misc: Refactor Dockerfile.amd

Author: FabioLuporini

docker/Dockerfile.amd

@@ -11,8 +11,17 @@ ARG ROCM_VERSION
 ENV rocm=/opt/rocm-${ROCM_VERSION}
 ENV AOMP=/opt/rocm-${ROCM_VERSION}/llvm
 
+# Bring in cmake3.19 apt repo
+RUN wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | apt-key add - && \
+    apt-add-repository 'deb https://apt.kitware.com/ubuntu/ bionic main' && \
+
 # Some utils needed
-RUN apt-get update && apt-get install -y wget git autoconf dh-autoreconf flex python3-venv python3-dev vim libnuma1 tmux
+# * lmod required to source Omniperf via `module use`
+# * software-properties-common required to compile cmake3.19, which in turn is required to compile Omniperf
+RUN apt-get update && \
+    apt-get install -y wget git autoconf dh-autoreconf \
+        flex python3-venv python3-dev vim lmod \
+        software-properties-common cmake libnuma1 tmux
 
 # Install tmpi
 RUN curl https://raw.githubusercontent.com/Azrael3000/tmpi/master/tmpi -o /usr/local/bin/tmpi
@@ -51,20 +60,15 @@ RUN ./omnitrace-1.7.3-ubuntu-20.04-ROCm-50100-PAPI-OMPT-Python3.sh --prefix=/opt
     rm omnitrace-1.7.3-ubuntu-20.04-ROCm-50100-PAPI-OMPT-Python3.sh
 
 # Install Omniperf, an AMDResearch profiling tool akin to Nvidia's Nsight-compute
-RUN apt-get update && apt-get install -y software-properties-common && \   # cmake3.19 required by Omniperf...
-    wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | sudo apt-key add - && \
-    apt-add-repository 'deb https://apt.kitware.com/ubuntu/ bionic main' && \
-    apt-get update && \
-    apt install -y -q cmake
-RUN apt-get update && apt-get install lmod  # to eventually bring it in PATH via the entrypoint
 ENV OMNIPERF_DIR=/app/omniperf
 RUN wget https://github.com/AMDResearch/omniperf/releases/download/v1.0.4/omniperf-1.0.4.tar.gz -q
 RUN tar xfz omniperf-1.0.4.tar.gz && \
     cd omniperf-1.0.4/ && \
     /venv/bin/pip install --no-cache-dir -r requirements.txt && \
     mkdir build && cd build/ && \
     cmake -DCMAKE_INSTALL_PREFIX=${OMNIPERF_DIR}/1.0.4 -DPYTHON_DEPS=${OMNIPERF_DIR}/python-libs -DMOD_INSTALL_PATH=${OMNIPERF_DIR}/modulefiles .. && \
-    make install
+    make install && \
+    rm -rf omniperf-1.0.4.tar.gz omniperf-1.0.4/
 
 # Devito env
 ENV DEVITO_ARCH="aomp"

docker/entrypoint.sh

@@ -17,7 +17,7 @@ fi
 
 if [[ -n "${ROCM_VERSION}" ]]; then
     echo "configuring Omnitrace..."
-    source /opt/omnitrace/share/omnitrace/setup-env.sh
+    module use /opt/omnitrace/share/modulefiles
     echo "configuring Omniperf..."
     module use /opt/omniperf/modulefiles
     module load omniperf