Revert "Remove duplicate CMake installs (#523)"

This reverts commit cf83cb3.
NVIDIA-Merlin · Aug 10, 2022 · b09e3e7 · b09e3e7
1 parent e417fec
commit b09e3e7
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/docker/dockerfile.ctr b/docker/dockerfile.ctr
@@ -61,6 +61,10 @@ RUN pip install --upgrade ipython
 RUN pip install tritonclient[all] grpcio-channelz
 RUN pip install git+https://github.com/rapidsai/asvdb.git@main
 
+# Install cmake
+RUN apt remove --purge cmake -y && wget http://www.cmake.org/files/v3.21/cmake-3.21.1.tar.gz && \
+    tar xf cmake-3.21.1.tar.gz && cd cmake-3.21.1 && ./configure && make && make install
+
 # Install CUDA-Aware hwloc
 ARG HWLOC_VER=2.4.1
 

diff --git a/docker/dockerfile.merlin b/docker/dockerfile.merlin
@@ -59,7 +59,6 @@ RUN apt update -y --fix-missing && \
         libssl-dev \
         libtbb-dev \
         libthrust-dev \
-        ninja-build \
         openssl \
         pkg-config \
         policykit-1 \
@@ -80,7 +79,7 @@ RUN ln -s /usr/bin/python3 /usr/bin/python
 # Required by treelite in pip installs 
 # apt install version too old (3.16.3)
 RUN apt remove --purge cmake -y && wget http://www.cmake.org/files/v3.21/cmake-3.21.1.tar.gz && \
-    tar xf cmake-3.21.1.tar.gz && cd cmake-3.21.1 && ./configure && make -j$(nproc) && make install
+    tar xf cmake-3.21.1.tar.gz && cd cmake-3.21.1 && ./configure && make && make install
 
 # Install multiple packages
 RUN pip install pandas==1.3.5
@@ -113,7 +112,7 @@ ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/tritonserver/lib
 # Install spdlog
 RUN git clone --branch v1.9.2 https://github.com/gabime/spdlog.git build-env && \
     pushd build-env && \
-    mkdir build && cd build && cmake .. && make -j$(nproc) && make install && \
+    mkdir build && cd build && cmake .. && make -j && make install && \
     popd && \
     rm -rf build-env
 
@@ -199,7 +198,7 @@ RUN git clone https://github.com/NVIDIA-Merlin/nvtabular_triton_backend.git buil
             -D TRITON_COMMON_REPO_TAG="r$TRITON_VERSION"    \
             -D TRITON_CORE_REPO_TAG="r$TRITON_VERSION"      \
             -D TRITON_BACKEND_REPO_TAG="r$TRITON_VERSION" .. \
-      && make -j$(nproc) && \
+      && make -j && \
       mkdir -p /opt/tritonserver/backends/nvtabular && \
       cp libtriton_nvtabular.so /opt/tritonserver/backends/nvtabular/ && \
     popd && \
@@ -248,7 +247,6 @@ RUN apt update -y --fix-missing && \
         libsasl2-2 \
         libssl-dev \
         libtbb-dev \
-        ninja-build \
         openssl \
         policykit-1 \
         protobuf-compiler \
@@ -265,9 +263,6 @@ RUN apt update -y --fix-missing && \
 
 RUN ln -s /usr/bin/python3 /usr/bin/python
 
-# CMake
-COPY --chown=1000:1000 --from=build /usr/local/bin/cmake /usr/local/bin/cmake
-
 # Includes
 COPY --chown=1000:1000 --from=build /usr/include /usr/include/
 COPY --chown=1000:1000 --from=build /usr/local/include /usr/local/include/

diff --git a/docker/dockerfile.tf b/docker/dockerfile.tf
@@ -37,6 +37,10 @@ RUN apt update -y --fix-missing && \
     apt clean && \
     rm -rf /var/lib/apt/lists/*
 
+# Install cmake
+RUN wget http://www.cmake.org/files/v3.21/cmake-3.21.1.tar.gz && \
+    tar xf cmake-3.21.1.tar.gz && cd cmake-3.21.1 && ./configure && make && make install
+
 
 # Install HugeCTR
 ENV LD_LIBRARY_PATH=/usr/local/hugectr/lib:$LD_LIBRARY_PATH \