Acorn spack-stack v2 updates

.gitignore

@@ -4,3 +4,4 @@ __pycache__
 cache
 .vscode
 doc/build
+deploy_logs/

configs/sites/tier1/acorn/packages.yaml

@@ -43,3 +43,5 @@
       externals:
       - spec: [email protected]
         prefix: /usr
+    libxslt:
+      require: '~crypto'

configs/sites/tier1/acorn/packages_oneapi-2024.2.1.yaml

@@ -0,0 +1,75 @@
+packages:
+  ### Compilers / compiler runtimes
+  intel-oneapi-compilers:
+    buildable: false
+    externals:
+    - spec: [email protected] ~envmods
+      modules:
+      - PrgEnv-intel/8.5.0
+      - craype/2.7.17
+      - intel-oneapi/2024.2
+      - libfabric
+      extra_attributes:
+        compilers:
+          c: cc
+          cxx: CC
+          fortran: ftn
+        flags:
+          cflags: '--gcc-toolchain=/opt/cray/pe/gcc/12.1.0/snos'
+          cxxflags: '--gcc-toolchain=/opt/cray/pe/gcc/12.1.0/snos'
+          fflags: '-gcc-name=/opt/cray/pe/gcc/12.1.0/snos/bin/gcc -gxx-name=/opt/cray/pe/gcc/12.1.0/snos/bin/g++'
+        environment:
+          prepend_path:
+            PATH: /opt/cray/pe/gcc/12.1.0/snos/bin
+            LD_LIBRARY_PATH: /opt/cray/pe/gcc/12.1.0/snos/lib64
+            LIBRARY_PATH: /opt/cray/pe/gcc/12.1.0/snos/lib64
+            CPATH: /opt/cray/pe/gcc/12.1.0/snos/include
+          set:
+            CONFIG_SITE: ''
+            INTEL_COMPILER_TYPE: RECOMMENDED
+  gcc:
+    buildable: false
+    externals:
+    - spec: [email protected] languages:='c,c++,fortran'
+      prefix: /opt/cray/pe/gcc/12.1.0/snos/
+      extra_attributes:
+        compilers:
+          c: /opt/cray/pe/gcc/12.1.0/snos/bin/gcc
+          cxx: /opt/cray/pe/gcc/12.1.0/snos/bin/g++
+          fortran: /opt/cray/pe/gcc/12.1.0/snos/bin/gfortran
+        environment:
+          set:
+            # OpenSUSE on WCOSS2 machines sets CONFIG_SITE so
+            # Automake-based builds are installed in lib64
+            # which confuses some packages.
+            CONFIG_SITE: ''
+  gcc-runtime:
+    require: '%[email protected]'
+  ### General package/provider settings & MPI external
+  mpi:
+    buildable: false
+    require: ['[email protected]']
+  cray-mpich:
+    externals:
+    - spec: [email protected]~wrappers
+      prefix: /opt/cray/pe/mpich/8.1.29/ofi/intel/2022.1
+      modules:
+      - libfabric
+      - craype-network-ofi
+      - cray-mpich/8.1.29
+      - cray-pals
+  ### Disable MKL
+  intel-oneapi-mkl:
+    buildable: false
+  blas:
+    require: ['openblas']
+  lapack:
+    require: ['openblas']
+  fftw-api:
+    require: ['fftw']
+  ectrans:
+    require:: ['~mkl', '+fftw']
+  gsibec:
+    require: ['~mkl']
+  py-numpy:
+    require:: ['^[virtuals=lapack,blas] openblas']

configs/sites/tier1/acorn/setup.sh

@@ -1,5 +1,4 @@
-## Load modules to avoid various issues with old Python versions
-module load gcc/10.3.0 python/3.11.7
+module load cray-python/3.11.7
 
 ## Go, Rust repo setup for fetcher scripts
 export GOMODCACHE=${SPACK_STACK_DIR}/cache/go

spack-ext/lib/jcsda-emc/spack-stack/stack/cmd/stack_cmds/create.py

@@ -3,7 +3,7 @@
 import shutil
 from sys import platform
 
-import llnl.util.tty as tty
+import spack.llnl.util.tty as tty
 
 from spack.extensions.stack.container_env import StackContainer
 from spack.extensions.stack.stack_env import StackEnv, stack_path

spack-ext/lib/jcsda-emc/spack-stack/stack/stack_env.py

@@ -349,13 +349,14 @@ def write(self):
                               "version of spack-stack, or really, really know what you are doing.")
                         )
             new_envrepo = os.path.join(self.env_dir(), "envrepo")
+            config_envrepo = False
             for upstream_path in all_upstreams[::-1]:
                 envrepo_path = os.path.realpath(os.path.join(upstream_path, "../envrepo"))
                 if os.path.isdir(envrepo_path):
                     shutil.copytree(envrepo_path, new_envrepo, dirs_exist_ok=True)
-            if os.path.isdir(new_envrepo):
-                repo_cfg = "repos:[$env/envrepo]"
-                spack.config.add(repo_cfg, scope=env_scope)
+                    config_envrepo = True
+            if config_envrepo:
+                spack.config.add("repos:[$env/envrepo]", scope=env_scope)
 
         if self.modifypkg:
             logging.info("Creating custom repo with packages %s" % ", ".join(self.modifypkg))
@@ -388,8 +389,16 @@ def write(self):
                 if not pkg_found:
                     logging.warning(f"WARNING: package '{pkg_name}' could not be found")
             logging.info("Adding custom repo 'envrepo' to env config")
-            repo_cfg = "repos:[$env/envrepo]"
-            spack.config.add(repo_cfg, scope=env_scope)
+            spack.config.add("repos:[$env/envrepo]", scope=env_scope)
+
+        # Copy any envrepo directory associated with the template (i.e., add-on env)
+        if self.template:
+            template_envrepo_path = os.path.join(self.template_path, "envrepo")
+            if os.path.isdir(template_envrepo_path):
+                logging.info(f"Copying envrepo/ from {self.template_path}")
+                target_envrepo_path = os.path.join(env_dir, "envrepo")
+                shutil.copytree(template_envrepo_path, target_envrepo_path, dirs_exist_ok=True)
+                spack.config.add("repos:[$env/envrepo]", scope=env_scope)
 
         # Merge the original spack.yaml template back in
         # so it has the highest precedence