Replace package tf-nightly-gpu by tf-nightly (horovod#3826)

Signed-off-by: Max H. Gerlach <git@maxgerlach.de>
chongxiaoc · Jan 26, 2023 · abe639b · abe639b
1 parent 85619c6
commit abe639b
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/Dockerfile.test.gpu b/Dockerfile.test.gpu
@@ -127,7 +127,7 @@ RUN if [[ ${MPI_KIND} != "None" ]]; then \
 # Install TensorFlow and Keras (releases).
 # Pin scipy!=1.4.0: https://github.com/scipy/scipy/issues/11237
 # Pin protobuf~=3.20 for tensorflow<2.6.5: https://github.com/tensorflow/tensorflow/issues/56077
-RUN if [[ ${TENSORFLOW_PACKAGE} != "tf-nightly-gpu" ]]; then \
+RUN if [[ ${TENSORFLOW_PACKAGE} != "tf-nightly" ]]; then \
         PROTOBUF_PACKAGE=""; \
         if [[ ${TENSORFLOW_PACKAGE} == tensorflow-gpu==1.15.* ]] || \
            [[ ${TENSORFLOW_PACKAGE} == tensorflow-gpu==2.[012345].* ]]; then \
@@ -181,7 +181,7 @@ COPY . /horovod
 
 # Install TensorFlow and Keras (nightly).
 # Pin scipy!=1.4.0: https://github.com/scipy/scipy/issues/11237
-RUN if [[ ${TENSORFLOW_PACKAGE} == "tf-nightly-gpu" ]]; then \
+RUN if [[ ${TENSORFLOW_PACKAGE} == "tf-nightly" ]]; then \
         pip install --no-cache-dir ${TENSORFLOW_PACKAGE}; \
         if [[ ${KERAS_PACKAGE} != "None" ]]; then \
             pip uninstall -y keras-nightly; \

diff --git a/assert-package-versions.sh b/assert-package-versions.sh
@@ -17,8 +17,7 @@ do
   if [ "$pattern" == "None" ]
   then
     continue
-  elif [[ "$pattern" == "tf-nightly" ]] ||
-       [[ "$pattern" == "tf-nightly-gpu" ]]
+  elif [[ "$pattern" == "tf-nightly" ]]
   then
     flag="-P"
     pattern="$pattern==.*\\.dev20\\d{6}"

diff --git a/docker-compose.test.yml b/docker-compose.test.yml
@@ -229,7 +229,7 @@ services:
         CUDNN_VERSION: 8.6.0.163-1+cuda11.8
         NCCL_VERSION_OVERRIDE: 2.11.4-1+cuda11.6
         MPI_KIND: OpenMPI
-        TENSORFLOW_PACKAGE: tf-nightly-gpu
+        TENSORFLOW_PACKAGE: tf-nightly
         KERAS_PACKAGE: None
         PYTORCH_PACKAGE: torch-nightly-cu116
         PYTORCH_LIGHTNING_PACKAGE: pytorch-lightning==1.5.9

diff --git a/docker/horovod-nvtabular/Dockerfile b/docker/horovod-nvtabular/Dockerfile
@@ -118,7 +118,7 @@ RUN if [[ ${MPI_KIND} != "None" ]]; then \
 # Install TensorFlow and Keras (releases).
 # Pin scipy!=1.4.0: https://github.com/scipy/scipy/issues/11237
 # Pin protobuf<4 for tensorflow: https://github.com/tensorflow/tensorflow/issues/56815
-RUN if [[ ${TENSORFLOW_PACKAGE} != "tf-nightly-gpu" ]]; then \
+RUN if [[ ${TENSORFLOW_PACKAGE} != "tf-nightly" ]]; then \
         pip install --no-cache-dir ${TENSORFLOW_PACKAGE} "protobuf<3.20"; \
         if [[ ${KERAS_PACKAGE} != "None" ]]; then \
             pip uninstall -y keras; \
@@ -170,7 +170,7 @@ COPY . /horovod
 
 # Install TensorFlow and Keras (nightly).
 # Pin scipy!=1.4.0: https://github.com/scipy/scipy/issues/11237
-RUN if [[ ${TENSORFLOW_PACKAGE} == "tf-nightly-gpu" ]]; then \
+RUN if [[ ${TENSORFLOW_PACKAGE} == "tf-nightly" ]]; then \
         pip install --no-cache-dir ${TENSORFLOW_PACKAGE}; \
         if [[ ${KERAS_PACKAGE} != "None" ]]; then \
             pip uninstall -y keras-nightly; \