Squash the commits

Author: jaeyoo

.bazelversion

@@ -0,0 +1 @@
+5.3.0

.github/workflows/ci.yaml

@@ -5,27 +5,27 @@ on: [pull_request]
 jobs:
   lint:
     name: Lint check
-    runs-on: ubuntu-16.04
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v1
       - uses: actions/setup-python@v1
         with:
-          python-version: '3.6'
+          python-version: '3.8'
           architecture: 'x64'
       - name: Install Lint tools
-        run: pip install --upgrade pylint
+        run: pip install --upgrade pip setuptools; pip install -r requirements.txt;
       - name: Lint All
         run: ./scripts/lint_all.sh
 
   format:
     name: Formatting check
-    runs-on: ubuntu-16.04
+    runs-on: ubuntu-20.04
 
     steps:
       - uses: actions/checkout@v1
       - uses: actions/setup-python@v1
         with:
-          python-version: '3.6'
+          python-version: '3.8'
           architecture: 'x64'
       - name: Install Format tools
         run: pip install --upgrade pip setuptools; pip install -r requirements.txt; sudo apt-get install -y clang-format-6.0
@@ -34,13 +34,13 @@ jobs:
 
   wheel-build:
     name: Wheel test
-    runs-on: ubuntu-16.04
+    runs-on: ubuntu-20.04
 
     steps:
       - uses: actions/checkout@v1
       - uses: actions/setup-python@v1
         with:
-          python-version: '3.6'
+          python-version: '3.8'
           architecture: 'x64'
       - name: Install Bazel on CI
         run: ./scripts/ci_install.sh
@@ -53,14 +53,14 @@ jobs:
 
   bazel-tests:
     name: Library tests
-    runs-on: ubuntu-16.04
+    runs-on: ubuntu-20.04
     needs: [lint, format]
 
     steps:
       - uses: actions/checkout@v1
       - uses: actions/setup-python@v1
         with:
-          python-version: '3.6'
+          python-version: '3.8'
           architecture: 'x64'
       - name: Install Bazel on CI
         run: ./scripts/ci_install.sh
@@ -71,14 +71,14 @@ jobs:
 
   leak-tests:
     name: Memory Leak tests
-    runs-on: ubuntu-16.04
+    runs-on: ubuntu-20.04
     needs: [lint, format]
 
     steps:
       - uses: actions/checkout@v1
       - uses: actions/setup-python@v1
         with:
-          python-version: '3.6'
+          python-version: '3.8'
           architecture: 'x64'
       - name: Install Bazel on CI
         run: ./scripts/ci_install.sh
@@ -89,14 +89,14 @@ jobs:
 
   tutorials-test:
     name: Tutorial tests
-    runs-on: ubuntu-16.04
+    runs-on: ubuntu-20.04
     needs: [lint, format, wheel-build]
 
     steps:
       - uses: actions/checkout@v1
       - uses: actions/setup-python@v1
         with:
-          python-version: '3.6'
+          python-version: '3.8'
           architecture: 'x64'
       - name: Install notebook dependencies
         run: pip install --upgrade pip seaborn==0.10.0
@@ -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

.github/workflows/cirq_compatibility.yaml

@@ -0,0 +1,25 @@
+
+name: Cirq Compatibility
+
+on:
+  schedule:
+    - cron: "0 0 * * *"
+
+jobs:
+  consistency:
+    name: Nightly Compatibility
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: actions/checkout@v1
+      - uses: actions/setup-python@v1
+        with:
+          python-version: '3.8'
+          architecture: 'x64'
+      - name: Install Bazel on CI
+        run: ./scripts/ci_install.sh
+      - name: Configure CI TF
+        run: echo "Y\n" | ./configure.sh
+      - name: Install Cirq nightly
+        run: pip install -U cirq --pre
+      - name: Nightly tests
+        run: ./scripts/test_all.sh

.gitignore

