Add variant to build Scalasca/Scorep/Cube as part of dev-utils-env

.gitmodules

@@ -4,5 +4,8 @@
   branch = spack-stack-dev
 [submodule "repos/builtin"]
   path = repos/builtin
-  url = https://github.com/jcsda/spack-packages
-  branch = spack-stack-dev
+  #url = https://github.com/jcsda/spack-packages
+  #branch = spack-stack-dev
+  # https://github.com/JCSDA/spack-packages/pull/57
+  url = https://github.com/climbfuji/spack-packages
+  branch = bugfix/scalasca_scorep_spack_stack_dev

configs/common/packages.yaml

@@ -465,6 +465,8 @@ packages:
     py-versioneer:
       require:
       - '@0.29'
+    # On a per-site basis, either set qt to buildable: false
+    # or add requirement to build with gcc for Intel oneAPI
     qt:
       require:
       - '@5'

configs/common/packages_oneapi.yaml

@@ -71,9 +71,9 @@ packages:
     py-scipy:
       require:
       - 'cxxflags="-O1"'
-    qt:
-      require:
-      - '%c,cxx=gcc'
+    #qt:
+    #  require:
+    #  - '%c,cxx=gcc'
     rust:
       require:
       - '%c,cxx=gcc'

configs/sites/tier2/bounty/packages.yaml

@@ -1,5 +1,8 @@
 packages:
   # Modification of common packages
+  dev-utils-env:
+    require:
+    - +scalasca
 
   # All other packages listed alphabetically
   autoconf:

repos/spack_stack/spack_repo/spack_stack/packages/dev_utils_env/package.py

@@ -19,6 +19,8 @@ class DevUtilsEnv(BundlePackage):
 
     version("1.0.0")
 
+    variant("scalasca", default=False, description="Build Scalasca/Cube")
+
     depends_on("base-env", type="run")
 
     # I/O
@@ -27,6 +29,10 @@ class DevUtilsEnv(BundlePackage):
     depends_on("py-pydantic +dotenv", type="run")
     depends_on("py-pydantic-settings", type="run")
 
+    # Scalasca/ScoreP
+    depends_on("scalasca", when="+scalasca", type="run")
+    depends_on("cube +gui", when="+scalasca", type="run")
+
     # Miscellaneous
     depends_on("cloc", type="run")
     depends_on("rank-run", type="run")

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

@@ -95,6 +95,7 @@ def check_preferred_compiler():
         except:
             logging.info(f"  ... {spec.name}@{spec.version}/{spec.dag_hash(length=7)} has no compiler dependency")
             continue
+        logging.warning(f"  ... {spec.name}@{spec.version}/{spec.dag_hash(length=7)}: {compiler_name}@={compiler_version}")
         # If the spec compiler matches the preferred compiler for the environment, move on.
         # Note that this permits situations where a packages has an explicit preferred (but
         # not explicitly required) compiler, but Spack decides to use the preferred (and

util/nrl/batch_install.sh

@@ -177,7 +177,7 @@ case ${SPACK_STACK_BATCH_HOST} in
     ;;
   bounty)
     SPACK_STACK_BATCH_COMPILERS=("oneapi@=2025.3.0" "gcc@=14.2.1" "gcc@=13.3.1" "clang@=22.1.0")
-    SPACK_STACK_BATCH_TEMPLATES=("neptune-dev" "neptune-dev-llvm" "unified-dev" "cylc-dev")
+    SPACK_STACK_BATCH_TEMPLATES=("neptune-dev") #"neptune-dev-llvm" "unified-dev" "cylc-dev")
     SPACK_STACK_MODULE_CHOICE="tcl"
     SPACK_STACK_BOOTSTRAP_MIRROR="/home/dom/prod/spack-bootstrap-mirror"
     SPACK_STACK_CARGO_MIRROR="/home/dom/prod/spack-cargo-mirror"