TensorFlow 2.6 upgrade

README.md

@@ -65,7 +65,7 @@ On Windows you will need [Microsoft C++ Build Tools](https://visualstudio.micros
 ```bash
 pip install --upgrade pip
 pip install --upgrade setuptools
-pip install recommenders[examples]
+pip install --no-cache --no-binary scikit-surprise recommenders[examples]
 ```
 
 4. Register your (conda or virtual) environment with Jupyter:

SETUP.md

@@ -151,13 +151,13 @@ create the file `%RECO_ENV%\etc\conda\deactivate.d\env_vars.bat` and add:
 
 It is straightforward to install the recommenders package within a [virtual environment](https://docs.python.org/3/library/venv.html). However, setting up CUDA for use with a GPU can be cumbersome. We thus
 recommend setting up [Nvidia docker](https://github.com/NVIDIA/nvidia-docker) and running the virtual environment within a container, as the most convenient way to do this.  
-In the following `3.6` should be replaced with the Python version you are using and `11` should be replaced with the appropriate Java version. 
+In the following `3.6` should be replaced with the Python version you are using and `8` should be replaced with the appropriate Java version. 
 
     # Start docker daemon if not running
     sudo dockerd &
     # Pull the image from the Nvidia docker hub (https://hub.docker.com/r/nvidia/cuda) that is suitable for your system
     # E.g. for Ubuntu 18.04 do
-    sudo docker run --gpus all -it --rm nvidia/cuda:10.0-cudnn7-runtime-ubuntu18.04
+    sudo docker run --gpus all -it --rm nvidia/cuda:11.2.2-cudnn8-runtime-ubuntu18.04
 
     # Within the container: 
 
@@ -167,8 +167,8 @@ In the following `3.6` should be replaced with the Python version you are using
     apt-get -y install python3.6-venv
     apt-get -y install libpython3.6-dev
     apt-get -y install cmake
-    apt-get install -y libgomp1 openjdk-11-jre
-    export JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64
+    apt-get install -y libgomp1 openjdk-8-jre
+    export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64
 
     python3.6 -m venv --system-site-packages /venv
     source /venv/bin/activate
@@ -179,7 +179,7 @@ In the following `3.6` should be replaced with the Python version you are using
     export PYSPARK_DRIVER_PYTHON=/venv/bin/python
     export PYSPARK_PYTHON=/venv/bin/python
 
-    pip install recommenders[all]
+    pip install --no-cache --no-binary scikit-surprise recommenders[all]
 
 If you prefer to use [virtualenv](https://virtualenv.pypa.io/en/latest/index.html#) instead of venv, you may follow the above steps, except you will need to replace the line
 

docs/README.md

@@ -2,9 +2,9 @@
 
 To setup the documentation, first you need to install the dependencies of the full environment. For it please follow the [SETUP.md](../SETUP.md). Then type:
 
-    conda create -n reco_full python=3.6 cudatoolkit=10.0 "cudnn>=7.6"
+    conda create -n reco_full -c conda-forge python=3.6 cudatoolkit=11.2 cudnn=8.1
     conda activate reco_full
-    pip install .[all]
+    pip install --no-cache --no-binary scikit-surprise .[all]
     pip install sphinx_rtd_theme
 
 

examples/00_quick_start/dkn_MIND.ipynb

@@ -62,20 +62,28 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 2,
+   "execution_count": 1,
    "metadata": {
     "pycharm": {
      "is_executing": false
     }
    },
    "outputs": [
+    {
+     "name": "stderr",
+     "output_type": "stream",
+     "text": [
+      "/anaconda/envs/tf2/lib/python3.7/site-packages/papermill/iorw.py:50: FutureWarning: pyarrow.HadoopFileSystem is deprecated as of 2.0.0, please use pyarrow.fs.HadoopFileSystem instead.\n",
+      "  from pyarrow import HadoopFileSystem\n"
+     ]
+    },
     {
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "System version: 3.6.11 | packaged by conda-forge | (default, Aug  5 2020, 20:09:42) \n",
+      "System version: 3.7.11 (default, Jul 27 2021, 14:32:16) \n",
       "[GCC 7.5.0]\n",
-      "Tensorflow version: 1.15.2\n"
+      "Tensorflow version: 2.6.1\n"
      ]
     }
    ],
@@ -359,10 +367,12 @@
  ],
  "metadata": {
   "celltoolbar": "Tags",
+  "interpreter": {
+   "hash": "3a9a0c422ff9f08d62211b9648017c63b0a26d2c935edc37ebb8453675d13bb5"
+  },
   "kernelspec": {
-   "display_name": "Python (reco_gpu)",
-   "language": "python",
-   "name": "reco_gpu"
+   "display_name": "Python 3.7.11 64-bit ('tf2': conda)",
+   "name": "python3"
   },
   "language_info": {
    "codemirror_mode": {
@@ -374,7 +384,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.6.11"
+   "version": "3.7.11"
   },
   "pycharm": {
    "stem_cell": {
@@ -388,4 +398,4 @@
  },
  "nbformat": 4,
  "nbformat_minor": 2
-}
+}

examples/00_quick_start/lstur_MIND.ipynb

@@ -75,13 +75,21 @@
    "execution_count": 1,
    "metadata": {},
    "outputs": [
+    {
+     "name": "stderr",
+     "output_type": "stream",
+     "text": [
+      "/anaconda/envs/tf2/lib/python3.7/site-packages/papermill/iorw.py:50: FutureWarning: pyarrow.HadoopFileSystem is deprecated as of 2.0.0, please use pyarrow.fs.HadoopFileSystem instead.\n",
+      "  from pyarrow import HadoopFileSystem\n"
+     ]
+    },
     {
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "System version: 3.6.11 | packaged by conda-forge | (default, Aug  5 2020, 20:09:42) \n",
+      "System version: 3.7.11 (default, Jul 27 2021, 14:32:16) \n",
       "[GCC 7.5.0]\n",
-      "Tensorflow version: 1.15.2\n"
+      "Tensorflow version: 2.6.1\n"
      ]
     }
    ],
@@ -529,10 +537,12 @@
  ],
  "metadata": {
   "celltoolbar": "Tags",
+  "interpreter": {
+   "hash": "3a9a0c422ff9f08d62211b9648017c63b0a26d2c935edc37ebb8453675d13bb5"
+  },
   "kernelspec": {
-   "display_name": "Python (reco_gpu)",
-   "language": "python",
-   "name": "reco_gpu"
+   "display_name": "Python 3.7.11 64-bit ('tf2': conda)",
+   "name": "python3"
   },
   "language_info": {
    "codemirror_mode": {
@@ -544,9 +554,9 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.6.11"
+   "version": "3.7.11"
   }
  },
  "nbformat": 4,
  "nbformat_minor": 4
-}
+}

