Trying to clean up a few things

arborx · Feb 8, 2025 · 04dd4f0 · 04dd4f0
1 parent 053fdd4
commit 04dd4f0
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 24 deletions.
diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -6,21 +6,16 @@ ARG NPROCS=4
 RUN if test ${NV_CUDA_LIB_VERSION}; then apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/cuda/repos/ubuntu1804/x86_64/3bf863cc.pub; fi
 
 RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -yq \
-        build-essential \
         bc \
+        build-essential \
+        ccache \
         curl \
+        gdb \
         git \
-        wget \
         jq \
-        vim \
-        lcov \
-        ccache \
-        gdb \
         ninja-build \
-        libbz2-dev \
-        libicu-dev \
-        python-dev \
-        autotools-dev \
+        vim \
+        wget \
         && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/*
@@ -135,7 +130,7 @@ ARG KOKKOS_VERSION=4.3.00
 ARG KOKKOS_OPTIONS="-DCMAKE_CXX_STANDARD=20 -DKokkos_ENABLE_SERIAL=ON -DKokkos_ENABLE_OPENMP=ON -DKokkos_ENABLE_CUDA=ON"
 ENV KOKKOS_DIR=/opt/kokkos
 RUN KOKKOS_URL=https://github.com/kokkos/kokkos/archive/${KOKKOS_VERSION}.tar.gz && \
-    KOKKOS_ARCHIVE=kokkos-${KOKKOS_HASH}.tar.gz && \
+    KOKKOS_ARCHIVE=kokkos-${KOKKOS_VERSION}.tar.gz && \
     SCRATCH_DIR=/scratch && mkdir -p ${SCRATCH_DIR} && cd ${SCRATCH_DIR} && \
     wget --quiet ${KOKKOS_URL} --output-document=${KOKKOS_ARCHIVE} && \
     mkdir -p kokkos && \

diff --git a/docker/Dockerfile.hipcc b/docker/Dockerfile.hipcc
@@ -5,22 +5,18 @@ ARG NPROCS=4
 
 RUN apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get install -yq \
-        build-essential \
         bc \
+        build-essential \
+        ccache \
         curl \
+        gdb \
         git \
-        kmod \
-        wget \
         jq \
-        vim \
-        gdb \
-        ccache \
-        libbz2-dev \
-        libicu-dev \
-        python-dev \
-        autotools-dev \
         libopenmpi-dev \
+        ninja-build \
         rocthrust \
+        vim \
+        wget \
         && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/*
@@ -93,7 +89,7 @@ ARG KOKKOS_VERSION=4.3.00
 ARG KOKKOS_OPTIONS="-DCMAKE_CXX_STANDARD=20 -DKokkos_ENABLE_HIP=ON -DKokkos_ENABLE_OPENMP=ON"
 ENV KOKKOS_DIR=/opt/kokkos
 RUN KOKKOS_URL=https://github.com/kokkos/kokkos/archive/${KOKKOS_VERSION}.tar.gz && \
-    KOKKOS_ARCHIVE=kokkos-${KOKKOS_HASH}.tar.gz && \
+    KOKKOS_ARCHIVE=kokkos-${KOKKOS_VERSION}.tar.gz && \
     SCRATCH_DIR=/scratch && mkdir -p ${SCRATCH_DIR} && cd ${SCRATCH_DIR} && \
     wget --quiet ${KOKKOS_URL} --output-document=${KOKKOS_ARCHIVE} && \
     mkdir -p kokkos && \

diff --git a/docker/Dockerfile.sycl b/docker/Dockerfile.sycl
@@ -10,7 +10,6 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -yq \
         wget \
         ccache \
         ninja-build \
-        python3 \
         git \
         vim \
         jq \
@@ -132,7 +131,7 @@ ARG KOKKOS_OPTIONS="-DCMAKE_CXX_STANDARD=20 -DKokkos_ENABLE_SYCL=ON -DCMAKE_CXX_
 ENV KOKKOS_DIR=/opt/kokkos
 RUN . /opt/intel/oneapi/setvars.sh --include-intel-llvm && \
     KOKKOS_URL=https://github.com/kokkos/kokkos/archive/${KOKKOS_VERSION}.tar.gz && \
-    KOKKOS_ARCHIVE=kokkos-${KOKKOS_HASH}.tar.gz && \
+    KOKKOS_ARCHIVE=kokkos-${KOKKOS_VERSION}.tar.gz && \
     SCRATCH_DIR=/scratch && mkdir -p ${SCRATCH_DIR} && cd ${SCRATCH_DIR} && \
     wget --quiet ${KOKKOS_URL} --output-document=${KOKKOS_ARCHIVE} && \
     mkdir -p kokkos && \