Update to nvhpc 23.5

alpaka-group · Jul 25, 2023 · b376b17 · b376b17
1 parent 5362b81
commit b376b17
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -241,9 +241,9 @@ jobs:
             install_extra: intel-oneapi-compiler-dpcpp-cpp g++-12 # for libstdc++
             cxx_flags: --gcc-install-dir=/usr/lib/gcc/x86_64-linux-gnu/12
           - name: build-ubuntu-nvc++
-            cxx: /opt/nvidia/hpc_sdk/Linux_x86_64/22.9/compilers/bin/nvc++
+            cxx: /opt/nvidia/hpc_sdk/Linux_x86_64/23.5/compilers/bin/nvc++
             add_nvcpp_repo: true
-            install_extra: nvhpc-22-9
+            install_extra: nvhpc-23-5
 
     steps:
       - uses: actions/checkout@v3

diff --git a/tests/recordref.cpp b/tests/recordref.cpp
@@ -4,6 +4,7 @@
 #include "common.hpp"
 
 #include <algorithm>
+#include <cstdio>
 #include <sstream>
 #include <vector>
 
@@ -29,6 +30,13 @@ namespace
         record(tag::Vel{}, tag::Y{}) = 4;
         record(tag::Vel{}, tag::Z{}) = 5;
         record(tag::Mass{}) = 6;
+
+#if defined(__NVCOMPILER) && __NVCOMPILER_MAJOR__ >= 23
+        // nvc++ somehow optimizes out the return of record but corrupts the value, so we make it escape to prevent
+        // compiler optimizations
+        printf("", &record);
+#endif
+
         return record;
     }
 } // namespace
@@ -1198,7 +1206,7 @@ TEST_CASE("decayCopy")
     STATIC_REQUIRE(std::is_same_v<decltype(llama::decayCopy(42)), int>);
     const int i = 42;
     STATIC_REQUIRE(std::is_same_v<decltype(llama::decayCopy(i)), int>);
-    const int& ir = i;
+    [[maybe_unused]] const int& ir = i;
     STATIC_REQUIRE(std::is_same_v<decltype(llama::decayCopy(ir)), int>);
 
     auto mapping = llama::mapping::BitPackedIntSoA<llama::ArrayExtents<int, 4>, Vec3I>{{}, 17};