Skip to content

Commit d789314

Browse files
committed
Merge remote-tracking branch 'forkB/fix_warnings'
2 parents fe3a96e + 01471ee commit d789314

File tree

157 files changed

+1300
-318
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

157 files changed

+1300
-318
lines changed

.bazelversion

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
5.1.0
1+
5.3.0

.github/workflows/ci.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on: [pull_request]
55
jobs:
66
lint:
77
name: Lint check
8-
runs-on: ubuntu-18.04
8+
runs-on: ubuntu-20.04
99
steps:
1010
- uses: actions/checkout@v1
1111
- uses: actions/setup-python@v1
@@ -19,7 +19,7 @@ jobs:
1919

2020
format:
2121
name: Formatting check
22-
runs-on: ubuntu-18.04
22+
runs-on: ubuntu-20.04
2323

2424
steps:
2525
- uses: actions/checkout@v1
@@ -34,7 +34,7 @@ jobs:
3434

3535
wheel-build:
3636
name: Wheel test
37-
runs-on: ubuntu-18.04
37+
runs-on: ubuntu-20.04
3838

3939
steps:
4040
- uses: actions/checkout@v1
@@ -53,7 +53,7 @@ jobs:
5353

5454
bazel-tests:
5555
name: Library tests
56-
runs-on: ubuntu-18.04
56+
runs-on: ubuntu-20.04
5757
needs: [lint, format]
5858

5959
steps:
@@ -71,7 +71,7 @@ jobs:
7171

7272
leak-tests:
7373
name: Memory Leak tests
74-
runs-on: ubuntu-18.04
74+
runs-on: ubuntu-20.04
7575
needs: [lint, format]
7676

7777
steps:
@@ -89,7 +89,7 @@ jobs:
8989

9090
tutorials-test:
9191
name: Tutorial tests
92-
runs-on: ubuntu-18.04
92+
runs-on: ubuntu-20.04
9393
needs: [lint, format, wheel-build]
9494

9595
steps:

.github/workflows/cirq_compatibility.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
12
name: Cirq Compatibility
23

34
on:
@@ -7,7 +8,7 @@ on:
78
jobs:
89
consistency:
910
name: Nightly Compatibility
10-
runs-on: ubuntu-16.04
11+
runs-on: ubuntu-20.04
1112
steps:
1213
- uses: actions/checkout@v1
1314
- uses: actions/setup-python@v1

WORKSPACE

Lines changed: 29 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,19 @@ cc_library(
2424
],
2525
)
2626

27+
# http_archive(
28+
# name = "qsim",
29+
# sha256 = "b9c1eba09a885a938b5e73dfc2e02f5231cf3b01d899415caa24769346a731d5",
30+
# strip_prefix = "qsim-0.13.3",
31+
# urls = ["https://github.com/quantumlib/qsim/archive/refs/tags/v0.13.3.zip"],
32+
# )
33+
34+
# TODO: After merging this patch later into qsim mainstream, remove this and uncomment the above.
2735
http_archive(
2836
name = "qsim",
29-
sha256 = "b9c1eba09a885a938b5e73dfc2e02f5231cf3b01d899415caa24769346a731d5",
30-
strip_prefix = "qsim-0.13.3",
31-
urls = ["https://github.com/quantumlib/qsim/archive/refs/tags/v0.13.3.zip"],
37+
sha256 = "",
38+
strip_prefix = "qsim-0.15.0-dev20230327_v3",
39+
urls = ["https://github.com/jaeyoo/qsim/archive/refs/tags/v0.15.0+dev20230327_v3.tar.gz"],
3240
)
3341

3442
http_archive(
@@ -73,3 +81,21 @@ bind(
7381
actual = "@six_archive//:six",
7482
)
7583

84+
new_local_repository(
85+
name = "cuquantum_libs",
86+
path = "/usr/local/google/home/jaeyoo/workspace/cuquantum-linux-x86_64-22.11.0.13-archive",
87+
build_file_content = """
88+
cc_library(
89+
name = "custatevec_headers",
90+
srcs = ["include/custatevec.h"],
91+
visibility = ["//visibility:public"],
92+
)
93+
94+
cc_library(
95+
name = "custatevec",
96+
srcs = ["lib/libcustatevec.so"],
97+
visibility = ["//visibility:public"],
98+
)
99+
""",
100+
)
101+

benchmarks/scripts/benchmark_clifford_circuit.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
14-
# ==============================================================================
14+
# =============================================================================
1515
"""Benchmark simulators against classically simulatable circuits."""
1616
import os
1717
import time

benchmarks/scripts/benchmark_op_gradients.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
14-
# ==============================================================================
14+
# =============================================================================
1515
"""Benchmark differentiator methods."""
1616
import os
1717
import time

benchmarks/scripts/benchmark_random_circuit.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
14-
# ==============================================================================
14+
# =============================================================================
1515
"""Benchmark simulators against classically intractable 'supremacy' circuits."""
1616
import os
1717
import time

benchmarks/scripts/benchmark_util.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
14-
# ==============================================================================
14+
# =============================================================================
1515
"""Utility functions for benchmark tools."""
1616
import tensorflow as tf
1717
import test_log_pb2

benchmarks/scripts/benchmark_util_test.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
14-
# ==============================================================================
14+
# =============================================================================
1515
"""Tests for utilities related to reading/running benchmarks."""
1616
import os
1717
import tempfile

benchmarks/scripts/flags.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
14-
# ==============================================================================
14+
# =============================================================================
1515
"""Command line flags shared between benchmarks."""
1616
from collections import namedtuple
1717
from absl import flags as absl_flags

0 commit comments

Comments
 (0)