@@ -47,4 +47,7 @@ venv/*
 
 # ignore emacs temp files
 *#
+
+# vscode
+.vscode/*
 *~

WORKSPACE

@@ -1,100 +1,61 @@
 # 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.3.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",
-    ],
-)
+EIGEN_COMMIT = "3bb6a48d8c171cf20b5f8e48bfb4e424fbd4f79e"
+EIGEN_SHA256 = "eca9847b3fe6249e0234a342b78f73feec07d29f534e914ba5f920f3e09383a3"
+
 
 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",
-    ],
+    name = "eigen",
+    build_file_content = """
+cc_library(
+  name = "eigen3",
+  textual_hdrs = glob(["Eigen/**", "unsupported/**"]),
+  visibility = ["//visibility:public"],
+)
+    """,
+    sha256 = EIGEN_SHA256,
+        strip_prefix = "eigen-{commit}".format(commit = EIGEN_COMMIT),
+        urls = [
+            "https://storage.googleapis.com/mirror.tensorflow.org/gitlab.com/libeigen/eigen/-/archive/{commit}/eigen-{commit}.tar.gz".format(commit = EIGEN_COMMIT),
+            "https://gitlab.com/libeigen/eigen/-/archive/{commit}/eigen-{commit}.tar.gz".format(commit = EIGEN_COMMIT),
+        ],
 )
 
 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 = "f7f410a07543a51b254f7a5810b5153e196a4c7b4ec89dc8faf86f9c77eec97b",
+    strip_prefix = "qsim-0.16.1",
+    urls = ["https://github.com/quantumlib/qsim/archive/refs/tags/v0.16.1.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 = "e52cda3bae45f0ae0fccd4055e9fa29892b414f70e2df94df9a3a10319c75fff",
+    strip_prefix = "tensorflow-2.11.0",
     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.11.0.zip",
     ],
 )
 
-load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
 
-protobuf_deps()
+load("@org_tensorflow//tensorflow:workspace3.bzl", "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"],
-)
+workspace()
 
-http_archive(
-    name = "cirq",
-    sha256 = "418cb7ff9c223e1e32516ab0ccc578385734af833528d6f5d903260b322d3362",
-    strip_prefix = "Cirq-0.9.1",
-    urls = ["https://github.com/quantumlib/Cirq/archive/v0.9.1.zip"],
-)
+load("@org_tensorflow//tensorflow:workspace2.bzl", "workspace")
 
-http_archive(
-    name = "qsim",
-    sha256 = "f390ee72cf88c48d81c98262c599dc45d660a2a9308a9ee903bfa73aec08a9b4",
-    strip_prefix = "qsim-0.6.0",
-    urls = ["https://github.com/quantumlib/qsim/archive/v0.6.0.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 = "6f063636673d6ef4ac60febd2541e3ad3516a57c18339a680c794b736798d054",
-    strip_prefix = "tensorflow-2.3.1",
-    urls = [
-        "https://github.com/tensorflow/tensorflow/archive/v2.3.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")
 
@@ -111,3 +72,7 @@ bind(
     name = "six",
     actual = "@six_archive//:six",
 )
+
+load("//third_party/cuquantum:cuquantum_configure.bzl", "cuquantum_configure")
+
+cuquantum_configure(name = "local_config_cuquantum")

benchmarks/README.md

@@ -24,7 +24,7 @@ Some notes on benchmark configuration:
 
 For example, to benchmark a dense depth-10 Clifford circuit over 5 qubits call:
 ```
-bazel run -c opt --cxxopt="-D_GLIBCXX_USE_CXX11_ABI=0" --cxxopt="-msse2" \
+bazel run -c opt --cxxopt="-D_GLIBCXX_USE_CXX11_ABI=1" --cxxopt="-msse2" \
   --cxxopt="-msse3" --cxxopt="-msse4" \
   benchmarks/scripts:benchmark_clifford_circuit -- \
   --n_moments 5 --n_qubits 4 \
@@ -39,7 +39,7 @@ benchmarks/scripts/reports/CliffordBenchmarks.benchmark_clifford_circuit_4_5_1
 To benchmark the parameter shift differentiation method on a random depth-10 4-qubit circuit with 10 parameters call, where the circuit will be differentiated
 over 50 trials, each time over a batch of 10 circuits.
 ```
-bazel run -c opt --cxxopt="-D_GLIBCXX_USE_CXX11_ABI=0" --cxxopt="-msse2" \
+bazel run -c opt --cxxopt="-D_GLIBCXX_USE_CXX11_ABI=1" --cxxopt="-msse2" \
   --cxxopt="-msse3" --cxxopt="-msse4" \
   benchmarks/scripts:benchmark_op_gradients -- \
   --n_moments 10 --n_qubits 4 --n_symbols 10 \

benchmarks/scripts/BUILD

@@ -1,3 +1,4 @@
+load("@local_config_cuda//cuda:build_defs.bzl", "if_cuda_is_configured")
 package(default_visibility = ["//visibility:public"])
 
 licenses(["notice"])
@@ -27,6 +28,18 @@ py_test(
     ],
 )
 
+py_test(
+    name = "benchmark_cuquantum_ops",
+    srcs = ["benchmark_cuquantum_ops.py"],
+    python_version = "PY3",
+    deps = [
+        "//tensorflow_quantum/core/ops:tfq_simulate_ops_cuquantum_py",
+        "//tensorflow_quantum/core/ops:tfq_simulate_ops_py",
+        "//tensorflow_quantum/core/serialize:serializer",
+        "@local_config_tf//:test_log_pb2",
+        "//tensorflow_quantum/python:util",
+    ],
+)
 py_test(
     name = "benchmark_op_gradients",
     srcs = ["benchmark_op_gradients.py"],

benchmarks/scripts/benchmark_clifford_circuit.py

@@ -11,7 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-# ==============================================================================
+# =============================================================================
 """Benchmark simulators against classically simulatable circuits."""
 import os
 import time