Skip to content

Commit 3c3cf8f

Browse files
committed
Clang -> GCC
MPICH alone seems hard enough
1 parent 92ff147 commit 3c3cf8f

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

.github/ci/spack-envs/clang14_py312_mpich_h5_ad2/spack.yaml renamed to .github/ci/spack-envs/gcc13_py312_mpich_h5_ad2/spack.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ spack:
4040
variants: ~fortran
4141
providers:
4242
mpi: [mpich]
43-
compiler: [clang@14.0.6]
43+
compiler: [gcc@13.2.0]
4444

4545
compilers:
4646
- compiler:
@@ -50,11 +50,11 @@ spack:
5050
modules: []
5151
operating_system: ubuntu24.04
5252
paths:
53-
cc: /usr/bin/clang-14
54-
cxx: /usr/bin/clang++-14
53+
cc: /usr/bin/gcc
54+
cxx: /usr/bin/g++
5555
f77: /usr/bin/gfortran
5656
fc: /usr/bin/gfortran
57-
spec: clang@14.0.6
57+
spec: gcc@13.2.0
5858
target: x86_64
5959

6060
config:

.github/workflows/linux.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -160,30 +160,30 @@ jobs:
160160
ctest --test-dir build --output-on-failure
161161
162162
# ADIOS2 v2.10
163-
clang14_py312_mpich_h5_ad2:
163+
gcc13_py312_mpich_h5_ad2:
164164
runs-on: ubuntu-24.04
165165
if: github.event.pull_request.draft == false
166166
steps:
167167
- uses: actions/checkout@v4
168168
- name: Spack Cache
169169
uses: actions/cache@v3
170-
with: {path: /opt/spack, key: clang14_py312_mpich_h5_ad2_newLayout_v2 }
170+
with: {path: /opt/spack, key: gcc13_py312_mpich_h5_ad2 }
171171
- name: Install
172172
run: |
173173
sudo apt-get update
174174
sudo apt-get remove openmpi* libopenmpi* *hdf5* || true
175-
sudo apt-get install clang-14 gfortran libmpich-dev mpich python3
175+
sudo apt-get install g++ gfortran libmpich-dev mpich python3
176176
sudo .github/workflows/dependencies/install_spack
177177
- name: Build
178-
env: {CC: clang-14, CXX: clang++-14, MPICH_CC: clang-14, MPICH_CXX: clang++-14}
178+
env: {CC: gcc, CXX: g++, MPICH_CC: gcc, MPICH_CXX: g++}
179179
# TODO: CXXFLAGS: -Werror removed because it fails CMake's find_package(MPI)
180180
run: |
181181
cmake --version
182182
mpiexec --version
183183
mpicxx --version
184184
perl --version
185185
python --version
186-
eval $(spack env activate --sh .github/ci/spack-envs/clang14_py312_mpich_h5_ad2/)
186+
eval $(spack env activate --sh .github/ci/spack-envs/gcc13_py312_mpich_h5_ad2/)
187187
spack install
188188
189189
share/openPMD/download_samples.sh build

0 commit comments

Comments
 (0)