C++17 for CUDA

yasahi-hpc · Jul 26, 2024 · 84d484f · 84d484f
1 parent 2c4db74
commit 84d484f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/.github/workflows/build_test.yaml b/.github/workflows/build_test.yaml
@@ -96,10 +96,10 @@ jobs:
           - name: cuda
             image: nvcc
             compiler:
-              c: gcc-12
-              cxx: g++-12
+              c: gcc
+              cxx: g++
             cmake_flags:
-              cxx_standard: 20
+              cxx_standard: 17
               kokkos: -DKokkos_ENABLE_CUDA=ON -DKokkos_ARCH_AMPERE80=ON
               kokkos_fft: -DCMAKE_CXX_FLAGS="-Wall -Wextra -Werror"
           - name: hip

diff --git a/docker/nvcc/Dockerfile b/docker/nvcc/Dockerfile
@@ -15,8 +15,6 @@ RUN apt-get update && apt-get install -y \
         git \
         ccache \
         libfftw3-dev \
-        gcc-12 \
-        g++-12 \
         $ADDITIONAL_PACKAGES \
         && \
     apt-get clean && \