Merge pull request #672 from climbfuji/feature/merge_spack_develop_20…

…230710 Merge spack develop as of 2023/07/10 into jcsda_emc_spack_stack
JCSDA · Aug 8, 2023 · d09ff3d · d09ff3d
2 parents bafe0c9 + 1538556
commit d09ff3d
Show file tree

Hide file tree

Showing 36 changed files with 196 additions and 191 deletions.
diff --git a/.github/workflows/macos-ci-aarch64.yaml b/.github/workflows/macos-ci-aarch64.yaml
@@ -67,7 +67,7 @@ jobs:
           export SPACK_SYSTEM_CONFIG_PATH="${ENVDIR}/site"
 
           # Find external packages
-          spack external find --scope system --exclude bison
+          spack external find --scope system --exclude bison --exclude openssl
           spack external find --scope system perl
           spack external find --scope system wget
           PATH="/opt/homebrew/opt/curl/bin:$PATH" \
@@ -103,7 +103,7 @@ jobs:
           # Add binary cache and reindex it
           spack mirror add local-binary file:///Users/ec2-user/spack-stack/build-cache/
           # DH* 20230721 - todo remove || true
-          spack buildcache update-index -m local-binary || true
+          spack buildcache update-index local-binary || true
           echo "Packages in combined spack build caches:"
           spack buildcache list
 
@@ -116,14 +116,14 @@ jobs:
           # DH* 20230721 - todo remove --no-checksum
           spack install --fail-fast --source --no-check-signature --no-checksum base-env 2>&1 | tee log.install.apple-clang-14.0.0.base-env
           # DH* 20230721 - todo remove || true (this was here all the time, but should not be needed if spack creates buildcaches correctly)
-          spack buildcache create -a -r -u -d /Users/ec2-user/spack-stack/build-cache/ || true
+          spack buildcache create -a -u /Users/ec2-user/spack-stack/build-cache/ || true
 
           # the rest
           echo "${{ inputs.template || 'unified-dev' }} ..."
           # DH* 20230721 - todo remove --no-checksum
           spack install --fail-fast --source --no-check-signature --no-checksum 2>&1 | tee log.install.apple-clang-14.0.0.${{ inputs.template || 'unified-dev' }}
           # DH* 20230721 - todo remove || true (this was here all the time, but should not be needed if spack creates buildcaches correctly)
-          spack buildcache create -a -r -u -d /Users/ec2-user/spack-stack/build-cache/ || true
+          spack buildcache create -a -u /Users/ec2-user/spack-stack/build-cache/ || true
 
           # Next steps: synchronize source and build cache to a central/combined mirror?
           echo "Next steps ..."
@@ -145,16 +145,17 @@ jobs:
           export ENVNAME=ci-env.macos-ci-aarch64
           # *DH
           export ENVDIR=$PWD/envs/${ENVNAME}
+          ls -l ${ENVDIR}/install/modulefiles/Core
 
           module use ${ENVDIR}/install/modulefiles/Core
           module load stack-apple-clang/14.0.0
-          module load stack-openmpi
+          module load stack-openmpi/4.1.5
           module load stack-python/3.10.8
           module available
 
-          module load jedi-ufs-env/unified-dev
-          module load ewok-env/unified-dev
-          module load soca-env/unified-dev
+          module load jedi-ufs-env/1.0.0
+          module load ewok-env/1.0.0
+          module load soca-env/1.0.0
           module list
 
       # Skip this for now, copied from other yaml

diff --git a/.github/workflows/macos-ci-x86_64.yaml b/.github/workflows/macos-ci-x86_64.yaml
@@ -60,7 +60,7 @@ jobs:
           export SPACK_SYSTEM_CONFIG_PATH="${ENVDIR}/site"
 
           # Find external packages
-          spack external find --scope system --exclude bison
+          spack external find --scope system --exclude bison --exclude openssl
           spack external find --scope system perl
           spack external find --scope system wget
           PATH="/usr/local/opt/curl/bin:$PATH" \
@@ -96,7 +96,7 @@ jobs:
           # Add binary cache and reindex it
           spack mirror add local-binary file:///Users/ec2-user/spack-stack/build-cache/
           # DH* 20230721 - todo remove || true
-          spack buildcache update-index -m local-binary || true
+          spack buildcache update-index local-binary || true
           echo "Packages in combined spack build caches:"
           spack buildcache list
 
@@ -109,14 +109,14 @@ jobs:
           # DH* 20230721 - todo remove --no-checksum
           spack install --fail-fast --source --no-check-signature --no-checksum base-env 2>&1 | tee log.install.apple-clang-14.0.0.base-env
           # DH* 20230721 - todo remove || true (this was here all the time, but should not be needed if spack creates buildcaches correctly)
-          spack buildcache create -a -r -u -d /Users/ec2-user/spack-stack/build-cache/ || true
+          spack buildcache create -a -u /Users/ec2-user/spack-stack/build-cache/ || true
 
           # the rest
           echo "${{ inputs.template || 'unified-dev' }} ..."
           # DH* 20230721 - todo remove --no-checksum
           spack install --fail-fast --source --no-check-signature --no-checksum 2>&1 | tee log.install.apple-clang-14.0.0.${{ inputs.template || 'unified-dev' }}
           # DH* 20230721 - todo remove || true (this was here all the time, but should not be needed if spack creates buildcaches correctly)
