diff --git a/.github/workflows/ubuntu-ci-x86_64-oneapi-ifx.cfg b/.github/workflows/ubuntu-ci-x86_64-oneapi-ifx.cfg index 714e30d1f..36af6d2ca 100644 --- a/.github/workflows/ubuntu-ci-x86_64-oneapi-ifx.cfg +++ b/.github/workflows/ubuntu-ci-x86_64-oneapi-ifx.cfg @@ -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: diff --git a/.github/workflows/ubuntu-ci-x86_64-oneapi.cfg b/.github/workflows/ubuntu-ci-x86_64-oneapi.cfg index 26eb5420f..dad047776 100644 --- a/.github/workflows/ubuntu-ci-x86_64-oneapi.cfg +++ b/.github/workflows/ubuntu-ci-x86_64-oneapi.cfg @@ -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: diff --git a/configs/common/packages.yaml b/configs/common/packages.yaml index 069c8c28f..399bf4ba9 100644 --- a/configs/common/packages.yaml +++ b/configs/common/packages.yaml @@ -86,7 +86,7 @@ packages: - +ownlibs codee: require: - - '@2026.1' + - '@2026.1.2' crtm_fix: require: - ~link-big-endian diff --git a/configs/common/packages_oneapi.yaml b/configs/common/packages_oneapi.yaml index 05f2e7e35..e6516bcab 100644 --- a/configs/common/packages_oneapi.yaml +++ b/configs/common/packages_oneapi.yaml @@ -62,6 +62,9 @@ packages: parallel-netcdf: require: - +shared-intel + patchelf: + require: + - '%c=gcc' py-maturin: require: - '%c=gcc' diff --git a/configs/sites/tier1/atlantis/packages_oneapi-2024.2.1.yaml b/configs/sites/tier1/atlantis/packages_oneapi-2024.2.1.yaml index bf6bd097f..2399b9d46 100644 --- a/configs/sites/tier1/atlantis/packages_oneapi-2024.2.1.yaml +++ b/configs/sites/tier1/atlantis/packages_oneapi-2024.2.1.yaml @@ -12,7 +12,7 @@ packages: intel-oneapi-compilers: buildable: false externals: - - spec: intel-oneapi-compilers@2024.2.1 + - spec: intel-oneapi-compilers@2024.2.1 +fix_rt_linkage prefix: /cm/shared/apps/intel/oneapi-2024.2.1 modules: - intel-oneapi-2024.2.1 diff --git a/configs/sites/tier1/atlantis/packages_oneapi-2025.3.0.yaml b/configs/sites/tier1/atlantis/packages_oneapi-2025.3.0.yaml index 40749709b..a284b3a2e 100644 --- a/configs/sites/tier1/atlantis/packages_oneapi-2025.3.0.yaml +++ b/configs/sites/tier1/atlantis/packages_oneapi-2025.3.0.yaml @@ -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: /gpfs/neptune/spack-stack/oneapi-2025.3.0 modules: - umf/1.0.2 diff --git a/configs/sites/tier1/blueback/packages_gcc-14.3.0.yaml b/configs/sites/tier1/blueback/packages_gcc-14.3.0.yaml new file mode 100644 index 000000000..76c642d1f --- /dev/null +++ b/configs/sites/tier1/blueback/packages_gcc-14.3.0.yaml @@ -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 diff --git a/configs/sites/tier1/blueback/packages_oneapi-2025.0.4.yaml b/configs/sites/tier1/blueback/packages_oneapi-2025.0.4.yaml index 13fe28a26..73694faaf 100644 --- a/configs/sites/tier1/blueback/packages_oneapi-2025.0.4.yaml +++ b/configs/sites/tier1/blueback/packages_oneapi-2025.0.4.yaml @@ -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 diff --git a/configs/sites/tier1/narwhal/packages_oneapi-2024.2.0.yaml b/configs/sites/tier1/narwhal/packages_oneapi-2024.2.0.yaml index 4a7b53b1c..91bb91e87 100644 --- a/configs/sites/tier1/narwhal/packages_oneapi-2024.2.0.yaml +++ b/configs/sites/tier1/narwhal/packages_oneapi-2024.2.0.yaml @@ -12,7 +12,7 @@ packages: intel-oneapi-compilers: buildable: false externals: - - spec: intel-oneapi-compilers@2024.2.0 + - spec: intel-oneapi-compilers@2024.2.0 +fix_rt_linkage prefix: /opt/intel/oneapi_2024.2.0.634 modules: - PrgEnv-intel/8.5.0 diff --git a/configs/sites/tier1/nautilus/packages_oneapi-2024.2.1.yaml b/configs/sites/tier1/nautilus/packages_oneapi-2024.2.1.yaml index 95166c31d..99d0b00c4 100644 --- a/configs/sites/tier1/nautilus/packages_oneapi-2024.2.1.yaml +++ b/configs/sites/tier1/nautilus/packages_oneapi-2024.2.1.yaml @@ -12,7 +12,7 @@ packages: intel-oneapi-compilers: buildable: false externals: - - spec: intel-oneapi-compilers@2024.2.1 + - spec: intel-oneapi-compilers@2024.2.1 +fix_rt_linkage prefix: /p/app/projects/NEPTUNE/spack-stack/oneapi-2024.2.1 modules: - tbb/2021.13 diff --git a/configs/sites/tier1/nautilus/packages_oneapi-2025.3.0.yaml b/configs/sites/tier1/nautilus/packages_oneapi-2025.3.0.yaml index 1698fe453..3a86e051a 100644 --- a/configs/sites/tier1/nautilus/packages_oneapi-2025.3.0.yaml +++ b/configs/sites/tier1/nautilus/packages_oneapi-2025.3.0.yaml @@ -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: /p/app/projects/NEPTUNE/spack-stack/oneapi-2025.3.0 modules: - tbb/2022.3 diff --git a/configs/sites/tier2/blackpearl/packages_oneapi-2024.2.1.yaml b/configs/sites/tier2/blackpearl/packages_oneapi-2024.2.1.yaml index 19c6c965b..92023e6c9 100644 --- a/configs/sites/tier2/blackpearl/packages_oneapi-2024.2.1.yaml +++ b/configs/sites/tier2/blackpearl/packages_oneapi-2024.2.1.yaml @@ -11,7 +11,7 @@ packages: - intel-oneapi-mpi@2021.13 intel-oneapi-compilers: externals: - - spec: intel-oneapi-compilers@2024.2.1 + - spec: intel-oneapi-compilers@2024.2.1 +fix_rt_linkage prefix: /opt/intel/oneapi extra_attributes: compilers: diff --git a/configs/sites/tier2/bounty/packages_oneapi-2025.3.0.yaml b/configs/sites/tier2/bounty/packages_oneapi-2025.3.0.yaml index 86fd28a86..a81903d45 100644 --- a/configs/sites/tier2/bounty/packages_oneapi-2025.3.0.yaml +++ b/configs/sites/tier2/bounty/packages_oneapi-2025.3.0.yaml @@ -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: diff --git a/repos/builtin b/repos/builtin index 89af8e824..0fb88e672 160000 --- a/repos/builtin +++ b/repos/builtin @@ -1 +1 @@ -Subproject commit 89af8e82400c8b5b8ae62c2915e7707cb4b8445f +Subproject commit 0fb88e672d8ed7614f89e9b050132e768e286114 diff --git a/spack-ext/lib/jcsda-emc/spack-stack/stack/compiler_utils.py b/spack-ext/lib/jcsda-emc/spack-stack/stack/compiler_utils.py index 013ba0f6d..fcb54871c 100644 --- a/spack-ext/lib/jcsda-emc/spack-stack/stack/compiler_utils.py +++ b/spack-ext/lib/jcsda-emc/spack-stack/stack/compiler_utils.py @@ -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 @@ -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: diff --git a/util/nrl/batch_install.sh b/util/nrl/batch_install.sh index d04c3333d..73990dfaf 100755 --- a/util/nrl/batch_install.sh +++ b/util/nrl/batch_install.sh @@ -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" @@ -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=""