diff --git a/.jenkins/lsu/batch.sh b/.jenkins/lsu/batch.sh index 1b24d132975f..64e4985ef554 100755 --- a/.jenkins/lsu/batch.sh +++ b/.jenkins/lsu/batch.sh @@ -21,7 +21,7 @@ ulimit -l unlimited set +e ctest \ - --verbose \ + ${ctest_extra_args} \ -S ${src_dir}/.jenkins/lsu/ctest.cmake \ -DCTEST_CONFIGURE_EXTRA_OPTIONS="${configure_extra_options}" \ -DCTEST_BUILD_CONFIGURATION_NAME="${configuration_name_with_build_type}" \ diff --git a/.jenkins/lsu/entry.sh b/.jenkins/lsu/entry.sh index 878e4aa9a4e8..9554137a7fa9 100755 --- a/.jenkins/lsu/entry.sh +++ b/.jenkins/lsu/entry.sh @@ -46,6 +46,7 @@ sbatch \ --job-name="${job_name}" \ --nodes="${configuration_slurm_num_nodes}" \ --partition="${configuration_slurm_partition}" \ + --exclude="bahram" \ --time="03:00:00" \ --output="jenkins-hpx-${configuration_name_with_build_type}.out" \ --error="jenkins-hpx-${configuration_name_with_build_type}.err" \ diff --git a/.jenkins/lsu/env-common.sh b/.jenkins/lsu/env-common.sh index 2d797c2acaf0..f0bd7e5dd00b 100644 --- a/.jenkins/lsu/env-common.sh +++ b/.jenkins/lsu/env-common.sh @@ -11,5 +11,7 @@ if [ "${build_type}" = "Debug" ]; then configure_extra_options+=" -DLCI_DEBUG=ON" fi +ctest_extra_args+=" --verbose " + hostname module avail diff --git a/.jenkins/lsu/env-gcc-10-cuda-11.sh b/.jenkins/lsu/env-gcc-10-cuda-11.sh index 39aa9b3539bc..78695b5827bf 100644 --- a/.jenkins/lsu/env-gcc-10-cuda-11.sh +++ b/.jenkins/lsu/env-gcc-10-cuda-11.sh @@ -23,4 +23,4 @@ configure_extra_options+=" -DHPX_WITH_CUDA=ON" configure_extra_options+=" -DHPX_WITH_NETWORKING=OFF" configure_extra_options+=" -DHPX_WITH_DISTRIBUTED_RUNTIME=OFF" configure_extra_options+=" -DHPX_WITH_ASYNC_MPI=ON" -configure_extra_options+=" -DCMAKE_CUDA_ARCHITECTURES='37;70'" +configure_extra_options+=" -DCMAKE_CUDA_ARCHITECTURES='70;80'" diff --git a/.jenkins/lsu/env-hipcc.sh b/.jenkins/lsu/env-hipcc.sh index abc09f74b40e..e31a25c4fa26 100644 --- a/.jenkins/lsu/env-hipcc.sh +++ b/.jenkins/lsu/env-hipcc.sh @@ -17,4 +17,6 @@ configure_extra_options+=" -DHPX_WITH_FETCH_ASIO=ON" configure_extra_options+=" -DHPX_WITH_MAX_CPU_COUNT=128" configure_extra_options+=" -DHPX_WITH_DEPRECATION_WARNINGS=OFF" configure_extra_options+=" -DHPX_WITH_COMPILER_WARNINGS=ON" -configure_extra_options+=" -DHPX_WITH_COMPILER_WARNINGS_AS_ERRORS=ON" +configure_extra_options+=" -DHPX_WITH_COMPILER_WARNINGS_AS_ERRORS=OFF" + +ctest_extra_args+=" -E tests.unit.modules.algorithms.detail " diff --git a/libs/core/async_cuda/tests/performance/synchronize.cu b/libs/core/async_cuda/tests/performance/synchronize.cu index 359a59568f42..d206638da99a 100644 --- a/libs/core/async_cuda/tests/performance/synchronize.cu +++ b/libs/core/async_cuda/tests/performance/synchronize.cu @@ -6,8 +6,8 @@ #include -// NVCC fails unceremoniously with this test at least until V11.5 -#if !defined(HPX_CUDA_VERSION) || (HPX_CUDA_VERSION > 1105) +// NVCC fails unceremoniously with this test at least until V12.1 +#if !defined(HPX_CUDA_VERSION) || (HPX_CUDA_VERSION > 1201) #include #include diff --git a/libs/core/async_cuda/tests/unit/transform_stream.cu b/libs/core/async_cuda/tests/unit/transform_stream.cu index b27f197822c6..d8ad49613be9 100644 --- a/libs/core/async_cuda/tests/unit/transform_stream.cu +++ b/libs/core/async_cuda/tests/unit/transform_stream.cu @@ -6,8 +6,8 @@ #include -// NVCC fails unceremoniously with this test at least until V11.5 -#if !defined(HPX_CUDA_VERSION) || (HPX_CUDA_VERSION > 1105) +// NVCC fails unceremoniously with this test at least until V12.1 +#if !defined(HPX_CUDA_VERSION) || (HPX_CUDA_VERSION > 1201) #include #include