From 56bf5e1ea228f0e71c6f4020f7622442933cd624 Mon Sep 17 00:00:00 2001 From: George Gayno Date: Tue, 27 Aug 2024 12:55:06 -0500 Subject: [PATCH] Update speck build. Fixes #879. --- .github/workflows/macos_clang.yaml | 2 +- .github/workflows/ubuntu_gcc.yaml | 2 +- .github/workflows/ubuntu_intel.yaml | 6 +++--- ci/spack.yaml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/macos_clang.yaml b/.github/workflows/macos_clang.yaml index 25f6bc693..f3fc4b27b 100644 --- a/.github/workflows/macos_clang.yaml +++ b/.github/workflows/macos_clang.yaml @@ -47,7 +47,7 @@ jobs: run: | git clone -c feature.manyFiles=true https://github.com/JCSDA/spack.git source spack/share/spack/setup-env.sh - sed "s/\[intel, gcc@10:10, apple-clang@14\]/\[apple-clang@14\]/g" ufs_utils/ci/spack.yaml > spack_ci.yaml + sed "s/\[oneapi, intel, gcc@10:10, apple-clang@14\]/\[apple-clang@14\]/g" ufs_utils/ci/spack.yaml > spack_ci.yaml spack env create ufs_utils-env spack_ci.yaml spack env activate ufs_utils-env spack external find diff --git a/.github/workflows/ubuntu_gcc.yaml b/.github/workflows/ubuntu_gcc.yaml index b501ef5ef..065e6d152 100644 --- a/.github/workflows/ubuntu_gcc.yaml +++ b/.github/workflows/ubuntu_gcc.yaml @@ -47,7 +47,7 @@ jobs: run: | git clone -c feature.manyFiles=true https://github.com/JCSDA/spack.git source spack/share/spack/setup-env.sh - sed "s/\[intel, gcc@10:10, apple-clang@14\]/\[gcc@10:10\]/g" ufs_utils/ci/spack.yaml > spack_ci.yaml + sed "s/\[oneapi, intel, gcc@10:10, apple-clang@14\]/\[gcc@10:10\]/g" ufs_utils/ci/spack.yaml > spack_ci.yaml spack env create ufs_utils-env spack_ci.yaml spack env activate ufs_utils-env sudo apt install cmake diff --git a/.github/workflows/ubuntu_intel.yaml b/.github/workflows/ubuntu_intel.yaml index 9b2da1e65..e721a44a4 100644 --- a/.github/workflows/ubuntu_intel.yaml +++ b/.github/workflows/ubuntu_intel.yaml @@ -59,7 +59,7 @@ jobs: run: | git clone -c feature.manyFiles=true https://github.com/JCSDA/spack.git source spack/share/spack/setup-env.sh - sed "s/\[intel, gcc@10:10, apple-clang@14\]/\[intel\]/g" ufs_utils/ci/spack.yaml > spack_ci.yaml + sed "s/\[oneapi, intel, gcc@10:10, apple-clang@14\]/\[oneapi\]/g" ufs_utils/ci/spack.yaml > spack_ci.yaml spack env create ufs_utils-env spack_ci.yaml spack env activate ufs_utils-env spack compiler find @@ -99,8 +99,8 @@ jobs: run: | source spack/share/spack/setup-env.sh spack env activate ufs_utils-env - export CC=mpiicc - export FC=mpiifort + export CC + export FC cd ufs_utils mkdir -p build && cd build cmake -DCMAKE_INSTALL_PREFIX=../install .. diff --git a/ci/spack.yaml b/ci/spack.yaml index f0db7c2ac..c72a0f3b1 100644 --- a/ci/spack.yaml +++ b/ci/spack.yaml @@ -2,7 +2,7 @@ spack: packages: all: - compiler: [intel, gcc@10:10, apple-clang@14] + compiler: [oneapi, intel, gcc@10:10, apple-clang@14] specs: - netcdf-c@4.9.2 - netcdf-fortran@4.6.1