Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[CherryPick:r2.3] Fix docker for numpy #40813

Merged
merged 2 commits into from
Jun 26, 2020
Merged

[CherryPick:r2.3] Fix docker for numpy #40813

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
04bd81d
Pin numpy below 1.19.0 in Dockerfiles
angerson Jun 24, 2020
5af8da4
Fix docker for numpy again
angerson Jun 25, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion tensorflow/tools/dockerfiles/dockerfiles/devel-cpu-jupyter.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ RUN python3 -m pip --no-cache-dir install \
keras_preprocessing \
matplotlib \
mock \
numpy \
'numpy<1.19.0' \
scipy \
sklearn \
pandas \
Expand Down
2 changes: 1 addition & 1 deletion tensorflow/tools/dockerfiles/dockerfiles/devel-cpu.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ RUN python3 -m pip --no-cache-dir install \
keras_preprocessing \
matplotlib \
mock \
numpy \
'numpy<1.19.0' \
scipy \
sklearn \
pandas \
Expand Down
2 changes: 1 addition & 1 deletion tensorflow/tools/dockerfiles/dockerfiles/devel-gpu-jupyter.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ RUN python3 -m pip --no-cache-dir install \
keras_preprocessing \
matplotlib \
mock \
numpy \
'numpy<1.19.0' \
scipy \
sklearn \
pandas \
Expand Down
2 changes: 1 addition & 1 deletion tensorflow/tools/dockerfiles/dockerfiles/devel-gpu.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ RUN python3 -m pip --no-cache-dir install \
keras_preprocessing \
matplotlib \
mock \
numpy \
'numpy<1.19.0' \
scipy \
sklearn \
pandas \
Expand Down
4 changes: 2 additions & 2 deletions tensorflow/tools/dockerfiles/dockerfiles/mkl_horovod/devel-horovod-jupyter.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ RUN python3 -m pip --no-cache-dir install \
keras_preprocessing \
matplotlib \
mock \
numpy \
'numpy<1.19.0' \
scipy \
sklearn \
pandas \
Expand All @@ -93,7 +93,7 @@ RUN python3 -m pip --no-cache-dir install \
enum34

# Install bazel
ARG BAZEL_VERSION=3.0.0
ARG BAZEL_VERSION=3.1.0
RUN mkdir /bazel && \
wget -O /bazel/installer.sh "https://github.com/bazelbuild/bazel/releases/download/${BAZEL_VERSION}/bazel-${BAZEL_VERSION}-installer-linux-x86_64.sh" && \
wget -O /bazel/LICENSE.txt "https://raw.githubusercontent.com/bazelbuild/bazel/master/LICENSE" && \
Expand Down
4 changes: 2 additions & 2 deletions tensorflow/tools/dockerfiles/dockerfiles/mkl_horovod/devel-horovod.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ RUN python3 -m pip --no-cache-dir install \
keras_preprocessing \
matplotlib \
mock \
numpy \
'numpy<1.19.0' \
scipy \
sklearn \
pandas \
Expand All @@ -93,7 +93,7 @@ RUN python3 -m pip --no-cache-dir install \
enum34

# Install bazel
ARG BAZEL_VERSION=3.0.0
ARG BAZEL_VERSION=3.1.0
RUN mkdir /bazel && \
wget -O /bazel/installer.sh "https://github.com/bazelbuild/bazel/releases/download/${BAZEL_VERSION}/bazel-${BAZEL_VERSION}-installer-linux-x86_64.sh" && \
wget -O /bazel/LICENSE.txt "https://raw.githubusercontent.com/bazelbuild/bazel/master/LICENSE" && \
Expand Down
4 changes: 2 additions & 2 deletions tensorflow/tools/dockerfiles/dockerfiles/ppc64le/devel-cpu-ppc64le-jupyter.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,15 +83,15 @@ RUN python3 -m pip --no-cache-dir install \
keras_preprocessing \
matplotlib \
mock \
numpy \
'numpy<1.19.0' \
scipy \
sklearn \
pandas \
portpicker \
enum34

# Build and install bazel
ENV BAZEL_VERSION 3.0.0
ENV BAZEL_VERSION 3.1.0
WORKDIR /
RUN mkdir /bazel && \
cd /bazel && \
Expand Down
4 changes: 2 additions & 2 deletions tensorflow/tools/dockerfiles/dockerfiles/ppc64le/devel-cpu-ppc64le.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,15 +83,15 @@ RUN python3 -m pip --no-cache-dir install \
keras_preprocessing \
matplotlib \
mock \
numpy \
'numpy<1.19.0' \
scipy \
sklearn \
pandas \
portpicker \
enum34

# Build and install bazel
ENV BAZEL_VERSION 3.0.0
ENV BAZEL_VERSION 3.1.0
WORKDIR /
RUN mkdir /bazel && \
cd /bazel && \
Expand Down
4 changes: 2 additions & 2 deletions tensorflow/tools/dockerfiles/dockerfiles/ppc64le/devel-gpu-ppc64le-jupyter.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,15 +125,15 @@ RUN python3 -m pip --no-cache-dir install \
keras_preprocessing \
matplotlib \
mock \
numpy \
'numpy<1.19.0' \
scipy \
sklearn \
pandas \
portpicker \
enum34

# Build and install bazel
ENV BAZEL_VERSION 3.0.0
ENV BAZEL_VERSION 3.1.0
WORKDIR /
RUN mkdir /bazel && \
cd /bazel && \
Expand Down
4 changes: 2 additions & 2 deletions tensorflow/tools/dockerfiles/dockerfiles/ppc64le/devel-gpu-ppc64le.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,15 +125,15 @@ RUN python3 -m pip --no-cache-dir install \
keras_preprocessing \
matplotlib \
mock \
numpy \
'numpy<1.19.0' \
scipy \
sklearn \
pandas \
portpicker \
enum34

# Build and install bazel
ENV BAZEL_VERSION 3.0.0
ENV BAZEL_VERSION 3.1.0
WORKDIR /
RUN mkdir /bazel && \
cd /bazel && \
Expand Down
2 changes: 1 addition & 1 deletion tensorflow/tools/dockerfiles/partials/ubuntu/bazel.partial.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ RUN python3 -m pip --no-cache-dir install \
keras_preprocessing \
matplotlib \
mock \
numpy \
'numpy<1.19.0' \
scipy \
sklearn \
pandas \
Expand Down
2 changes: 1 addition & 1 deletion tensorflow/tools/dockerfiles/partials/ubuntu/bazelbuild.partial.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ RUN python3 -m pip --no-cache-dir install \
keras_preprocessing \
matplotlib \
mock \
numpy \
'numpy<1.19.0' \
scipy \
sklearn \
pandas \
Expand Down