-          spack buildcache create -a -r -u -d /Users/ec2-user/spack-stack/build-cache/ || true
+          spack buildcache create -a -u /Users/ec2-user/spack-stack/build-cache/ || true
 
           # Next steps: synchronize source and build cache to a central/combined mirror?
           echo "Next steps ..."
@@ -136,16 +136,17 @@ jobs:
           export ENVNAME=ci-env.macos-ci-x86_64
           # *DH
           export ENVDIR=$PWD/envs/${ENVNAME}
+          ls -l ${ENVDIR}/install/modulefiles/Core
 
           module use ${ENVDIR}/install/modulefiles/Core
           module load stack-apple-clang/14.0.0
-          module load stack-openmpi
+          module load stack-openmpi/4.1.5
           module load stack-python/3.10.8
           module available
 
-          module load jedi-ufs-env/unified-dev
-          module load ewok-env/unified-dev
-          module load soca-env/unified-dev
+          module load jedi-ufs-env/1.0.0
+          module load ewok-env/1.0.0
+          module load soca-env/1.0.0
           module list
 
       # Skip this for now, copied from other yaml

diff --git a/.github/workflows/ubuntu-ci-x86_64.yaml b/.github/workflows/ubuntu-ci-x86_64.yaml
@@ -60,7 +60,7 @@ jobs:
           export SPACK_SYSTEM_CONFIG_PATH="${ENVDIR}/site"
 
           # Find external packages
-          spack external find --scope system
+          spack external find --scope system --exclude bison --exclude openssl
           spack external find --scope system perl
           spack external find --scope system wget
           PATH="/usr/local/opt/curl/bin:$PATH" \
@@ -134,7 +134,7 @@ jobs:
           # Add binary cache and reindex it
           spack mirror add local-binary file:///home/ubuntu/spack-stack/build-cache/
           # DH* 20230721 - todo remove || true
-          spack buildcache update-index -m local-binary || true
+          spack buildcache update-index local-binary || true
           echo "Packages in combined spack build caches:"
           spack buildcache list
 
@@ -147,14 +147,14 @@ jobs:
           # DH* 20230721 - todo remove --no-checksum
           spack install --fail-fast --source --no-check-signature --no-checksum base-env 2>&1 | tee log.install.intel-2021.4.0.base-env
           # DH* 20230721 - todo remove || true (this was here all the time, but should not be needed if spack creates buildcaches correctly)
-          spack buildcache create -a -r -u -d /home/ubuntu/spack-stack/build-cache/ || true
+          spack buildcache create -a -u /home/ubuntu/spack-stack/build-cache/ || true
 
           # the rest
           echo "${{ inputs.template || 'unified-dev' }} ..."
           # DH* 20230721 - todo remove --no-checksum
           spack install --fail-fast --source --no-check-signature --no-checksum 2>&1 | tee [email protected].${{ inputs.template || 'unified-dev' }}
           # DH* 20230721 - todo remove || true (this was here all the time, but should not be needed if spack creates buildcaches correctly)
-          spack buildcache create -a -r -u -d /home/ubuntu/spack-stack/build-cache/ || true
+          spack buildcache create -a -u /home/ubuntu/spack-stack/build-cache/ || true
 
           # Next steps: synchronize source and build cache to a central/combined mirror?
           echo "Next steps ..."
@@ -186,16 +186,17 @@ jobs:
           export ENVNAME=ci-env.ubuntu-ci-x86_64
           # *DH
           export ENVDIR=$PWD/envs/${ENVNAME}
+          ls -l ${ENVDIR}/install/modulefiles/Core
 
           module use ${ENVDIR}/install/modulefiles/Core
           module load stack-intel/2021.4.0
           module load stack-intel-oneapi-mpi/2021.4.0
           module load stack-python/3.10.8
           module available
 
-          module load jedi-ufs-env/unified-dev
-          module load ewok-env/unified-dev
-          module load soca-env/unified-dev
+          module load jedi-ufs-env/1.0.0
+          module load ewok-env/1.0.0
+          module load soca-env/1.0.0
           module list
 
       # Skip this for now, copied from other yaml

diff --git a/configs/common/config.yaml b/configs/common/config.yaml
@@ -4,7 +4,7 @@ config:
   install_tree:
     root: $env/install
     projections:
-      all: "${COMPILERNAME}/${COMPILERVER}/${PACKAGE}-${VERSION}-${HASH}"
+      all: "{compiler.name}/{compiler.version}/{name}-{version}-{hash}"
     # Needed for relocation of binary packages (build caches)
     #padded_length: true
 

diff --git a/configs/common/modules.yaml b/configs/common/modules.yaml
@@ -16,7 +16,7 @@ modules:
         nlohmann-json: '{compiler.name}/{compiler.version}/json/{version}'
         nlohmann-json-schema-validator: '{compiler.name}/{compiler.version}/json-schema-validator/{version}'
         libjpeg-turbo: '{compiler.name}/{compiler.version}/libjpeg/{version}'
-      blacklist:
+      exclude:
       # List of packages for which we don't need modules
       - apple-libunwind
       - apple-libuuid
@@ -261,7 +261,7 @@ modules:
         nlohmann-json: 'json/{version}'
         nlohmann-json-schema-validator: 'json-schema-validator/{version}'
         libjpeg-turbo: 'libjpeg/{version}'
-      blacklist:
+      exclude:
       # List of packages for which we don't need modules
       - apple-libunwind
       - apple-libuuid