Tf 2 public (#261)

sboshin · chuyang-deng · commit 5f5c0cdc9ccb · 2019-12-18T19:12:54.000-08:00
* Moving to public S3

* fixing cpu py3

* Add License files

* Removing tmp files after install
diff --git a/docker/2.0.0/py2/Dockerfile.cpu b/docker/2.0.0/py2/Dockerfile.cpu
@@ -22,6 +22,7 @@ ENV LC_ALL=C.UTF-8
 
 ARG FRAMEWORK_SUPPORT_INSTALLABLE=sagemaker_tensorflow_container-2.0.8.dev0.tar.gz
 ARG TENSORFLOW_WHL=tensorflow-2.0.0-cp27-cp27mu-manylinux2010_x86_64.whl
+ARG TF_URL=https://tensorflow-aws.s3-us-west-2.amazonaws.com/2.0/AmazonLinux/cpu/final/$TENSORFLOW_WHL
 
 ARG PYTHON=python
 ARG PYTHON_PIP=python-pip
@@ -81,7 +82,6 @@ RUN apt-get update && apt-get install -y \
     ${PYTHON_PIP}
 
 COPY $FRAMEWORK_SUPPORT_INSTALLABLE .
-COPY $TENSORFLOW_WHL .
 
 RUN ${PIP} --no-cache-dir install --upgrade \
     pip \
@@ -90,6 +90,9 @@ RUN ${PIP} --no-cache-dir install --upgrade \
 # Some TF tools expect a "python" binary
 RUN ln -s $(which ${PYTHON}) /usr/local/bin/python
 
+# Setup TF Wheel
+RUN wget $TF_URL -O /tmp/$TENSORFLOW_WHL
+
 # install PyYAML==5.1.2 to avoid conflict with latest awscli
 # # python-dateutil==2.8.0 to satisfy botocore associated with latest awscli
 RUN ${PIP} install --no-cache-dir -U \
@@ -113,7 +116,8 @@ RUN ${PIP} install --no-cache-dir -U \
     # the library version to be overwritten
     # ${PIP} install --no-cache-dir -U ${TF_URL} \
  && ${PIP} install --no-cache-dir -U \
-    $TENSORFLOW_WHL \
+    /tmp/$TENSORFLOW_WHL \
+ && rm -f /tmp/$TENSORFLOW_WHL \
  && ${PIP} install --no-cache-dir -U \
     $FRAMEWORK_SUPPORT_INSTALLABLE \
  && rm -f $FRAMEWORK_SUPPORT_INSTALLABLE \
@@ -126,5 +130,7 @@ COPY deep_learning_container.py /usr/local/bin/deep_learning_container.py
 RUN chmod +x /usr/local/bin/dockerd-entrypoint.py \
  && chmod +x /usr/local/bin/deep_learning_container.py
 
+RUN curl https://aws-dlc-licenses.s3.amazonaws.com/tensorflow-2.0/license.txt -o /license.txt
+
 ENTRYPOINT ["python", "/usr/local/bin/dockerd-entrypoint.py"]
 CMD ["bin/bash"]
diff --git a/docker/2.0.0/py2/Dockerfile.gpu b/docker/2.0.0/py2/Dockerfile.gpu
@@ -15,6 +15,7 @@ ENV LC_ALL=C.UTF-8
 
 ARG FRAMEWORK_SUPPORT_INSTALLABLE=sagemaker_tensorflow_container-2.0.8.dev0.tar.gz
 ARG TENSORFLOW_WHL=tensorflow_gpu-2.0.0-cp27-cp27mu-manylinux2010_x86_64.whl
+ARG TF_URL=https://tensorflow-aws.s3-us-west-2.amazonaws.com/2.0/AmazonLinux/gpu/final/$TENSORFLOW_WHL
 
 ARG PYTHON=python
 ARG PYTHON_PIP=python-pip
@@ -116,7 +117,9 @@ RUN ${PIP} --no-cache-dir install --upgrade \
 RUN ln -s $(which ${PYTHON}) /usr/local/bin/python
 
 COPY $FRAMEWORK_SUPPORT_INSTALLABLE .
-COPY $TENSORFLOW_WHL .
+
+# Setup TF Wheel
+RUN wget $TF_URL -O /tmp/$TENSORFLOW_WHL
 
 # install PyYAML==5.1.2 to avoid conflict with latest awscli
 # # python-dateutil==2.8.0 to satisfy botocore associated with latest awscli
@@ -141,7 +144,8 @@ RUN ${PIP} install --no-cache-dir -U \
     # the library version to be overwritten
     # ${PIP} install --no-cache-dir -U ${TF_URL} \
  && ${PIP} install --no-cache-dir -U \
-    $TENSORFLOW_WHL \
+    /tmp/$TENSORFLOW_WHL \
+ && rm -f /tmp/$TENSORFLOW_WHL \
  && ${PIP} install --no-cache-dir -U \
     $FRAMEWORK_SUPPORT_INSTALLABLE \
  && rm -f $FRAMEWORK_SUPPORT_INSTALLABLE 
@@ -162,5 +166,7 @@ COPY deep_learning_container.py /usr/local/bin/deep_learning_container.py
 RUN chmod +x /usr/local/bin/dockerd-entrypoint.py \
  && chmod +x /usr/local/bin/deep_learning_container.py
 
+RUN curl https://aws-dlc-licenses.s3.amazonaws.com/tensorflow-2.0/license.txt -o /license.txt
+
 ENTRYPOINT ["python", "/usr/local/bin/dockerd-entrypoint.py"]
 CMD ["bin/bash"]
diff --git a/docker/2.0.0/py3/Dockerfile.cpu b/docker/2.0.0/py3/Dockerfile.cpu
@@ -29,6 +29,7 @@ ARG PIP=pip3
 
 ARG FRAMEWORK_SUPPORT_INSTALLABLE=sagemaker_tensorflow_container-2.0.8.dev0.tar.gz
 ARG TENSORFLOW_WHL=tensorflow-2.0.0-cp36-cp36m-manylinux2010_x86_64.whl
+ARG TF_URL=https://tensorflow-aws.s3-us-west-2.amazonaws.com/2.0/AmazonLinux/cpu/final/$TENSORFLOW_WHL
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
     python3-dev \
@@ -83,7 +84,6 @@ RUN mkdir -p /root/.ssh/ \
 WORKDIR /
 
 COPY $FRAMEWORK_SUPPORT_INSTALLABLE .
-COPY $TENSORFLOW_WHL .
 
 RUN ${PIP} --no-cache-dir install --upgrade \
     pip \
@@ -93,6 +93,9 @@ RUN ${PIP} --no-cache-dir install --upgrade \
 RUN ln -s $(which ${PYTHON}) /usr/local/bin/python \
  && ln -s $(which ${PIP}) /usr/bin/pip
 
+# Setup TF Wheel
+RUN wget $TF_URL -O /tmp/$TENSORFLOW_WHL
+
 # install PyYAML==5.1.2 to avoid conflict with latest awscli
 # # python-dateutil==2.8.0 to satisfy botocore associated with latest awscli
 RUN ${PIP} install --no-cache-dir -U \
@@ -115,8 +118,9 @@ RUN ${PIP} install --no-cache-dir -U \
     # the library version to be overwritten
     # ${PIP} install --no-cache-dir -U ${TF_URL} \
  && ${PIP} install --no-cache-dir -U \
-    $TENSORFLOW_WHL \
+    /tmp/$TENSORFLOW_WHL \
     horovod==0.18.2 \
+ && rm -f /tmp/$TENSORFLOW_WHL \
  && ${PIP} install --no-cache-dir -U \
     $FRAMEWORK_SUPPORT_INSTALLABLE \
  && rm -f $FRAMEWORK_SUPPORT_INSTALLABLE 
@@ -127,5 +131,7 @@ COPY deep_learning_container.py /usr/local/bin/deep_learning_container.py
 RUN chmod +x /usr/local/bin/dockerd-entrypoint.py \
  && chmod +x /usr/local/bin/deep_learning_container.py
 
+RUN curl https://aws-dlc-licenses.s3.amazonaws.com/tensorflow-2.0/license.txt -o /license.txt
+
 ENTRYPOINT ["python", "/usr/local/bin/dockerd-entrypoint.py"]
 CMD ["bin/bash"]
diff --git a/docker/2.0.0/py3/Dockerfile.gpu b/docker/2.0.0/py3/Dockerfile.gpu
@@ -29,6 +29,7 @@ ARG PIP=pip3
 
 ARG FRAMEWORK_SUPPORT_INSTALLABLE=sagemaker_tensorflow_container-2.0.8.dev0.tar.gz
 ARG TENSORFLOW_WHL=tensorflow_gpu-2.0.0-cp36-cp36m-manylinux2010_x86_64.whl
+ARG TF_URL=https://tensorflow-aws.s3-us-west-2.amazonaws.com/2.0/AmazonLinux/gpu/final/$TENSORFLOW_WHL
 
 RUN apt-get update && apt-get install -y --no-install-recommends --allow-unauthenticated \
     python3-dev \
@@ -130,7 +131,9 @@ RUN ln -s $(which ${PYTHON}) /usr/local/bin/python \
  && ln -s $(which ${PIP}) /usr/bin/pip
 
 COPY $FRAMEWORK_SUPPORT_INSTALLABLE .
-COPY $TENSORFLOW_WHL .
+
+# Setup TF Wheel
+RUN wget $TF_URL -O /tmp/$TENSORFLOW_WHL
 
 # install PyYAML==5.1.2 to avoid conflict with latest awscli
 # # python-dateutil==2.8.0 to satisfy botocore associated with latest awscli
@@ -154,7 +157,8 @@ RUN ${PIP} install --no-cache-dir -U \
     # the library version to be overwritten
     # ${PIP} install --no-cache-dir -U ${TF_URL} \
  && ${PIP} install --no-cache-dir -U \
-    $TENSORFLOW_WHL \
+    /tmp/$TENSORFLOW_WHL \
+ && rm -f /tmp/$TENSORFLOW_WHL \
  && ${PIP} install --no-cache-dir -U \
     $FRAMEWORK_SUPPORT_INSTALLABLE \
  && rm -f $FRAMEWORK_SUPPORT_INSTALLABLE 
@@ -175,5 +179,7 @@ COPY deep_learning_container.py /usr/local/bin/deep_learning_container.py
 RUN chmod +x /usr/local/bin/dockerd-entrypoint.py \
  && chmod +x /usr/local/bin/deep_learning_container.py
 
+RUN curl https://aws-dlc-licenses.s3.amazonaws.com/tensorflow-2.0/license.txt -o /license.txt
+
 ENTRYPOINT ["python", "/usr/local/bin/dockerd-entrypoint.py"]
 CMD ["bin/bash"]
