From 328ea49fe6a1ecc7215c709f387adf6315bbac0c Mon Sep 17 00:00:00 2001 From: Hannes Vogt Date: Tue, 9 Oct 2018 10:05:30 +0200 Subject: [PATCH] cleanup and remove gcc as cpp compiler * remove the g++ from crat * cmake version * pgi without gnu * update cmake on kesch * fix cray kesch * remove comment * remove comments, fix CMake path * cleanup * add missing quote * fix kesch cray-env/gpu * add DEFAULT_BOOST_ROOT --- env | 2 ++ modules/daint/c2sm/base | 4 ++-- modules/daint/c2sm/cray-env/base | 4 ++-- modules/daint/c2sm/gnu_for_cpp | 12 ------------ modules/daint/c2sm/pgi-env/base | 4 ++-- modules/kesch/c2sm/base | 5 +++-- modules/kesch/c2sm/cray-env/base | 13 +++++-------- modules/kesch/c2sm/cray-env/gpu | 4 ++-- modules/kesch/c2sm/gnu_for_cpp | 13 ------------- modules/kesch/c2sm/pgi-env/base | 4 ++-- modules/tave/c2sm/base | 2 +- modules/tave/c2sm/cray-env/base | 3 ++- modules/tave/c2sm/gnu_for_cpp | 11 ----------- 13 files changed, 23 insertions(+), 58 deletions(-) delete mode 100644 modules/daint/c2sm/gnu_for_cpp delete mode 100644 modules/kesch/c2sm/gnu_for_cpp delete mode 100644 modules/tave/c2sm/gnu_for_cpp diff --git a/env b/env index 34fb642..0efbbec 100644 --- a/env +++ b/env @@ -9,6 +9,8 @@ proc ModulesHelp { } { set hostname [info hostname] if {[regexp {daint.*} $hostname]} { set machine "daint" +} elseif {[regexp {dom.*} $hostname]} { + set machine "daint" } elseif {[regexp {kesch.*} $hostname]} { set machine "kesch" } elseif {[regexp {tave.*} $hostname]} { diff --git a/modules/daint/c2sm/base b/modules/daint/c2sm/base index d9ffbdb..46881ac 100644 --- a/modules/daint/c2sm/base +++ b/modules/daint/c2sm/base @@ -1,8 +1,8 @@ #%Module1.0##################################################################### module load daint-gpu -module load CMake +module load CMake/3.11.4 -setenv BOOST_ROOT /project/c14/install/daint/boost/boost_1_49_0 +setenv DEFAULT_BOOST_ROOT /project/c14/install/daint/boost/boost_1_49_0 diff --git a/modules/daint/c2sm/cray-env/base b/modules/daint/c2sm/cray-env/base index 145863c..990beb4 100644 --- a/modules/daint/c2sm/cray-env/base +++ b/modules/daint/c2sm/cray-env/base @@ -9,9 +9,9 @@ module load c2sm/base # we assume starting from a default module environment prereq PrgEnv-cray -module load c2sm/gnu_for_cpp - setenv FC ftn +setenv CXX CC +setenv CC cc module load cray-netcdf diff --git a/modules/daint/c2sm/gnu_for_cpp b/modules/daint/c2sm/gnu_for_cpp deleted file mode 100644 index ec200e8..0000000 --- a/modules/daint/c2sm/gnu_for_cpp +++ /dev/null @@ -1,12 +0,0 @@ -#%Module1.0##################################################################### - -# Load gcc/5.3.0 to link with the C++ dynamical core -module load gcc/5.3.0 - -global GCC_PATH -setenv CXX $env(GCC_PATH)/snos/bin/g++ -setenv CC $env(GCC_PATH)/snos/bin/gcc -prepend-path -d " " LDFLAGS "-L$env(GCC_PATH)/snos/lib64" - -module-whatis "Load gcc/5.3.0 to link with the C++ dynamical core" - diff --git a/modules/daint/c2sm/pgi-env/base b/modules/daint/c2sm/pgi-env/base index 4763a91..8998847 100644 --- a/modules/daint/c2sm/pgi-env/base +++ b/modules/daint/c2sm/pgi-env/base @@ -10,9 +10,9 @@ if { [module-info mode load] } { module switch PrgEnv-pgi PrgEnv-cray } -module load c2sm/gnu_for_cpp - setenv FC ftn +setenv CXX CC +setenv CC cc module load cray-netcdf diff --git a/modules/kesch/c2sm/base b/modules/kesch/c2sm/base index 7ff9c13..38064b2 100644 --- a/modules/kesch/c2sm/base +++ b/modules/kesch/c2sm/base @@ -1,6 +1,6 @@ #%Module1.0##################################################################### -module load cmake +module load /users/jenkins/easybuild/kesch/modules/all/cmake/3.12.0 # load default modules (in case we come from a purged env) # but don't unload them on unload of this module @@ -11,6 +11,7 @@ if { [module-info mode load] } { module load cudatoolkit/8.0.61 module load cray-libsci -setenv LD_PRELOAD /opt/mvapich2/gdr/no-mcast/2.2/cuda8.0/mpirun/gnu4.8.5/lib64/libmpi.so setenv NVIDIA_CUDA_ARCH "sm_37" +setenv DEFAULT_BOOST_ROOT /project/c14/install/kesch/boost/boost_1_49_0 + diff --git a/modules/kesch/c2sm/cray-env/base b/modules/kesch/c2sm/cray-env/base index c0795fb..6a80af5 100644 --- a/modules/kesch/c2sm/cray-env/base +++ b/modules/kesch/c2sm/cray-env/base @@ -5,18 +5,15 @@ conflict c2sm/pgi/base module load c2sm/base +module load PrgEnv-cray module load craype-accel-nvidia35 module load netCDF-Fortran/4.4.4-CrayCCE-17.06 - -module load c2sm/gnu_for_cpp - -if { [module-info mode load] } { - module switch mvapich2_cce/2.2rc1.0.3_cuda80 mvapich2_cce/2.2rc1.0.3 -} elseif { [module-info mode remove] } { - module switch mvapich2_cce/2.2rc1.0.3 mvapich2_cce/2.2rc1.0.3_cuda80 -} +global EBROOTNETCDF +setenv NETCDF_PATH $env(EBROOTNETCDF) setenv FC "ftn -D__CRAY_FORTRAN__" +setenv CXX CC +setenv CC cc module-whatis TODO diff --git a/modules/kesch/c2sm/cray-env/gpu b/modules/kesch/c2sm/cray-env/gpu index 652b45d..982b409 100644 --- a/modules/kesch/c2sm/cray-env/gpu +++ b/modules/kesch/c2sm/cray-env/gpu @@ -4,9 +4,9 @@ module load c2sm/cray-env/base if { [module-info mode load] } { - module switch mvapich2_cce/2.2rc1.0.3 mvapich2gdr_gnu/2.2_cuda_8.0 + module switch mvapich2_cce/2.2rc1.0.3_cuda80 mvapich2gdr_gnu/2.2_cuda_8.0 } elseif { [module-info mode remove] } { - module switch mvapich2gdr_gnu/2.2_cuda_8.0 mvapich2_cce/2.2rc1.0.3 + module switch mvapich2gdr_gnu/2.2_cuda_8.0 mvapich2_cce/2.2rc1.0.3_cuda80 } module-whatis TODO diff --git a/modules/kesch/c2sm/gnu_for_cpp b/modules/kesch/c2sm/gnu_for_cpp deleted file mode 100644 index 93468f9..0000000 --- a/modules/kesch/c2sm/gnu_for_cpp +++ /dev/null @@ -1,13 +0,0 @@ -#%Module1.0##################################################################### - -module load gcc/5.4.0-2.26 -setenv CXX g++ -setenv CC gcc - -global EBROOTGCC -prepend-path -d " " LDFLAGS "-L$env(EBROOTGCC)/lib64" -global CRAY_LD_LIBRARY_PATH -prepend-path -d ":" LD_LIBRARY_PATH "$env(CRAY_LD_LIBRARY_PATH)" - -module-whatis "Load gcc/5.4.0 to link with the C++ dynamical core" - diff --git a/modules/kesch/c2sm/pgi-env/base b/modules/kesch/c2sm/pgi-env/base index 358a324..4db3beb 100644 --- a/modules/kesch/c2sm/pgi-env/base +++ b/modules/kesch/c2sm/pgi-env/base @@ -9,9 +9,9 @@ module load PrgEnv-pgi/17.10 module unload openmpi module load mvapich2gdr_gnu/2.3a_cuda_8.0_pgi17.10 -module load c2sm/gnu_for_cpp - setenv FC mpif90 +setenv CXX CC +setenv CC cc module-whatis TODO diff --git a/modules/tave/c2sm/base b/modules/tave/c2sm/base index 32270da..28f8756 100644 --- a/modules/tave/c2sm/base +++ b/modules/tave/c2sm/base @@ -2,5 +2,5 @@ module load CMake -#setenv BOOST_ROOT /project/c14/install/daint/boost/boost_1_49_0 +setenv DEFAULT_BOOST_ROOT /project/c14/install/daint/boost/boost_1_49_0 # only headers (therefore same as daint) diff --git a/modules/tave/c2sm/cray-env/base b/modules/tave/c2sm/cray-env/base index d7ebf39..638fb09 100644 --- a/modules/tave/c2sm/cray-env/base +++ b/modules/tave/c2sm/cray-env/base @@ -9,8 +9,9 @@ module load c2sm/base # we assume starting from a default module environment prereq PrgEnv-cray -module load c2sm/gnu_for_cpp setenv FC ftn +setenv CXX CC +setenv CC cc module-whatis TODO diff --git a/modules/tave/c2sm/gnu_for_cpp b/modules/tave/c2sm/gnu_for_cpp deleted file mode 100644 index 1b80df3..0000000 --- a/modules/tave/c2sm/gnu_for_cpp +++ /dev/null @@ -1,11 +0,0 @@ -#%Module1.0##################################################################### - -module load gcc - -global GCC_PATH -setenv CXX $env(GCC_PATH)/snos/bin/g++ -setenv CC $env(GCC_PATH)/snos/bin/gcc -prepend-path -d " " LDFLAGS "-L$env(GCC_PATH)/snos/lib64" - -module-whatis "Load gcc to link with the C++ dynamical core" -