diff --git a/conf/cori-gcc-py27.module b/conf/cori-gcc-py27.module index 965d381..9d62005 100644 --- a/conf/cori-gcc-py27.module +++ b/conf/cori-gcc-py27.module @@ -9,7 +9,6 @@ if [ module-info mode load ] { module swap PrgEnv-intel PrgEnv-gnu } } - module load cmake module load git setenv CRAYPE_LINK_TYPE dynamic } diff --git a/conf/cori-gcc-py27.sh b/conf/cori-gcc-py27.sh index 4b0770b..560a8e3 100644 --- a/conf/cori-gcc-py27.sh +++ b/conf/cori-gcc-py27.sh @@ -11,7 +11,6 @@ if [ "x${loadedgnu}" = x ]; then fi module unload darshan module unload altd -module load cmake module load git export CRAYPE_LINK_TYPE=dynamic diff --git a/conf/cori-gcc.module b/conf/cori-gcc.module index 965d381..9d62005 100644 --- a/conf/cori-gcc.module +++ b/conf/cori-gcc.module @@ -9,7 +9,6 @@ if [ module-info mode load ] { module swap PrgEnv-intel PrgEnv-gnu } } - module load cmake module load git setenv CRAYPE_LINK_TYPE dynamic } diff --git a/conf/cori-gcc.sh b/conf/cori-gcc.sh index 4b0770b..560a8e3 100644 --- a/conf/cori-gcc.sh +++ b/conf/cori-gcc.sh @@ -11,7 +11,6 @@ if [ "x${loadedgnu}" = x ]; then fi module unload darshan module unload altd -module load cmake module load git export CRAYPE_LINK_TYPE=dynamic diff --git a/conf/cori-intel.module b/conf/cori-intel.module index 554f85e..a529d6c 100644 --- a/conf/cori-intel.module +++ b/conf/cori-intel.module @@ -9,9 +9,7 @@ if [ module-info mode load ] { module swap PrgEnv-gnu PrgEnv-intel } } - module swap intel intel/18.0.1.163 module load gcc - module load cmake module load git setenv CRAYPE_LINK_TYPE dynamic } diff --git a/conf/cori-intel.sh b/conf/cori-intel.sh index e7e4187..7ab7f7b 100644 --- a/conf/cori-intel.sh +++ b/conf/cori-intel.sh @@ -12,9 +12,7 @@ if [ "x${loadedintel}" = x ]; then fi module unload darshan module unload altd -module swap intel intel/18.0.1.163 module load gcc -module load cmake module load git export CRAYPE_LINK_TYPE=dynamic diff --git a/conf/edison-gcc.module b/conf/edison-gcc.module index 965d381..9d62005 100644 --- a/conf/edison-gcc.module +++ b/conf/edison-gcc.module @@ -9,7 +9,6 @@ if [ module-info mode load ] { module swap PrgEnv-intel PrgEnv-gnu } } - module load cmake module load git setenv CRAYPE_LINK_TYPE dynamic } diff --git a/conf/edison-gcc.sh b/conf/edison-gcc.sh index 4deade1..05d221a 100644 --- a/conf/edison-gcc.sh +++ b/conf/edison-gcc.sh @@ -12,7 +12,6 @@ if [ "x${loadedgnu}" = x ]; then fi module unload darshan module unload altd -module load cmake module load git export CRAYPE_LINK_TYPE=dynamic diff --git a/conf/edison-intel.module b/conf/edison-intel.module index 554f85e..a529d6c 100644 --- a/conf/edison-intel.module +++ b/conf/edison-intel.module @@ -9,9 +9,7 @@ if [ module-info mode load ] { module swap PrgEnv-gnu PrgEnv-intel } } - module swap intel intel/18.0.1.163 module load gcc - module load cmake module load git setenv CRAYPE_LINK_TYPE dynamic } diff --git a/conf/edison-intel.sh b/conf/edison-intel.sh index e7e4187..7ab7f7b 100644 --- a/conf/edison-intel.sh +++ b/conf/edison-intel.sh @@ -12,9 +12,7 @@ if [ "x${loadedintel}" = x ]; then fi module unload darshan module unload altd -module swap intel intel/18.0.1.163 module load gcc -module load cmake module load git export CRAYPE_LINK_TYPE=dynamic diff --git a/rules/conda_pkgs.sh b/rules/conda_pkgs.sh index 0c46611..759e4e6 100644 --- a/rules/conda_pkgs.sh +++ b/rules/conda_pkgs.sh @@ -3,6 +3,7 @@ conda install --copy --yes \ requests \ future \ cython \ + cmake \ numpy \ scipy \ matplotlib=2.1.2 \