Merge pull request #5 from raikonenfnu/rocm2.0fix

Refactor rocm installation.
nod-ai · Oct 15, 2023 · bb94e8c · bb94e8c
2 parents 45be86d + 0f4a0d5
commit bb94e8c
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 18 deletions.
diff --git a/dockerfiles/amdgpu_ubuntu_jammy_ghr_x86_64.Dockerfile b/dockerfiles/amdgpu_ubuntu_jammy_ghr_x86_64.Dockerfile
@@ -23,15 +23,14 @@ RUN rmdir /install-amdvlk
 #   docker run --device=/dev/kfd --device=/dev/dri <docker ID> rocminfo
 ARG ROCM_VERSION=5.6
 WORKDIR /install-rocm
-RUN wget https://repo.radeon.com/rocm/rocm.gpg.key -O - | gpg --dearmor | tee /etc/apt/keyrings/rocm.gpg > /dev/null && \
-    echo "deb [arch=amd64 signed-by=/etc/apt/keyrings/rocm.gpg] https://repo.radeon.com/amdgpu/${ROCM_VERSION}/ubuntu jammy main" \
-    | tee /etc/apt/sources.list.d/amdgpu.list && \
-    apt update && DEBIAN_FRONTEND=noninteractive apt install -y --no-install-recommends ca-certificates amdgpu-dkms && \
-    echo "deb [arch=amd64 signed-by=/etc/apt/keyrings/rocm.gpg] https://repo.radeon.com/rocm/apt/${ROCM_VERSION} jammy main" \
-    | tee --append /etc/apt/sources.list.d/rocm.list && \
-    echo 'Package: *\nPin: release o=repo.radeon.com\nPin-Priority: 600' \
-    | tee /etc/apt/preferences.d/rocm-pin-600 && \
-    apt update && DEBIAN_FRONTEND=noninteractive apt install  -y --no-install-recommends ca-certificates rocm-hip-sdk && \
+RUN mkdir --parents --mode=0755 /etc/apt/keyrings && wget https://repo.radeon.com/rocm/rocm.gpg.key -O - | \
+    gpg --dearmor | tee /etc/apt/keyrings/rocm.gpg > /dev/null && \
+    echo "deb [arch=amd64 signed-by=/etc/apt/keyrings/rocm.gpg] https://repo.radeon.com/amdgpu/${ROCM_VERSION}/ubuntu jammy main" | \
+    tee /etc/apt/sources.list.d/amdgpu.list && \
+    echo "deb [arch=amd64 signed-by=/etc/apt/keyrings/rocm.gpg] https://repo.radeon.com/rocm/apt/${ROCM_VERSION} jammy main" | \
+    tee /etc/apt/sources.list.d/rocm.list && \
+    echo -e 'Package: *\nPin: release o=repo.radeon.com\nPin-Priority: 600' | tee /etc/apt/preferences.d/rocm-pin-600 && \
+    apt update && DEBIAN_FRONTEND=noninteractive apt install -y --no-install-recommends ca-certificates rocm-hip-libraries && \
     echo "/opt/rocm/lib\n/opt/rocm/hip/lib" | tee /etc/ld.so.conf.d/24-rocm.conf && ldconfig && \
     rm -rf /install-rocm/*
 WORKDIR /

diff --git a/dockerfiles/amdgpu_ubuntu_jammy_x86_64.Dockerfile b/dockerfiles/amdgpu_ubuntu_jammy_x86_64.Dockerfile
@@ -25,15 +25,14 @@ RUN rmdir /install-amdvlk
 #   docker run --device=/dev/kfd --device=/dev/dri <docker ID> rocminfo
 ARG ROCM_VERSION=5.6
 WORKDIR /install-rocm
-RUN wget https://repo.radeon.com/rocm/rocm.gpg.key -O - | gpg --dearmor | tee /etc/apt/keyrings/rocm.gpg > /dev/null && \
-    echo "deb [arch=amd64 signed-by=/etc/apt/keyrings/rocm.gpg] https://repo.radeon.com/amdgpu/${ROCM_VERSION}/ubuntu jammy main" \
-    | tee /etc/apt/sources.list.d/amdgpu.list && \
-    apt update && DEBIAN_FRONTEND=noninteractive apt install -y --no-install-recommends ca-certificates amdgpu-dkms && \
-    echo "deb [arch=amd64 signed-by=/etc/apt/keyrings/rocm.gpg] https://repo.radeon.com/rocm/apt/${ROCM_VERSION} jammy main" \
-    | tee --append /etc/apt/sources.list.d/rocm.list && \
-    echo 'Package: *\nPin: release o=repo.radeon.com\nPin-Priority: 600' \
-    | tee /etc/apt/preferences.d/rocm-pin-600 && \
-    apt update && DEBIAN_FRONTEND=noninteractive apt install  -y --no-install-recommends ca-certificates rocm-hip-sdk && \
+RUN mkdir --parents --mode=0755 /etc/apt/keyrings && wget https://repo.radeon.com/rocm/rocm.gpg.key -O - | \
+    gpg --dearmor | tee /etc/apt/keyrings/rocm.gpg > /dev/null && \
+    echo "deb [arch=amd64 signed-by=/etc/apt/keyrings/rocm.gpg] https://repo.radeon.com/amdgpu/${ROCM_VERSION}/ubuntu jammy main" | \
+    tee /etc/apt/sources.list.d/amdgpu.list && \
+    echo "deb [arch=amd64 signed-by=/etc/apt/keyrings/rocm.gpg] https://repo.radeon.com/rocm/apt/${ROCM_VERSION} jammy main" | \
+    tee /etc/apt/sources.list.d/rocm.list && \
+    echo 'Package: *\nPin: release o=repo.radeon.com\nPin-Priority: 600' | tee /etc/apt/preferences.d/rocm-pin-600 && \
+    apt update && DEBIAN_FRONTEND=noninteractive apt install -y --no-install-recommends ca-certificates rocm-hip-libraries && \
     echo "/opt/rocm/lib\n/opt/rocm/hip/lib" | tee /etc/ld.so.conf.d/24-rocm.conf && ldconfig && \
     rm -rf /install-rocm/*
 WORKDIR /