Fix problem with TensorFlow and cupy tests (#1568)

- when tensorflow-gpu v1.15.0 is installed in the conda environment some strange dependency leads to `ModuleNotFoundError: No module named 'prompt_toolkit.formatted_text'` error - according to jupyter/notebook#4050 installing `ipykernel<5.0.0 ipython<7.0.0` helps - fixes cupy version to 6.6.0 as this the last one supporting python 2.7 Signed-off-by: Janusz Lisiecki <[email protected]>
NVIDIA · Dec 12, 2019 · e61c304 · e61c304
1 parent ff59a82
commit e61c304
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/qa/TL0_python_self_test_frameworks/test_cupy.sh b/qa/TL0_python_self_test_frameworks/test_cupy.sh
@@ -4,10 +4,7 @@ pip_packages="nose numpy cupy"
 target_dir=./dali/test/python
 
 test_body() {
-    if [[ ${PYTHON_VERSION} != 2.7 ]]
-    then
-        nosetests --verbose -m '(?:^|[\b_\./-])[Tt]est.*cupy' test_dltensor_operator.py
-    fi
+    nosetests --verbose -m '(?:^|[\b_\./-])[Tt]est.*cupy' test_dltensor_operator.py
 }
 
 pushd ../..

diff --git a/qa/TL1_tensorflow_dataset/test.sh b/qa/TL1_tensorflow_dataset/test.sh
@@ -1,6 +1,6 @@
 #!/bin/bash -e
 # used pip packages
-pip_packages="nose jupyter tensorflow-gpu"
+pip_packages="nose jupyter tensorflow-gpu ipykernel<5.0.0 ipython<7.0.0"
 target_dir=./dali/test/python
 
 # populate epilog and prolog with variants to enable/disable conda and virtual env

diff --git a/qa/setup_packages.py b/qa/setup_packages.py
@@ -22,6 +22,7 @@
 
 packages = {
             "opencv-python" : ["4.1.0.25"],
+            "cupy" : ["6.6.0"],
             "mxnet-cu{cuda_v}" : {
                         "90" : ["1.5.0"],
                         "100" : ["1.5.0"]},