Merge branch 'master' into serializer_line

Author: MichaelBroughton

.bazelversion

@@ -1 +1 @@
-3.1.0
+3.7.2

.github/workflows/ci.yaml

@@ -5,7 +5,7 @@ on: [pull_request]
 jobs:
   lint:
     name: Lint check
-    runs-on: ubuntu-16.04
+    runs-on: ubuntu-18.04
     steps:
       - uses: actions/checkout@v1
       - uses: actions/setup-python@v1
@@ -19,7 +19,7 @@ jobs:
 
   format:
     name: Formatting check
-    runs-on: ubuntu-16.04
+    runs-on: ubuntu-18.04
 
     steps:
       - uses: actions/checkout@v1
@@ -34,7 +34,7 @@ jobs:
 
   wheel-build:
     name: Wheel test
-    runs-on: ubuntu-16.04
+    runs-on: ubuntu-18.04
 
     steps:
       - uses: actions/checkout@v1
@@ -53,7 +53,7 @@ jobs:
 
   bazel-tests:
     name: Library tests
-    runs-on: ubuntu-16.04
+    runs-on: ubuntu-18.04
     needs: [lint, format]
 
     steps:
@@ -71,7 +71,7 @@ jobs:
 
   leak-tests:
     name: Memory Leak tests
-    runs-on: ubuntu-16.04
+    runs-on: ubuntu-18.04
     needs: [lint, format]
 
     steps:
@@ -89,7 +89,7 @@ jobs:
 
   tutorials-test:
     name: Tutorial tests
-    runs-on: ubuntu-16.04
+    runs-on: ubuntu-18.04
     needs: [lint, format, wheel-build]
 
     steps:
@@ -107,4 +107,4 @@ jobs:
       - name: Build Wheel
         run: ./scripts/build_pip_package_test.sh
       - name: Test Notebooks
-        run: ./scripts/ci_validate_tutorials.sh
+        run: ./scripts/ci_validate_tutorials.sh

WORKSPACE

@@ -1,93 +1,39 @@
 # This file includes external dependencies that are required to compile the
-# TensorFlow op. Maybe of them are specific versions used by the TensorFlow
-# binary used. These are extracted from TF v2.4.1, tensorflow/workspace.bzl.
+# TensorFlow op.
 
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
 http_archive(
-    name = "com_google_absl",
-    sha256 = "f368a8476f4e2e0eccf8a7318b98dafbe30b2600f4e3cf52636e5eb145aba06a",
-    strip_prefix = "abseil-cpp-df3ea785d8c30a9503321a3d35ee7d35808f190d",
-    urls = [
-        "https://storage.googleapis.com/mirror.tensorflow.org/github.com/abseil/abseil-cpp/archive/df3ea785d8c30a9503321a3d35ee7d35808f190d.tar.gz",
-        "https://github.com/abseil/abseil-cpp/archive/df3ea785d8c30a9503321a3d35ee7d35808f190d.tar.gz",
-    ],
-)
-
-http_archive(
-    name = "com_google_googletest",
-    sha256 = "ff7a82736e158c077e76188232eac77913a15dac0b22508c390ab3f88e6d6d86",
-    strip_prefix = "googletest-b6cd405286ed8635ece71c72f118e659f4ade3fb",
-    urls = [
-        "https://storage.googleapis.com/mirror.tensorflow.org/github.com/google/googletest/archive/b6cd405286ed8635ece71c72f118e659f4ade3fb.zip",
-        "https://github.com/google/googletest/archive/b6cd405286ed8635ece71c72f118e659f4ade3fb.zip",
-    ],
-)
-
-http_archive(
-    name = "com_google_protobuf",
-    sha256 = "cfcba2df10feec52a84208693937c17a4b5df7775e1635c1e3baffc487b24c9b",
-    strip_prefix = "protobuf-3.9.2",
-    urls = [
-        "https://storage.googleapis.com/mirror.tensorflow.org/github.com/protocolbuffers/protobuf/archive/v3.9.2.zip",
-        "https://github.com/protocolbuffers/protobuf/archive/v3.9.2.zip",
-    ],
+    name = "qsim",
+    sha256 = "d39b9c48866ce4d6a095093ae8059444d649e851219497af99e937a74f1e9a45",
+    strip_prefix = "qsim-0.9.2-dev-20210317",
+    urls = ["https://github.com/quantumlib/qsim/archive/v0.9.2-dev+20210317.zip"],
 )
 
