From 549077ece69c355dad23b4b1bc114263a74a80c3 Mon Sep 17 00:00:00 2001 From: David Huber Date: Wed, 11 Dec 2024 06:56:48 -0600 Subject: [PATCH 01/30] Update GH CI workflows --- .github/workflows/gcc.yml | 6 +++--- .github/workflows/intel.yml | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/gcc.yml b/.github/workflows/gcc.yml index 1f6fa3afcd..ed0b1a67c1 100644 --- a/.github/workflows/gcc.yml +++ b/.github/workflows/gcc.yml @@ -9,9 +9,9 @@ defaults: env: cache_key: gcc - CC: gcc-10 - FC: gfortran-10 - CXX: g++-10 + CC: gcc-12 + FC: gfortran-12 + CXX: g++-12 # The jobs are split into: # 1. a dependency build step (setup), and diff --git a/.github/workflows/intel.yml b/.github/workflows/intel.yml index d21420687a..4cf0abf129 100644 --- a/.github/workflows/intel.yml +++ b/.github/workflows/intel.yml @@ -34,7 +34,8 @@ jobs: sudo swapoff -a sudo rm -f /swapfile sudo apt clean - docker rmi $(docker image ls -aq) + DOCKER_IMGS=$(docker image ls -aq) + [[ ! -z "${DOCKER_IMGS}" ]] && docker rmi ${DOCKER_IMGS} # Checkout the GSI to get the ci/spack.yaml file - name: checkout From 14306ddba48aceeeb128e5ff966c98c42755b2cc Mon Sep 17 00:00:00 2001 From: David Huber Date: Wed, 11 Dec 2024 07:04:46 -0600 Subject: [PATCH 02/30] Update gcc cache --- .github/workflows/gcc.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gcc.yml b/.github/workflows/gcc.yml index ed0b1a67c1..6cfaab9b3f 100644 --- a/.github/workflows/gcc.yml +++ b/.github/workflows/gcc.yml @@ -34,7 +34,7 @@ jobs: # Cache spack, compiler and dependencies - name: cache-env id: cache-env - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: | spack From cb8fa1d0c97e7f2058c8aa1652b92b8ba0132b31 Mon Sep 17 00:00:00 2001 From: David Huber Date: Wed, 11 Dec 2024 07:24:24 -0600 Subject: [PATCH 03/30] Update gcc version --- ci/spack.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/spack.yaml b/ci/spack.yaml index 647904108e..ba8bc93187 100644 --- a/ci/spack.yaml +++ b/ci/spack.yaml @@ -4,7 +4,7 @@ spack: all: compiler: - intel - - gcc@10:10 + - gcc@12 specs: - netcdf-c@4.9.2 - netcdf-fortran@4.6.1 From 804d9586a1836db7dd5c417a61dffa85f5a7eb5a Mon Sep 17 00:00:00 2001 From: David Huber Date: Thu, 12 Dec 2024 07:33:51 -0600 Subject: [PATCH 04/30] Turn [[]] into if block --- .github/workflows/intel.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/intel.yml b/.github/workflows/intel.yml index 4cf0abf129..8981981dfe 100644 --- a/.github/workflows/intel.yml +++ b/.github/workflows/intel.yml @@ -35,7 +35,8 @@ jobs: sudo rm -f /swapfile sudo apt clean DOCKER_IMGS=$(docker image ls -aq) - [[ ! -z "${DOCKER_IMGS}" ]] && docker rmi ${DOCKER_IMGS} + if [[ ! -z "${DOCKER_IMGS}" ]]; then docker rmi ${DOCKER_IMGS}; fi + df -h # Checkout the GSI to get the ci/spack.yaml file - name: checkout From b331a7573cfabe80685a22bbed053518c11c6de8 Mon Sep 17 00:00:00 2001 From: David Huber Date: Thu, 12 Dec 2024 07:34:10 -0600 Subject: [PATCH 05/30] Explicitly install blas --- .github/workflows/gcc.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/gcc.yml b/.github/workflows/gcc.yml index 6cfaab9b3f..4a5d5f77ce 100644 --- a/.github/workflows/gcc.yml +++ b/.github/workflows/gcc.yml @@ -52,6 +52,7 @@ jobs: spack env activate gsi-env spack compiler find sudo apt install cmake + sudo apt install libblas-dev spack external find spack add mpich@3.4.2 spack concretize @@ -70,7 +71,7 @@ jobs: - name: cache-env id: cache-env - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: | spack From a45865a65e27b6fb2337be178ba70aeaaad83ebc Mon Sep 17 00:00:00 2001 From: David Huber Date: Thu, 12 Dec 2024 08:31:15 -0600 Subject: [PATCH 06/30] Install GCC 10 --- .github/workflows/gcc.yml | 7 ++++--- ci/spack.yaml | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/gcc.yml b/.github/workflows/gcc.yml index 4a5d5f77ce..e79708ab87 100644 --- a/.github/workflows/gcc.yml +++ b/.github/workflows/gcc.yml @@ -9,9 +9,9 @@ defaults: env: cache_key: gcc - CC: gcc-12 - FC: gfortran-12 - CXX: g++-12 + CC: gcc-10 + FC: gfortran-10 + CXX: g++-10 # The jobs are split into: # 1. a dependency build step (setup), and @@ -46,6 +46,7 @@ jobs: if: steps.cache-env.outputs.cache-hit != 'true' run: | sudo apt-get install cmake + sudo apt-get install gcc-10 g++-10 gfortran-10 git clone -c feature.manyFiles=true https://github.com/JCSDA/spack.git source spack/share/spack/setup-env.sh spack env create gsi-env gsi/ci/spack.yaml diff --git a/ci/spack.yaml b/ci/spack.yaml index ba8bc93187..f766a6064e 100644 --- a/ci/spack.yaml +++ b/ci/spack.yaml @@ -4,7 +4,7 @@ spack: all: compiler: - intel - - gcc@12 + - gcc@10 specs: - netcdf-c@4.9.2 - netcdf-fortran@4.6.1 From e76a58a85fc5553ac28b71d51fedb0f2a4ab2ff7 Mon Sep 17 00:00:00 2001 From: David Huber Date: Thu, 12 Dec 2024 08:40:05 -0600 Subject: [PATCH 07/30] Temporarily disable GCC cache --- .github/workflows/gcc.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gcc.yml b/.github/workflows/gcc.yml index e79708ab87..d66012db14 100644 --- a/.github/workflows/gcc.yml +++ b/.github/workflows/gcc.yml @@ -43,7 +43,7 @@ jobs: # Install dependencies using Spack - name: install-dependencies-with-spack - if: steps.cache-env.outputs.cache-hit != 'true' + # if: steps.cache-env.outputs.cache-hit != 'true' run: | sudo apt-get install cmake sudo apt-get install gcc-10 g++-10 gfortran-10 From 6d7536e7814fc80aed1f1718128e4612de7181b1 Mon Sep 17 00:00:00 2001 From: David Huber Date: Thu, 12 Dec 2024 09:26:24 -0600 Subject: [PATCH 08/30] Install more gcc10 stuff --- .github/workflows/gcc.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/gcc.yml b/.github/workflows/gcc.yml index d66012db14..0bd8f9ad0a 100644 --- a/.github/workflows/gcc.yml +++ b/.github/workflows/gcc.yml @@ -46,13 +46,13 @@ jobs: # if: steps.cache-env.outputs.cache-hit != 'true' run: | sudo apt-get install cmake - sudo apt-get install gcc-10 g++-10 gfortran-10 + sudo apt-get install gcc-10 g++-10 gfortran-10 gcc-10-runtime gcc-10-locales \ + gcc-10-multilib g++-10-multilib gfortran-10-multilib git clone -c feature.manyFiles=true https://github.com/JCSDA/spack.git source spack/share/spack/setup-env.sh spack env create gsi-env gsi/ci/spack.yaml spack env activate gsi-env spack compiler find - sudo apt install cmake sudo apt install libblas-dev spack external find spack add mpich@3.4.2 From b68eb92831edb85aecae0892a40d303da9a5475c Mon Sep 17 00:00:00 2001 From: David Huber Date: Thu, 12 Dec 2024 09:34:16 -0600 Subject: [PATCH 09/30] Force non-cache install for Intel --- .github/workflows/intel.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/intel.yml b/.github/workflows/intel.yml index 8981981dfe..a9fa254bdd 100644 --- a/.github/workflows/intel.yml +++ b/.github/workflows/intel.yml @@ -68,7 +68,7 @@ jobs: # Install dependencies using Spack - name: install-dependencies-with-spack - if: steps.cache-env.outputs.cache-hit != 'true' + # if: steps.cache-env.outputs.cache-hit != 'true' run: | sudo mv /usr/local/ /usr_local_mv sudo apt-get install cmake From bddcfad5189e11d4c12289044f09ff553fd36858 Mon Sep 17 00:00:00 2001 From: David Huber Date: Thu, 12 Dec 2024 09:35:38 -0600 Subject: [PATCH 10/30] Remove non-existent gcc package --- .github/workflows/gcc.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/gcc.yml b/.github/workflows/gcc.yml index 0bd8f9ad0a..9aeb2c6ced 100644 --- a/.github/workflows/gcc.yml +++ b/.github/workflows/gcc.yml @@ -43,10 +43,10 @@ jobs: # Install dependencies using Spack - name: install-dependencies-with-spack - # if: steps.cache-env.outputs.cache-hit != 'true' + if: steps.cache-env.outputs.cache-hit != 'true' run: | sudo apt-get install cmake - sudo apt-get install gcc-10 g++-10 gfortran-10 gcc-10-runtime gcc-10-locales \ + sudo apt-get install gcc-10 g++-10 gfortran-10 gcc-10-locales \ gcc-10-multilib g++-10-multilib gfortran-10-multilib git clone -c feature.manyFiles=true https://github.com/JCSDA/spack.git source spack/share/spack/setup-env.sh From 440ed1e72a6a35f8723e2dde86a67824a9c3ccd6 Mon Sep 17 00:00:00 2001 From: David Huber Date: Thu, 12 Dec 2024 09:36:46 -0600 Subject: [PATCH 11/30] Build GCC again --- .github/workflows/gcc.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gcc.yml b/.github/workflows/gcc.yml index 9aeb2c6ced..0d4df9726e 100644 --- a/.github/workflows/gcc.yml +++ b/.github/workflows/gcc.yml @@ -43,7 +43,7 @@ jobs: # Install dependencies using Spack - name: install-dependencies-with-spack - if: steps.cache-env.outputs.cache-hit != 'true' + # if: steps.cache-env.outputs.cache-hit != 'true' run: | sudo apt-get install cmake sudo apt-get install gcc-10 g++-10 gfortran-10 gcc-10-locales \ From 9320e0146d579e0be6ff52f0beae3e5aa1ac6887 Mon Sep 17 00:00:00 2001 From: David Huber Date: Thu, 12 Dec 2024 09:41:33 -0600 Subject: [PATCH 12/30] Remove spack/ if it already exists --- .github/workflows/gcc.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/gcc.yml b/.github/workflows/gcc.yml index 0d4df9726e..61353f8569 100644 --- a/.github/workflows/gcc.yml +++ b/.github/workflows/gcc.yml @@ -48,6 +48,7 @@ jobs: sudo apt-get install cmake sudo apt-get install gcc-10 g++-10 gfortran-10 gcc-10-locales \ gcc-10-multilib g++-10-multilib gfortran-10-multilib + rm -rf spack git clone -c feature.manyFiles=true https://github.com/JCSDA/spack.git source spack/share/spack/setup-env.sh spack env create gsi-env gsi/ci/spack.yaml From 01a4a9d3c8d535443b5384d37f7e6853c46da0ad Mon Sep 17 00:00:00 2001 From: David Huber Date: Thu, 12 Dec 2024 09:42:29 -0600 Subject: [PATCH 13/30] Remove spack/ if it already exists --- .github/workflows/intel.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/intel.yml b/.github/workflows/intel.yml index a9fa254bdd..3969453094 100644 --- a/.github/workflows/intel.yml +++ b/.github/workflows/intel.yml @@ -72,6 +72,7 @@ jobs: run: | sudo mv /usr/local/ /usr_local_mv sudo apt-get install cmake + rm -rf spack git clone -c feature.manyFiles=true https://github.com/JCSDA/spack.git source spack/share/spack/setup-env.sh spack env create gsi-env gsi/ci/spack.yaml From a11548026cc46785108a04697b93db718a819ae1 Mon Sep 17 00:00:00 2001 From: David Huber Date: Thu, 12 Dec 2024 13:19:15 -0600 Subject: [PATCH 14/30] Try GCC13 --- .github/workflows/gcc.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/gcc.yml b/.github/workflows/gcc.yml index 61353f8569..e4121a0604 100644 --- a/.github/workflows/gcc.yml +++ b/.github/workflows/gcc.yml @@ -9,9 +9,9 @@ defaults: env: cache_key: gcc - CC: gcc-10 - FC: gfortran-10 - CXX: g++-10 + CC: gcc-13 + FC: gfortran-13 + CXX: g++-13 # The jobs are split into: # 1. a dependency build step (setup), and @@ -46,8 +46,6 @@ jobs: # if: steps.cache-env.outputs.cache-hit != 'true' run: | sudo apt-get install cmake - sudo apt-get install gcc-10 g++-10 gfortran-10 gcc-10-locales \ - gcc-10-multilib g++-10-multilib gfortran-10-multilib rm -rf spack git clone -c feature.manyFiles=true https://github.com/JCSDA/spack.git source spack/share/spack/setup-env.sh From d090df349b12c5d8b1d920bac731f8f09f020e77 Mon Sep 17 00:00:00 2001 From: David Huber Date: Thu, 12 Dec 2024 13:19:39 -0600 Subject: [PATCH 15/30] Update GCC in spack.yaml --- ci/spack.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/spack.yaml b/ci/spack.yaml index f766a6064e..48b4c6dbca 100644 --- a/ci/spack.yaml +++ b/ci/spack.yaml @@ -4,7 +4,7 @@ spack: all: compiler: - intel - - gcc@10 + - gcc@13 specs: - netcdf-c@4.9.2 - netcdf-fortran@4.6.1 From 32ce9b519b02143cefb6297f6254f603a9f538e4 Mon Sep 17 00:00:00 2001 From: David Huber Date: Thu, 12 Dec 2024 14:25:46 -0600 Subject: [PATCH 16/30] Add openblas to spack env --- .github/workflows/gcc.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/gcc.yml b/.github/workflows/gcc.yml index e4121a0604..6cf734b916 100644 --- a/.github/workflows/gcc.yml +++ b/.github/workflows/gcc.yml @@ -55,6 +55,7 @@ jobs: sudo apt install libblas-dev spack external find spack add mpich@3.4.2 + spack add openblas spack concretize spack install -v --fail-fast --dirty spack clean -a From 41aa50d8d9467a4dac831f0de74349227433bc63 Mon Sep 17 00:00:00 2001 From: David Huber Date: Fri, 13 Dec 2024 09:47:30 -0600 Subject: [PATCH 17/30] Separate spack YAMLs for Intel and GCC --- .github/workflows/gcc.yml | 7 ++----- .github/workflows/intel.yml | 6 ++---- ci/spack_gcc.yaml | 30 +++++++++++++++++++++++++++++ ci/{spack.yaml => spack_intel.yaml} | 4 +++- 4 files changed, 37 insertions(+), 10 deletions(-) create mode 100644 ci/spack_gcc.yaml rename ci/{spack.yaml => spack_intel.yaml} (83%) diff --git a/.github/workflows/gcc.yml b/.github/workflows/gcc.yml index 6cf734b916..eef57cecb8 100644 --- a/.github/workflows/gcc.yml +++ b/.github/workflows/gcc.yml @@ -49,15 +49,12 @@ jobs: rm -rf spack git clone -c feature.manyFiles=true https://github.com/JCSDA/spack.git source spack/share/spack/setup-env.sh - spack env create gsi-env gsi/ci/spack.yaml + spack env create gsi-env gsi/ci/spack_gcc.yaml spack env activate gsi-env spack compiler find - sudo apt install libblas-dev spack external find - spack add mpich@3.4.2 - spack add openblas spack concretize - spack install -v --fail-fast --dirty + spack install --fail-fast --dirty spack clean -a gsi: diff --git a/.github/workflows/intel.yml b/.github/workflows/intel.yml index 3969453094..d8f8c80f59 100644 --- a/.github/workflows/intel.yml +++ b/.github/workflows/intel.yml @@ -75,14 +75,12 @@ jobs: rm -rf spack git clone -c feature.manyFiles=true https://github.com/JCSDA/spack.git source spack/share/spack/setup-env.sh - spack env create gsi-env gsi/ci/spack.yaml + spack env create gsi-env gsi/ci/spack_intel.yaml spack env activate gsi-env spack compiler find - sudo apt install cmake spack external find - spack add intel-oneapi-mpi spack concretize - spack install -v --fail-fast --dirty + spack install --fail-fast --dirty spack clean -a gsi: diff --git a/ci/spack_gcc.yaml b/ci/spack_gcc.yaml new file mode 100644 index 0000000000..566d47cd71 --- /dev/null +++ b/ci/spack_gcc.yaml @@ -0,0 +1,30 @@ +# Spack environment file to build GSI dependencies +spack: + packages: + all: + providers: + blas: openblas + lapack: openblas + mpi: mpich + compiler: + - gcc@13 + specs: + - netcdf-c@4.9.2 + - netcdf-fortran@4.6.1 + - bufr@11.7.0 + - bacio@2.4.1 + - w3emc@2.10.0 + - sp@2.5.0 + - ip@4.3.0 + - sigio@2.3.2 + - sfcio@1.4.1 + - nemsio@2.5.4 + - wrf-io@1.2.0 + - ncio@1.1.2 + - crtm@2.4.0.1 + - gsi-ncdiag@1.1.2 + - mpich@3.4.2 + - openblas@0.3.28 + view: true + concretizer: + unify: true diff --git a/ci/spack.yaml b/ci/spack_intel.yaml similarity index 83% rename from ci/spack.yaml rename to ci/spack_intel.yaml index 48b4c6dbca..cba5974d6b 100644 --- a/ci/spack.yaml +++ b/ci/spack_intel.yaml @@ -2,9 +2,10 @@ spack: packages: all: + providers: + mpi: intel-oneapi-mpi compiler: - intel - - gcc@13 specs: - netcdf-c@4.9.2 - netcdf-fortran@4.6.1 @@ -20,6 +21,7 @@ spack: - ncio@1.1.2 - crtm@2.4.0.1 - gsi-ncdiag@1.1.2 + - intel-oneapi-mpi@2021.10.0 view: true concretizer: unify: true From b9fcb7ab19d56be5923fcec8ea8478018052964b Mon Sep 17 00:00:00 2001 From: David Huber Date: Fri, 13 Dec 2024 10:23:59 -0600 Subject: [PATCH 18/30] Make providers arrays --- ci/spack_gcc.yaml | 6 +++--- ci/spack_intel.yaml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ci/spack_gcc.yaml b/ci/spack_gcc.yaml index 566d47cd71..ad8965add6 100644 --- a/ci/spack_gcc.yaml +++ b/ci/spack_gcc.yaml @@ -3,9 +3,9 @@ spack: packages: all: providers: - blas: openblas - lapack: openblas - mpi: mpich + blas: [openblas] + lapack: [openblas] + mpi: [mpich] compiler: - gcc@13 specs: diff --git a/ci/spack_intel.yaml b/ci/spack_intel.yaml index cba5974d6b..3d0d51953f 100644 --- a/ci/spack_intel.yaml +++ b/ci/spack_intel.yaml @@ -3,7 +3,7 @@ spack: packages: all: providers: - mpi: intel-oneapi-mpi + mpi: [intel-oneapi-mpi] compiler: - intel specs: From c698787c4783ada0d41d369f2f92e28e883636dd Mon Sep 17 00:00:00 2001 From: David Huber Date: Wed, 18 Dec 2024 08:43:04 -0600 Subject: [PATCH 19/30] Try using the ubuntu 22 for Intel runner --- .github/workflows/intel.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/intel.yml b/.github/workflows/intel.yml index d8f8c80f59..66e8478060 100644 --- a/.github/workflows/intel.yml +++ b/.github/workflows/intel.yml @@ -85,7 +85,7 @@ jobs: gsi: needs: setup - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - name: install-intel From 6efc32bb44f682a7fd83dafd24b3049577bbfeb7 Mon Sep 17 00:00:00 2001 From: Alex Richert Date: Wed, 18 Dec 2024 09:50:39 -0800 Subject: [PATCH 20/30] debug --- ci/spack_intel.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/spack_intel.yaml b/ci/spack_intel.yaml index 3d0d51953f..ca9f530334 100644 --- a/ci/spack_intel.yaml +++ b/ci/spack_intel.yaml @@ -7,7 +7,7 @@ spack: compiler: - intel specs: - - netcdf-c@4.9.2 + - netcdf-c@4.9.2 ^snappy@1.1.10 - netcdf-fortran@4.6.1 - bufr@11.7.0 - bacio@2.4.1 From 675c03bf0b2a33d97c3fa30f3b791fab2a94053a Mon Sep 17 00:00:00 2001 From: Alex Richert Date: Wed, 18 Dec 2024 10:00:03 -0800 Subject: [PATCH 21/30] debug --- ci/spack_intel.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/spack_intel.yaml b/ci/spack_intel.yaml index ca9f530334..87d4afb8ab 100644 --- a/ci/spack_intel.yaml +++ b/ci/spack_intel.yaml @@ -7,7 +7,7 @@ spack: compiler: - intel specs: - - netcdf-c@4.9.2 ^snappy@1.1.10 + - netcdf-c@4.9.2 ~blosc - netcdf-fortran@4.6.1 - bufr@11.7.0 - bacio@2.4.1 From c1063e9be2a9fed184136ca5cd3f370a9729b6ad Mon Sep 17 00:00:00 2001 From: Alex Richert Date: Wed, 18 Dec 2024 10:11:20 -0800 Subject: [PATCH 22/30] debug --- ci/spack_intel.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/spack_intel.yaml b/ci/spack_intel.yaml index 87d4afb8ab..c6b35dbe44 100644 --- a/ci/spack_intel.yaml +++ b/ci/spack_intel.yaml @@ -7,7 +7,7 @@ spack: compiler: - intel specs: - - netcdf-c@4.9.2 ~blosc + - netcdf-c@4.9.2 ~blosc ^hdf5@1.14.2 - netcdf-fortran@4.6.1 - bufr@11.7.0 - bacio@2.4.1 From 0322c58808e3500fa07384b066dc39e133ae3b5f Mon Sep 17 00:00:00 2001 From: Alex Richert Date: Wed, 18 Dec 2024 10:25:00 -0800 Subject: [PATCH 23/30] debug --- ci/spack_intel.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/spack_intel.yaml b/ci/spack_intel.yaml index c6b35dbe44..da1183c89d 100644 --- a/ci/spack_intel.yaml +++ b/ci/spack_intel.yaml @@ -7,7 +7,7 @@ spack: compiler: - intel specs: - - netcdf-c@4.9.2 ~blosc ^hdf5@1.14.2 + - netcdf-c@4.9.2 ~blosc build_system=cmake ^hdf5@1.14.2 - netcdf-fortran@4.6.1 - bufr@11.7.0 - bacio@2.4.1 From 403e8013711009a0e0e6ba4be4703eecfa6ff4e9 Mon Sep 17 00:00:00 2001 From: Alex Richert Date: Wed, 18 Dec 2024 15:32:22 -0800 Subject: [PATCH 24/30] debug intel.yml --- .github/workflows/intel.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/intel.yml b/.github/workflows/intel.yml index 66e8478060..213f2083c6 100644 --- a/.github/workflows/intel.yml +++ b/.github/workflows/intel.yml @@ -109,6 +109,7 @@ jobs: - name: build run: | + sudo mv /usr/local/ /usr_local_mv source spack/share/spack/setup-env.sh spack env activate gsi-env cd gsi From 06ada8808b943487d42bf1ea5d7be209ecffc649 Mon Sep 17 00:00:00 2001 From: Alex Richert Date: Wed, 18 Dec 2024 15:53:38 -0800 Subject: [PATCH 25/30] Update intel.yml --- .github/workflows/intel.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/intel.yml b/.github/workflows/intel.yml index 213f2083c6..042daddf68 100644 --- a/.github/workflows/intel.yml +++ b/.github/workflows/intel.yml @@ -57,6 +57,7 @@ jobs: key: spack-${{ runner.os }}-${{ env.cache_key }}-${{ hashFiles('gsi/ci/spack.yaml') }} - name: install-intel-compilers + if: steps.cache-env.outputs.cache-hit != 'true' run: | wget https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB sudo apt-key add GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB @@ -68,7 +69,7 @@ jobs: # Install dependencies using Spack - name: install-dependencies-with-spack - # if: steps.cache-env.outputs.cache-hit != 'true' + if: steps.cache-env.outputs.cache-hit != 'true' run: | sudo mv /usr/local/ /usr_local_mv sudo apt-get install cmake @@ -110,6 +111,7 @@ jobs: - name: build run: | sudo mv /usr/local/ /usr_local_mv + sudo apt-get install cmake source spack/share/spack/setup-env.sh spack env activate gsi-env cd gsi From 3a86a7947b8388c0f9cd201d52db8a5ec797e6eb Mon Sep 17 00:00:00 2001 From: Alex Richert Date: Wed, 18 Dec 2024 16:10:11 -0800 Subject: [PATCH 26/30] Update intel.yml --- .github/workflows/intel.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/intel.yml b/.github/workflows/intel.yml index 042daddf68..f6419e8536 100644 --- a/.github/workflows/intel.yml +++ b/.github/workflows/intel.yml @@ -54,7 +54,7 @@ jobs: spack ~/.spack /opt/intel - key: spack-${{ runner.os }}-${{ env.cache_key }}-${{ hashFiles('gsi/ci/spack.yaml') }} + key: spack-${{ runner.os }}-${{ env.cache_key }}-${{ hashFiles('gsi/ci/spack.yaml') }}-1 - name: install-intel-compilers if: steps.cache-env.outputs.cache-hit != 'true' From 03eccf9b1b6545808fa71d5f05d460429a82a728 Mon Sep 17 00:00:00 2001 From: Alex Richert Date: Wed, 18 Dec 2024 20:13:43 -0800 Subject: [PATCH 27/30] Update intel.yml --- .github/workflows/intel.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/intel.yml b/.github/workflows/intel.yml index f6419e8536..d0f7a7bcd0 100644 --- a/.github/workflows/intel.yml +++ b/.github/workflows/intel.yml @@ -86,7 +86,7 @@ jobs: gsi: needs: setup - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest steps: - name: install-intel From 725a2b7f246c86cc6c1cf150d7b39fa0fc49dc98 Mon Sep 17 00:00:00 2001 From: Alex Richert Date: Wed, 18 Dec 2024 20:18:33 -0800 Subject: [PATCH 28/30] Update intel.yml --- .github/workflows/intel.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/intel.yml b/.github/workflows/intel.yml index d0f7a7bcd0..86986bab5c 100644 --- a/.github/workflows/intel.yml +++ b/.github/workflows/intel.yml @@ -111,7 +111,7 @@ jobs: - name: build run: | sudo mv /usr/local/ /usr_local_mv - sudo apt-get install cmake + sudo apt-get install cmake libblas-dev source spack/share/spack/setup-env.sh spack env activate gsi-env cd gsi From 34126ec6d915807e129dc659e0b71020ae5263fb Mon Sep 17 00:00:00 2001 From: Alex Richert Date: Wed, 18 Dec 2024 20:21:59 -0800 Subject: [PATCH 29/30] Update intel.yml --- .github/workflows/intel.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/intel.yml b/.github/workflows/intel.yml index 86986bab5c..9d2dc4c294 100644 --- a/.github/workflows/intel.yml +++ b/.github/workflows/intel.yml @@ -111,7 +111,7 @@ jobs: - name: build run: | sudo mv /usr/local/ /usr_local_mv - sudo apt-get install cmake libblas-dev + sudo apt-get install cmake libblas-dev liblapack-dev source spack/share/spack/setup-env.sh spack env activate gsi-env cd gsi From 6c4d035c0e533f86692734bc8bad0773c2db38cd Mon Sep 17 00:00:00 2001 From: Alex Richert Date: Fri, 27 Dec 2024 12:57:15 -0800 Subject: [PATCH 30/30] Update spack_intel.yaml --- ci/spack_intel.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/spack_intel.yaml b/ci/spack_intel.yaml index da1183c89d..c3c74e407c 100644 --- a/ci/spack_intel.yaml +++ b/ci/spack_intel.yaml @@ -7,7 +7,7 @@ spack: compiler: - intel specs: - - netcdf-c@4.9.2 ~blosc build_system=cmake ^hdf5@1.14.2 + - netcdf-c@4.9.2 ~blosc build_system=cmake - netcdf-fortran@4.6.1 - bufr@11.7.0 - bacio@2.4.1