Merge branch 'master' into mhucka-fix-circuit-parser-warnings

Author: mhucka

WORKSPACE

@@ -12,6 +12,7 @@ EIGEN_COMMIT = "aa6964bf3a34fd607837dd8123bc42465185c4f8"
 
 http_archive(
     name = "eigen",
+    sha256 = "35ba771e30c735a4215ed784d7e032086cf89fe6622dce4d793c45dd74373362",
     build_file_content = """
 cc_library(
   name = "eigen3",
@@ -41,7 +42,7 @@ http_archive(
     patches = [
         "//third_party/tf:tf.patch",
     ],
-    # sha256 = "e52cda3bae45f0ae0fccd4055e9fa29892b414f70e2df94df9a3a10319c75fff",
+    sha256 = "f771db8d96ca13c72f73c85c9cfb6f5358e2de3dd62a97a9ae4b672fe4c6d094",
     strip_prefix = "tensorflow-2.15.0",
     urls = [
         "https://github.com/tensorflow/tensorflow/archive/refs/tags/v2.15.0.zip",

configure.sh

@@ -102,6 +102,28 @@ write_to_bazelrc "build -c opt"
 write_to_bazelrc "build --cxxopt=\"-D_GLIBCXX_USE_CXX11_ABI=1\""
 write_to_bazelrc "build --cxxopt=\"-std=c++17\""
 
+# The transitive inclusion of build rules from TensorFlow ends up including
+# and building two copies of zlib (one from bazel_rules, one from the TF code
+# baase itself). The version of zlib you get (at least in TF 2.15.0) ends up
+# producing many compiler warnings that "a function declaration without a
+# prototype is deprecated". It's difficult to patch the particular build rules
+# involved, so the approach taken here is to silence those warnings for stuff
+# in external/. TODO: figure out how to patch the BUILD files and put it there.
+write_to_bazelrc "build --per_file_copt=external/.*@-Wno-deprecated-non-prototype"
+write_to_bazelrc "build --host_per_file_copt=external/.*@-Wno-deprecated-non-prototype"
+
+# Similarly, these are other harmless warnings about unused functions coming
+# from things pulled in by the TF bazel config rules.
+write_to_bazelrc "build --per_file_copt=external/com_google_protobuf/.*@-Wno-unused-function"
+write_to_bazelrc "build --host_per_file_copt=external/com_google_protobuf/.*@-Wno-unused-function"
+
+# The following supress warnings coming from qsim.
+# TODO: fix the code in qsim & update TFQ to use the updated version.
+write_to_bazelrc "build --per_file_copt=tensorflow_quantum/core/ops/noise/tfq_.*@-Wno-unused-but-set-variable"
+write_to_bazelrc "build --host_per_file_copt=tensorflow_quantum/core/ops/noise/tfq_.*@-Wno-unused-but-set-variable"
+write_to_bazelrc "build --per_file_copt=tensorflow_quantum/core/ops/math_ops/tfq_.*@-Wno-deprecated-declarations"
+write_to_bazelrc "build --host_per_file_copt=tensorflow_quantum/core/ops/math_ops/tfq_.*@-Wno-deprecated-declarations"
+
 
 if is_windows; then
   # Use pywrap_tensorflow instead of tensorflow_framework on Windows