-# Use this zlib rule that depends on github since it is more reliable than zlib.net.
 http_archive(
-    name = "zlib",
-    build_file = "@com_google_protobuf//:third_party/zlib.BUILD",
-    sha256 = "c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1",
-    strip_prefix = "zlib-1.2.11",
+    name = "org_tensorflow",
+    sha256 = "2023a377a16e5566b8981400af9e8c8e25d3367d82824ffec2b5b6b9c7dba55d",
+    strip_prefix = "tensorflow-2.5.1",
     urls = [
-        "https://storage.googleapis.com/mirror.tensorflow.org/zlib.net/zlib-1.2.11.tar.gz",
-        "https://zlib.net/zlib-1.2.11.tar.gz",
+        "https://github.com/tensorflow/tensorflow/archive/refs/tags/v2.5.1.zip",
     ],
 )
 
-load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
+load("@org_tensorflow//tensorflow:workspace3.bzl", "workspace")
 
-protobuf_deps()
+workspace()
 
-# com_google_protobuf depends on @bazel_skylib ??
-http_archive(
-    name = "bazel_skylib",
-    sha256 = "bbccf674aa441c266df9894182d80de104cabd19be98be002f6d478aaa31574d",
-    strip_prefix = "bazel-skylib-2169ae1c374aab4a09aa90e65efe1a3aad4e279b",
-    urls = ["https://github.com/bazelbuild/bazel-skylib/archive/2169ae1c374aab4a09aa90e65efe1a3aad4e279b.tar.gz"],
-)
+load("@org_tensorflow//tensorflow:workspace2.bzl", "workspace")
 
-http_archive(
-    name = "qsim",
-    sha256 = "d39b9c48866ce4d6a095093ae8059444d649e851219497af99e937a74f1e9a45",
-    strip_prefix = "qsim-0.9.2-dev-20210317",
-    urls = ["https://github.com/quantumlib/qsim/archive/v0.9.2-dev+20210317.zip"],
-)
+workspace()
 
-# Added for crosstool in tensorflow.
-http_archive(
-    name = "io_bazel_rules_closure",
-    sha256 = "5b00383d08dd71f28503736db0500b6fb4dda47489ff5fc6bed42557c07c6ba9",
-    strip_prefix = "rules_closure-308b05b2419edb5c8ee0471b67a40403df940149",
-    urls = [
-        "https://storage.googleapis.com/mirror.tensorflow.org/github.com/bazelbuild/rules_closure/archive/308b05b2419edb5c8ee0471b67a40403df940149.tar.gz",
-        "https://github.com/bazelbuild/rules_closure/archive/308b05b2419edb5c8ee0471b67a40403df940149.tar.gz",  # 2019-06-13
-    ],
-)
+load("@org_tensorflow//tensorflow:workspace1.bzl", "workspace")
 
-http_archive(
-    name = "org_tensorflow",
-    sha256 = "b91ec194ddf6c4a5a2f9d1db4af4daab0b187ff691e6f88142413d2c7e77a3bb",
-    strip_prefix = "tensorflow-2.4.1",
-    urls = [
-        "https://github.com/tensorflow/tensorflow/archive/v2.4.1.zip",
-    ],
-)
+workspace()
 
-load("@org_tensorflow//tensorflow:workspace.bzl", "tf_workspace")
+load("@org_tensorflow//tensorflow:workspace0.bzl", "workspace")
 
