diff --git a/configs/common/packages.yaml b/configs/common/packages.yaml index 64bbb45e4..ae084e409 100644 --- a/configs/common/packages.yaml +++ b/configs/common/packages.yaml @@ -273,8 +273,10 @@ packages: require: '@69' py-setuptools-rust: require: '+rust_bootstrap' + # When making changes here, also check the tier2/blackpearl/packages.yaml py-torch: - require: '+custom-protobuf ~mkldnn' + require: + - '+custom-protobuf ~mkldnn' # To avoid duplicate packages py-urllib3: require: '@1.26.12' diff --git a/configs/sites/tier2/blackpearl/compilers.yaml b/configs/sites/tier2/blackpearl/compilers.yaml index efe1c6bef..13e655e21 100644 --- a/configs/sites/tier2/blackpearl/compilers.yaml +++ b/configs/sites/tier2/blackpearl/compilers.yaml @@ -40,23 +40,19 @@ compilers: append_path: CPATH: /opt/intel/oneapi/compiler/2024.2/opt/compiler/include/intel64 extra_rpaths: [] -# DH* change to 2025.x.y - compiler: - spec: oneapi@=2024.1.2 + spec: oneapi@=2025.1.0 paths: - cc: /opt/intel/oneapi/2024.1/bin/icx - cxx: /opt/intel/oneapi/2024.1/bin/icpx - f77: /opt/intel/oneapi/2024.1/bin/ifx - fc: /opt/intel/oneapi/2024.1/bin/ifx + cc: /opt/intel/oneapi/2025.1/bin/icx + cxx: /opt/intel/oneapi/2025.1/bin/icpx + f77: /opt/intel/oneapi/2025.1/bin/ifx + fc: /opt/intel/oneapi/2025.1/bin/ifx flags: {} operating_system: oracle9 target: x86_64 modules: [] - environment: - append_path: - CPATH: /opt/intel/oneapi/compiler/2024.1/opt/compiler/include/intel64 + environment: {} extra_rpaths: [] -# *DH - compiler: spec: aocc@=4.2.0 paths: diff --git a/configs/sites/tier2/blackpearl/packages.yaml b/configs/sites/tier2/blackpearl/packages.yaml index 5613edcd8..e5e13f46a 100644 --- a/configs/sites/tier2/blackpearl/packages.yaml +++ b/configs/sites/tier2/blackpearl/packages.yaml @@ -1,4 +1,12 @@ packages: + # Modification of common packages + + # Pin py-torch to 2.5.1 to avoid build errors with 2.6.0 + py-torch: + require: + - '@2.5.1' + + # All other packages listed alphabetically autoconf: externals: - spec: autoconf@2.69 diff --git a/configs/sites/tier2/blackpearl/packages_oneapi.yaml b/configs/sites/tier2/blackpearl/packages_oneapi.yaml index 7919e8c47..d79986c4e 100644 --- a/configs/sites/tier2/blackpearl/packages_oneapi.yaml +++ b/configs/sites/tier2/blackpearl/packages_oneapi.yaml @@ -1,29 +1,25 @@ packages: all: - # DH* TODO UPDATE to 2025.x.y (MPI, ... TOO) - compiler:: [oneapi@2024.2.1, oneapi@2024.1.2, gcc@11.4.1] + compiler:: [oneapi@2024.2.1, oneapi@2025.1.0, gcc@11.4.1] providers: - mpi:: [intel-oneapi-mpi@2021.13, intel-oneapi-mpi@2021.12] + mpi:: [intel-oneapi-mpi@2021.13, intel-oneapi-mpi@2021.15] mpi: buildable: False intel-oneapi-mpi: externals: - spec: intel-oneapi-mpi@2021.13%oneapi@2024.2.1 prefix: /opt/intel/oneapi - # DH* CHANGE TO 2025.x.y - - spec: intel-oneapi-mpi@2021.12%oneapi@2024.1.2 + - spec: intel-oneapi-mpi@2021.15%oneapi@2025.1.0 prefix: /opt/intel/oneapi intel-oneapi-mkl: externals: - spec: intel-oneapi-mkl@2024.2%oneapi@2024.2.1 prefix: /opt/intel/oneapi - # DH* CHANGE TO 2025.x.y - - spec: intel-oneapi-mkl@2024.1%oneapi@2024.1.2 + - spec: intel-oneapi-mkl@2025.1%oneapi@2025.1.0 prefix: /opt/intel/oneapi intel-oneapi-runtime: externals: - spec: intel-oneapi-runtime@2024.2.1%oneapi@2024.2.1 prefix: /opt/intel/oneapi - # DH* CHANGE TO 2025.x.y - - spec: intel-oneapi-runtime@2024.1.2%oneapi@2024.1.2 + - spec: intel-oneapi-runtime@2025.1.0%oneapi@2025.1.0 prefix: /opt/intel/oneapi diff --git a/util/nrl/batch_install.sh b/util/nrl/batch_install.sh index 4def41a55..5a5910a31 100755 --- a/util/nrl/batch_install.sh +++ b/util/nrl/batch_install.sh @@ -147,8 +147,7 @@ case ${SPACK_STACK_BATCH_HOST} in SPACK_STACK_CARGO_MIRROR="/p/work1/heinzell/spack-stack/cargo-mirror" ;; blackpearl) - # DH* TODO UPDATE oneifx@=2024.1.2 to oneifx@=2025.x.y - SPACK_STACK_BATCH_COMPILERS=("oneapi@=2024.2.1" "oneapi@=2024.1.2" "gcc@=13.3.0" "aocc@=4.2.0") + SPACK_STACK_BATCH_COMPILERS=("oneapi@=2024.2.1" "oneapi@=2025.1.0" "gcc@=13.3.0") SPACK_STACK_BATCH_TEMPLATES=("neptune-dev" "unified-dev" "cylc-dev") SPACK_STACK_MODULE_CHOICE="tcl" SPACK_STACK_BOOTSTRAP_MIRROR="/home/dom/prod/spack-bootstrap-mirror"