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
C2SM-RCM · Oct 9, 2018 · 328ea49 · 328ea49
1 parent fea8716
commit 328ea49
Show file tree

Hide file tree

Showing 13 changed files with 23 additions and 58 deletions.
diff --git 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
@@ -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
@@ -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
diff --git 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
@@ -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
@@ -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
@@ -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
diff --git 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
@@ -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
@@ -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