-tf_workspace(tf_repo_name = "@org_tensorflow")
+workspace()
 
 load("//third_party/tf:tf_configure.bzl", "tf_configure")
 

docs/concepts.md

@@ -1,7 +1,7 @@
 # Quantum machine learning concepts
 
 Google's
-<a href="https://ai.googleblog.com/2019/10/quantum-supremacy-using-programmable.html" class="external">quantum supremacy experiment</a>
+<a href="https://ai.googleblog.com/2019/10/quantum-supremacy-using-programmable.html" class="external">quantum beyond-classical experiment</a>
 used 53&nbsp;*noisy*&nbsp;qubits to demonstrate it could perform a calculation
 in 200 seconds on a quantum computer that would take 10,000 years on the largest
 classical computer using existing algorithms. This marks the beginning of the

docs/design.md

@@ -70,7 +70,7 @@ challenges:
 For performance reasons, Eigen (the C++ library used in many TensorFlow ops) is
 not well suited for quantum circuit simulation. Instead, the circuit simulators
 used in the
-<a href="https://ai.googleblog.com/2019/10/quantum-supremacy-using-programmable.html" class="external">quantum supremacy experiment</a>
+<a href="https://ai.googleblog.com/2019/10/quantum-supremacy-using-programmable.html" class="external">quantum beyond-classical experiment</a>
 are used as verifiers and extended as the foundation of TFQ ops (all written
 with AVX2 and SSE instructions). Ops with identical functional signatures were
 created that use a physical quantum computer. Switching between a simulated and

docs/install.md

@@ -17,7 +17,7 @@ TensorFlow Quantum is supported on Python 3.6, 3.7, and 3.8 and depends directly
 ### Requirements
 
 * pip 19.0 or later (requires `manylinux2010` support)
