Skip to content

Commit

Permalink
Update pip and setuptools in Dockerfiles (#199)
Browse files Browse the repository at this point in the history
  • Loading branch information
apivovarov authored Jun 17, 2020
1 parent 9c05dce commit acd1b8a
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 7 deletions.
2 changes: 1 addition & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ def CloudInstallAndTest(cloudTarget) {
sh """
ls -lh python/dist/*.whl
echo "Updating pip3..."
sudo -H pip3 install -U pip setuptools
sudo -H pip3 install -U pip setuptools wheel
pip3 --version
echo "Installing DLR Python package..."
pip3 install --prefer-binary python/dist/*.whl
Expand Down
4 changes: 3 additions & 1 deletion container/Dockerfile.cpu
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,16 @@ ENV DEBIAN_FRONTEND noninteractive
RUN apt-get update && \
apt-get install -y --no-install-recommends \
python3 \
python3-setuptools \
python3-distutils \
wget \
curl \
ca-certificates \
&& rm -rf /var/lib/apt/lists/* \
&& curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py && python3 get-pip.py && rm get-pip.py \
&& rm -rf /root/.cache/pip

RUN pip3 install -U pip setuptools wheel

### Stage 1: Build
FROM base AS builder
WORKDIR /workspace
Expand Down
4 changes: 3 additions & 1 deletion container/Dockerfile.gpu
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,16 @@ ENV LD_LIBRARY_PATH=/packages/TensorRT-7.0.0.11/lib:$LD_LIBRARY_PATH
RUN apt-get update && \
apt-get install -y --no-install-recommends \
python3 \
python3-setuptools \
python3-distutils \
wget \
curl \
ca-certificates \
&& rm -rf /var/lib/apt/lists/* \
&& curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py && python3 get-pip.py && rm get-pip.py \
&& rm -rf /root/.cache/pip

RUN pip3 install -U pip setuptools wheel

### Stage 1: Build
FROM base AS builder
WORKDIR /workspace
Expand Down
3 changes: 2 additions & 1 deletion container/ec2_compilation_container/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,12 @@ RUN apt update
RUN apt install -y build-essential
RUN apt install -y llvm-6.0 clang-6.0
RUN apt install -y cmake git wget curl vim zip
RUN apt install -y python3 python3-dev
RUN apt install -y python3 python3-dev python3-distutils
RUN apt install -y libedit-dev libxml2-dev antlr4

RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py && python3 get-pip.py && rm get-pip.py

RUN pip3 install -U pip setuptools wheel
RUN pip3 install numpy decorator attrs antlr4-python3-runtime

RUN wget https://developer.download.nvidia.com/compute/cuda/repos/ubuntu1604/x86_64/cuda-repo-ubuntu1604_10.0.130-1_amd64.deb
Expand Down
3 changes: 2 additions & 1 deletion doc/install.rst
Original file line number Diff line number Diff line change
Expand Up @@ -86,10 +86,11 @@ Ensure that all necessary software packages are installed: GCC (or Clang), CMake
.. code-block:: bash
sudo apt-get update
sudo apt-get install -y python3 python3-setuptools build-essential cmake curl ca-certificates
sudo apt-get install -y python3 python3-distutils build-essential cmake curl ca-certificates
curl https://bootstrap.pypa.io/get-pip.py -o /tmp/get-pip.py
sudo python3 /tmp/get-pip.py
rm /tmp/get-pip.py
sudo pip3 install -U pip setuptools wheel
Building for CPU
Expand Down
3 changes: 2 additions & 1 deletion examples/android/tvm_compiler/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,12 @@ RUN apt update
RUN apt install -y build-essential
RUN apt install -y llvm-9 clang-9
RUN apt install -y cmake git wget curl vim zip
RUN apt install -y python3 python3-dev
RUN apt install -y python3 python3-dev python3-distutils
RUN apt install -y libedit-dev libxml2-dev antlr4

RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py && python3 get-pip.py && rm get-pip.py

RUN pip3 install -U pip setuptools wheel
RUN pip3 install numpy decorator attrs antlr4-python3-runtime

WORKDIR /root
Expand Down
4 changes: 3 additions & 1 deletion tests/ci_build/Dockerfile.gpu_bare
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,16 @@ ENV LD_LIBRARY_PATH=/packages/TensorRT-7.0.0.11/lib:$LD_LIBRARY_PATH
RUN apt-get update && \
apt-get install -y --no-install-recommends \
python3 \
python3-setuptools \
python3-distutils \
wget \
curl \
ca-certificates \
&& rm -rf /var/lib/apt/lists/* \
&& curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py && python3 get-pip.py && rm get-pip.py \
&& rm -rf /root/.cache/pip

RUN pip3 install -U pip setuptools wheel

RUN apt-get update && \
apt-get install -y --no-install-recommends \
build-essential \
Expand Down

0 comments on commit acd1b8a

Please sign in to comment.