Moving CUDA builders to gcc12

STEllAR-GROUP · Jun 22, 2024 · 86fa22f · 86fa22f
1 parent 653342e
commit 86fa22f
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 12 deletions.
diff --git a/.jenkins/lsu/Jenkinsfile b/.jenkins/lsu/Jenkinsfile
@@ -37,7 +37,7 @@ pipeline {
                 axes {
                     axis {
                         name 'configuration_name'
-                        values 'gcc-11', 'gcc-12', 'gcc-13', 'gcc-14', 'clang-17-apex', 'clang-16', 'clang-17', 'clang-18', 'gcc-13-cuda-12', 'gcc-13-cuda-12-dgx', 'hipcc'
+                        values 'gcc-11', 'gcc-12', 'gcc-13', 'gcc-14', 'clang-17-apex', 'clang-16', 'clang-17', 'clang-18', 'gcc-12-cuda-12', 'gcc-12-cuda-12-dgx', 'hipcc'
                     }
                     axis {
                          name 'build_type'

diff --git a/.jenkins/lsu/env-gcc-13-cuda-12-dgx.sh → .jenkins/lsu/env-gcc-12-cuda-12-dgx.sh b/.jenkins/lsu/env-gcc-13-cuda-12-dgx.sh → .jenkins/lsu/env-gcc-12-cuda-12-dgx.sh
@@ -7,7 +7,7 @@
 
 module purge
 module load cmake
-module load gcc/13
+module load gcc/12
 module load cuda/12
 module load boost/1.85.0-${build_type,,}
 module load hwloc

diff --git a/.jenkins/lsu/env-gcc-13-cuda-12.sh → .jenkins/lsu/env-gcc-12-cuda-12.sh b/.jenkins/lsu/env-gcc-13-cuda-12.sh → .jenkins/lsu/env-gcc-12-cuda-12.sh
@@ -7,7 +7,7 @@
 
 module purge
 module load cmake
-module load gcc/13
+module load gcc/12
 module load boost/1.84.0-${build_type,,}
 module load hwloc
 module load cuda/12

diff --git a/...slurm-configuration-gcc-13-cuda-12-dgx.sh → ...slurm-configuration-gcc-12-cuda-12-dgx.sh b/...slurm-configuration-gcc-13-cuda-12-dgx.sh → ...slurm-configuration-gcc-12-cuda-12-dgx.sh
diff --git a/...lsu/slurm-configuration-gcc-13-cuda-12.sh → ...lsu/slurm-configuration-gcc-12-cuda-12.sh b/...lsu/slurm-configuration-gcc-13-cuda-12.sh → ...lsu/slurm-configuration-gcc-12-cuda-12.sh
diff --git a/libs/core/format/include/hpx/modules/format.hpp b/libs/core/format/include/hpx/modules/format.hpp
@@ -317,11 +317,7 @@ namespace hpx::util {
                         os << value.delim;
                     first = false;
 
-#if defined(HPX_CUDA_VERSION)
-                    using value_type = typename std::decay_t<Range>::value_type;
-#else
                     using value_type = std::decay_t<decltype(elem)>;
-#endif
                     detail::formatter<value_type>::call(os, spec, &elem);
                 }
             }

diff --git a/libs/core/pack_traversal/include/hpx/pack_traversal/detail/pack_traversal_impl.hpp b/libs/core/pack_traversal/include/hpx/pack_traversal/detail/pack_traversal_impl.hpp
@@ -515,13 +515,8 @@ namespace hpx::util::detail {
             // I didn't want to pull a whole header for it in.
             for (auto&& val : container_accessor_of(HPX_FORWARD(T, container)))
             {
-#if defined(HPX_CUDA_VERSION)
-                remapped.push_back(
-                    spreading::unpack(HPX_FORWARD(M, mapper)(HPX_MOVE(val))));
-#else
                 remapped.push_back(spreading::unpack(
                     HPX_FORWARD(M, mapper)(HPX_FORWARD(decltype(val), val))));
-#endif
             }
 
             return remapped;    // RVO