examples/00_quick_start/naml_MIND.ipynb

@@ -72,16 +72,24 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 2,
+   "execution_count": 1,
    "metadata": {},
    "outputs": [
+    {
+     "name": "stderr",
+     "output_type": "stream",
+     "text": [
+      "/anaconda/envs/tf2/lib/python3.7/site-packages/papermill/iorw.py:50: FutureWarning: pyarrow.HadoopFileSystem is deprecated as of 2.0.0, please use pyarrow.fs.HadoopFileSystem instead.\n",
+      "  from pyarrow import HadoopFileSystem\n"
+     ]
+    },
     {
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "System version: 3.6.11 | packaged by conda-forge | (default, Aug  5 2020, 20:09:42) \n",
+      "System version: 3.7.11 (default, Jul 27 2021, 14:32:16) \n",
       "[GCC 7.5.0]\n",
-      "Tensorflow version: 1.15.2\n"
+      "Tensorflow version: 2.6.1\n"
      ]
     }
    ],
@@ -526,10 +534,12 @@
  ],
  "metadata": {
   "celltoolbar": "Tags",
+  "interpreter": {
+   "hash": "3a9a0c422ff9f08d62211b9648017c63b0a26d2c935edc37ebb8453675d13bb5"
+  },
   "kernelspec": {
-   "display_name": "Python (reco_gpu)",
-   "language": "python",
-   "name": "reco_gpu"
+   "display_name": "Python 3.7.11 64-bit ('tf2': conda)",
+   "name": "python3"
   },
   "language_info": {
    "codemirror_mode": {
@@ -541,9 +551,9 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.6.11"
+   "version": "3.7.11"
   }
  },
  "nbformat": 4,
  "nbformat_minor": 4
-}
+}

