From 992a242b6cc459afee11bf30c68653da8682bc50 Mon Sep 17 00:00:00 2001 From: David Beckingsale Date: Thu, 29 Aug 2024 13:50:57 -0700 Subject: [PATCH 1/5] Build using ROCM 6 image --- .github/workflows/build.yml | 2 +- Dockerfile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 778f180595..4ebf7e2b48 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -4,7 +4,7 @@ jobs: build_docker: strategy: matrix: - target: [gcc12_debug, gcc13, clang13, clang15, rocm5.6, rocm5.6_desul, intel2024, intel2024_debug, intel2024_sycl] + target: [gcc12_debug, gcc13, clang13, clang15, rocm6, rocm5.6_desul, intel2024, intel2024_debug, intel2024_sycl] runs-on: ubuntu-latest steps: - run: | diff --git a/Dockerfile b/Dockerfile index 66a50c3794..947aaa1bd9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -117,9 +117,9 @@ RUN /bin/bash -c "source /opt/intel/oneapi/setvars.sh 2>&1 > /dev/null && \ ## # TODO: We should switch to ROCm 6 -- where to get an image?? -FROM ghcr.io/llnl/radiuss:ubuntu-20.04-hip-5.6.1 AS rocm5.6 +FROM ghcr.io/llnl/radiuss:hip-6.0.2-ubuntu-20.04 image AS rocm6 ENV GTEST_COLOR=1 -ENV HCC_AMDGPU_TARGET=gfx900 +ENV HCC_AMDGPU_TARGET=gfx90a COPY . /home/raja/workspace WORKDIR /home/raja/workspace/build RUN cmake -DCMAKE_CXX_COMPILER=/opt/rocm-5.6.1/bin/amdclang++ -DCMAKE_BUILD_TYPE=Release -DENABLE_HIP=On -DRAJA_ENABLE_WARNINGS_AS_ERRORS=Off .. && \ From e614c0e997c48f665cd02c0ecfb7ab35743c1926 Mon Sep 17 00:00:00 2001 From: David Beckingsale Date: Thu, 29 Aug 2024 13:55:24 -0700 Subject: [PATCH 2/5] Correct typo --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 947aaa1bd9..e9edb422a1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -117,7 +117,7 @@ RUN /bin/bash -c "source /opt/intel/oneapi/setvars.sh 2>&1 > /dev/null && \ ## # TODO: We should switch to ROCm 6 -- where to get an image?? -FROM ghcr.io/llnl/radiuss:hip-6.0.2-ubuntu-20.04 image AS rocm6 +FROM ghcr.io/llnl/radiuss:hip-6.0.2-ubuntu-20.04 AS rocm6 ENV GTEST_COLOR=1 ENV HCC_AMDGPU_TARGET=gfx90a COPY . /home/raja/workspace From f336bae8c8ac4fa70ee078deac49d105b68ce441 Mon Sep 17 00:00:00 2001 From: David Beckingsale Date: Wed, 4 Sep 2024 15:26:34 -0700 Subject: [PATCH 3/5] Correct compiler path --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index e9edb422a1..92334d8a77 100644 --- a/Dockerfile +++ b/Dockerfile @@ -122,7 +122,7 @@ ENV GTEST_COLOR=1 ENV HCC_AMDGPU_TARGET=gfx90a COPY . /home/raja/workspace WORKDIR /home/raja/workspace/build -RUN cmake -DCMAKE_CXX_COMPILER=/opt/rocm-5.6.1/bin/amdclang++ -DCMAKE_BUILD_TYPE=Release -DENABLE_HIP=On -DRAJA_ENABLE_WARNINGS_AS_ERRORS=Off .. && \ +RUN cmake -DCMAKE_CXX_COMPILER=/opt/rocm-6.0.2/bin/amdclang++ -DCMAKE_BUILD_TYPE=Release -DENABLE_HIP=On -DRAJA_ENABLE_WARNINGS_AS_ERRORS=Off .. && \ make -j 16 # TODO: We should switch to ROCm 6 -- where to get an image?? From 70c0a687e78a2e89575c360308d97c4147c725af Mon Sep 17 00:00:00 2001 From: David Beckingsale Date: Fri, 27 Sep 2024 10:46:26 -0700 Subject: [PATCH 4/5] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 92334d8a77..859a7d9439 100644 --- a/Dockerfile +++ b/Dockerfile @@ -140,7 +140,7 @@ ENV GTEST_COLOR=1 ENV HCC_AMDGPU_TARGET=gfx900 COPY . /home/raja/workspace WORKDIR /home/raja/workspace/build -RUN cmake -DCMAKE_CXX_COMPILER=/opt/rocm-6.0.2/bin/amdclang++ -DCMAKE_BUILD_TYPE=Release -DENABLE_HIP=On -DRAJA_ENABLE_WARNINGS_AS_ERRORS=Off .. && \ +RUN cmake -DCMAKE_CXX_COMPILER=/opt/rocm-6.0.2/bin/amdclang++ -DROCM_PATH=/opt/rocm-6.0.2 -DCMAKE_BUILD_TYPE=Release -DENABLE_HIP=On -DRAJA_ENABLE_WARNINGS_AS_ERRORS=Off .. && \ make -j 16 ## ROCm 6 image is broken From ff22ee63a9a266d97b0dd220a917d7206e1a9d3c Mon Sep 17 00:00:00 2001 From: David Beckingsale Date: Fri, 27 Sep 2024 14:14:30 -0700 Subject: [PATCH 5/5] Switch to ROCM 6 for both builds --- .github/workflows/build.yml | 2 +- Dockerfile | 24 ++---------------------- 2 files changed, 3 insertions(+), 23 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4ebf7e2b48..f7513d42b9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -4,7 +4,7 @@ jobs: build_docker: strategy: matrix: - target: [gcc12_debug, gcc13, clang13, clang15, rocm6, rocm5.6_desul, intel2024, intel2024_debug, intel2024_sycl] + target: [gcc12_debug, gcc13, clang13, clang15, rocm6, rocm6_desul, intel2024, intel2024_debug, intel2024_sycl] runs-on: ubuntu-latest steps: - run: | diff --git a/Dockerfile b/Dockerfile index 859a7d9439..f41492755a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -116,40 +116,20 @@ RUN /bin/bash -c "source /opt/intel/oneapi/setvars.sh 2>&1 > /dev/null && \ ## Need to find a viable cuda image to test... ## -# TODO: We should switch to ROCm 6 -- where to get an image?? FROM ghcr.io/llnl/radiuss:hip-6.0.2-ubuntu-20.04 AS rocm6 ENV GTEST_COLOR=1 -ENV HCC_AMDGPU_TARGET=gfx90a -COPY . /home/raja/workspace -WORKDIR /home/raja/workspace/build -RUN cmake -DCMAKE_CXX_COMPILER=/opt/rocm-6.0.2/bin/amdclang++ -DCMAKE_BUILD_TYPE=Release -DENABLE_HIP=On -DRAJA_ENABLE_WARNINGS_AS_ERRORS=Off .. && \ - make -j 16 - -# TODO: We should switch to ROCm 6 -- where to get an image?? -FROM ghcr.io/llnl/radiuss:ubuntu-20.04-hip-5.6.1 AS rocm5.6_desul -ENV GTEST_COLOR=1 -ENV HCC_AMDGPU_TARGET=gfx900 -COPY . /home/raja/workspace -WORKDIR /home/raja/workspace/build -RUN cmake -DCMAKE_CXX_COMPILER=/opt/rocm-5.6.1/bin/amdclang++ -DCMAKE_BUILD_TYPE=Release -DENABLE_HIP=On -DRAJA_ENABLE_DESUL_ATOMICS=On -DRAJA_ENABLE_WARNINGS_AS_ERRORS=Off .. && \ - make -j 16 - -## ROCm 6 image is broken -FROM ghcr.io/llnl/radiuss:hip-6.0.2-ubuntu-20.04 AS rocm6.0 -ENV GTEST_COLOR=1 ENV HCC_AMDGPU_TARGET=gfx900 COPY . /home/raja/workspace WORKDIR /home/raja/workspace/build RUN cmake -DCMAKE_CXX_COMPILER=/opt/rocm-6.0.2/bin/amdclang++ -DROCM_PATH=/opt/rocm-6.0.2 -DCMAKE_BUILD_TYPE=Release -DENABLE_HIP=On -DRAJA_ENABLE_WARNINGS_AS_ERRORS=Off .. && \ make -j 16 -## ROCm 6 image is broken -FROM ghcr.io/llnl/radiuss:hip-6.0.2-ubuntu-20.04 AS rocm6.0_desul +FROM ghcr.io/llnl/radiuss:hip-6.0.2-ubuntu-20.04 AS rocm6_desul ENV GTEST_COLOR=1 ENV HCC_AMDGPU_TARGET=gfx900 COPY . /home/raja/workspace WORKDIR /home/raja/workspace/build -RUN cmake -DCMAKE_CXX_COMPILER=/opt/rocm-6.0.2/bin/amdclang++ -DCMAKE_BUILD_TYPE=Release -DENABLE_HIP=On -DRAJA_ENABLE_DESUL_ATOMICS=On -DRAJA_ENABLE_WARNINGS_AS_ERRORS=Off .. && \ +RUN cmake -DCMAKE_CXX_COMPILER=/opt/rocm-6.0.2/bin/amdclang++ -DROCM_PATH=/opt/rocm-6.0.2 -DCMAKE_BUILD_TYPE=Release -DENABLE_HIP=On -DRAJA_ENABLE_DESUL_ATOMICS=On -DRAJA_ENABLE_WARNINGS_AS_ERRORS=Off .. && \ make -j 16 FROM ghcr.io/llnl/radiuss:intel-2024.0-ubuntu-20.04 AS intel2024_sycl