diff --git a/.github/workflows/ubuntu-ci-x86_64-oneapi-ifx.yaml b/.github/workflows/ubuntu-ci-x86_64-oneapi-ifx.yaml index 182a8dd6c..2d021efae 100644 --- a/.github/workflows/ubuntu-ci-x86_64-oneapi-ifx.yaml +++ b/.github/workflows/ubuntu-ci-x86_64-oneapi-ifx.yaml @@ -174,9 +174,6 @@ jobs: spack install --fail-fast --source --no-check-signature 2>&1 | tee log.install.${ENVNAME}.all spack buildcache create -u local-binary - # Check for libirc.so in shared libraries (returns 1=error if found) - ${SPACK_STACK_DIR}/util/check_libirc.sh - # Remove buildcache config settings spack config remove config:install_tree:padded_length @@ -213,9 +210,6 @@ jobs: # Check shared libraries ${SPACK_STACK_DIR}/util/ldd_check.py $SPACK_ENV 2>&1 | tee log.ldd_check - # Check for libirc.so in shared libraries (returns 1=error if found) - ${SPACK_STACK_DIR}/util/check_libirc.sh - # Create modules spack clean -a spack module tcl refresh -y diff --git a/.github/workflows/ubuntu-ci-x86_64-oneapi.yaml b/.github/workflows/ubuntu-ci-x86_64-oneapi.yaml index c6b9d436b..821cf9278 100644 --- a/.github/workflows/ubuntu-ci-x86_64-oneapi.yaml +++ b/.github/workflows/ubuntu-ci-x86_64-oneapi.yaml @@ -174,9 +174,6 @@ jobs: spack install --fail-fast --source --no-check-signature 2>&1 | tee log.install.${ENVNAME}.all spack buildcache create -u local-binary - # Check for libirc.so in shared libraries (returns 1=error if found) - ${SPACK_STACK_DIR}/util/check_libirc.sh - # Remove buildcache config settings spack config remove config:install_tree:padded_length @@ -213,9 +210,6 @@ jobs: # Check shared libraries ${SPACK_STACK_DIR}/util/ldd_check.py $SPACK_ENV 2>&1 | tee log.ldd_check - # Check for libirc.so in shared libraries (returns 1=error if found) - ${SPACK_STACK_DIR}/util/check_libirc.sh - # Create modules spack clean -a spack module tcl refresh -y diff --git a/configs/common/packages.yaml b/configs/common/packages.yaml index 376a315e1..72464e694 100644 --- a/configs/common/packages.yaml +++ b/configs/common/packages.yaml @@ -250,7 +250,7 @@ packages: - ~netcdf hdf5: require: - - '@1.14.5' + - '@2.1.0' - +hl - +fortran - +mpi @@ -389,10 +389,9 @@ packages: require: - '@2.6.2' - +pnetcdf - # DH* CAN WE UPDATE? NEED A NEW SHARED-INTEL PATCH? parallel-netcdf: require: - - '@1.12.3' + - '@1.14.1' pflogger: require: - +mpi diff --git a/configs/common/packages_oneapi.yaml b/configs/common/packages_oneapi.yaml index a60141866..cd4aaba18 100644 --- a/configs/common/packages_oneapi.yaml +++ b/configs/common/packages_oneapi.yaml @@ -19,6 +19,10 @@ packages: lapack: require: - intel-oneapi-mkl + # Force fixing libirc.so/libimf.so in intel-oneapi-runtime + intel-oneapi-compilers: + require: + - +fix_rt_linkage # Individual package settings antlr: require: @@ -63,9 +67,6 @@ packages: oops: require: - +mkl - parallel-netcdf: - require: - - +shared-intel patchelf: require: - '%c=gcc' diff --git a/util/check_libirc.sh b/util/check_libirc.sh deleted file mode 100755 index 62e6f625a..000000000 --- a/util/check_libirc.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/usr/bin/env bash - -ierror=0 - -searchfor="libirc.so" - -echo "Checking shared libraries for ${searchfor} ..." -for file in `find ${SPACK_ENV} -type f -iname '*.so*'`; do - # Return code from grep is 1 if not found, 0 if found - ldd $file 2>&1 | grep "${searchfor}" - if [[ $? -eq 0 ]]; then - echo "Found ${searchfor} linked in ${file}" - ierror=1 - fi -done - -echo "Checking executables for ${searchfor} ..." -for file in `find ${SPACK_ENV} -type f -executable`; do - # Return code from grep is 1 if not found, 0 if found - ldd $file 2>&1 | grep "${searchfor}" - if [[ $? -eq 0 ]]; then - echo "Found ${searchfor} linked in ${file}" - ierror=1 - fi -done - -exit ${ierror}