From 86fa22f9ad548ab01dce0981082c5083e37b3c20 Mon Sep 17 00:00:00 2001 From: Hartmut Kaiser Date: Fri, 21 Jun 2024 19:16:07 -0500 Subject: [PATCH] Moving CUDA builders to gcc12 --- .jenkins/lsu/Jenkinsfile | 2 +- .../{env-gcc-13-cuda-12-dgx.sh => env-gcc-12-cuda-12-dgx.sh} | 2 +- .../lsu/{env-gcc-13-cuda-12.sh => env-gcc-12-cuda-12.sh} | 2 +- ...a-12-dgx.sh => slurm-configuration-gcc-12-cuda-12-dgx.sh} | 0 ...c-13-cuda-12.sh => slurm-configuration-gcc-12-cuda-12.sh} | 0 libs/core/format/include/hpx/modules/format.hpp | 4 ---- .../hpx/pack_traversal/detail/pack_traversal_impl.hpp | 5 ----- 7 files changed, 3 insertions(+), 12 deletions(-) rename .jenkins/lsu/{env-gcc-13-cuda-12-dgx.sh => env-gcc-12-cuda-12-dgx.sh} (98%) rename .jenkins/lsu/{env-gcc-13-cuda-12.sh => env-gcc-12-cuda-12.sh} (98%) rename .jenkins/lsu/{slurm-configuration-gcc-13-cuda-12-dgx.sh => slurm-configuration-gcc-12-cuda-12-dgx.sh} (100%) rename .jenkins/lsu/{slurm-configuration-gcc-13-cuda-12.sh => slurm-configuration-gcc-12-cuda-12.sh} (100%) diff --git a/.jenkins/lsu/Jenkinsfile b/.jenkins/lsu/Jenkinsfile index 08977c7614fe..d2cba01e2f55 100644 --- 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 b/.jenkins/lsu/env-gcc-12-cuda-12-dgx.sh similarity index 98% rename from .jenkins/lsu/env-gcc-13-cuda-12-dgx.sh rename to .jenkins/lsu/env-gcc-12-cuda-12-dgx.sh index eb197fc21623..80229dbbc640 100644 --- a/.jenkins/lsu/env-gcc-13-cuda-12-dgx.sh +++ b/.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 b/.jenkins/lsu/env-gcc-12-cuda-12.sh similarity index 98% rename from .jenkins/lsu/env-gcc-13-cuda-12.sh rename to .jenkins/lsu/env-gcc-12-cuda-12.sh index 08f87aed63c6..2e7861f7d02d 100644 --- a/.jenkins/lsu/env-gcc-13-cuda-12.sh +++ b/.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/.jenkins/lsu/slurm-configuration-gcc-13-cuda-12-dgx.sh b/.jenkins/lsu/slurm-configuration-gcc-12-cuda-12-dgx.sh similarity index 100% rename from .jenkins/lsu/slurm-configuration-gcc-13-cuda-12-dgx.sh rename to .jenkins/lsu/slurm-configuration-gcc-12-cuda-12-dgx.sh diff --git a/.jenkins/lsu/slurm-configuration-gcc-13-cuda-12.sh b/.jenkins/lsu/slurm-configuration-gcc-12-cuda-12.sh similarity index 100% rename from .jenkins/lsu/slurm-configuration-gcc-13-cuda-12.sh rename to .jenkins/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 index ff1b43146780..f18b553fe60d 100644 --- 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::value_type; -#else using value_type = std::decay_t; -#endif detail::formatter::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 index c0cbe0b6e63b..d7b341d22a28 100644 --- 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