Skip to content

Commit cc68eee

Browse files
authored
Apply suggestions from code review
Co-authored-by: Dom Heinzeller <dom.heinzeller@icloud.com>
1 parent dd5a53f commit cc68eee

4 files changed

Lines changed: 4 additions & 8 deletions

File tree

configs/common/packages_oneapi.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,9 @@ packages:
7171
py-scipy:
7272
require:
7373
- 'cxxflags="-O1"'
74-
#qt:
75-
# require:
76-
# - '%c,cxx=gcc'
74+
qt:
75+
require:
76+
- '%c,cxx=gcc'
7777
rust:
7878
require:
7979
- '%c,cxx=gcc'

configs/sites/tier2/bounty/packages.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
packages:
22
# Modification of common packages
3-
dev-utils-env:
4-
require:
5-
- +scalasca
63

74
# All other packages listed alphabetically
85
autoconf:

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,6 @@ def check_preferred_compiler():
9595
except:
9696
logging.info(f" ... {spec.name}@{spec.version}/{spec.dag_hash(length=7)} has no compiler dependency")
9797
continue
98-
logging.warning(f" ... {spec.name}@{spec.version}/{spec.dag_hash(length=7)}: {compiler_name}@={compiler_version}")
9998
# If the spec compiler matches the preferred compiler for the environment, move on.
10099
# Note that this permits situations where a packages has an explicit preferred (but
101100
# not explicitly required) compiler, but Spack decides to use the preferred (and

util/nrl/batch_install.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ case ${SPACK_STACK_BATCH_HOST} in
177177
;;
178178
bounty)
179179
SPACK_STACK_BATCH_COMPILERS=("oneapi@=2025.3.0" "gcc@=14.2.1" "gcc@=13.3.1" "clang@=22.1.0")
180-
SPACK_STACK_BATCH_TEMPLATES=("neptune-dev") #"neptune-dev-llvm" "unified-dev" "cylc-dev")
180+
SPACK_STACK_BATCH_TEMPLATES=("neptune-dev" "neptune-dev-llvm" "unified-dev" "cylc-dev")
181181
SPACK_STACK_MODULE_CHOICE="tcl"
182182
SPACK_STACK_BOOTSTRAP_MIRROR="/home/dom/prod/spack-bootstrap-mirror"
183183
SPACK_STACK_CARGO_MIRROR="/home/dom/prod/spack-cargo-mirror"

0 commit comments

Comments
 (0)