Fix more missed {PIP} expansions with the dockerfiles

Resolves #38247

PiperOrigin-RevId: 305114966
Change-Id: I83d00699783f9827ab526533fdeaaa3012086e66
This commit is contained in:
Austin Anderson 2020-04-06 14:16:25 -07:00 committed by TensorFlower Gardener
parent 2fb65633e9
commit 452c18fc5d
25 changed files with 32 additions and 32 deletions

View File

@ -48,7 +48,7 @@ RUN ln -s $(which python3) /usr/local/bin/python
# Installs the latest version by default.
ARG TF_PACKAGE=tensorflow
ARG TF_PACKAGE_VERSION=
RUN ${PIP} install --no-cache-dir ${TF_PACKAGE}${TF_PACKAGE_VERSION:+==${TF_PACKAGE_VERSION}}
RUN python3 -m pip install --no-cache-dir ${TF_PACKAGE}${TF_PACKAGE_VERSION:+==${TF_PACKAGE_VERSION}}
COPY bashrc /etc/bash.bashrc
RUN chmod a+rwx /etc/bash.bashrc

View File

@ -48,7 +48,7 @@ RUN ln -s $(which python3) /usr/local/bin/python
# Installs the latest version by default.
ARG TF_PACKAGE=tensorflow
ARG TF_PACKAGE_VERSION=
RUN ${PIP} install --no-cache-dir ${TF_PACKAGE}${TF_PACKAGE_VERSION:+==${TF_PACKAGE_VERSION}}
RUN python3 -m pip install --no-cache-dir ${TF_PACKAGE}${TF_PACKAGE_VERSION:+==${TF_PACKAGE_VERSION}}
COPY bashrc /etc/bash.bashrc
RUN chmod a+rwx /etc/bash.bashrc

View File

@ -78,7 +78,7 @@ RUN apt-get update && apt-get install -y \
virtualenv \
swig
RUN ${PIP} --no-cache-dir install \
RUN python3 -m pip --no-cache-dir install \
Pillow \
h5py \
keras_preprocessing \

View File

@ -78,7 +78,7 @@ RUN apt-get update && apt-get install -y \
virtualenv \
swig
RUN ${PIP} --no-cache-dir install \
RUN python3 -m pip --no-cache-dir install \
Pillow \
h5py \
keras_preprocessing \

View File

@ -120,7 +120,7 @@ RUN apt-get update && apt-get install -y \
virtualenv \
swig
RUN ${PIP} --no-cache-dir install \
RUN python3 -m pip --no-cache-dir install \
Pillow \
h5py \
keras_preprocessing \

View File

@ -120,7 +120,7 @@ RUN apt-get update && apt-get install -y \
virtualenv \
swig
RUN ${PIP} --no-cache-dir install \
RUN python3 -m pip --no-cache-dir install \
Pillow \
h5py \
keras_preprocessing \

View File

@ -97,7 +97,7 @@ RUN ln -s $(which python3) /usr/local/bin/python
# Installs the latest version by default.
ARG TF_PACKAGE=tensorflow
ARG TF_PACKAGE_VERSION=
RUN ${PIP} install --no-cache-dir ${TF_PACKAGE}${TF_PACKAGE_VERSION:+==${TF_PACKAGE_VERSION}}
RUN python3 -m pip install --no-cache-dir ${TF_PACKAGE}${TF_PACKAGE_VERSION:+==${TF_PACKAGE_VERSION}}
COPY bashrc /etc/bash.bashrc
RUN chmod a+rwx /etc/bash.bashrc

View File

@ -97,7 +97,7 @@ RUN ln -s $(which python3) /usr/local/bin/python
# Installs the latest version by default.
ARG TF_PACKAGE=tensorflow
ARG TF_PACKAGE_VERSION=
RUN ${PIP} install --no-cache-dir ${TF_PACKAGE}${TF_PACKAGE_VERSION:+==${TF_PACKAGE_VERSION}}
RUN python3 -m pip install --no-cache-dir ${TF_PACKAGE}${TF_PACKAGE_VERSION:+==${TF_PACKAGE_VERSION}}
COPY bashrc /etc/bash.bashrc
RUN chmod a+rwx /etc/bash.bashrc

