[SCore-users-jp] [SCore-users] GLOBAL ARRAYS

[kameyama ＠ pccluster.org]

In article <200206130947.g5D9ljv18938 ＠ yl-dhcp18.is.s.u-tokyo.ac.jp> kameyama ＠ pccluster.org wrotes:
> In article <200206130722.g5D7MMp02150 ＠ zeralda.streamline.com> Nick Birkett <n
> I modified as following:
> 1. change CC, FC, _CC, _FC to mpicc and mpif77.
...

Here is patch from GLOBAL ARRAYS 3.2 beta.
This is quick hack and I test only test.x with nodes are 1x2 and 2x1.

Note that if you want to compile, please exec to following command:
     export TARGET=LINUX; make CC='/opt/score/bin/mpicc' FC='/opt/score/bin/mpif77' _CC=/opt/score/bin/mpicc _FC=/opt/score/bin/mpif77


                       from Kameyama Toyohisa
---------------------------------------cut here---------------------------------
diff -ur g/GNUmakefile g.success/GNUmakefile
--- g/GNUmakefile	Thu Mar 21 07:46:49 2002
+++ g.success/GNUmakefile	Thu Jun 13 17:45:19 2002
@@ -15,6 +15,7 @@
 MAKESUBDIRS = for dir in $(SUBDIRS); do $(MAKE)  -C $$dir $@ || exit 1 ; done
     SUBDIRS = ma global tcgmsg-mpi LinAlg/lapack+blas server tcgmsg armci/src pario
   USE_ARMCI = yes
+  USE_MPI = yes
 
 ifdef USE_MPI
      MP_VER = MPI
Only in g.success: LINUX-MPI.stamp
Only in g.success/LinAlg/lapack+blas: LINUX.stamp
Only in g.success/armci: lib
Only in g.success/armci/src: LINUX.MPI.stamp
diff -ur g/armci/src/acc.h g.success/armci/src/acc.h
--- g/armci/src/acc.h	Fri Mar  8 02:34:29 2002
+++ g.success/armci/src/acc.h	Thu Jun 13 18:09:58 2002
@@ -20,6 +20,12 @@
 #    define C_ACCUMULATE_2D     c_accumulate_2d_u_
 #    define Z_ACCUMULATE_2D     z_accumulate_2d_u_
 #    define F_ACCUMULATE_2D     f_accumulate_2d_u_
+#elif defined(LINUX)
+#    define I_ACCUMULATE_2D     i_accumulate_2d__
+#    define D_ACCUMULATE_2D     d_accumulate_2d__
+#    define C_ACCUMULATE_2D     c_accumulate_2d__
+#    define Z_ACCUMULATE_2D     z_accumulate_2d__
+#    define F_ACCUMULATE_2D     f_accumulate_2d__
 #elif !defined(CRAY) && !defined(WIN32) && !defined(HITACHI)
 #    define I_ACCUMULATE_2D     i_accumulate_2d_
 #    define D_ACCUMULATE_2D     d_accumulate_2d_
diff -ur g/config/makefile.h g.success/config/makefile.h
--- g/config/makefile.h	Wed Feb 27 03:48:38 2002
+++ g.success/config/makefile.h	Thu Jun 13 18:15:51 2002
@@ -54,7 +54,8 @@
 
 # to enable two underscores in fortran names, please define environment variable
 # F2C_TWO_UNDERSCORES or uncomment the following line
-#F2C_TWO_UNDERSCORES=1
+F2C_TWO_UNDERSCORES=1
+USE_MPI = 1
 #
 #........................ SUN and Fujitsu Sparc/solaris ........................
 #
@@ -170,19 +171,15 @@
 # IBM PC running Linux
 #
 ifeq ($(TARGET),LINUX)
-           CC = gcc
-           FC = g77
+           CC = /opt/score/bin/mpicc
+           FC = /opt/score/bin/mpif77
           CPP = gcc -E -nostdinc -undef -P
        RANLIB = ranlib
          _CPU = $(shell uname -m |\
                  awk ' /sparc/ { print "sparc" }; /i*86/ { print "x86" } ' )
 
-ifneq (,$(findstring mpif,$(_FC)))
-         _FC = $(shell $(FC) -v 2>&1 | awk ' /g77 version/ { print "g77"; exit }; /pgf/ { print "pgf77" ; exit } ' )
-endif
-ifneq (,$(findstring mpicc,$(_CC)))
-         _CC = $(shell $(CC) -v 2>&1 | awk ' /gcc version/ { print "gcc" ; exit  } ' )
-endif
+         _FC = /opt/score/bin/mpif77
+         _CC = /opt/score/bin/mpicc
 #
 #              GNU compilers
 ifeq ($(_CPU),x86)
@@ -199,28 +196,8 @@
 endif
 #
 #           g77
-ifeq ($(_FC),g77)
-   ifeq ($(FOPT),-O)
            FOPT = -O2
       FOPT_REN += -funroll-loops -fomit-frame-pointer $(OPT_ALIGN)
-   endif
-else
-#
-#             PGI fortran compiler on intel
-   ifneq (,$(findstring pgf,$(_FC)))
-       CMAIN = -Dmain=MAIN_
-       FOPT_REN = -Mdalign -Minform,warn -Mnolist -Minfo=loop -Munixlogical
-       GLOB_DEFINES += -DPGLINUX
-   endif
-   ifneq (,$(findstring ifc,$(_FC)))
-       FOPT_REN = -O3 -prefetch 
-       GLOB_DEFINES += -DIFCLINUX
-   endif
-   ifneq (,$(findstring icc,$(_CC)))
-       FOPT_REN = -O3 -prefetch 
-       GLOB_DEFINES += -DIFCLINUX
-   endif
-endif
 
 endif
 #
@@ -688,7 +665,7 @@
 
 ifdef USE_MPI
   ifndef LIBMPI
-      LIBMPI = -lmpi
+      LIBMPI =
   endif
   ifdef MPI_LIB
       LIBS += -L$(MPI_LIB)
---------------------------------------cut here---------------------------------
_______________________________________________
SCore-users mailing list
SCore-users ＠ pccluster.org
http://www.pccluster.org/mailman/listinfo/score-users