From bc519eaf317addc497de2ef2eb825136a0fa6b10 Mon Sep 17 00:00:00 2001 From: Matt Masarik Date: Fri, 18 Aug 2023 10:37:30 -0400 Subject: [PATCH 01/17] fix attempt for ci, 1 --- .github/workflows/gnu.yml | 4 ++-- .github/workflows/intel.yml | 10 +++++----- model/ci/spack_gnu.yaml | 3 ++- model/ci/spack_intel.yaml | 3 ++- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/.github/workflows/gnu.yml b/.github/workflows/gnu.yml index d1aa0e967..b637905ab 100644 --- a/.github/workflows/gnu.yml +++ b/.github/workflows/gnu.yml @@ -7,7 +7,7 @@ concurrency: cancel-in-progress: true env: - cache_key: gnu8 + cache_key: gnu9 CC: gcc-10 FC: gfortran-10 CXX: g++-10 @@ -45,7 +45,7 @@ jobs: run: | # Install NetCDF, ESMF, g2, etc using Spack sudo apt install cmake - git clone -c feature.manyFiles=true https://github.com/spack/spack.git + git clone -c feature.manyFiles=true https://github.com/JCSDA/spack.git source spack/share/spack/setup-env.sh spack env create ww3-gnu ww3/model/ci/spack_gnu.yaml spack env activate ww3-gnu diff --git a/.github/workflows/intel.yml b/.github/workflows/intel.yml index c40f3265e..d46d1252f 100644 --- a/.github/workflows/intel.yml +++ b/.github/workflows/intel.yml @@ -8,7 +8,7 @@ concurrency: # Set I_MPI_CC/F90 so Intel MPI wrapper uses icc/ifort instead of gcc/gfortran env: - cache_key: intel7 + cache_key: intel9 CC: icc FC: ifort CXX: icpc @@ -16,12 +16,12 @@ env: I_MPI_F90: ifort # Split into a dependency build step, and a WW3 build step which -# builds multiple switches in a matrix. The setup is run once and +# builds multiple switches in a matrix. The setup is run once and # the environment is cached so each build of WW3 can share the dependencies. jobs: setup: - runs-on: ubuntu-20.04 + runs-on: ubuntu-20.04 steps: @@ -61,7 +61,7 @@ jobs: . /opt/intel/oneapi/setvars.sh sudo mv /usr/local /usrlocal_renamed sudo apt install cmake - git clone -c feature.manyFiles=true https://github.com/spack/spack.git + git clone -c feature.manyFiles=true https://github.com/JCSDA/spack.git source spack/share/spack/setup-env.sh ln -s $(realpath $(which gcc)) spack/lib/spack/env/intel/gcc # spack/make bug in ESMF spack env create ww3-intel ww3/model/ci/spack_intel.yaml @@ -91,7 +91,7 @@ jobs: strategy: matrix: switch: [Ifremer1, NCEP_st2, NCEP_st4, ite_pdlib, NCEP_st4sbs, NCEP_glwu, OASACM, UKMO, MULTI_ESMF] - runs-on: ubuntu-20.04 + runs-on: ubuntu-20.04 steps: - name: checkout-ww3 diff --git a/model/ci/spack_gnu.yaml b/model/ci/spack_gnu.yaml index 5f1ca3a47..d2c16711a 100644 --- a/model/ci/spack_gnu.yaml +++ b/model/ci/spack_gnu.yaml @@ -13,7 +13,8 @@ spack: - g2@3.4.5 - bacio@2.4.1 - w3emc@2.9.2 - - esmf@8.1.1~pio~pnetcdf~xerces + - parallelio@2.5.9+fortran~pnetcdf + - esmf@8.4.2~debug~xerces+external-parallelio view: true concretizer: unify: when_possible diff --git a/model/ci/spack_intel.yaml b/model/ci/spack_intel.yaml index ee09d8827..887ae7066 100644 --- a/model/ci/spack_intel.yaml +++ b/model/ci/spack_intel.yaml @@ -14,7 +14,8 @@ spack: - g2@3.4.5 - bacio@2.4.1 - w3emc@2.9.2 - - esmf@8.1.1~pio~pnetcdf~xerces + - parallelio@2.5.9+fortran~pnetcdf + - esmf@8.4.2~debug~xerces+external-parallelio - intel-oneapi-mpi %intel view: true concretizer: From 525ad98bebd8aea0aa90596f93e199f1b11210af Mon Sep 17 00:00:00 2001 From: Matthew Masarik Date: Mon, 21 Aug 2023 18:10:11 +0000 Subject: [PATCH 02/17] intel.yml: cache_key decrement, previously +2 --- .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 d46d1252f..1056cc80c 100644 --- a/.github/workflows/intel.yml +++ b/.github/workflows/intel.yml @@ -8,7 +8,7 @@ concurrency: # Set I_MPI_CC/F90 so Intel MPI wrapper uses icc/ifort instead of gcc/gfortran env: - cache_key: intel9 + cache_key: intel8 CC: icc FC: ifort CXX: icpc From cd326d5ff472a48d7f37a0a51ae10e111aaa4c2f Mon Sep 17 00:00:00 2001 From: Matthew Masarik Date: Mon, 21 Aug 2023 18:28:58 +0000 Subject: [PATCH 03/17] ci: intel@2021.9.0 and diffutils@3.8 --- .github/workflows/intel.yml | 2 +- model/ci/spack_intel.yaml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/intel.yml b/.github/workflows/intel.yml index 1056cc80c..d46d1252f 100644 --- a/.github/workflows/intel.yml +++ b/.github/workflows/intel.yml @@ -8,7 +8,7 @@ concurrency: # Set I_MPI_CC/F90 so Intel MPI wrapper uses icc/ifort instead of gcc/gfortran env: - cache_key: intel8 + cache_key: intel9 CC: icc FC: ifort CXX: icpc diff --git a/model/ci/spack_intel.yaml b/model/ci/spack_intel.yaml index 887ae7066..a77c1eaf3 100644 --- a/model/ci/spack_intel.yaml +++ b/model/ci/spack_intel.yaml @@ -16,7 +16,8 @@ spack: - w3emc@2.9.2 - parallelio@2.5.9+fortran~pnetcdf - esmf@8.4.2~debug~xerces+external-parallelio - - intel-oneapi-mpi %intel + - diffutils@3.8%intel@2021.9.0 + - intel-oneapi-mpi %intel@2021.9.0 view: true concretizer: unify: when_possible From 1dd620fe6511c7a2a6d43cae29cb5d0b736bcb9c Mon Sep 17 00:00:00 2001 From: Matthew Masarik Date: Mon, 21 Aug 2023 18:40:02 +0000 Subject: [PATCH 04/17] ci: intel@2021.10.0 --- .github/workflows/intel.yml | 2 +- model/ci/spack_intel.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/intel.yml b/.github/workflows/intel.yml index d46d1252f..926964a9d 100644 --- a/.github/workflows/intel.yml +++ b/.github/workflows/intel.yml @@ -8,7 +8,7 @@ concurrency: # Set I_MPI_CC/F90 so Intel MPI wrapper uses icc/ifort instead of gcc/gfortran env: - cache_key: intel9 + cache_key: intel10 CC: icc FC: ifort CXX: icpc diff --git a/model/ci/spack_intel.yaml b/model/ci/spack_intel.yaml index a77c1eaf3..07b80918d 100644 --- a/model/ci/spack_intel.yaml +++ b/model/ci/spack_intel.yaml @@ -16,8 +16,8 @@ spack: - w3emc@2.9.2 - parallelio@2.5.9+fortran~pnetcdf - esmf@8.4.2~debug~xerces+external-parallelio - - diffutils@3.8%intel@2021.9.0 - - intel-oneapi-mpi %intel@2021.9.0 + - diffutils@3.8%intel@2021.10.0 + - intel-oneapi-mpi %intel@2021.10.0 view: true concretizer: unify: when_possible From fb98e894425cedec32659044636e441d0b961999 Mon Sep 17 00:00:00 2001 From: Matthew Masarik Date: Mon, 21 Aug 2023 22:41:38 +0000 Subject: [PATCH 05/17] intel.yml - cache@v2 --> cache@v3 --- .github/workflows/intel.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/intel.yml b/.github/workflows/intel.yml index 926964a9d..8318034c4 100644 --- a/.github/workflows/intel.yml +++ b/.github/workflows/intel.yml @@ -8,7 +8,7 @@ concurrency: # Set I_MPI_CC/F90 so Intel MPI wrapper uses icc/ifort instead of gcc/gfortran env: - cache_key: intel10 + cache_key: intel11 CC: icc FC: ifort CXX: icpc @@ -35,7 +35,7 @@ jobs: # No way to flush Action cache, so key may have # appended - name: cache-env id: cache-env - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: | spack @@ -101,7 +101,7 @@ jobs: - name: cache-env id: cache-env - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: | spack From 6074255836d5e72f4f2aef0a4e0c97a6ca96b7ee Mon Sep 17 00:00:00 2001 From: Matthew Masarik Date: Wed, 30 Aug 2023 14:12:03 +0000 Subject: [PATCH 06/17] intel.yml: checkout@v2 --> checkout@v3 --- .github/workflows/intel.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/intel.yml b/.github/workflows/intel.yml index 8318034c4..fbecd8bbf 100644 --- a/.github/workflows/intel.yml +++ b/.github/workflows/intel.yml @@ -8,7 +8,7 @@ concurrency: # Set I_MPI_CC/F90 so Intel MPI wrapper uses icc/ifort instead of gcc/gfortran env: - cache_key: intel11 + cache_key: intel12 CC: icc FC: ifort CXX: icpc @@ -27,7 +27,7 @@ jobs: - name: checkout-ww3 if: steps.cache-env.outputs.cache-hit != 'true' - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: path: ww3 @@ -95,7 +95,7 @@ jobs: steps: - name: checkout-ww3 - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: path: ww3 From ea380ce4d7a17512677bff5281fc9bd2091c4e7e Mon Sep 17 00:00:00 2001 From: Matthew Masarik Date: Wed, 30 Aug 2023 17:45:18 +0000 Subject: [PATCH 07/17] intel.yml: bash command sourcing for attempted fix --- .github/workflows/intel.yml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/intel.yml b/.github/workflows/intel.yml index fbecd8bbf..d435f9ffb 100644 --- a/.github/workflows/intel.yml +++ b/.github/workflows/intel.yml @@ -8,7 +8,7 @@ concurrency: # Set I_MPI_CC/F90 so Intel MPI wrapper uses icc/ifort instead of gcc/gfortran env: - cache_key: intel12 + cache_key: intel13 CC: icc FC: ifort CXX: icpc @@ -58,7 +58,8 @@ jobs: if: steps.cache-env.outputs.cache-hit != 'true' run: | # Install NetCDF, ESMF, g2, etc using Spack - . /opt/intel/oneapi/setvars.sh + ###MTM . /opt/intel/oneapi/setvars.sh + bash -c 'source /opt/intel/oneapi/setvars.sh' sudo mv /usr/local /usrlocal_renamed sudo apt install cmake git clone -c feature.manyFiles=true https://github.com/JCSDA/spack.git @@ -75,7 +76,8 @@ jobs: - name: build-oasis if: steps.cache-env.outputs.cache-hit != 'true' run: | - . /opt/intel/oneapi/setvars.sh + ###MTM . /opt/intel/oneapi/setvars.sh + bash -c 'source /opt/intel/oneapi/setvars.sh' source spack/share/spack/setup-env.sh spack env activate ww3-intel export WWATCH3_DIR=${GITHUB_WORKSPACE}/ww3/model @@ -112,7 +114,8 @@ jobs: - name: build-ww3 run: | - . /opt/intel/oneapi/setvars.sh + ###MTM . /opt/intel/oneapi/setvars.sh + bash -c 'source /opt/intel/oneapi/setvars.sh' source spack/share/spack/setup-env.sh spack env activate ww3-intel cd ww3 From 93931644aec0b8d1f2949e3eee3d59d794628101 Mon Sep 17 00:00:00 2001 From: Matthew Masarik Date: Thu, 31 Aug 2023 18:58:32 +0000 Subject: [PATCH 08/17] intel ci updates: ufs_utils example --- .github/workflows/intel.yml | 26 +++++++++++++++----------- model/ci/spack_intel.yaml | 11 +++++------ 2 files changed, 20 insertions(+), 17 deletions(-) diff --git a/.github/workflows/intel.yml b/.github/workflows/intel.yml index d435f9ffb..28e6a23af 100644 --- a/.github/workflows/intel.yml +++ b/.github/workflows/intel.yml @@ -8,7 +8,7 @@ concurrency: # Set I_MPI_CC/F90 so Intel MPI wrapper uses icc/ifort instead of gcc/gfortran env: - cache_key: intel13 + cache_key: intel14 CC: icc FC: ifort CXX: icpc @@ -51,7 +51,8 @@ jobs: sudo apt-key add GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB echo "deb https://apt.repos.intel.com/oneapi all main" | sudo tee /etc/apt/sources.list.d/oneAPI.list sudo apt-get update - sudo apt-get install intel-oneapi-mpi-devel intel-oneapi-openmp intel-oneapi-compiler-fortran intel-oneapi-compiler-dpcpp-cpp-and-cpp-classic + sudo apt-get install intel-oneapi-dev-utilities intel-oneapi-mpi-devel intel-oneapi-openmp intel-oneapi-compiler-fortran intel-oneapi-compiler-dpcpp-cpp-and-cpp-classic + echo "source /opt/intel/oneapi/setvars.sh" >> ~/.bash_profile # Build WW3 spack environment - name: install-dependencies-with-spack @@ -59,25 +60,27 @@ jobs: run: | # Install NetCDF, ESMF, g2, etc using Spack ###MTM . /opt/intel/oneapi/setvars.sh - bash -c 'source /opt/intel/oneapi/setvars.sh' - sudo mv /usr/local /usrlocal_renamed - sudo apt install cmake - git clone -c feature.manyFiles=true https://github.com/JCSDA/spack.git + ###MTM bash -c 'source /opt/intel/oneapi/setvars.sh' + ### ?? sudo mv /usr/local /usrlocal_renamed + git clone -c feature.manyFiles=true https://github.com/NOAA-EMC/spack.git source spack/share/spack/setup-env.sh ln -s $(realpath $(which gcc)) spack/lib/spack/env/intel/gcc # spack/make bug in ESMF spack env create ww3-intel ww3/model/ci/spack_intel.yaml spack env activate ww3-intel spack compiler find - spack external find cmake + sudo apt install cmake + spack external find + spack config add "packages:all:require:['%intel']" spack add intel-oneapi-mpi spack concretize spack install --dirty -v --fail-fast + spack clean --all - name: build-oasis if: steps.cache-env.outputs.cache-hit != 'true' run: | ###MTM . /opt/intel/oneapi/setvars.sh - bash -c 'source /opt/intel/oneapi/setvars.sh' + ###MTM bash -c 'source /opt/intel/oneapi/setvars.sh' source spack/share/spack/setup-env.sh spack env activate ww3-intel export WWATCH3_DIR=${GITHUB_WORKSPACE}/ww3/model @@ -115,12 +118,12 @@ jobs: - name: build-ww3 run: | ###MTM . /opt/intel/oneapi/setvars.sh - bash -c 'source /opt/intel/oneapi/setvars.sh' + ###MTM bash -c 'source /opt/intel/oneapi/setvars.sh' source spack/share/spack/setup-env.sh spack env activate ww3-intel cd ww3 - export CC=mpicc - export FC=mpif90 + export CC=mpiicc + export FC=mpiifort export OASISDIR=${GITHUB_WORKSPACE}/work_oasis3-mct mkdir build && cd build if [[ ${{ matrix.switch }} == "MULTI_ESMF" ]]; then @@ -129,3 +132,4 @@ jobs: cmake .. -DSWITCH=${{ matrix.switch }} fi make -j2 VERBOSE=1 + make install diff --git a/model/ci/spack_intel.yaml b/model/ci/spack_intel.yaml index 07b80918d..c571da825 100644 --- a/model/ci/spack_intel.yaml +++ b/model/ci/spack_intel.yaml @@ -5,19 +5,18 @@ spack: providers: mpi: [intel-oneapi-mpi] specs: + - netcdf-c@4.7.4~dap + - netcdf-fortran@4.5.3 + - bacio@2.4.1 + - g2@3.4.5 - metis@5.1.0~shared - parmetis@4.0.3~shared - scotch@7.0.1+mpi+metis~shared - - netcdf-c@4.7.4~dap - - netcdf-fortran@4.5.3 - jasper@2.0.32 - - g2@3.4.5 - - bacio@2.4.1 - w3emc@2.9.2 - parallelio@2.5.9+fortran~pnetcdf - esmf@8.4.2~debug~xerces+external-parallelio - - diffutils@3.8%intel@2021.10.0 - - intel-oneapi-mpi %intel@2021.10.0 + - intel-oneapi-mpi %intel view: true concretizer: unify: when_possible From a52a6a255f6925c871b44a871d12d12c2382b09f Mon Sep 17 00:00:00 2001 From: Matthew Masarik Date: Thu, 31 Aug 2023 19:17:48 +0000 Subject: [PATCH 09/17] revert setvars sourcing to original --- .github/workflows/intel.yml | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/.github/workflows/intel.yml b/.github/workflows/intel.yml index 28e6a23af..0742a0e0a 100644 --- a/.github/workflows/intel.yml +++ b/.github/workflows/intel.yml @@ -52,15 +52,13 @@ jobs: echo "deb https://apt.repos.intel.com/oneapi all main" | sudo tee /etc/apt/sources.list.d/oneAPI.list sudo apt-get update sudo apt-get install intel-oneapi-dev-utilities intel-oneapi-mpi-devel intel-oneapi-openmp intel-oneapi-compiler-fortran intel-oneapi-compiler-dpcpp-cpp-and-cpp-classic - echo "source /opt/intel/oneapi/setvars.sh" >> ~/.bash_profile # Build WW3 spack environment - name: install-dependencies-with-spack if: steps.cache-env.outputs.cache-hit != 'true' run: | # Install NetCDF, ESMF, g2, etc using Spack - ###MTM . /opt/intel/oneapi/setvars.sh - ###MTM bash -c 'source /opt/intel/oneapi/setvars.sh' + . /opt/intel/oneapi/setvars.sh ### ?? sudo mv /usr/local /usrlocal_renamed git clone -c feature.manyFiles=true https://github.com/NOAA-EMC/spack.git source spack/share/spack/setup-env.sh @@ -70,8 +68,8 @@ jobs: spack compiler find sudo apt install cmake spack external find - spack config add "packages:all:require:['%intel']" spack add intel-oneapi-mpi + spack config add "packages:all:require:['%intel']" spack concretize spack install --dirty -v --fail-fast spack clean --all @@ -79,8 +77,7 @@ jobs: - name: build-oasis if: steps.cache-env.outputs.cache-hit != 'true' run: | - ###MTM . /opt/intel/oneapi/setvars.sh - ###MTM bash -c 'source /opt/intel/oneapi/setvars.sh' + . /opt/intel/oneapi/setvars.sh source spack/share/spack/setup-env.sh spack env activate ww3-intel export WWATCH3_DIR=${GITHUB_WORKSPACE}/ww3/model @@ -117,8 +114,7 @@ jobs: - name: build-ww3 run: | - ###MTM . /opt/intel/oneapi/setvars.sh - ###MTM bash -c 'source /opt/intel/oneapi/setvars.sh' + . /opt/intel/oneapi/setvars.sh source spack/share/spack/setup-env.sh spack env activate ww3-intel cd ww3 From 0cd374f65f7c3e35ec3cabad52ff8a2da1ca87ff Mon Sep 17 00:00:00 2001 From: Matthew Masarik Date: Thu, 31 Aug 2023 19:18:59 +0000 Subject: [PATCH 10/17] woops, needed to update the cache key --- .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 0742a0e0a..8cdf6241d 100644 --- a/.github/workflows/intel.yml +++ b/.github/workflows/intel.yml @@ -8,7 +8,7 @@ concurrency: # Set I_MPI_CC/F90 so Intel MPI wrapper uses icc/ifort instead of gcc/gfortran env: - cache_key: intel14 + cache_key: intel15 CC: icc FC: ifort CXX: icpc From 6d4ffe347f0823fd02d7bd611fb499e0ac5b7a2e Mon Sep 17 00:00:00 2001 From: Matthew Masarik Date: Thu, 31 Aug 2023 20:49:24 +0000 Subject: [PATCH 11/17] intel.yml - remove "make install" --- .github/workflows/intel.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/intel.yml b/.github/workflows/intel.yml index 8cdf6241d..ae5abe5f7 100644 --- a/.github/workflows/intel.yml +++ b/.github/workflows/intel.yml @@ -8,7 +8,7 @@ concurrency: # Set I_MPI_CC/F90 so Intel MPI wrapper uses icc/ifort instead of gcc/gfortran env: - cache_key: intel15 + cache_key: intel16 CC: icc FC: ifort CXX: icpc @@ -128,4 +128,3 @@ jobs: cmake .. -DSWITCH=${{ matrix.switch }} fi make -j2 VERBOSE=1 - make install From 0ad68b811f4f8f4607e043243c60dc4ec512a3ba Mon Sep 17 00:00:00 2001 From: Matthew Masarik Date: Fri, 1 Sep 2023 17:34:10 +0000 Subject: [PATCH 12/17] cache_key updates for gnu/intel - used a number (10) based on current numbers, and having gnu and intel keys the same --- .github/workflows/gnu.yml | 2 +- .github/workflows/intel.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/gnu.yml b/.github/workflows/gnu.yml index b637905ab..307fc96c4 100644 --- a/.github/workflows/gnu.yml +++ b/.github/workflows/gnu.yml @@ -7,7 +7,7 @@ concurrency: cancel-in-progress: true env: - cache_key: gnu9 + cache_key: gnu10 CC: gcc-10 FC: gfortran-10 CXX: g++-10 diff --git a/.github/workflows/intel.yml b/.github/workflows/intel.yml index ae5abe5f7..1cf18f0a3 100644 --- a/.github/workflows/intel.yml +++ b/.github/workflows/intel.yml @@ -8,7 +8,7 @@ concurrency: # Set I_MPI_CC/F90 so Intel MPI wrapper uses icc/ifort instead of gcc/gfortran env: - cache_key: intel16 + cache_key: intel10 CC: icc FC: ifort CXX: icpc From d1ad578e86b99bcf1d622bbc007cdd9db15ea2c1 Mon Sep 17 00:00:00 2001 From: Matthew Masarik Date: Fri, 1 Sep 2023 17:40:05 +0000 Subject: [PATCH 13/17] intel.yml - remove bugfix line for /usr/local --- .github/workflows/intel.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/intel.yml b/.github/workflows/intel.yml index 1cf18f0a3..e9133b5e7 100644 --- a/.github/workflows/intel.yml +++ b/.github/workflows/intel.yml @@ -59,7 +59,6 @@ jobs: run: | # Install NetCDF, ESMF, g2, etc using Spack . /opt/intel/oneapi/setvars.sh - ### ?? sudo mv /usr/local /usrlocal_renamed git clone -c feature.manyFiles=true https://github.com/NOAA-EMC/spack.git source spack/share/spack/setup-env.sh ln -s $(realpath $(which gcc)) spack/lib/spack/env/intel/gcc # spack/make bug in ESMF From 30109a5cbe82be8d7d6cc7bb84af220af71c134a Mon Sep 17 00:00:00 2001 From: Matthew Masarik Date: Fri, 1 Sep 2023 18:05:27 +0000 Subject: [PATCH 14/17] intel.yml: spack repo, NOAA-EMC --> JCSDA --- .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 e9133b5e7..bb24bfbf2 100644 --- a/.github/workflows/intel.yml +++ b/.github/workflows/intel.yml @@ -59,7 +59,7 @@ jobs: run: | # Install NetCDF, ESMF, g2, etc using Spack . /opt/intel/oneapi/setvars.sh - git clone -c feature.manyFiles=true https://github.com/NOAA-EMC/spack.git + git clone -c feature.manyFiles=true https://github.com/JCDSA/spack.git source spack/share/spack/setup-env.sh ln -s $(realpath $(which gcc)) spack/lib/spack/env/intel/gcc # spack/make bug in ESMF spack env create ww3-intel ww3/model/ci/spack_intel.yaml From 6abbd7044ad65d50b756981511885fa91ef6b927 Mon Sep 17 00:00:00 2001 From: Matthew Masarik Date: Fri, 1 Sep 2023 18:09:03 +0000 Subject: [PATCH 15/17] gnu.yml - updates to bring in line with updates to intel.yml --- .github/workflows/gnu.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/gnu.yml b/.github/workflows/gnu.yml index 307fc96c4..aecf0bde7 100644 --- a/.github/workflows/gnu.yml +++ b/.github/workflows/gnu.yml @@ -19,19 +19,19 @@ env: jobs: setup: - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 steps: - name: checkout-ww3 if: steps.cache-env.outputs.cache-hit != 'true' - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: path: ww3 # Cache spack, OASIS, and compiler # No way to flush Action cache, so key may have # appended - name: cache-env id: cache-env - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: | spack @@ -73,17 +73,17 @@ jobs: strategy: matrix: switch: [Ifremer1, NCEP_st2, NCEP_st4, ite_pdlib, NCEP_st4sbs, NCEP_glwu, OASACM, UKMO, MULTI_ESMF] - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 steps: - name: checkout-ww3 - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: path: ww3 - name: cache-env id: cache-env - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: | spack From 9e78c8e2fa1715469445f38e025c5e9d3028233d Mon Sep 17 00:00:00 2001 From: Matthew Masarik Date: Fri, 1 Sep 2023 18:19:29 +0000 Subject: [PATCH 16/17] intel.yml - typo JCDSA --> JCSDA --- .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 bb24bfbf2..700553cea 100644 --- a/.github/workflows/intel.yml +++ b/.github/workflows/intel.yml @@ -59,7 +59,7 @@ jobs: run: | # Install NetCDF, ESMF, g2, etc using Spack . /opt/intel/oneapi/setvars.sh - git clone -c feature.manyFiles=true https://github.com/JCDSA/spack.git + git clone -c feature.manyFiles=true https://github.com/JCSDA/spack.git source spack/share/spack/setup-env.sh ln -s $(realpath $(which gcc)) spack/lib/spack/env/intel/gcc # spack/make bug in ESMF spack env create ww3-intel ww3/model/ci/spack_intel.yaml From 19833d2b28625c5998c9df472e4b9459d37a2765 Mon Sep 17 00:00:00 2001 From: Matthew Masarik Date: Fri, 1 Sep 2023 19:41:20 +0000 Subject: [PATCH 17/17] gnu.yml - ugh, 1st attempt fixing introduced GNU issue --- .github/workflows/gnu.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/gnu.yml b/.github/workflows/gnu.yml index aecf0bde7..d28d1bb5b 100644 --- a/.github/workflows/gnu.yml +++ b/.github/workflows/gnu.yml @@ -7,7 +7,7 @@ concurrency: cancel-in-progress: true env: - cache_key: gnu10 + cache_key: gnu11 CC: gcc-10 FC: gfortran-10 CXX: g++-10 @@ -19,7 +19,7 @@ env: jobs: setup: - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest steps: - name: checkout-ww3 @@ -73,7 +73,7 @@ jobs: strategy: matrix: switch: [Ifremer1, NCEP_st2, NCEP_st4, ite_pdlib, NCEP_st4sbs, NCEP_glwu, OASACM, UKMO, MULTI_ESMF] - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest steps: - name: checkout-ww3