2020 Fujitsu (xmp_api)

CCS-QCD/src/Makefile

@@ -16,7 +16,12 @@ FFLAGS += -D_NDIMX=$(PX) -D_NDIMY=$(PY) -D_NDIMZ=$(PZ)
 endif
 export
 #######################################################################
-SOURCE = ccs_qcd_solver_bench.F90  ccs_qcd_solver_bench_class.F90  lattice_class.F90 comlib.F90
+ifeq ($(USE_XMP_API), yes)
+	COMLIB = xmpAPI_comlib
+else
+	COMLIB = comlib
+endif
+SOURCE = ccs_qcd_solver_bench.F90  ccs_qcd_solver_bench_class.F90  lattice_class.F90 $(COMLIB).F90
 CONFIG = CLASS_$(CLASS)/config.h
 FFLAGS += -Ima_prof/src
 LDFLAGS += -Lma_prof/src
@@ -46,14 +51,14 @@ clean :
 	$(MAKE) -C ma_prof/src clean
 
 #######################################################################
-comlib.o : comlib.F90 config.h
-lattice_class.o : lattice_class.F90 comlib.o config.h
-ccs_qcd_solver_bench_class.o : ccs_qcd_solver_bench_class.F90 comlib.o lattice_class.o config.h
+$(COMLIB).o : $(COMLIB).F90 config.h
+lattice_class.o : lattice_class.F90 $(COMLIB).o config.h
+ccs_qcd_solver_bench_class.o : ccs_qcd_solver_bench_class.F90 $(COMLIB).o lattice_class.o config.h
 ccs_qcd_solver_bench_class.o : bicgstab_hmc.h90 clover.h90 clover_f1f2.h90 clvinv.h90
 ccs_qcd_solver_bench_class.o : clvinv_ldl.h90 copy_u.h90 copy_y.h90 expp_u.h90 full2linear_clv.h90 gauss_y.h90
 ccs_qcd_solver_bench_class.o : init_p.h90 init_u_and_y.h90 initset.h90 mult.h90 mult_eo_tzyx.h90
 ccs_qcd_solver_bench_class.o : mult_fclinv.h90 mult_mb_pre.h90 output.h90 xrand.h90
-ccs_qcd_solver_bench.o : ccs_qcd_solver_bench.F90 comlib.o ccs_qcd_solver_bench_class.o lattice_class.o config.h
+ccs_qcd_solver_bench.o : ccs_qcd_solver_bench.F90 $(COMLIB).o ccs_qcd_solver_bench_class.o lattice_class.o config.h
 
 .PHONY: CONFIG_GEN
 CONFIG_GEN:

CCS-QCD/src/ma_prof/src/maprof_yaml.c

@@ -65,7 +65,7 @@ maprof_yaml_node maprof_yaml_str_node(const char *s)
   node_t *n = (node_t *)malloc(sizeof(node_t));
   n->type = SCALAR;
   n->data.scalar.type = STRING;
-  n->data.scalar.value.str = strdup(s);
+  n->data.scalar.value.str = (!s ? NULL : strdup(s));
   return n;
 }
 
@@ -150,7 +150,7 @@ void maprof_yaml_add_map_item(maprof_yaml_node map, const char *name, maprof_yam
 
   map_end = map->data.mapping.end;
   map_new = (map_item_t *)malloc(sizeof(map_item_t));
-  map_new->name = strdup(name);
+  map_new->name = (!name ? NULL : strdup(name));
   map_new->node = node;
   map_new->next = NULL;
   if (map_end == NULL) {

CCS-QCD/src/make.xmpAPI_Fugaku.inc

@@ -0,0 +1,30 @@
+#$Id: make.inc,v 1.1 2009/12/02 10:24:37 ishikawa Exp $
+
+REVISION = -D_REVISION_='"$(shell cat .svnrevision)"'
+
+#
+# specify Fortran90 MPI compiler FC, compiler options FFLAGS and linker options LDFLAGS
+#
+USE_XMP_API = yes
+OMNI_HOME = $(shell xmpcc --show-env | grep OMNI_HOME | sed -e 's/OMNI_HOME=//' -e 's/"//g')
+OMNI_INC = -I$(OMNI_HOME)/include
+OMNI_LIB = $(shell xmpcc --show-env | grep OMNI_LINKER_OPT | sed -e 's/OMNI_LINKER_OPT=//' -e 's/"//g')
+
+FC     = mpifrtpx
+FFLAGS = -cpp -Kfast,openmp -KXFILL -Kprefetch_sequential=soft
+
+CC     = mpifccpx
+
+LDFLAGS = $(FFLAGS)
+LIBS = $(OMNI_LIB)
+
+MPIINC = /opt/FJSVxtclanga/tcsds-1.2.30a/include/mpi/fujitsu
+INCLUDE = -I./ $(OMNI_INC)
+
+#.F90.o :
+
+#%.mod : %.F90
+#	$(FC) $(FFLAGS) $(REVISION) $(INCLUDE) -c $<
+
+#%.o : %.F90
+#	$(FC) $(FFLAGS) $(REVISION) $(INCLUDE) -c $<

CCS-QCD/src/make.xmpAPI_gfortran.inc

@@ -0,0 +1,22 @@
+#$Id: make.inc,v 1.1 2009/12/02 10:24:37 ishikawa Exp $
+
+REVISION = -D_REVISION_='"$(shell cat .svnrevision)"'
+
+#
+# specify Fortran90 MPI compiler FC, compiler options FFLAGS and linker options LDFLAGS
+#
+
+# example: GNU gfortran, OpenMP enabled.
+USE_XMP_API = yes
+OMNI_HOME = $(shell xmpcc --show-env | grep OMNI_HOME | sed -e 's/OMNI_HOME=//' -e 's/"//g')
+OMNI_INC = -I$(OMNI_HOME)/include
+OMNI_LIB = $(shell xmpcc --show-env | grep OMNI_LINKER_OPT | sed -e 's/OMNI_LINKER_OPT=//' -e 's/"//g')
+
+FC      = mpif90
+CC      = mpicc
+FFLAGS  = -cpp -O2 -ffixed-line-length-132 -march=native -g -fopenmp -mcmodel=medium -funderscoring \
+	$(OMNI_INC)
+LDFLAGS = $(FFLAGS)
+LIBS = $(OMNI_LIB)
+
+INCLUDE = -I./ $(OMNI_INC)

CCS-QCD/src/make.xmp_Fugaku.inc

@@ -0,0 +1,27 @@
+#$Id: make.inc,v 1.1 2009/12/02 10:24:37 ishikawa Exp $
+
+REVISION = -D_REVISION_='"$(shell cat .svnrevision)"'
+
+#
+# specify Fortran90 MPI compiler FC, compiler options FFLAGS and linker options LDFLAGS
+#
+
+FC     = xmpf90
+FFLAGS = -cpp -omp -Kfast,openmp -KXFILL -Kprefetch_sequential=soft
+
+CC     = mpifccpx
+
+LDFLAGS = $(FFLAGS)
+
+#LIBS = 
+
+MPIINC = /opt/FJSVxtclanga/tcsds-1.2.30a/include/mpi/fujitsu
+INCLUDE = -I./ -I$(MPIINC)
+
+#.F90.o :
+
+#%.mod : %.F90
+#	$(FC) $(FFLAGS) $(REVISION) $(INCLUDE) -c $<
+
+#%.o : %.F90
+#	$(FC) $(FFLAGS) $(REVISION) $(INCLUDE) -c $<