Skip to content

Commit

Permalink
Use gcc-11 for macos CI, turn off GPU label
Browse files Browse the repository at this point in the history
  • Loading branch information
christopherwharrop-noaa committed Aug 14, 2024
1 parent 9807cea commit c3e47df
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 8 deletions.
10 changes: 6 additions & 4 deletions .github/workflows/gpu_nvhpc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,12 @@ jobs:
# sudo apt-get update -y
# sudo apt-get install -y nvhpc-24-7

# Remove label
- name: Remove GPU-CI label
- uses: actions-ecosystem/action-remove-labels@v1
with:
labels: GPU-CI

# Check location of installed NVHPC compilers
- name: Check compiler install
run: |
Expand All @@ -48,10 +54,6 @@ jobs:
which nvc
which nvfortran
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- name: Checkout repository
uses: actions/checkout@v2

# Test debug mode
# Turn this off because the compiler hangs while building in debug mode
#- name: Build gf debug
Expand Down
12 changes: 8 additions & 4 deletions .github/workflows/macos_gnu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@ jobs:
- name: Checkout repository
uses: actions/checkout@v2

# Install gcc11
- name: Install GCC
run: brew install gcc@11

# Install OpenMPI
- name: Install OpenMPI
run: brew install open-mpi
Expand All @@ -37,8 +41,8 @@ jobs:
mkdir build
cd build
#export OMP_NUM_THREADS=4
export CC=gcc-13
export FC=gfortran-13
export CC=gcc-11
export FC=gfortran-11
cmake -DCMAKE_BUILD_TYPE=debug -DENABLE_GPU=off ..
make VERBOSE=1
ctest --output-on-failure
Expand All @@ -51,8 +55,8 @@ jobs:
mkdir build
cd build
#export OMP_NUM_THREADS=4
export CC=gcc-13
export FC=gfortran-13
export CC=gcc-11
export FC=gfortran-11
cmake -DCMAKE_BUILD_TYPE=release -DENABLE_GPU=off ..
make VERBOSE=1
ctest --output-on-failure
Expand Down

0 comments on commit c3e47df

Please sign in to comment.