Use CMake from apt in containers based on Ubuntu 20.04

Signed-off-by: Max H. Gerlach <git@maxgerlach.de>

.github/workflows/codeql-analysis.yml

@@ -100,9 +100,6 @@ jobs:
         sed -i -e "s%^# setup ssh service$%${command//$'\n'/\\n}\n\n# setup ssh service%" Dockerfile.test.?pu
 
         command=$(cat <<EOF
-        # Install recent CMake
-        RUN pip install --no-cache-dir -U cmake~=3.13.0
-
         # Setup CodeQL tracing
         RUN mkdir -p /home/runner/work/horovod
         RUN ln -s /horovod /home/runner/work/horovod/horovod

docker-compose.test.yml

@@ -59,6 +59,7 @@ services:
       args:
         # Tensorflow 1.15.5 is only available for Python 3.7
         # Python 3.7 is only available on Ubuntu 18.04
+        # On Ubuntu 18.04 our setup.py will pull in a recent CMake and use that only to build Horovod
         UBUNTU_VERSION: 18.04
         PYTHON_VERSION: 3.7
         # there is no tensorflow-cpu>1.15.0, so we use tensorflow==1.15.5

docker/horovod-cpu/Dockerfile

@@ -17,6 +17,7 @@ SHELL ["/bin/bash", "-euo", "pipefail", "-c"]
 
 RUN apt-get update && apt-get install -y --allow-downgrades --allow-change-held-packages --no-install-recommends \
         build-essential \
+        cmake \
         g++-7 \
         git \
         curl \
@@ -55,9 +56,6 @@ RUN curl -O https://bootstrap.pypa.io/get-pip.py && \
     python get-pip.py && \
     rm get-pip.py
 
-# Install recent CMake.
-RUN pip install --no-cache-dir -U cmake~=3.13.0
-
 # Install PyTorch, TensorFlow, Keras and MXNet
 RUN pip install --no-cache-dir torch==${PYTORCH_VERSION} torchvision==${TORCHVISION_VERSION}
 RUN pip install --no-cache-dir pytorch_lightning==${PYTORCH_LIGHTNING_VERSION}

docker/horovod-ray/Dockerfile

@@ -15,16 +15,14 @@ SHELL ["/bin/bash", "-euo", "pipefail", "-c"]
 
 RUN sudo apt-get update && DEBIAN_FRONTEND="noninteractive" sudo apt-get install -y \
         build-essential \
+        cmake \
         wget \
         git \
         curl \
         rsync \
         vim \
     && sudo apt-get clean && sudo rm -rf /var/lib/apt/lists/*
 
-# Install recent CMake.
-RUN pip install --no-cache-dir -U cmake~=3.13.0
-
 # Install PyTorch
 RUN pip install --no-cache-dir \
     torch==${PYTORCH_VERSION} \

docker/horovod/Dockerfile

@@ -23,6 +23,7 @@ SHELL ["/bin/bash", "-euo", "pipefail", "-c"]
 
 RUN apt-get update && apt-get install -y --allow-downgrades --allow-change-held-packages --no-install-recommends \
         build-essential \
+        cmake \
         g++-7 \
         git \
         curl \
@@ -67,9 +68,6 @@ RUN curl -O https://bootstrap.pypa.io/get-pip.py && \
     rm get-pip.py && \
     pip install --no-cache-dir -U --force pip~=21.0.0
 
-# Install recent CMake.
-RUN pip install --no-cache-dir -U cmake~=3.13.0
-
 # Install PyTorch, TensorFlow, Keras and MXNet
 RUN pip install --no-cache-dir \
     torch==${PYTORCH_VERSION} \