From 975a0cc908ea5ad987c45bad5d82c1d5e6c0de2b Mon Sep 17 00:00:00 2001 From: Bruno Turcksin Date: Fri, 2 Feb 2024 14:47:50 -0500 Subject: [PATCH 1/3] Reenable MLS tests on HIP --- test/tstInterpDetailsMLSCoefficients.cpp | 22 ---------------------- test/tstInterpMovingLeastSquares.cpp | 24 ------------------------ 2 files changed, 46 deletions(-) diff --git a/test/tstInterpDetailsMLSCoefficients.cpp b/test/tstInterpDetailsMLSCoefficients.cpp index ea714eb23..1911915c2 100644 --- a/test/tstInterpDetailsMLSCoefficients.cpp +++ b/test/tstInterpDetailsMLSCoefficients.cpp @@ -44,17 +44,6 @@ interpolate(ExecutionSpace const &space, SourceValues const &source_values, BOOST_AUTO_TEST_CASE_TEMPLATE(mls_coefficients, DeviceType, ARBORX_DEVICE_TYPES) { - // FIXME_HIP: the CI fails with: - // fatal error: in "mls_coefficients_edge_cases>": std::runtime_error: Kokkos::Impl::ParallelFor/Reduce< - // HIP > could not find a valid team size. - // The error seems similar to https://github.com/kokkos/kokkos/issues/6743 -#ifdef KOKKOS_ENABLE_HIP - if (std::is_same_v) - { - return; - } -#endif using ExecutionSpace = typename DeviceType::execution_space; using MemorySpace = typename DeviceType::memory_space; ExecutionSpace space{}; @@ -134,17 +123,6 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(mls_coefficients, DeviceType, ARBORX_DEVICE_TYPES) BOOST_AUTO_TEST_CASE_TEMPLATE(mls_coefficients_edge_cases, DeviceType, ARBORX_DEVICE_TYPES) { - // FIXME_HIP: the CI fails with: - // fatal error: in "mls_coefficients_edge_cases>": std::runtime_error: Kokkos::Impl::ParallelFor/Reduce< - // HIP > could not find a valid team size. - // The error seems similar to https://github.com/kokkos/kokkos/issues/6743 -#ifdef KOKKOS_ENABLE_HIP - if (std::is_same_v) - { - return; - } -#endif using ExecutionSpace = typename DeviceType::execution_space; using MemorySpace = typename DeviceType::memory_space; ExecutionSpace space{}; diff --git a/test/tstInterpMovingLeastSquares.cpp b/test/tstInterpMovingLeastSquares.cpp index 1dd63d190..0eb013f60 100644 --- a/test/tstInterpMovingLeastSquares.cpp +++ b/test/tstInterpMovingLeastSquares.cpp @@ -21,18 +21,6 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(moving_least_squares, DeviceType, ARBORX_DEVICE_TYPES) { - // FIXME_HIP: the CI fails with: - // fatal error: in "mls_coefficients_edge_cases>": std::runtime_error: Kokkos::Impl::ParallelFor/Reduce< - // HIP > could not find a valid team size. - // The error seems similar to https://github.com/kokkos/kokkos/issues/6743 -#ifdef KOKKOS_ENABLE_HIP - if (std::is_same_v) - { - return; - } -#endif - using ExecutionSpace = typename DeviceType::execution_space; using MemorySpace = typename DeviceType::memory_space; ExecutionSpace space{}; @@ -109,18 +97,6 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(moving_least_squares, DeviceType, BOOST_AUTO_TEST_CASE_TEMPLATE(moving_least_squares_edge_cases, DeviceType, ARBORX_DEVICE_TYPES) { - // FIXME_HIP: the CI fails with: - // fatal error: in "mls_coefficients_edge_cases>": std::runtime_error: Kokkos::Impl::ParallelFor/Reduce< - // HIP > could not find a valid team size. - // The error seems similar to https://github.com/kokkos/kokkos/issues/6743 -#ifdef KOKKOS_ENABLE_HIP - if (std::is_same_v) - { - return; - } -#endif - using ExecutionSpace = typename DeviceType::execution_space; using MemorySpace = typename DeviceType::memory_space; ExecutionSpace space{}; From eddf5f1ed4e8a0e4371d2d006422727475f362d4 Mon Sep 17 00:00:00 2001 From: Bruno Turcksin Date: Thu, 24 Oct 2024 14:03:01 -0400 Subject: [PATCH 2/3] Update to ROCm 6.2 in Jenkins --- .jenkins/continuous.groovy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.jenkins/continuous.groovy b/.jenkins/continuous.groovy index 5efdb2186..423d65064 100644 --- a/.jenkins/continuous.groovy +++ b/.jenkins/continuous.groovy @@ -338,12 +338,12 @@ pipeline { } } - stage('HIP-5.6') { + stage('HIP-6.2') { agent { dockerfile { filename "Dockerfile.hipcc" dir "docker" - additionalBuildArgs '--build-arg BASE=rocm/dev-ubuntu-20.04:5.6 --build-arg KOKKOS_VERSION=4.4.00 --build-arg KOKKOS_ARCH=${KOKKOS_ARCH}' + additionalBuildArgs '--build-arg BASE=rocm/dev-ubuntu-20.04:6.2-complete --build-arg KOKKOS_VERSION=4.4.00 --build-arg KOKKOS_ARCH=${KOKKOS_ARCH}' args '-v /tmp/ccache.kokkos:/tmp/ccache --device=/dev/kfd --device=/dev/dri --security-opt seccomp=unconfined --group-add video --env HIP_VISIBLE_DEVICES=${HIP_VISIBLE_DEVICES} --env AMDGPU_TARGET=${AMDGPU_TARGET}' label 'rocm-docker && AMD_Radeon_Instinct_MI210' } From fe67b46ab3e426e02970519f2e4781c8d1fb419c Mon Sep 17 00:00:00 2001 From: Bruno Turcksin Date: Thu, 24 Oct 2024 14:38:17 -0400 Subject: [PATCH 3/3] Update Boost for HIP CI --- docker/Dockerfile.hipcc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile.hipcc b/docker/Dockerfile.hipcc index f657c74a9..7ba05c470 100644 --- a/docker/Dockerfile.hipcc +++ b/docker/Dockerfile.hipcc @@ -54,7 +54,7 @@ ENV PATH=${CMAKE_DIR}/bin:$PATH # Install Boost ENV BOOST_DIR=/opt/boost -RUN BOOST_VERSION=1.79.0 && \ +RUN BOOST_VERSION=1.86.0 && \ BOOST_VERSION_UNDERSCORE=$(echo "$BOOST_VERSION" | sed -e "s/\./_/g") && \ BOOST_KEY=379CE192D401AB61 && \ BOOST_URL=https://boostorg.jfrog.io/artifactory/main/release/${BOOST_VERSION}/source && \