Extend fixes to all PNNL platforms.

buildsystem/spack/deception/env.sh

@@ -16,6 +16,9 @@ module load cuda/11.4
 module rm openmpi
 module load openmpi/4.1.0mlx5.0
 
+# Print modules for sanity
+module list
+
 # Define environment variables for where spack stores key files
 # For now, SPACK_INSTALL is the path where everything spack related is installed
 # If you want to modify the module install path, edit the spack.yaml manually

buildsystem/spack/incline/env.sh

@@ -8,8 +8,8 @@ module purge
 # MPI module is finnicky on incline
 modules=$(module list 2>&1)
 if echo $modules | grep -q 'openmpi'; then
-  module load gcc/8.4.0
-  module rm openmpi
+	module load gcc/8.4.0
+	module rm openmpi
 fi
 
 # Configure python and other system modules
@@ -20,6 +20,9 @@ module load openmpi/4.1.4
 module load rocm/5.3.0
 module load python/3.7.0
 
+# Print out modules for sanity
+module list
+
 # Try forcing behaviour of spack compiler
 export SPACK_CC=$(which gcc)
 export SPACK_CXX=$(which g++)

buildsystem/spack/newell/env.sh

@@ -1,16 +1,24 @@
 #!/bin/bash
 
+# Just for CI
 . /etc/profile.d/modules.sh
 
 # Load system python
-module load python/miniconda3.8
-. /share/apps/python/miniconda3.8/etc/profile.d/conda.sh
+module rm python
+module load python/miniconda3.8 >/dev/null 2>&1
+. /share/apps/python/miniconda3.8/etc/profile.d/conda.sh >/dev/null 2>&1
 
 # Load compiler/system modules
+module rm gcc
 module load gcc/8.5.0
+module rm cuda
 module load cuda/11.4
+module rm openmpi
 module load openmpi/4.1.4
 
+# Print modules for sanity
+module list
+
 # Define environment variables for where spack stores key files
 # For now, SPACK_INSTALL is the path where everything spack related is installed
 # If you want to modify the module install path, edit the spack.yaml manually