examples/00_quick_start/npa_MIND.ipynb

@@ -75,13 +75,21 @@
    "execution_count": 1,
    "metadata": {},
    "outputs": [
+    {
+     "name": "stderr",
+     "output_type": "stream",
+     "text": [
+      "/anaconda/envs/tf2/lib/python3.7/site-packages/papermill/iorw.py:50: FutureWarning: pyarrow.HadoopFileSystem is deprecated as of 2.0.0, please use pyarrow.fs.HadoopFileSystem instead.\n",
+      "  from pyarrow import HadoopFileSystem\n"
+     ]
+    },
     {
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "System version: 3.6.11 | packaged by conda-forge | (default, Aug  5 2020, 20:09:42) \n",
+      "System version: 3.7.11 (default, Jul 27 2021, 14:32:16) \n",
       "[GCC 7.5.0]\n",
-      "Tensorflow version: 1.15.2\n"
+      "Tensorflow version: 2.6.1\n"
      ]
     }
    ],
@@ -504,10 +512,12 @@
  ],
  "metadata": {
   "celltoolbar": "Tags",
+  "interpreter": {
+   "hash": "3a9a0c422ff9f08d62211b9648017c63b0a26d2c935edc37ebb8453675d13bb5"
+  },
   "kernelspec": {
-   "display_name": "Python (reco_gpu)",
-   "language": "python",
-   "name": "reco_gpu"
+   "display_name": "Python 3.7.11 64-bit ('tf2': conda)",
+   "name": "python3"
   },
   "language_info": {
    "codemirror_mode": {
@@ -519,9 +529,9 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.6.11"
+   "version": "3.7.11"
   }
  },
  "nbformat": 4,
  "nbformat_minor": 4
-}
+}

examples/00_quick_start/nrms_MIND.ipynb

@@ -75,13 +75,21 @@
     "scrolled": false
    },
    "outputs": [
+    {
+     "name": "stderr",
+     "output_type": "stream",
+     "text": [
+      "/anaconda/envs/tf2/lib/python3.7/site-packages/papermill/iorw.py:50: FutureWarning: pyarrow.HadoopFileSystem is deprecated as of 2.0.0, please use pyarrow.fs.HadoopFileSystem instead.\n",
+      "  from pyarrow import HadoopFileSystem\n"
+     ]
+    },
     {
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "System version: 3.6.11 | packaged by conda-forge | (default, Aug  5 2020, 20:09:42) \n",
+      "System version: 3.7.11 (default, Jul 27 2021, 14:32:16) \n",
       "[GCC 7.5.0]\n",
-      "Tensorflow version: 1.15.2\n"
+      "Tensorflow version: 2.6.1\n"
      ]
     }
    ],
@@ -523,10 +531,12 @@
  ],
  "metadata": {
   "celltoolbar": "Tags",
+  "interpreter": {
+   "hash": "3a9a0c422ff9f08d62211b9648017c63b0a26d2c935edc37ebb8453675d13bb5"
+  },
   "kernelspec": {
-   "display_name": "Python (reco_gpu)",
-   "language": "python",
-   "name": "reco_gpu"
+   "display_name": "Python 3.7.11 64-bit ('tf2': conda)",
+   "name": "python3"
   },
   "language_info": {
    "codemirror_mode": {
@@ -538,9 +548,9 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.6.11"
+   "version": "3.7.11"
   }
  },
  "nbformat": 4,
  "nbformat_minor": 4
-}
+}