rpms/blacs/devel blacs-fedora.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 Bmake.inc, 1.8, 1.9 blacs.spec, 1.29, 1.30 sources, 1.2, 1.3 Bmake.inc.64bit, 1.8, NONE blacs-shared.patch, 1.2, NONE
Tom Callaway
spot at fedoraproject.org
Tue Sep 23 16:04:21 UTC 2008
- Previous message (by thread): rpms/gnome-mag/devel .cvsignore, 1.33, 1.34 gnome-mag.spec, 1.57, 1.58 sources, 1.34, 1.35
- Next message (by thread): rpms/gnome-system-monitor/devel .cvsignore, 1.70, 1.71 gnome-system-monitor.spec, 1.126, 1.127 sources, 1.70, 1.71
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: spot
Update of /cvs/extras/rpms/blacs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18325
Modified Files:
.cvsignore Bmake.inc blacs.spec sources
Added Files:
blacs-fedora.patch
Removed Files:
Bmake.inc.64bit blacs-shared.patch
Log Message:
use openmpi
blacs-fedora.patch:
--- NEW FILE blacs-fedora.patch ---
--- 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) $<
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/blacs/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 24 Apr 2005 17:42:47 -0000 1.2
+++ .cvsignore 23 Sep 2008 16:03:50 -0000 1.3
@@ -1,2 +1,7 @@
-blacstester.tgz
mpiblacs.tgz
+blacs_install.ps
+cblacsqref.ps
+f77blacsqref.ps
+lawn94.ps
+mpiblacs_issues.ps
+mpi_prop.ps
Index: Bmake.inc
===================================================================
RCS file: /cvs/extras/rpms/blacs/devel/Bmake.inc,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Bmake.inc 8 Jul 2008 17:54:20 -0000 1.8
+++ Bmake.inc 23 Sep 2008 16:03:50 -0000 1.9
@@ -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 =
Index: blacs.spec
===================================================================
RCS file: /cvs/extras/rpms/blacs/devel/blacs.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- blacs.spec 8 Jul 2008 17:54:20 -0000 1.29
+++ blacs.spec 23 Sep 2008 16:03:50 -0000 1.30
@@ -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 @@
%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 @@
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 @@
%{_libdir}/libmpiblacs*.so
%changelog
+* Tue Sep 23 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.1-30
+- incorporate Deji Akingunola's changes
+- use openmpi rather than lam
+
* Tue Jul 8 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.1-29
- fix lam paths
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/blacs/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 24 Apr 2005 17:42:47 -0000 1.2
+++ sources 23 Sep 2008 16:03:50 -0000 1.3
@@ -1,2 +1 @@
-5cdd9cf792b793baaeb8acef17b9bb71 blacstester.tgz
-850b302d5f7786a6bc895cac5e9382bb mpiblacs.tgz
+28ae5b91b3193402fe1ae8d06adcf500 mpiblacs.tgz
--- Bmake.inc.64bit DELETED ---
--- blacs-shared.patch DELETED ---
- Previous message (by thread): rpms/gnome-mag/devel .cvsignore, 1.33, 1.34 gnome-mag.spec, 1.57, 1.58 sources, 1.34, 1.35
- Next message (by thread): rpms/gnome-system-monitor/devel .cvsignore, 1.70, 1.71 gnome-system-monitor.spec, 1.126, 1.127 sources, 1.70, 1.71
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list