From 8967675d63337471089a15d45d8c77fe93e0232a Mon Sep 17 00:00:00 2001 From: Jae Yoo Date: Fri, 17 Mar 2023 15:44:32 -0700 Subject: [PATCH 01/14] Upgrade to TFv2.11 and add CUDA support --- .bazelrc | 8 ++++++-- .gitignore | 6 ++++++ WORKSPACE | 25 ++++++++++++++++++++----- lib/BUILD | 17 +++++++---------- pybind_interface/Makefile | 2 +- tests/BUILD | 22 ++++++++++++++++++++-- 6 files changed, 60 insertions(+), 20 deletions(-) diff --git a/.bazelrc b/.bazelrc index 79fe3007b..a2559e630 100644 --- a/.bazelrc +++ b/.bazelrc @@ -1,6 +1,6 @@ # Default build options -build --copt -std=c++11 -build --copt -D_GLIBCXX_USE_CXX11_ABI=0 +build --copt -std=c++17 +build --copt -D_GLIBCXX_USE_CXX11_ABI=1 ##### Sanitizers (choose one, or nosan for none) ##### @@ -55,3 +55,7 @@ build:malloc -- # Test flags test --test_output=errors + +# CUDA options +build:cuda --@local_config_cuda//:enable_cuda +build --experimental_repo_remote_exec \ No newline at end of file diff --git a/.gitignore b/.gitignore index c71e8399f..4ef0dcb89 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,9 @@ bazel-* # Eigen library eigen + +# vscode +.vscode/* + +# Bazel files +/bazel-* \ No newline at end of file diff --git a/WORKSPACE b/WORKSPACE index f85022766..b6645f80d 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -20,17 +20,32 @@ http_archive( # https://github.com/tensorflow/quantum http_archive( name = "org_tensorflow", - sha256 = "e82f3b94d863e223881678406faa5071b895e1ff928ba18578d2adbbc6b42a4c", - strip_prefix = "tensorflow-2.1.0", + sha256 = "e52cda3bae45f0ae0fccd4055e9fa29892b414f70e2df94df9a3a10319c75fff", + strip_prefix = "tensorflow-2.11.0", urls = [ - "https://github.com/tensorflow/tensorflow/archive/v2.1.0.zip", + "https://github.com/tensorflow/tensorflow/archive/refs/tags/v2.11.0.zip", ], ) -EIGEN_COMMIT = "12e8d57108c50d8a63605c6eb0144c838c128337" -EIGEN_SHA256 = "f689246e342c3955af48d26ce74ac34d21b579a00675c341721a735937919b02" +EIGEN_COMMIT = "3bb6a48d8c171cf20b5f8e48bfb4e424fbd4f79e" +EIGEN_SHA256 = "eca9847b3fe6249e0234a342b78f73feec07d29f534e914ba5f920f3e09383a3" +load("@org_tensorflow//tensorflow:workspace3.bzl", "workspace") + +workspace() + +load("@org_tensorflow//tensorflow:workspace2.bzl", "workspace") + +workspace() + +load("@org_tensorflow//tensorflow:workspace1.bzl", "workspace") + +workspace() + +load("@org_tensorflow//tensorflow:workspace0.bzl", "workspace") + +workspace() http_archive( name = "eigen", diff --git a/lib/BUILD b/lib/BUILD index 9be39dea9..5a633a871 100644 --- a/lib/BUILD +++ b/lib/BUILD @@ -1,3 +1,5 @@ +load("@local_config_cuda//cuda:build_defs.bzl", "if_cuda_is_configured", "cuda_library") + package(default_visibility = ["//visibility:public"]) # Libraries of the following form: @@ -67,8 +69,7 @@ cc_library( ) # Full qsim library, including CUDA -# cuda_library -cc_library( +cuda_library( name = "qsim_cuda_lib", hdrs = [ "bits.h", @@ -247,8 +248,7 @@ cc_library( hdrs = ["util_cpu.h"], ) -# cuda_library -cc_library( +cuda_library( name = "util_cuda", hdrs = ["util_cuda.h"], ) @@ -408,8 +408,7 @@ cc_library( hdrs = ["vectorspace.h"], ) -# cuda_library -cc_library( +cuda_library( name = "vectorspace_cuda", hdrs = ["vectorspace_cuda.h"], ) @@ -462,8 +461,7 @@ cc_library( ], ) -# cuda_library -cc_library( +cuda_library( name = "statespace_cuda", hdrs = [ "statespace_cuda.h", @@ -520,8 +518,7 @@ cc_library( ], ) -# cuda_library -cc_library( +cuda_library( name = "simulator_cuda", hdrs = [ "simulator_cuda.h", diff --git a/pybind_interface/Makefile b/pybind_interface/Makefile index 8450bd17b..1a3ca4ae0 100644 --- a/pybind_interface/Makefile +++ b/pybind_interface/Makefile @@ -14,7 +14,7 @@ PYBINDFLAGS_AVX2 = -mavx2 -mfma -Wall -shared -std=c++17 -fPIC `python3 -m pybin PYBINDFLAGS_AVX512 = -mavx512f -mbmi2 -Wall -shared -std=c++17 -fPIC `python3 -m pybind11 --includes` # The flags for the compilation of GPU-specific Pybind11 interfaces -PYBINDFLAGS_CUDA = -std=c++14 -x cu -Xcompiler "-Wall -shared -fPIC `python3 -m pybind11 --includes`" +PYBINDFLAGS_CUDA = -std=c++17 -x cu -Xcompiler "-Wall -shared -fPIC `python3 -m pybind11 --includes`" # The flags for the compilation of cuStateVec-specific Pybind11 interfaces PYBINDFLAGS_CUSTATEVEC = $(CUSTATEVECFLAGS) $(PYBINDFLAGS_CUDA) diff --git a/tests/BUILD b/tests/BUILD index eda93a3ec..c8b64f16d 100644 --- a/tests/BUILD +++ b/tests/BUILD @@ -1,3 +1,5 @@ +load("@local_config_cuda//cuda:build_defs.bzl", "if_cuda_is_configured") + # Options for testing different simulator types. avx_copts = ['-mavx2', '-mfma'] avx512_copts = ['-march=native'] @@ -5,12 +7,12 @@ sse_copts = ['-msse4'] windows_copts = [ "/arch:AVX", - "/std:c++14", + "/std:c++17", ] windows_avx512_copts = [ "/arch:AVX512", - "/std:c++14", + "/std:c++17", ] config_setting( @@ -353,6 +355,22 @@ cc_test( }), ) +cc_test( + name = "simulator_cuda_test", + srcs = ["simulator_cuda_test.cu"], + deps = [ + ":simulator_testfixture", + "@com_google_googletest//:gtest_main", + "//lib:parfor", + "//lib:seqfor", + ] + if_cuda_is_configured(["//lib:simulator_cuda"]), + linkshared = 1, + copts = select({ + ":windows": windows_copts + ["/D__CLANG_SUPPORT_DYN_ANNOTATION__", "/DEIGEN_MPL2_ONLY", "/DEIGEN_MAX_ALIGN_BYTES=64", "/DEIGEN_HAS_TYPE_TRAITS=0", "/DTF_USE_SNAPPY", "/showIncludes", "/MD", "/O2", "/DNDEBUG", "/w", "-DWIN32_LEAN_AND_MEAN", "-DNOGDI", "/d2ReducedOptimizeHugeFunctions", "/arch:AVX", "/std:c++17", "-DTENSORFLOW_MONOLITHIC_BUILD", "/DPLATFORM_WINDOWS", "/DEIGEN_HAS_C99_MATH", "/DTENSORFLOW_USE_EIGEN_THREADPOOL", "/DEIGEN_AVOID_STL_ARRAY", "/Iexternal/gemmlowp", "/wd4018", "/wd4577", "/DNOGDI", "/UTF_COMPILE_LIBRARY"], + "//conditions:default": ["-pthread", "-std=c++17", "-D_GLIBCXX_USE_CXX11_ABI=1"], + }) + if_cuda_is_configured(["-DTENSORFLOW_USE_NVCC=1", "-DGOOGLE_CUDA=1", "-x cuda", "-nvcc_options=relaxed-constexpr", "-nvcc_options=ftz=true"]), +) + cc_library( name = "statespace_testfixture", hdrs = ["statespace_testfixture.h"], From b31c9ff3419d92b9be7af07c342865c8ea7dc3a3 Mon Sep 17 00:00:00 2001 From: Jae Yoo Date: Fri, 17 Mar 2023 16:38:35 -0700 Subject: [PATCH 02/14] Fix bazel version to 5.1.0 --- .bazelversion | 1 + 1 file changed, 1 insertion(+) create mode 100644 .bazelversion diff --git a/.bazelversion b/.bazelversion new file mode 100644 index 000000000..831446cbd --- /dev/null +++ b/.bazelversion @@ -0,0 +1 @@ +5.1.0 From 5593192d2da2cbd6d12c52bac540be69852b64e2 Mon Sep 17 00:00:00 2001 From: Jae Yoo Date: Fri, 17 Mar 2023 22:58:10 -0700 Subject: [PATCH 03/14] Remove linkshared --- tests/BUILD | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/BUILD b/tests/BUILD index c8b64f16d..69c84ce0c 100644 --- a/tests/BUILD +++ b/tests/BUILD @@ -364,7 +364,6 @@ cc_test( "//lib:parfor", "//lib:seqfor", ] + if_cuda_is_configured(["//lib:simulator_cuda"]), - linkshared = 1, copts = select({ ":windows": windows_copts + ["/D__CLANG_SUPPORT_DYN_ANNOTATION__", "/DEIGEN_MPL2_ONLY", "/DEIGEN_MAX_ALIGN_BYTES=64", "/DEIGEN_HAS_TYPE_TRAITS=0", "/DTF_USE_SNAPPY", "/showIncludes", "/MD", "/O2", "/DNDEBUG", "/w", "-DWIN32_LEAN_AND_MEAN", "-DNOGDI", "/d2ReducedOptimizeHugeFunctions", "/arch:AVX", "/std:c++17", "-DTENSORFLOW_MONOLITHIC_BUILD", "/DPLATFORM_WINDOWS", "/DEIGEN_HAS_C99_MATH", "/DTENSORFLOW_USE_EIGEN_THREADPOOL", "/DEIGEN_AVOID_STL_ARRAY", "/Iexternal/gemmlowp", "/wd4018", "/wd4577", "/DNOGDI", "/UTF_COMPILE_LIBRARY"], "//conditions:default": ["-pthread", "-std=c++17", "-D_GLIBCXX_USE_CXX11_ABI=1"], From 64fcd2dcc5fefa99bb661bdb074fb96465867699 Mon Sep 17 00:00:00 2001 From: Jae Yoo Date: Fri, 17 Mar 2023 23:00:04 -0700 Subject: [PATCH 04/14] Fix test_libs.sh --- build_tools/test_libs.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) mode change 100644 => 100755 build_tools/test_libs.sh diff --git a/build_tools/test_libs.sh b/build_tools/test_libs.sh old mode 100644 new mode 100755 index cfb90f66c..e360f0290 --- a/build_tools/test_libs.sh +++ b/build_tools/test_libs.sh @@ -19,7 +19,7 @@ fi set e # Ignore errors until artifacts are collected. EXIT_CODE=0 for TARGET in bitstring_test channels_cirq_test circuit_qsim_parser_test expect_test \ - fuser_basic_test gates_qsim_test hybrid_test matrix_test qtrajectory_test \ + fuser_basic_test gates_qsim_test hybrid_avx_test matrix_test qtrajectory_avx_test \ run_qsim_test run_qsimh_test simulator_basic_test simulator_sse_test statespace_basic_test \ statespace_sse_test unitary_calculator_basic_test unitary_calculator_sse_test \ unitaryspace_basic_test unitaryspace_sse_test vectorspace_test; do \ From 41fd7a2d8cbc9693d31e1b3c5d8da6b46693bc1c Mon Sep 17 00:00:00 2001 From: Jae Yoo Date: Fri, 17 Mar 2023 23:05:32 -0700 Subject: [PATCH 05/14] Update Eigen version to be compatible with TFv2.11 --- WORKSPACE | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index b6645f80d..15b3d57c8 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -27,10 +27,6 @@ http_archive( ], ) - -EIGEN_COMMIT = "3bb6a48d8c171cf20b5f8e48bfb4e424fbd4f79e" -EIGEN_SHA256 = "eca9847b3fe6249e0234a342b78f73feec07d29f534e914ba5f920f3e09383a3" - load("@org_tensorflow//tensorflow:workspace3.bzl", "workspace") workspace() @@ -47,6 +43,11 @@ load("@org_tensorflow//tensorflow:workspace0.bzl", "workspace") workspace() + +EIGEN_COMMIT = "3bb6a48d8c171cf20b5f8e48bfb4e424fbd4f79e" +EIGEN_SHA256 = "eca9847b3fe6249e0234a342b78f73feec07d29f534e914ba5f920f3e09383a3" + + http_archive( name = "eigen", build_file_content = """ From 6b175b2a3f6bb2ac342cac67f58d2618ed040d51 Mon Sep 17 00:00:00 2001 From: Jae Yoo Date: Fri, 17 Mar 2023 23:05:55 -0700 Subject: [PATCH 06/14] Update numpy version to be compatible with TF v2.11 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 26173852a..a62b52b88 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ absl-py cirq-core~=1.0 -numpy~=1.16 +numpy==1.24.2 pybind11 typing_extensions From 515641ccb328c09a1a2f1bae3ba7a24c6f9c84ef Mon Sep 17 00:00:00 2001 From: Jae Yoo Date: Fri, 17 Mar 2023 23:06:28 -0700 Subject: [PATCH 07/14] Update Makefile Eigen version --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 7cdaa4149..2a585b5ce 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -EIGEN_PREFIX = "d10b27fe37736d2944630ecd7557cefa95cf87c9" +EIGEN_PREFIX = "3bb6a48d8c171cf20b5f8e48bfb4e424fbd4f79e" EIGEN_URL = "https://gitlab.com/libeigen/eigen/-/archive/" TARGETS = qsim From 076adfb9b59aaf5b629fbed8d6620498036de092 Mon Sep 17 00:00:00 2001 From: Jae Yoo Date: Fri, 17 Mar 2023 23:06:46 -0700 Subject: [PATCH 08/14] Update bazeltest bazel version --- .github/workflows/bazeltest.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/bazeltest.yml b/.github/workflows/bazeltest.yml index 5284ca3de..5b951a5fa 100644 --- a/.github/workflows/bazeltest.yml +++ b/.github/workflows/bazeltest.yml @@ -9,7 +9,7 @@ on: pull_request: jobs: - # Run tests with Bazel v0.26. + # Run tests with Bazel v5.1.0. test: name: Test with Bazel runs-on: ubuntu-20.04 @@ -26,8 +26,8 @@ jobs: run: git submodule update --init --recursive - name: Install Bazel on CI run: | - wget https://github.com/bazelbuild/bazel/releases/download/3.7.2/bazel_3.7.2-linux-x86_64.deb - sudo dpkg -i bazel_3.7.2-linux-x86_64.deb + wget https://github.com/bazelbuild/bazel/releases/download/5.1.0/bazel_5.1.0-linux-x86_64.deb + sudo dpkg -i bazel_5.1.0-linux-x86_64.deb - name: Run C++ tests run: | bazel test --config=${{ matrix.hardware_opt }} \ @@ -52,8 +52,8 @@ jobs: run: git submodule update --init --recursive - name: Install Bazel on CI run: | - wget https://github.com/bazelbuild/bazel/releases/download/3.7.2/bazel_3.7.2-linux-x86_64.deb - sudo dpkg -i bazel_3.7.2-linux-x86_64.deb + wget https://github.com/bazelbuild/bazel/releases/download/5.1.0/bazel_5.1.0-linux-x86_64.deb + sudo dpkg -i bazel_5.1.0-linux-x86_64.deb - name: Run C++ tests run: | bazel test --config=avx --config=openmp \ @@ -69,8 +69,8 @@ jobs: run: git submodule update --init --recursive - name: Install Bazel on CI run: | - wget https://github.com/bazelbuild/bazel/releases/download/3.7.2/bazel_3.7.2-linux-x86_64.deb - sudo dpkg -i bazel_3.7.2-linux-x86_64.deb + wget https://github.com/bazelbuild/bazel/releases/download/5.1.0/bazel_5.1.0-linux-x86_64.deb + sudo dpkg -i bazel_5.1.0-linux-x86_64.deb - name: Install google-perftools for tcmalloc run: sudo apt-get install libgoogle-perftools-dev - name: Run C++ tests From cdf2804a13e9a36e1605937a871ac57a1d6f4497 Mon Sep 17 00:00:00 2001 From: Jae Yoo Date: Fri, 17 Mar 2023 23:10:17 -0700 Subject: [PATCH 09/14] Add intalling requirements.txt step at bazeltest --- .github/workflows/bazeltest.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/workflows/bazeltest.yml b/.github/workflows/bazeltest.yml index 5b951a5fa..f98dc083a 100644 --- a/.github/workflows/bazeltest.yml +++ b/.github/workflows/bazeltest.yml @@ -28,6 +28,9 @@ jobs: run: | wget https://github.com/bazelbuild/bazel/releases/download/5.1.0/bazel_5.1.0-linux-x86_64.deb sudo dpkg -i bazel_5.1.0-linux-x86_64.deb + - name: Install requirements + run: | + python3 -m pip install -r requirements.txt - name: Run C++ tests run: | bazel test --config=${{ matrix.hardware_opt }} \ @@ -54,6 +57,9 @@ jobs: run: | wget https://github.com/bazelbuild/bazel/releases/download/5.1.0/bazel_5.1.0-linux-x86_64.deb sudo dpkg -i bazel_5.1.0-linux-x86_64.deb + - name: Install requirements + run: | + python3 -m pip install -r requirements.txt - name: Run C++ tests run: | bazel test --config=avx --config=openmp \ @@ -71,6 +77,9 @@ jobs: run: | wget https://github.com/bazelbuild/bazel/releases/download/5.1.0/bazel_5.1.0-linux-x86_64.deb sudo dpkg -i bazel_5.1.0-linux-x86_64.deb + - name: Install requirements + run: | + python3 -m pip install -r requirements.txt - name: Install google-perftools for tcmalloc run: sudo apt-get install libgoogle-perftools-dev - name: Run C++ tests From 9c0c9389b69722abdc9f3bd840f0a5070e9777cd Mon Sep 17 00:00:00 2001 From: Jae Yoo Date: Fri, 17 Mar 2023 23:15:58 -0700 Subject: [PATCH 10/14] Add more requirements install --- .github/workflows/release_wheels.yml | 3 +++ .github/workflows/testing_wheels.yml | 3 +++ 2 files changed, 6 insertions(+) diff --git a/.github/workflows/release_wheels.yml b/.github/workflows/release_wheels.yml index 735079ade..5463f5ce1 100644 --- a/.github/workflows/release_wheels.yml +++ b/.github/workflows/release_wheels.yml @@ -49,6 +49,9 @@ jobs: - name: Install cibuildwheel and twine run: python -m pip install cibuildwheel==2.2.2 + - name: Install requirements + run: python -m pip install -r requirements.txt + - name: Run C++ tests run: bash build_tools/test_libs.sh diff --git a/.github/workflows/testing_wheels.yml b/.github/workflows/testing_wheels.yml index 7c4aa911d..e63671f58 100644 --- a/.github/workflows/testing_wheels.yml +++ b/.github/workflows/testing_wheels.yml @@ -54,6 +54,9 @@ jobs: - name: Install cibuildwheel and twine run: python -m pip install cibuildwheel==2.2.2 + - name: Install requirements + run: python -m pip install -r requirements.txt + - name: Run C++ tests run: bash build_tools/test_libs.sh From 5ceeacfcea189cfb983a290daf7703959dca9d0a Mon Sep 17 00:00:00 2001 From: Jae Yoo Date: Sat, 18 Mar 2023 01:10:27 -0700 Subject: [PATCH 11/14] Clean tests, remove cc_test for cuda --- .bazelrc | 3 ++- lib/BUILD | 2 +- tests/BUILD | 17 ----------------- 3 files changed, 3 insertions(+), 19 deletions(-) diff --git a/.bazelrc b/.bazelrc index a2559e630..16c8a51dc 100644 --- a/.bazelrc +++ b/.bazelrc @@ -1,6 +1,7 @@ # Default build options build --copt -std=c++17 build --copt -D_GLIBCXX_USE_CXX11_ABI=1 +build --experimental_repo_remote_exec ##### Sanitizers (choose one, or nosan for none) ##### @@ -58,4 +59,4 @@ test --test_output=errors # CUDA options build:cuda --@local_config_cuda//:enable_cuda -build --experimental_repo_remote_exec \ No newline at end of file +build:cuda --define=using_cuda=true --define=using_cuda_nvcc=true diff --git a/lib/BUILD b/lib/BUILD index 5a633a871..452de649f 100644 --- a/lib/BUILD +++ b/lib/BUILD @@ -1,4 +1,4 @@ -load("@local_config_cuda//cuda:build_defs.bzl", "if_cuda_is_configured", "cuda_library") +load("@local_config_cuda//cuda:build_defs.bzl", "cuda_library") package(default_visibility = ["//visibility:public"]) diff --git a/tests/BUILD b/tests/BUILD index 69c84ce0c..9b31c1187 100644 --- a/tests/BUILD +++ b/tests/BUILD @@ -1,5 +1,3 @@ -load("@local_config_cuda//cuda:build_defs.bzl", "if_cuda_is_configured") - # Options for testing different simulator types. avx_copts = ['-mavx2', '-mfma'] avx512_copts = ['-march=native'] @@ -355,21 +353,6 @@ cc_test( }), ) -cc_test( - name = "simulator_cuda_test", - srcs = ["simulator_cuda_test.cu"], - deps = [ - ":simulator_testfixture", - "@com_google_googletest//:gtest_main", - "//lib:parfor", - "//lib:seqfor", - ] + if_cuda_is_configured(["//lib:simulator_cuda"]), - copts = select({ - ":windows": windows_copts + ["/D__CLANG_SUPPORT_DYN_ANNOTATION__", "/DEIGEN_MPL2_ONLY", "/DEIGEN_MAX_ALIGN_BYTES=64", "/DEIGEN_HAS_TYPE_TRAITS=0", "/DTF_USE_SNAPPY", "/showIncludes", "/MD", "/O2", "/DNDEBUG", "/w", "-DWIN32_LEAN_AND_MEAN", "-DNOGDI", "/d2ReducedOptimizeHugeFunctions", "/arch:AVX", "/std:c++17", "-DTENSORFLOW_MONOLITHIC_BUILD", "/DPLATFORM_WINDOWS", "/DEIGEN_HAS_C99_MATH", "/DTENSORFLOW_USE_EIGEN_THREADPOOL", "/DEIGEN_AVOID_STL_ARRAY", "/Iexternal/gemmlowp", "/wd4018", "/wd4577", "/DNOGDI", "/UTF_COMPILE_LIBRARY"], - "//conditions:default": ["-pthread", "-std=c++17", "-D_GLIBCXX_USE_CXX11_ABI=1"], - }) + if_cuda_is_configured(["-DTENSORFLOW_USE_NVCC=1", "-DGOOGLE_CUDA=1", "-x cuda", "-nvcc_options=relaxed-constexpr", "-nvcc_options=ftz=true"]), -) - cc_library( name = "statespace_testfixture", hdrs = ["statespace_testfixture.h"], From b7f940b6008d0a774ccab087883c0f9cbc2ca794 Mon Sep 17 00:00:00 2001 From: "Jae H. Yoo" <40815393+jaeyoo@users.noreply.github.com> Date: Fri, 24 Mar 2023 20:51:37 -0700 Subject: [PATCH 12/14] Update bazel version to 5.3.0 --- .github/workflows/bazeltest.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/bazeltest.yml b/.github/workflows/bazeltest.yml index f98dc083a..6eb6a2611 100644 --- a/.github/workflows/bazeltest.yml +++ b/.github/workflows/bazeltest.yml @@ -9,7 +9,7 @@ on: pull_request: jobs: - # Run tests with Bazel v5.1.0. + # Run tests with Bazel v5.3.0. test: name: Test with Bazel runs-on: ubuntu-20.04 @@ -26,8 +26,8 @@ jobs: run: git submodule update --init --recursive - name: Install Bazel on CI run: | - wget https://github.com/bazelbuild/bazel/releases/download/5.1.0/bazel_5.1.0-linux-x86_64.deb - sudo dpkg -i bazel_5.1.0-linux-x86_64.deb + wget https://github.com/bazelbuild/bazel/releases/download/5.3.0/bazel_5.3.0-linux-x86_64.deb + sudo dpkg -i bazel_5.3.0-linux-x86_64.deb - name: Install requirements run: | python3 -m pip install -r requirements.txt @@ -55,8 +55,8 @@ jobs: run: git submodule update --init --recursive - name: Install Bazel on CI run: | - wget https://github.com/bazelbuild/bazel/releases/download/5.1.0/bazel_5.1.0-linux-x86_64.deb - sudo dpkg -i bazel_5.1.0-linux-x86_64.deb + wget https://github.com/bazelbuild/bazel/releases/download/5.3.0/bazel_5.3.0-linux-x86_64.deb + sudo dpkg -i bazel_5.3.0-linux-x86_64.deb - name: Install requirements run: | python3 -m pip install -r requirements.txt @@ -75,8 +75,8 @@ jobs: run: git submodule update --init --recursive - name: Install Bazel on CI run: | - wget https://github.com/bazelbuild/bazel/releases/download/5.1.0/bazel_5.1.0-linux-x86_64.deb - sudo dpkg -i bazel_5.1.0-linux-x86_64.deb + wget https://github.com/bazelbuild/bazel/releases/download/5.3.0/bazel_5.3.0-linux-x86_64.deb + sudo dpkg -i bazel_5.3.0-linux-x86_64.deb - name: Install requirements run: | python3 -m pip install -r requirements.txt From 8e00222ad04d36c1c513c88305d39154d2105260 Mon Sep 17 00:00:00 2001 From: "Jae H. Yoo" <40815393+jaeyoo@users.noreply.github.com> Date: Sun, 26 Mar 2023 18:18:53 -0700 Subject: [PATCH 13/14] Update requirements.txt --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index a62b52b88..fb9f10c1e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ absl-py cirq-core~=1.0 -numpy==1.24.2 +numpy==1.21.6 pybind11 typing_extensions From b7322aea2862b75f81bbcb182b82fa9ac8d90d5d Mon Sep 17 00:00:00 2001 From: "Jae H. Yoo" <40815393+jaeyoo@users.noreply.github.com> Date: Sun, 26 Mar 2023 20:50:42 -0700 Subject: [PATCH 14/14] Update requirements.txt --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index fb9f10c1e..056b76c61 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ absl-py cirq-core~=1.0 -numpy==1.21.6 +numpy==1.21.1 pybind11 typing_extensions