Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
d7c69cd
Add gcc@14.2.1 on Bounty
climbfuji Apr 6, 2026
7608096
Update submodule pointer for repos/builtin
climbfuji Apr 10, 2026
46a67a1
Merge branch 'develop' of https://github.com/jcsda/spack-stack into d…
climbfuji Apr 14, 2026
c864f9f
Update .gitmodules and submodule pointer for repos/builtin for code r…
climbfuji Apr 15, 2026
4aa4df6
Merge branch 'develop' of https://github.com/jcsda/spack-stack into f…
climbfuji Apr 15, 2026
b5681ad
Revert .gitmodules and update submodule pointer for repos/builtin
climbfuji Apr 16, 2026
fa26ecc
Add configs/sites/tier1/blueback/packages_gcc-14.3.0.yaml
climbfuji Apr 17, 2026
3a4edc0
Fix bug in gcc@14 config for Blueback in util/nrl/batch_install.sh; r…
climbfuji Apr 27, 2026
5b5e76a
Merge branch 'develop' of https://github.com/jcsda/spack-stack into f…
climbfuji Apr 27, 2026
762c074
Update .gitmodules and submodule pointer for repos/builtin
climbfuji Apr 27, 2026
ee21288
configs/sites/tier1/blueback/packages_oneapi-2025.0.4.yaml: add varia…
climbfuji Apr 27, 2026
56faa13
Revert .gitmodules and update submodule pointer for repos/builtin
climbfuji Apr 27, 2026
346b897
Add +fix_rt_linkage variant to external Intel oneAPI compiler specs i…
climbfuji Apr 27, 2026
f064929
Bug fix in spack-ext/lib/jcsda-emc/spack-stack/stack/compiler_utils.p…
climbfuji Apr 28, 2026
6177af9
Add variant +fix_rt_linkage to bounty tier2 site config for oneapi@20…
climbfuji Apr 28, 2026
89b0f05
configs/common/packages_oneapi.yaml: build patchelf with gcc
climbfuji Apr 28, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ubuntu-ci-x86_64-oneapi-ifx.cfg
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
intel-oneapi-compilers:
externals:
- spec: intel-oneapi-compilers@2024.2.0
- spec: intel-oneapi-compilers@2024.2.0 +fix_rt_linkage
prefix: /opt/intel/oneapi
extra_attributes:
compilers:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ubuntu-ci-x86_64-oneapi.cfg
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
intel-oneapi-compilers:
externals:
- spec: intel-oneapi-compilers@2024.2.0
- spec: intel-oneapi-compilers@2024.2.0 +fix_rt_linkage
prefix: /opt/intel/oneapi
extra_attributes:
compilers:
Expand Down
1 change: 1 addition & 0 deletions configs/common/packages.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ packages:
- +ownlibs
codee:
require:
# TODO UPDATE TO 2026.1.2 once https://github.com/JCSDA/spack-packages/pull/56 is merged
- '@2026.1'
crtm_fix:
require:
Expand Down
3 changes: 3 additions & 0 deletions configs/common/packages_oneapi.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,9 @@ packages:
parallel-netcdf:
require:
- +shared-intel
patchelf:
require:
- '%c=gcc'
py-maturin:
require:
- '%c=gcc'
Expand Down
39 changes: 39 additions & 0 deletions configs/sites/tier1/blueback/packages_gcc-14.3.0.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
packages:
all:
require:
- any_of: ['%gcc@=14.3.0']
when: '%gcc'
mpi:
buildable: false
require:
- cray-mpich@8.1.32
gcc:
buildable: false
externals:
- spec: gcc@14.3.0 languages:='c,c++,fortran'
prefix: /usr
modules:
- PrgEnv-gnu/8.6.0
- gcc-native/14.2
extra_attributes:
compilers:
c: /opt/cray/pe/gcc-native/14/bin/gcc
cxx: /opt/cray/pe/gcc-native/14/bin/g++
fortran: /opt/cray/pe/gcc-native/14/bin/gfortran
environment:
set:
CONFIG_SITE: ''
PE_GCC_EXTERNAL: native
cray-mpich:
buildable: false
externals:
- spec: cray-mpich@8.1.32
prefix: /opt/cray/pe/mpich/8.1.32/ofi/GNU/12.3
modules:
- libfabric/1.22.0
- craype-network-ofi
- cray-mpich/8.1.32
extra_attributes:
environment:
prepend_path:
CMAKE_PREFIX_PATH: /p/app/projects/NEPTUNE/spack-stack/cmake-findmpi
2 changes: 1 addition & 1 deletion configs/sites/tier1/blueback/packages_oneapi-2025.0.4.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ packages:
intel-oneapi-compilers:
buildable: false
externals:
- spec: intel-oneapi-compilers@2025.0.4
- spec: intel-oneapi-compilers@2025.0.4 +fix_rt_linkage
prefix: /p/app/intel/oneapi-combined
modules:
- PrgEnv-intel/8.6.0
Expand Down
2 changes: 1 addition & 1 deletion configs/sites/tier2/bounty/packages_oneapi-2025.3.0.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ packages:
intel-oneapi-compilers:
buildable: false
externals:
- spec: intel-oneapi-compilers@2025.3.0
- spec: intel-oneapi-compilers@2025.3.0 +fix_rt_linkage
prefix: /opt/intel/oneapi
extra_attributes:
compilers:
Expand Down
9 changes: 7 additions & 2 deletions spack-ext/lib/jcsda-emc/spack-stack/stack/compiler_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,12 @@ def check_preferred_compiler():
# different) compiler for the environment instead.
if preferred_compiler_name == compiler_name and preferred_compiler_version == compiler_version:
logging.info(f" ... {spec.name}@{spec.version}/{spec.dag_hash(length=7)} uses preferred compiler")
# If the package config doesn't have an entry for the package, then it should be
# built with the preferred compiler. However, because it failed the "if" test
# above, we know it is not.
elif not spec.name in package_config.keys():
errors += 1
logging.error(f" ... {RED}error: {spec.name}@{spec.version}/{spec.dag_hash(length=7)} does not use intended compiler{RESET}")
else:
spec_required_compiler_name = None
spec_required_compiler_version = None
Expand Down Expand Up @@ -147,8 +153,7 @@ def check_preferred_compiler():
logging.info(f" ... {spec.name}@{spec.version}/{spec.dag_hash(length=7)} uses explicitly preferred compiler")
else:
errors += 1
logging.error(f" ... {RED}error: {spec.name}@{spec.version}/{spec.dag_hash(length=7)} does not use intended compiler\n" + \
f" check also that any explicit preferred/required compiler dependencies are using Spack v1 syntax{RESET}")
logging.error(f" ... {RED}error: {spec.name}@{spec.version}/{spec.dag_hash(length=7)} does not use intended compiler{RESET}")
if errors==1:
raise Exception(f"{RED}Detected {errors} compiler mismatch!{RESET}")
elif errors:
Expand Down
4 changes: 2 additions & 2 deletions util/nrl/batch_install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ case ${SPACK_STACK_BATCH_HOST} in
SPACK_STACK_CARGO_MIRROR="/neptune_diagnostics/spack-stack/cargo-mirror"
;;
blueback)
SPACK_STACK_BATCH_COMPILERS=("oneapi@=2025.0.4" "gcc@=13.3.0") # oneapi@=2025.2.1
SPACK_STACK_BATCH_COMPILERS=("oneapi@=2025.0.4" "gcc@=13.3.0" "gcc@=14.3.0") # oneapi@=2025.2.1
SPACK_STACK_BATCH_TEMPLATES=("neptune-dev" "unified-dev" "cylc-dev")
SPACK_STACK_MODULE_CHOICE="tcl"
SPACK_STACK_BOOTSTRAP_MIRROR="/p/app/projects/NEPTUNE/spack-stack/bootstrap-mirror"
Expand Down Expand Up @@ -671,7 +671,7 @@ for compiler in "${SPACK_STACK_BATCH_COMPILERS[@]}"; do
case ${submit_to_scheduler} in
"true")
jobs=$(tasks_per_node ${host})
parallel_install_flags="--concurrent-packages=10 --jobs=${jobs}"
parallel_install_flags="--concurrent-packages=4 --jobs=${jobs}"
;;
"false")
parallel_install_flags=""
Expand Down
Loading