fdurastante/psblas3
1
0
Fork 0
mirror of https://github.com/sfilippone/psblas3.git synced 2026-10-18 11:52:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

psblas2:

Browse Source 
Make/Make.inc.g95
 Make/Make.inc.gnu42-serialmpi
 Make/Make.inc.gnu42
 Make/Make.inc.gnu43
 Make/Make.inc.ifort9
 Make/Make.inc.sp5
 Make/Make.inc.sun-6.2
 base/internals/srcht.c
 base/modules/fakempi.c

Fixed CDEFINES names for handling Fortran mangling.
This commit is contained in:
Salvatore Filippone
2008-02-27 16:14:43 +00:00
parent eedf3b2916
commit 8dc4dff121
9 changed files with 90 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Make/Make.inc.g95
+1 -1
View File
@@ -53,7 +53,7 @@ BLACS=-lmpiblacsg95 -L$(HOME)/LIB
PSBLDLIBS=$(BLACS) $(BLAS) $(METIS_LIB)
# Add -DLargeFptr for 64-bit addresses
PSBCDEFINES=-DAdd_
PSBCDEFINES=-DLowerUnderscore
#
PSBFDEFINES=-DHAVE_KSENDID $(MPI_FINC) -DHAVE_MOVE_ALLOC
# -DHAVE_METIS
Make/Make.inc.gnu42
+1 -1
View File
@@ -57,7 +57,7 @@ BLACS=-lmpiblacs-gcc42 -L$(HOME)/LIB
PSBLDLIBS=$(BLACS) $(BLAS) $(METIS_LIB)
# Add -DLargeFptr for 64-bit addresses
PSBCDEFINES=-DAdd_
PSBCDEFINES=-DLowerUnderscore
#
PSBFDEFINES=-DHAVE_KSENDID $(MPI_FINC) -DHAVE_MOVE_ALLOC
# -DHAVE_METIS
Make/Make.inc.gnu42-serialmpi
+1 -1
View File
@@ -56,7 +56,7 @@ EXTRA_COBJS=fakempi.o
PSBLDLIBS=$(BLACS) $(BLAS) $(METIS_LIB)
# Add -DLargeFptr for 64-bit addresses
PSBCDEFINES=-DAdd_
PSBCDEFINES=-DLowerUnderscore
#
PSBFDEFINES=-DHAVE_MOVE_ALLOC -DSERIAL_MPI $(MPI_FINC)
# -DHAVE_METIS
Make/Make.inc.gnu43
+1 -1
View File
@@ -57,7 +57,7 @@ BLACS=-lmpiblacs-gcc42 -L$(HOME)/LIB
PSBLDLIBS=$(BLACS) $(BLAS) $(METIS_LIB)
# Add -DLargeFptr for 64-bit addresses
PSBCDEFINES=-DAdd_
PSBCDEFINES=-DLowerUnderscore
#
PSBFDEFINES=-DHAVE_KSENDID $(MPI_FINC) -DHAVE_MOVE_ALLOC
# -DHAVE_METIS
Make/Make.inc.ifort9
+1 -1
View File
@@ -58,7 +58,7 @@ BLACS=-lmpiblacs-ifort91 -L$(HOME)/LIB
PSBLDLIBS=$(BLACS) $(BLAS) $(METIS_LIB)
# Add -DLargeFptr for 64-bit addresses
PSBCDEFINES=-DAdd_
PSBCDEFINES=-DLowerUnderscore
#
# Note: MOVE_ALLOC is only on Intel Fortran 9.1, NOT on 9.0
PSBFDEFINES=-DHAVE_KSENDID $(MPI_FINC) -DHAVE_MOVE_ALLOC
Make/Make.inc.sp5
+2 -2
View File
@@ -1,4 +1,4 @@
.mod=.mod
.mod=.mod
.fh=.fh
.SUFFIXES:
.SUFFIXES: .f90 .F90 $(.mod) .F .f .c .o
@@ -55,7 +55,7 @@ BLACS=-lblacssmp
PSBLDLIBS=$(BLACS) $(BLAS) $(METIS_LIB)
# Add -DLargeFptr for 64-bit addresses
PSBCDEFINES=-DNoChange -DLargeFptr
PSBCDEFINES=-DLowerCase -DLargeFptr
#
PSBFDEFINES=-WF,-DHAVE_ESSL_BLACS $(MPI_FINC)
# There's no MOVE_ALLOC yet in XLF 10.1.
Make/Make.inc.sun-6.2
+1 -1
View File
@@ -55,7 +55,7 @@ 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_
PSBCDEFINES=-DLowerUnderscore
# SUN compiler does not have MOVE_ALLOC.
PSBFDEFINES=-DHAVE_KSENDID $(MPI_FINC)
# -DHAVE_MOVE_ALLOC
base/internals/srcht.c
+30 -3
View File
@@ -84,7 +84,7 @@
#define POOLSIZE 4096
#define CACHESIZE 16
#ifdef Add_
#ifdef LowerUnderscore
#define InitPairSearchTree initpairsearchtree_
#define FreePairSearchTree freepairsearchtree_
#define ClonePairSearchTree clonepairsearchtree_
@@ -93,7 +93,7 @@
#define SearchKeyVal searchkeyval_
#define NPairs npairs_
#endif
#ifdef AddDouble_
#ifdef LowerDoubleUnderscore
#define InitPairSearchTree initpairsearchtree_
#define FreePairSearchTree freepairsearchtree_
#define ClonePairSearchTree clonepairsearchtree_
@@ -102,7 +102,7 @@
#define SearchKeyVal searchkeyval_
#define NPairs npairs_
#endif
#ifdef NoChange
#ifdef LowerCase
#define InitPairSearchTree initpairsearchtree
#define FreePairSearchTree freepairsearchtree
#define ClonePairSearchTree clonepairsearchtree
@@ -111,6 +111,33 @@
#define SearchKeyVal searchkeyval
#define NPairs npairs
#endif
#ifdef UpperUnderscore
#define InitPairSearchTree INITPAIRSEARCHTREE_
#define FreePairSearchTree FREEPAIRSEARCHTREE_
#define ClonePairSearchTree CLONEPAIRSEARCHTREE_
#define SizeofPairSearchTree SIZEOFPAIRSEARCHTREE_
#define SearchInsKeyVal SEARCHINSKEYVAL_
#define SearchKeyVal SEARCHKEYVAL_
#define NPairs NPAIRS_
#endif
#ifdef UpperDoubleUnderscore
#define InitPairSearchTree INITPAIRSEARCHTREE_
#define FreePairSearchTree FREEPAIRSEARCHTREE_
#define ClonePairSearchTree CLONEPAIRSEARCHTREE_
#define SizeofPairSearchTree SIZEOFPAIRSEARCHTREE_
#define SearchInsKeyVal SEARCHINSKEYVAL_
#define SearchKeyVal SEARCHKEYVAL_
#define NPairs NPAIRS_
#endif
#ifdef UpperCase
#define InitPairSearchTree INITPAIRSEARCHTREE
#define FreePairSearchTree FREEPAIRSEARCHTREE
#define ClonePairSearchTree CLONEPAIRSEARCHTREE
#define SizeofPairSearchTree SIZEOFPAIRSEARCHTREE
#define SearchInsKeyVal SEARCHINSKEYVAL
#define SearchKeyVal SEARCHKEYVAL
#define NPairs NPAIRS
#endif
base/modules/fakempi.c
+52 -1
View File
@@ -2,7 +2,7 @@
#include <stdio.h>
#include <string.h>
#ifdef Add_
#ifdef LowerUndescore
#define mpi_wtime mpi_wtime_
#define mpi_send mpi_send_
#define mpi_irecv mpi_irecv_
@@ -12,6 +12,57 @@
#define mpi_allgather mpi_allgather_
#define mpi_allgatherv mpi_allgatherv_
#endif
#ifdef LowerDoubleUndescore
#define mpi_wtime mpi_wtime__
#define mpi_send mpi_send__
#define mpi_irecv mpi_irecv__
#define mpi_wait mpi_wait__
#define mpi_alltoall mpi_alltoall__
#define mpi_alltoallv mpi_alltoallv__
#define mpi_allgather mpi_allgather__
#define mpi_allgatherv mpi_allgatherv__
#endif
#ifdef LowerCase
#define mpi_wtime mpi_wtime
#define mpi_send mpi_send
#define mpi_irecv mpi_irecv
#define mpi_wait mpi_wait
#define mpi_alltoall mpi_alltoall
#define mpi_alltoallv mpi_alltoallv
#define mpi_allgather mpi_allgather
#define mpi_allgatherv mpi_allgatherv
#endif
#ifdef UpperUndescore
#define mpi_wtime MPI_WTIME_
#define mpi_send MPI_SEND_
#define mpi_irecv MPI_IRECV_
#define mpi_wait MPI_WAIT_
#define mpi_alltoall MPI_ALLTOALL_
#define mpi_alltoallv MPI_ALLTOALLV_
#define mpi_allgather MPI_ALLGATHER_
#define mpi_allgatherv MPI_ALLGATHERV_
#endif
#ifdef UpperDoubleUndescore
#define mpi_wtime MPI_WTIME__
#define mpi_send MPI_SEND__
#define mpi_irecv MPI_IRECV__
#define mpi_wait MPI_WAIT__
#define mpi_alltoall MPI_ALLTOALL__
#define mpi_alltoallv MPI_ALLTOALLV__
#define mpi_allgather MPI_ALLGATHER__
#define mpi_allgatherv MPI_ALLGATHERV__
#endif
#ifdef UpperCase
#define mpi_wtime MPI_WTIME
#define mpi_send MPI_SEND
#define mpi_irecv MPI_IRECV
#define mpi_wait MPI_WAIT
#define mpi_alltoall MPI_ALLTOALL
#define mpi_alltoallv MPI_ALLTOALLV
#define mpi_allgather MPI_ALLGATHER
#define mpi_allgatherv MPI_ALLGATHERV
#endif
#define mpi_integer 1
#define mpi_double 3
#define mpi_double_complex 5