Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Reenable MLS tests on HIP #1034

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Reenable MLS tests on HIP #1034

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
975a0cc
Reenable MLS tests on HIP
Rombur Feb 2, 2024
eddf5f1
Update to ROCm 6.2 in Jenkins
Rombur Oct 24, 2024
fe67b46
Update Boost for HIP CI
Rombur Oct 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .jenkins/continuous.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.hipcc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 && \
Expand Down
22 changes: 0 additions & 22 deletions test/tstInterpDetailsMLSCoefficients.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<Kokkos__Device<Kokkos__HIP_
// Kokkos__HIPSpace>>": 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<typename DeviceType::execution_space, Kokkos::HIP>)
{
return;
}
#endif
using ExecutionSpace = typename DeviceType::execution_space;
using MemorySpace = typename DeviceType::memory_space;
ExecutionSpace space{};
Expand Down Expand Up @@ -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<Kokkos__Device<Kokkos__HIP_
// Kokkos__HIPSpace>>": 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<typename DeviceType::execution_space, Kokkos::HIP>)
{
return;
}
#endif
using ExecutionSpace = typename DeviceType::execution_space;
using MemorySpace = typename DeviceType::memory_space;
ExecutionSpace space{};
Expand Down
24 changes: 0 additions & 24 deletions test/tstInterpMovingLeastSquares.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<Kokkos__Device<Kokkos__HIP_
// Kokkos__HIPSpace>>": 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<typename DeviceType::execution_space, Kokkos::HIP>)
{
return;
}
#endif

using ExecutionSpace = typename DeviceType::execution_space;
using MemorySpace = typename DeviceType::memory_space;
ExecutionSpace space{};
Expand Down Expand Up @@ -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<Kokkos__Device<Kokkos__HIP_
// Kokkos__HIPSpace>>": 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<typename DeviceType::execution_space, Kokkos::HIP>)
{
return;
}
#endif

using ExecutionSpace = typename DeviceType::execution_space;
using MemorySpace = typename DeviceType::memory_space;
ExecutionSpace space{};
Expand Down
Loading