Use %tensorflow_version and remove cirq install since tfq will instal…

…l cirq. (tensorflow#125)
hongyunnchen · Feb 28, 2020 · d43f6a3 · d43f6a3
1 parent 63eee39
commit d43f6a3
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 65 deletions.
diff --git a/docs/tutorials/barren_plateaus.ipynb b/docs/tutorials/barren_plateaus.ipynb
@@ -89,19 +89,6 @@
     "Download and install the required packages:"
    ]
   },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {
-    "colab": {},
-    "colab_type": "code",
-    "id": "fAVlg7rxkvUw"
-   },
-   "outputs": [],
-   "source": [
-    "!pip install cirq==0.7.0"
-   ]
-  },
   {
    "cell_type": "code",
    "execution_count": null,
@@ -112,7 +99,10 @@
    },
    "outputs": [],
    "source": [
-    "!pip install --upgrade tensorflow==2.1.0"
+    "try:\n",
+    "    %tensorflow_version 2.x\n",
+    "except Exception:\n",
+    "    pass"
    ]
   },
   {

diff --git a/docs/tutorials/gradients.ipynb b/docs/tutorials/gradients.ipynb
@@ -91,19 +91,6 @@
     "Download and install the required packages:"
    ]
   },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {
-    "colab": {},
-    "colab_type": "code",
-    "id": "fAVlg7rxkvUw"
-   },
-   "outputs": [],
-   "source": [
-    "!pip install cirq==0.7.0"
-   ]
-  },
   {
    "cell_type": "code",
    "execution_count": null,
@@ -114,7 +101,10 @@
    },
    "outputs": [],
    "source": [
-    "!pip install --upgrade tensorflow==2.1.0"
+    "try:\n",
+    "    %tensorflow_version 2.x\n",
+    "except Exception:\n",
+    "    pass"
    ]
   },
   {

diff --git a/docs/tutorials/hello_many_worlds.ipynb b/docs/tutorials/hello_many_worlds.ipynb
@@ -95,24 +95,23 @@
    "metadata": {
     "colab": {},
     "colab_type": "code",
-    "id": "fAVlg7rxkvUw"
+    "id": "TorxE5tnkvb2"
    },
    "outputs": [],
    "source": [
-    "!pip install cirq==0.7.0 graphviz pydot"
+    "try:\n",
+    "    %tensorflow_version 2.x\n",
+    "except Exception:\n",
+    "    pass"
    ]
   },
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {
-    "colab": {},
-    "colab_type": "code",
-    "id": "TorxE5tnkvb2"
-   },
+   "metadata": {},
    "outputs": [],
    "source": [
-    "!pip install --upgrade tensorflow==2.1.0"
+    "!pip install graphviz pydot"
    ]
   },
   {
@@ -1045,7 +1044,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.7.3rc1"
+   "version": "3.7.5rc1"
   }
  },
  "nbformat": 4,

diff --git a/docs/tutorials/mnist.ipynb b/docs/tutorials/mnist.ipynb
@@ -89,19 +89,6 @@
     "Download and install the required packages:"
    ]
   },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {
-    "colab": {},
-    "colab_type": "code",
-    "id": "fAVlg7rxkvUw"
-   },
-   "outputs": [],
-   "source": [
-    "!pip install cirq==0.7.0"
-   ]
-  },
   {
    "cell_type": "code",
    "execution_count": null,
@@ -112,7 +99,10 @@
    },
    "outputs": [],
    "source": [
-    "!pip install --upgrade tensorflow==2.0.0"
+    "try:\n",
+    "    %tensorflow_version 2.x\n",
+    "except Exception:\n",
+    "    pass"
    ]
   },
   {

diff --git a/docs/tutorials/qcnn.ipynb b/docs/tutorials/qcnn.ipynb
@@ -91,19 +91,6 @@
     "Download and install the required packages:"
    ]
   },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {
-    "colab": {},
-    "colab_type": "code",
-    "id": "evObd2BXr5hs"
-   },
-   "outputs": [],
-   "source": [
-    "!pip install cirq==0.7.0"
-   ]
-  },
   {
    "cell_type": "code",
    "execution_count": null,
@@ -114,7 +101,10 @@
    },
    "outputs": [],
    "source": [
-    "!pip install --upgrade tensorflow==2.1.0"
+    "try:\n",
+    "    %tensorflow_version 2.x\n",
+    "except Exception:\n",
+    "    pass"
    ]
   },
   {