diff --git a/setup.py b/setup.py index 7d07be523..5aacc47a3 100644 --- a/setup.py +++ b/setup.py @@ -60,9 +60,7 @@ extras_require = { "gpu": [ "nvidia-ml-py3>=7.352.0", - # TensorFlow compiled with CUDA 11.2, CuDNN 8.1 - "tensorflow~=2.6.1;python_version=='3.6'", - "tensorflow~=2.7.0;python_version>='3.7'", + "tensorflow==2.8.4", # FIXME: Temporarily pinned due to issue with TF version > 2.10.1 See #2018 "tf-slim>=1.1.0", "torch>=1.13.1", # for CUDA 11 support "fastai>=1.0.46,<2", diff --git a/tests/ci/azureml_tests/test_groups.py b/tests/ci/azureml_tests/test_groups.py index a1138e3df..9451c6826 100644 --- a/tests/ci/azureml_tests/test_groups.py +++ b/tests/ci/azureml_tests/test_groups.py @@ -69,23 +69,23 @@ "tests/smoke/recommenders/recommender/test_deeprec_model.py::test_FFM_iterator", # 0.74s "tests/smoke/recommenders/recommender/test_newsrec_utils.py::test_news_iterator", # 3.04s # - "tests/smoke/recommenders/recommender/test_deeprec_model.py::test_model_lightgcn", # 6.03s - "tests/functional/examples/test_notebooks_gpu.py::test_lightgcn_deep_dive_functional", # 19.45s + "tests/smoke/recommenders/recommender/test_deeprec_model.py::test_model_lightgcn", # 6.03s # FIXME: Issue with TF version > 2.10.1 See #2018 + "tests/functional/examples/test_notebooks_gpu.py::test_lightgcn_deep_dive_functional", # 19.45s # FIXME: Issue with TF version > 2.10.1 See #2018 # - "tests/smoke/recommenders/recommender/test_deeprec_model.py::test_model_sum", # 27.23s + "tests/smoke/recommenders/recommender/test_deeprec_model.py::test_model_sum", # 27.23s # FIXME: Issue with TF version > 2.10.1 See #2018 # "tests/smoke/recommenders/recommender/test_deeprec_model.py::test_model_dkn", # 187.20s "tests/functional/examples/test_notebooks_gpu.py::test_dkn_quickstart_functional", # 1167.93s # - "tests/functional/examples/test_notebooks_gpu.py::test_slirec_quickstart_functional", # 175.00s - "tests/smoke/recommenders/recommender/test_deeprec_model.py::test_model_slirec", # 346.72s + "tests/functional/examples/test_notebooks_gpu.py::test_slirec_quickstart_functional", # 175.00s # FIXME: Issue with TF version > 2.10.1 See #2018 + "tests/smoke/recommenders/recommender/test_deeprec_model.py::test_model_slirec", # 346.72s # FIXME: Issue with TF version > 2.10.1 See #2018 ], "group_gpu_002": [ # Total group time: 1896.76s "tests/unit/examples/test_notebooks_gpu.py::test_gpu_vm", # 0.76s (Always the first test to check the GPU works) "tests/smoke/recommenders/recommender/test_deeprec_model.py::test_model_xdeepfm", # 3.10s # FIXME: https://github.com/microsoft/recommenders/issues/1883 # "tests/smoke/examples/test_notebooks_gpu.py::test_xdeepfm_smoke", # 77.93s - "tests/functional/examples/test_notebooks_gpu.py::test_xdeepfm_functional", # 470.11s + "tests/functional/examples/test_notebooks_gpu.py::test_xdeepfm_functional", # FIXME: Issue with TF version > 2.10.1 See #2018 # "tests/smoke/examples/test_notebooks_gpu.py::test_cornac_bivae_smoke", # 67.84s "tests/functional/examples/test_notebooks_gpu.py::test_cornac_bivae_functional", # 453.21s @@ -420,12 +420,12 @@ ], "group_gpu_002": [ # Total group time: "tests/unit/examples/test_notebooks_gpu.py::test_gpu_vm", # 0.76s (Always the first test to check the GPU works) - "tests/unit/recommenders/models/test_deeprec_model.py::test_xdeepfm_component_definition", + "tests/unit/recommenders/models/test_deeprec_model.py::test_xdeepfm_component_definition", # FIXME: Issue with TF version > 2.10.1 See #2018 "tests/unit/recommenders/models/test_deeprec_model.py::test_dkn_component_definition", "tests/unit/recommenders/models/test_deeprec_model.py::test_dkn_item2item_component_definition", - "tests/unit/recommenders/models/test_deeprec_model.py::test_slirec_component_definition", + "tests/unit/recommenders/models/test_deeprec_model.py::test_slirec_component_definition", # FIXME: Issue with TF version > 2.10.1 See #2018 "tests/unit/recommenders/models/test_deeprec_model.py::test_nextitnet_component_definition", - "tests/unit/recommenders/models/test_deeprec_model.py::test_sum_component_definition", + "tests/unit/recommenders/models/test_deeprec_model.py::test_sum_component_definition", # FIXME: Issue with TF version > 2.10.1 See #2018 "tests/unit/recommenders/models/test_deeprec_model.py::test_lightgcn_component_definition", "tests/unit/recommenders/models/test_deeprec_utils.py::test_prepare_hparams", "tests/unit/recommenders/models/test_deeprec_utils.py::test_load_yaml_file", @@ -443,7 +443,7 @@ "group_notebooks_gpu_002": [ # Total group time: 241.15s "tests/unit/examples/test_notebooks_gpu.py::test_gpu_vm", # 0.76s (Always the first test to check the GPU works) "tests/unit/examples/test_notebooks_gpu.py::test_wide_deep", - "tests/unit/examples/test_notebooks_gpu.py::test_xdeepfm", + "tests/unit/examples/test_notebooks_gpu.py::test_xdeepfm", # FIXME: Issue with TF version > 2.10.1 See #2018 "tests/unit/examples/test_notebooks_gpu.py::test_gpu_vm", ], } diff --git a/tests/security/test_dependency_security.py b/tests/security/test_dependency_security.py index d706f9471..82a4f0596 100644 --- a/tests/security/test_dependency_security.py +++ b/tests/security/test_dependency_security.py @@ -33,7 +33,8 @@ def test_pandas(): def test_tensorflow(): # Security issue: https://github.com/advisories/GHSA-w5gh-2wr2-pm6g # Security issue: https://github.com/advisories/GHSA-r6jx-9g48-2r5r - assert tf.__version__ >= "2.5.1" + # Security issue: https://github.com/advisories/GHSA-xxcj-rhqg-m46g + assert tf.__version__ >= "2.8.4" @pytest.mark.gpu diff --git a/tests/smoke/recommenders/recommender/test_deeprec_model.py b/tests/smoke/recommenders/recommender/test_deeprec_model.py index ead368485..81e6f589c 100644 --- a/tests/smoke/recommenders/recommender/test_deeprec_model.py +++ b/tests/smoke/recommenders/recommender/test_deeprec_model.py @@ -4,6 +4,9 @@ import os import pytest +from recommenders.datasets import movielens +from recommenders.datasets.python_splitters import python_stratified_split + try: import tensorflow as tf from recommenders.models.deeprec.deeprec_utils import ( @@ -24,8 +27,7 @@ ) from recommenders.models.deeprec.models.graphrec.lightgcn import LightGCN from recommenders.models.deeprec.DataModel.ImplicitCF import ImplicitCF - from recommenders.datasets import movielens - from recommenders.datasets.python_splitters import python_stratified_split + except ImportError: pass # disable error while collecting tests for non-gpu environments