Attachment 317122 Details for Bug 462779 – Updated patch that allows building with mpi compilers

[patch] Updated patch that allows building with mpi compilers

blacs-fedora.patch (text/plain), 5.14 KB, created by Deji Akingunola on 2008-09-18 20:54:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Deji Akingunola

Created: 2008-09-18 20:54:49 UTC

Size: 5.14 KB

patch

obsolete

>--- 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) ; ld -shared --build-id -o $(BLACSdir)/$(BLACSLIBS).0.0 *.o *.oo -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) $<

Actions: View | Diff

Attachments on bug 462779: 317117 | 317118 | 317120 | 317122 | 317124 | 317146