View File

@ -78,7 +78,7 @@ RUN apt-get update && apt-get install -y \
virtualenv \
swig
RUN ${PIP} --no-cache-dir install \
RUN python3 -m pip --no-cache-dir install \
Pillow \
h5py \
keras_preprocessing \

View File

@ -78,7 +78,7 @@ RUN apt-get update && apt-get install -y \
virtualenv \
swig
RUN ${PIP} --no-cache-dir install \
RUN python3 -m pip --no-cache-dir install \
Pillow \
h5py \
keras_preprocessing \

View File

@ -48,7 +48,7 @@ RUN ln -s $(which python3) /usr/local/bin/python
# Installs the latest version by default.
ARG TF_PACKAGE=tensorflow
ARG TF_PACKAGE_VERSION=
RUN ${PIP} install --no-cache-dir ${TF_PACKAGE}${TF_PACKAGE_VERSION:+==${TF_PACKAGE_VERSION}}
RUN python3 -m pip install --no-cache-dir ${TF_PACKAGE}${TF_PACKAGE_VERSION:+==${TF_PACKAGE_VERSION}}
# install libnuma, openssh, wget
RUN ( apt-get update && apt-get install -y --no-install-recommends --fix-missing \
@ -100,7 +100,7 @@ RUN cat /etc/ssh/ssh_config | grep -v StrictHostKeyChecking > /etc/ssh/ssh_confi
# Install Horovod
ARG HOROVOD_VERSION=0.16.4
RUN ${PIP} install --no-cache-dir horovod==${HOROVOD_VERSION}
RUN python3 -m pip install --no-cache-dir horovod==${HOROVOD_VERSION}
COPY bashrc /etc/bash.bashrc
RUN chmod a+rwx /etc/bash.bashrc

View File

@ -48,7 +48,7 @@ RUN ln -s $(which python3) /usr/local/bin/python
# Installs the latest version by default.
ARG TF_PACKAGE=tensorflow
ARG TF_PACKAGE_VERSION=
RUN ${PIP} install --no-cache-dir ${TF_PACKAGE}${TF_PACKAGE_VERSION:+==${TF_PACKAGE_VERSION}}
RUN python3 -m pip install --no-cache-dir ${TF_PACKAGE}${TF_PACKAGE_VERSION:+==${TF_PACKAGE_VERSION}}
# install libnuma, openssh, wget
RUN ( apt-get update && apt-get install -y --no-install-recommends --fix-missing \
@ -100,7 +100,7 @@ RUN cat /etc/ssh/ssh_config | grep -v StrictHostKeyChecking > /etc/ssh/ssh_confi
# Install Horovod
ARG HOROVOD_VERSION=0.16.4
RUN ${PIP} install --no-cache-dir horovod==${HOROVOD_VERSION}
RUN python3 -m pip install --no-cache-dir horovod==${HOROVOD_VERSION}
COPY bashrc /etc/bash.bashrc
RUN chmod a+rwx /etc/bash.bashrc

View File

@ -46,7 +46,7 @@ RUN ln -s $(which python3) /usr/local/bin/python
# tf-nightly-gpu
ARG TF_PACKAGE=tensorflow
RUN apt-get update && apt-get install -y curl libhdf5-dev wget
RUN ${PIP} install --global-option=build_ext \
RUN python3 -m pip install --global-option=build_ext \
--global-option=-I/usr/include/hdf5/serial/ \
--global-option=-L/usr/lib/powerpc64le-linux-gnu/hdf5/serial \
h5py
@ -66,7 +66,7 @@ RUN if [ ${TF_PACKAGE} = tensorflow-gpu ]; then \
MINOR=`python3 -c 'import sys; print(sys.version_info[1])'`; \
PACKAGE=$(wget -qO- ${BASE}"api/xml?xpath=//fileName&wrapper=artifacts" | grep -o "[^<>]*cp${MAJOR}${MINOR}[^<>]*.whl"); \
wget ${BASE}"artifact/tensorflow_pkg/"${PACKAGE}; \
${PIP} install ${PACKAGE}
python3 -m pip install ${PACKAGE}
COPY bashrc /etc/bash.bashrc
RUN chmod a+rwx /etc/bash.bashrc

View File

@ -46,7 +46,7 @@ RUN ln -s $(which python3) /usr/local/bin/python
# tf-nightly-gpu
ARG TF_PACKAGE=tensorflow
RUN apt-get update && apt-get install -y curl libhdf5-dev wget
RUN ${PIP} install --global-option=build_ext \
RUN python3 -m pip install --global-option=build_ext \
--global-option=-I/usr/include/hdf5/serial/ \
--global-option=-L/usr/lib/powerpc64le-linux-gnu/hdf5/serial \
h5py
@ -66,7 +66,7 @@ RUN if [ ${TF_PACKAGE} = tensorflow-gpu ]; then \
MINOR=`python3 -c 'import sys; print(sys.version_info[1])'`; \
PACKAGE=$(wget -qO- ${BASE}"api/xml?xpath=//fileName&wrapper=artifacts" | grep -o "[^<>]*cp${MAJOR}${MINOR}[^<>]*.whl"); \
wget ${BASE}"artifact/tensorflow_pkg/"${PACKAGE}; \
${PIP} install ${PACKAGE}
python3 -m pip install ${PACKAGE}
COPY bashrc /etc/bash.bashrc
RUN chmod a+rwx /etc/bash.bashrc

View File

@ -77,7 +77,7 @@ RUN apt-get update && apt-get install -y \
virtualenv \
swig
RUN ${PIP} --no-cache-dir install \
RUN python3 -m pip --no-cache-dir install \
Pillow \
h5py \
keras_preprocessing \

View File

@ -77,7 +77,7 @@ RUN apt-get update && apt-get install -y \
virtualenv \
swig
RUN ${PIP} --no-cache-dir install \
RUN python3 -m pip --no-cache-dir install \
Pillow \
h5py \
keras_preprocessing \

View File

@ -119,7 +119,7 @@ RUN apt-get update && apt-get install -y \
virtualenv \
swig
RUN ${PIP} --no-cache-dir install \
RUN python3 -m pip --no-cache-dir install \
Pillow \
h5py \
keras_preprocessing \

View File

@ -119,7 +119,7 @@ RUN apt-get update && apt-get install -y \
virtualenv \
swig
RUN ${PIP} --no-cache-dir install \
RUN python3 -m pip --no-cache-dir install \
Pillow \
h5py \
keras_preprocessing \

View File

@ -95,7 +95,7 @@ RUN ln -s $(which python3) /usr/local/bin/python
# tf-nightly-gpu
ARG TF_PACKAGE=tensorflow
RUN apt-get update && apt-get install -y curl libhdf5-dev wget
RUN ${PIP} install --global-option=build_ext \
RUN python3 -m pip install --global-option=build_ext \
--global-option=-I/usr/include/hdf5/serial/ \
--global-option=-L/usr/lib/powerpc64le-linux-gnu/hdf5/serial \
h5py
@ -115,7 +115,7 @@ RUN if [ ${TF_PACKAGE} = tensorflow-gpu ]; then \
MINOR=`python3 -c 'import sys; print(sys.version_info[1])'`; \
PACKAGE=$(wget -qO- ${BASE}"api/xml?xpath=//fileName&wrapper=artifacts" | grep -o "[^<>]*cp${MAJOR}${MINOR}[^<>]*.whl"); \
wget ${BASE}"artifact/tensorflow_pkg/"${PACKAGE}; \
${PIP} install ${PACKAGE}
python3 -m pip install ${PACKAGE}
COPY bashrc /etc/bash.bashrc
RUN chmod a+rwx /etc/bash.bashrc

View File

@ -95,7 +95,7 @@ RUN ln -s $(which python3) /usr/local/bin/python
# tf-nightly-gpu
ARG TF_PACKAGE=tensorflow
RUN apt-get update && apt-get install -y curl libhdf5-dev wget
RUN ${PIP} install --global-option=build_ext \
RUN python3 -m pip install --global-option=build_ext \
--global-option=-I/usr/include/hdf5/serial/ \
--global-option=-L/usr/lib/powerpc64le-linux-gnu/hdf5/serial \
h5py
@ -115,7 +115,7 @@ RUN if [ ${TF_PACKAGE} = tensorflow-gpu ]; then \
MINOR=`python3 -c 'import sys; print(sys.version_info[1])'`; \
PACKAGE=$(wget -qO- ${BASE}"api/xml?xpath=//fileName&wrapper=artifacts" | grep -o "[^<>]*cp${MAJOR}${MINOR}[^<>]*.whl"); \
wget ${BASE}"artifact/tensorflow_pkg/"${PACKAGE}; \
${PIP} install ${PACKAGE}
python3 -m pip install ${PACKAGE}
COPY bashrc /etc/bash.bashrc
RUN chmod a+rwx /etc/bash.bashrc

View File

@ -1,3 +1,3 @@
# Install Horovod
ARG HOROVOD_VERSION=0.16.4
RUN ${PIP} install --no-cache-dir horovod==${HOROVOD_VERSION}
RUN python3 -m pip install --no-cache-dir horovod==${HOROVOD_VERSION}

View File

@ -5,7 +5,7 @@
# tf-nightly-gpu
ARG TF_PACKAGE=tensorflow
RUN apt-get update && apt-get install -y curl libhdf5-dev wget
RUN ${PIP} install --global-option=build_ext \
RUN python3 -m pip install --global-option=build_ext \
--global-option=-I/usr/include/hdf5/serial/ \
--global-option=-L/usr/lib/powerpc64le-linux-gnu/hdf5/serial \
h5py
@ -25,4 +25,4 @@ RUN if [ ${TF_PACKAGE} = tensorflow-gpu ]; then \
MINOR=`python3 -c 'import sys; print(sys.version_info[1])'`; \
PACKAGE=$(wget -qO- ${BASE}"api/xml?xpath=//fileName&wrapper=artifacts" | grep -o "[^<>]*cp${MAJOR}${MINOR}[^<>]*.whl"); \
wget ${BASE}"artifact/tensorflow_pkg/"${PACKAGE}; \
${PIP} install ${PACKAGE}
python3 -m pip install ${PACKAGE}

View File

@ -7,4 +7,4 @@
# Installs the latest version by default.
ARG TF_PACKAGE=tensorflow
ARG TF_PACKAGE_VERSION=
RUN ${PIP} install --no-cache-dir ${TF_PACKAGE}${TF_PACKAGE_VERSION:+==${TF_PACKAGE_VERSION}}
RUN python3 -m pip install --no-cache-dir ${TF_PACKAGE}${TF_PACKAGE_VERSION:+==${TF_PACKAGE_VERSION}}

View File

@ -8,7 +8,7 @@ RUN apt-get update && apt-get install -y \
virtualenv \
swig
RUN ${PIP} --no-cache-dir install \
RUN python3 -m pip --no-cache-dir install \
Pillow \
h5py \
keras_preprocessing \

View File

@ -7,7 +7,7 @@ RUN apt-get update && apt-get install -y \
virtualenv \
swig
RUN ${PIP} --no-cache-dir install \
RUN python3 -m pip --no-cache-dir install \
Pillow \
h5py \
keras_preprocessing \