From 31b695e3656f8f771170140f564811d93a69c6b0 Mon Sep 17 00:00:00 2001
From: mloubout <mathias.louboutin@gmail.com>
Date: Tue, 18 Apr 2023 08:46:42 -0400
Subject: [PATCH] docker: switch to predefined nproc

---
 docker/Dockerfile.amd    | 12 +++++-------
 docker/Dockerfile.nvidia |  2 +-
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/docker/Dockerfile.amd b/docker/Dockerfile.amd
index 858cf5fe923..1a82dde9807 100644
--- a/docker/Dockerfile.amd
+++ b/docker/Dockerfile.amd
@@ -1,5 +1,6 @@
 ##############################################################
 # This Dockerfile contains AMD compilers
+# Based on  https://github.com/amd/InfinityHub-CI/tree/main/base-gpu-mpi-rocm-docker
 ##############################################################
 
 ARG ROCM_VERSION=5.4.2
@@ -78,8 +79,8 @@ RUN cd /tmp/ \
         --disable-logging \
         --disable-debug \
         --disable-examples \
-    && make -j $(( $(lscpu | awk '/^Socket\(s\)/{ print $2 }') * $(lscpu | awk '/^Core\(s\) per socket/{ print $4 }') ))  \
-    && make install \
+    && make -j ${nproc} \
+    && make install
 
 # Install OpenMPI
 RUN cd /tmp \
@@ -95,7 +96,7 @@ RUN cd /tmp \
         --enable-mpi \
         --enable-mpi-fortran=yes \
         --disable-debug \
-    && make -j $(( $(lscpu | awk '/^Socket\(s\)/{ print $2 }') * $(lscpu | awk '/^Core\(s\) per socket/{ print $4 }') )) \
+    && make -j ${nproc} \
     && make install
 
 # Cleanup
@@ -117,7 +118,6 @@ ENV OMPI_ALLOW_RUN_AS_ROOT=1  \
     OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1 \
     OMPI_MCA_pml=ucx
 
-
 ##############################################################
 # Additional Devito requirements
 ##############################################################
@@ -127,13 +127,11 @@ RUN apt-get update && \
     apt-get install -y dh-autoreconf python3-venv python3-dev python3-pip
 
 # Build mpi4py against amdclang
-RUN which mpicc && \
-    python3 -m venv /venv && \
+RUN python3 -m venv /venv && \
     /venv/bin/pip install --no-cache-dir --upgrade pip && \
     /venv/bin/pip install --no-cache-dir mpi4py && \
     rm -rf ~/.cache/pip
 
-
 ########################################################################
 # AOMP for GPUs (OpenMP offloading)
 ########################################################################
diff --git a/docker/Dockerfile.nvidia b/docker/Dockerfile.nvidia
index 7cad2bad750..6b3857e277b 100644
--- a/docker/Dockerfile.nvidia
+++ b/docker/Dockerfile.nvidia
@@ -185,7 +185,7 @@ RUN cd /llvm-project/build && \
     -DCLANG_OPENMP_NVPTX_DEFAULT_ARCH=sm_86 \
     -DLIBOMPTARGET_NVPTX_COMPUTE_CAPABILITIES=all \
     -DCMAKE_INSTALL_PREFIX=/llvm && \
-    make -j $(( $(lscpu | awk '/^Socket\(s\)/{ print $2 }') * $(lscpu | awk '/^Core\(s\) per socket/{ print $4 }') )) && \
+    make -j ${nproc} && \
     make install
 
 # Set path