From 04bd81d7e69c658ec18d47eb91ca39bed69bb4d1 Mon Sep 17 00:00:00 2001 From: Austin Anderson Date: Wed, 24 Jun 2020 12:50:47 -0700 Subject: [PATCH 1/2] Pin numpy below 1.19.0 in Dockerfiles See #40688. PiperOrigin-RevId: 318122157 Change-Id: Ief46c5610f3aaf0cdd7d43ce1a10d6d87e8e8e01 --- .../dockerfiles/dockerfiles/devel-cpu-jupyter.Dockerfile | 2 +- tensorflow/tools/dockerfiles/dockerfiles/devel-cpu.Dockerfile | 2 +- .../dockerfiles/dockerfiles/devel-gpu-jupyter.Dockerfile | 2 +- tensorflow/tools/dockerfiles/dockerfiles/devel-gpu.Dockerfile | 2 +- .../dockerfiles/mkl_horovod/devel-horovod-jupyter.Dockerfile | 4 ++-- .../dockerfiles/mkl_horovod/devel-horovod.Dockerfile | 4 ++-- .../dockerfiles/ppc64le/devel-cpu-ppc64le-jupyter.Dockerfile | 4 ++-- .../dockerfiles/ppc64le/devel-cpu-ppc64le.Dockerfile | 4 ++-- .../dockerfiles/ppc64le/devel-gpu-ppc64le-jupyter.Dockerfile | 4 ++-- .../dockerfiles/ppc64le/devel-gpu-ppc64le.Dockerfile | 4 ++-- .../dockerfiles/partials/ubuntu/bazel.partial.Dockerfile | 2 +- .../dockerfiles/partials/ubuntu/bazelbuild.partial.Dockerfile | 2 +- 12 files changed, 18 insertions(+), 18 deletions(-) diff --git a/tensorflow/tools/dockerfiles/dockerfiles/devel-cpu-jupyter.Dockerfile b/tensorflow/tools/dockerfiles/dockerfiles/devel-cpu-jupyter.Dockerfile index a215449ef7f..3ea196bb354 100644 --- a/tensorflow/tools/dockerfiles/dockerfiles/devel-cpu-jupyter.Dockerfile +++ b/tensorflow/tools/dockerfiles/dockerfiles/devel-cpu-jupyter.Dockerfile @@ -84,7 +84,7 @@ RUN python3 -m pip --no-cache-dir install \ keras_preprocessing \ matplotlib \ mock \ - numpy \ + numpy<1.19.0 \ scipy \ sklearn \ pandas \ diff --git a/tensorflow/tools/dockerfiles/dockerfiles/devel-cpu.Dockerfile b/tensorflow/tools/dockerfiles/dockerfiles/devel-cpu.Dockerfile index f7d414bc902..d3a487d754c 100644 --- a/tensorflow/tools/dockerfiles/dockerfiles/devel-cpu.Dockerfile +++ b/tensorflow/tools/dockerfiles/dockerfiles/devel-cpu.Dockerfile @@ -84,7 +84,7 @@ RUN python3 -m pip --no-cache-dir install \ keras_preprocessing \ matplotlib \ mock \ - numpy \ + numpy<1.19.0 \ scipy \ sklearn \ pandas \ diff --git a/tensorflow/tools/dockerfiles/dockerfiles/devel-gpu-jupyter.Dockerfile b/tensorflow/tools/dockerfiles/dockerfiles/devel-gpu-jupyter.Dockerfile index e7e717c584c..f6e6b2e4869 100644 --- a/tensorflow/tools/dockerfiles/dockerfiles/devel-gpu-jupyter.Dockerfile +++ b/tensorflow/tools/dockerfiles/dockerfiles/devel-gpu-jupyter.Dockerfile @@ -126,7 +126,7 @@ RUN python3 -m pip --no-cache-dir install \ keras_preprocessing \ matplotlib \ mock \ - numpy \ + numpy<1.19.0 \ scipy \ sklearn \ pandas \ diff --git a/tensorflow/tools/dockerfiles/dockerfiles/devel-gpu.Dockerfile b/tensorflow/tools/dockerfiles/dockerfiles/devel-gpu.Dockerfile index b18af60892f..9301ca36712 100644 --- a/tensorflow/tools/dockerfiles/dockerfiles/devel-gpu.Dockerfile +++ b/tensorflow/tools/dockerfiles/dockerfiles/devel-gpu.Dockerfile @@ -126,7 +126,7 @@ RUN python3 -m pip --no-cache-dir install \ keras_preprocessing \ matplotlib \ mock \ - numpy \ + numpy<1.19.0 \ scipy \ sklearn \ pandas \ diff --git a/tensorflow/tools/dockerfiles/dockerfiles/mkl_horovod/devel-horovod-jupyter.Dockerfile b/tensorflow/tools/dockerfiles/dockerfiles/mkl_horovod/devel-horovod-jupyter.Dockerfile index db669389df4..a41f979aecd 100644 --- a/tensorflow/tools/dockerfiles/dockerfiles/mkl_horovod/devel-horovod-jupyter.Dockerfile +++ b/tensorflow/tools/dockerfiles/dockerfiles/mkl_horovod/devel-horovod-jupyter.Dockerfile @@ -84,7 +84,7 @@ RUN python3 -m pip --no-cache-dir install \ keras_preprocessing \ matplotlib \ mock \ - numpy \ + numpy<1.19.0 \ scipy \ sklearn \ pandas \ @@ -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" && \ diff --git a/tensorflow/tools/dockerfiles/dockerfiles/mkl_horovod/devel-horovod.Dockerfile b/tensorflow/tools/dockerfiles/dockerfiles/mkl_horovod/devel-horovod.Dockerfile index 5d90624f64f..8da0f799662 100644 --- a/tensorflow/tools/dockerfiles/dockerfiles/mkl_horovod/devel-horovod.Dockerfile +++ b/tensorflow/tools/dockerfiles/dockerfiles/mkl_horovod/devel-horovod.Dockerfile @@ -84,7 +84,7 @@ RUN python3 -m pip --no-cache-dir install \ keras_preprocessing \ matplotlib \ mock \ - numpy \ + numpy<1.19.0 \ scipy \ sklearn \ pandas \ @@ -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" && \ diff --git a/tensorflow/tools/dockerfiles/dockerfiles/ppc64le/devel-cpu-ppc64le-jupyter.Dockerfile b/tensorflow/tools/dockerfiles/dockerfiles/ppc64le/devel-cpu-ppc64le-jupyter.Dockerfile index 53ccffd1403..9542bf3d17a 100644 --- a/tensorflow/tools/dockerfiles/dockerfiles/ppc64le/devel-cpu-ppc64le-jupyter.Dockerfile +++ b/tensorflow/tools/dockerfiles/dockerfiles/ppc64le/devel-cpu-ppc64le-jupyter.Dockerfile @@ -83,7 +83,7 @@ RUN python3 -m pip --no-cache-dir install \ keras_preprocessing \ matplotlib \ mock \ - numpy \ + numpy<1.19.0 \ scipy \ sklearn \ pandas \ @@ -91,7 +91,7 @@ RUN python3 -m pip --no-cache-dir install \ enum34 # Build and install bazel -ENV BAZEL_VERSION 3.0.0 +ENV BAZEL_VERSION 3.1.0 WORKDIR / RUN mkdir /bazel && \ cd /bazel && \ diff --git a/tensorflow/tools/dockerfiles/dockerfiles/ppc64le/devel-cpu-ppc64le.Dockerfile b/tensorflow/tools/dockerfiles/dockerfiles/ppc64le/devel-cpu-ppc64le.Dockerfile index 1bbe7129479..60b0e07c62a 100644 --- a/tensorflow/tools/dockerfiles/dockerfiles/ppc64le/devel-cpu-ppc64le.Dockerfile +++ b/tensorflow/tools/dockerfiles/dockerfiles/ppc64le/devel-cpu-ppc64le.Dockerfile @@ -83,7 +83,7 @@ RUN python3 -m pip --no-cache-dir install \ keras_preprocessing \ matplotlib \ mock \ - numpy \ + numpy<1.19.0 \ scipy \ sklearn \ pandas \ @@ -91,7 +91,7 @@ RUN python3 -m pip --no-cache-dir install \ enum34 # Build and install bazel -ENV BAZEL_VERSION 3.0.0 +ENV BAZEL_VERSION 3.1.0 WORKDIR / RUN mkdir /bazel && \ cd /bazel && \ diff --git a/tensorflow/tools/dockerfiles/dockerfiles/ppc64le/devel-gpu-ppc64le-jupyter.Dockerfile b/tensorflow/tools/dockerfiles/dockerfiles/ppc64le/devel-gpu-ppc64le-jupyter.Dockerfile index 0700a354d3c..00116417490 100644 --- a/tensorflow/tools/dockerfiles/dockerfiles/ppc64le/devel-gpu-ppc64le-jupyter.Dockerfile +++ b/tensorflow/tools/dockerfiles/dockerfiles/ppc64le/devel-gpu-ppc64le-jupyter.Dockerfile @@ -125,7 +125,7 @@ RUN python3 -m pip --no-cache-dir install \ keras_preprocessing \ matplotlib \ mock \ - numpy \ + numpy<1.19.0 \ scipy \ sklearn \ pandas \ @@ -133,7 +133,7 @@ RUN python3 -m pip --no-cache-dir install \ enum34 # Build and install bazel -ENV BAZEL_VERSION 3.0.0 +ENV BAZEL_VERSION 3.1.0 WORKDIR / RUN mkdir /bazel && \ cd /bazel && \ diff --git a/tensorflow/tools/dockerfiles/dockerfiles/ppc64le/devel-gpu-ppc64le.Dockerfile b/tensorflow/tools/dockerfiles/dockerfiles/ppc64le/devel-gpu-ppc64le.Dockerfile index b6d8ff8b90e..6c01d3499c9 100644 --- a/tensorflow/tools/dockerfiles/dockerfiles/ppc64le/devel-gpu-ppc64le.Dockerfile +++ b/tensorflow/tools/dockerfiles/dockerfiles/ppc64le/devel-gpu-ppc64le.Dockerfile @@ -125,7 +125,7 @@ RUN python3 -m pip --no-cache-dir install \ keras_preprocessing \ matplotlib \ mock \ - numpy \ + numpy<1.19.0 \ scipy \ sklearn \ pandas \ @@ -133,7 +133,7 @@ RUN python3 -m pip --no-cache-dir install \ enum34 # Build and install bazel -ENV BAZEL_VERSION 3.0.0 +ENV BAZEL_VERSION 3.1.0 WORKDIR / RUN mkdir /bazel && \ cd /bazel && \ diff --git a/tensorflow/tools/dockerfiles/partials/ubuntu/bazel.partial.Dockerfile b/tensorflow/tools/dockerfiles/partials/ubuntu/bazel.partial.Dockerfile index 54fdb2be648..7babbdaae97 100644 --- a/tensorflow/tools/dockerfiles/partials/ubuntu/bazel.partial.Dockerfile +++ b/tensorflow/tools/dockerfiles/partials/ubuntu/bazel.partial.Dockerfile @@ -14,7 +14,7 @@ RUN python3 -m pip --no-cache-dir install \ keras_preprocessing \ matplotlib \ mock \ - numpy \ + numpy<1.19.0 \ scipy \ sklearn \ pandas \ diff --git a/tensorflow/tools/dockerfiles/partials/ubuntu/bazelbuild.partial.Dockerfile b/tensorflow/tools/dockerfiles/partials/ubuntu/bazelbuild.partial.Dockerfile index c0327619ad9..f3f9d689506 100644 --- a/tensorflow/tools/dockerfiles/partials/ubuntu/bazelbuild.partial.Dockerfile +++ b/tensorflow/tools/dockerfiles/partials/ubuntu/bazelbuild.partial.Dockerfile @@ -13,7 +13,7 @@ RUN python3 -m pip --no-cache-dir install \ keras_preprocessing \ matplotlib \ mock \ - numpy \ + numpy<1.19.0 \ scipy \ sklearn \ pandas \ From 5af8da4a17bfec2bab5e186e9424858b8ed936b5 Mon Sep 17 00:00:00 2001 From: Austin Anderson Date: Thu, 25 Jun 2020 13:07:09 -0700 Subject: [PATCH 2/2] Fix docker for numpy again I forgot about the trouble using '<' in pip dependencies on the CLI. This time I verified the build works. PiperOrigin-RevId: 318332763 Change-Id: I347aee8121464232222e72d89409c600159ee80c --- .../tools/dockerfiles/dockerfiles/devel-cpu-jupyter.Dockerfile | 2 +- tensorflow/tools/dockerfiles/dockerfiles/devel-cpu.Dockerfile | 2 +- .../tools/dockerfiles/dockerfiles/devel-gpu-jupyter.Dockerfile | 2 +- tensorflow/tools/dockerfiles/dockerfiles/devel-gpu.Dockerfile | 2 +- .../dockerfiles/mkl_horovod/devel-horovod-jupyter.Dockerfile | 2 +- .../dockerfiles/mkl_horovod/devel-horovod.Dockerfile | 2 +- .../dockerfiles/ppc64le/devel-cpu-ppc64le-jupyter.Dockerfile | 2 +- .../dockerfiles/ppc64le/devel-cpu-ppc64le.Dockerfile | 2 +- .../dockerfiles/ppc64le/devel-gpu-ppc64le-jupyter.Dockerfile | 2 +- .../dockerfiles/ppc64le/devel-gpu-ppc64le.Dockerfile | 2 +- .../tools/dockerfiles/partials/ubuntu/bazel.partial.Dockerfile | 2 +- .../dockerfiles/partials/ubuntu/bazelbuild.partial.Dockerfile | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/tensorflow/tools/dockerfiles/dockerfiles/devel-cpu-jupyter.Dockerfile b/tensorflow/tools/dockerfiles/dockerfiles/devel-cpu-jupyter.Dockerfile index 3ea196bb354..78ec4416f47 100644 --- a/tensorflow/tools/dockerfiles/dockerfiles/devel-cpu-jupyter.Dockerfile +++ b/tensorflow/tools/dockerfiles/dockerfiles/devel-cpu-jupyter.Dockerfile @@ -84,7 +84,7 @@ RUN python3 -m pip --no-cache-dir install \ keras_preprocessing \ matplotlib \ mock \ - numpy<1.19.0 \ + 'numpy<1.19.0' \ scipy \ sklearn \ pandas \ diff --git a/tensorflow/tools/dockerfiles/dockerfiles/devel-cpu.Dockerfile b/tensorflow/tools/dockerfiles/dockerfiles/devel-cpu.Dockerfile index d3a487d754c..018b7bb35ba 100644 --- a/tensorflow/tools/dockerfiles/dockerfiles/devel-cpu.Dockerfile +++ b/tensorflow/tools/dockerfiles/dockerfiles/devel-cpu.Dockerfile @@ -84,7 +84,7 @@ RUN python3 -m pip --no-cache-dir install \ keras_preprocessing \ matplotlib \ mock \ - numpy<1.19.0 \ + 'numpy<1.19.0' \ scipy \ sklearn \ pandas \ diff --git a/tensorflow/tools/dockerfiles/dockerfiles/devel-gpu-jupyter.Dockerfile b/tensorflow/tools/dockerfiles/dockerfiles/devel-gpu-jupyter.Dockerfile index f6e6b2e4869..b99c384fe20 100644 --- a/tensorflow/tools/dockerfiles/dockerfiles/devel-gpu-jupyter.Dockerfile +++ b/tensorflow/tools/dockerfiles/dockerfiles/devel-gpu-jupyter.Dockerfile @@ -126,7 +126,7 @@ RUN python3 -m pip --no-cache-dir install \ keras_preprocessing \ matplotlib \ mock \ - numpy<1.19.0 \ + 'numpy<1.19.0' \ scipy \ sklearn \ pandas \ diff --git a/tensorflow/tools/dockerfiles/dockerfiles/devel-gpu.Dockerfile b/tensorflow/tools/dockerfiles/dockerfiles/devel-gpu.Dockerfile index 9301ca36712..4493964cffc 100644 --- a/tensorflow/tools/dockerfiles/dockerfiles/devel-gpu.Dockerfile +++ b/tensorflow/tools/dockerfiles/dockerfiles/devel-gpu.Dockerfile @@ -126,7 +126,7 @@ RUN python3 -m pip --no-cache-dir install \ keras_preprocessing \ matplotlib \ mock \ - numpy<1.19.0 \ + 'numpy<1.19.0' \ scipy \ sklearn \ pandas \ diff --git a/tensorflow/tools/dockerfiles/dockerfiles/mkl_horovod/devel-horovod-jupyter.Dockerfile b/tensorflow/tools/dockerfiles/dockerfiles/mkl_horovod/devel-horovod-jupyter.Dockerfile index a41f979aecd..5ed856259a9 100644 --- a/tensorflow/tools/dockerfiles/dockerfiles/mkl_horovod/devel-horovod-jupyter.Dockerfile +++ b/tensorflow/tools/dockerfiles/dockerfiles/mkl_horovod/devel-horovod-jupyter.Dockerfile @@ -84,7 +84,7 @@ RUN python3 -m pip --no-cache-dir install \ keras_preprocessing \ matplotlib \ mock \ - numpy<1.19.0 \ + 'numpy<1.19.0' \ scipy \ sklearn \ pandas \ diff --git a/tensorflow/tools/dockerfiles/dockerfiles/mkl_horovod/devel-horovod.Dockerfile b/tensorflow/tools/dockerfiles/dockerfiles/mkl_horovod/devel-horovod.Dockerfile index 8da0f799662..a4a0bee0bc6 100644 --- a/tensorflow/tools/dockerfiles/dockerfiles/mkl_horovod/devel-horovod.Dockerfile +++ b/tensorflow/tools/dockerfiles/dockerfiles/mkl_horovod/devel-horovod.Dockerfile @@ -84,7 +84,7 @@ RUN python3 -m pip --no-cache-dir install \ keras_preprocessing \ matplotlib \ mock \ - numpy<1.19.0 \ + 'numpy<1.19.0' \ scipy \ sklearn \ pandas \ diff --git a/tensorflow/tools/dockerfiles/dockerfiles/ppc64le/devel-cpu-ppc64le-jupyter.Dockerfile b/tensorflow/tools/dockerfiles/dockerfiles/ppc64le/devel-cpu-ppc64le-jupyter.Dockerfile index 9542bf3d17a..14ae948c31a 100644 --- a/tensorflow/tools/dockerfiles/dockerfiles/ppc64le/devel-cpu-ppc64le-jupyter.Dockerfile +++ b/tensorflow/tools/dockerfiles/dockerfiles/ppc64le/devel-cpu-ppc64le-jupyter.Dockerfile @@ -83,7 +83,7 @@ RUN python3 -m pip --no-cache-dir install \ keras_preprocessing \ matplotlib \ mock \ - numpy<1.19.0 \ + 'numpy<1.19.0' \ scipy \ sklearn \ pandas \ diff --git a/tensorflow/tools/dockerfiles/dockerfiles/ppc64le/devel-cpu-ppc64le.Dockerfile b/tensorflow/tools/dockerfiles/dockerfiles/ppc64le/devel-cpu-ppc64le.Dockerfile index 60b0e07c62a..c098b863eaa 100644 --- a/tensorflow/tools/dockerfiles/dockerfiles/ppc64le/devel-cpu-ppc64le.Dockerfile +++ b/tensorflow/tools/dockerfiles/dockerfiles/ppc64le/devel-cpu-ppc64le.Dockerfile @@ -83,7 +83,7 @@ RUN python3 -m pip --no-cache-dir install \ keras_preprocessing \ matplotlib \ mock \ - numpy<1.19.0 \ + 'numpy<1.19.0' \ scipy \ sklearn \ pandas \ diff --git a/tensorflow/tools/dockerfiles/dockerfiles/ppc64le/devel-gpu-ppc64le-jupyter.Dockerfile b/tensorflow/tools/dockerfiles/dockerfiles/ppc64le/devel-gpu-ppc64le-jupyter.Dockerfile index 00116417490..1967c20419c 100644 --- a/tensorflow/tools/dockerfiles/dockerfiles/ppc64le/devel-gpu-ppc64le-jupyter.Dockerfile +++ b/tensorflow/tools/dockerfiles/dockerfiles/ppc64le/devel-gpu-ppc64le-jupyter.Dockerfile @@ -125,7 +125,7 @@ RUN python3 -m pip --no-cache-dir install \ keras_preprocessing \ matplotlib \ mock \ - numpy<1.19.0 \ + 'numpy<1.19.0' \ scipy \ sklearn \ pandas \ diff --git a/tensorflow/tools/dockerfiles/dockerfiles/ppc64le/devel-gpu-ppc64le.Dockerfile b/tensorflow/tools/dockerfiles/dockerfiles/ppc64le/devel-gpu-ppc64le.Dockerfile index 6c01d3499c9..ffd74c52efa 100644 --- a/tensorflow/tools/dockerfiles/dockerfiles/ppc64le/devel-gpu-ppc64le.Dockerfile +++ b/tensorflow/tools/dockerfiles/dockerfiles/ppc64le/devel-gpu-ppc64le.Dockerfile @@ -125,7 +125,7 @@ RUN python3 -m pip --no-cache-dir install \ keras_preprocessing \ matplotlib \ mock \ - numpy<1.19.0 \ + 'numpy<1.19.0' \ scipy \ sklearn \ pandas \ diff --git a/tensorflow/tools/dockerfiles/partials/ubuntu/bazel.partial.Dockerfile b/tensorflow/tools/dockerfiles/partials/ubuntu/bazel.partial.Dockerfile index 7babbdaae97..9dbfb2e71ac 100644 --- a/tensorflow/tools/dockerfiles/partials/ubuntu/bazel.partial.Dockerfile +++ b/tensorflow/tools/dockerfiles/partials/ubuntu/bazel.partial.Dockerfile @@ -14,7 +14,7 @@ RUN python3 -m pip --no-cache-dir install \ keras_preprocessing \ matplotlib \ mock \ - numpy<1.19.0 \ + 'numpy<1.19.0' \ scipy \ sklearn \ pandas \ diff --git a/tensorflow/tools/dockerfiles/partials/ubuntu/bazelbuild.partial.Dockerfile b/tensorflow/tools/dockerfiles/partials/ubuntu/bazelbuild.partial.Dockerfile index f3f9d689506..015427b707b 100644 --- a/tensorflow/tools/dockerfiles/partials/ubuntu/bazelbuild.partial.Dockerfile +++ b/tensorflow/tools/dockerfiles/partials/ubuntu/bazelbuild.partial.Dockerfile @@ -13,7 +13,7 @@ RUN python3 -m pip --no-cache-dir install \ keras_preprocessing \ matplotlib \ mock \ - numpy<1.19.0 \ + 'numpy<1.19.0' \ scipy \ sklearn \ pandas \