Skip to content

Commit

Permalink
CI: update nvhpc to 23.5
Browse files Browse the repository at this point in the history
  • Loading branch information
awnawab committed Oct 11, 2024
1 parent d9c4cae commit 993618b
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 112 deletions.
15 changes: 15 additions & 0 deletions .github/tools/bootstrap-nvhpc.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
#!/bin/bash
set -euo pipefail
set -x

# Set nvhpc version to default value if unset
: "${nvhpc_version:=21.9}"

# Use Atlas' nvhpc installation script
wget https://raw.githubusercontent.com/ecmwf/atlas/develop/tools/install-nvhpc.sh
chmod +x install-nvhpc.sh

# Install nvhpc
./install-nvhpc.sh --version $nvhpc_version --prefix "${GITHUB_WORKSPACE}/nvhpc-install" --tmpdir "${RUNNER_TEMP}"

exit 0
107 changes: 0 additions & 107 deletions .github/tools/install-nvhpc.sh

This file was deleted.

11 changes: 6 additions & 5 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
name:
- linux gnu-10
- linux gnu-14
- linux nvhpc-21.9
- linux nvhpc-23.5
- linux intel-classic
- macos

Expand All @@ -59,9 +59,9 @@ jobs:
python-version: '3.11'
caching: true

- name: linux nvhpc-21.9
- name: linux nvhpc-23.5
os: ubuntu-20.04
compiler: nvhpc-21.9
compiler: nvhpc-23.5
compiler_cc: nvc
compiler_cxx: nvc++
compiler_fc: nvfortran
Expand Down Expand Up @@ -139,13 +139,14 @@ jobs:
- name: Install NVHPC compiler
if: contains( matrix.compiler, 'nvhpc' )
shell: bash -eux {0}
env:
nvhpc_version: 23.5
run: |
${ECWAM_TOOLS}/install-nvhpc.sh --prefix /opt/nvhpc
${ECWAM_TOOLS}/bootstrap-nvhpc.sh
source /opt/nvhpc/env.sh
echo "${NVHPC_DIR}/compilers/bin" >> $GITHUB_PATH
[ -z ${MPI_HOME+x} ] || echo "MPI_HOME=${MPI_HOME}" >> $GITHUB_ENV
echo "localhost slots=72" >> ${MPI_HOME}/etc/openmpi-default-hostfile
echo "ECWAM_LAUNCH_SERIAL_MPI=1" >> $GITHUB_ENV
- name: Install Intel oneAPI compiler
Expand Down

0 comments on commit 993618b

Please sign in to comment.