From d7edbeb8dcc81a9cabc922ae46f549fe6b498eb9 Mon Sep 17 00:00:00 2001 From: Francois Chollet Date: Mon, 1 Oct 2018 14:09:23 -0700 Subject: Update keras_applications to 1.0.6 and keras_preprocessing to 1.0.5. This removes the transitive keras and scipy dependencies in TensorFlow. PiperOrigin-RevId: 215277190 --- tensorflow/tools/ci_build/Dockerfile.cmake | 4 ++-- tensorflow/tools/ci_build/install/install_pip_packages.sh | 8 ++++---- .../tools/ci_build/install/install_python3.5_pip_packages.sh | 4 ++-- .../tools/ci_build/install/install_python3.6_pip_packages.sh | 4 ++-- tensorflow/tools/docker/Dockerfile | 4 ++-- tensorflow/tools/docker/Dockerfile.devel | 4 ++-- tensorflow/tools/docker/Dockerfile.devel-gpu | 4 ++-- tensorflow/tools/docker/Dockerfile.devel-mkl | 4 ++-- tensorflow/tools/docker/Dockerfile.devel-mkl-horovod | 4 ++-- tensorflow/tools/docker/Dockerfile.gpu | 4 ++-- tensorflow/tools/docker/Dockerfile.mkl | 4 ++-- tensorflow/tools/docker/Dockerfile.mkl-horovod | 4 ++-- tensorflow/tools/pip_package/setup.py | 4 ++-- 13 files changed, 28 insertions(+), 28 deletions(-) (limited to 'tensorflow/tools') diff --git a/tensorflow/tools/ci_build/Dockerfile.cmake b/tensorflow/tools/ci_build/Dockerfile.cmake index b7450c83de..ef0024fdb4 100644 --- a/tensorflow/tools/ci_build/Dockerfile.cmake +++ b/tensorflow/tools/ci_build/Dockerfile.cmake @@ -28,8 +28,8 @@ RUN pip install --upgrade astor RUN pip install --upgrade gast RUN pip install --upgrade numpy RUN pip install --upgrade termcolor -RUN pip install keras_applications==1.0.5 -RUN pip install keras_preprocessing==1.0.3 +RUN pip install --upgrade keras_applications +RUN pip install --upgrade keras_preprocessing # Install golang RUN apt-get install -t xenial-backports -y golang-1.9 diff --git a/tensorflow/tools/ci_build/install/install_pip_packages.sh b/tensorflow/tools/ci_build/install/install_pip_packages.sh index 4ced96f90b..b90f3f3b97 100755 --- a/tensorflow/tools/ci_build/install/install_pip_packages.sh +++ b/tensorflow/tools/ci_build/install/install_pip_packages.sh @@ -115,10 +115,10 @@ pip2 install --upgrade setuptools==39.1.0 pip3 install --upgrade setuptools==39.1.0 # Keras -pip2 install keras_applications==1.0.5 --no-deps -pip3 install keras_applications==1.0.5 --no-deps -pip2 install keras_preprocessing==1.0.3 --no-deps -pip3 install keras_preprocessing==1.0.3 --no-deps +pip2 install keras_applications==1.0.6 --no-deps +pip3 install keras_applications==1.0.6 --no-deps +pip2 install keras_preprocessing==1.0.5 --no-deps +pip3 install keras_preprocessing==1.0.5 --no-deps pip2 install --upgrade h5py==2.8.0 pip3 install --upgrade h5py==2.8.0 diff --git a/tensorflow/tools/ci_build/install/install_python3.5_pip_packages.sh b/tensorflow/tools/ci_build/install/install_python3.5_pip_packages.sh index 37e6b51f66..61d4fe3fe8 100755 --- a/tensorflow/tools/ci_build/install/install_python3.5_pip_packages.sh +++ b/tensorflow/tools/ci_build/install/install_python3.5_pip_packages.sh @@ -85,8 +85,8 @@ pip3.5 install --upgrade termcolor pip3.5 install --upgrade setuptools==39.1.0 # Keras -pip3.5 install keras_applications==1.0.5 -pip3.5 install keras_preprocessing==1.0.3 +pip3.5 install keras_applications==1.0.6 +pip3.5 install keras_preprocessing==1.0.5 pip3.5 install --upgrade h5py==2.8.0 # Install last working version of setuptools. diff --git a/tensorflow/tools/ci_build/install/install_python3.6_pip_packages.sh b/tensorflow/tools/ci_build/install/install_python3.6_pip_packages.sh index 7520ff74cb..8949af8a88 100755 --- a/tensorflow/tools/ci_build/install/install_python3.6_pip_packages.sh +++ b/tensorflow/tools/ci_build/install/install_python3.6_pip_packages.sh @@ -102,7 +102,7 @@ pip3 install --upgrade setuptools==39.1.0 pip3 install --upgrade h5py==2.8.0 # Keras -pip3 install keras_applications==1.0.5 -pip3 install keras_preprocessing==1.0.3 +pip3 install keras_applications==1.0.6 +pip3 install keras_preprocessing==1.0.5 # LINT.ThenChange(//tensorflow/tools/ci_build/install/install_python3.5_pip_packages.sh) diff --git a/tensorflow/tools/docker/Dockerfile b/tensorflow/tools/docker/Dockerfile index b5a6c05193..205128ad58 100644 --- a/tensorflow/tools/docker/Dockerfile +++ b/tensorflow/tools/docker/Dockerfile @@ -29,8 +29,8 @@ RUN pip --no-cache-dir install \ h5py \ ipykernel \ jupyter \ - keras_applications==1.0.5 \ - keras_preprocessing==1.0.3 \ + keras_applications \ + keras_preprocessing \ matplotlib \ numpy \ pandas \ diff --git a/tensorflow/tools/docker/Dockerfile.devel b/tensorflow/tools/docker/Dockerfile.devel index c741e8ad0c..6f8e91fccf 100644 --- a/tensorflow/tools/docker/Dockerfile.devel +++ b/tensorflow/tools/docker/Dockerfile.devel @@ -33,8 +33,8 @@ RUN pip --no-cache-dir install \ h5py \ ipykernel \ jupyter \ - keras_applications==1.0.5 \ - keras_preprocessing==1.0.3 \ + keras_applications \ + keras_preprocessing \ matplotlib \ mock \ numpy \ diff --git a/tensorflow/tools/docker/Dockerfile.devel-gpu b/tensorflow/tools/docker/Dockerfile.devel-gpu index f544725af4..69a117fda6 100644 --- a/tensorflow/tools/docker/Dockerfile.devel-gpu +++ b/tensorflow/tools/docker/Dockerfile.devel-gpu @@ -55,8 +55,8 @@ RUN pip --no-cache-dir install \ h5py \ ipykernel \ jupyter \ - keras_applications==1.0.5 \ - keras_preprocessing==1.0.3 \ + keras_applications \ + keras_preprocessing \ matplotlib \ mock \ numpy \ diff --git a/tensorflow/tools/docker/Dockerfile.devel-mkl b/tensorflow/tools/docker/Dockerfile.devel-mkl index db7c701289..e433e9ebb2 100755 --- a/tensorflow/tools/docker/Dockerfile.devel-mkl +++ b/tensorflow/tools/docker/Dockerfile.devel-mkl @@ -52,8 +52,8 @@ RUN ${PIP} --no-cache-dir install \ h5py \ ipykernel \ jupyter \ - keras_applications==1.0.5 \ - keras_preprocessing==1.0.3 \ + keras_applications \ + keras_preprocessing \ matplotlib \ mock \ numpy \ diff --git a/tensorflow/tools/docker/Dockerfile.devel-mkl-horovod b/tensorflow/tools/docker/Dockerfile.devel-mkl-horovod index 987b582d10..48f2400569 100755 --- a/tensorflow/tools/docker/Dockerfile.devel-mkl-horovod +++ b/tensorflow/tools/docker/Dockerfile.devel-mkl-horovod @@ -45,8 +45,8 @@ RUN ${PIP} --no-cache-dir install \ h5py \ ipykernel \ jupyter \ - keras_applications==1.0.5 \ - keras_preprocessing==1.0.3 \ + keras_applications \ + keras_preprocessing \ matplotlib \ mock \ numpy \ diff --git a/tensorflow/tools/docker/Dockerfile.gpu b/tensorflow/tools/docker/Dockerfile.gpu index 781bf9e851..7dc92a888b 100644 --- a/tensorflow/tools/docker/Dockerfile.gpu +++ b/tensorflow/tools/docker/Dockerfile.gpu @@ -42,8 +42,8 @@ RUN pip --no-cache-dir install \ h5py \ ipykernel \ jupyter \ - keras_applications==1.0.5 \ - keras_preprocessing==1.0.3 \ + keras_applications \ + keras_preprocessing \ matplotlib \ numpy \ pandas \ diff --git a/tensorflow/tools/docker/Dockerfile.mkl b/tensorflow/tools/docker/Dockerfile.mkl index 641c9e3b16..ac41cffe4b 100755 --- a/tensorflow/tools/docker/Dockerfile.mkl +++ b/tensorflow/tools/docker/Dockerfile.mkl @@ -38,8 +38,8 @@ RUN ${PIP} --no-cache-dir install \ h5py \ ipykernel \ jupyter \ - keras_applications==1.0.5 \ - keras_preprocessing==1.0.3 \ + keras_applications \ + keras_preprocessing \ matplotlib \ numpy \ pandas \ diff --git a/tensorflow/tools/docker/Dockerfile.mkl-horovod b/tensorflow/tools/docker/Dockerfile.mkl-horovod index 2b11679f54..4daf4fefff 100755 --- a/tensorflow/tools/docker/Dockerfile.mkl-horovod +++ b/tensorflow/tools/docker/Dockerfile.mkl-horovod @@ -38,8 +38,8 @@ RUN ${PIP} --no-cache-dir install \ h5py \ ipykernel \ jupyter \ - keras_applications==1.0.5 \ - keras_preprocessing==1.0.3 \ + keras_applications \ + keras_preprocessing \ matplotlib \ numpy \ pandas \ diff --git a/tensorflow/tools/pip_package/setup.py b/tensorflow/tools/pip_package/setup.py index 88c9c20d36..d864a7a039 100644 --- a/tensorflow/tools/pip_package/setup.py +++ b/tensorflow/tools/pip_package/setup.py @@ -51,8 +51,8 @@ REQUIRED_PACKAGES = [ 'absl-py >= 0.1.6', 'astor >= 0.6.0', 'gast >= 0.2.0', - 'keras_applications >= 1.0.5', - 'keras_preprocessing >= 1.0.3', + 'keras_applications >= 1.0.6', + 'keras_preprocessing >= 1.0.5', 'numpy >= 1.13.3', 'six >= 1.10.0', 'protobuf >= 3.6.1', -- cgit v1.2.3