Skip to content

Commit fe7ad38

Browse files
committed
Fixes
1 parent 8455ac9 commit fe7ad38

File tree

7 files changed

+15
-15
lines changed

7 files changed

+15
-15
lines changed

.github/ci/spack-envs/clang11_nopy_ompi_h5_ad2/spack.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ spack:
1212

1313
packages:
1414
adios2:
15-
variants: ~zfp ~sz ~png ~dataman ~python ~fortran ~ssc ~shared ~bzip2 ~blosc2
15+
variants: ~zfp ~sz ~png ~dataman ~python ~fortran ~ssc ~shared ~bzip2 ~blosc2 ~mgard
1616
cmake:
1717
externals:
1818
- spec: cmake@3.31.5

.github/ci/spack-envs/clang12_py38_mpich_h5_ad2/spack.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@ spack:
1212

1313
packages:
1414
adios2:
15-
variants: ~zfp ~sz ~png ~dataman ~python ~fortran ~ssc ~shared ~bzip2 ~blosc2
15+
variants: ~zfp ~sz ~png ~dataman ~python ~fortran ~ssc ~shared ~bzip2 ~blosc2 ~mgard
1616
cmake:
1717
externals:
1818
- spec: cmake@3.31.5
1919
prefix: /usr
2020
buildable: False
2121
mpich:
2222
externals:
23-
- spec: mpich@4.0
23+
- spec: mpich@4.0.3
2424
prefix: /usr
2525
buildable: False
2626
perl:

.github/ci/spack-envs/clangtidy_nopy_ompi_h5_ad2/spack.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ spack:
1212

1313
packages:
1414
adios2:
15-
variants: ~zfp ~sz ~png ~dataman ~python ~fortran ~ssc ~shared ~bzip2
15+
variants: ~zfp ~sz ~png ~dataman ~python ~fortran ~ssc ~shared ~bzip2 ~mgard
1616
cmake:
1717
externals:
1818
- spec: cmake@3.31.5

.github/workflows/dependencies/install_nvcc11.sh renamed to .github/workflows/dependencies/install_nvcc12.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ echo "deb https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2204/x8
2121
sudo apt-get update
2222
apt search cuda-compiler
2323
sudo apt-get install -y \
24-
cuda-command-line-tools-11-2 \
25-
cuda-compiler-11-2 \
26-
cuda-cupti-dev-11-2 \
27-
cuda-minimal-build-11-2
24+
cuda-command-line-tools-12-8 \
25+
cuda-compiler-12-8 \
26+
cuda-cupti-dev-12-8 \
27+
cuda-minimal-build-12-8
2828

2929
sudo ln -s cuda-11.2 /usr/local/cuda

.github/workflows/dependencies/install_nvhpc21-11.sh renamed to .github/workflows/dependencies/install_nvhpc25-1.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ sudo apt-get install -y \
1717
echo 'deb [trusted=yes] https://developer.download.nvidia.com/hpc-sdk/ubuntu/amd64 /' | \
1818
sudo tee /etc/apt/sources.list.d/nvhpc.list
1919
sudo apt-get update -y
20-
sudo apt-get install -y --no-install-recommends nvhpc-21-11
20+
sudo apt-get install -y --no-install-recommends nvhpc-25-1
2121

2222
# things should reside in /opt/nvidia/hpc_sdk now
2323

.github/workflows/nvidia.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
steps:
1616
- uses: actions/checkout@v4
1717
- name: Dependencies
18-
run: .github/workflows/dependencies/install_nvcc11.sh
18+
run: .github/workflows/dependencies/install_nvcc12.sh
1919
- name: Build & Install
2020
run: |
2121
export PATH=/usr/local/nvidia/bin:/usr/local/cuda/bin:${PATH}
@@ -31,8 +31,8 @@ jobs:
3131
cmake --build build --parallel 2
3232
ctest --test-dir build --output-on-failure
3333
34-
tests-nvhpc21-11-nvcc:
35-
name: NVHPC@21.11
34+
tests-nvhpc25-1-nvcc:
35+
name: NVHPC@25.1
3636
runs-on: ubuntu-22.04
3737
if: github.event.pull_request.draft == false
3838
# Catch warnings:
@@ -41,11 +41,11 @@ jobs:
4141
steps:
4242
- uses: actions/checkout@v4
4343
- name: Dependencies
44-
run: .github/workflows/dependencies/install_nvhpc21-11.sh
44+
run: .github/workflows/dependencies/install_nvhpc25-1.sh
4545
- name: Build & Install
4646
run: |
4747
source /etc/profile.d/modules.sh
48-
module load /opt/nvidia/hpc_sdk/modulefiles/nvhpc/21.11
48+
module load /opt/nvidia/hpc_sdk/modulefiles/nvhpc/25.1
4949
5050
which nvcc || echo "nvcc not in PATH!"
5151
which nvc++ || echo "nvc++ not in PATH!"

.github/workflows/tooling.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ jobs:
7272
cmake --build build --parallel 2
7373
export ASAN_OPTIONS=detect_stack_use_after_return=1:detect_leaks=1:check_initialization_order=true:strict_init_order=true:detect_stack_use_after_scope=1:fast_unwind_on_malloc=0
7474
export LSAN_OPTIONS=suppressions="$SOURCEPATH/.github/ci/sanitizer/clang/Leak.supp"
75-
export LD_PRELOAD=/usr/lib/clang/10/lib/linux/libclang_rt.asan-x86_64.so
75+
export LD_PRELOAD=/usr/lib/clang/14/lib/linux/libclang_rt.asan-x86_64.so
7676
ctest --test-dir build -E 3b --output-on-failure
7777
export OPENPMD_HDF5_CHUNKS="auto"
7878
ctest --test-dir build -R 3b --output-on-failure

0 commit comments

Comments
 (0)