-* [TensorFlow == 2.4.1](https://www.tensorflow.org/install/pip)
+* [TensorFlow == 2.5.1](https://www.tensorflow.org/install/pip)
 
 See the [TensorFlow install guide](https://www.tensorflow.org/install/pip) to
 set up your Python development environment and an (optional) virtual environment.
@@ -27,7 +27,7 @@ Upgrade `pip` and install TensorFlow
 <!-- common_typos_disable -->
 <pre class="devsite-click-to-copy">
   <code class="devsite-terminal">pip3 install --upgrade pip</code>
-  <code class="devsite-terminal">pip3 install tensorflow==2.4.1</code>
+  <code class="devsite-terminal">pip3 install tensorflow==2.5.1</code>
 </pre>
 <!-- common_typos_enable -->
 
@@ -84,21 +84,21 @@ As noted in the TensorFlow
 guide, the <a href="https://bazel.build/" class="external">Bazel</a>
 build system will be required.
 
-Our latest source builds use TensorFlow 2.4.1. To ensure compatibility we use `bazel` version 3.1.0. To remove any existing version of Bazel:
+Our latest source builds use TensorFlow 2.5.1. To ensure compatibility we use `bazel` version 3.7.2. To remove any existing version of Bazel:
 
 <!-- common_typos_disable -->
 <pre class="devsite-click-to-copy">
   <code class="devsite-terminal">sudo apt-get remove bazel</code>
 </pre>
 <!-- common_typos_enable -->
 
-Download and install `bazel` version 3.1.0:
+Download and install `bazel` version 3.7.2:
 
 <!-- common_typos_disable -->
 <pre class="devsite-click-to-copy">
-  <code class="devsite-terminal">wget https://github.com/bazelbuild/bazel/releases/download/3.1.0/bazel_3.1.0-linux-x86_64.deb
+  <code class="devsite-terminal">wget https://github.com/bazelbuild/bazel/releases/download/3.7.2/bazel_3.7.2-linux-x86_64.deb
 </code>
-  <code class="devsite-terminal">sudo dpkg -i bazel_3.1.0-linux-x86_64.deb</code>
+  <code class="devsite-terminal">sudo dpkg -i bazel_3.7.2-linux-x86_64.deb</code>
 </pre>
 <!-- common_typos_enable -->
 
@@ -122,7 +122,7 @@ Finally, confirm installation of the correct `bazel` version:
 ### 4. Build TensorFlow from source
 
 Here we adapt instructions from the TensorFlow [build from source](https://www.tensorflow.org/install/source)
-guide, see the link for further details. TensorFlow Quantum is compatible with TensorFlow version&nbsp;2.4.
+guide, see the link for further details. TensorFlow Quantum is compatible with TensorFlow version&nbsp;2.5.
 
 Download the
 <a href="https://github.com/tensorflow/tensorflow" class="external">TensorFlow source code</a>:
@@ -131,7 +131,7 @@ Download the
 <pre class="devsite-click-to-copy">
   <code class="devsite-terminal">git clone https://github.com/tensorflow/tensorflow.git</code>
   <code class="devsite-terminal">cd tensorflow</code>
-  <code class="devsite-terminal">git checkout v2.4.1</code>
+  <code class="devsite-terminal">git checkout v2.5.1</code>
 </pre>
 
 Be sure the virtual environment you created in step 2 is activated. Then, install the TensorFlow dependencies:

docs/tutorials/barren_plateaus.ipynb

@@ -123,6 +123,21 @@
         "!pip install tensorflow-quantum"
       ]
     },
+    {
+      "cell_type": "code",
+      "execution_count": 0,
+      "metadata": {
+        "colab": {},
+        "colab_type": "code",
+        "id": "4Ql5PW-ACO0J"
+      },
+      "outputs": [],
+      "source": [
+        "# Update package resources to account for version changes.\n",
+        "import importlib, pkg_resources\n",
+        "importlib.reload(pkg_resources)"
+      ]
+    },
     {
       "cell_type": "markdown",
       "metadata": {

docs/tutorials/gradients.ipynb

@@ -125,6 +125,21 @@
         "!pip install tensorflow-quantum"
       ]
     },
+    {
+      "cell_type": "code",
+      "execution_count": 0,
+      "metadata": {
+        "colab": {},
+        "colab_type": "code",
+        "id": "4Ql5PW-ACO0J"
+      },
+      "outputs": [],
+      "source": [
+        "# Update package resources to account for version changes.\n",
+        "import importlib, pkg_resources\n",
+        "importlib.reload(pkg_resources)"
+      ]
+    },
     {
       "cell_type": "markdown",
       "metadata": {

docs/tutorials/hello_many_worlds.ipynb

@@ -123,6 +123,21 @@
         "!pip install tensorflow-quantum"
       ]
     },
+    {
+      "cell_type": "code",
+      "execution_count": 0,
+      "metadata": {
+        "colab": {},
+        "colab_type": "code",
+        "id": "4Ql5PW-ACO0J"
+      },
+      "outputs": [],
+      "source": [
+        "# Update package resources to account for version changes.\n",
+        "import importlib, pkg_resources\n",
+        "importlib.reload(pkg_resources)"
+      ]
+    },
     {
       "cell_type": "markdown",
       "metadata": {

docs/tutorials/mnist.ipynb

@@ -123,6 +123,21 @@
         "!pip install tensorflow-quantum"
       ]
     },
+    {
+      "cell_type": "code",
+      "execution_count": 0,
+      "metadata": {
+        "colab": {},
+        "colab_type": "code",
+        "id": "4Ql5PW-ACO0J"
+      },
+      "outputs": [],
+      "source": [
+        "# Update package resources to account for version changes.\n",
+        "import importlib, pkg_resources\n",
+        "importlib.reload(pkg_resources)"
+      ]
+    },
     {
       "cell_type": "markdown",
       "metadata": {