From 07cbf09f2273239579b1ac8b7635dbcfc4bf929b Mon Sep 17 00:00:00 2001 From: Alexandre Lissy Date: Fri, 25 Sep 2020 14:11:06 +0200 Subject: [PATCH 1/2] Fix #3088: Use TensorFlow 1.15.4 with CUDNN fix --- Dockerfile.train.tmpl | 3 +++ doc/TRAINING.rst | 2 +- setup.py | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Dockerfile.train.tmpl b/Dockerfile.train.tmpl index 6fd93fe9..05c09d4f 100644 --- a/Dockerfile.train.tmpl +++ b/Dockerfile.train.tmpl @@ -43,6 +43,9 @@ RUN pip3 install --upgrade native_client/ctcdecode/dist/*.whl # Prepare deps RUN pip3 install --upgrade pip==20.2.2 wheel==0.34.2 setuptools==49.6.0 +# FIXME: Hack because no 1.15.4 Docker image +RUN pip3 install --upgrade tensorflow-gpu==1.15.4 + # Install DeepSpeech # - No need for the decoder since we did it earlier # - There is already correct TensorFlow GPU installed on the base image, diff --git a/doc/TRAINING.rst b/doc/TRAINING.rst index 4ee9ca61..e8413243 100644 --- a/doc/TRAINING.rst +++ b/doc/TRAINING.rst @@ -65,7 +65,7 @@ If you have a capable (NVIDIA, at least 8GB of VRAM) GPU, it is highly recommend .. code-block:: bash pip3 uninstall tensorflow - pip3 install 'tensorflow-gpu==1.15.2' + pip3 install 'tensorflow-gpu==1.15.4' Please ensure you have the required :ref:`CUDA dependency `. diff --git a/setup.py b/setup.py index 91a9af5b..16c17eb7 100644 --- a/setup.py +++ b/setup.py @@ -74,7 +74,7 @@ def main(): ] tensorflow_pypi_dep = [ - 'tensorflow == 1.15.2' + 'tensorflow == 1.15.4' ] # Due to pip craziness environment variables are the only consistent way to From 62c1075681d8ffd60b6fb1febd43c0b3b3d4f013 Mon Sep 17 00:00:00 2001 From: Alexandre Lissy Date: Tue, 15 Sep 2020 13:40:12 +0200 Subject: [PATCH 2/2] Fix #3321: Update NCCL dep to 2.7 following NVIDIA update --- Dockerfile.build.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.build.tmpl b/Dockerfile.build.tmpl index 1e4e2c57..b6bf3938 100644 --- a/Dockerfile.build.tmpl +++ b/Dockerfile.build.tmpl @@ -64,7 +64,7 @@ ENV TF_CUDA_PATHS "/usr,/usr/local/cuda-10.1,/usr/lib/x86_64-linux-gnu/" ENV TF_CUDA_VERSION 10.1 ENV TF_CUDNN_VERSION 7.6 ENV TF_CUDA_COMPUTE_CAPABILITIES 6.0 -ENV TF_NCCL_VERSION 2.4 +ENV TF_NCCL_VERSION 2.7 # Common Environment Setup ENV TF_BUILD_CONTAINER_TYPE GPU