From ad5a7341d0a49b851426d53fdc51dd73199ff416 Mon Sep 17 00:00:00 2001 From: "Oriol.Tinto.Prims" Date: Thu, 25 Jun 2020 18:03:47 +0200 Subject: [PATCH 01/26] Arch files updated --- cfg/arch/arch-O1_trace.fcm | 44 +++++++++++++++++++++++++++++++++ cfg/arch/arch-O1_vanilla.fcm | 44 +++++++++++++++++++++++++++++++++ cfg/arch/arch-xHost_trace.fcm | 44 +++++++++++++++++++++++++++++++++ cfg/arch/arch-xHost_vanilla.fcm | 44 +++++++++++++++++++++++++++++++++ 4 files changed, 176 insertions(+) create mode 100644 cfg/arch/arch-O1_trace.fcm create mode 100644 cfg/arch/arch-O1_vanilla.fcm create mode 100644 cfg/arch/arch-xHost_trace.fcm create mode 100644 cfg/arch/arch-xHost_vanilla.fcm diff --git a/cfg/arch/arch-O1_trace.fcm b/cfg/arch/arch-O1_trace.fcm new file mode 100644 index 0000000..d018655 --- /dev/null +++ b/cfg/arch/arch-O1_trace.fcm @@ -0,0 +1,44 @@ +# generic ifort compiler options for linux +# NCDF_INC netcdf include file +# NCDF_LIB netcdf library +# FC Fortran compiler command +# FCFLAGS Fortran compiler flags +# FFLAGS Fortran 77 compiler flags +# LD linker +# LDFLAGS linker flags, e.g. -L if you have libraries in a +# FPPFLAGS pre-processing flags +# AR assembler +# ARFLAGS assembler flags +# MK make +# USER_INC additional include files for the compiler, e.g. -I +# USER_LIB additional libraries to pass to the linker, e.g. -l + +%CPP fpp +%NCDF_INC -I/apps/NETCDF/4.4.1.1/INTEL/IMPI/include +%NCDF_LIB -L/apps/NETCDF/4.4.1.1/INTEL/IMPI/lib -lnetcdf -lnetcdff + +%XIOS_DIR /gpfs/projects/bsc32/bsc32870/xios/2.5/mn4-r1650-prod +%XIOS_INC -I%XIOS_DIR/inc +%XIOS_LIB %XIOS_DIR/lib/libxios.a + +%OASIS_HOME /home/bsc32/bsc32870/oasis3-mct/MN3/ +%OASIS_INC -I%OASIS_HOME/build/lib/mct -I%OASIS_HOME/build/lib/psmile.MPI1 +%OASIS_LIB -L%OASIS_HOME/lib -lpsmile.MPI1 -lmct -lmpeu -lscrip + +%RPE_DIR /gpfs/projects/bsc32/bsc32870/rpe/mn4/intel-2017.4 +%RPE_INC -I/%RPE_DIR/modules +%RPE_LIB %RPE_DIR/lib/librpe.a + +%FC mpiifort +%CC icc +%CFLAGS -O1 +%FCFLAGS -r8 -O1 -fp-model strict -extend-source 132 -heap-arrays -g -finstrument-functions +%FFFLAGS %FCFLAGS +%LD mpiifort +%FPPFLAGS -P +%LDFLAGS -lstdc++ +%AR ar +%ARFLAGS -r +%MK gmake +%USER_INC %NCDF_INC %XIOS_INC %OASIS_INC %RPE_INC +%USER_LIB %NCDF_LIB %XIOS_LIB %OASIS_LIB %RPE_LIB diff --git a/cfg/arch/arch-O1_vanilla.fcm b/cfg/arch/arch-O1_vanilla.fcm new file mode 100644 index 0000000..3c190be --- /dev/null +++ b/cfg/arch/arch-O1_vanilla.fcm @@ -0,0 +1,44 @@ +# generic ifort compiler options for linux +# NCDF_INC netcdf include file +# NCDF_LIB netcdf library +# FC Fortran compiler command +# FCFLAGS Fortran compiler flags +# FFLAGS Fortran 77 compiler flags +# LD linker +# LDFLAGS linker flags, e.g. -L if you have libraries in a +# FPPFLAGS pre-processing flags +# AR assembler +# ARFLAGS assembler flags +# MK make +# USER_INC additional include files for the compiler, e.g. -I +# USER_LIB additional libraries to pass to the linker, e.g. -l + +%CPP fpp +%NCDF_INC -I/apps/NETCDF/4.4.1.1/INTEL/IMPI/include +%NCDF_LIB -L/apps/NETCDF/4.4.1.1/INTEL/IMPI/lib -lnetcdf -lnetcdff + +%XIOS_DIR /gpfs/projects/bsc32/bsc32870/xios/2.5/mn4-r1650-prod +%XIOS_INC -I%XIOS_DIR/inc +%XIOS_LIB %XIOS_DIR/lib/libxios.a + +%OASIS_HOME /home/bsc32/bsc32870/oasis3-mct/MN3/ +%OASIS_INC -I%OASIS_HOME/build/lib/mct -I%OASIS_HOME/build/lib/psmile.MPI1 +%OASIS_LIB -L%OASIS_HOME/lib -lpsmile.MPI1 -lmct -lmpeu -lscrip + +%RPE_DIR /gpfs/projects/bsc32/bsc32870/rpe/mn4/intel-2017.4 +%RPE_INC -I/%RPE_DIR/modules +%RPE_LIB %RPE_DIR/lib/librpe.a + +%FC mpiifort +%CC icc +%CFLAGS -O1 +%FCFLAGS -r8 -O1 -fp-model strict -extend-source 132 -heap-arrays +%FFFLAGS %FCFLAGS +%LD mpiifort +%FPPFLAGS -P +%LDFLAGS -lstdc++ +%AR ar +%ARFLAGS -r +%MK gmake +%USER_INC %NCDF_INC %XIOS_INC %OASIS_INC %RPE_INC +%USER_LIB %NCDF_LIB %XIOS_LIB %OASIS_LIB %RPE_LIB diff --git a/cfg/arch/arch-xHost_trace.fcm b/cfg/arch/arch-xHost_trace.fcm new file mode 100644 index 0000000..413f065 --- /dev/null +++ b/cfg/arch/arch-xHost_trace.fcm @@ -0,0 +1,44 @@ +# generic ifort compiler options for linux +# NCDF_INC netcdf include file +# NCDF_LIB netcdf library +# FC Fortran compiler command +# FCFLAGS Fortran compiler flags +# FFLAGS Fortran 77 compiler flags +# LD linker +# LDFLAGS linker flags, e.g. -L if you have libraries in a +# FPPFLAGS pre-processing flags +# AR assembler +# ARFLAGS assembler flags +# MK make +# USER_INC additional include files for the compiler, e.g. -I +# USER_LIB additional libraries to pass to the linker, e.g. -l + +%CPP fpp +%NCDF_INC -I/apps/NETCDF/4.4.1.1/INTEL/IMPI/include +%NCDF_LIB -L/apps/NETCDF/4.4.1.1/INTEL/IMPI/lib -lnetcdf -lnetcdff + +%XIOS_DIR /gpfs/projects/bsc32/bsc32870/xios/2.5/mn4-r1650-prod +%XIOS_INC -I%XIOS_DIR/inc +%XIOS_LIB %XIOS_DIR/lib/libxios.a + +%OASIS_HOME /home/bsc32/bsc32870/oasis3-mct/MN3/ +%OASIS_INC -I%OASIS_HOME/build/lib/mct -I%OASIS_HOME/build/lib/psmile.MPI1 +%OASIS_LIB -L%OASIS_HOME/lib -lpsmile.MPI1 -lmct -lmpeu -lscrip + +%RPE_DIR /gpfs/projects/bsc32/bsc32870/rpe/mn4/intel-2017.4 +%RPE_INC -I/%RPE_DIR/modules +%RPE_LIB %RPE_DIR/lib/librpe.a + +%FC mpiifort +%CC icc +%CFLAGS -O3 +%FCFLAGS -ip -r8 -O3 -fp-model strict -extend-source 132 -heap-arrays -xHost -g -finstrument-functions +%FFFLAGS %FCFLAGS +%LD mpiifort +%FPPFLAGS -P +%LDFLAGS -lstdc++ +%AR ar +%ARFLAGS -r +%MK gmake +%USER_INC %NCDF_INC %XIOS_INC %OASIS_INC %RPE_INC +%USER_LIB %NCDF_LIB %XIOS_LIB %OASIS_LIB %RPE_LIB diff --git a/cfg/arch/arch-xHost_vanilla.fcm b/cfg/arch/arch-xHost_vanilla.fcm new file mode 100644 index 0000000..828861b --- /dev/null +++ b/cfg/arch/arch-xHost_vanilla.fcm @@ -0,0 +1,44 @@ +# generic ifort compiler options for linux +# NCDF_INC netcdf include file +# NCDF_LIB netcdf library +# FC Fortran compiler command +# FCFLAGS Fortran compiler flags +# FFLAGS Fortran 77 compiler flags +# LD linker +# LDFLAGS linker flags, e.g. -L if you have libraries in a +# FPPFLAGS pre-processing flags +# AR assembler +# ARFLAGS assembler flags +# MK make +# USER_INC additional include files for the compiler, e.g. -I +# USER_LIB additional libraries to pass to the linker, e.g. -l + +%CPP fpp +%NCDF_INC -I/apps/NETCDF/4.4.1.1/INTEL/IMPI/include +%NCDF_LIB -L/apps/NETCDF/4.4.1.1/INTEL/IMPI/lib -lnetcdf -lnetcdff + +%XIOS_DIR /gpfs/projects/bsc32/bsc32870/xios/2.5/mn4-r1650-prod +%XIOS_INC -I%XIOS_DIR/inc +%XIOS_LIB %XIOS_DIR/lib/libxios.a + +%OASIS_HOME /home/bsc32/bsc32870/oasis3-mct/MN3/ +%OASIS_INC -I%OASIS_HOME/build/lib/mct -I%OASIS_HOME/build/lib/psmile.MPI1 +%OASIS_LIB -L%OASIS_HOME/lib -lpsmile.MPI1 -lmct -lmpeu -lscrip + +%RPE_DIR /gpfs/projects/bsc32/bsc32870/rpe/mn4/intel-2017.4 +%RPE_INC -I/%RPE_DIR/modules +%RPE_LIB %RPE_DIR/lib/librpe.a + +%FC mpiifort +%CC icc +%CFLAGS -O3 +%FCFLAGS -ip -r8 -O3 -fp-model strict -extend-source 132 -heap-arrays -xHost +%FFFLAGS %FCFLAGS +%LD mpiifort +%FPPFLAGS -P +%LDFLAGS -lstdc++ +%AR ar +%ARFLAGS -r +%MK gmake +%USER_INC %NCDF_INC %XIOS_INC %OASIS_INC %RPE_INC +%USER_LIB %NCDF_LIB %XIOS_LIB %OASIS_LIB %RPE_LIB -- GitLab From e3ca72b7b35d3c8a830dd8f0a3007debdc3c3960 Mon Sep 17 00:00:00 2001 From: "Oriol.Tinto.Prims" Date: Thu, 25 Jun 2020 18:05:03 +0200 Subject: [PATCH 02/26] Few old archfiles removed --- cfg/arch/arch-O0_gprof.fcm | 44 ----------------------------- cfg/arch/arch-mtune_gprof.fcm | 44 ----------------------------- cfg/arch/arch-mtune_trace.fcm | 44 ----------------------------- cfg/arch/arch-mtune_vanilla.fcm | 44 ----------------------------- cfg/arch/arch-nofpmodel_gprof.fcm | 44 ----------------------------- cfg/arch/arch-nofpmodel_trace.fcm | 44 ----------------------------- cfg/arch/arch-nofpmodel_vanilla.fcm | 44 ----------------------------- cfg/arch/arch-novec_gprof.fcm | 44 ----------------------------- cfg/arch/arch-novec_trace.fcm | 44 ----------------------------- cfg/arch/arch-novec_vanilla.fcm | 44 ----------------------------- cfg/arch/arch-prod_gprof.fcm | 44 ----------------------------- cfg/arch/arch-tuned_gprof.fcm | 44 ----------------------------- cfg/arch/arch-tuned_trace.fcm | 44 ----------------------------- cfg/arch/arch-tuned_vanilla.fcm | 44 ----------------------------- 14 files changed, 616 deletions(-) delete mode 100644 cfg/arch/arch-O0_gprof.fcm delete mode 100644 cfg/arch/arch-mtune_gprof.fcm delete mode 100644 cfg/arch/arch-mtune_trace.fcm delete mode 100644 cfg/arch/arch-mtune_vanilla.fcm delete mode 100644 cfg/arch/arch-nofpmodel_gprof.fcm delete mode 100644 cfg/arch/arch-nofpmodel_trace.fcm delete mode 100644 cfg/arch/arch-nofpmodel_vanilla.fcm delete mode 100644 cfg/arch/arch-novec_gprof.fcm delete mode 100644 cfg/arch/arch-novec_trace.fcm delete mode 100644 cfg/arch/arch-novec_vanilla.fcm delete mode 100644 cfg/arch/arch-prod_gprof.fcm delete mode 100644 cfg/arch/arch-tuned_gprof.fcm delete mode 100644 cfg/arch/arch-tuned_trace.fcm delete mode 100644 cfg/arch/arch-tuned_vanilla.fcm diff --git a/cfg/arch/arch-O0_gprof.fcm b/cfg/arch/arch-O0_gprof.fcm deleted file mode 100644 index 1b21fbe..0000000 --- a/cfg/arch/arch-O0_gprof.fcm +++ /dev/null @@ -1,44 +0,0 @@ -# generic ifort compiler options for linux -# NCDF_INC netcdf include file -# NCDF_LIB netcdf library -# FC Fortran compiler command -# FCFLAGS Fortran compiler flags -# FFLAGS Fortran 77 compiler flags -# LD linker -# LDFLAGS linker flags, e.g. -L if you have libraries in a -# FPPFLAGS pre-processing flags -# AR assembler -# ARFLAGS assembler flags -# MK make -# USER_INC additional include files for the compiler, e.g. -I -# USER_LIB additional libraries to pass to the linker, e.g. -l - -%CPP fpp -%NCDF_INC -I/apps/NETCDF/4.4.1.1/INTEL/IMPI/include -%NCDF_LIB -L/apps/NETCDF/4.4.1.1/INTEL/IMPI/lib -lnetcdf -lnetcdff - -%XIOS_DIR /gpfs/projects/bsc32/bsc32870/xios/2.5/mn4-r1650-prod -%XIOS_INC -I%XIOS_DIR/inc -%XIOS_LIB %XIOS_DIR/lib/libxios.a - -%OASIS_HOME /home/bsc32/bsc32870/oasis3-mct/MN3/ -%OASIS_INC -I%OASIS_HOME/build/lib/mct -I%OASIS_HOME/build/lib/psmile.MPI1 -%OASIS_LIB -L%OASIS_HOME/lib -lpsmile.MPI1 -lmct -lmpeu -lscrip - -%RPE_DIR /gpfs/projects/bsc32/bsc32870/rpe/mn4/intel-2017.4 -%RPE_INC -I/%RPE_DIR/modules -%RPE_LIB %RPE_DIR/lib/librpe.a - -%FC mpiifort -%CC icc -%CFLAGS -O3 -%FCFLAGS -r8 -O0 -fp-model strict -extend-source 132 -heap-arrays -pg -g -finstrument-functions -%FFFLAGS %FCFLAGS -%LD mpiifort -%FPPFLAGS -P -%LDFLAGS -lstdc++ -%AR ar -%ARFLAGS -r -%MK gmake -%USER_INC %NCDF_INC %XIOS_INC %OASIS_INC %RPE_INC -%USER_LIB %NCDF_LIB %XIOS_LIB %OASIS_LIB %RPE_LIB diff --git a/cfg/arch/arch-mtune_gprof.fcm b/cfg/arch/arch-mtune_gprof.fcm deleted file mode 100644 index a47eae3..0000000 --- a/cfg/arch/arch-mtune_gprof.fcm +++ /dev/null @@ -1,44 +0,0 @@ -# generic ifort compiler options for linux -# NCDF_INC netcdf include file -# NCDF_LIB netcdf library -# FC Fortran compiler command -# FCFLAGS Fortran compiler flags -# FFLAGS Fortran 77 compiler flags -# LD linker -# LDFLAGS linker flags, e.g. -L if you have libraries in a -# FPPFLAGS pre-processing flags -# AR assembler -# ARFLAGS assembler flags -# MK make -# USER_INC additional include files for the compiler, e.g. -I -# USER_LIB additional libraries to pass to the linker, e.g. -l - -%CPP fpp -%NCDF_INC -I/apps/NETCDF/4.4.1.1/INTEL/IMPI/include -%NCDF_LIB -L/apps/NETCDF/4.4.1.1/INTEL/IMPI/lib -lnetcdf -lnetcdff - -%XIOS_DIR /gpfs/projects/bsc32/bsc32870/xios/2.5/mn4-r1650-prod -%XIOS_INC -I%XIOS_DIR/inc -%XIOS_LIB %XIOS_DIR/lib/libxios.a - -%OASIS_HOME /home/bsc32/bsc32870/oasis3-mct/MN3/ -%OASIS_INC -I%OASIS_HOME/build/lib/mct -I%OASIS_HOME/build/lib/psmile.MPI1 -%OASIS_LIB -L%OASIS_HOME/lib -lpsmile.MPI1 -lmct -lmpeu -lscrip - -%RPE_DIR /gpfs/projects/bsc32/bsc32870/rpe/mn4/intel-2017.4 -%RPE_INC -I/%RPE_DIR/modules -%RPE_LIB %RPE_DIR/lib/librpe.a - -%FC mpiifort -%CC icc -%CFLAGS -O3 -%FCFLAGS -ip -r8 -Ofast -fp-model fast=2 -extend-source 132 -heap-arrays -xHost -mtune=skylake -pg -g -finstrument-functions -%FFFLAGS %FCFLAGS -%LD mpiifort -%FPPFLAGS -P -%LDFLAGS -lstdc++ -pg -%AR ar -%ARFLAGS -r -%MK gmake -%USER_INC %NCDF_INC %XIOS_INC %OASIS_INC %RPE_INC -%USER_LIB %NCDF_LIB %XIOS_LIB %OASIS_LIB %RPE_LIB diff --git a/cfg/arch/arch-mtune_trace.fcm b/cfg/arch/arch-mtune_trace.fcm deleted file mode 100644 index e46d16d..0000000 --- a/cfg/arch/arch-mtune_trace.fcm +++ /dev/null @@ -1,44 +0,0 @@ -# generic ifort compiler options for linux -# NCDF_INC netcdf include file -# NCDF_LIB netcdf library -# FC Fortran compiler command -# FCFLAGS Fortran compiler flags -# FFLAGS Fortran 77 compiler flags -# LD linker -# LDFLAGS linker flags, e.g. -L if you have libraries in a -# FPPFLAGS pre-processing flags -# AR assembler -# ARFLAGS assembler flags -# MK make -# USER_INC additional include files for the compiler, e.g. -I -# USER_LIB additional libraries to pass to the linker, e.g. -l - -%CPP fpp -%NCDF_INC -I/apps/NETCDF/4.4.1.1/INTEL/IMPI/include -%NCDF_LIB -L/apps/NETCDF/4.4.1.1/INTEL/IMPI/lib -lnetcdf -lnetcdff - -%XIOS_DIR /gpfs/projects/bsc32/bsc32870/xios/2.5/mn4-r1650-prod -%XIOS_INC -I%XIOS_DIR/inc -%XIOS_LIB %XIOS_DIR/lib/libxios.a - -%OASIS_HOME /home/bsc32/bsc32870/oasis3-mct/MN3/ -%OASIS_INC -I%OASIS_HOME/build/lib/mct -I%OASIS_HOME/build/lib/psmile.MPI1 -%OASIS_LIB -L%OASIS_HOME/lib -lpsmile.MPI1 -lmct -lmpeu -lscrip - -%RPE_DIR /gpfs/projects/bsc32/bsc32870/rpe/mn4/intel-2017.4 -%RPE_INC -I/%RPE_DIR/modules -%RPE_LIB %RPE_DIR/lib/librpe.a - -%FC mpiifort -%CC icc -%CFLAGS -O3 -%FCFLAGS -ip -r8 -Ofast -fp-model fast=2 -extend-source 132 -heap-arrays -xHost -mtune=skylake -g -finstrument-functions -%FFFLAGS %FCFLAGS -%LD mpiifort -%FPPFLAGS -P -%LDFLAGS -lstdc++ -%AR ar -%ARFLAGS -r -%MK gmake -%USER_INC %NCDF_INC %XIOS_INC %OASIS_INC %RPE_INC -%USER_LIB %NCDF_LIB %XIOS_LIB %OASIS_LIB %RPE_LIB diff --git a/cfg/arch/arch-mtune_vanilla.fcm b/cfg/arch/arch-mtune_vanilla.fcm deleted file mode 100644 index af5bfa1..0000000 --- a/cfg/arch/arch-mtune_vanilla.fcm +++ /dev/null @@ -1,44 +0,0 @@ -# generic ifort compiler options for linux -# NCDF_INC netcdf include file -# NCDF_LIB netcdf library -# FC Fortran compiler command -# FCFLAGS Fortran compiler flags -# FFLAGS Fortran 77 compiler flags -# LD linker -# LDFLAGS linker flags, e.g. -L if you have libraries in a -# FPPFLAGS pre-processing flags -# AR assembler -# ARFLAGS assembler flags -# MK make -# USER_INC additional include files for the compiler, e.g. -I -# USER_LIB additional libraries to pass to the linker, e.g. -l - -%CPP fpp -%NCDF_INC -I/apps/NETCDF/4.4.1.1/INTEL/IMPI/include -%NCDF_LIB -L/apps/NETCDF/4.4.1.1/INTEL/IMPI/lib -lnetcdf -lnetcdff - -%XIOS_DIR /gpfs/projects/bsc32/bsc32870/xios/2.5/mn4-r1650-prod -%XIOS_INC -I%XIOS_DIR/inc -%XIOS_LIB %XIOS_DIR/lib/libxios.a - -%OASIS_HOME /home/bsc32/bsc32870/oasis3-mct/MN3/ -%OASIS_INC -I%OASIS_HOME/build/lib/mct -I%OASIS_HOME/build/lib/psmile.MPI1 -%OASIS_LIB -L%OASIS_HOME/lib -lpsmile.MPI1 -lmct -lmpeu -lscrip - -%RPE_DIR /gpfs/projects/bsc32/bsc32870/rpe/mn4/intel-2017.4 -%RPE_INC -I/%RPE_DIR/modules -%RPE_LIB %RPE_DIR/lib/librpe.a - -%FC mpiifort -%CC icc -%CFLAGS -O3 -%FCFLAGS -ip -r8 -Ofast -fp-model fast=2 -extend-source 132 -heap-arrays -xHost -mtune=skylake -%FFFLAGS %FCFLAGS -%LD mpiifort -%FPPFLAGS -P -%LDFLAGS -lstdc++ -%AR ar -%ARFLAGS -r -%MK gmake -%USER_INC %NCDF_INC %XIOS_INC %OASIS_INC %RPE_INC -%USER_LIB %NCDF_LIB %XIOS_LIB %OASIS_LIB %RPE_LIB diff --git a/cfg/arch/arch-nofpmodel_gprof.fcm b/cfg/arch/arch-nofpmodel_gprof.fcm deleted file mode 100644 index 15670b4..0000000 --- a/cfg/arch/arch-nofpmodel_gprof.fcm +++ /dev/null @@ -1,44 +0,0 @@ -# generic ifort compiler options for linux -# NCDF_INC netcdf include file -# NCDF_LIB netcdf library -# FC Fortran compiler command -# FCFLAGS Fortran compiler flags -# FFLAGS Fortran 77 compiler flags -# LD linker -# LDFLAGS linker flags, e.g. -L if you have libraries in a -# FPPFLAGS pre-processing flags -# AR assembler -# ARFLAGS assembler flags -# MK make -# USER_INC additional include files for the compiler, e.g. -I -# USER_LIB additional libraries to pass to the linker, e.g. -l - -%CPP fpp -%NCDF_INC -I/apps/NETCDF/4.4.1.1/INTEL/IMPI/include -%NCDF_LIB -L/apps/NETCDF/4.4.1.1/INTEL/IMPI/lib -lnetcdf -lnetcdff - -%XIOS_DIR /gpfs/projects/bsc32/bsc32870/xios/2.5/mn4-r1650-prod -%XIOS_INC -I%XIOS_DIR/inc -%XIOS_LIB %XIOS_DIR/lib/libxios.a - -%OASIS_HOME /home/bsc32/bsc32870/oasis3-mct/MN3/ -%OASIS_INC -I%OASIS_HOME/build/lib/mct -I%OASIS_HOME/build/lib/psmile.MPI1 -%OASIS_LIB -L%OASIS_HOME/lib -lpsmile.MPI1 -lmct -lmpeu -lscrip - -%RPE_DIR /gpfs/projects/bsc32/bsc32870/rpe/mn4/intel-2017.4 -%RPE_INC -I/%RPE_DIR/modules -%RPE_LIB %RPE_DIR/lib/librpe.a - -%FC mpiifort -%CC icc -%CFLAGS -O3 -%FCFLAGS -ip -r8 -O3 -extend-source 132 -heap-arrays -g -pg -finstrument-functions -%FFFLAGS %FCFLAGS -%LD mpiifort -%FPPFLAGS -P -%LDFLAGS -lstdc++ -pg -%AR ar -%ARFLAGS -r -%MK gmake -%USER_INC %NCDF_INC %XIOS_INC %OASIS_INC %RPE_INC -%USER_LIB %NCDF_LIB %XIOS_LIB %OASIS_LIB %RPE_LIB diff --git a/cfg/arch/arch-nofpmodel_trace.fcm b/cfg/arch/arch-nofpmodel_trace.fcm deleted file mode 100644 index f465053..0000000 --- a/cfg/arch/arch-nofpmodel_trace.fcm +++ /dev/null @@ -1,44 +0,0 @@ -# generic ifort compiler options for linux -# NCDF_INC netcdf include file -# NCDF_LIB netcdf library -# FC Fortran compiler command -# FCFLAGS Fortran compiler flags -# FFLAGS Fortran 77 compiler flags -# LD linker -# LDFLAGS linker flags, e.g. -L if you have libraries in a -# FPPFLAGS pre-processing flags -# AR assembler -# ARFLAGS assembler flags -# MK make -# USER_INC additional include files for the compiler, e.g. -I -# USER_LIB additional libraries to pass to the linker, e.g. -l - -%CPP fpp -%NCDF_INC -I/apps/NETCDF/4.4.1.1/INTEL/IMPI/include -%NCDF_LIB -L/apps/NETCDF/4.4.1.1/INTEL/IMPI/lib -lnetcdf -lnetcdff - -%XIOS_DIR /gpfs/projects/bsc32/bsc32870/xios/2.5/mn4-r1650-prod -%XIOS_INC -I%XIOS_DIR/inc -%XIOS_LIB %XIOS_DIR/lib/libxios.a - -%OASIS_HOME /home/bsc32/bsc32870/oasis3-mct/MN3/ -%OASIS_INC -I%OASIS_HOME/build/lib/mct -I%OASIS_HOME/build/lib/psmile.MPI1 -%OASIS_LIB -L%OASIS_HOME/lib -lpsmile.MPI1 -lmct -lmpeu -lscrip - -%RPE_DIR /gpfs/projects/bsc32/bsc32870/rpe/mn4/intel-2017.4 -%RPE_INC -I/%RPE_DIR/modules -%RPE_LIB %RPE_DIR/lib/librpe.a - -%FC mpiifort -%CC icc -%CFLAGS -O3 -%FCFLAGS -ip -r8 -O3 -extend-source 132 -heap-arrays -g -finstrument-functions -%FFFLAGS %FCFLAGS -%LD mpiifort -%FPPFLAGS -P -%LDFLAGS -lstdc++ -%AR ar -%ARFLAGS -r -%MK gmake -%USER_INC %NCDF_INC %XIOS_INC %OASIS_INC %RPE_INC -%USER_LIB %NCDF_LIB %XIOS_LIB %OASIS_LIB %RPE_LIB diff --git a/cfg/arch/arch-nofpmodel_vanilla.fcm b/cfg/arch/arch-nofpmodel_vanilla.fcm deleted file mode 100644 index 1de6568..0000000 --- a/cfg/arch/arch-nofpmodel_vanilla.fcm +++ /dev/null @@ -1,44 +0,0 @@ -# generic ifort compiler options for linux -# NCDF_INC netcdf include file -# NCDF_LIB netcdf library -# FC Fortran compiler command -# FCFLAGS Fortran compiler flags -# FFLAGS Fortran 77 compiler flags -# LD linker -# LDFLAGS linker flags, e.g. -L if you have libraries in a -# FPPFLAGS pre-processing flags -# AR assembler -# ARFLAGS assembler flags -# MK make -# USER_INC additional include files for the compiler, e.g. -I -# USER_LIB additional libraries to pass to the linker, e.g. -l - -%CPP fpp -%NCDF_INC -I/apps/NETCDF/4.4.1.1/INTEL/IMPI/include -%NCDF_LIB -L/apps/NETCDF/4.4.1.1/INTEL/IMPI/lib -lnetcdf -lnetcdff - -%XIOS_DIR /gpfs/projects/bsc32/bsc32870/xios/2.5/mn4-r1650-prod -%XIOS_INC -I%XIOS_DIR/inc -%XIOS_LIB %XIOS_DIR/lib/libxios.a - -%OASIS_HOME /home/bsc32/bsc32870/oasis3-mct/MN3/ -%OASIS_INC -I%OASIS_HOME/build/lib/mct -I%OASIS_HOME/build/lib/psmile.MPI1 -%OASIS_LIB -L%OASIS_HOME/lib -lpsmile.MPI1 -lmct -lmpeu -lscrip - -%RPE_DIR /gpfs/projects/bsc32/bsc32870/rpe/mn4/intel-2017.4 -%RPE_INC -I/%RPE_DIR/modules -%RPE_LIB %RPE_DIR/lib/librpe.a - -%FC mpiifort -%CC icc -%CFLAGS -O3 -%FCFLAGS -ip -r8 -Ofast -fp-model fast=2 -extend-source 132 -heap-arrays -%FFFLAGS %FCFLAGS -%LD mpiifort -%FPPFLAGS -P -%LDFLAGS -lstdc++ -%AR ar -%ARFLAGS -r -%MK gmake -%USER_INC %NCDF_INC %XIOS_INC %OASIS_INC %RPE_INC -%USER_LIB %NCDF_LIB %XIOS_LIB %OASIS_LIB %RPE_LIB diff --git a/cfg/arch/arch-novec_gprof.fcm b/cfg/arch/arch-novec_gprof.fcm deleted file mode 100644 index 6add89c..0000000 --- a/cfg/arch/arch-novec_gprof.fcm +++ /dev/null @@ -1,44 +0,0 @@ -# generic ifort compiler options for linux -# NCDF_INC netcdf include file -# NCDF_LIB netcdf library -# FC Fortran compiler command -# FCFLAGS Fortran compiler flags -# FFLAGS Fortran 77 compiler flags -# LD linker -# LDFLAGS linker flags, e.g. -L if you have libraries in a -# FPPFLAGS pre-processing flags -# AR assembler -# ARFLAGS assembler flags -# MK make -# USER_INC additional include files for the compiler, e.g. -I -# USER_LIB additional libraries to pass to the linker, e.g. -l - -%CPP fpp -%NCDF_INC -I/apps/NETCDF/4.4.1.1/INTEL/IMPI/include -%NCDF_LIB -L/apps/NETCDF/4.4.1.1/INTEL/IMPI/lib -lnetcdf -lnetcdff - -%XIOS_DIR /gpfs/projects/bsc32/bsc32870/xios/2.5/mn4-r1650-prod -%XIOS_INC -I%XIOS_DIR/inc -%XIOS_LIB %XIOS_DIR/lib/libxios.a - -%OASIS_HOME /home/bsc32/bsc32870/oasis3-mct/MN3/ -%OASIS_INC -I%OASIS_HOME/build/lib/mct -I%OASIS_HOME/build/lib/psmile.MPI1 -%OASIS_LIB -L%OASIS_HOME/lib -lpsmile.MPI1 -lmct -lmpeu -lscrip - -%RPE_DIR /gpfs/projects/bsc32/bsc32870/rpe/mn4/intel-2017.4 -%RPE_INC -I/%RPE_DIR/modules -%RPE_LIB %RPE_DIR/lib/librpe.a - -%FC mpiifort -%CC icc -%CFLAGS -O3 -%FCFLAGS -ip -r8 -O1 -fp-model strict -extend-source 132 -heap-arrays -g -pg -finstrument-functions -%FFFLAGS %FCFLAGS -%LD mpiifort -%FPPFLAGS -P -%LDFLAGS -lstdc++ -pg -%AR ar -%ARFLAGS -r -%MK gmake -%USER_INC %NCDF_INC %XIOS_INC %OASIS_INC %RPE_INC -%USER_LIB %NCDF_LIB %XIOS_LIB %OASIS_LIB %RPE_LIB diff --git a/cfg/arch/arch-novec_trace.fcm b/cfg/arch/arch-novec_trace.fcm deleted file mode 100644 index 2f45880..0000000 --- a/cfg/arch/arch-novec_trace.fcm +++ /dev/null @@ -1,44 +0,0 @@ -# generic ifort compiler options for linux -# NCDF_INC netcdf include file -# NCDF_LIB netcdf library -# FC Fortran compiler command -# FCFLAGS Fortran compiler flags -# FFLAGS Fortran 77 compiler flags -# LD linker -# LDFLAGS linker flags, e.g. -L if you have libraries in a -# FPPFLAGS pre-processing flags -# AR assembler -# ARFLAGS assembler flags -# MK make -# USER_INC additional include files for the compiler, e.g. -I -# USER_LIB additional libraries to pass to the linker, e.g. -l - -%CPP fpp -%NCDF_INC -I/apps/NETCDF/4.4.1.1/INTEL/IMPI/include -%NCDF_LIB -L/apps/NETCDF/4.4.1.1/INTEL/IMPI/lib -lnetcdf -lnetcdff - -%XIOS_DIR /gpfs/projects/bsc32/bsc32870/xios/2.5/mn4-r1650-prod -%XIOS_INC -I%XIOS_DIR/inc -%XIOS_LIB %XIOS_DIR/lib/libxios.a - -%OASIS_HOME /home/bsc32/bsc32870/oasis3-mct/MN3/ -%OASIS_INC -I%OASIS_HOME/build/lib/mct -I%OASIS_HOME/build/lib/psmile.MPI1 -%OASIS_LIB -L%OASIS_HOME/lib -lpsmile.MPI1 -lmct -lmpeu -lscrip - -%RPE_DIR /gpfs/projects/bsc32/bsc32870/rpe/mn4/intel-2017.4 -%RPE_INC -I/%RPE_DIR/modules -%RPE_LIB %RPE_DIR/lib/librpe.a - -%FC mpiifort -%CC icc -%CFLAGS -O3 -%FCFLAGS -ip -r8 -O1 -fp-model strict -extend-source 132 -heap-arrays -g -finstrument-functions -%FFFLAGS %FCFLAGS -%LD mpiifort -%FPPFLAGS -P -%LDFLAGS -lstdc++ -%AR ar -%ARFLAGS -r -%MK gmake -%USER_INC %NCDF_INC %XIOS_INC %OASIS_INC %RPE_INC -%USER_LIB %NCDF_LIB %XIOS_LIB %OASIS_LIB %RPE_LIB diff --git a/cfg/arch/arch-novec_vanilla.fcm b/cfg/arch/arch-novec_vanilla.fcm deleted file mode 100644 index 6e8497d..0000000 --- a/cfg/arch/arch-novec_vanilla.fcm +++ /dev/null @@ -1,44 +0,0 @@ -# generic ifort compiler options for linux -# NCDF_INC netcdf include file -# NCDF_LIB netcdf library -# FC Fortran compiler command -# FCFLAGS Fortran compiler flags -# FFLAGS Fortran 77 compiler flags -# LD linker -# LDFLAGS linker flags, e.g. -L if you have libraries in a -# FPPFLAGS pre-processing flags -# AR assembler -# ARFLAGS assembler flags -# MK make -# USER_INC additional include files for the compiler, e.g. -I -# USER_LIB additional libraries to pass to the linker, e.g. -l - -%CPP fpp -%NCDF_INC -I/apps/NETCDF/4.4.1.1/INTEL/IMPI/include -%NCDF_LIB -L/apps/NETCDF/4.4.1.1/INTEL/IMPI/lib -lnetcdf -lnetcdff - -%XIOS_DIR /gpfs/projects/bsc32/bsc32870/xios/2.5/mn4-r1650-prod -%XIOS_INC -I%XIOS_DIR/inc -%XIOS_LIB %XIOS_DIR/lib/libxios.a - -%OASIS_HOME /home/bsc32/bsc32870/oasis3-mct/MN3/ -%OASIS_INC -I%OASIS_HOME/build/lib/mct -I%OASIS_HOME/build/lib/psmile.MPI1 -%OASIS_LIB -L%OASIS_HOME/lib -lpsmile.MPI1 -lmct -lmpeu -lscrip - -%RPE_DIR /gpfs/projects/bsc32/bsc32870/rpe/mn4/intel-2017.4 -%RPE_INC -I/%RPE_DIR/modules -%RPE_LIB %RPE_DIR/lib/librpe.a - -%FC mpiifort -%CC icc -%CFLAGS -O3 -%FCFLAGS -ip -r8 -O1 -fp-model strict -extend-source 132 -heap-arrays -%FFFLAGS %FCFLAGS -%LD mpiifort -%FPPFLAGS -P -%LDFLAGS -lstdc++ -%AR ar -%ARFLAGS -r -%MK gmake -%USER_INC %NCDF_INC %XIOS_INC %OASIS_INC %RPE_INC -%USER_LIB %NCDF_LIB %XIOS_LIB %OASIS_LIB %RPE_LIB diff --git a/cfg/arch/arch-prod_gprof.fcm b/cfg/arch/arch-prod_gprof.fcm deleted file mode 100644 index d12e654..0000000 --- a/cfg/arch/arch-prod_gprof.fcm +++ /dev/null @@ -1,44 +0,0 @@ -# generic ifort compiler options for linux -# NCDF_INC netcdf include file -# NCDF_LIB netcdf library -# FC Fortran compiler command -# FCFLAGS Fortran compiler flags -# FFLAGS Fortran 77 compiler flags -# LD linker -# LDFLAGS linker flags, e.g. -L if you have libraries in a -# FPPFLAGS pre-processing flags -# AR assembler -# ARFLAGS assembler flags -# MK make -# USER_INC additional include files for the compiler, e.g. -I -# USER_LIB additional libraries to pass to the linker, e.g. -l - -%CPP fpp -%NCDF_INC -I/apps/NETCDF/4.4.1.1/INTEL/IMPI/include -%NCDF_LIB -L/apps/NETCDF/4.4.1.1/INTEL/IMPI/lib -lnetcdf -lnetcdff - -%XIOS_DIR /gpfs/projects/bsc32/bsc32870/xios/2.5/mn4-r1650-prod -%XIOS_INC -I%XIOS_DIR/inc -%XIOS_LIB %XIOS_DIR/lib/libxios.a - -%OASIS_HOME /home/bsc32/bsc32870/oasis3-mct/MN3/ -%OASIS_INC -I%OASIS_HOME/build/lib/mct -I%OASIS_HOME/build/lib/psmile.MPI1 -%OASIS_LIB -L%OASIS_HOME/lib -lpsmile.MPI1 -lmct -lmpeu -lscrip - -%RPE_DIR /gpfs/projects/bsc32/bsc32870/rpe/mn4/intel-2017.4 -%RPE_INC -I/%RPE_DIR/modules -%RPE_LIB %RPE_DIR/lib/librpe.a - -%FC mpiifort -%CC icc -%CFLAGS -O3 -%FCFLAGS -ip -r8 -O3 -fp-model strict -extend-source 132 -heap-arrays -g -pg -finstrument-functions -%FFFLAGS %FCFLAGS -%LD mpiifort -%FPPFLAGS -P -%LDFLAGS -lstdc++ -pg -%AR ar -%ARFLAGS -r -%MK gmake -%USER_INC %NCDF_INC %XIOS_INC %OASIS_INC %RPE_INC -%USER_LIB %NCDF_LIB %XIOS_LIB %OASIS_LIB %RPE_LIB diff --git a/cfg/arch/arch-tuned_gprof.fcm b/cfg/arch/arch-tuned_gprof.fcm deleted file mode 100644 index 1215be5..0000000 --- a/cfg/arch/arch-tuned_gprof.fcm +++ /dev/null @@ -1,44 +0,0 @@ -# generic ifort compiler options for linux -# NCDF_INC netcdf include file -# NCDF_LIB netcdf library -# FC Fortran compiler command -# FCFLAGS Fortran compiler flags -# FFLAGS Fortran 77 compiler flags -# LD linker -# LDFLAGS linker flags, e.g. -L if you have libraries in a -# FPPFLAGS pre-processing flags -# AR assembler -# ARFLAGS assembler flags -# MK make -# USER_INC additional include files for the compiler, e.g. -I -# USER_LIB additional libraries to pass to the linker, e.g. -l - -%CPP fpp -%NCDF_INC -I/apps/NETCDF/4.4.1.1/INTEL/IMPI/include -%NCDF_LIB -L/apps/NETCDF/4.4.1.1/INTEL/IMPI/lib -lnetcdf -lnetcdff - -%XIOS_DIR /gpfs/projects/bsc32/bsc32870/xios/2.5/mn4-r1650-prod -%XIOS_INC -I%XIOS_DIR/inc -%XIOS_LIB %XIOS_DIR/lib/libxios.a - -%OASIS_HOME /home/bsc32/bsc32870/oasis3-mct/MN3/ -%OASIS_INC -I%OASIS_HOME/build/lib/mct -I%OASIS_HOME/build/lib/psmile.MPI1 -%OASIS_LIB -L%OASIS_HOME/lib -lpsmile.MPI1 -lmct -lmpeu -lscrip - -%RPE_DIR /gpfs/projects/bsc32/bsc32870/rpe/mn4/intel-2017.4 -%RPE_INC -I/%RPE_DIR/modules -%RPE_LIB %RPE_DIR/lib/librpe.a - -%FC mpiifort -%CC icc -%CFLAGS -O3 -%FCFLAGS -ip -r8 -Ofast -fp-model fast=2 -extend-source 132 -heap-arrays -xHost -pg -g -finstrument-functions -%FFFLAGS %FCFLAGS -%LD mpiifort -%FPPFLAGS -P -%LDFLAGS -lstdc++ -%AR ar -%ARFLAGS -r -%MK gmake -%USER_INC %NCDF_INC %XIOS_INC %OASIS_INC %RPE_INC -%USER_LIB %NCDF_LIB %XIOS_LIB %OASIS_LIB %RPE_LIB diff --git a/cfg/arch/arch-tuned_trace.fcm b/cfg/arch/arch-tuned_trace.fcm deleted file mode 100644 index 1f851cc..0000000 --- a/cfg/arch/arch-tuned_trace.fcm +++ /dev/null @@ -1,44 +0,0 @@ -# generic ifort compiler options for linux -# NCDF_INC netcdf include file -# NCDF_LIB netcdf library -# FC Fortran compiler command -# FCFLAGS Fortran compiler flags -# FFLAGS Fortran 77 compiler flags -# LD linker -# LDFLAGS linker flags, e.g. -L if you have libraries in a -# FPPFLAGS pre-processing flags -# AR assembler -# ARFLAGS assembler flags -# MK make -# USER_INC additional include files for the compiler, e.g. -I -# USER_LIB additional libraries to pass to the linker, e.g. -l - -%CPP fpp -%NCDF_INC -I/apps/NETCDF/4.4.1.1/INTEL/IMPI/include -%NCDF_LIB -L/apps/NETCDF/4.4.1.1/INTEL/IMPI/lib -lnetcdf -lnetcdff - -%XIOS_DIR /gpfs/projects/bsc32/bsc32870/xios/2.5/mn4-r1650-prod -%XIOS_INC -I%XIOS_DIR/inc -%XIOS_LIB %XIOS_DIR/lib/libxios.a - -%OASIS_HOME /home/bsc32/bsc32870/oasis3-mct/MN3/ -%OASIS_INC -I%OASIS_HOME/build/lib/mct -I%OASIS_HOME/build/lib/psmile.MPI1 -%OASIS_LIB -L%OASIS_HOME/lib -lpsmile.MPI1 -lmct -lmpeu -lscrip - -%RPE_DIR /gpfs/projects/bsc32/bsc32870/rpe/mn4/intel-2017.4 -%RPE_INC -I/%RPE_DIR/modules -%RPE_LIB %RPE_DIR/lib/librpe.a - -%FC mpiifort -%CC icc -%CFLAGS -O3 -%FCFLAGS -ip -r8 -Ofast -fp-model fast=2 -extend-source 132 -heap-arrays -xHost -g -finstrument-functions -%FFFLAGS %FCFLAGS -%LD mpiifort -%FPPFLAGS -P -%LDFLAGS -lstdc++ -%AR ar -%ARFLAGS -r -%MK gmake -%USER_INC %NCDF_INC %XIOS_INC %OASIS_INC %RPE_INC -%USER_LIB %NCDF_LIB %XIOS_LIB %OASIS_LIB %RPE_LIB diff --git a/cfg/arch/arch-tuned_vanilla.fcm b/cfg/arch/arch-tuned_vanilla.fcm deleted file mode 100644 index 5d662c6..0000000 --- a/cfg/arch/arch-tuned_vanilla.fcm +++ /dev/null @@ -1,44 +0,0 @@ -# generic ifort compiler options for linux -# NCDF_INC netcdf include file -# NCDF_LIB netcdf library -# FC Fortran compiler command -# FCFLAGS Fortran compiler flags -# FFLAGS Fortran 77 compiler flags -# LD linker -# LDFLAGS linker flags, e.g. -L if you have libraries in a -# FPPFLAGS pre-processing flags -# AR assembler -# ARFLAGS assembler flags -# MK make -# USER_INC additional include files for the compiler, e.g. -I -# USER_LIB additional libraries to pass to the linker, e.g. -l - -%CPP fpp -%NCDF_INC -I/apps/NETCDF/4.4.1.1/INTEL/IMPI/include -%NCDF_LIB -L/apps/NETCDF/4.4.1.1/INTEL/IMPI/lib -lnetcdf -lnetcdff - -%XIOS_DIR /gpfs/projects/bsc32/bsc32870/xios/2.5/mn4-r1650-prod -%XIOS_INC -I%XIOS_DIR/inc -%XIOS_LIB %XIOS_DIR/lib/libxios.a - -%OASIS_HOME /home/bsc32/bsc32870/oasis3-mct/MN3/ -%OASIS_INC -I%OASIS_HOME/build/lib/mct -I%OASIS_HOME/build/lib/psmile.MPI1 -%OASIS_LIB -L%OASIS_HOME/lib -lpsmile.MPI1 -lmct -lmpeu -lscrip - -%RPE_DIR /gpfs/projects/bsc32/bsc32870/rpe/mn4/intel-2017.4 -%RPE_INC -I/%RPE_DIR/modules -%RPE_LIB %RPE_DIR/lib/librpe.a - -%FC mpiifort -%CC icc -%CFLAGS -O3 -%FCFLAGS -ip -r8 -Ofast -fp-model fast=2 -extend-source 132 -heap-arrays -xHost -%FFFLAGS %FCFLAGS -%LD mpiifort -%FPPFLAGS -P -%LDFLAGS -lstdc++ -%AR ar -%ARFLAGS -r -%MK gmake -%USER_INC %NCDF_INC %XIOS_INC %OASIS_INC %RPE_INC -%USER_LIB %NCDF_LIB %XIOS_LIB %OASIS_LIB %RPE_LIB -- GitLab From e1d174a74c1f862c85d404c52ac8aedae7aad450 Mon Sep 17 00:00:00 2001 From: "Oriol.Tinto.Prims" Date: Thu, 25 Jun 2020 18:05:47 +0200 Subject: [PATCH 03/26] Experiment launcher updated to take folder as input --- experiment_launcher.cmd | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/experiment_launcher.cmd b/experiment_launcher.cmd index 62bbbbd..9e557f5 100755 --- a/experiment_launcher.cmd +++ b/experiment_launcher.cmd @@ -1,7 +1,17 @@ # Script to control a multiexperiment experiments_folder=experiments -experiment_configurations_folder=experiments_to_run +experiment_configurations_folder=$1 + +# Some sanity checks +if [ -z "$1" ] ; then + echo "Argument required" + exit 1 +fi +if [ ! -d "$1" ] ; then + echo "Not a folder" + exit 1 +fi # Create experiments folder if it does not exist [ ! -d experiments ] && mkdir ${experiments_folder} @@ -11,6 +21,9 @@ experiment_configurations=$( ls ${experiment_configurations_folder} ) # For each experiment clone the repo there for experiment in ${experiment_configurations} ; do + if [ -d ${${experiments_folder}/${experiment} ] ; then + continue + fi # Clone repository to the new experiment folder git clone . ${experiments_folder}/${experiment} # Copy the configuration file into the new folder -- GitLab From 2cf344f110b6108a2a727a3f492d225b6a1f5a3c Mon Sep 17 00:00:00 2001 From: "Oriol.Tinto.Prims" Date: Thu, 25 Jun 2020 18:03:47 +0200 Subject: [PATCH 04/26] Arch files updated --- cfg/arch/arch-O1_trace.fcm | 44 +++++++++++++++++++++++++++++++++ cfg/arch/arch-O1_vanilla.fcm | 44 +++++++++++++++++++++++++++++++++ cfg/arch/arch-xHost_trace.fcm | 44 +++++++++++++++++++++++++++++++++ cfg/arch/arch-xHost_vanilla.fcm | 44 +++++++++++++++++++++++++++++++++ 4 files changed, 176 insertions(+) create mode 100644 cfg/arch/arch-O1_trace.fcm create mode 100644 cfg/arch/arch-O1_vanilla.fcm create mode 100644 cfg/arch/arch-xHost_trace.fcm create mode 100644 cfg/arch/arch-xHost_vanilla.fcm diff --git a/cfg/arch/arch-O1_trace.fcm b/cfg/arch/arch-O1_trace.fcm new file mode 100644 index 0000000..d018655 --- /dev/null +++ b/cfg/arch/arch-O1_trace.fcm @@ -0,0 +1,44 @@ +# generic ifort compiler options for linux +# NCDF_INC netcdf include file +# NCDF_LIB netcdf library +# FC Fortran compiler command +# FCFLAGS Fortran compiler flags +# FFLAGS Fortran 77 compiler flags +# LD linker +# LDFLAGS linker flags, e.g. -L if you have libraries in a +# FPPFLAGS pre-processing flags +# AR assembler +# ARFLAGS assembler flags +# MK make +# USER_INC additional include files for the compiler, e.g. -I +# USER_LIB additional libraries to pass to the linker, e.g. -l + +%CPP fpp +%NCDF_INC -I/apps/NETCDF/4.4.1.1/INTEL/IMPI/include +%NCDF_LIB -L/apps/NETCDF/4.4.1.1/INTEL/IMPI/lib -lnetcdf -lnetcdff + +%XIOS_DIR /gpfs/projects/bsc32/bsc32870/xios/2.5/mn4-r1650-prod +%XIOS_INC -I%XIOS_DIR/inc +%XIOS_LIB %XIOS_DIR/lib/libxios.a + +%OASIS_HOME /home/bsc32/bsc32870/oasis3-mct/MN3/ +%OASIS_INC -I%OASIS_HOME/build/lib/mct -I%OASIS_HOME/build/lib/psmile.MPI1 +%OASIS_LIB -L%OASIS_HOME/lib -lpsmile.MPI1 -lmct -lmpeu -lscrip + +%RPE_DIR /gpfs/projects/bsc32/bsc32870/rpe/mn4/intel-2017.4 +%RPE_INC -I/%RPE_DIR/modules +%RPE_LIB %RPE_DIR/lib/librpe.a + +%FC mpiifort +%CC icc +%CFLAGS -O1 +%FCFLAGS -r8 -O1 -fp-model strict -extend-source 132 -heap-arrays -g -finstrument-functions +%FFFLAGS %FCFLAGS +%LD mpiifort +%FPPFLAGS -P +%LDFLAGS -lstdc++ +%AR ar +%ARFLAGS -r +%MK gmake +%USER_INC %NCDF_INC %XIOS_INC %OASIS_INC %RPE_INC +%USER_LIB %NCDF_LIB %XIOS_LIB %OASIS_LIB %RPE_LIB diff --git a/cfg/arch/arch-O1_vanilla.fcm b/cfg/arch/arch-O1_vanilla.fcm new file mode 100644 index 0000000..3c190be --- /dev/null +++ b/cfg/arch/arch-O1_vanilla.fcm @@ -0,0 +1,44 @@ +# generic ifort compiler options for linux +# NCDF_INC netcdf include file +# NCDF_LIB netcdf library +# FC Fortran compiler command +# FCFLAGS Fortran compiler flags +# FFLAGS Fortran 77 compiler flags +# LD linker +# LDFLAGS linker flags, e.g. -L if you have libraries in a +# FPPFLAGS pre-processing flags +# AR assembler +# ARFLAGS assembler flags +# MK make +# USER_INC additional include files for the compiler, e.g. -I +# USER_LIB additional libraries to pass to the linker, e.g. -l + +%CPP fpp +%NCDF_INC -I/apps/NETCDF/4.4.1.1/INTEL/IMPI/include +%NCDF_LIB -L/apps/NETCDF/4.4.1.1/INTEL/IMPI/lib -lnetcdf -lnetcdff + +%XIOS_DIR /gpfs/projects/bsc32/bsc32870/xios/2.5/mn4-r1650-prod +%XIOS_INC -I%XIOS_DIR/inc +%XIOS_LIB %XIOS_DIR/lib/libxios.a + +%OASIS_HOME /home/bsc32/bsc32870/oasis3-mct/MN3/ +%OASIS_INC -I%OASIS_HOME/build/lib/mct -I%OASIS_HOME/build/lib/psmile.MPI1 +%OASIS_LIB -L%OASIS_HOME/lib -lpsmile.MPI1 -lmct -lmpeu -lscrip + +%RPE_DIR /gpfs/projects/bsc32/bsc32870/rpe/mn4/intel-2017.4 +%RPE_INC -I/%RPE_DIR/modules +%RPE_LIB %RPE_DIR/lib/librpe.a + +%FC mpiifort +%CC icc +%CFLAGS -O1 +%FCFLAGS -r8 -O1 -fp-model strict -extend-source 132 -heap-arrays +%FFFLAGS %FCFLAGS +%LD mpiifort +%FPPFLAGS -P +%LDFLAGS -lstdc++ +%AR ar +%ARFLAGS -r +%MK gmake +%USER_INC %NCDF_INC %XIOS_INC %OASIS_INC %RPE_INC +%USER_LIB %NCDF_LIB %XIOS_LIB %OASIS_LIB %RPE_LIB diff --git a/cfg/arch/arch-xHost_trace.fcm b/cfg/arch/arch-xHost_trace.fcm new file mode 100644 index 0000000..413f065 --- /dev/null +++ b/cfg/arch/arch-xHost_trace.fcm @@ -0,0 +1,44 @@ +# generic ifort compiler options for linux +# NCDF_INC netcdf include file +# NCDF_LIB netcdf library +# FC Fortran compiler command +# FCFLAGS Fortran compiler flags +# FFLAGS Fortran 77 compiler flags +# LD linker +# LDFLAGS linker flags, e.g. -L if you have libraries in a +# FPPFLAGS pre-processing flags +# AR assembler +# ARFLAGS assembler flags +# MK make +# USER_INC additional include files for the compiler, e.g. -I +# USER_LIB additional libraries to pass to the linker, e.g. -l + +%CPP fpp +%NCDF_INC -I/apps/NETCDF/4.4.1.1/INTEL/IMPI/include +%NCDF_LIB -L/apps/NETCDF/4.4.1.1/INTEL/IMPI/lib -lnetcdf -lnetcdff + +%XIOS_DIR /gpfs/projects/bsc32/bsc32870/xios/2.5/mn4-r1650-prod +%XIOS_INC -I%XIOS_DIR/inc +%XIOS_LIB %XIOS_DIR/lib/libxios.a + +%OASIS_HOME /home/bsc32/bsc32870/oasis3-mct/MN3/ +%OASIS_INC -I%OASIS_HOME/build/lib/mct -I%OASIS_HOME/build/lib/psmile.MPI1 +%OASIS_LIB -L%OASIS_HOME/lib -lpsmile.MPI1 -lmct -lmpeu -lscrip + +%RPE_DIR /gpfs/projects/bsc32/bsc32870/rpe/mn4/intel-2017.4 +%RPE_INC -I/%RPE_DIR/modules +%RPE_LIB %RPE_DIR/lib/librpe.a + +%FC mpiifort +%CC icc +%CFLAGS -O3 +%FCFLAGS -ip -r8 -O3 -fp-model strict -extend-source 132 -heap-arrays -xHost -g -finstrument-functions +%FFFLAGS %FCFLAGS +%LD mpiifort +%FPPFLAGS -P +%LDFLAGS -lstdc++ +%AR ar +%ARFLAGS -r +%MK gmake +%USER_INC %NCDF_INC %XIOS_INC %OASIS_INC %RPE_INC +%USER_LIB %NCDF_LIB %XIOS_LIB %OASIS_LIB %RPE_LIB diff --git a/cfg/arch/arch-xHost_vanilla.fcm b/cfg/arch/arch-xHost_vanilla.fcm new file mode 100644 index 0000000..828861b --- /dev/null +++ b/cfg/arch/arch-xHost_vanilla.fcm @@ -0,0 +1,44 @@ +# generic ifort compiler options for linux +# NCDF_INC netcdf include file +# NCDF_LIB netcdf library +# FC Fortran compiler command +# FCFLAGS Fortran compiler flags +# FFLAGS Fortran 77 compiler flags +# LD linker +# LDFLAGS linker flags, e.g. -L if you have libraries in a +# FPPFLAGS pre-processing flags +# AR assembler +# ARFLAGS assembler flags +# MK make +# USER_INC additional include files for the compiler, e.g. -I +# USER_LIB additional libraries to pass to the linker, e.g. -l + +%CPP fpp +%NCDF_INC -I/apps/NETCDF/4.4.1.1/INTEL/IMPI/include +%NCDF_LIB -L/apps/NETCDF/4.4.1.1/INTEL/IMPI/lib -lnetcdf -lnetcdff + +%XIOS_DIR /gpfs/projects/bsc32/bsc32870/xios/2.5/mn4-r1650-prod +%XIOS_INC -I%XIOS_DIR/inc +%XIOS_LIB %XIOS_DIR/lib/libxios.a + +%OASIS_HOME /home/bsc32/bsc32870/oasis3-mct/MN3/ +%OASIS_INC -I%OASIS_HOME/build/lib/mct -I%OASIS_HOME/build/lib/psmile.MPI1 +%OASIS_LIB -L%OASIS_HOME/lib -lpsmile.MPI1 -lmct -lmpeu -lscrip + +%RPE_DIR /gpfs/projects/bsc32/bsc32870/rpe/mn4/intel-2017.4 +%RPE_INC -I/%RPE_DIR/modules +%RPE_LIB %RPE_DIR/lib/librpe.a + +%FC mpiifort +%CC icc +%CFLAGS -O3 +%FCFLAGS -ip -r8 -O3 -fp-model strict -extend-source 132 -heap-arrays -xHost +%FFFLAGS %FCFLAGS +%LD mpiifort +%FPPFLAGS -P +%LDFLAGS -lstdc++ +%AR ar +%ARFLAGS -r +%MK gmake +%USER_INC %NCDF_INC %XIOS_INC %OASIS_INC %RPE_INC +%USER_LIB %NCDF_LIB %XIOS_LIB %OASIS_LIB %RPE_LIB -- GitLab From 7b9c25c5d66b24004caa4028297c3f3bc0d086e3 Mon Sep 17 00:00:00 2001 From: "Oriol.Tinto.Prims" Date: Thu, 25 Jun 2020 18:05:03 +0200 Subject: [PATCH 05/26] Few old archfiles removed --- cfg/arch/arch-O0_gprof.fcm | 44 ----------------------------- cfg/arch/arch-mtune_gprof.fcm | 44 ----------------------------- cfg/arch/arch-mtune_trace.fcm | 44 ----------------------------- cfg/arch/arch-mtune_vanilla.fcm | 44 ----------------------------- cfg/arch/arch-nofpmodel_gprof.fcm | 44 ----------------------------- cfg/arch/arch-nofpmodel_trace.fcm | 44 ----------------------------- cfg/arch/arch-nofpmodel_vanilla.fcm | 44 ----------------------------- cfg/arch/arch-novec_gprof.fcm | 44 ----------------------------- cfg/arch/arch-novec_trace.fcm | 44 ----------------------------- cfg/arch/arch-novec_vanilla.fcm | 44 ----------------------------- cfg/arch/arch-prod_gprof.fcm | 44 ----------------------------- cfg/arch/arch-tuned_gprof.fcm | 44 ----------------------------- cfg/arch/arch-tuned_trace.fcm | 44 ----------------------------- cfg/arch/arch-tuned_vanilla.fcm | 44 ----------------------------- 14 files changed, 616 deletions(-) delete mode 100644 cfg/arch/arch-O0_gprof.fcm delete mode 100644 cfg/arch/arch-mtune_gprof.fcm delete mode 100644 cfg/arch/arch-mtune_trace.fcm delete mode 100644 cfg/arch/arch-mtune_vanilla.fcm delete mode 100644 cfg/arch/arch-nofpmodel_gprof.fcm delete mode 100644 cfg/arch/arch-nofpmodel_trace.fcm delete mode 100644 cfg/arch/arch-nofpmodel_vanilla.fcm delete mode 100644 cfg/arch/arch-novec_gprof.fcm delete mode 100644 cfg/arch/arch-novec_trace.fcm delete mode 100644 cfg/arch/arch-novec_vanilla.fcm delete mode 100644 cfg/arch/arch-prod_gprof.fcm delete mode 100644 cfg/arch/arch-tuned_gprof.fcm delete mode 100644 cfg/arch/arch-tuned_trace.fcm delete mode 100644 cfg/arch/arch-tuned_vanilla.fcm diff --git a/cfg/arch/arch-O0_gprof.fcm b/cfg/arch/arch-O0_gprof.fcm deleted file mode 100644 index 1b21fbe..0000000 --- a/cfg/arch/arch-O0_gprof.fcm +++ /dev/null @@ -1,44 +0,0 @@ -# generic ifort compiler options for linux -# NCDF_INC netcdf include file -# NCDF_LIB netcdf library -# FC Fortran compiler command -# FCFLAGS Fortran compiler flags -# FFLAGS Fortran 77 compiler flags -# LD linker -# LDFLAGS linker flags, e.g. -L if you have libraries in a -# FPPFLAGS pre-processing flags -# AR assembler -# ARFLAGS assembler flags -# MK make -# USER_INC additional include files for the compiler, e.g. -I -# USER_LIB additional libraries to pass to the linker, e.g. -l - -%CPP fpp -%NCDF_INC -I/apps/NETCDF/4.4.1.1/INTEL/IMPI/include -%NCDF_LIB -L/apps/NETCDF/4.4.1.1/INTEL/IMPI/lib -lnetcdf -lnetcdff - -%XIOS_DIR /gpfs/projects/bsc32/bsc32870/xios/2.5/mn4-r1650-prod -%XIOS_INC -I%XIOS_DIR/inc -%XIOS_LIB %XIOS_DIR/lib/libxios.a - -%OASIS_HOME /home/bsc32/bsc32870/oasis3-mct/MN3/ -%OASIS_INC -I%OASIS_HOME/build/lib/mct -I%OASIS_HOME/build/lib/psmile.MPI1 -%OASIS_LIB -L%OASIS_HOME/lib -lpsmile.MPI1 -lmct -lmpeu -lscrip - -%RPE_DIR /gpfs/projects/bsc32/bsc32870/rpe/mn4/intel-2017.4 -%RPE_INC -I/%RPE_DIR/modules -%RPE_LIB %RPE_DIR/lib/librpe.a - -%FC mpiifort -%CC icc -%CFLAGS -O3 -%FCFLAGS -r8 -O0 -fp-model strict -extend-source 132 -heap-arrays -pg -g -finstrument-functions -%FFFLAGS %FCFLAGS -%LD mpiifort -%FPPFLAGS -P -%LDFLAGS -lstdc++ -%AR ar -%ARFLAGS -r -%MK gmake -%USER_INC %NCDF_INC %XIOS_INC %OASIS_INC %RPE_INC -%USER_LIB %NCDF_LIB %XIOS_LIB %OASIS_LIB %RPE_LIB diff --git a/cfg/arch/arch-mtune_gprof.fcm b/cfg/arch/arch-mtune_gprof.fcm deleted file mode 100644 index a47eae3..0000000 --- a/cfg/arch/arch-mtune_gprof.fcm +++ /dev/null @@ -1,44 +0,0 @@ -# generic ifort compiler options for linux -# NCDF_INC netcdf include file -# NCDF_LIB netcdf library -# FC Fortran compiler command -# FCFLAGS Fortran compiler flags -# FFLAGS Fortran 77 compiler flags -# LD linker -# LDFLAGS linker flags, e.g. -L if you have libraries in a -# FPPFLAGS pre-processing flags -# AR assembler -# ARFLAGS assembler flags -# MK make -# USER_INC additional include files for the compiler, e.g. -I -# USER_LIB additional libraries to pass to the linker, e.g. -l - -%CPP fpp -%NCDF_INC -I/apps/NETCDF/4.4.1.1/INTEL/IMPI/include -%NCDF_LIB -L/apps/NETCDF/4.4.1.1/INTEL/IMPI/lib -lnetcdf -lnetcdff - -%XIOS_DIR /gpfs/projects/bsc32/bsc32870/xios/2.5/mn4-r1650-prod -%XIOS_INC -I%XIOS_DIR/inc -%XIOS_LIB %XIOS_DIR/lib/libxios.a - -%OASIS_HOME /home/bsc32/bsc32870/oasis3-mct/MN3/ -%OASIS_INC -I%OASIS_HOME/build/lib/mct -I%OASIS_HOME/build/lib/psmile.MPI1 -%OASIS_LIB -L%OASIS_HOME/lib -lpsmile.MPI1 -lmct -lmpeu -lscrip - -%RPE_DIR /gpfs/projects/bsc32/bsc32870/rpe/mn4/intel-2017.4 -%RPE_INC -I/%RPE_DIR/modules -%RPE_LIB %RPE_DIR/lib/librpe.a - -%FC mpiifort -%CC icc -%CFLAGS -O3 -%FCFLAGS -ip -r8 -Ofast -fp-model fast=2 -extend-source 132 -heap-arrays -xHost -mtune=skylake -pg -g -finstrument-functions -%FFFLAGS %FCFLAGS -%LD mpiifort -%FPPFLAGS -P -%LDFLAGS -lstdc++ -pg -%AR ar -%ARFLAGS -r -%MK gmake -%USER_INC %NCDF_INC %XIOS_INC %OASIS_INC %RPE_INC -%USER_LIB %NCDF_LIB %XIOS_LIB %OASIS_LIB %RPE_LIB diff --git a/cfg/arch/arch-mtune_trace.fcm b/cfg/arch/arch-mtune_trace.fcm deleted file mode 100644 index e46d16d..0000000 --- a/cfg/arch/arch-mtune_trace.fcm +++ /dev/null @@ -1,44 +0,0 @@ -# generic ifort compiler options for linux -# NCDF_INC netcdf include file -# NCDF_LIB netcdf library -# FC Fortran compiler command -# FCFLAGS Fortran compiler flags -# FFLAGS Fortran 77 compiler flags -# LD linker -# LDFLAGS linker flags, e.g. -L if you have libraries in a -# FPPFLAGS pre-processing flags -# AR assembler -# ARFLAGS assembler flags -# MK make -# USER_INC additional include files for the compiler, e.g. -I -# USER_LIB additional libraries to pass to the linker, e.g. -l - -%CPP fpp -%NCDF_INC -I/apps/NETCDF/4.4.1.1/INTEL/IMPI/include -%NCDF_LIB -L/apps/NETCDF/4.4.1.1/INTEL/IMPI/lib -lnetcdf -lnetcdff - -%XIOS_DIR /gpfs/projects/bsc32/bsc32870/xios/2.5/mn4-r1650-prod -%XIOS_INC -I%XIOS_DIR/inc -%XIOS_LIB %XIOS_DIR/lib/libxios.a - -%OASIS_HOME /home/bsc32/bsc32870/oasis3-mct/MN3/ -%OASIS_INC -I%OASIS_HOME/build/lib/mct -I%OASIS_HOME/build/lib/psmile.MPI1 -%OASIS_LIB -L%OASIS_HOME/lib -lpsmile.MPI1 -lmct -lmpeu -lscrip - -%RPE_DIR /gpfs/projects/bsc32/bsc32870/rpe/mn4/intel-2017.4 -%RPE_INC -I/%RPE_DIR/modules -%RPE_LIB %RPE_DIR/lib/librpe.a - -%FC mpiifort -%CC icc -%CFLAGS -O3 -%FCFLAGS -ip -r8 -Ofast -fp-model fast=2 -extend-source 132 -heap-arrays -xHost -mtune=skylake -g -finstrument-functions -%FFFLAGS %FCFLAGS -%LD mpiifort -%FPPFLAGS -P -%LDFLAGS -lstdc++ -%AR ar -%ARFLAGS -r -%MK gmake -%USER_INC %NCDF_INC %XIOS_INC %OASIS_INC %RPE_INC -%USER_LIB %NCDF_LIB %XIOS_LIB %OASIS_LIB %RPE_LIB diff --git a/cfg/arch/arch-mtune_vanilla.fcm b/cfg/arch/arch-mtune_vanilla.fcm deleted file mode 100644 index af5bfa1..0000000 --- a/cfg/arch/arch-mtune_vanilla.fcm +++ /dev/null @@ -1,44 +0,0 @@ -# generic ifort compiler options for linux -# NCDF_INC netcdf include file -# NCDF_LIB netcdf library -# FC Fortran compiler command -# FCFLAGS Fortran compiler flags -# FFLAGS Fortran 77 compiler flags -# LD linker -# LDFLAGS linker flags, e.g. -L if you have libraries in a -# FPPFLAGS pre-processing flags -# AR assembler -# ARFLAGS assembler flags -# MK make -# USER_INC additional include files for the compiler, e.g. -I -# USER_LIB additional libraries to pass to the linker, e.g. -l - -%CPP fpp -%NCDF_INC -I/apps/NETCDF/4.4.1.1/INTEL/IMPI/include -%NCDF_LIB -L/apps/NETCDF/4.4.1.1/INTEL/IMPI/lib -lnetcdf -lnetcdff - -%XIOS_DIR /gpfs/projects/bsc32/bsc32870/xios/2.5/mn4-r1650-prod -%XIOS_INC -I%XIOS_DIR/inc -%XIOS_LIB %XIOS_DIR/lib/libxios.a - -%OASIS_HOME /home/bsc32/bsc32870/oasis3-mct/MN3/ -%OASIS_INC -I%OASIS_HOME/build/lib/mct -I%OASIS_HOME/build/lib/psmile.MPI1 -%OASIS_LIB -L%OASIS_HOME/lib -lpsmile.MPI1 -lmct -lmpeu -lscrip - -%RPE_DIR /gpfs/projects/bsc32/bsc32870/rpe/mn4/intel-2017.4 -%RPE_INC -I/%RPE_DIR/modules -%RPE_LIB %RPE_DIR/lib/librpe.a - -%FC mpiifort -%CC icc -%CFLAGS -O3 -%FCFLAGS -ip -r8 -Ofast -fp-model fast=2 -extend-source 132 -heap-arrays -xHost -mtune=skylake -%FFFLAGS %FCFLAGS -%LD mpiifort -%FPPFLAGS -P -%LDFLAGS -lstdc++ -%AR ar -%ARFLAGS -r -%MK gmake -%USER_INC %NCDF_INC %XIOS_INC %OASIS_INC %RPE_INC -%USER_LIB %NCDF_LIB %XIOS_LIB %OASIS_LIB %RPE_LIB diff --git a/cfg/arch/arch-nofpmodel_gprof.fcm b/cfg/arch/arch-nofpmodel_gprof.fcm deleted file mode 100644 index 15670b4..0000000 --- a/cfg/arch/arch-nofpmodel_gprof.fcm +++ /dev/null @@ -1,44 +0,0 @@ -# generic ifort compiler options for linux -# NCDF_INC netcdf include file -# NCDF_LIB netcdf library -# FC Fortran compiler command -# FCFLAGS Fortran compiler flags -# FFLAGS Fortran 77 compiler flags -# LD linker -# LDFLAGS linker flags, e.g. -L if you have libraries in a -# FPPFLAGS pre-processing flags -# AR assembler -# ARFLAGS assembler flags -# MK make -# USER_INC additional include files for the compiler, e.g. -I -# USER_LIB additional libraries to pass to the linker, e.g. -l - -%CPP fpp -%NCDF_INC -I/apps/NETCDF/4.4.1.1/INTEL/IMPI/include -%NCDF_LIB -L/apps/NETCDF/4.4.1.1/INTEL/IMPI/lib -lnetcdf -lnetcdff - -%XIOS_DIR /gpfs/projects/bsc32/bsc32870/xios/2.5/mn4-r1650-prod -%XIOS_INC -I%XIOS_DIR/inc -%XIOS_LIB %XIOS_DIR/lib/libxios.a - -%OASIS_HOME /home/bsc32/bsc32870/oasis3-mct/MN3/ -%OASIS_INC -I%OASIS_HOME/build/lib/mct -I%OASIS_HOME/build/lib/psmile.MPI1 -%OASIS_LIB -L%OASIS_HOME/lib -lpsmile.MPI1 -lmct -lmpeu -lscrip - -%RPE_DIR /gpfs/projects/bsc32/bsc32870/rpe/mn4/intel-2017.4 -%RPE_INC -I/%RPE_DIR/modules -%RPE_LIB %RPE_DIR/lib/librpe.a - -%FC mpiifort -%CC icc -%CFLAGS -O3 -%FCFLAGS -ip -r8 -O3 -extend-source 132 -heap-arrays -g -pg -finstrument-functions -%FFFLAGS %FCFLAGS -%LD mpiifort -%FPPFLAGS -P -%LDFLAGS -lstdc++ -pg -%AR ar -%ARFLAGS -r -%MK gmake -%USER_INC %NCDF_INC %XIOS_INC %OASIS_INC %RPE_INC -%USER_LIB %NCDF_LIB %XIOS_LIB %OASIS_LIB %RPE_LIB diff --git a/cfg/arch/arch-nofpmodel_trace.fcm b/cfg/arch/arch-nofpmodel_trace.fcm deleted file mode 100644 index f465053..0000000 --- a/cfg/arch/arch-nofpmodel_trace.fcm +++ /dev/null @@ -1,44 +0,0 @@ -# generic ifort compiler options for linux -# NCDF_INC netcdf include file -# NCDF_LIB netcdf library -# FC Fortran compiler command -# FCFLAGS Fortran compiler flags -# FFLAGS Fortran 77 compiler flags -# LD linker -# LDFLAGS linker flags, e.g. -L if you have libraries in a -# FPPFLAGS pre-processing flags -# AR assembler -# ARFLAGS assembler flags -# MK make -# USER_INC additional include files for the compiler, e.g. -I -# USER_LIB additional libraries to pass to the linker, e.g. -l - -%CPP fpp -%NCDF_INC -I/apps/NETCDF/4.4.1.1/INTEL/IMPI/include -%NCDF_LIB -L/apps/NETCDF/4.4.1.1/INTEL/IMPI/lib -lnetcdf -lnetcdff - -%XIOS_DIR /gpfs/projects/bsc32/bsc32870/xios/2.5/mn4-r1650-prod -%XIOS_INC -I%XIOS_DIR/inc -%XIOS_LIB %XIOS_DIR/lib/libxios.a - -%OASIS_HOME /home/bsc32/bsc32870/oasis3-mct/MN3/ -%OASIS_INC -I%OASIS_HOME/build/lib/mct -I%OASIS_HOME/build/lib/psmile.MPI1 -%OASIS_LIB -L%OASIS_HOME/lib -lpsmile.MPI1 -lmct -lmpeu -lscrip - -%RPE_DIR /gpfs/projects/bsc32/bsc32870/rpe/mn4/intel-2017.4 -%RPE_INC -I/%RPE_DIR/modules -%RPE_LIB %RPE_DIR/lib/librpe.a - -%FC mpiifort -%CC icc -%CFLAGS -O3 -%FCFLAGS -ip -r8 -O3 -extend-source 132 -heap-arrays -g -finstrument-functions -%FFFLAGS %FCFLAGS -%LD mpiifort -%FPPFLAGS -P -%LDFLAGS -lstdc++ -%AR ar -%ARFLAGS -r -%MK gmake -%USER_INC %NCDF_INC %XIOS_INC %OASIS_INC %RPE_INC -%USER_LIB %NCDF_LIB %XIOS_LIB %OASIS_LIB %RPE_LIB diff --git a/cfg/arch/arch-nofpmodel_vanilla.fcm b/cfg/arch/arch-nofpmodel_vanilla.fcm deleted file mode 100644 index 1de6568..0000000 --- a/cfg/arch/arch-nofpmodel_vanilla.fcm +++ /dev/null @@ -1,44 +0,0 @@ -# generic ifort compiler options for linux -# NCDF_INC netcdf include file -# NCDF_LIB netcdf library -# FC Fortran compiler command -# FCFLAGS Fortran compiler flags -# FFLAGS Fortran 77 compiler flags -# LD linker -# LDFLAGS linker flags, e.g. -L if you have libraries in a -# FPPFLAGS pre-processing flags -# AR assembler -# ARFLAGS assembler flags -# MK make -# USER_INC additional include files for the compiler, e.g. -I -# USER_LIB additional libraries to pass to the linker, e.g. -l - -%CPP fpp -%NCDF_INC -I/apps/NETCDF/4.4.1.1/INTEL/IMPI/include -%NCDF_LIB -L/apps/NETCDF/4.4.1.1/INTEL/IMPI/lib -lnetcdf -lnetcdff - -%XIOS_DIR /gpfs/projects/bsc32/bsc32870/xios/2.5/mn4-r1650-prod -%XIOS_INC -I%XIOS_DIR/inc -%XIOS_LIB %XIOS_DIR/lib/libxios.a - -%OASIS_HOME /home/bsc32/bsc32870/oasis3-mct/MN3/ -%OASIS_INC -I%OASIS_HOME/build/lib/mct -I%OASIS_HOME/build/lib/psmile.MPI1 -%OASIS_LIB -L%OASIS_HOME/lib -lpsmile.MPI1 -lmct -lmpeu -lscrip - -%RPE_DIR /gpfs/projects/bsc32/bsc32870/rpe/mn4/intel-2017.4 -%RPE_INC -I/%RPE_DIR/modules -%RPE_LIB %RPE_DIR/lib/librpe.a - -%FC mpiifort -%CC icc -%CFLAGS -O3 -%FCFLAGS -ip -r8 -Ofast -fp-model fast=2 -extend-source 132 -heap-arrays -%FFFLAGS %FCFLAGS -%LD mpiifort -%FPPFLAGS -P -%LDFLAGS -lstdc++ -%AR ar -%ARFLAGS -r -%MK gmake -%USER_INC %NCDF_INC %XIOS_INC %OASIS_INC %RPE_INC -%USER_LIB %NCDF_LIB %XIOS_LIB %OASIS_LIB %RPE_LIB diff --git a/cfg/arch/arch-novec_gprof.fcm b/cfg/arch/arch-novec_gprof.fcm deleted file mode 100644 index 6add89c..0000000 --- a/cfg/arch/arch-novec_gprof.fcm +++ /dev/null @@ -1,44 +0,0 @@ -# generic ifort compiler options for linux -# NCDF_INC netcdf include file -# NCDF_LIB netcdf library -# FC Fortran compiler command -# FCFLAGS Fortran compiler flags -# FFLAGS Fortran 77 compiler flags -# LD linker -# LDFLAGS linker flags, e.g. -L if you have libraries in a -# FPPFLAGS pre-processing flags -# AR assembler -# ARFLAGS assembler flags -# MK make -# USER_INC additional include files for the compiler, e.g. -I -# USER_LIB additional libraries to pass to the linker, e.g. -l - -%CPP fpp -%NCDF_INC -I/apps/NETCDF/4.4.1.1/INTEL/IMPI/include -%NCDF_LIB -L/apps/NETCDF/4.4.1.1/INTEL/IMPI/lib -lnetcdf -lnetcdff - -%XIOS_DIR /gpfs/projects/bsc32/bsc32870/xios/2.5/mn4-r1650-prod -%XIOS_INC -I%XIOS_DIR/inc -%XIOS_LIB %XIOS_DIR/lib/libxios.a - -%OASIS_HOME /home/bsc32/bsc32870/oasis3-mct/MN3/ -%OASIS_INC -I%OASIS_HOME/build/lib/mct -I%OASIS_HOME/build/lib/psmile.MPI1 -%OASIS_LIB -L%OASIS_HOME/lib -lpsmile.MPI1 -lmct -lmpeu -lscrip - -%RPE_DIR /gpfs/projects/bsc32/bsc32870/rpe/mn4/intel-2017.4 -%RPE_INC -I/%RPE_DIR/modules -%RPE_LIB %RPE_DIR/lib/librpe.a - -%FC mpiifort -%CC icc -%CFLAGS -O3 -%FCFLAGS -ip -r8 -O1 -fp-model strict -extend-source 132 -heap-arrays -g -pg -finstrument-functions -%FFFLAGS %FCFLAGS -%LD mpiifort -%FPPFLAGS -P -%LDFLAGS -lstdc++ -pg -%AR ar -%ARFLAGS -r -%MK gmake -%USER_INC %NCDF_INC %XIOS_INC %OASIS_INC %RPE_INC -%USER_LIB %NCDF_LIB %XIOS_LIB %OASIS_LIB %RPE_LIB diff --git a/cfg/arch/arch-novec_trace.fcm b/cfg/arch/arch-novec_trace.fcm deleted file mode 100644 index 2f45880..0000000 --- a/cfg/arch/arch-novec_trace.fcm +++ /dev/null @@ -1,44 +0,0 @@ -# generic ifort compiler options for linux -# NCDF_INC netcdf include file -# NCDF_LIB netcdf library -# FC Fortran compiler command -# FCFLAGS Fortran compiler flags -# FFLAGS Fortran 77 compiler flags -# LD linker -# LDFLAGS linker flags, e.g. -L if you have libraries in a -# FPPFLAGS pre-processing flags -# AR assembler -# ARFLAGS assembler flags -# MK make -# USER_INC additional include files for the compiler, e.g. -I -# USER_LIB additional libraries to pass to the linker, e.g. -l - -%CPP fpp -%NCDF_INC -I/apps/NETCDF/4.4.1.1/INTEL/IMPI/include -%NCDF_LIB -L/apps/NETCDF/4.4.1.1/INTEL/IMPI/lib -lnetcdf -lnetcdff - -%XIOS_DIR /gpfs/projects/bsc32/bsc32870/xios/2.5/mn4-r1650-prod -%XIOS_INC -I%XIOS_DIR/inc -%XIOS_LIB %XIOS_DIR/lib/libxios.a - -%OASIS_HOME /home/bsc32/bsc32870/oasis3-mct/MN3/ -%OASIS_INC -I%OASIS_HOME/build/lib/mct -I%OASIS_HOME/build/lib/psmile.MPI1 -%OASIS_LIB -L%OASIS_HOME/lib -lpsmile.MPI1 -lmct -lmpeu -lscrip - -%RPE_DIR /gpfs/projects/bsc32/bsc32870/rpe/mn4/intel-2017.4 -%RPE_INC -I/%RPE_DIR/modules -%RPE_LIB %RPE_DIR/lib/librpe.a - -%FC mpiifort -%CC icc -%CFLAGS -O3 -%FCFLAGS -ip -r8 -O1 -fp-model strict -extend-source 132 -heap-arrays -g -finstrument-functions -%FFFLAGS %FCFLAGS -%LD mpiifort -%FPPFLAGS -P -%LDFLAGS -lstdc++ -%AR ar -%ARFLAGS -r -%MK gmake -%USER_INC %NCDF_INC %XIOS_INC %OASIS_INC %RPE_INC -%USER_LIB %NCDF_LIB %XIOS_LIB %OASIS_LIB %RPE_LIB diff --git a/cfg/arch/arch-novec_vanilla.fcm b/cfg/arch/arch-novec_vanilla.fcm deleted file mode 100644 index 6e8497d..0000000 --- a/cfg/arch/arch-novec_vanilla.fcm +++ /dev/null @@ -1,44 +0,0 @@ -# generic ifort compiler options for linux -# NCDF_INC netcdf include file -# NCDF_LIB netcdf library -# FC Fortran compiler command -# FCFLAGS Fortran compiler flags -# FFLAGS Fortran 77 compiler flags -# LD linker -# LDFLAGS linker flags, e.g. -L if you have libraries in a -# FPPFLAGS pre-processing flags -# AR assembler -# ARFLAGS assembler flags -# MK make -# USER_INC additional include files for the compiler, e.g. -I -# USER_LIB additional libraries to pass to the linker, e.g. -l - -%CPP fpp -%NCDF_INC -I/apps/NETCDF/4.4.1.1/INTEL/IMPI/include -%NCDF_LIB -L/apps/NETCDF/4.4.1.1/INTEL/IMPI/lib -lnetcdf -lnetcdff - -%XIOS_DIR /gpfs/projects/bsc32/bsc32870/xios/2.5/mn4-r1650-prod -%XIOS_INC -I%XIOS_DIR/inc -%XIOS_LIB %XIOS_DIR/lib/libxios.a - -%OASIS_HOME /home/bsc32/bsc32870/oasis3-mct/MN3/ -%OASIS_INC -I%OASIS_HOME/build/lib/mct -I%OASIS_HOME/build/lib/psmile.MPI1 -%OASIS_LIB -L%OASIS_HOME/lib -lpsmile.MPI1 -lmct -lmpeu -lscrip - -%RPE_DIR /gpfs/projects/bsc32/bsc32870/rpe/mn4/intel-2017.4 -%RPE_INC -I/%RPE_DIR/modules -%RPE_LIB %RPE_DIR/lib/librpe.a - -%FC mpiifort -%CC icc -%CFLAGS -O3 -%FCFLAGS -ip -r8 -O1 -fp-model strict -extend-source 132 -heap-arrays -%FFFLAGS %FCFLAGS -%LD mpiifort -%FPPFLAGS -P -%LDFLAGS -lstdc++ -%AR ar -%ARFLAGS -r -%MK gmake -%USER_INC %NCDF_INC %XIOS_INC %OASIS_INC %RPE_INC -%USER_LIB %NCDF_LIB %XIOS_LIB %OASIS_LIB %RPE_LIB diff --git a/cfg/arch/arch-prod_gprof.fcm b/cfg/arch/arch-prod_gprof.fcm deleted file mode 100644 index d12e654..0000000 --- a/cfg/arch/arch-prod_gprof.fcm +++ /dev/null @@ -1,44 +0,0 @@ -# generic ifort compiler options for linux -# NCDF_INC netcdf include file -# NCDF_LIB netcdf library -# FC Fortran compiler command -# FCFLAGS Fortran compiler flags -# FFLAGS Fortran 77 compiler flags -# LD linker -# LDFLAGS linker flags, e.g. -L if you have libraries in a -# FPPFLAGS pre-processing flags -# AR assembler -# ARFLAGS assembler flags -# MK make -# USER_INC additional include files for the compiler, e.g. -I -# USER_LIB additional libraries to pass to the linker, e.g. -l - -%CPP fpp -%NCDF_INC -I/apps/NETCDF/4.4.1.1/INTEL/IMPI/include -%NCDF_LIB -L/apps/NETCDF/4.4.1.1/INTEL/IMPI/lib -lnetcdf -lnetcdff - -%XIOS_DIR /gpfs/projects/bsc32/bsc32870/xios/2.5/mn4-r1650-prod -%XIOS_INC -I%XIOS_DIR/inc -%XIOS_LIB %XIOS_DIR/lib/libxios.a - -%OASIS_HOME /home/bsc32/bsc32870/oasis3-mct/MN3/ -%OASIS_INC -I%OASIS_HOME/build/lib/mct -I%OASIS_HOME/build/lib/psmile.MPI1 -%OASIS_LIB -L%OASIS_HOME/lib -lpsmile.MPI1 -lmct -lmpeu -lscrip - -%RPE_DIR /gpfs/projects/bsc32/bsc32870/rpe/mn4/intel-2017.4 -%RPE_INC -I/%RPE_DIR/modules -%RPE_LIB %RPE_DIR/lib/librpe.a - -%FC mpiifort -%CC icc -%CFLAGS -O3 -%FCFLAGS -ip -r8 -O3 -fp-model strict -extend-source 132 -heap-arrays -g -pg -finstrument-functions -%FFFLAGS %FCFLAGS -%LD mpiifort -%FPPFLAGS -P -%LDFLAGS -lstdc++ -pg -%AR ar -%ARFLAGS -r -%MK gmake -%USER_INC %NCDF_INC %XIOS_INC %OASIS_INC %RPE_INC -%USER_LIB %NCDF_LIB %XIOS_LIB %OASIS_LIB %RPE_LIB diff --git a/cfg/arch/arch-tuned_gprof.fcm b/cfg/arch/arch-tuned_gprof.fcm deleted file mode 100644 index 1215be5..0000000 --- a/cfg/arch/arch-tuned_gprof.fcm +++ /dev/null @@ -1,44 +0,0 @@ -# generic ifort compiler options for linux -# NCDF_INC netcdf include file -# NCDF_LIB netcdf library -# FC Fortran compiler command -# FCFLAGS Fortran compiler flags -# FFLAGS Fortran 77 compiler flags -# LD linker -# LDFLAGS linker flags, e.g. -L if you have libraries in a -# FPPFLAGS pre-processing flags -# AR assembler -# ARFLAGS assembler flags -# MK make -# USER_INC additional include files for the compiler, e.g. -I -# USER_LIB additional libraries to pass to the linker, e.g. -l - -%CPP fpp -%NCDF_INC -I/apps/NETCDF/4.4.1.1/INTEL/IMPI/include -%NCDF_LIB -L/apps/NETCDF/4.4.1.1/INTEL/IMPI/lib -lnetcdf -lnetcdff - -%XIOS_DIR /gpfs/projects/bsc32/bsc32870/xios/2.5/mn4-r1650-prod -%XIOS_INC -I%XIOS_DIR/inc -%XIOS_LIB %XIOS_DIR/lib/libxios.a - -%OASIS_HOME /home/bsc32/bsc32870/oasis3-mct/MN3/ -%OASIS_INC -I%OASIS_HOME/build/lib/mct -I%OASIS_HOME/build/lib/psmile.MPI1 -%OASIS_LIB -L%OASIS_HOME/lib -lpsmile.MPI1 -lmct -lmpeu -lscrip - -%RPE_DIR /gpfs/projects/bsc32/bsc32870/rpe/mn4/intel-2017.4 -%RPE_INC -I/%RPE_DIR/modules -%RPE_LIB %RPE_DIR/lib/librpe.a - -%FC mpiifort -%CC icc -%CFLAGS -O3 -%FCFLAGS -ip -r8 -Ofast -fp-model fast=2 -extend-source 132 -heap-arrays -xHost -pg -g -finstrument-functions -%FFFLAGS %FCFLAGS -%LD mpiifort -%FPPFLAGS -P -%LDFLAGS -lstdc++ -%AR ar -%ARFLAGS -r -%MK gmake -%USER_INC %NCDF_INC %XIOS_INC %OASIS_INC %RPE_INC -%USER_LIB %NCDF_LIB %XIOS_LIB %OASIS_LIB %RPE_LIB diff --git a/cfg/arch/arch-tuned_trace.fcm b/cfg/arch/arch-tuned_trace.fcm deleted file mode 100644 index 1f851cc..0000000 --- a/cfg/arch/arch-tuned_trace.fcm +++ /dev/null @@ -1,44 +0,0 @@ -# generic ifort compiler options for linux -# NCDF_INC netcdf include file -# NCDF_LIB netcdf library -# FC Fortran compiler command -# FCFLAGS Fortran compiler flags -# FFLAGS Fortran 77 compiler flags -# LD linker -# LDFLAGS linker flags, e.g. -L if you have libraries in a -# FPPFLAGS pre-processing flags -# AR assembler -# ARFLAGS assembler flags -# MK make -# USER_INC additional include files for the compiler, e.g. -I -# USER_LIB additional libraries to pass to the linker, e.g. -l - -%CPP fpp -%NCDF_INC -I/apps/NETCDF/4.4.1.1/INTEL/IMPI/include -%NCDF_LIB -L/apps/NETCDF/4.4.1.1/INTEL/IMPI/lib -lnetcdf -lnetcdff - -%XIOS_DIR /gpfs/projects/bsc32/bsc32870/xios/2.5/mn4-r1650-prod -%XIOS_INC -I%XIOS_DIR/inc -%XIOS_LIB %XIOS_DIR/lib/libxios.a - -%OASIS_HOME /home/bsc32/bsc32870/oasis3-mct/MN3/ -%OASIS_INC -I%OASIS_HOME/build/lib/mct -I%OASIS_HOME/build/lib/psmile.MPI1 -%OASIS_LIB -L%OASIS_HOME/lib -lpsmile.MPI1 -lmct -lmpeu -lscrip - -%RPE_DIR /gpfs/projects/bsc32/bsc32870/rpe/mn4/intel-2017.4 -%RPE_INC -I/%RPE_DIR/modules -%RPE_LIB %RPE_DIR/lib/librpe.a - -%FC mpiifort -%CC icc -%CFLAGS -O3 -%FCFLAGS -ip -r8 -Ofast -fp-model fast=2 -extend-source 132 -heap-arrays -xHost -g -finstrument-functions -%FFFLAGS %FCFLAGS -%LD mpiifort -%FPPFLAGS -P -%LDFLAGS -lstdc++ -%AR ar -%ARFLAGS -r -%MK gmake -%USER_INC %NCDF_INC %XIOS_INC %OASIS_INC %RPE_INC -%USER_LIB %NCDF_LIB %XIOS_LIB %OASIS_LIB %RPE_LIB diff --git a/cfg/arch/arch-tuned_vanilla.fcm b/cfg/arch/arch-tuned_vanilla.fcm deleted file mode 100644 index 5d662c6..0000000 --- a/cfg/arch/arch-tuned_vanilla.fcm +++ /dev/null @@ -1,44 +0,0 @@ -# generic ifort compiler options for linux -# NCDF_INC netcdf include file -# NCDF_LIB netcdf library -# FC Fortran compiler command -# FCFLAGS Fortran compiler flags -# FFLAGS Fortran 77 compiler flags -# LD linker -# LDFLAGS linker flags, e.g. -L if you have libraries in a -# FPPFLAGS pre-processing flags -# AR assembler -# ARFLAGS assembler flags -# MK make -# USER_INC additional include files for the compiler, e.g. -I -# USER_LIB additional libraries to pass to the linker, e.g. -l - -%CPP fpp -%NCDF_INC -I/apps/NETCDF/4.4.1.1/INTEL/IMPI/include -%NCDF_LIB -L/apps/NETCDF/4.4.1.1/INTEL/IMPI/lib -lnetcdf -lnetcdff - -%XIOS_DIR /gpfs/projects/bsc32/bsc32870/xios/2.5/mn4-r1650-prod -%XIOS_INC -I%XIOS_DIR/inc -%XIOS_LIB %XIOS_DIR/lib/libxios.a - -%OASIS_HOME /home/bsc32/bsc32870/oasis3-mct/MN3/ -%OASIS_INC -I%OASIS_HOME/build/lib/mct -I%OASIS_HOME/build/lib/psmile.MPI1 -%OASIS_LIB -L%OASIS_HOME/lib -lpsmile.MPI1 -lmct -lmpeu -lscrip - -%RPE_DIR /gpfs/projects/bsc32/bsc32870/rpe/mn4/intel-2017.4 -%RPE_INC -I/%RPE_DIR/modules -%RPE_LIB %RPE_DIR/lib/librpe.a - -%FC mpiifort -%CC icc -%CFLAGS -O3 -%FCFLAGS -ip -r8 -Ofast -fp-model fast=2 -extend-source 132 -heap-arrays -xHost -%FFFLAGS %FCFLAGS -%LD mpiifort -%FPPFLAGS -P -%LDFLAGS -lstdc++ -%AR ar -%ARFLAGS -r -%MK gmake -%USER_INC %NCDF_INC %XIOS_INC %OASIS_INC %RPE_INC -%USER_LIB %NCDF_LIB %XIOS_LIB %OASIS_LIB %RPE_LIB -- GitLab From 11a630284446717555a9e50e548ad9bc2db75932 Mon Sep 17 00:00:00 2001 From: "Oriol.Tinto.Prims" Date: Thu, 25 Jun 2020 18:05:47 +0200 Subject: [PATCH 06/26] Experiment launcher updated to take folder as input --- experiment_launcher.cmd | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/experiment_launcher.cmd b/experiment_launcher.cmd index 62bbbbd..9e557f5 100755 --- a/experiment_launcher.cmd +++ b/experiment_launcher.cmd @@ -1,7 +1,17 @@ # Script to control a multiexperiment experiments_folder=experiments -experiment_configurations_folder=experiments_to_run +experiment_configurations_folder=$1 + +# Some sanity checks +if [ -z "$1" ] ; then + echo "Argument required" + exit 1 +fi +if [ ! -d "$1" ] ; then + echo "Not a folder" + exit 1 +fi # Create experiments folder if it does not exist [ ! -d experiments ] && mkdir ${experiments_folder} @@ -11,6 +21,9 @@ experiment_configurations=$( ls ${experiment_configurations_folder} ) # For each experiment clone the repo there for experiment in ${experiment_configurations} ; do + if [ -d ${${experiments_folder}/${experiment} ] ; then + continue + fi # Clone repository to the new experiment folder git clone . ${experiments_folder}/${experiment} # Copy the configuration file into the new folder -- GitLab From b681a12c421a84a2271ae14d16fcc4875e61c1e5 Mon Sep 17 00:00:00 2001 From: "Oriol.Tinto.Prims" Date: Fri, 26 Jun 2020 09:17:36 +0200 Subject: [PATCH 07/26] Bugfix in experiment_launcher.cmd --- experiment_launcher.cmd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/experiment_launcher.cmd b/experiment_launcher.cmd index 9e557f5..f002c73 100755 --- a/experiment_launcher.cmd +++ b/experiment_launcher.cmd @@ -21,7 +21,7 @@ experiment_configurations=$( ls ${experiment_configurations_folder} ) # For each experiment clone the repo there for experiment in ${experiment_configurations} ; do - if [ -d ${${experiments_folder}/${experiment} ] ; then + if [ -d ${experiments_folder}/${experiment} ] ; then continue fi # Clone repository to the new experiment folder -- GitLab From a976ecb06d7f3239657e25e2943a79b3bc18eb27 Mon Sep 17 00:00:00 2001 From: "Oriol.Tinto.Prims" Date: Fri, 26 Jun 2020 09:42:21 +0200 Subject: [PATCH 08/26] Bugfix in paramedir dependencies --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 829dd5d..2884709 100644 --- a/Makefile +++ b/Makefile @@ -144,7 +144,7 @@ extrae_functions.txt: functions_dir paramedir_configurations=$(wildcard ${analysis_tools}/paramedir_configurations/*) -.paramedir_%.done: .Trace_%.done | images_folder +.paramedir_%.done: .trace_cut_%.done | images_folder # Variable which contains traces' folder name $(eval $@_trace_folder := $(shell echo ${trace_folder_prefix}_$*)) # Enter directory and process all paramedir configurations -- GitLab From ba8e6730262bba9f3c4c47156702c6a876f1b64c Mon Sep 17 00:00:00 2001 From: "Oriol.Tinto.Prims" Date: Fri, 26 Jun 2020 11:04:22 +0200 Subject: [PATCH 09/26] Using a specific EXTRAE version since latest was giving problems --- cfg/generate_func_list/jobscript.cmd | 2 +- cfg/trace/jobscript.cmd | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cfg/generate_func_list/jobscript.cmd b/cfg/generate_func_list/jobscript.cmd index 3459859..1cd8e67 100644 --- a/cfg/generate_func_list/jobscript.cmd +++ b/cfg/generate_func_list/jobscript.cmd @@ -15,7 +15,7 @@ n_functions=80 # Load EXTRAE module and create wrapper module load gcc/8.1.0 -module load EXTRAE +module load EXTRAE/3.7.1 trace=./trace.sh cat << EOF > $trace diff --git a/cfg/trace/jobscript.cmd b/cfg/trace/jobscript.cmd index 510acb8..4fd9188 100644 --- a/cfg/trace/jobscript.cmd +++ b/cfg/trace/jobscript.cmd @@ -18,7 +18,7 @@ source modules.env # Load EXTRAE module and create wrapper module load gcc/8.1.0 -module load EXTRAE +module load EXTRAE/3.7.1 trace=trace.sh cat << EOF > $trace -- GitLab From 78742eece39ea3723c4e800d3ddd4ef7c2bca0e2 Mon Sep 17 00:00:00 2001 From: "Oriol.Tinto.Prims" Date: Fri, 26 Jun 2020 15:40:23 +0200 Subject: [PATCH 10/26] paramedir configuration renaming --- .../MPIcallprofile.pm.cfg | 77 +++++++++++++++++++ 1 file changed, 77 insertions(+) create mode 100644 cfg/trace_analysis/paramedir_configurations/MPIcallprofile.pm.cfg diff --git a/cfg/trace_analysis/paramedir_configurations/MPIcallprofile.pm.cfg b/cfg/trace_analysis/paramedir_configurations/MPIcallprofile.pm.cfg new file mode 100644 index 0000000..c29796a --- /dev/null +++ b/cfg/trace_analysis/paramedir_configurations/MPIcallprofile.pm.cfg @@ -0,0 +1,77 @@ +#ParaverCFG +ConfigFile.Version: 3.4 +ConfigFile.NumWindows: 1 + + +################################################################################ +< NEW DISPLAYING WINDOW MPI call > +################################################################################ +window_name MPI call +window_type single +window_id 1 +window_position_x 377 +window_position_y 288 +window_width 600 +window_height 114 +window_comm_lines_enabled false +window_flags_enabled false +window_noncolor_mode true +window_logical_filtered true +window_physical_filtered false +window_comm_fromto true +window_comm_tagsize true +window_comm_typeval true +window_units Microseconds +window_maximum_y 70.000000000000 +window_minimum_y 0.000000000000 +window_compute_y_max false +window_level thread +window_scale_relative 1.000000000000 +window_end_time_relative 1.000000000000 +window_object appl { 1, { All } } +window_begin_time_relative 0.000000000000 +window_open false +window_drawmode draw_maximum +window_drawmode_rows draw_maximum +window_pixel_size 1 +window_labels_to_draw 1 +window_selected_functions { 14, { {cpu, Active Thd}, {appl, Adding}, {task, Thread i}, {thread, Last Evt Val}, {node, Adding}, {system, Adding}, {workload, Adding}, {from_obj, All}, {to_obj, All}, {tag_msg, All}, {size_msg, All}, {bw_msg, All}, {evt_type, [x,y]}, {evt_value, All} } } +window_compose_functions { 9, { {compose_cpu, As Is}, {compose_appl, As Is}, {compose_task, As Is}, {compose_thread, As Is}, {compose_node, As Is}, {compose_system, As Is}, {compose_workload, As Is}, {topcompose1, As Is}, {topcompose2, As Is} } } +window_semantic_module task Thread i { 1, { 1 0.000000000000 } } +window_filter_module evt_type 2 50000001 50000005 +window_filter_module evt_type_label 2 "MPI Point-to-point" "Unknown" + +< NEW ANALYZER2D > +Analyzer2D.Name: MPI call profile +Analyzer2D.X: 631 +Analyzer2D.Y: 172 +Analyzer2D.Width: 1018 +Analyzer2D.Height: 816 +Analyzer2D.ControlWindow: 1 +Analyzer2D.DataWindow: 1 +Analyzer2D.Accumulator: Semantic +Analyzer2D.Statistic: % Time +Analyzer2D.CalculateAll: True +Analyzer2D.HideCols: True +Analyzer2D.HorizVert: Horizontal +Analyzer2D.Color: True +Analyzer2D.SemanticColor: True +Analyzer2D.Zoom: Disabled +Analyzer2D.SortCols: False +Analyzer2D.SortCriteria: Average +Analyzer2D.Parameters: 4 -179769313486231570814527423731704356798070567525844996598917476803157260780028538760589558632766878171540458953514382464234321326889464182768467546703537516986049910576551282076245490090389328944075868508455133942304583236903222948165808559332123348274797826204144723168738177180919299881250404026184124858368.000000000000 179769313486231570814527423731704356798070567525844996598917476803157260780028538760589558632766878171540458953514382464234321326889464182768467546703537516986049910576551282076245490090389328944075868508455133942304583236903222948165808559332123348274797826204144723168738177180919299881250404026184124858368.000000000000 -179769313486231570814527423731704356798070567525844996598917476803157260780028538760589558632766878171540458953514382464234321326889464182768467546703537516986049910576551282076245490090389328944075868508455133942304583236903222948165808559332123348274797826204144723168738177180919299881250404026184124858368.000000000000 179769313486231570814527423731704356798070567525844996598917476803157260780028538760589558632766878171540458953514382464234321326889464182768467546703537516986049910576551282076245490090389328944075868508455133942304583236903222948165808559332123348274797826204144723168738177180919299881250404026184124858368.000000000000 +Analyzer2D.AnalysisLimits: Alltrace +Analyzer2D.ComputeYScale: False +Analyzer2D.Minimum: 0.000000000000 +Analyzer2D.Maximum: 200.000000000000 +Analyzer2D.Delta: 1.000000000000 +Analyzer2D.ComputeGradient: True +Analyzer2D.MinimumGradient: 0.000053884277 +Analyzer2D.MaximumGradient: 98.457083647023 +Analyzer2D.DrawModeObjects: draw_maximum +Analyzer2D.DrawModeColumns: draw_maximum +Analyzer2D.PixelSize: 1 +Analyzer2D.ColorMode: window_in_gradient_mode +Analyzer2D.ShowOnlyTotals: False +Analyzer2D.ShortHeaderLabels: True + -- GitLab From 81f2807eacb90cd1afdb8b0429922ab97a21d1c2 Mon Sep 17 00:00:00 2001 From: "Oriol.Tinto.Prims" Date: Fri, 26 Jun 2020 15:40:30 +0200 Subject: [PATCH 11/26] paramedir configuration renaming --- .../3D_UsefulCycles_by_function.cfg | 190 ------------------ .../3D_UsefulInstructions_by_function.cfg | 190 ------------------ 2 files changed, 380 deletions(-) delete mode 100644 cfg/trace_analysis/paramedir_configurations/3D_UsefulCycles_by_function.cfg delete mode 100644 cfg/trace_analysis/paramedir_configurations/3D_UsefulInstructions_by_function.cfg diff --git a/cfg/trace_analysis/paramedir_configurations/3D_UsefulCycles_by_function.cfg b/cfg/trace_analysis/paramedir_configurations/3D_UsefulCycles_by_function.cfg deleted file mode 100644 index 9b14319..0000000 --- a/cfg/trace_analysis/paramedir_configurations/3D_UsefulCycles_by_function.cfg +++ /dev/null @@ -1,190 +0,0 @@ -#ParaverCFG -ConfigFile.Version: 3.4 -ConfigFile.NumWindows: 4 - - -################################################################################ -< NEW DISPLAYING WINDOW Cycles > -################################################################################ -window_name Cycles -window_type single -window_id 1 -window_position_x 389 -window_position_y 127 -window_width 600 -window_height 114 -window_comm_lines_enabled false -window_flags_enabled false -window_noncolor_mode true -window_color_mode window_in_null_gradient_mode -window_logical_filtered true -window_physical_filtered false -window_comm_fromto true -window_comm_tagsize true -window_comm_typeval true -window_units Microseconds -window_maximum_y 78892470535.000000000000 -window_minimum_y 0.000000000000 -window_compute_y_max false -window_level thread -window_scale_relative 1.000000000000 -window_end_time_relative 1.000000000000 -window_object appl { 1, { All } } -window_begin_time_relative 0.000000000000 -window_open false -window_drawmode draw_maximum -window_drawmode_rows draw_maximum -window_pixel_size 1 -window_labels_to_draw 1 -window_selected_functions { 14, { {cpu, Active Thd}, {appl, Adding}, {task, Adding}, {thread, Next Evt Val}, {node, Adding}, {system, Adding}, {workload, Adding}, {from_obj, All}, {to_obj, All}, {tag_msg, All}, {size_msg, All}, {bw_msg, All}, {evt_type, =}, {evt_value, All} } } -window_compose_functions { 9, { {compose_cpu, As Is}, {compose_appl, As Is}, {compose_task, As Is}, {compose_thread, As Is}, {compose_node, As Is}, {compose_system, As Is}, {compose_workload, As Is}, {topcompose1, As Is}, {topcompose2, As Is} } } -window_filter_module evt_type 1 42000059 -window_filter_module evt_type_label 1 "PAPI_TOT_CYC [Total cycles]" - -################################################################################ -< NEW DISPLAYING WINDOW Useful.c1.c1 > -################################################################################ -window_name Useful.c1.c1 -window_type single -window_id 2 -window_position_x 389 -window_position_y 127 -window_width 600 -window_height 134 -window_comm_lines_enabled false -window_flags_enabled false -window_noncolor_mode true -window_logical_filtered true -window_physical_filtered true -window_comm_fromto true -window_comm_tagsize true -window_comm_typeval true -window_units Microseconds -window_maximum_y 1.000000000000 -window_minimum_y 0.000000000000 -window_compute_y_max false -window_level thread -window_scale_relative 1.000000000000 -window_end_time_relative 1.000000000000 -window_object appl { 1, { All } } -window_begin_time_relative 0.000000000000 -window_open false -window_drawmode draw_maximum -window_drawmode_rows draw_maximum -window_pixel_size 1 -window_labels_to_draw 1 -window_selected_functions { 14, { {cpu, Active Thd}, {appl, Adding}, {task, Adding}, {thread, Useful}, {node, Adding}, {system, Adding}, {workload, Adding}, {from_obj, All}, {to_obj, =}, {tag_msg, All}, {size_msg, All}, {bw_msg, All}, {evt_type, All}, {evt_value, All} } } -window_compose_functions { 9, { {compose_cpu, As Is}, {compose_appl, As Is}, {compose_task, As Is}, {compose_thread, As Is}, {compose_node, As Is}, {compose_system, As Is}, {compose_workload, As Is}, {topcompose1, As Is}, {topcompose2, As Is} } } - -################################################################################ -< NEW DISPLAYING WINDOW useful cycles > -################################################################################ -window_name useful cycles -window_type composed -window_id 3 -window_factors 1.000000000000 1.000000000000 -window_operation product -window_identifiers 1 2 -window_position_x 525 -window_position_y 366 -window_width 600 -window_height 114 -window_comm_lines_enabled false -window_flags_enabled false -window_noncolor_mode true -window_color_mode window_in_null_gradient_mode -window_units Nanoseconds -window_maximum_y 176360335.000000000000 -window_minimum_y 610.000000000000 -window_compute_y_max false -window_level thread -window_scale_relative 1.000000000000 -window_end_time_relative 1.000000000000 -window_object appl { 1, { All } } -window_begin_time_relative 0.000000000000 -window_open false -window_drawmode draw_maximum -window_drawmode_rows draw_maximum -window_pixel_size 1 -window_labels_to_draw 1 -window_selected_functions { 5, { {appl, Adding}, {task, Adding}, {node, Adding}, {system, Adding}, {workload, Adding}, } } -window_compose_functions { 9, { {compose_cpu, As Is}, {compose_appl, As Is}, {compose_task, As Is}, {compose_thread, As Is}, {compose_node, As Is}, {compose_system, As Is}, {compose_workload, As Is}, {topcompose1, As Is}, {topcompose2, As Is} } } - -################################################################################ -< NEW DISPLAYING WINDOW User function x thread > -################################################################################ -window_name User function x thread -window_type single -window_id 4 -window_position_x 525 -window_position_y 510 -window_width 600 -window_height 114 -window_comm_lines_enabled false -window_flags_enabled false -window_noncolor_mode true -window_logical_filtered true -window_physical_filtered false -window_comm_fromto true -window_comm_tagsize true -window_comm_typeval true -window_units Microseconds -window_maximum_y 48.000000000000 -window_minimum_y 3.000000000000 -window_compute_y_max false -window_level thread -window_scale_relative 1.000000000000 -window_end_time_relative 1.000000000000 -window_object appl { 1, { All } } -window_begin_time_relative 0.000000000000 -window_open false -window_drawmode draw_maximum -window_drawmode_rows draw_maximum -window_pixel_size 1 -window_labels_to_draw 1 -window_selected_functions { 14, { {cpu, Active Thd}, {appl, Adding}, {task, Thread i}, {thread, Last Evt Val}, {node, Adding}, {system, Adding}, {workload, Adding}, {from_obj, All}, {to_obj, All}, {tag_msg, All}, {size_msg, All}, {bw_msg, All}, {evt_type, =}, {evt_value, All} } } -window_compose_functions { 9, { {compose_cpu, As Is}, {compose_appl, As Is}, {compose_task, As Is}, {compose_thread, Stacked Val}, {compose_node, As Is}, {compose_system, As Is}, {compose_workload, As Is}, {topcompose1, As Is}, {topcompose2, As Is} } } -window_semantic_module task Thread i { 1, { 1 0.000000000000 } } -window_filter_module evt_type 1 60000019 -window_filter_module evt_type_label 1 "User function" - -< NEW ANALYZER2D > -Analyzer2D.Name: 2dh Useful Cycles -Analyzer2D.X: 1125 -Analyzer2D.Y: 565 -Analyzer2D.Width: 600 -Analyzer2D.Height: 300 -Analyzer2D.ControlWindow: 3 -Analyzer2D.DataWindow: 3 -Analyzer2D.Accumulator: Semantic -Analyzer2D.Statistic: Sum bursts -Analyzer2D.CalculateAll: True -Analyzer2D.HideCols: False -Analyzer2D.HorizVert: Horizontal -Analyzer2D.Color: True -Analyzer2D.SemanticColor: False -Analyzer2D.Zoom: Enabled -Analyzer2D.SortCols: False -Analyzer2D.SortCriteria: Average -Analyzer2D.Parameters: 4 -179769313486231570814527423731704356798070567525844996598917476803157260780028538760589558632766878171540458953514382464234321326889464182768467546703537516986049910576551282076245490090389328944075868508455133942304583236903222948165808559332123348274797826204144723168738177180919299881250404026184124858368.000000000000 179769313486231570814527423731704356798070567525844996598917476803157260780028538760589558632766878171540458953514382464234321326889464182768467546703537516986049910576551282076245490090389328944075868508455133942304583236903222948165808559332123348274797826204144723168738177180919299881250404026184124858368.000000000000 -179769313486231570814527423731704356798070567525844996598917476803157260780028538760589558632766878171540458953514382464234321326889464182768467546703537516986049910576551282076245490090389328944075868508455133942304583236903222948165808559332123348274797826204144723168738177180919299881250404026184124858368.000000000000 179769313486231570814527423731704356798070567525844996598917476803157260780028538760589558632766878171540458953514382464234321326889464182768467546703537516986049910576551282076245490090389328944075868508455133942304583236903222948165808559332123348274797826204144723168738177180919299881250404026184124858368.000000000000 -Analyzer2D.AnalysisLimits: Alltrace -Analyzer2D.ComputeYScale: False -Analyzer2D.Minimum: 610.000000000000 -Analyzer2D.Maximum: 185178321.250000000000 -Analyzer2D.Delta: 925888556.250000000000 -Analyzer2D.ComputeGradient: True -Analyzer2D.MinimumGradient: 250059474.000000000000 -Analyzer2D.MaximumGradient: 265269439.000000000000 -Analyzer2D.DrawModeObjects: draw_maximum -Analyzer2D.DrawModeColumns: draw_maximum -Analyzer2D.PixelSize: 1 -Analyzer2D.ColorMode: window_in_gradient_mode -Analyzer2D.ShowOnlyTotals: False -Analyzer2D.ShortHeaderLabels: True -Analyzer2D.3D_ControlWindow: 4 -Analyzer3D.ComputeYScale: True -Analyzer2D.3D_Minimum: 3.000000000000 -Analyzer2D.3D_Maximum: 48.000000000000 -Analyzer2D.3D_Delta: 1.000000000000 -Analyzer2D.3D_FixedValue: 39.000000000000 - diff --git a/cfg/trace_analysis/paramedir_configurations/3D_UsefulInstructions_by_function.cfg b/cfg/trace_analysis/paramedir_configurations/3D_UsefulInstructions_by_function.cfg deleted file mode 100644 index bcb136a..0000000 --- a/cfg/trace_analysis/paramedir_configurations/3D_UsefulInstructions_by_function.cfg +++ /dev/null @@ -1,190 +0,0 @@ -#ParaverCFG -ConfigFile.Version: 3.4 -ConfigFile.NumWindows: 4 - - -################################################################################ -< NEW DISPLAYING WINDOW Instructions.c1 > -################################################################################ -window_name Instructions.c1 -window_type single -window_id 1 -window_position_x 314 -window_position_y 52 -window_width 600 -window_height 114 -window_comm_lines_enabled false -window_flags_enabled false -window_noncolor_mode true -window_color_mode window_in_null_gradient_mode -window_logical_filtered true -window_physical_filtered false -window_comm_fromto true -window_comm_tagsize true -window_comm_typeval true -window_units Microseconds -window_maximum_y 78892470535.000000000000 -window_minimum_y 0.000000000000 -window_compute_y_max false -window_level thread -window_scale_relative 1.000000000000 -window_end_time_relative 1.000000000000 -window_object appl { 1, { All } } -window_begin_time_relative 0.000000000000 -window_open false -window_drawmode draw_maximum -window_drawmode_rows draw_maximum -window_pixel_size 1 -window_labels_to_draw 1 -window_selected_functions { 14, { {cpu, Active Thd}, {appl, Adding}, {task, Adding}, {thread, Next Evt Val}, {node, Adding}, {system, Adding}, {workload, Adding}, {from_obj, All}, {to_obj, All}, {tag_msg, All}, {size_msg, All}, {bw_msg, All}, {evt_type, =}, {evt_value, All} } } -window_compose_functions { 9, { {compose_cpu, As Is}, {compose_appl, As Is}, {compose_task, As Is}, {compose_thread, As Is}, {compose_node, As Is}, {compose_system, As Is}, {compose_workload, As Is}, {topcompose1, As Is}, {topcompose2, As Is} } } -window_filter_module evt_type 1 42000050 -window_filter_module evt_type_label 1 "PAPI_TOT_INS [Instr completed]" - -################################################################################ -< NEW DISPLAYING WINDOW Useful.c1 > -################################################################################ -window_name Useful.c1 -window_type single -window_id 2 -window_position_x 340 -window_position_y 78 -window_width 600 -window_height 134 -window_comm_lines_enabled false -window_flags_enabled false -window_noncolor_mode true -window_logical_filtered true -window_physical_filtered true -window_comm_fromto true -window_comm_tagsize true -window_comm_typeval true -window_units Microseconds -window_maximum_y 1.000000000000 -window_minimum_y 0.000000000000 -window_compute_y_max false -window_level thread -window_scale_relative 1.000000000000 -window_end_time_relative 1.000000000000 -window_object appl { 1, { All } } -window_begin_time_relative 0.000000000000 -window_open false -window_drawmode draw_maximum -window_drawmode_rows draw_maximum -window_pixel_size 1 -window_labels_to_draw 1 -window_selected_functions { 14, { {cpu, Active Thd}, {appl, Adding}, {task, Adding}, {thread, Useful}, {node, Adding}, {system, Adding}, {workload, Adding}, {from_obj, All}, {to_obj, =}, {tag_msg, All}, {size_msg, All}, {bw_msg, All}, {evt_type, All}, {evt_value, All} } } -window_compose_functions { 9, { {compose_cpu, As Is}, {compose_appl, As Is}, {compose_task, As Is}, {compose_thread, As Is}, {compose_node, As Is}, {compose_system, As Is}, {compose_workload, As Is}, {topcompose1, As Is}, {topcompose2, As Is} } } - -################################################################################ -< NEW DISPLAYING WINDOW useful instructions > -################################################################################ -window_name useful instructions -window_type composed -window_id 3 -window_factors 1.000000000000 1.000000000000 -window_operation product -window_identifiers 1 2 -window_position_x 525 -window_position_y 222 -window_width 600 -window_height 114 -window_comm_lines_enabled false -window_flags_enabled false -window_noncolor_mode true -window_color_mode window_in_null_gradient_mode -window_units Microseconds -window_maximum_y 97268896.000000000000 -window_minimum_y 1022.000000000000 -window_compute_y_max false -window_level thread -window_scale_relative 1.000000000000 -window_end_time_relative 1.000000000000 -window_object appl { 1, { All } } -window_begin_time_relative 0.000000000000 -window_open false -window_drawmode draw_maximum -window_drawmode_rows draw_maximum -window_pixel_size 1 -window_labels_to_draw 1 -window_selected_functions { 5, { {appl, Adding}, {task, Adding}, {node, Adding}, {system, Adding}, {workload, Adding}, } } -window_compose_functions { 9, { {compose_cpu, As Is}, {compose_appl, As Is}, {compose_task, As Is}, {compose_thread, As Is}, {compose_node, As Is}, {compose_system, As Is}, {compose_workload, As Is}, {topcompose1, As Is}, {topcompose2, As Is} } } - -################################################################################ -< NEW DISPLAYING WINDOW User function x thread > -################################################################################ -window_name User function x thread -window_type single -window_id 4 -window_position_x 525 -window_position_y 510 -window_width 600 -window_height 114 -window_comm_lines_enabled false -window_flags_enabled false -window_noncolor_mode true -window_logical_filtered true -window_physical_filtered false -window_comm_fromto true -window_comm_tagsize true -window_comm_typeval true -window_units Microseconds -window_maximum_y 48.000000000000 -window_minimum_y 3.000000000000 -window_compute_y_max false -window_level thread -window_scale_relative 1.000000000000 -window_end_time_relative 1.000000000000 -window_object appl { 1, { All } } -window_begin_time_relative 0.000000000000 -window_open false -window_drawmode draw_maximum -window_drawmode_rows draw_maximum -window_pixel_size 1 -window_labels_to_draw 1 -window_selected_functions { 14, { {cpu, Active Thd}, {appl, Adding}, {task, Thread i}, {thread, Last Evt Val}, {node, Adding}, {system, Adding}, {workload, Adding}, {from_obj, All}, {to_obj, All}, {tag_msg, All}, {size_msg, All}, {bw_msg, All}, {evt_type, =}, {evt_value, All} } } -window_compose_functions { 9, { {compose_cpu, As Is}, {compose_appl, As Is}, {compose_task, As Is}, {compose_thread, Stacked Val}, {compose_node, As Is}, {compose_system, As Is}, {compose_workload, As Is}, {topcompose1, As Is}, {topcompose2, As Is} } } -window_semantic_module task Thread i { 1, { 1 0.000000000000 } } -window_filter_module evt_type 1 60000019 -window_filter_module evt_type_label 1 "User function" - -< NEW ANALYZER2D > -Analyzer2D.Name: 2dh useful instructions -Analyzer2D.X: 1112 -Analyzer2D.Y: 180 -Analyzer2D.Width: 600 -Analyzer2D.Height: 300 -Analyzer2D.ControlWindow: 3 -Analyzer2D.DataWindow: 3 -Analyzer2D.Accumulator: Semantic -Analyzer2D.Statistic: Sum bursts -Analyzer2D.CalculateAll: True -Analyzer2D.HideCols: False -Analyzer2D.HorizVert: Horizontal -Analyzer2D.Color: True -Analyzer2D.SemanticColor: False -Analyzer2D.Zoom: Enabled -Analyzer2D.SortCols: False -Analyzer2D.SortCriteria: Average -Analyzer2D.Parameters: 4 -179769313486231570814527423731704356798070567525844996598917476803157260780028538760589558632766878171540458953514382464234321326889464182768467546703537516986049910576551282076245490090389328944075868508455133942304583236903222948165808559332123348274797826204144723168738177180919299881250404026184124858368.000000000000 179769313486231570814527423731704356798070567525844996598917476803157260780028538760589558632766878171540458953514382464234321326889464182768467546703537516986049910576551282076245490090389328944075868508455133942304583236903222948165808559332123348274797826204144723168738177180919299881250404026184124858368.000000000000 -179769313486231570814527423731704356798070567525844996598917476803157260780028538760589558632766878171540458953514382464234321326889464182768467546703537516986049910576551282076245490090389328944075868508455133942304583236903222948165808559332123348274797826204144723168738177180919299881250404026184124858368.000000000000 179769313486231570814527423731704356798070567525844996598917476803157260780028538760589558632766878171540458953514382464234321326889464182768467546703537516986049910576551282076245490090389328944075868508455133942304583236903222948165808559332123348274797826204144723168738177180919299881250404026184124858368.000000000000 -Analyzer2D.AnalysisLimits: Alltrace -Analyzer2D.ComputeYScale: False -Analyzer2D.Minimum: 1022.000000000000 -Analyzer2D.Maximum: 102132289.700000002980 -Analyzer2D.Delta: 1000000000.000000000000 -Analyzer2D.ComputeGradient: True -Analyzer2D.MinimumGradient: 93191550.000000000000 -Analyzer2D.MaximumGradient: 93658686.000000000000 -Analyzer2D.DrawModeObjects: draw_maximum -Analyzer2D.DrawModeColumns: draw_maximum -Analyzer2D.PixelSize: 1 -Analyzer2D.ColorMode: window_in_gradient_mode -Analyzer2D.ShowOnlyTotals: False -Analyzer2D.ShortHeaderLabels: True -Analyzer2D.3D_ControlWindow: 4 -Analyzer3D.ComputeYScale: True -Analyzer2D.3D_Minimum: 3.000000000000 -Analyzer2D.3D_Maximum: 48.000000000000 -Analyzer2D.3D_Delta: 1.000000000000 -Analyzer2D.3D_FixedValue: 39.000000000000 - -- GitLab From d79c8b502995f0c863a4ceb50caafa1f5fa4f7d7 Mon Sep 17 00:00:00 2001 From: "Oriol.Tinto.Prims" Date: Fri, 26 Jun 2020 15:51:10 +0200 Subject: [PATCH 12/26] paramedir configuration renaming --- .../MPI_call_profile.pm.cfg | 77 ------------------- 1 file changed, 77 deletions(-) delete mode 100644 cfg/trace_analysis/paramedir_configurations/MPI_call_profile.pm.cfg diff --git a/cfg/trace_analysis/paramedir_configurations/MPI_call_profile.pm.cfg b/cfg/trace_analysis/paramedir_configurations/MPI_call_profile.pm.cfg deleted file mode 100644 index c29796a..0000000 --- a/cfg/trace_analysis/paramedir_configurations/MPI_call_profile.pm.cfg +++ /dev/null @@ -1,77 +0,0 @@ -#ParaverCFG -ConfigFile.Version: 3.4 -ConfigFile.NumWindows: 1 - - -################################################################################ -< NEW DISPLAYING WINDOW MPI call > -################################################################################ -window_name MPI call -window_type single -window_id 1 -window_position_x 377 -window_position_y 288 -window_width 600 -window_height 114 -window_comm_lines_enabled false -window_flags_enabled false -window_noncolor_mode true -window_logical_filtered true -window_physical_filtered false -window_comm_fromto true -window_comm_tagsize true -window_comm_typeval true -window_units Microseconds -window_maximum_y 70.000000000000 -window_minimum_y 0.000000000000 -window_compute_y_max false -window_level thread -window_scale_relative 1.000000000000 -window_end_time_relative 1.000000000000 -window_object appl { 1, { All } } -window_begin_time_relative 0.000000000000 -window_open false -window_drawmode draw_maximum -window_drawmode_rows draw_maximum -window_pixel_size 1 -window_labels_to_draw 1 -window_selected_functions { 14, { {cpu, Active Thd}, {appl, Adding}, {task, Thread i}, {thread, Last Evt Val}, {node, Adding}, {system, Adding}, {workload, Adding}, {from_obj, All}, {to_obj, All}, {tag_msg, All}, {size_msg, All}, {bw_msg, All}, {evt_type, [x,y]}, {evt_value, All} } } -window_compose_functions { 9, { {compose_cpu, As Is}, {compose_appl, As Is}, {compose_task, As Is}, {compose_thread, As Is}, {compose_node, As Is}, {compose_system, As Is}, {compose_workload, As Is}, {topcompose1, As Is}, {topcompose2, As Is} } } -window_semantic_module task Thread i { 1, { 1 0.000000000000 } } -window_filter_module evt_type 2 50000001 50000005 -window_filter_module evt_type_label 2 "MPI Point-to-point" "Unknown" - -< NEW ANALYZER2D > -Analyzer2D.Name: MPI call profile -Analyzer2D.X: 631 -Analyzer2D.Y: 172 -Analyzer2D.Width: 1018 -Analyzer2D.Height: 816 -Analyzer2D.ControlWindow: 1 -Analyzer2D.DataWindow: 1 -Analyzer2D.Accumulator: Semantic -Analyzer2D.Statistic: % Time -Analyzer2D.CalculateAll: True -Analyzer2D.HideCols: True -Analyzer2D.HorizVert: Horizontal -Analyzer2D.Color: True -Analyzer2D.SemanticColor: True -Analyzer2D.Zoom: Disabled -Analyzer2D.SortCols: False -Analyzer2D.SortCriteria: Average -Analyzer2D.Parameters: 4 -179769313486231570814527423731704356798070567525844996598917476803157260780028538760589558632766878171540458953514382464234321326889464182768467546703537516986049910576551282076245490090389328944075868508455133942304583236903222948165808559332123348274797826204144723168738177180919299881250404026184124858368.000000000000 179769313486231570814527423731704356798070567525844996598917476803157260780028538760589558632766878171540458953514382464234321326889464182768467546703537516986049910576551282076245490090389328944075868508455133942304583236903222948165808559332123348274797826204144723168738177180919299881250404026184124858368.000000000000 -179769313486231570814527423731704356798070567525844996598917476803157260780028538760589558632766878171540458953514382464234321326889464182768467546703537516986049910576551282076245490090389328944075868508455133942304583236903222948165808559332123348274797826204144723168738177180919299881250404026184124858368.000000000000 179769313486231570814527423731704356798070567525844996598917476803157260780028538760589558632766878171540458953514382464234321326889464182768467546703537516986049910576551282076245490090389328944075868508455133942304583236903222948165808559332123348274797826204144723168738177180919299881250404026184124858368.000000000000 -Analyzer2D.AnalysisLimits: Alltrace -Analyzer2D.ComputeYScale: False -Analyzer2D.Minimum: 0.000000000000 -Analyzer2D.Maximum: 200.000000000000 -Analyzer2D.Delta: 1.000000000000 -Analyzer2D.ComputeGradient: True -Analyzer2D.MinimumGradient: 0.000053884277 -Analyzer2D.MaximumGradient: 98.457083647023 -Analyzer2D.DrawModeObjects: draw_maximum -Analyzer2D.DrawModeColumns: draw_maximum -Analyzer2D.PixelSize: 1 -Analyzer2D.ColorMode: window_in_gradient_mode -Analyzer2D.ShowOnlyTotals: False -Analyzer2D.ShortHeaderLabels: True - -- GitLab From fa60e0fc18b5e51df4308bbc954e5cb504222942 Mon Sep 17 00:00:00 2001 From: "Oriol.Tinto.Prims" Date: Mon, 29 Jun 2020 09:28:15 +0200 Subject: [PATCH 13/26] Parameter file for deployment experiments added --- cfg/deployment_experiments/O0 | 24 ++++++++++++++++++++++++ cfg/deployment_experiments/O1 | 24 ++++++++++++++++++++++++ cfg/deployment_experiments/O3 | 24 ++++++++++++++++++++++++ cfg/deployment_experiments/xHost | 24 ++++++++++++++++++++++++ 4 files changed, 96 insertions(+) create mode 100644 cfg/deployment_experiments/O0 create mode 100644 cfg/deployment_experiments/O1 create mode 100644 cfg/deployment_experiments/O3 create mode 100644 cfg/deployment_experiments/xHost diff --git a/cfg/deployment_experiments/O0 b/cfg/deployment_experiments/O0 new file mode 100644 index 0000000..ccc10da --- /dev/null +++ b/cfg/deployment_experiments/O0 @@ -0,0 +1,24 @@ +# Branch to profile +nemo_branch=avoid_error_partition +# Configuration name +configuration_name=Deployment-O0 +# the following parameter should be cfgs in case the configuration is based on ORCA or tests if it is based n the bench +configuration_folder=tests +# Details of the configuration which you would put after makenemo, excluding the arch file +configuration_details=-a BENCH +# For BENCH specifies the resolution at which it will run +configuration_resolution=orca1 +# Suffix of the arch file used +arch_file_prefix=O0 +# Enable or disable output (TRUE or FALSE) +output=FALSE +# Number of steps used in test (Adjust acording to cost) +test_steps=200 +trace_steps=20 +# Processes used for the modelfactor +number_of_processes=48 96 +# This value will be passed to the slurm parameter --ntasks-per-node (default in mn4 is 48) +processes_per_node=48 + +# Which parts of the recipe will be executed when we run make experiment +experiment_recipes = json diff --git a/cfg/deployment_experiments/O1 b/cfg/deployment_experiments/O1 new file mode 100644 index 0000000..2141354 --- /dev/null +++ b/cfg/deployment_experiments/O1 @@ -0,0 +1,24 @@ +# Branch to profile +nemo_branch=avoid_error_partition +# Configuration name +configuration_name=Deployment-O1 +# the following parameter should be cfgs in case the configuration is based on ORCA or tests if it is based n the bench +configuration_folder=tests +# Details of the configuration which you would put after makenemo, excluding the arch file +configuration_details=-a BENCH +# For BENCH specifies the resolution at which it will run +configuration_resolution=orca1 +# Suffix of the arch file used +arch_file_prefix=O1 +# Enable or disable output (TRUE or FALSE) +output=FALSE +# Number of steps used in test (Adjust acording to cost) +test_steps=200 +trace_steps=20 +# Processes used for the modelfactor +number_of_processes=48 96 +# This value will be passed to the slurm parameter --ntasks-per-node (default in mn4 is 48) +processes_per_node=48 + +# Which parts of the recipe will be executed when we run make experiment +experiment_recipes = json diff --git a/cfg/deployment_experiments/O3 b/cfg/deployment_experiments/O3 new file mode 100644 index 0000000..ce0827f --- /dev/null +++ b/cfg/deployment_experiments/O3 @@ -0,0 +1,24 @@ +# Branch to profile +nemo_branch=avoid_error_partition +# Configuration name +configuration_name=Deployment-O3 +# the following parameter should be cfgs in case the configuration is based on ORCA or tests if it is based n the bench +configuration_folder=tests +# Details of the configuration which you would put after makenemo, excluding the arch file +configuration_details=-a BENCH +# For BENCH specifies the resolution at which it will run +configuration_resolution=orca1 +# Suffix of the arch file used +arch_file_prefix=prod +# Enable or disable output (TRUE or FALSE) +output=FALSE +# Number of steps used in test (Adjust acording to cost) +test_steps=200 +trace_steps=20 +# Processes used for the modelfactor +number_of_processes=48 96 +# This value will be passed to the slurm parameter --ntasks-per-node (default in mn4 is 48) +processes_per_node=48 + +# Which parts of the recipe will be executed when we run make experiment +experiment_recipes = json diff --git a/cfg/deployment_experiments/xHost b/cfg/deployment_experiments/xHost new file mode 100644 index 0000000..b1443a8 --- /dev/null +++ b/cfg/deployment_experiments/xHost @@ -0,0 +1,24 @@ +# Branch to profile +nemo_branch=avoid_error_partition +# Configuration name +configuration_name=Deployment-xHost +# the following parameter should be cfgs in case the configuration is based on ORCA or tests if it is based n the bench +configuration_folder=tests +# Details of the configuration which you would put after makenemo, excluding the arch file +configuration_details=-a BENCH +# For BENCH specifies the resolution at which it will run +configuration_resolution=orca1 +# Suffix of the arch file used +arch_file_prefix=xHost +# Enable or disable output (TRUE or FALSE) +output=FALSE +# Number of steps used in test (Adjust acording to cost) +test_steps=200 +trace_steps=20 +# Processes used for the modelfactor +number_of_processes=48 96 +# This value will be passed to the slurm parameter --ntasks-per-node (default in mn4 is 48) +processes_per_node=48 + +# Which parts of the recipe will be executed when we run make experiment +experiment_recipes = json -- GitLab From 64e8f2f1654d77f36cf0c21bfd52ee9a75c3fa4e Mon Sep 17 00:00:00 2001 From: "Oriol.Tinto.Prims" Date: Mon, 29 Jun 2020 12:48:41 +0200 Subject: [PATCH 14/26] Unnecessary files removed --- experiments_to_run/O0 | 24 ------------------------ experiments_to_run/Production | 24 ------------------------ 2 files changed, 48 deletions(-) delete mode 100644 experiments_to_run/O0 delete mode 100644 experiments_to_run/Production diff --git a/experiments_to_run/O0 b/experiments_to_run/O0 deleted file mode 100644 index 67108a7..0000000 --- a/experiments_to_run/O0 +++ /dev/null @@ -1,24 +0,0 @@ -# Branch to profile -nemo_branch=avoid_error_partition -# Configuration name -configuration_name=BENCH -# the following parameter should be cfgs in case the configuration is based on ORCA or tests if it is based n the bench -configuration_folder=tests -# Details of the configuration which you would put after makenemo, excluding the arch file -configuration_details=-a BENCH -# For BENCH specifies the resolution at which it will run -configuration_resolution=orca1 -# Suffix of the arch file used -arch_file_prefix=O0 -# Enable or disable output (TRUE or FALSE) -output=FALSE -# Number of steps used in test (Adjust acording to cost) -test_steps=200 -trace_steps=20 -# Processes used for the modelfactor -number_of_processes=48 96 -# This value will be passed to the slurm parameter --ntasks-per-node (default in mn4 is 48) -processes_per_node=48 - -# Which parts of the recipe will be executed when we run make experiment -experiment_recipes = json diff --git a/experiments_to_run/Production b/experiments_to_run/Production deleted file mode 100644 index 30c6540..0000000 --- a/experiments_to_run/Production +++ /dev/null @@ -1,24 +0,0 @@ -# Branch to profile -nemo_branch=avoid_error_partition -# Configuration name -configuration_name=BENCH -# the following parameter should be cfgs in case the configuration is based on ORCA or tests if it is based n the bench -configuration_folder=tests -# Details of the configuration which you would put after makenemo, excluding the arch file -configuration_details=-a BENCH -# For BENCH specifies the resolution at which it will run -configuration_resolution=orca1 -# Suffix of the arch file used -arch_file_prefix=prod -# Enable or disable output (TRUE or FALSE) -output=FALSE -# Number of steps used in test (Adjust acording to cost) -test_steps=200 -trace_steps=20 -# Processes used for the modelfactor -number_of_processes=48 96 192 -# This value will be passed to the slurm parameter --ntasks-per-node (default in mn4 is 48) -processes_per_node=48 - -# Which parts of the recipe will be executed when we run make experiment -experiment_recipes = json -- GitLab From b7a8dec1f93da05a88fe079f4179367f895e0c09 Mon Sep 17 00:00:00 2001 From: sparonuz Date: Wed, 17 Jun 2020 18:29:58 +0200 Subject: [PATCH 15/26] Added target for benchmark to be run Generalized to get data OSU pruduces and get if it is a latency or bdw test, and create the plot accordingly. First commit, to create a csv with stream results Converting stream out to csv, still to format Added section in report for benchmarks Added feature to parse paramedir files moved cfg from paraver to paramedir, since we need to parse csv output --- Makefile | 104 +++++++++++++--- cfg/benchmarks/OSU/OSU_test_plots.py | 69 +++++++++++ cfg/benchmarks/OSU/jobscript.cmd | 14 +++ cfg/benchmarks/STREAM/STREAM_data_parser.py | 53 +++++++++ cfg/benchmarks/STREAM/jobscript.cmd | 17 +++ cfg/latex/csv_formatter.py | 112 ++++++++++++++++-- cfg/latex/report_orig.tex | 18 +++ .../MPI_call_profile.pm.cfg} | 0 8 files changed, 365 insertions(+), 22 deletions(-) create mode 100755 cfg/benchmarks/OSU/OSU_test_plots.py create mode 100644 cfg/benchmarks/OSU/jobscript.cmd create mode 100644 cfg/benchmarks/STREAM/STREAM_data_parser.py create mode 100644 cfg/benchmarks/STREAM/jobscript.cmd rename cfg/trace_analysis/{paraver_configurations/MPI_call_profile.cfg => paramedir_configurations/MPI_call_profile.pm.cfg} (100%) diff --git a/Makefile b/Makefile index ddfd418..829dd5d 100644 --- a/Makefile +++ b/Makefile @@ -143,9 +143,8 @@ extrae_functions.txt: functions_dir -paramedir_configurations=$(wildcard ../${analysis_tools}/paramedir_configurations/*) +paramedir_configurations=$(wildcard ${analysis_tools}/paramedir_configurations/*) .paramedir_%.done: .Trace_%.done | images_folder - # Variable which contains traces' folder name $(eval $@_trace_folder := $(shell echo ${trace_folder_prefix}_$*)) # Enter directory and process all paramedir configurations @@ -157,7 +156,8 @@ paramedir_configurations=$(wildcard ../${analysis_tools}/paramedir_configuration cd $($@_trace_folder); for file in *pm ; do \ mv $${file} $*_$${file} ;\ done - + mkdir -p ../${latex_images_folder}/call_profile + cp $($@_trace_folder)/$*_MPI_call_profile.pm ${latex_images_folder}/call_profile touch $@ paraver_configurations=$(wildcard cfg/trace_analysis/paraver_configurations/*) @@ -266,7 +266,8 @@ bin: # Delete (almost)-everything clean: rm -rf reference_workdir nemo_source *.prv *.row *.pcf modelfactors* histogram_* trace_* functions_dir extrae_functions.txt *_workdir bin test_* - + rm -rf OSU* osu* bin/osu_bench cfg/latex/images/OSU .osu* + rm -rf STREAM* stream* bin/stream_bench cfg/latex/images/STREAM .stream* hard_clean: -chmod +w inidata -chmod +w InitialConditions.nc @@ -337,9 +338,9 @@ function_csv_folder: cd ${latex_folder}; mkdir -p ${latex_function_csv} report: .latex_report.done -.latex_report.done: modelfactors paramedir_experiment scalability .info_report.done +.latex_report.done: modelfactors paramedir_experiment scalability .info_report.done hardware_benchmarks # Stores the nemo commit tag to a variable - $(eval $@_NEMO_VERSION := $(shell cd nemo_mirror; git log | head -10 | grep 'git-svn-id:' | awk '{print $$2}'| awk -F / '{print $$NF}' )) + $(eval $@_NEMO_VERSION := $(shell cd nemo_mirror; git log | head -50 | grep 'git-svn-id:'| head -1 | awk '{print $$2}'| awk -F / '{print $$NF}' )) # Avoid overwriting variables templates cp ${latex_folder}/variables_orig.tex ${latex_folder}/variables.tex @@ -348,14 +349,6 @@ report: .latex_report.done $(eval $@_LATEX_REPORT := $(shell echo report_$($@_NEMO_VERSION).tex)) cp ${latex_folder}/report_orig.tex ${latex_folder}/$($@_LATEX_REPORT) - # Format modelfactors file and defines it in latex report - $(eval $@_MODELFATCTORS_CSV_TABLE := $(shell echo "modelfactors")) - cd ${latex_folder}; python csv_formatter.py -i $($@_MODELFATCTORS_CSV_TABLE).csv -o $($@_MODELFATCTORS_CSV_TABLE)_fmt.csv - sed -i 's/MODELFACTORS_TABLE_PLACEHOLDER/$($@_MODELFATCTORS_CSV_TABLE)_fmt.csv/g' ${latex_folder}/$($@_LATEX_REPORT) - - # Defines nemo version var - sed -i 's/NEMO_VERSION/$($@_NEMO_VERSION)/g' ${latex_folder}/variables.tex - # Defines some variables as latex newcommand to be used in report sed -i 's/NEMO_VERSION/$($@_NEMO_VERSION)/g' ${latex_folder}/variables.tex sed -i 's/SCALING_PLOT/${configuration_name}/g' ${latex_folder}/variables.tex @@ -365,7 +358,8 @@ report: .latex_report.done # Insert function info section into latex template cd ${latex_folder}; ./function_info2tex.sh $($@_LATEX_REPORT) ${latex_function_csv} - + python ${latex_folder}/csv_formatter.py \ + -i ${latex_images_folder}/call_profile/48_MPI_call_profile.pm -c -s # Clean latex old log cd ${latex_folder}; rm -f *.aux *.log @@ -374,6 +368,86 @@ report: .latex_report.done # Generate the target touch $@ + +########################## +#Run some standard benchmark +.stream_ready: | bin + git clone https://github.com/jeffhammond/STREAM.git + cd STREAM; gcc -fopenmp -D_OPENMP stream.c -o stream + mkdir bin/STREAM + cp STREAM/stream bin/STREAM/ + touch $@ +.stream_run_%.done: .stream_ready + mkdir -p STREAM_RUN/$* + mkdir -p cfg/benchmarks/STREAM/DATA + cp bin/STREAM/* STREAM_RUN/$* + cp cfg/benchmarks/STREAM/jobscript.cmd STREAM_RUN/$* + sed -i "s/%CORES%/$*/g" STREAM_RUN/$*/jobscript.cmd ;\ + sed -i "s/%PROCESSES_PER_NODE%/${processes_per_node}/g" STREAM_RUN/$*/jobscript.cmd ;\ + sbatch --wait --chdir STREAM_RUN/$* STREAM_RUN/$*/jobscript.cmd ;\ + cp STREAM_RUN/$*/*txt cfg/benchmarks/STREAM/DATA ;\ + + touch $@ + +stream_harvest_dep=$(foreach var, $(number_of_processes), .stream_run_$(var).done) +n_cores=$(foreach var, $(number_of_processes), $(var)) +.stream_harvest.done: $(stream_harvest_dep) + for core in ${n_cores} ; do \ + file_in=cfg/benchmarks/STREAM/DATA/stream_$${core}.txt ;\ + file_out=$${file_in%.txt}.csv ;\ + python cfg/benchmarks/STREAM/STREAM_data_parser.py -i $${file_in} -o $${file_out} ;\ + python ${latex_folder}/csv_formatter.py -i $${file_out} ;\ + mkdir -p ${latex_images_folder}/STREAM ;\ + fmt_file=$${file_out%.csv}_fmt.csv;\ + mv $${fmt_file} ${latex_images_folder}/STREAM ;\ + done + touch $@ + +.osu_ready: | bin + wget http://mvapich.cse.ohio-state.edu/download/mvapich/osu-micro-benchmarks-5.6.3.tar.gz + + osu_folder=osu-micro-benchmarks-5.6.3 ;\ + tar -xvf $${osu_folder}.tar.gz ;\ + rm $${osu_folder}.tar.gz ;\ + cd $${osu_folder} ;\ + ./configure CC=`which mpicxx` CXX=`which mpicc` --prefix=`pwd`;\ + make install;\ + make + # Instrallation finished + mkdir bin/osu_bench + cp ./osu-micro-benchmarks-5.6.3/mpi/pt2pt/{osu_multi_lat,osu_mbw_mr} bin/osu_bench + cp ./osu-micro-benchmarks-5.6.3/mpi/collective/osu_allgather bin/osu_bench + touch $@ + +osu_test=$(wildcard bin/osu_bench/*) +.osu_run_%.done: .osu_ready + mkdir -p OSU_RUN/$* + mkdir -p cfg/benchmarks/OSU/DATA + for test in ${osu_test} ; do \ + test_name=$${test##bin/osu_bench/} ;\ + cp $${test} OSU_RUN/$* ;\ + cp cfg/benchmarks/OSU/jobscript.cmd OSU_RUN/$*/$${test_name}_jobscript.cmd ;\ + sed -i "s/%CORES%/$*/g" OSU_RUN/$*/$${test_name}_jobscript.cmd ;\ + sed -i "s/%PROCESSES_PER_NODE%/${processes_per_node}/g" OSU_RUN/$*/$${test_name}_jobscript.cmd ;\ + sed -i "s/%TEST%/$${test_name}/g" OSU_RUN/$*/$${test_name}_jobscript.cmd ;\ + sbatch --wait --chdir OSU_RUN/$* OSU_RUN/$*/$${test_name}_jobscript.cmd ;\ + cp OSU_RUN/$*/*txt cfg/benchmarks/OSU/DATA ;\ + done + touch $@ + +osu_harvest_dep=$(foreach var, $(number_of_processes), .osu_run_$(var).done) + +.osu_harvest.done: $(osu_harvest_dep) + for test in ${osu_test} ; do \ + test_name=$${test##bin/osu_bench/} ;\ + python cfg/benchmarks/OSU/OSU_test_plots.py cfg/benchmarks/OSU/DATA/$${test_name}* ;\ + done + mkdir -p ${latex_images_folder}/OSU + mv ./*.png ${latex_images_folder}/OSU + touch $@ + + +hardware_benchmarks: .stream_harvest.done .osu_harvest.done ############ # Intermediate files #that won't be removed automatically binaries= bin/nemo_trace.exe bin/nemo_vanilla.exe diff --git a/cfg/benchmarks/OSU/OSU_test_plots.py b/cfg/benchmarks/OSU/OSU_test_plots.py new file mode 100755 index 0000000..14c2e53 --- /dev/null +++ b/cfg/benchmarks/OSU/OSU_test_plots.py @@ -0,0 +1,69 @@ +import numpy as np +import matplotlib.pyplot as plt + + +def expand_arguments(arguments): + import glob + # Using the glob library to make it possible to use wildcards + expanded_arguments = [] + for arg in arguments: + if arg.count("*"): + for new_argument in glob.glob(arg): + expanded_arguments.append(new_argument) + else: + expanded_arguments.append(arg) + return expanded_arguments + + +def get_file_list_from_command_line_arguments(): + """ + Returns a list of files that have been provided as a command line argument + :return: list of files + """ + from optparse import OptionParser + # Parse and assert command line options + parser = OptionParser() + (options, args) = parser.parse_args() + + files = expand_arguments(args) + + # In case of not having any argument print help and exit + if not files: + files = None + return files, options + + +def plot_collective(files): + # Set plot title from data's first line + with open(files[0]) as f: + plot_title = f.readline().strip() + while plot_title == "": + plot_title = f.readline().strip() + fig, ax = plt.subplots() + plt.title(plot_title) + + for f in files: + n_cores = f.split("/")[-1].split(".txt")[0].split("_")[-1] + try: + int(n_cores) + except ValueError: + print("Filename does not contain info on N cores") + n_cores = "0" + x, y = np.loadtxt(f, usecols=(0, 1), comments="#", unpack=True) + line, = ax.plot(x, y, label=n_cores + " cores") + ax.legend() + if plot_title.lower().count("bandwidth"): + plt.ylabel('Bandwidth [MB/s]- LOGSCALE - the Higher the better') + elif plot_title.lower().count("latency"): + plt.ylabel(r'Latency [$\mu$s]- LOGSCALE - the Lower the better') + plt.xlabel('Packet size (bits) - LOGSCALE') + plt.grid(True) + plot_title = plot_title.replace(" / ", "_") + fig_name = ("_").join(plot_title.split()[2:-2]) + plt.savefig(fig_name + '.png') + + +if __name__ == "__main__": + # Get files from command line + files, options = get_file_list_from_command_line_arguments() + plot_collective(files) diff --git a/cfg/benchmarks/OSU/jobscript.cmd b/cfg/benchmarks/OSU/jobscript.cmd new file mode 100644 index 0000000..ea63eaf --- /dev/null +++ b/cfg/benchmarks/OSU/jobscript.cmd @@ -0,0 +1,14 @@ +#!/bin/bash +############################################################################### +# VERY BASIC NEMO RUN +############################################################################### +#SBATCH --ntasks %CORES% +#SBATCH --ntasks-per-node %PROCESSES_PER_NODE% +#SBATCH -J osu-bench +#SBATCH --output log_%j.out +#SBATCH --error log_%j.err +#SBATCH --time 00:05:00 +#SBATCH --qos=debug + +number_of_cores=%CORES% +mpirun -np ${number_of_cores} ./%TEST% > %TEST%_${number_of_cores}.txt diff --git a/cfg/benchmarks/STREAM/STREAM_data_parser.py b/cfg/benchmarks/STREAM/STREAM_data_parser.py new file mode 100644 index 0000000..86674ee --- /dev/null +++ b/cfg/benchmarks/STREAM/STREAM_data_parser.py @@ -0,0 +1,53 @@ +import csv + + +def get_command_line_instructions(): + """ + Returns a list of files that have been provided as a command line argument + :return: list of files + """ + # Using optparse to enable command line selection of different runtime options + from optparse import OptionParser + + # Initializing parser + parser = OptionParser() + + # Adding options + parser.add_option("-i", "--input-file", dest="input_file", help="data file produced by stream benchmark", + default=None) + parser.add_option("-o", "--output-file", dest="output_file", + help="CSV file which contains formatted stream results", + default=None) + (options, args) = parser.parse_args() + return options.input_file, options.output_file + + +def stram_output_2csv(stream_data, stream_data_csv): + with open(stream_data, mode='r') as f: + line = f.readline().strip() + while not line.count("Function "): + line = f.readline().strip() + # Now we are at the data part + with open(stream_data_csv, mode='w') as output: + out_writer = csv.writer(output, delimiter=',') + # Write header + header = [name for name in line.split(" ") if name != ""] + out_writer.writerow(header) + # Write Copy + line = f.readline().strip().replace(":", "") + out_writer.writerow(line.split()) + # Write Scale + line = f.readline().strip().replace(":", "") + out_writer.writerow(line.split()) + # Write Add + line = f.readline().strip().replace(":", "") + out_writer.writerow(line.split()) + # Write Triad + line = f.readline().strip().replace(":", "") + out_writer.writerow(line.split()) + + +if __name__ == "__main__": + # Get options from command line + stream_data, stream_data_csv = get_command_line_instructions() + stram_output_2csv(stream_data, stream_data_csv) diff --git a/cfg/benchmarks/STREAM/jobscript.cmd b/cfg/benchmarks/STREAM/jobscript.cmd new file mode 100644 index 0000000..94e10d4 --- /dev/null +++ b/cfg/benchmarks/STREAM/jobscript.cmd @@ -0,0 +1,17 @@ +#!/bin/bash +############################################################################### +# VERY BASIC NEMO RUN +############################################################################### +#SBATCH --ntasks %CORES% +#SBATCH --ntasks-per-node %PROCESSES_PER_NODE% +#SBATCH -J osu-bench +#SBATCH --output log_%j.out +#SBATCH --error log_%j.err +#SBATCH --time 00:05:00 +#SBATCH --qos=debug + + +number_of_cores=%CORES% + +export OMP_NUM_THREADS=%CORES% +./stream > stream_%CORES%.txt diff --git a/cfg/latex/csv_formatter.py b/cfg/latex/csv_formatter.py index 5429e0b..f1ad50b 100644 --- a/cfg/latex/csv_formatter.py +++ b/cfg/latex/csv_formatter.py @@ -1,3 +1,14 @@ +import csv + +# List of different accumulated results given by paraver +paraver_labels = ("Total", + "Average", + "Maximum", + "Minimum", + "StDev", + "Avg/Max", + ) + def get_command_line_arguments(): """ @@ -11,26 +22,105 @@ def get_command_line_arguments(): help="File to be formatted", default=None) parser.add_option("-o", "--output_file", dest="output_file", help="File which will retain output", default=None) + parser.add_option("-c", "--convert", dest="convert_file", default=False, action="store_true", + help="to use input file is not already in csv format" + ) + parser.add_option("-s", "--summary", dest="print_summary", default=False, action="store_true", + help="parse the file and print just the summary" + ) (options, args) = parser.parse_args() return options -def formatter(input_file, output_file): - import csv +class paraver_file: + def __init__(self, _name): + self.name = _name + self.lines = self.get_lines() + self.nthreads = self.get_nthreads() + self.header = self.get_header() + self.data_lines = self.get_data_lines() + self.summary = self.get_summary() + + def remove_tab(self): + self.lines = [l.replace('\t', ' ') for l in self.lines] + + def remove_spaces(self): + self.lines = [l.replace(' ', '_') for l in self.lines] + + def get_header(self): + header = self.lines[0] + return header + + def get_lines(self): + with open(self.name, 'rt') as f: + self.lines = f.readlines() + self.remove_spaces() + self.remove_tab() + self.lines = [l.split() for l in self.lines if len(l) > 0] + # self.lines = [l[1:] for l in self.lines] + return self.lines + + def get_data_lines(self): + self.data_lines = [] + for l in self.lines: + if len(l) > 0 and l[0].count("THREAD"): + self.data_lines.append(l[1:]) + return self.data_lines + + def get_nthreads(self): + self.nthreads = 0 + for line in self.lines: + if len(line) > 0 and line[0].count("THREAD"): + self.nthreads = self.nthreads + 1 + return self.nthreads + def get_summary(self): + summary = {} + for line in self.lines: + for field in line: + if field in paraver_labels: + summary[field.lower()] = line[1:] + return summary + + def print_csv(self, summary=False): + output_file = "new_file" + with open(output_file, 'wt') as f_output: + csv_output = csv.writer(f_output) + + if summary: + new_header = ['-'] + [field for field in self.header] + csv_output.writerow(new_header) + for key, val in self.summary.items(): + csv_output.writerow([key] + val) + else: + csv_output.writerow(self.header) + for data in self.data_lines: + csv_output.writerow(data) + + return output_file + + +def converter(input_file, summary=False): + file = paraver_file(input_file) + fmt_file = file.print_csv(summary) + return fmt_file + + +def formatter(input_file, output_file): with open(input_file, 'rt') as f_input, open(output_file, 'wt') as f_output: csv_input = csv.reader(f_input) csv_output = csv.writer(f_output) - csv_output.writerow(next(csv_input)) # write header + # Write header + csv_output.writerow(next(csv_input)) - for cols in csv_input: - for i in range(1, len(cols[1:]) + 1): + for row in csv_input: + for i_row in range(1, len(row[1:]) + 1): try: - cols[i] = '{:.2f}'.format(float(cols[i])) + row[i_row] = '{:.2f}'.format(float(row[i_row])) except ValueError: continue - csv_output.writerow(cols) + csv_output.writerow(row) if __name__ == "__main__": @@ -38,5 +128,13 @@ if __name__ == "__main__": options = get_command_line_arguments() file_in = options.input_file file_out = options.output_file + convert_file = options.convert_file + summary = options.print_summary + if convert_file: + converted_file = converter(file_in, summary=summary) + file_in = converted_file + if file_out is None: + file_in_extension = file_in.split(".")[-1] + file_out = file_in.replace(".", "").replace(file_in_extension, "_fmt.csv") # Call formatter formatter(file_in, file_out) diff --git a/cfg/latex/report_orig.tex b/cfg/latex/report_orig.tex index 91cdf3b..5975127 100644 --- a/cfg/latex/report_orig.tex +++ b/cfg/latex/report_orig.tex @@ -24,6 +24,24 @@ \section{Introduction} This is an automatically generated report on Nemo code. \clearpage +\section{Hardware Benchmarks} +\subsection{OSU Benchmark} +\begin{figure} + \includegraphics[width=\linewidth]{images/OSU/MPI_Multiple_Bandwidth_Message_Rate.png} + \label{fig:MPI_Multiple_Bandwidth_Message_Rate} +\end{figure} +\begin{figure} + \includegraphics[width=\linewidth]{images/OSU/MPI_Multi_Latency.png} + \label{fig:MPI_Multi_Latency} +\end{figure} +\begin{figure} + \includegraphics[width=\linewidth]{images/OSU/MPI_Allgather_Latency.png} + \label{fig:MPI_Allgather_Latency} +\end{figure} +\clearpage +\subsection{STREAM Benchmark} +\csvautotabular{images/STREAM/stream_\ncores_fmt.csv} +\clearpage \section{Extrae insights for race on \ncores cores} \begin{figure} \includegraphics[width=\linewidth]{images/UserFunctions_trace_\ncores.png} diff --git a/cfg/trace_analysis/paraver_configurations/MPI_call_profile.cfg b/cfg/trace_analysis/paramedir_configurations/MPI_call_profile.pm.cfg similarity index 100% rename from cfg/trace_analysis/paraver_configurations/MPI_call_profile.cfg rename to cfg/trace_analysis/paramedir_configurations/MPI_call_profile.pm.cfg -- GitLab From 042997aaea701d4e5fe2b63c031cfd3b396627dd Mon Sep 17 00:00:00 2001 From: "Oriol.Tinto.Prims" Date: Thu, 25 Jun 2020 18:03:47 +0200 Subject: [PATCH 16/26] Arch files updated --- cfg/arch/arch-O1_trace.fcm | 44 +++++++++++++++++++++++++++++++++ cfg/arch/arch-O1_vanilla.fcm | 44 +++++++++++++++++++++++++++++++++ cfg/arch/arch-xHost_trace.fcm | 44 +++++++++++++++++++++++++++++++++ cfg/arch/arch-xHost_vanilla.fcm | 44 +++++++++++++++++++++++++++++++++ 4 files changed, 176 insertions(+) create mode 100644 cfg/arch/arch-O1_trace.fcm create mode 100644 cfg/arch/arch-O1_vanilla.fcm create mode 100644 cfg/arch/arch-xHost_trace.fcm create mode 100644 cfg/arch/arch-xHost_vanilla.fcm diff --git a/cfg/arch/arch-O1_trace.fcm b/cfg/arch/arch-O1_trace.fcm new file mode 100644 index 0000000..d018655 --- /dev/null +++ b/cfg/arch/arch-O1_trace.fcm @@ -0,0 +1,44 @@ +# generic ifort compiler options for linux +# NCDF_INC netcdf include file +# NCDF_LIB netcdf library +# FC Fortran compiler command +# FCFLAGS Fortran compiler flags +# FFLAGS Fortran 77 compiler flags +# LD linker +# LDFLAGS linker flags, e.g. -L if you have libraries in a +# FPPFLAGS pre-processing flags +# AR assembler +# ARFLAGS assembler flags +# MK make +# USER_INC additional include files for the compiler, e.g. -I +# USER_LIB additional libraries to pass to the linker, e.g. -l + +%CPP fpp +%NCDF_INC -I/apps/NETCDF/4.4.1.1/INTEL/IMPI/include +%NCDF_LIB -L/apps/NETCDF/4.4.1.1/INTEL/IMPI/lib -lnetcdf -lnetcdff + +%XIOS_DIR /gpfs/projects/bsc32/bsc32870/xios/2.5/mn4-r1650-prod +%XIOS_INC -I%XIOS_DIR/inc +%XIOS_LIB %XIOS_DIR/lib/libxios.a + +%OASIS_HOME /home/bsc32/bsc32870/oasis3-mct/MN3/ +%OASIS_INC -I%OASIS_HOME/build/lib/mct -I%OASIS_HOME/build/lib/psmile.MPI1 +%OASIS_LIB -L%OASIS_HOME/lib -lpsmile.MPI1 -lmct -lmpeu -lscrip + +%RPE_DIR /gpfs/projects/bsc32/bsc32870/rpe/mn4/intel-2017.4 +%RPE_INC -I/%RPE_DIR/modules +%RPE_LIB %RPE_DIR/lib/librpe.a + +%FC mpiifort +%CC icc +%CFLAGS -O1 +%FCFLAGS -r8 -O1 -fp-model strict -extend-source 132 -heap-arrays -g -finstrument-functions +%FFFLAGS %FCFLAGS +%LD mpiifort +%FPPFLAGS -P +%LDFLAGS -lstdc++ +%AR ar +%ARFLAGS -r +%MK gmake +%USER_INC %NCDF_INC %XIOS_INC %OASIS_INC %RPE_INC +%USER_LIB %NCDF_LIB %XIOS_LIB %OASIS_LIB %RPE_LIB diff --git a/cfg/arch/arch-O1_vanilla.fcm b/cfg/arch/arch-O1_vanilla.fcm new file mode 100644 index 0000000..3c190be --- /dev/null +++ b/cfg/arch/arch-O1_vanilla.fcm @@ -0,0 +1,44 @@ +# generic ifort compiler options for linux +# NCDF_INC netcdf include file +# NCDF_LIB netcdf library +# FC Fortran compiler command +# FCFLAGS Fortran compiler flags +# FFLAGS Fortran 77 compiler flags +# LD linker +# LDFLAGS linker flags, e.g. -L if you have libraries in a +# FPPFLAGS pre-processing flags +# AR assembler +# ARFLAGS assembler flags +# MK make +# USER_INC additional include files for the compiler, e.g. -I +# USER_LIB additional libraries to pass to the linker, e.g. -l + +%CPP fpp +%NCDF_INC -I/apps/NETCDF/4.4.1.1/INTEL/IMPI/include +%NCDF_LIB -L/apps/NETCDF/4.4.1.1/INTEL/IMPI/lib -lnetcdf -lnetcdff + +%XIOS_DIR /gpfs/projects/bsc32/bsc32870/xios/2.5/mn4-r1650-prod +%XIOS_INC -I%XIOS_DIR/inc +%XIOS_LIB %XIOS_DIR/lib/libxios.a + +%OASIS_HOME /home/bsc32/bsc32870/oasis3-mct/MN3/ +%OASIS_INC -I%OASIS_HOME/build/lib/mct -I%OASIS_HOME/build/lib/psmile.MPI1 +%OASIS_LIB -L%OASIS_HOME/lib -lpsmile.MPI1 -lmct -lmpeu -lscrip + +%RPE_DIR /gpfs/projects/bsc32/bsc32870/rpe/mn4/intel-2017.4 +%RPE_INC -I/%RPE_DIR/modules +%RPE_LIB %RPE_DIR/lib/librpe.a + +%FC mpiifort +%CC icc +%CFLAGS -O1 +%FCFLAGS -r8 -O1 -fp-model strict -extend-source 132 -heap-arrays +%FFFLAGS %FCFLAGS +%LD mpiifort +%FPPFLAGS -P +%LDFLAGS -lstdc++ +%AR ar +%ARFLAGS -r +%MK gmake +%USER_INC %NCDF_INC %XIOS_INC %OASIS_INC %RPE_INC +%USER_LIB %NCDF_LIB %XIOS_LIB %OASIS_LIB %RPE_LIB diff --git a/cfg/arch/arch-xHost_trace.fcm b/cfg/arch/arch-xHost_trace.fcm new file mode 100644 index 0000000..413f065 --- /dev/null +++ b/cfg/arch/arch-xHost_trace.fcm @@ -0,0 +1,44 @@ +# generic ifort compiler options for linux +# NCDF_INC netcdf include file +# NCDF_LIB netcdf library +# FC Fortran compiler command +# FCFLAGS Fortran compiler flags +# FFLAGS Fortran 77 compiler flags +# LD linker +# LDFLAGS linker flags, e.g. -L if you have libraries in a +# FPPFLAGS pre-processing flags +# AR assembler +# ARFLAGS assembler flags +# MK make +# USER_INC additional include files for the compiler, e.g. -I +# USER_LIB additional libraries to pass to the linker, e.g. -l + +%CPP fpp +%NCDF_INC -I/apps/NETCDF/4.4.1.1/INTEL/IMPI/include +%NCDF_LIB -L/apps/NETCDF/4.4.1.1/INTEL/IMPI/lib -lnetcdf -lnetcdff + +%XIOS_DIR /gpfs/projects/bsc32/bsc32870/xios/2.5/mn4-r1650-prod +%XIOS_INC -I%XIOS_DIR/inc +%XIOS_LIB %XIOS_DIR/lib/libxios.a + +%OASIS_HOME /home/bsc32/bsc32870/oasis3-mct/MN3/ +%OASIS_INC -I%OASIS_HOME/build/lib/mct -I%OASIS_HOME/build/lib/psmile.MPI1 +%OASIS_LIB -L%OASIS_HOME/lib -lpsmile.MPI1 -lmct -lmpeu -lscrip + +%RPE_DIR /gpfs/projects/bsc32/bsc32870/rpe/mn4/intel-2017.4 +%RPE_INC -I/%RPE_DIR/modules +%RPE_LIB %RPE_DIR/lib/librpe.a + +%FC mpiifort +%CC icc +%CFLAGS -O3 +%FCFLAGS -ip -r8 -O3 -fp-model strict -extend-source 132 -heap-arrays -xHost -g -finstrument-functions +%FFFLAGS %FCFLAGS +%LD mpiifort +%FPPFLAGS -P +%LDFLAGS -lstdc++ +%AR ar +%ARFLAGS -r +%MK gmake +%USER_INC %NCDF_INC %XIOS_INC %OASIS_INC %RPE_INC +%USER_LIB %NCDF_LIB %XIOS_LIB %OASIS_LIB %RPE_LIB diff --git a/cfg/arch/arch-xHost_vanilla.fcm b/cfg/arch/arch-xHost_vanilla.fcm new file mode 100644 index 0000000..828861b --- /dev/null +++ b/cfg/arch/arch-xHost_vanilla.fcm @@ -0,0 +1,44 @@ +# generic ifort compiler options for linux +# NCDF_INC netcdf include file +# NCDF_LIB netcdf library +# FC Fortran compiler command +# FCFLAGS Fortran compiler flags +# FFLAGS Fortran 77 compiler flags +# LD linker +# LDFLAGS linker flags, e.g. -L if you have libraries in a +# FPPFLAGS pre-processing flags +# AR assembler +# ARFLAGS assembler flags +# MK make +# USER_INC additional include files for the compiler, e.g. -I +# USER_LIB additional libraries to pass to the linker, e.g. -l + +%CPP fpp +%NCDF_INC -I/apps/NETCDF/4.4.1.1/INTEL/IMPI/include +%NCDF_LIB -L/apps/NETCDF/4.4.1.1/INTEL/IMPI/lib -lnetcdf -lnetcdff + +%XIOS_DIR /gpfs/projects/bsc32/bsc32870/xios/2.5/mn4-r1650-prod +%XIOS_INC -I%XIOS_DIR/inc +%XIOS_LIB %XIOS_DIR/lib/libxios.a + +%OASIS_HOME /home/bsc32/bsc32870/oasis3-mct/MN3/ +%OASIS_INC -I%OASIS_HOME/build/lib/mct -I%OASIS_HOME/build/lib/psmile.MPI1 +%OASIS_LIB -L%OASIS_HOME/lib -lpsmile.MPI1 -lmct -lmpeu -lscrip + +%RPE_DIR /gpfs/projects/bsc32/bsc32870/rpe/mn4/intel-2017.4 +%RPE_INC -I/%RPE_DIR/modules +%RPE_LIB %RPE_DIR/lib/librpe.a + +%FC mpiifort +%CC icc +%CFLAGS -O3 +%FCFLAGS -ip -r8 -O3 -fp-model strict -extend-source 132 -heap-arrays -xHost +%FFFLAGS %FCFLAGS +%LD mpiifort +%FPPFLAGS -P +%LDFLAGS -lstdc++ +%AR ar +%ARFLAGS -r +%MK gmake +%USER_INC %NCDF_INC %XIOS_INC %OASIS_INC %RPE_INC +%USER_LIB %NCDF_LIB %XIOS_LIB %OASIS_LIB %RPE_LIB -- GitLab From 1ec9cf58073059adf70d61193132b49192fab58e Mon Sep 17 00:00:00 2001 From: "Oriol.Tinto.Prims" Date: Thu, 25 Jun 2020 18:05:03 +0200 Subject: [PATCH 17/26] Few old archfiles removed --- cfg/arch/arch-O0_gprof.fcm | 44 ----------------------------- cfg/arch/arch-mtune_gprof.fcm | 44 ----------------------------- cfg/arch/arch-mtune_trace.fcm | 44 ----------------------------- cfg/arch/arch-mtune_vanilla.fcm | 44 ----------------------------- cfg/arch/arch-nofpmodel_gprof.fcm | 44 ----------------------------- cfg/arch/arch-nofpmodel_trace.fcm | 44 ----------------------------- cfg/arch/arch-nofpmodel_vanilla.fcm | 44 ----------------------------- cfg/arch/arch-novec_gprof.fcm | 44 ----------------------------- cfg/arch/arch-novec_trace.fcm | 44 ----------------------------- cfg/arch/arch-novec_vanilla.fcm | 44 ----------------------------- cfg/arch/arch-prod_gprof.fcm | 44 ----------------------------- cfg/arch/arch-tuned_gprof.fcm | 44 ----------------------------- cfg/arch/arch-tuned_trace.fcm | 44 ----------------------------- cfg/arch/arch-tuned_vanilla.fcm | 44 ----------------------------- 14 files changed, 616 deletions(-) delete mode 100644 cfg/arch/arch-O0_gprof.fcm delete mode 100644 cfg/arch/arch-mtune_gprof.fcm delete mode 100644 cfg/arch/arch-mtune_trace.fcm delete mode 100644 cfg/arch/arch-mtune_vanilla.fcm delete mode 100644 cfg/arch/arch-nofpmodel_gprof.fcm delete mode 100644 cfg/arch/arch-nofpmodel_trace.fcm delete mode 100644 cfg/arch/arch-nofpmodel_vanilla.fcm delete mode 100644 cfg/arch/arch-novec_gprof.fcm delete mode 100644 cfg/arch/arch-novec_trace.fcm delete mode 100644 cfg/arch/arch-novec_vanilla.fcm delete mode 100644 cfg/arch/arch-prod_gprof.fcm delete mode 100644 cfg/arch/arch-tuned_gprof.fcm delete mode 100644 cfg/arch/arch-tuned_trace.fcm delete mode 100644 cfg/arch/arch-tuned_vanilla.fcm diff --git a/cfg/arch/arch-O0_gprof.fcm b/cfg/arch/arch-O0_gprof.fcm deleted file mode 100644 index 1b21fbe..0000000 --- a/cfg/arch/arch-O0_gprof.fcm +++ /dev/null @@ -1,44 +0,0 @@ -# generic ifort compiler options for linux -# NCDF_INC netcdf include file -# NCDF_LIB netcdf library -# FC Fortran compiler command -# FCFLAGS Fortran compiler flags -# FFLAGS Fortran 77 compiler flags -# LD linker -# LDFLAGS linker flags, e.g. -L if you have libraries in a -# FPPFLAGS pre-processing flags -# AR assembler -# ARFLAGS assembler flags -# MK make -# USER_INC additional include files for the compiler, e.g. -I -# USER_LIB additional libraries to pass to the linker, e.g. -l - -%CPP fpp -%NCDF_INC -I/apps/NETCDF/4.4.1.1/INTEL/IMPI/include -%NCDF_LIB -L/apps/NETCDF/4.4.1.1/INTEL/IMPI/lib -lnetcdf -lnetcdff - -%XIOS_DIR /gpfs/projects/bsc32/bsc32870/xios/2.5/mn4-r1650-prod -%XIOS_INC -I%XIOS_DIR/inc -%XIOS_LIB %XIOS_DIR/lib/libxios.a - -%OASIS_HOME /home/bsc32/bsc32870/oasis3-mct/MN3/ -%OASIS_INC -I%OASIS_HOME/build/lib/mct -I%OASIS_HOME/build/lib/psmile.MPI1 -%OASIS_LIB -L%OASIS_HOME/lib -lpsmile.MPI1 -lmct -lmpeu -lscrip - -%RPE_DIR /gpfs/projects/bsc32/bsc32870/rpe/mn4/intel-2017.4 -%RPE_INC -I/%RPE_DIR/modules -%RPE_LIB %RPE_DIR/lib/librpe.a - -%FC mpiifort -%CC icc -%CFLAGS -O3 -%FCFLAGS -r8 -O0 -fp-model strict -extend-source 132 -heap-arrays -pg -g -finstrument-functions -%FFFLAGS %FCFLAGS -%LD mpiifort -%FPPFLAGS -P -%LDFLAGS -lstdc++ -%AR ar -%ARFLAGS -r -%MK gmake -%USER_INC %NCDF_INC %XIOS_INC %OASIS_INC %RPE_INC -%USER_LIB %NCDF_LIB %XIOS_LIB %OASIS_LIB %RPE_LIB diff --git a/cfg/arch/arch-mtune_gprof.fcm b/cfg/arch/arch-mtune_gprof.fcm deleted file mode 100644 index a47eae3..0000000 --- a/cfg/arch/arch-mtune_gprof.fcm +++ /dev/null @@ -1,44 +0,0 @@ -# generic ifort compiler options for linux -# NCDF_INC netcdf include file -# NCDF_LIB netcdf library -# FC Fortran compiler command -# FCFLAGS Fortran compiler flags -# FFLAGS Fortran 77 compiler flags -# LD linker -# LDFLAGS linker flags, e.g. -L if you have libraries in a -# FPPFLAGS pre-processing flags -# AR assembler -# ARFLAGS assembler flags -# MK make -# USER_INC additional include files for the compiler, e.g. -I -# USER_LIB additional libraries to pass to the linker, e.g. -l - -%CPP fpp -%NCDF_INC -I/apps/NETCDF/4.4.1.1/INTEL/IMPI/include -%NCDF_LIB -L/apps/NETCDF/4.4.1.1/INTEL/IMPI/lib -lnetcdf -lnetcdff - -%XIOS_DIR /gpfs/projects/bsc32/bsc32870/xios/2.5/mn4-r1650-prod -%XIOS_INC -I%XIOS_DIR/inc -%XIOS_LIB %XIOS_DIR/lib/libxios.a - -%OASIS_HOME /home/bsc32/bsc32870/oasis3-mct/MN3/ -%OASIS_INC -I%OASIS_HOME/build/lib/mct -I%OASIS_HOME/build/lib/psmile.MPI1 -%OASIS_LIB -L%OASIS_HOME/lib -lpsmile.MPI1 -lmct -lmpeu -lscrip - -%RPE_DIR /gpfs/projects/bsc32/bsc32870/rpe/mn4/intel-2017.4 -%RPE_INC -I/%RPE_DIR/modules -%RPE_LIB %RPE_DIR/lib/librpe.a - -%FC mpiifort -%CC icc -%CFLAGS -O3 -%FCFLAGS -ip -r8 -Ofast -fp-model fast=2 -extend-source 132 -heap-arrays -xHost -mtune=skylake -pg -g -finstrument-functions -%FFFLAGS %FCFLAGS -%LD mpiifort -%FPPFLAGS -P -%LDFLAGS -lstdc++ -pg -%AR ar -%ARFLAGS -r -%MK gmake -%USER_INC %NCDF_INC %XIOS_INC %OASIS_INC %RPE_INC -%USER_LIB %NCDF_LIB %XIOS_LIB %OASIS_LIB %RPE_LIB diff --git a/cfg/arch/arch-mtune_trace.fcm b/cfg/arch/arch-mtune_trace.fcm deleted file mode 100644 index e46d16d..0000000 --- a/cfg/arch/arch-mtune_trace.fcm +++ /dev/null @@ -1,44 +0,0 @@ -# generic ifort compiler options for linux -# NCDF_INC netcdf include file -# NCDF_LIB netcdf library -# FC Fortran compiler command -# FCFLAGS Fortran compiler flags -# FFLAGS Fortran 77 compiler flags -# LD linker -# LDFLAGS linker flags, e.g. -L if you have libraries in a -# FPPFLAGS pre-processing flags -# AR assembler -# ARFLAGS assembler flags -# MK make -# USER_INC additional include files for the compiler, e.g. -I -# USER_LIB additional libraries to pass to the linker, e.g. -l - -%CPP fpp -%NCDF_INC -I/apps/NETCDF/4.4.1.1/INTEL/IMPI/include -%NCDF_LIB -L/apps/NETCDF/4.4.1.1/INTEL/IMPI/lib -lnetcdf -lnetcdff - -%XIOS_DIR /gpfs/projects/bsc32/bsc32870/xios/2.5/mn4-r1650-prod -%XIOS_INC -I%XIOS_DIR/inc -%XIOS_LIB %XIOS_DIR/lib/libxios.a - -%OASIS_HOME /home/bsc32/bsc32870/oasis3-mct/MN3/ -%OASIS_INC -I%OASIS_HOME/build/lib/mct -I%OASIS_HOME/build/lib/psmile.MPI1 -%OASIS_LIB -L%OASIS_HOME/lib -lpsmile.MPI1 -lmct -lmpeu -lscrip - -%RPE_DIR /gpfs/projects/bsc32/bsc32870/rpe/mn4/intel-2017.4 -%RPE_INC -I/%RPE_DIR/modules -%RPE_LIB %RPE_DIR/lib/librpe.a - -%FC mpiifort -%CC icc -%CFLAGS -O3 -%FCFLAGS -ip -r8 -Ofast -fp-model fast=2 -extend-source 132 -heap-arrays -xHost -mtune=skylake -g -finstrument-functions -%FFFLAGS %FCFLAGS -%LD mpiifort -%FPPFLAGS -P -%LDFLAGS -lstdc++ -%AR ar -%ARFLAGS -r -%MK gmake -%USER_INC %NCDF_INC %XIOS_INC %OASIS_INC %RPE_INC -%USER_LIB %NCDF_LIB %XIOS_LIB %OASIS_LIB %RPE_LIB diff --git a/cfg/arch/arch-mtune_vanilla.fcm b/cfg/arch/arch-mtune_vanilla.fcm deleted file mode 100644 index af5bfa1..0000000 --- a/cfg/arch/arch-mtune_vanilla.fcm +++ /dev/null @@ -1,44 +0,0 @@ -# generic ifort compiler options for linux -# NCDF_INC netcdf include file -# NCDF_LIB netcdf library -# FC Fortran compiler command -# FCFLAGS Fortran compiler flags -# FFLAGS Fortran 77 compiler flags -# LD linker -# LDFLAGS linker flags, e.g. -L if you have libraries in a -# FPPFLAGS pre-processing flags -# AR assembler -# ARFLAGS assembler flags -# MK make -# USER_INC additional include files for the compiler, e.g. -I -# USER_LIB additional libraries to pass to the linker, e.g. -l - -%CPP fpp -%NCDF_INC -I/apps/NETCDF/4.4.1.1/INTEL/IMPI/include -%NCDF_LIB -L/apps/NETCDF/4.4.1.1/INTEL/IMPI/lib -lnetcdf -lnetcdff - -%XIOS_DIR /gpfs/projects/bsc32/bsc32870/xios/2.5/mn4-r1650-prod -%XIOS_INC -I%XIOS_DIR/inc -%XIOS_LIB %XIOS_DIR/lib/libxios.a - -%OASIS_HOME /home/bsc32/bsc32870/oasis3-mct/MN3/ -%OASIS_INC -I%OASIS_HOME/build/lib/mct -I%OASIS_HOME/build/lib/psmile.MPI1 -%OASIS_LIB -L%OASIS_HOME/lib -lpsmile.MPI1 -lmct -lmpeu -lscrip - -%RPE_DIR /gpfs/projects/bsc32/bsc32870/rpe/mn4/intel-2017.4 -%RPE_INC -I/%RPE_DIR/modules -%RPE_LIB %RPE_DIR/lib/librpe.a - -%FC mpiifort -%CC icc -%CFLAGS -O3 -%FCFLAGS -ip -r8 -Ofast -fp-model fast=2 -extend-source 132 -heap-arrays -xHost -mtune=skylake -%FFFLAGS %FCFLAGS -%LD mpiifort -%FPPFLAGS -P -%LDFLAGS -lstdc++ -%AR ar -%ARFLAGS -r -%MK gmake -%USER_INC %NCDF_INC %XIOS_INC %OASIS_INC %RPE_INC -%USER_LIB %NCDF_LIB %XIOS_LIB %OASIS_LIB %RPE_LIB diff --git a/cfg/arch/arch-nofpmodel_gprof.fcm b/cfg/arch/arch-nofpmodel_gprof.fcm deleted file mode 100644 index 15670b4..0000000 --- a/cfg/arch/arch-nofpmodel_gprof.fcm +++ /dev/null @@ -1,44 +0,0 @@ -# generic ifort compiler options for linux -# NCDF_INC netcdf include file -# NCDF_LIB netcdf library -# FC Fortran compiler command -# FCFLAGS Fortran compiler flags -# FFLAGS Fortran 77 compiler flags -# LD linker -# LDFLAGS linker flags, e.g. -L if you have libraries in a -# FPPFLAGS pre-processing flags -# AR assembler -# ARFLAGS assembler flags -# MK make -# USER_INC additional include files for the compiler, e.g. -I -# USER_LIB additional libraries to pass to the linker, e.g. -l - -%CPP fpp -%NCDF_INC -I/apps/NETCDF/4.4.1.1/INTEL/IMPI/include -%NCDF_LIB -L/apps/NETCDF/4.4.1.1/INTEL/IMPI/lib -lnetcdf -lnetcdff - -%XIOS_DIR /gpfs/projects/bsc32/bsc32870/xios/2.5/mn4-r1650-prod -%XIOS_INC -I%XIOS_DIR/inc -%XIOS_LIB %XIOS_DIR/lib/libxios.a - -%OASIS_HOME /home/bsc32/bsc32870/oasis3-mct/MN3/ -%OASIS_INC -I%OASIS_HOME/build/lib/mct -I%OASIS_HOME/build/lib/psmile.MPI1 -%OASIS_LIB -L%OASIS_HOME/lib -lpsmile.MPI1 -lmct -lmpeu -lscrip - -%RPE_DIR /gpfs/projects/bsc32/bsc32870/rpe/mn4/intel-2017.4 -%RPE_INC -I/%RPE_DIR/modules -%RPE_LIB %RPE_DIR/lib/librpe.a - -%FC mpiifort -%CC icc -%CFLAGS -O3 -%FCFLAGS -ip -r8 -O3 -extend-source 132 -heap-arrays -g -pg -finstrument-functions -%FFFLAGS %FCFLAGS -%LD mpiifort -%FPPFLAGS -P -%LDFLAGS -lstdc++ -pg -%AR ar -%ARFLAGS -r -%MK gmake -%USER_INC %NCDF_INC %XIOS_INC %OASIS_INC %RPE_INC -%USER_LIB %NCDF_LIB %XIOS_LIB %OASIS_LIB %RPE_LIB diff --git a/cfg/arch/arch-nofpmodel_trace.fcm b/cfg/arch/arch-nofpmodel_trace.fcm deleted file mode 100644 index f465053..0000000 --- a/cfg/arch/arch-nofpmodel_trace.fcm +++ /dev/null @@ -1,44 +0,0 @@ -# generic ifort compiler options for linux -# NCDF_INC netcdf include file -# NCDF_LIB netcdf library -# FC Fortran compiler command -# FCFLAGS Fortran compiler flags -# FFLAGS Fortran 77 compiler flags -# LD linker -# LDFLAGS linker flags, e.g. -L if you have libraries in a -# FPPFLAGS pre-processing flags -# AR assembler -# ARFLAGS assembler flags -# MK make -# USER_INC additional include files for the compiler, e.g. -I -# USER_LIB additional libraries to pass to the linker, e.g. -l - -%CPP fpp -%NCDF_INC -I/apps/NETCDF/4.4.1.1/INTEL/IMPI/include -%NCDF_LIB -L/apps/NETCDF/4.4.1.1/INTEL/IMPI/lib -lnetcdf -lnetcdff - -%XIOS_DIR /gpfs/projects/bsc32/bsc32870/xios/2.5/mn4-r1650-prod -%XIOS_INC -I%XIOS_DIR/inc -%XIOS_LIB %XIOS_DIR/lib/libxios.a - -%OASIS_HOME /home/bsc32/bsc32870/oasis3-mct/MN3/ -%OASIS_INC -I%OASIS_HOME/build/lib/mct -I%OASIS_HOME/build/lib/psmile.MPI1 -%OASIS_LIB -L%OASIS_HOME/lib -lpsmile.MPI1 -lmct -lmpeu -lscrip - -%RPE_DIR /gpfs/projects/bsc32/bsc32870/rpe/mn4/intel-2017.4 -%RPE_INC -I/%RPE_DIR/modules -%RPE_LIB %RPE_DIR/lib/librpe.a - -%FC mpiifort -%CC icc -%CFLAGS -O3 -%FCFLAGS -ip -r8 -O3 -extend-source 132 -heap-arrays -g -finstrument-functions -%FFFLAGS %FCFLAGS -%LD mpiifort -%FPPFLAGS -P -%LDFLAGS -lstdc++ -%AR ar -%ARFLAGS -r -%MK gmake -%USER_INC %NCDF_INC %XIOS_INC %OASIS_INC %RPE_INC -%USER_LIB %NCDF_LIB %XIOS_LIB %OASIS_LIB %RPE_LIB diff --git a/cfg/arch/arch-nofpmodel_vanilla.fcm b/cfg/arch/arch-nofpmodel_vanilla.fcm deleted file mode 100644 index 1de6568..0000000 --- a/cfg/arch/arch-nofpmodel_vanilla.fcm +++ /dev/null @@ -1,44 +0,0 @@ -# generic ifort compiler options for linux -# NCDF_INC netcdf include file -# NCDF_LIB netcdf library -# FC Fortran compiler command -# FCFLAGS Fortran compiler flags -# FFLAGS Fortran 77 compiler flags -# LD linker -# LDFLAGS linker flags, e.g. -L if you have libraries in a -# FPPFLAGS pre-processing flags -# AR assembler -# ARFLAGS assembler flags -# MK make -# USER_INC additional include files for the compiler, e.g. -I -# USER_LIB additional libraries to pass to the linker, e.g. -l - -%CPP fpp -%NCDF_INC -I/apps/NETCDF/4.4.1.1/INTEL/IMPI/include -%NCDF_LIB -L/apps/NETCDF/4.4.1.1/INTEL/IMPI/lib -lnetcdf -lnetcdff - -%XIOS_DIR /gpfs/projects/bsc32/bsc32870/xios/2.5/mn4-r1650-prod -%XIOS_INC -I%XIOS_DIR/inc -%XIOS_LIB %XIOS_DIR/lib/libxios.a - -%OASIS_HOME /home/bsc32/bsc32870/oasis3-mct/MN3/ -%OASIS_INC -I%OASIS_HOME/build/lib/mct -I%OASIS_HOME/build/lib/psmile.MPI1 -%OASIS_LIB -L%OASIS_HOME/lib -lpsmile.MPI1 -lmct -lmpeu -lscrip - -%RPE_DIR /gpfs/projects/bsc32/bsc32870/rpe/mn4/intel-2017.4 -%RPE_INC -I/%RPE_DIR/modules -%RPE_LIB %RPE_DIR/lib/librpe.a - -%FC mpiifort -%CC icc -%CFLAGS -O3 -%FCFLAGS -ip -r8 -Ofast -fp-model fast=2 -extend-source 132 -heap-arrays -%FFFLAGS %FCFLAGS -%LD mpiifort -%FPPFLAGS -P -%LDFLAGS -lstdc++ -%AR ar -%ARFLAGS -r -%MK gmake -%USER_INC %NCDF_INC %XIOS_INC %OASIS_INC %RPE_INC -%USER_LIB %NCDF_LIB %XIOS_LIB %OASIS_LIB %RPE_LIB diff --git a/cfg/arch/arch-novec_gprof.fcm b/cfg/arch/arch-novec_gprof.fcm deleted file mode 100644 index 6add89c..0000000 --- a/cfg/arch/arch-novec_gprof.fcm +++ /dev/null @@ -1,44 +0,0 @@ -# generic ifort compiler options for linux -# NCDF_INC netcdf include file -# NCDF_LIB netcdf library -# FC Fortran compiler command -# FCFLAGS Fortran compiler flags -# FFLAGS Fortran 77 compiler flags -# LD linker -# LDFLAGS linker flags, e.g. -L if you have libraries in a -# FPPFLAGS pre-processing flags -# AR assembler -# ARFLAGS assembler flags -# MK make -# USER_INC additional include files for the compiler, e.g. -I -# USER_LIB additional libraries to pass to the linker, e.g. -l - -%CPP fpp -%NCDF_INC -I/apps/NETCDF/4.4.1.1/INTEL/IMPI/include -%NCDF_LIB -L/apps/NETCDF/4.4.1.1/INTEL/IMPI/lib -lnetcdf -lnetcdff - -%XIOS_DIR /gpfs/projects/bsc32/bsc32870/xios/2.5/mn4-r1650-prod -%XIOS_INC -I%XIOS_DIR/inc -%XIOS_LIB %XIOS_DIR/lib/libxios.a - -%OASIS_HOME /home/bsc32/bsc32870/oasis3-mct/MN3/ -%OASIS_INC -I%OASIS_HOME/build/lib/mct -I%OASIS_HOME/build/lib/psmile.MPI1 -%OASIS_LIB -L%OASIS_HOME/lib -lpsmile.MPI1 -lmct -lmpeu -lscrip - -%RPE_DIR /gpfs/projects/bsc32/bsc32870/rpe/mn4/intel-2017.4 -%RPE_INC -I/%RPE_DIR/modules -%RPE_LIB %RPE_DIR/lib/librpe.a - -%FC mpiifort -%CC icc -%CFLAGS -O3 -%FCFLAGS -ip -r8 -O1 -fp-model strict -extend-source 132 -heap-arrays -g -pg -finstrument-functions -%FFFLAGS %FCFLAGS -%LD mpiifort -%FPPFLAGS -P -%LDFLAGS -lstdc++ -pg -%AR ar -%ARFLAGS -r -%MK gmake -%USER_INC %NCDF_INC %XIOS_INC %OASIS_INC %RPE_INC -%USER_LIB %NCDF_LIB %XIOS_LIB %OASIS_LIB %RPE_LIB diff --git a/cfg/arch/arch-novec_trace.fcm b/cfg/arch/arch-novec_trace.fcm deleted file mode 100644 index 2f45880..0000000 --- a/cfg/arch/arch-novec_trace.fcm +++ /dev/null @@ -1,44 +0,0 @@ -# generic ifort compiler options for linux -# NCDF_INC netcdf include file -# NCDF_LIB netcdf library -# FC Fortran compiler command -# FCFLAGS Fortran compiler flags -# FFLAGS Fortran 77 compiler flags -# LD linker -# LDFLAGS linker flags, e.g. -L if you have libraries in a -# FPPFLAGS pre-processing flags -# AR assembler -# ARFLAGS assembler flags -# MK make -# USER_INC additional include files for the compiler, e.g. -I -# USER_LIB additional libraries to pass to the linker, e.g. -l - -%CPP fpp -%NCDF_INC -I/apps/NETCDF/4.4.1.1/INTEL/IMPI/include -%NCDF_LIB -L/apps/NETCDF/4.4.1.1/INTEL/IMPI/lib -lnetcdf -lnetcdff - -%XIOS_DIR /gpfs/projects/bsc32/bsc32870/xios/2.5/mn4-r1650-prod -%XIOS_INC -I%XIOS_DIR/inc -%XIOS_LIB %XIOS_DIR/lib/libxios.a - -%OASIS_HOME /home/bsc32/bsc32870/oasis3-mct/MN3/ -%OASIS_INC -I%OASIS_HOME/build/lib/mct -I%OASIS_HOME/build/lib/psmile.MPI1 -%OASIS_LIB -L%OASIS_HOME/lib -lpsmile.MPI1 -lmct -lmpeu -lscrip - -%RPE_DIR /gpfs/projects/bsc32/bsc32870/rpe/mn4/intel-2017.4 -%RPE_INC -I/%RPE_DIR/modules -%RPE_LIB %RPE_DIR/lib/librpe.a - -%FC mpiifort -%CC icc -%CFLAGS -O3 -%FCFLAGS -ip -r8 -O1 -fp-model strict -extend-source 132 -heap-arrays -g -finstrument-functions -%FFFLAGS %FCFLAGS -%LD mpiifort -%FPPFLAGS -P -%LDFLAGS -lstdc++ -%AR ar -%ARFLAGS -r -%MK gmake -%USER_INC %NCDF_INC %XIOS_INC %OASIS_INC %RPE_INC -%USER_LIB %NCDF_LIB %XIOS_LIB %OASIS_LIB %RPE_LIB diff --git a/cfg/arch/arch-novec_vanilla.fcm b/cfg/arch/arch-novec_vanilla.fcm deleted file mode 100644 index 6e8497d..0000000 --- a/cfg/arch/arch-novec_vanilla.fcm +++ /dev/null @@ -1,44 +0,0 @@ -# generic ifort compiler options for linux -# NCDF_INC netcdf include file -# NCDF_LIB netcdf library -# FC Fortran compiler command -# FCFLAGS Fortran compiler flags -# FFLAGS Fortran 77 compiler flags -# LD linker -# LDFLAGS linker flags, e.g. -L if you have libraries in a -# FPPFLAGS pre-processing flags -# AR assembler -# ARFLAGS assembler flags -# MK make -# USER_INC additional include files for the compiler, e.g. -I -# USER_LIB additional libraries to pass to the linker, e.g. -l - -%CPP fpp -%NCDF_INC -I/apps/NETCDF/4.4.1.1/INTEL/IMPI/include -%NCDF_LIB -L/apps/NETCDF/4.4.1.1/INTEL/IMPI/lib -lnetcdf -lnetcdff - -%XIOS_DIR /gpfs/projects/bsc32/bsc32870/xios/2.5/mn4-r1650-prod -%XIOS_INC -I%XIOS_DIR/inc -%XIOS_LIB %XIOS_DIR/lib/libxios.a - -%OASIS_HOME /home/bsc32/bsc32870/oasis3-mct/MN3/ -%OASIS_INC -I%OASIS_HOME/build/lib/mct -I%OASIS_HOME/build/lib/psmile.MPI1 -%OASIS_LIB -L%OASIS_HOME/lib -lpsmile.MPI1 -lmct -lmpeu -lscrip - -%RPE_DIR /gpfs/projects/bsc32/bsc32870/rpe/mn4/intel-2017.4 -%RPE_INC -I/%RPE_DIR/modules -%RPE_LIB %RPE_DIR/lib/librpe.a - -%FC mpiifort -%CC icc -%CFLAGS -O3 -%FCFLAGS -ip -r8 -O1 -fp-model strict -extend-source 132 -heap-arrays -%FFFLAGS %FCFLAGS -%LD mpiifort -%FPPFLAGS -P -%LDFLAGS -lstdc++ -%AR ar -%ARFLAGS -r -%MK gmake -%USER_INC %NCDF_INC %XIOS_INC %OASIS_INC %RPE_INC -%USER_LIB %NCDF_LIB %XIOS_LIB %OASIS_LIB %RPE_LIB diff --git a/cfg/arch/arch-prod_gprof.fcm b/cfg/arch/arch-prod_gprof.fcm deleted file mode 100644 index d12e654..0000000 --- a/cfg/arch/arch-prod_gprof.fcm +++ /dev/null @@ -1,44 +0,0 @@ -# generic ifort compiler options for linux -# NCDF_INC netcdf include file -# NCDF_LIB netcdf library -# FC Fortran compiler command -# FCFLAGS Fortran compiler flags -# FFLAGS Fortran 77 compiler flags -# LD linker -# LDFLAGS linker flags, e.g. -L if you have libraries in a -# FPPFLAGS pre-processing flags -# AR assembler -# ARFLAGS assembler flags -# MK make -# USER_INC additional include files for the compiler, e.g. -I -# USER_LIB additional libraries to pass to the linker, e.g. -l - -%CPP fpp -%NCDF_INC -I/apps/NETCDF/4.4.1.1/INTEL/IMPI/include -%NCDF_LIB -L/apps/NETCDF/4.4.1.1/INTEL/IMPI/lib -lnetcdf -lnetcdff - -%XIOS_DIR /gpfs/projects/bsc32/bsc32870/xios/2.5/mn4-r1650-prod -%XIOS_INC -I%XIOS_DIR/inc -%XIOS_LIB %XIOS_DIR/lib/libxios.a - -%OASIS_HOME /home/bsc32/bsc32870/oasis3-mct/MN3/ -%OASIS_INC -I%OASIS_HOME/build/lib/mct -I%OASIS_HOME/build/lib/psmile.MPI1 -%OASIS_LIB -L%OASIS_HOME/lib -lpsmile.MPI1 -lmct -lmpeu -lscrip - -%RPE_DIR /gpfs/projects/bsc32/bsc32870/rpe/mn4/intel-2017.4 -%RPE_INC -I/%RPE_DIR/modules -%RPE_LIB %RPE_DIR/lib/librpe.a - -%FC mpiifort -%CC icc -%CFLAGS -O3 -%FCFLAGS -ip -r8 -O3 -fp-model strict -extend-source 132 -heap-arrays -g -pg -finstrument-functions -%FFFLAGS %FCFLAGS -%LD mpiifort -%FPPFLAGS -P -%LDFLAGS -lstdc++ -pg -%AR ar -%ARFLAGS -r -%MK gmake -%USER_INC %NCDF_INC %XIOS_INC %OASIS_INC %RPE_INC -%USER_LIB %NCDF_LIB %XIOS_LIB %OASIS_LIB %RPE_LIB diff --git a/cfg/arch/arch-tuned_gprof.fcm b/cfg/arch/arch-tuned_gprof.fcm deleted file mode 100644 index 1215be5..0000000 --- a/cfg/arch/arch-tuned_gprof.fcm +++ /dev/null @@ -1,44 +0,0 @@ -# generic ifort compiler options for linux -# NCDF_INC netcdf include file -# NCDF_LIB netcdf library -# FC Fortran compiler command -# FCFLAGS Fortran compiler flags -# FFLAGS Fortran 77 compiler flags -# LD linker -# LDFLAGS linker flags, e.g. -L if you have libraries in a -# FPPFLAGS pre-processing flags -# AR assembler -# ARFLAGS assembler flags -# MK make -# USER_INC additional include files for the compiler, e.g. -I -# USER_LIB additional libraries to pass to the linker, e.g. -l - -%CPP fpp -%NCDF_INC -I/apps/NETCDF/4.4.1.1/INTEL/IMPI/include -%NCDF_LIB -L/apps/NETCDF/4.4.1.1/INTEL/IMPI/lib -lnetcdf -lnetcdff - -%XIOS_DIR /gpfs/projects/bsc32/bsc32870/xios/2.5/mn4-r1650-prod -%XIOS_INC -I%XIOS_DIR/inc -%XIOS_LIB %XIOS_DIR/lib/libxios.a - -%OASIS_HOME /home/bsc32/bsc32870/oasis3-mct/MN3/ -%OASIS_INC -I%OASIS_HOME/build/lib/mct -I%OASIS_HOME/build/lib/psmile.MPI1 -%OASIS_LIB -L%OASIS_HOME/lib -lpsmile.MPI1 -lmct -lmpeu -lscrip - -%RPE_DIR /gpfs/projects/bsc32/bsc32870/rpe/mn4/intel-2017.4 -%RPE_INC -I/%RPE_DIR/modules -%RPE_LIB %RPE_DIR/lib/librpe.a - -%FC mpiifort -%CC icc -%CFLAGS -O3 -%FCFLAGS -ip -r8 -Ofast -fp-model fast=2 -extend-source 132 -heap-arrays -xHost -pg -g -finstrument-functions -%FFFLAGS %FCFLAGS -%LD mpiifort -%FPPFLAGS -P -%LDFLAGS -lstdc++ -%AR ar -%ARFLAGS -r -%MK gmake -%USER_INC %NCDF_INC %XIOS_INC %OASIS_INC %RPE_INC -%USER_LIB %NCDF_LIB %XIOS_LIB %OASIS_LIB %RPE_LIB diff --git a/cfg/arch/arch-tuned_trace.fcm b/cfg/arch/arch-tuned_trace.fcm deleted file mode 100644 index 1f851cc..0000000 --- a/cfg/arch/arch-tuned_trace.fcm +++ /dev/null @@ -1,44 +0,0 @@ -# generic ifort compiler options for linux -# NCDF_INC netcdf include file -# NCDF_LIB netcdf library -# FC Fortran compiler command -# FCFLAGS Fortran compiler flags -# FFLAGS Fortran 77 compiler flags -# LD linker -# LDFLAGS linker flags, e.g. -L if you have libraries in a -# FPPFLAGS pre-processing flags -# AR assembler -# ARFLAGS assembler flags -# MK make -# USER_INC additional include files for the compiler, e.g. -I -# USER_LIB additional libraries to pass to the linker, e.g. -l - -%CPP fpp -%NCDF_INC -I/apps/NETCDF/4.4.1.1/INTEL/IMPI/include -%NCDF_LIB -L/apps/NETCDF/4.4.1.1/INTEL/IMPI/lib -lnetcdf -lnetcdff - -%XIOS_DIR /gpfs/projects/bsc32/bsc32870/xios/2.5/mn4-r1650-prod -%XIOS_INC -I%XIOS_DIR/inc -%XIOS_LIB %XIOS_DIR/lib/libxios.a - -%OASIS_HOME /home/bsc32/bsc32870/oasis3-mct/MN3/ -%OASIS_INC -I%OASIS_HOME/build/lib/mct -I%OASIS_HOME/build/lib/psmile.MPI1 -%OASIS_LIB -L%OASIS_HOME/lib -lpsmile.MPI1 -lmct -lmpeu -lscrip - -%RPE_DIR /gpfs/projects/bsc32/bsc32870/rpe/mn4/intel-2017.4 -%RPE_INC -I/%RPE_DIR/modules -%RPE_LIB %RPE_DIR/lib/librpe.a - -%FC mpiifort -%CC icc -%CFLAGS -O3 -%FCFLAGS -ip -r8 -Ofast -fp-model fast=2 -extend-source 132 -heap-arrays -xHost -g -finstrument-functions -%FFFLAGS %FCFLAGS -%LD mpiifort -%FPPFLAGS -P -%LDFLAGS -lstdc++ -%AR ar -%ARFLAGS -r -%MK gmake -%USER_INC %NCDF_INC %XIOS_INC %OASIS_INC %RPE_INC -%USER_LIB %NCDF_LIB %XIOS_LIB %OASIS_LIB %RPE_LIB diff --git a/cfg/arch/arch-tuned_vanilla.fcm b/cfg/arch/arch-tuned_vanilla.fcm deleted file mode 100644 index 5d662c6..0000000 --- a/cfg/arch/arch-tuned_vanilla.fcm +++ /dev/null @@ -1,44 +0,0 @@ -# generic ifort compiler options for linux -# NCDF_INC netcdf include file -# NCDF_LIB netcdf library -# FC Fortran compiler command -# FCFLAGS Fortran compiler flags -# FFLAGS Fortran 77 compiler flags -# LD linker -# LDFLAGS linker flags, e.g. -L if you have libraries in a -# FPPFLAGS pre-processing flags -# AR assembler -# ARFLAGS assembler flags -# MK make -# USER_INC additional include files for the compiler, e.g. -I -# USER_LIB additional libraries to pass to the linker, e.g. -l - -%CPP fpp -%NCDF_INC -I/apps/NETCDF/4.4.1.1/INTEL/IMPI/include -%NCDF_LIB -L/apps/NETCDF/4.4.1.1/INTEL/IMPI/lib -lnetcdf -lnetcdff - -%XIOS_DIR /gpfs/projects/bsc32/bsc32870/xios/2.5/mn4-r1650-prod -%XIOS_INC -I%XIOS_DIR/inc -%XIOS_LIB %XIOS_DIR/lib/libxios.a - -%OASIS_HOME /home/bsc32/bsc32870/oasis3-mct/MN3/ -%OASIS_INC -I%OASIS_HOME/build/lib/mct -I%OASIS_HOME/build/lib/psmile.MPI1 -%OASIS_LIB -L%OASIS_HOME/lib -lpsmile.MPI1 -lmct -lmpeu -lscrip - -%RPE_DIR /gpfs/projects/bsc32/bsc32870/rpe/mn4/intel-2017.4 -%RPE_INC -I/%RPE_DIR/modules -%RPE_LIB %RPE_DIR/lib/librpe.a - -%FC mpiifort -%CC icc -%CFLAGS -O3 -%FCFLAGS -ip -r8 -Ofast -fp-model fast=2 -extend-source 132 -heap-arrays -xHost -%FFFLAGS %FCFLAGS -%LD mpiifort -%FPPFLAGS -P -%LDFLAGS -lstdc++ -%AR ar -%ARFLAGS -r -%MK gmake -%USER_INC %NCDF_INC %XIOS_INC %OASIS_INC %RPE_INC -%USER_LIB %NCDF_LIB %XIOS_LIB %OASIS_LIB %RPE_LIB -- GitLab From 176803c337071406c370458781c6fdf37560810e Mon Sep 17 00:00:00 2001 From: "Oriol.Tinto.Prims" Date: Thu, 25 Jun 2020 18:05:47 +0200 Subject: [PATCH 18/26] Experiment launcher updated to take folder as input --- experiment_launcher.cmd | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/experiment_launcher.cmd b/experiment_launcher.cmd index 62bbbbd..9e557f5 100755 --- a/experiment_launcher.cmd +++ b/experiment_launcher.cmd @@ -1,7 +1,17 @@ # Script to control a multiexperiment experiments_folder=experiments -experiment_configurations_folder=experiments_to_run +experiment_configurations_folder=$1 + +# Some sanity checks +if [ -z "$1" ] ; then + echo "Argument required" + exit 1 +fi +if [ ! -d "$1" ] ; then + echo "Not a folder" + exit 1 +fi # Create experiments folder if it does not exist [ ! -d experiments ] && mkdir ${experiments_folder} @@ -11,6 +21,9 @@ experiment_configurations=$( ls ${experiment_configurations_folder} ) # For each experiment clone the repo there for experiment in ${experiment_configurations} ; do + if [ -d ${${experiments_folder}/${experiment} ] ; then + continue + fi # Clone repository to the new experiment folder git clone . ${experiments_folder}/${experiment} # Copy the configuration file into the new folder -- GitLab From 83b822d8f8e3927793d4d904035cb902922d44f4 Mon Sep 17 00:00:00 2001 From: "Oriol.Tinto.Prims" Date: Fri, 26 Jun 2020 09:17:36 +0200 Subject: [PATCH 19/26] Bugfix in experiment_launcher.cmd --- experiment_launcher.cmd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/experiment_launcher.cmd b/experiment_launcher.cmd index 9e557f5..f002c73 100755 --- a/experiment_launcher.cmd +++ b/experiment_launcher.cmd @@ -21,7 +21,7 @@ experiment_configurations=$( ls ${experiment_configurations_folder} ) # For each experiment clone the repo there for experiment in ${experiment_configurations} ; do - if [ -d ${${experiments_folder}/${experiment} ] ; then + if [ -d ${experiments_folder}/${experiment} ] ; then continue fi # Clone repository to the new experiment folder -- GitLab From 11b146ba7c06bde6046d0e3fe74c12761cac4932 Mon Sep 17 00:00:00 2001 From: "Oriol.Tinto.Prims" Date: Fri, 26 Jun 2020 09:42:21 +0200 Subject: [PATCH 20/26] Bugfix in paramedir dependencies --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 829dd5d..2884709 100644 --- a/Makefile +++ b/Makefile @@ -144,7 +144,7 @@ extrae_functions.txt: functions_dir paramedir_configurations=$(wildcard ${analysis_tools}/paramedir_configurations/*) -.paramedir_%.done: .Trace_%.done | images_folder +.paramedir_%.done: .trace_cut_%.done | images_folder # Variable which contains traces' folder name $(eval $@_trace_folder := $(shell echo ${trace_folder_prefix}_$*)) # Enter directory and process all paramedir configurations -- GitLab From 2e22bc80c31c2a82964fe7d2942f499da4eeb11c Mon Sep 17 00:00:00 2001 From: "Oriol.Tinto.Prims" Date: Fri, 26 Jun 2020 11:04:22 +0200 Subject: [PATCH 21/26] Using a specific EXTRAE version since latest was giving problems --- cfg/generate_func_list/jobscript.cmd | 2 +- cfg/trace/jobscript.cmd | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cfg/generate_func_list/jobscript.cmd b/cfg/generate_func_list/jobscript.cmd index 3459859..1cd8e67 100644 --- a/cfg/generate_func_list/jobscript.cmd +++ b/cfg/generate_func_list/jobscript.cmd @@ -15,7 +15,7 @@ n_functions=80 # Load EXTRAE module and create wrapper module load gcc/8.1.0 -module load EXTRAE +module load EXTRAE/3.7.1 trace=./trace.sh cat << EOF > $trace diff --git a/cfg/trace/jobscript.cmd b/cfg/trace/jobscript.cmd index 510acb8..4fd9188 100644 --- a/cfg/trace/jobscript.cmd +++ b/cfg/trace/jobscript.cmd @@ -18,7 +18,7 @@ source modules.env # Load EXTRAE module and create wrapper module load gcc/8.1.0 -module load EXTRAE +module load EXTRAE/3.7.1 trace=trace.sh cat << EOF > $trace -- GitLab From 3d2d34073b5f1c604dd1f85108946816fe05db73 Mon Sep 17 00:00:00 2001 From: "Oriol.Tinto.Prims" Date: Fri, 26 Jun 2020 15:40:23 +0200 Subject: [PATCH 22/26] paramedir configuration renaming --- .../MPIcallprofile.pm.cfg | 77 +++++++++++++++++++ 1 file changed, 77 insertions(+) create mode 100644 cfg/trace_analysis/paramedir_configurations/MPIcallprofile.pm.cfg diff --git a/cfg/trace_analysis/paramedir_configurations/MPIcallprofile.pm.cfg b/cfg/trace_analysis/paramedir_configurations/MPIcallprofile.pm.cfg new file mode 100644 index 0000000..c29796a --- /dev/null +++ b/cfg/trace_analysis/paramedir_configurations/MPIcallprofile.pm.cfg @@ -0,0 +1,77 @@ +#ParaverCFG +ConfigFile.Version: 3.4 +ConfigFile.NumWindows: 1 + + +################################################################################ +< NEW DISPLAYING WINDOW MPI call > +################################################################################ +window_name MPI call +window_type single +window_id 1 +window_position_x 377 +window_position_y 288 +window_width 600 +window_height 114 +window_comm_lines_enabled false +window_flags_enabled false +window_noncolor_mode true +window_logical_filtered true +window_physical_filtered false +window_comm_fromto true +window_comm_tagsize true +window_comm_typeval true +window_units Microseconds +window_maximum_y 70.000000000000 +window_minimum_y 0.000000000000 +window_compute_y_max false +window_level thread +window_scale_relative 1.000000000000 +window_end_time_relative 1.000000000000 +window_object appl { 1, { All } } +window_begin_time_relative 0.000000000000 +window_open false +window_drawmode draw_maximum +window_drawmode_rows draw_maximum +window_pixel_size 1 +window_labels_to_draw 1 +window_selected_functions { 14, { {cpu, Active Thd}, {appl, Adding}, {task, Thread i}, {thread, Last Evt Val}, {node, Adding}, {system, Adding}, {workload, Adding}, {from_obj, All}, {to_obj, All}, {tag_msg, All}, {size_msg, All}, {bw_msg, All}, {evt_type, [x,y]}, {evt_value, All} } } +window_compose_functions { 9, { {compose_cpu, As Is}, {compose_appl, As Is}, {compose_task, As Is}, {compose_thread, As Is}, {compose_node, As Is}, {compose_system, As Is}, {compose_workload, As Is}, {topcompose1, As Is}, {topcompose2, As Is} } } +window_semantic_module task Thread i { 1, { 1 0.000000000000 } } +window_filter_module evt_type 2 50000001 50000005 +window_filter_module evt_type_label 2 "MPI Point-to-point" "Unknown" + +< NEW ANALYZER2D > +Analyzer2D.Name: MPI call profile +Analyzer2D.X: 631 +Analyzer2D.Y: 172 +Analyzer2D.Width: 1018 +Analyzer2D.Height: 816 +Analyzer2D.ControlWindow: 1 +Analyzer2D.DataWindow: 1 +Analyzer2D.Accumulator: Semantic +Analyzer2D.Statistic: % Time +Analyzer2D.CalculateAll: True +Analyzer2D.HideCols: True +Analyzer2D.HorizVert: Horizontal +Analyzer2D.Color: True +Analyzer2D.SemanticColor: True +Analyzer2D.Zoom: Disabled +Analyzer2D.SortCols: False +Analyzer2D.SortCriteria: Average +Analyzer2D.Parameters: 4 -179769313486231570814527423731704356798070567525844996598917476803157260780028538760589558632766878171540458953514382464234321326889464182768467546703537516986049910576551282076245490090389328944075868508455133942304583236903222948165808559332123348274797826204144723168738177180919299881250404026184124858368.000000000000 179769313486231570814527423731704356798070567525844996598917476803157260780028538760589558632766878171540458953514382464234321326889464182768467546703537516986049910576551282076245490090389328944075868508455133942304583236903222948165808559332123348274797826204144723168738177180919299881250404026184124858368.000000000000 -179769313486231570814527423731704356798070567525844996598917476803157260780028538760589558632766878171540458953514382464234321326889464182768467546703537516986049910576551282076245490090389328944075868508455133942304583236903222948165808559332123348274797826204144723168738177180919299881250404026184124858368.000000000000 179769313486231570814527423731704356798070567525844996598917476803157260780028538760589558632766878171540458953514382464234321326889464182768467546703537516986049910576551282076245490090389328944075868508455133942304583236903222948165808559332123348274797826204144723168738177180919299881250404026184124858368.000000000000 +Analyzer2D.AnalysisLimits: Alltrace +Analyzer2D.ComputeYScale: False +Analyzer2D.Minimum: 0.000000000000 +Analyzer2D.Maximum: 200.000000000000 +Analyzer2D.Delta: 1.000000000000 +Analyzer2D.ComputeGradient: True +Analyzer2D.MinimumGradient: 0.000053884277 +Analyzer2D.MaximumGradient: 98.457083647023 +Analyzer2D.DrawModeObjects: draw_maximum +Analyzer2D.DrawModeColumns: draw_maximum +Analyzer2D.PixelSize: 1 +Analyzer2D.ColorMode: window_in_gradient_mode +Analyzer2D.ShowOnlyTotals: False +Analyzer2D.ShortHeaderLabels: True + -- GitLab From dc349006737b0879ce26eafd80d812b03bc7879d Mon Sep 17 00:00:00 2001 From: "Oriol.Tinto.Prims" Date: Fri, 26 Jun 2020 15:40:30 +0200 Subject: [PATCH 23/26] paramedir configuration renaming --- .../3D_UsefulCycles_by_function.cfg | 190 ------------------ .../3D_UsefulInstructions_by_function.cfg | 190 ------------------ 2 files changed, 380 deletions(-) delete mode 100644 cfg/trace_analysis/paramedir_configurations/3D_UsefulCycles_by_function.cfg delete mode 100644 cfg/trace_analysis/paramedir_configurations/3D_UsefulInstructions_by_function.cfg diff --git a/cfg/trace_analysis/paramedir_configurations/3D_UsefulCycles_by_function.cfg b/cfg/trace_analysis/paramedir_configurations/3D_UsefulCycles_by_function.cfg deleted file mode 100644 index 9b14319..0000000 --- a/cfg/trace_analysis/paramedir_configurations/3D_UsefulCycles_by_function.cfg +++ /dev/null @@ -1,190 +0,0 @@ -#ParaverCFG -ConfigFile.Version: 3.4 -ConfigFile.NumWindows: 4 - - -################################################################################ -< NEW DISPLAYING WINDOW Cycles > -################################################################################ -window_name Cycles -window_type single -window_id 1 -window_position_x 389 -window_position_y 127 -window_width 600 -window_height 114 -window_comm_lines_enabled false -window_flags_enabled false -window_noncolor_mode true -window_color_mode window_in_null_gradient_mode -window_logical_filtered true -window_physical_filtered false -window_comm_fromto true -window_comm_tagsize true -window_comm_typeval true -window_units Microseconds -window_maximum_y 78892470535.000000000000 -window_minimum_y 0.000000000000 -window_compute_y_max false -window_level thread -window_scale_relative 1.000000000000 -window_end_time_relative 1.000000000000 -window_object appl { 1, { All } } -window_begin_time_relative 0.000000000000 -window_open false -window_drawmode draw_maximum -window_drawmode_rows draw_maximum -window_pixel_size 1 -window_labels_to_draw 1 -window_selected_functions { 14, { {cpu, Active Thd}, {appl, Adding}, {task, Adding}, {thread, Next Evt Val}, {node, Adding}, {system, Adding}, {workload, Adding}, {from_obj, All}, {to_obj, All}, {tag_msg, All}, {size_msg, All}, {bw_msg, All}, {evt_type, =}, {evt_value, All} } } -window_compose_functions { 9, { {compose_cpu, As Is}, {compose_appl, As Is}, {compose_task, As Is}, {compose_thread, As Is}, {compose_node, As Is}, {compose_system, As Is}, {compose_workload, As Is}, {topcompose1, As Is}, {topcompose2, As Is} } } -window_filter_module evt_type 1 42000059 -window_filter_module evt_type_label 1 "PAPI_TOT_CYC [Total cycles]" - -################################################################################ -< NEW DISPLAYING WINDOW Useful.c1.c1 > -################################################################################ -window_name Useful.c1.c1 -window_type single -window_id 2 -window_position_x 389 -window_position_y 127 -window_width 600 -window_height 134 -window_comm_lines_enabled false -window_flags_enabled false -window_noncolor_mode true -window_logical_filtered true -window_physical_filtered true -window_comm_fromto true -window_comm_tagsize true -window_comm_typeval true -window_units Microseconds -window_maximum_y 1.000000000000 -window_minimum_y 0.000000000000 -window_compute_y_max false -window_level thread -window_scale_relative 1.000000000000 -window_end_time_relative 1.000000000000 -window_object appl { 1, { All } } -window_begin_time_relative 0.000000000000 -window_open false -window_drawmode draw_maximum -window_drawmode_rows draw_maximum -window_pixel_size 1 -window_labels_to_draw 1 -window_selected_functions { 14, { {cpu, Active Thd}, {appl, Adding}, {task, Adding}, {thread, Useful}, {node, Adding}, {system, Adding}, {workload, Adding}, {from_obj, All}, {to_obj, =}, {tag_msg, All}, {size_msg, All}, {bw_msg, All}, {evt_type, All}, {evt_value, All} } } -window_compose_functions { 9, { {compose_cpu, As Is}, {compose_appl, As Is}, {compose_task, As Is}, {compose_thread, As Is}, {compose_node, As Is}, {compose_system, As Is}, {compose_workload, As Is}, {topcompose1, As Is}, {topcompose2, As Is} } } - -################################################################################ -< NEW DISPLAYING WINDOW useful cycles > -################################################################################ -window_name useful cycles -window_type composed -window_id 3 -window_factors 1.000000000000 1.000000000000 -window_operation product -window_identifiers 1 2 -window_position_x 525 -window_position_y 366 -window_width 600 -window_height 114 -window_comm_lines_enabled false -window_flags_enabled false -window_noncolor_mode true -window_color_mode window_in_null_gradient_mode -window_units Nanoseconds -window_maximum_y 176360335.000000000000 -window_minimum_y 610.000000000000 -window_compute_y_max false -window_level thread -window_scale_relative 1.000000000000 -window_end_time_relative 1.000000000000 -window_object appl { 1, { All } } -window_begin_time_relative 0.000000000000 -window_open false -window_drawmode draw_maximum -window_drawmode_rows draw_maximum -window_pixel_size 1 -window_labels_to_draw 1 -window_selected_functions { 5, { {appl, Adding}, {task, Adding}, {node, Adding}, {system, Adding}, {workload, Adding}, } } -window_compose_functions { 9, { {compose_cpu, As Is}, {compose_appl, As Is}, {compose_task, As Is}, {compose_thread, As Is}, {compose_node, As Is}, {compose_system, As Is}, {compose_workload, As Is}, {topcompose1, As Is}, {topcompose2, As Is} } } - -################################################################################ -< NEW DISPLAYING WINDOW User function x thread > -################################################################################ -window_name User function x thread -window_type single -window_id 4 -window_position_x 525 -window_position_y 510 -window_width 600 -window_height 114 -window_comm_lines_enabled false -window_flags_enabled false -window_noncolor_mode true -window_logical_filtered true -window_physical_filtered false -window_comm_fromto true -window_comm_tagsize true -window_comm_typeval true -window_units Microseconds -window_maximum_y 48.000000000000 -window_minimum_y 3.000000000000 -window_compute_y_max false -window_level thread -window_scale_relative 1.000000000000 -window_end_time_relative 1.000000000000 -window_object appl { 1, { All } } -window_begin_time_relative 0.000000000000 -window_open false -window_drawmode draw_maximum -window_drawmode_rows draw_maximum -window_pixel_size 1 -window_labels_to_draw 1 -window_selected_functions { 14, { {cpu, Active Thd}, {appl, Adding}, {task, Thread i}, {thread, Last Evt Val}, {node, Adding}, {system, Adding}, {workload, Adding}, {from_obj, All}, {to_obj, All}, {tag_msg, All}, {size_msg, All}, {bw_msg, All}, {evt_type, =}, {evt_value, All} } } -window_compose_functions { 9, { {compose_cpu, As Is}, {compose_appl, As Is}, {compose_task, As Is}, {compose_thread, Stacked Val}, {compose_node, As Is}, {compose_system, As Is}, {compose_workload, As Is}, {topcompose1, As Is}, {topcompose2, As Is} } } -window_semantic_module task Thread i { 1, { 1 0.000000000000 } } -window_filter_module evt_type 1 60000019 -window_filter_module evt_type_label 1 "User function" - -< NEW ANALYZER2D > -Analyzer2D.Name: 2dh Useful Cycles -Analyzer2D.X: 1125 -Analyzer2D.Y: 565 -Analyzer2D.Width: 600 -Analyzer2D.Height: 300 -Analyzer2D.ControlWindow: 3 -Analyzer2D.DataWindow: 3 -Analyzer2D.Accumulator: Semantic -Analyzer2D.Statistic: Sum bursts -Analyzer2D.CalculateAll: True -Analyzer2D.HideCols: False -Analyzer2D.HorizVert: Horizontal -Analyzer2D.Color: True -Analyzer2D.SemanticColor: False -Analyzer2D.Zoom: Enabled -Analyzer2D.SortCols: False -Analyzer2D.SortCriteria: Average -Analyzer2D.Parameters: 4 -179769313486231570814527423731704356798070567525844996598917476803157260780028538760589558632766878171540458953514382464234321326889464182768467546703537516986049910576551282076245490090389328944075868508455133942304583236903222948165808559332123348274797826204144723168738177180919299881250404026184124858368.000000000000 179769313486231570814527423731704356798070567525844996598917476803157260780028538760589558632766878171540458953514382464234321326889464182768467546703537516986049910576551282076245490090389328944075868508455133942304583236903222948165808559332123348274797826204144723168738177180919299881250404026184124858368.000000000000 -179769313486231570814527423731704356798070567525844996598917476803157260780028538760589558632766878171540458953514382464234321326889464182768467546703537516986049910576551282076245490090389328944075868508455133942304583236903222948165808559332123348274797826204144723168738177180919299881250404026184124858368.000000000000 179769313486231570814527423731704356798070567525844996598917476803157260780028538760589558632766878171540458953514382464234321326889464182768467546703537516986049910576551282076245490090389328944075868508455133942304583236903222948165808559332123348274797826204144723168738177180919299881250404026184124858368.000000000000 -Analyzer2D.AnalysisLimits: Alltrace -Analyzer2D.ComputeYScale: False -Analyzer2D.Minimum: 610.000000000000 -Analyzer2D.Maximum: 185178321.250000000000 -Analyzer2D.Delta: 925888556.250000000000 -Analyzer2D.ComputeGradient: True -Analyzer2D.MinimumGradient: 250059474.000000000000 -Analyzer2D.MaximumGradient: 265269439.000000000000 -Analyzer2D.DrawModeObjects: draw_maximum -Analyzer2D.DrawModeColumns: draw_maximum -Analyzer2D.PixelSize: 1 -Analyzer2D.ColorMode: window_in_gradient_mode -Analyzer2D.ShowOnlyTotals: False -Analyzer2D.ShortHeaderLabels: True -Analyzer2D.3D_ControlWindow: 4 -Analyzer3D.ComputeYScale: True -Analyzer2D.3D_Minimum: 3.000000000000 -Analyzer2D.3D_Maximum: 48.000000000000 -Analyzer2D.3D_Delta: 1.000000000000 -Analyzer2D.3D_FixedValue: 39.000000000000 - diff --git a/cfg/trace_analysis/paramedir_configurations/3D_UsefulInstructions_by_function.cfg b/cfg/trace_analysis/paramedir_configurations/3D_UsefulInstructions_by_function.cfg deleted file mode 100644 index bcb136a..0000000 --- a/cfg/trace_analysis/paramedir_configurations/3D_UsefulInstructions_by_function.cfg +++ /dev/null @@ -1,190 +0,0 @@ -#ParaverCFG -ConfigFile.Version: 3.4 -ConfigFile.NumWindows: 4 - - -################################################################################ -< NEW DISPLAYING WINDOW Instructions.c1 > -################################################################################ -window_name Instructions.c1 -window_type single -window_id 1 -window_position_x 314 -window_position_y 52 -window_width 600 -window_height 114 -window_comm_lines_enabled false -window_flags_enabled false -window_noncolor_mode true -window_color_mode window_in_null_gradient_mode -window_logical_filtered true -window_physical_filtered false -window_comm_fromto true -window_comm_tagsize true -window_comm_typeval true -window_units Microseconds -window_maximum_y 78892470535.000000000000 -window_minimum_y 0.000000000000 -window_compute_y_max false -window_level thread -window_scale_relative 1.000000000000 -window_end_time_relative 1.000000000000 -window_object appl { 1, { All } } -window_begin_time_relative 0.000000000000 -window_open false -window_drawmode draw_maximum -window_drawmode_rows draw_maximum -window_pixel_size 1 -window_labels_to_draw 1 -window_selected_functions { 14, { {cpu, Active Thd}, {appl, Adding}, {task, Adding}, {thread, Next Evt Val}, {node, Adding}, {system, Adding}, {workload, Adding}, {from_obj, All}, {to_obj, All}, {tag_msg, All}, {size_msg, All}, {bw_msg, All}, {evt_type, =}, {evt_value, All} } } -window_compose_functions { 9, { {compose_cpu, As Is}, {compose_appl, As Is}, {compose_task, As Is}, {compose_thread, As Is}, {compose_node, As Is}, {compose_system, As Is}, {compose_workload, As Is}, {topcompose1, As Is}, {topcompose2, As Is} } } -window_filter_module evt_type 1 42000050 -window_filter_module evt_type_label 1 "PAPI_TOT_INS [Instr completed]" - -################################################################################ -< NEW DISPLAYING WINDOW Useful.c1 > -################################################################################ -window_name Useful.c1 -window_type single -window_id 2 -window_position_x 340 -window_position_y 78 -window_width 600 -window_height 134 -window_comm_lines_enabled false -window_flags_enabled false -window_noncolor_mode true -window_logical_filtered true -window_physical_filtered true -window_comm_fromto true -window_comm_tagsize true -window_comm_typeval true -window_units Microseconds -window_maximum_y 1.000000000000 -window_minimum_y 0.000000000000 -window_compute_y_max false -window_level thread -window_scale_relative 1.000000000000 -window_end_time_relative 1.000000000000 -window_object appl { 1, { All } } -window_begin_time_relative 0.000000000000 -window_open false -window_drawmode draw_maximum -window_drawmode_rows draw_maximum -window_pixel_size 1 -window_labels_to_draw 1 -window_selected_functions { 14, { {cpu, Active Thd}, {appl, Adding}, {task, Adding}, {thread, Useful}, {node, Adding}, {system, Adding}, {workload, Adding}, {from_obj, All}, {to_obj, =}, {tag_msg, All}, {size_msg, All}, {bw_msg, All}, {evt_type, All}, {evt_value, All} } } -window_compose_functions { 9, { {compose_cpu, As Is}, {compose_appl, As Is}, {compose_task, As Is}, {compose_thread, As Is}, {compose_node, As Is}, {compose_system, As Is}, {compose_workload, As Is}, {topcompose1, As Is}, {topcompose2, As Is} } } - -################################################################################ -< NEW DISPLAYING WINDOW useful instructions > -################################################################################ -window_name useful instructions -window_type composed -window_id 3 -window_factors 1.000000000000 1.000000000000 -window_operation product -window_identifiers 1 2 -window_position_x 525 -window_position_y 222 -window_width 600 -window_height 114 -window_comm_lines_enabled false -window_flags_enabled false -window_noncolor_mode true -window_color_mode window_in_null_gradient_mode -window_units Microseconds -window_maximum_y 97268896.000000000000 -window_minimum_y 1022.000000000000 -window_compute_y_max false -window_level thread -window_scale_relative 1.000000000000 -window_end_time_relative 1.000000000000 -window_object appl { 1, { All } } -window_begin_time_relative 0.000000000000 -window_open false -window_drawmode draw_maximum -window_drawmode_rows draw_maximum -window_pixel_size 1 -window_labels_to_draw 1 -window_selected_functions { 5, { {appl, Adding}, {task, Adding}, {node, Adding}, {system, Adding}, {workload, Adding}, } } -window_compose_functions { 9, { {compose_cpu, As Is}, {compose_appl, As Is}, {compose_task, As Is}, {compose_thread, As Is}, {compose_node, As Is}, {compose_system, As Is}, {compose_workload, As Is}, {topcompose1, As Is}, {topcompose2, As Is} } } - -################################################################################ -< NEW DISPLAYING WINDOW User function x thread > -################################################################################ -window_name User function x thread -window_type single -window_id 4 -window_position_x 525 -window_position_y 510 -window_width 600 -window_height 114 -window_comm_lines_enabled false -window_flags_enabled false -window_noncolor_mode true -window_logical_filtered true -window_physical_filtered false -window_comm_fromto true -window_comm_tagsize true -window_comm_typeval true -window_units Microseconds -window_maximum_y 48.000000000000 -window_minimum_y 3.000000000000 -window_compute_y_max false -window_level thread -window_scale_relative 1.000000000000 -window_end_time_relative 1.000000000000 -window_object appl { 1, { All } } -window_begin_time_relative 0.000000000000 -window_open false -window_drawmode draw_maximum -window_drawmode_rows draw_maximum -window_pixel_size 1 -window_labels_to_draw 1 -window_selected_functions { 14, { {cpu, Active Thd}, {appl, Adding}, {task, Thread i}, {thread, Last Evt Val}, {node, Adding}, {system, Adding}, {workload, Adding}, {from_obj, All}, {to_obj, All}, {tag_msg, All}, {size_msg, All}, {bw_msg, All}, {evt_type, =}, {evt_value, All} } } -window_compose_functions { 9, { {compose_cpu, As Is}, {compose_appl, As Is}, {compose_task, As Is}, {compose_thread, Stacked Val}, {compose_node, As Is}, {compose_system, As Is}, {compose_workload, As Is}, {topcompose1, As Is}, {topcompose2, As Is} } } -window_semantic_module task Thread i { 1, { 1 0.000000000000 } } -window_filter_module evt_type 1 60000019 -window_filter_module evt_type_label 1 "User function" - -< NEW ANALYZER2D > -Analyzer2D.Name: 2dh useful instructions -Analyzer2D.X: 1112 -Analyzer2D.Y: 180 -Analyzer2D.Width: 600 -Analyzer2D.Height: 300 -Analyzer2D.ControlWindow: 3 -Analyzer2D.DataWindow: 3 -Analyzer2D.Accumulator: Semantic -Analyzer2D.Statistic: Sum bursts -Analyzer2D.CalculateAll: True -Analyzer2D.HideCols: False -Analyzer2D.HorizVert: Horizontal -Analyzer2D.Color: True -Analyzer2D.SemanticColor: False -Analyzer2D.Zoom: Enabled -Analyzer2D.SortCols: False -Analyzer2D.SortCriteria: Average -Analyzer2D.Parameters: 4 -179769313486231570814527423731704356798070567525844996598917476803157260780028538760589558632766878171540458953514382464234321326889464182768467546703537516986049910576551282076245490090389328944075868508455133942304583236903222948165808559332123348274797826204144723168738177180919299881250404026184124858368.000000000000 179769313486231570814527423731704356798070567525844996598917476803157260780028538760589558632766878171540458953514382464234321326889464182768467546703537516986049910576551282076245490090389328944075868508455133942304583236903222948165808559332123348274797826204144723168738177180919299881250404026184124858368.000000000000 -179769313486231570814527423731704356798070567525844996598917476803157260780028538760589558632766878171540458953514382464234321326889464182768467546703537516986049910576551282076245490090389328944075868508455133942304583236903222948165808559332123348274797826204144723168738177180919299881250404026184124858368.000000000000 179769313486231570814527423731704356798070567525844996598917476803157260780028538760589558632766878171540458953514382464234321326889464182768467546703537516986049910576551282076245490090389328944075868508455133942304583236903222948165808559332123348274797826204144723168738177180919299881250404026184124858368.000000000000 -Analyzer2D.AnalysisLimits: Alltrace -Analyzer2D.ComputeYScale: False -Analyzer2D.Minimum: 1022.000000000000 -Analyzer2D.Maximum: 102132289.700000002980 -Analyzer2D.Delta: 1000000000.000000000000 -Analyzer2D.ComputeGradient: True -Analyzer2D.MinimumGradient: 93191550.000000000000 -Analyzer2D.MaximumGradient: 93658686.000000000000 -Analyzer2D.DrawModeObjects: draw_maximum -Analyzer2D.DrawModeColumns: draw_maximum -Analyzer2D.PixelSize: 1 -Analyzer2D.ColorMode: window_in_gradient_mode -Analyzer2D.ShowOnlyTotals: False -Analyzer2D.ShortHeaderLabels: True -Analyzer2D.3D_ControlWindow: 4 -Analyzer3D.ComputeYScale: True -Analyzer2D.3D_Minimum: 3.000000000000 -Analyzer2D.3D_Maximum: 48.000000000000 -Analyzer2D.3D_Delta: 1.000000000000 -Analyzer2D.3D_FixedValue: 39.000000000000 - -- GitLab From b524cb7e81d249761a22325a329a5bab4c327a83 Mon Sep 17 00:00:00 2001 From: "Oriol.Tinto.Prims" Date: Fri, 26 Jun 2020 15:51:10 +0200 Subject: [PATCH 24/26] paramedir configuration renaming --- .../MPI_call_profile.pm.cfg | 77 ------------------- 1 file changed, 77 deletions(-) delete mode 100644 cfg/trace_analysis/paramedir_configurations/MPI_call_profile.pm.cfg diff --git a/cfg/trace_analysis/paramedir_configurations/MPI_call_profile.pm.cfg b/cfg/trace_analysis/paramedir_configurations/MPI_call_profile.pm.cfg deleted file mode 100644 index c29796a..0000000 --- a/cfg/trace_analysis/paramedir_configurations/MPI_call_profile.pm.cfg +++ /dev/null @@ -1,77 +0,0 @@ -#ParaverCFG -ConfigFile.Version: 3.4 -ConfigFile.NumWindows: 1 - - -################################################################################ -< NEW DISPLAYING WINDOW MPI call > -################################################################################ -window_name MPI call -window_type single -window_id 1 -window_position_x 377 -window_position_y 288 -window_width 600 -window_height 114 -window_comm_lines_enabled false -window_flags_enabled false -window_noncolor_mode true -window_logical_filtered true -window_physical_filtered false -window_comm_fromto true -window_comm_tagsize true -window_comm_typeval true -window_units Microseconds -window_maximum_y 70.000000000000 -window_minimum_y 0.000000000000 -window_compute_y_max false -window_level thread -window_scale_relative 1.000000000000 -window_end_time_relative 1.000000000000 -window_object appl { 1, { All } } -window_begin_time_relative 0.000000000000 -window_open false -window_drawmode draw_maximum -window_drawmode_rows draw_maximum -window_pixel_size 1 -window_labels_to_draw 1 -window_selected_functions { 14, { {cpu, Active Thd}, {appl, Adding}, {task, Thread i}, {thread, Last Evt Val}, {node, Adding}, {system, Adding}, {workload, Adding}, {from_obj, All}, {to_obj, All}, {tag_msg, All}, {size_msg, All}, {bw_msg, All}, {evt_type, [x,y]}, {evt_value, All} } } -window_compose_functions { 9, { {compose_cpu, As Is}, {compose_appl, As Is}, {compose_task, As Is}, {compose_thread, As Is}, {compose_node, As Is}, {compose_system, As Is}, {compose_workload, As Is}, {topcompose1, As Is}, {topcompose2, As Is} } } -window_semantic_module task Thread i { 1, { 1 0.000000000000 } } -window_filter_module evt_type 2 50000001 50000005 -window_filter_module evt_type_label 2 "MPI Point-to-point" "Unknown" - -< NEW ANALYZER2D > -Analyzer2D.Name: MPI call profile -Analyzer2D.X: 631 -Analyzer2D.Y: 172 -Analyzer2D.Width: 1018 -Analyzer2D.Height: 816 -Analyzer2D.ControlWindow: 1 -Analyzer2D.DataWindow: 1 -Analyzer2D.Accumulator: Semantic -Analyzer2D.Statistic: % Time -Analyzer2D.CalculateAll: True -Analyzer2D.HideCols: True -Analyzer2D.HorizVert: Horizontal -Analyzer2D.Color: True -Analyzer2D.SemanticColor: True -Analyzer2D.Zoom: Disabled -Analyzer2D.SortCols: False -Analyzer2D.SortCriteria: Average -Analyzer2D.Parameters: 4 -179769313486231570814527423731704356798070567525844996598917476803157260780028538760589558632766878171540458953514382464234321326889464182768467546703537516986049910576551282076245490090389328944075868508455133942304583236903222948165808559332123348274797826204144723168738177180919299881250404026184124858368.000000000000 179769313486231570814527423731704356798070567525844996598917476803157260780028538760589558632766878171540458953514382464234321326889464182768467546703537516986049910576551282076245490090389328944075868508455133942304583236903222948165808559332123348274797826204144723168738177180919299881250404026184124858368.000000000000 -179769313486231570814527423731704356798070567525844996598917476803157260780028538760589558632766878171540458953514382464234321326889464182768467546703537516986049910576551282076245490090389328944075868508455133942304583236903222948165808559332123348274797826204144723168738177180919299881250404026184124858368.000000000000 179769313486231570814527423731704356798070567525844996598917476803157260780028538760589558632766878171540458953514382464234321326889464182768467546703537516986049910576551282076245490090389328944075868508455133942304583236903222948165808559332123348274797826204144723168738177180919299881250404026184124858368.000000000000 -Analyzer2D.AnalysisLimits: Alltrace -Analyzer2D.ComputeYScale: False -Analyzer2D.Minimum: 0.000000000000 -Analyzer2D.Maximum: 200.000000000000 -Analyzer2D.Delta: 1.000000000000 -Analyzer2D.ComputeGradient: True -Analyzer2D.MinimumGradient: 0.000053884277 -Analyzer2D.MaximumGradient: 98.457083647023 -Analyzer2D.DrawModeObjects: draw_maximum -Analyzer2D.DrawModeColumns: draw_maximum -Analyzer2D.PixelSize: 1 -Analyzer2D.ColorMode: window_in_gradient_mode -Analyzer2D.ShowOnlyTotals: False -Analyzer2D.ShortHeaderLabels: True - -- GitLab From 9a831f730bbca363b583b49f0597f84ba81dfecc Mon Sep 17 00:00:00 2001 From: "Oriol.Tinto.Prims" Date: Mon, 29 Jun 2020 09:28:15 +0200 Subject: [PATCH 25/26] Parameter file for deployment experiments added --- cfg/deployment_experiments/O0 | 24 ++++++++++++++++++++++++ cfg/deployment_experiments/O1 | 24 ++++++++++++++++++++++++ cfg/deployment_experiments/O3 | 24 ++++++++++++++++++++++++ cfg/deployment_experiments/xHost | 24 ++++++++++++++++++++++++ 4 files changed, 96 insertions(+) create mode 100644 cfg/deployment_experiments/O0 create mode 100644 cfg/deployment_experiments/O1 create mode 100644 cfg/deployment_experiments/O3 create mode 100644 cfg/deployment_experiments/xHost diff --git a/cfg/deployment_experiments/O0 b/cfg/deployment_experiments/O0 new file mode 100644 index 0000000..ccc10da --- /dev/null +++ b/cfg/deployment_experiments/O0 @@ -0,0 +1,24 @@ +# Branch to profile +nemo_branch=avoid_error_partition +# Configuration name +configuration_name=Deployment-O0 +# the following parameter should be cfgs in case the configuration is based on ORCA or tests if it is based n the bench +configuration_folder=tests +# Details of the configuration which you would put after makenemo, excluding the arch file +configuration_details=-a BENCH +# For BENCH specifies the resolution at which it will run +configuration_resolution=orca1 +# Suffix of the arch file used +arch_file_prefix=O0 +# Enable or disable output (TRUE or FALSE) +output=FALSE +# Number of steps used in test (Adjust acording to cost) +test_steps=200 +trace_steps=20 +# Processes used for the modelfactor +number_of_processes=48 96 +# This value will be passed to the slurm parameter --ntasks-per-node (default in mn4 is 48) +processes_per_node=48 + +# Which parts of the recipe will be executed when we run make experiment +experiment_recipes = json diff --git a/cfg/deployment_experiments/O1 b/cfg/deployment_experiments/O1 new file mode 100644 index 0000000..2141354 --- /dev/null +++ b/cfg/deployment_experiments/O1 @@ -0,0 +1,24 @@ +# Branch to profile +nemo_branch=avoid_error_partition +# Configuration name +configuration_name=Deployment-O1 +# the following parameter should be cfgs in case the configuration is based on ORCA or tests if it is based n the bench +configuration_folder=tests +# Details of the configuration which you would put after makenemo, excluding the arch file +configuration_details=-a BENCH +# For BENCH specifies the resolution at which it will run +configuration_resolution=orca1 +# Suffix of the arch file used +arch_file_prefix=O1 +# Enable or disable output (TRUE or FALSE) +output=FALSE +# Number of steps used in test (Adjust acording to cost) +test_steps=200 +trace_steps=20 +# Processes used for the modelfactor +number_of_processes=48 96 +# This value will be passed to the slurm parameter --ntasks-per-node (default in mn4 is 48) +processes_per_node=48 + +# Which parts of the recipe will be executed when we run make experiment +experiment_recipes = json diff --git a/cfg/deployment_experiments/O3 b/cfg/deployment_experiments/O3 new file mode 100644 index 0000000..ce0827f --- /dev/null +++ b/cfg/deployment_experiments/O3 @@ -0,0 +1,24 @@ +# Branch to profile +nemo_branch=avoid_error_partition +# Configuration name +configuration_name=Deployment-O3 +# the following parameter should be cfgs in case the configuration is based on ORCA or tests if it is based n the bench +configuration_folder=tests +# Details of the configuration which you would put after makenemo, excluding the arch file +configuration_details=-a BENCH +# For BENCH specifies the resolution at which it will run +configuration_resolution=orca1 +# Suffix of the arch file used +arch_file_prefix=prod +# Enable or disable output (TRUE or FALSE) +output=FALSE +# Number of steps used in test (Adjust acording to cost) +test_steps=200 +trace_steps=20 +# Processes used for the modelfactor +number_of_processes=48 96 +# This value will be passed to the slurm parameter --ntasks-per-node (default in mn4 is 48) +processes_per_node=48 + +# Which parts of the recipe will be executed when we run make experiment +experiment_recipes = json diff --git a/cfg/deployment_experiments/xHost b/cfg/deployment_experiments/xHost new file mode 100644 index 0000000..b1443a8 --- /dev/null +++ b/cfg/deployment_experiments/xHost @@ -0,0 +1,24 @@ +# Branch to profile +nemo_branch=avoid_error_partition +# Configuration name +configuration_name=Deployment-xHost +# the following parameter should be cfgs in case the configuration is based on ORCA or tests if it is based n the bench +configuration_folder=tests +# Details of the configuration which you would put after makenemo, excluding the arch file +configuration_details=-a BENCH +# For BENCH specifies the resolution at which it will run +configuration_resolution=orca1 +# Suffix of the arch file used +arch_file_prefix=xHost +# Enable or disable output (TRUE or FALSE) +output=FALSE +# Number of steps used in test (Adjust acording to cost) +test_steps=200 +trace_steps=20 +# Processes used for the modelfactor +number_of_processes=48 96 +# This value will be passed to the slurm parameter --ntasks-per-node (default in mn4 is 48) +processes_per_node=48 + +# Which parts of the recipe will be executed when we run make experiment +experiment_recipes = json -- GitLab From d93ebd48cd93c6ca0ff13c9b26654ffdaec29044 Mon Sep 17 00:00:00 2001 From: "Oriol.Tinto.Prims" Date: Mon, 29 Jun 2020 12:48:41 +0200 Subject: [PATCH 26/26] Unnecessary files removed --- experiments_to_run/O0 | 24 ------------------------ experiments_to_run/Production | 24 ------------------------ 2 files changed, 48 deletions(-) delete mode 100644 experiments_to_run/O0 delete mode 100644 experiments_to_run/Production diff --git a/experiments_to_run/O0 b/experiments_to_run/O0 deleted file mode 100644 index 67108a7..0000000 --- a/experiments_to_run/O0 +++ /dev/null @@ -1,24 +0,0 @@ -# Branch to profile -nemo_branch=avoid_error_partition -# Configuration name -configuration_name=BENCH -# the following parameter should be cfgs in case the configuration is based on ORCA or tests if it is based n the bench -configuration_folder=tests -# Details of the configuration which you would put after makenemo, excluding the arch file -configuration_details=-a BENCH -# For BENCH specifies the resolution at which it will run -configuration_resolution=orca1 -# Suffix of the arch file used -arch_file_prefix=O0 -# Enable or disable output (TRUE or FALSE) -output=FALSE -# Number of steps used in test (Adjust acording to cost) -test_steps=200 -trace_steps=20 -# Processes used for the modelfactor -number_of_processes=48 96 -# This value will be passed to the slurm parameter --ntasks-per-node (default in mn4 is 48) -processes_per_node=48 - -# Which parts of the recipe will be executed when we run make experiment -experiment_recipes = json diff --git a/experiments_to_run/Production b/experiments_to_run/Production deleted file mode 100644 index 30c6540..0000000 --- a/experiments_to_run/Production +++ /dev/null @@ -1,24 +0,0 @@ -# Branch to profile -nemo_branch=avoid_error_partition -# Configuration name -configuration_name=BENCH -# the following parameter should be cfgs in case the configuration is based on ORCA or tests if it is based n the bench -configuration_folder=tests -# Details of the configuration which you would put after makenemo, excluding the arch file -configuration_details=-a BENCH -# For BENCH specifies the resolution at which it will run -configuration_resolution=orca1 -# Suffix of the arch file used -arch_file_prefix=prod -# Enable or disable output (TRUE or FALSE) -output=FALSE -# Number of steps used in test (Adjust acording to cost) -test_steps=200 -trace_steps=20 -# Processes used for the modelfactor -number_of_processes=48 96 192 -# This value will be passed to the slurm parameter --ntasks-per-node (default in mn4 is 48) -processes_per_node=48 - -# Which parts of the recipe will be executed when we run make experiment -experiment_recipes = json -- GitLab