From e917b60234b7a61b1f507a559cbb185db6878d6a Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Sep 23 2008 16:03:50 +0000 Subject: use openmpi --- diff --git a/.cvsignore b/.cvsignore index 2165f03..2751bc7 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,7 @@ -blacstester.tgz mpiblacs.tgz +blacs_install.ps +cblacsqref.ps +f77blacsqref.ps +lawn94.ps +mpiblacs_issues.ps +mpi_prop.ps diff --git a/Bmake.inc b/Bmake.inc index e37af8a..ce16632 100644 --- a/Bmake.inc +++ b/Bmake.inc @@ -54,16 +54,11 @@ # Name and location of the MPI library. # ------------------------------------- MPIdir = /usr - MPILIBdir = $(MPIdir)/lib/lam/lib - MPIINCdir = $(MPIdir)/lib/lam/include - MPILIB = -lmpi - LAMLIBS = -llam -llamf77mpi - EXTRALIBS = -ldl -lpthread -lutil # ------------------------------------- # All libraries required by the tester. # ------------------------------------- - BTLIBS = -L$(BLACSdir) $(BLACSFINITSL) $(BLACSLIBSL) $(BLACSCINITSL) -L$(MPILIBdir) $(MPILIB) $(LAMLIBS) $(EXTRALIBS) + BTLIBS = -L$(BLACSdir) $(BLACSFINITSL) $(BLACSLIBSL) $(BLACSCINITSL) # ---------------------------------------------------------------- # The directory to put the installation help routines' executables @@ -94,7 +89,7 @@ # The directory to find the required communication library include files, # if they are required by your system. # ----------------------------------------------------------------------- - SYSINC = -I$(MPIINCdir) -I$(MPIINCdir)/32 + SYSINC = # --------------------------------------------------------------------------- # The Fortran 77 to C interface to be used. If you are unsure of the correct @@ -203,12 +198,12 @@ # optimization. This is the F77NO_OPTFLAG. The usage of the remaining # macros should be obvious from the names. #============================================================================= - F77 = gfortran + F77 = mpif77 F77NO_OPTFLAGS = $(RPM_OPT_FLAGS) -fPIC F77FLAGS = $(F77NO_OPTFLAGS) -O F77LOADER = $(F77) F77LOADFLAGS = - CC = gcc + CC = mpicc CCFLAGS = $(RPM_OPT_FLAGS) -fPIC CCLOADER = $(CC) CCLOADFLAGS = diff --git a/Bmake.inc.64bit b/Bmake.inc.64bit deleted file mode 100644 index 7dc0698..0000000 --- a/Bmake.inc.64bit +++ /dev/null @@ -1,226 +0,0 @@ -#============================================================================= -#====================== SECTION 1: PATHS AND LIBRARIES ======================= -#============================================================================= -# The following macros specify the name and location of libraries required by -# the BLACS and its tester. -#============================================================================= - -# -------------------------------------- -# Make sure we've got a consistent shell -# -------------------------------------- - SHELL = /bin/sh - -# ----------------------------- -# The top level BLACS directory -# ----------------------------- - BTOPdir = $(RPM_BUILD_DIR)/blacs/BLACS - -# --------------------------------------------------------------------------- -# The communication library your BLACS have been written for. -# Known choices (and the machines they run on) are: -# -# COMMLIB MACHINE -# ....... .............................................................. -# CMMD Thinking Machine's CM-5 -# MPI Wide variety of systems -# MPL IBM's SP series (SP1 and SP2) -# NX Intel's supercomputer series (iPSC2, iPSC/860, DELTA, PARAGON) -# PVM Most unix machines; See PVM User's Guide for details -# --------------------------------------------------------------------------- - COMMLIB = MPI - -# ------------------------------------------------------------- -# The platform identifier to suffix to the end of library names -# ------------------------------------------------------------- - PLAT = LINUX - -# ---------------------------------------------------------- -# Name and location of the BLACS library. See section 2 for -# details on BLACS debug level (BLACSDBGLVL). -# ---------------------------------------------------------- - BLACSdir = $(BTOPdir)/LIB - BLACSDBGLVL = 0 - BLACSFINIT = $(BLACSdir)/libmpiblacsF77init.a - BLACSFINITS = libmpiblacsF77init.so.1 - BLACSFINITSL = -lmpiblacsF77init - BLACSCINIT = $(BLACSdir)/libmpiblacsCinit.a - BLACSCINITS = libmpiblacsCinit.so.1 - BLACSCINITSL = -lmpiblacsCinit - BLACSLIB = $(BLACSdir)/libmpiblacs.a - BLACSLIBS = libmpiblacs.so.1 - BLACSLIBSL = -lmpiblacs - -# ------------------------------------- -# Name and location of the MPI library. -# ------------------------------------- - MPIdir = /usr - MPILIBdir = $(MPIdir)/lib64/lam/lib - MPIINCdir = $(MPIdir)/lib64/lam/include - MPILIB = -lmpi - LAMLIBS = -llam -llamf77mpi - EXTRALIBS = -ldl -lpthread -lutil - -# ------------------------------------- -# All libraries required by the tester. -# ------------------------------------- - BTLIBS = -L$(BLACSdir) $(BLACSFINITSL) $(BLACSLIBSL) $(BLACSCINITSL) -L$(MPILIBdir) $(MPILIB) $(LAMLIBS) $(EXTRALIBS) - -# ---------------------------------------------------------------- -# The directory to put the installation help routines' executables -# ---------------------------------------------------------------- - INSTdir = $(BTOPdir)/INSTALL/EXE - -# ------------------------------------------------ -# The name and location of the tester's executable -# ------------------------------------------------ - TESTdir = $(BTOPdir)/TESTING/EXE - FTESTexe = $(TESTdir)/xFbtest_$(COMMLIB)-$(PLAT)-$(BLACSDBGLVL) - CTESTexe = $(TESTdir)/xCbtest_$(COMMLIB)-$(PLAT)-$(BLACSDBGLVL) -#============================================================================= -#=============================== End SECTION 1 =============================== -#============================================================================= - - -#============================================================================= -#========================= SECTION 2: BLACS INTERNALS ======================== -#============================================================================= -# The following macro definitions set preprocessor values for the BLACS. -# The file Bconfig.h sets these values if they are not set by the makefile. -# User's compiling only the tester can skip this entire section. -# NOTE: The MPI defaults have been set for MPICH. -#============================================================================= - -# ----------------------------------------------------------------------- -# The directory to find the required communication library include files, -# if they are required by your system. -# ----------------------------------------------------------------------- - SYSINC = -I$(MPIINCdir) -I$(MPIINCdir)/64 - -# --------------------------------------------------------------------------- -# The Fortran 77 to C interface to be used. If you are unsure of the correct -# setting for your platform, compile and run BLACS/INSTALL/xintface. -# Choices are: Add_, NoChange, UpCase, or f77IsF2C. -# --------------------------------------------------------------------------- - INTFACE = -DAdd_ - -# ------------------------------------------------------------------------ -# Allows the user to vary the topologies that the BLACS default topologies -# (TOP = ' ') correspond to. If you wish to use a particular topology -# (as opposed to letting the BLACS make the choice), uncomment the -# following macros, and replace the character in single quotes with the -# topology of your choice. -# ------------------------------------------------------------------------ -# DEFBSTOP = -DDefBSTop="'1'" -# DEFCOMBTOP = -DDefCombTop="'1'" - -# ------------------------------------------------------------------- -# If your MPI_Send is locally-blocking, substitute the following line -# for the empty macro definition below. -# SENDIS = -DSndIsLocBlk -# ------------------------------------------------------------------- - SENDIS = - -# -------------------------------------------------------------------- -# If your MPI handles packing of non-contiguous messages by copying to -# another buffer or sending extra bytes, better performance may be -# obtained by replacing the empty macro definition below with the -# macro definition on the following line. -# BUFF = -DNoMpiBuff -# -------------------------------------------------------------------- - BUFF = - -# ----------------------------------------------------------------------- -# If you know something about your system, you may make it easier for the -# BLACS to translate between C and fortran communicators. If the empty -# macro defininition is left alone, this translation will cause the C -# BLACS to globally block for MPI_COMM_WORLD on calls to BLACS_GRIDINIT -# and BLACS_GRIDMAP. If you choose one of the options for translating -# the context, neither the C or fortran calls will globally block. -# If you are using MPICH, or a derivitive system, you can replace the -# empty macro definition below with the following (note that if you let -# MPICH do the translation between C and fortran, you must also indicate -# here if your system has pointers that are longer than integers. If so, -# define -DPOINTER_64_BITS=1.) For help on setting TRANSCOMM, you can -# run BLACS/INSTALL/xtc_CsameF77 and BLACS/INSTALL/xtc_UseMpich as -# explained in BLACS/INSTALL/README. - TRANSCOMM = -DUseMpich -# -# If you know that your MPI uses the same handles for fortran and C -# communicators, you can replace the empty macro definition below with -# the macro definition on the following line. -# TRANSCOMM = -DCSameF77 -# ----------------------------------------------------------------------- -# TRANSCOMM = - -# -------------------------------------------------------------------------- -# You may choose to have the BLACS internally call either the C or Fortran77 -# interface to MPI by varying the following macro. If TRANSCOMM is left -# empty, the C interface BLACS_GRIDMAP/BLACS_GRIDINIT will globally-block if -# you choose to use the fortran internals, and the fortran interface will -# block if you choose to use the C internals. It is recommended that the -# user leave this macro definition blank, unless there is a strong reason -# to prefer one MPI interface over the other. -# WHATMPI = -DUseF77Mpi -# WHATMPI = -DUseCMpi -# -------------------------------------------------------------------------- - WHATMPI = - -# --------------------------------------------------------------------------- -# Some early versions of MPICH and its derivatives cannot handle user defined -# zero byte data types. If your system has this problem (compile and run -# BLACS/INSTALL/xsyserrors to check if unsure), replace the empty macro -# definition below with the macro definition on the following line. -# SYSERRORS = -DZeroByteTypeBug -# --------------------------------------------------------------------------- - SYSERRORS = - -# ------------------------------------------------------------------ -# These macros set the debug level for the BLACS. The fastest -# code is produced by BlacsDebugLvl 0. Higher levels provide -# more debug information at the cost of performance. Present levels -# of debug are: -# 0 : No debug information -# 1 : Mainly parameter checking. -# ------------------------------------------------------------------ - DEBUGLVL = -DBlacsDebugLvl=$(BLACSDBGLVL) - -# ------------------------------------------------------------------------- -# All BLACS definitions needed for compile (DEFS1 contains definitions used -# by all BLACS versions). -# ------------------------------------------------------------------------- - DEFS1 = -DSYSINC $(SYSINC) $(INTFACE) $(DEFBSTOP) $(DEFCOMBTOP) $(DEBUGLVL) - BLACSDEFS = $(DEFS1) $(SENDIS) $(BUFF) $(TRANSCOMM) $(WHATMPI) $(SYSERRORS) -#============================================================================= -#=============================== End SECTION 2 =============================== -#============================================================================= - - -#============================================================================= -#=========================== SECTION 3: COMPILERS ============================ -#============================================================================= -# The following macros specify compilers, linker/loaders, the archiver, -# and their options. Some of the fortran files need to be compiled with no -# optimization. This is the F77NO_OPTFLAG. The usage of the remaining -# macros should be obvious from the names. -#============================================================================= - F77 = gfortran - F77NO_OPTFLAGS = $(RPM_OPT_FLAGS) -fPIC - F77FLAGS = $(F77NO_OPTFLAGS) -O - F77LOADER = $(F77) - F77LOADFLAGS = - CC = gcc - CCFLAGS = $(RPM_OPT_FLAGS) -fPIC - CCLOADER = $(CC) - CCLOADFLAGS = - -# -------------------------------------------------------------------------- -# The archiver and the flag(s) to use when building an archive (library). -# Also the ranlib routine. If your system has no ranlib, set RANLIB = echo. -# -------------------------------------------------------------------------- - ARCH = ar - ARCHFLAGS = r - RANLIB = ranlib - -#============================================================================= -#=============================== End SECTION 3 =============================== -#============================================================================= diff --git a/blacs-fedora.patch b/blacs-fedora.patch new file mode 100644 index 0000000..22936c5 --- /dev/null +++ b/blacs-fedora.patch @@ -0,0 +1,132 @@ +--- blacs/BLACS/SRC/MPI/Makefile 2007-10-04 13:09:14.000000000 -0400 ++++ blacs/BLACS/SRC/MPI/Makefile.new 2008-09-18 14:12:10.000000000 -0400 +@@ -88,12 +88,14 @@ + make $(BLACSCINIT) + $(ARCH) $(ARCHFLAGS) $(BLACSLIB) $(Fintobj) $(Cintobj) + $(RANLIB) $(BLACSLIB) ++ ( mkdir tmp ; cp $(BLACSLIB) tmp ; cd tmp ; ar x $(BLACSLIB) ; mpif77 -shared -o $(BLACSdir)/$(BLACSLIBS).0.0 *.o *.oo -Wl,-soname=$(BLACSLIBS) ; cd .. ) + + $(BLACSFINIT) : + $(CC) -o Cblacs_pinfo.o -c $(CCFLAGS) $(BLACSDEFS) -DCallFromC -DMainInF77 \ + blacs_pinfo_.c + $(CC) -c $(CCFLAGS) $(BLACSDEFS) -DMainInF77 blacs_pinfo_.c + $(ARCH) $(ARCHFLAGS) $(BLACSFINIT) blacs_pinfo_.o Cblacs_pinfo.o ++ $(CC) $(CCFLAGS) -shared -Wl,-soname=$(BLACSFINITS) -o $(BLACSdir)/$(BLACSFINITS).0.0 blacs_pinfo_.o Cblacs_pinfo.o + $(RANLIB) $(BLACSFINIT) + + $(BLACSCINIT) : +@@ -101,6 +103,7 @@ + blacs_pinfo_.c + $(CC) -c $(CCFLAGS) $(BLACSDEFS) -DMainInC blacs_pinfo_.c + $(ARCH) $(ARCHFLAGS) $(BLACSCINIT) blacs_pinfo_.o Cblacs_pinfo.o ++ $(CC) $(CCFLAGS) -shared -Wl,-soname=$(BLACSCINITS) -o $(BLACSdir)/$(BLACSCINITS).0.0 blacs_pinfo_.o Cblacs_pinfo.o + $(RANLIB) $(BLACSCINIT) + + # ------------------ +@@ -129,7 +132,7 @@ + ( cd INTERNAL ; rm -f bi_f77_get_constants.o bi_f77_mpi_attr_get.o \ + bi_f77_mpi_initialized.o bi_f77_mpi_op_create.o \ + bi_f77_mpi_test.o bi_f77_mpi_testall.o \ +- bi_f77_init.o Bdef.h Bconfig.h mpif.h ) ++ bi_f77_init.o Bdef.h Bconfig.h ) + ( cd INTERNAL ; rm -f $(internal) ) + + # ------------------------------------- +@@ -142,7 +145,7 @@ + ( cd INTERNAL ; rm -f $(internal:.o=.c) Bdef.h Bconfig.h ) + ( cd INTERNAL ; rm -f bi_f77_get_constants.f bi_f77_mpi_attr_get.f \ + bi_f77_mpi_initialized.f bi_f77_mpi_op_create.f \ +- bi_f77_mpi_test.f bi_f77_mpi_testall.f mpif.h ) ++ bi_f77_mpi_test.f bi_f77_mpi_testall.f ) + + # ------------------------------------------------------------------------- + # Establish how to make logical links to the long-name C interface routines +@@ -180,25 +183,21 @@ + # ------------------------------------- + # Compile the (ouch!) fortran internals + # ------------------------------------- +-bi_f77_init.o : mpif.h bi_f77_init.f ++bi_f77_init.o : bi_f77_init.f + $(F77) -c $(F77FLAGS) $*.f +-bi_f77_get_constants.o : mpif.h bi_f77_get_constants.f ++bi_f77_get_constants.o :bi_f77_get_constants.f + $(F77) -c $(F77FLAGS) $*.f +-bi_f77_mpi_attr_get.o : mpif.h bi_f77_mpi_attr_get.f ++bi_f77_mpi_attr_get.o : bi_f77_mpi_attr_get.f + $(F77) -c $(F77FLAGS) $*.f +-bi_f77_mpi_initialized.o : mpif.h bi_f77_mpi_initialized.f ++bi_f77_mpi_initialized.o : bi_f77_mpi_initialized.f + $(F77) -c $(F77FLAGS) $*.f +-bi_f77_mpi_op_create.o : mpif.h bi_f77_mpi_op_create.f ++bi_f77_mpi_op_create.o : bi_f77_mpi_op_create.f + $(F77) -c $(F77FLAGS) $*.f +-bi_f77_mpi_test.o : mpif.h bi_f77_mpi_test.f ++bi_f77_mpi_test.o : bi_f77_mpi_test.f + $(F77) -c $(F77FLAGS) $*.f +-bi_f77_mpi_testall.o : mpif.h bi_f77_mpi_testall.f ++bi_f77_mpi_testall.o : bi_f77_mpi_testall.f + $(F77) -c $(F77FLAGS) $*.f + +-mpif.h : $(MPIINCdir)/mpif.h +- rm -f mpif.h +- ln -s $(MPIINCdir)/mpif.h mpif.h +- + # ------------------------------------------------------------------------ + # We move C .o files to .oo so that we can use the portable suffix rule for + # compilation, and still have them coexist with the fortran interface +--- blacs/BLACS/TESTING/Makefile 2006-01-18 16:36:03.000000000 -0500 ++++ blacs/BLACS/TESTING/Makefile.new 2008-09-18 15:41:47.000000000 -0400 +@@ -51,22 +51,17 @@ + cp $(BTOPdir)/TESTING/comb.dat $(TESTdir)/ + + btprim_MPI.o : btprim_MPI.f +- make mpif.h + $(F77) -c $(F77FLAGS) $*.f + + btprim_PVM.o : btprim_PVM.f + make fpvm3.h + $(F77) -c $(F77FLAGS) $*.f + +-mpif.h : $(MPIINCdir)/mpif.h +- rm -f mpif.h +- ln -s $(MPIINCdir)/mpif.h mpif.h +- + fpvm3.h : $(PVMINCdir)/fpvm3.h + rm -f fpvm3.h + ln -s $(PVMINCdir)/fpvm3.h fpvm3.h + + clean : +- rm -f $(obj) tools.o Cbt.o mpif.h fpvm3.h ++ rm -f $(obj) tools.o Cbt.o fpvm3.h + + .f.o: ; $(F77) -c $(F77FLAGS) $*.f +--- blacs/BLACS/INSTALL/Makefile 2006-01-18 16:36:03.000000000 -0500 ++++ blacs/BLACS/INSTALL/Makefile.new 2008-09-18 15:43:07.000000000 -0400 +@@ -28,7 +28,7 @@ + $(INSTdir)/xsyserrors : syserrors.o + $(CCLOADER) $(CCLOADFLAGS) -o $@ syserrors.o $(MPILIB) + +-$(INSTdir)/xtc_CsameF77 : mpif.h tc_fCsameF77.o tc_cCsameF77.o ++$(INSTdir)/xtc_CsameF77 : tc_fCsameF77.o tc_cCsameF77.o + $(F77LOADER) $(F77LOADFLAGS) -o $@ tc_fCsameF77.o tc_cCsameF77.o $(MPILIB) + + $(INSTdir)/xtc_UseMpich : tc_UseMpich.o +@@ -37,17 +37,13 @@ + $(INSTdir)/xcmpi_sane : cmpi_sane.o + $(CCLOADER) $(CCLOADFLAGS) -o $@ cmpi_sane.o $(MPILIB) + +-$(INSTdir)/xfmpi_sane : mpif.h fmpi_sane.o ++$(INSTdir)/xfmpi_sane : fmpi_sane.o + $(F77LOADER) $(F77LOADFLAGS) -o $@ fmpi_sane.o $(MPILIB) + + clean: + rm -f size.o Fintface.o Cintface.o syserrors.o transcomm.o \ + mpi_sane.o fmpi_sane.o tc_UseMpich.o tc_fCsameF77.o tc_cCsameF77.o + +-mpif.h : $(MPIINCdir)/mpif.h +- rm -f mpif.h +- ln -s $(MPIINCdir)/mpif.h mpif.h +- + .f.o: ; $(F77) -c $(F77FLAGS) $*.f + .c.o: + $(CC) -c $(CCFLAGS) $(BLACSDEFS) $< diff --git a/blacs-shared.patch b/blacs-shared.patch deleted file mode 100644 index 59e7d98..0000000 --- a/blacs-shared.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- blacs/BLACS/SRC/MPI/Makefile.BAD 2005-06-27 07:12:21.252897368 -0500 -+++ blacs/BLACS/SRC/MPI/Makefile 2005-06-27 07:14:23.144367048 -0500 -@@ -88,12 +88,14 @@ - make $(BLACSCINIT) - $(ARCH) $(ARCHFLAGS) $(BLACSLIB) $(Fintobj) $(Cintobj) - $(RANLIB) $(BLACSLIB) -+ ( mkdir tmp ; cp $(BLACSLIB) tmp ; cd tmp ; ar x $(BLACSLIB) ; ld -shared --build-id -o $(BLACSdir)/$(BLACSLIBS).0.0 *.o *.C -soname=$(BLACSLIBS) ; cd .. ) - - $(BLACSFINIT) : - $(CC) -o Cblacs_pinfo.o -c $(CCFLAGS) $(BLACSDEFS) -DCallFromC -DMainInF77 \ - blacs_pinfo_.c - $(CC) -c $(CCFLAGS) $(BLACSDEFS) -DMainInF77 blacs_pinfo_.c - $(ARCH) $(ARCHFLAGS) $(BLACSFINIT) blacs_pinfo_.o Cblacs_pinfo.o -+ $(CC) $(CCFLAGS) -shared -Wl,-soname=$(BLACSFINITS) -o $(BLACSdir)/$(BLACSFINITS).0.0 blacs_pinfo_.o Cblacs_pinfo.o - $(RANLIB) $(BLACSFINIT) - - $(BLACSCINIT) : -@@ -101,6 +103,7 @@ - blacs_pinfo_.c - $(CC) -c $(CCFLAGS) $(BLACSDEFS) -DMainInC blacs_pinfo_.c - $(ARCH) $(ARCHFLAGS) $(BLACSCINIT) blacs_pinfo_.o Cblacs_pinfo.o -+ $(CC) $(CCFLAGS) -shared -Wl,-soname=$(BLACSCINITS) -o $(BLACSdir)/$(BLACSCINITS).0.0 blacs_pinfo_.o Cblacs_pinfo.o - $(RANLIB) $(BLACSCINIT) - - # ------------------ diff --git a/blacs.spec b/blacs.spec index 7a4378c..f5bebf6 100644 --- a/blacs.spec +++ b/blacs.spec @@ -1,28 +1,23 @@ Summary: Basic Linear Algebra Communication Subprograms Name: blacs Version: 1.1 -Release: 29%{?dist} +Release: 30%{?dist} License: Public Domain Group: Development/Libraries URL: http://www.netlib.org/blacs Source0: http://www.netlib.org/blacs/mpiblacs.tgz -Source1: http://www.netlib.org/blacs/blacstester.tgz -Source2: Bmake.inc -Source3: http://www.netlib.org/blacs/mpi_prop.ps -Source4: http://www.netlib.org/blacs/blacs_install.ps -Source5: http://www.netlib.org/blacs/mpiblacs_issues.ps -Source6: http://www.netlib.org/blacs/f77blacsqref.ps -Source7: http://www.netlib.org/blacs/cblacsqref.ps -Source8: http://www.netlib.org/blacs/lawn94.ps -Source9: Bmake.inc.64bit +Source1: Bmake.inc +Source2: http://www.netlib.org/blacs/mpi_prop.ps +Source3: http://www.netlib.org/blacs/blacs_install.ps +Source4: http://www.netlib.org/blacs/mpiblacs_issues.ps +Source5: http://www.netlib.org/blacs/f77blacsqref.ps +Source6: http://www.netlib.org/blacs/cblacsqref.ps +Source7: http://www.netlib.org/blacs/lawn94.ps BuildRequires: gcc-gfortran -# Lam before 7.1.1-5 is missing: -# -shared library support -# -fPIC compilation flag -BuildRequires: lapack, blas, lam-devel >= 2:7.1.1-5 -Requires: lapack, blas, lam >= 2:7.1.1-5 +BuildRequires: lapack, blas, openmpi-devel +Requires: lapack, blas BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Patch0: blacs-shared.patch +Patch0: blacs-fedora.patch %description The BLACS (Basic Linear Algebra Communication Subprograms) project is @@ -45,17 +40,9 @@ This package contains development libraries for blacs. %prep %setup -q -c -n %{name} -%setup -q -D -T -a 1 -n %{name} %patch0 -p1 cd BLACS/ -%ifarch ppc64 sparc64 x86_64 ia64 -cp -f %{SOURCE9} ./Bmake.inc -%else -cp -f %{SOURCE2} . -%endif -%ifarch ia64 -sed -i -e 's,/lib64/,/lib/,g' ./Bmake.inc -%endif +cp -f %{SOURCE1} . %build cd BLACS/ @@ -67,12 +54,12 @@ cd TESTING/ make cd ../.. -cp %{SOURCE3} mpi_prop.ps -cp %{SOURCE4} blacs_install.ps -cp %{SOURCE5} mpiblacs_issues.ps -cp %{SOURCE6} f77blacsqref.ps -cp %{SOURCE7} cblacsqref.ps -cp %{SOURCE8} lawn94.ps +cp %{SOURCE2} mpi_prop.ps +cp %{SOURCE3} blacs_install.ps +cp %{SOURCE4} mpiblacs_issues.ps +cp %{SOURCE5} f77blacsqref.ps +cp %{SOURCE6} cblacsqref.ps +cp %{SOURCE7} lawn94.ps %install rm -fr ${RPM_BUILD_ROOT} @@ -112,6 +99,10 @@ rm -fr ${RPM_BUILD_ROOT} %{_libdir}/libmpiblacs*.so %changelog +* Tue Sep 23 2008 Tom "spot" Callaway - 1.1-30 +- incorporate Deji Akingunola's changes +- use openmpi rather than lam + * Tue Jul 8 2008 Tom "spot" Callaway - 1.1-29 - fix lam paths diff --git a/sources b/sources index 48a1c26..c791357 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -5cdd9cf792b793baaeb8acef17b9bb71 blacstester.tgz -850b302d5f7786a6bc895cac5e9382bb mpiblacs.tgz +28ae5b91b3193402fe1ae8d06adcf500 mpiblacs.tgz