psblas: Refined compilation macros for handling various Fortran cases

(see Changelog).
17 years ago · bbffc66b9b
parent ecc2920c9f
commit bbffc66b9b
7 changed files with 13 additions and 7 deletions
--- a/Make/Make.inc.g95
+++ b/Make/Make.inc.g95
@ -54,7 +54,8 @@ PSBLDLIBS=$(BLACS) $(BLAS) $(METIS_LIB)

 #  Add -DLargeFptr for 64-bit addresses
 PSBCDEFINES=-DAdd_ 
-PSBFDEFINES=-DNETLIB_BLACS  $(MPI_FINC) -DHAVE_MOVE_ALLOC
+#
+PSBFDEFINES=-DHAVE_KSENDID  $(MPI_FINC) -DHAVE_MOVE_ALLOC
 # -DHAVE_METIS

 AR=ar -cur
--- a/Make/Make.inc.gnu42
+++ b/Make/Make.inc.gnu42
@ -58,6 +58,7 @@ PSBLDLIBS=$(BLACS) $(BLAS) $(METIS_LIB)

 #  Add -DLargeFptr for 64-bit addresses
 PSBCDEFINES=-DAdd_ 
+#
 PSBFDEFINES=-DNETLIB_BLACS  $(MPI_FINC) -DHAVE_MOVE_ALLOC
 # -DHAVE_METIS

--- a/Make/Make.inc.gnu42-serialmpi
+++ b/Make/Make.inc.gnu42-serialmpi
@ -57,6 +57,7 @@ PSBLDLIBS=$(BLACS) $(BLAS) $(METIS_LIB)

 #  Add -DLargeFptr for 64-bit addresses
 PSBCDEFINES=-DAdd_ 
+#
 PSBFDEFINES=-DHAVE_MOVE_ALLOC -DSERIAL_MPI  $(MPI_FINC)
 # -DHAVE_METIS

--- a/Make/Make.inc.gnu43
+++ b/Make/Make.inc.gnu43
@ -58,7 +58,8 @@ PSBLDLIBS=$(BLACS) $(BLAS) $(METIS_LIB)

 #  Add -DLargeFptr for 64-bit addresses
 PSBCDEFINES=-DAdd_ 
-PSBFDEFINES=-DNETLIB_BLACS  $(MPI_FINC) -DHAVE_MOVE_ALLOC
+# 
+PSBFDEFINES=-DHAVE_KSENDID  $(MPI_FINC) -DHAVE_MOVE_ALLOC
 # -DHAVE_METIS

 AR=ar -cur
--- a/Make/Make.inc.ifort9
+++ b/Make/Make.inc.ifort9
@ -58,9 +58,10 @@ BLACS=-lmpiblacs-ifort91 -L$(HOME)/LIB
 PSBLDLIBS=$(BLACS) $(BLAS) $(METIS_LIB)

 #  Add -DLargeFptr for 64-bit addresses
-#   Note: MOVE_ALLOC is only on Intel Fortran 9.1, NOT on 9.0
 PSBCDEFINES=-DAdd_ 
-PSBFDEFINES=-DNETLIB_BLACS  $(MPI_FINC) -DHAVE_MOVE_ALLOC
+#
+#   Note: MOVE_ALLOC is only on Intel Fortran 9.1, NOT on 9.0
+PSBFDEFINES=-DHAVE_KSENDID  $(MPI_FINC) -DHAVE_MOVE_ALLOC
 # -DHAVE_METIS

 AR=ar -cur
--- a/Make/Make.inc.sp5
+++ b/Make/Make.inc.sp5
@ -56,7 +56,8 @@ PSBLDLIBS=$(BLACS) $(BLAS) $(METIS_LIB)

 #  Add -DLargeFptr for 64-bit addresses
 PSBCDEFINES=-DNoChange -DLargeFptr
-PSBFDEFINES=-WF,-DESSL_BLACS  $(MPI_FINC)
+#
+PSBFDEFINES=-WF,-DHAVE_ESSL_BLACS  $(MPI_FINC)
 # There's no MOVE_ALLOC yet in XLF 10.1.
 #-WF,-DHAVE_MOVE_ALLOC   -WF,-DHAVE_METIS

--- a/Make/Make.inc.sun-6.2
+++ b/Make/Make.inc.sun-6.2
@ -55,10 +55,10 @@ BLACS=$(HOME)/LIB/libblacs_MPI-SUN4SOL2-0.a $(HOME)/LIB/libblacsCinit_MPI-SUN4SO
 PSBLDLIBS=$(BLACS) $(BLAS) $(METIS_LIB)

 #  Add -DLargeFptr for 64-bit addresses
+PSBCDEFINES=-DAdd_ 
 #  SUN compiler does not have MOVE_ALLOC. 
+PSBFDEFINES=-DHAVE_KSENDID  $(MPI_FINC) 
 # -DHAVE_MOVE_ALLOC
-PSBCDEFINES=-DAdd_ 
-PSBFDEFINES=-DNETLIB_BLACS  $(MPI_FINC) 
 # -DHAVE_METIS

 AR=ar -cur