From 84d484fc3c8982f04c35cbd031927f00540ee14b Mon Sep 17 00:00:00 2001
From: Yuuichi Asahi <yuuichi.asahi@cea.fr>
Date: Fri, 26 Jul 2024 18:42:04 +0200
Subject: [PATCH] C++17 for CUDA

---
 .github/workflows/build_test.yaml | 6 +++---
 docker/nvcc/Dockerfile            | 2 --
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build_test.yaml b/.github/workflows/build_test.yaml
index bb82a565..6fb28b58 100644
--- 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
index ab7bf1a3..b2ab0435 100644
--- 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 && \