Merge pull request #596 from jaeyoo/cuda_enabled

95-martin-orion · web-flow · commit d747970d36f7 · 2023-04-12T13:51:29.000-07:00
Cuda enabled - SimulatorCUDA
diff --git a/.bazelrc b/.bazelrc
@@ -1,6 +1,7 @@
 # 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
+build --experimental_repo_remote_exec
 
 ##### Sanitizers (choose one, or nosan for none) #####
 
@@ -55,3 +56,7 @@ build:malloc --
 
 # Test flags
 test --test_output=errors
+
+# CUDA options
+build:cuda --@local_config_cuda//:enable_cuda
+build:cuda --define=using_cuda=true --define=using_cuda_nvcc=true
diff --git a/.bazelversion b/.bazelversion
@@ -0,0 +1 @@
+5.3.0
diff --git 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.3.0.
   test:
     name: Test with Bazel
     runs-on: ubuntu-20.04
@@ -26,8 +26,11 @@ 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.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
       - name: Run C++ tests
         run: |
           bazel test --config=${{ matrix.hardware_opt }} \
@@ -52,8 +55,11 @@ 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.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
       - name: Run C++ tests
         run: |
           bazel test --config=avx --config=openmp \
@@ -69,8 +75,11 @@ 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.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
       - name: Install google-perftools for tcmalloc
         run: sudo apt-get install libgoogle-perftools-dev
       - name: Run C++ tests
diff --git 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
@@ -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
 
diff --git a/.gitignore b/.gitignore
@@ -20,3 +20,9 @@ bazel-*
 
 # Eigen library
 eigen
+
+# vscode
+.vscode/*
+
+# Bazel files
+/bazel-*
diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-EIGEN_PREFIX = "d10b27fe37736d2944630ecd7557cefa95cf87c9"
+EIGEN_PREFIX = "3bb6a48d8c171cf20b5f8e48bfb4e424fbd4f79e"
 EIGEN_URL = "https://gitlab.com/libeigen/eigen/-/archive/"
 
 TARGETS = qsim
diff --git a/WORKSPACE b/WORKSPACE
@@ -20,16 +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",
     ],
 )
 
+load("@org_tensorflow//tensorflow:workspace3.bzl", "workspace")
 
-EIGEN_COMMIT = "12e8d57108c50d8a63605c6eb0144c838c128337"
-EIGEN_SHA256 = "f689246e342c3955af48d26ce74ac34d21b579a00675c341721a735937919b02"
+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()
+
+
+EIGEN_COMMIT = "3bb6a48d8c171cf20b5f8e48bfb4e424fbd4f79e"
+EIGEN_SHA256 = "eca9847b3fe6249e0234a342b78f73feec07d29f534e914ba5f920f3e09383a3"
 
 
 http_archive(
diff --git 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 \
diff --git a/lib/BUILD b/lib/BUILD
@@ -1,10 +1,6 @@
-package(default_visibility = ["//visibility:public"])
+load("@local_config_cuda//cuda:build_defs.bzl", "cuda_library")
 
-# Libraries of the following form:
-#   # cuda_library
-#   cc_library(...)
-# are converted to cuda_library rules when imported to the Google codebase.
-# Do not modify this tag.
+package(default_visibility = ["//visibility:public"])
 
 ##### Aggregate libraries #####
 
@@ -67,8 +63,7 @@ cc_library(
 )
 
 # Full qsim library, including CUDA
-# cuda_library
-cc_library(
+cuda_library(
     name = "qsim_cuda_lib",
     hdrs = [
         "bits.h",
@@ -99,6 +94,7 @@ cc_library(
         "run_qsimh.h",
         "seqfor.h",
         "simmux.h",
+        "simmux_gpu.h",
         "simulator.h",
         "simulator_avx.h",
         "simulator_avx512.h",
@@ -247,8 +243,7 @@ cc_library(
     hdrs = ["util_cpu.h"],
 )
 
-# cuda_library
-cc_library(
+cuda_library(
     name = "util_cuda",
     hdrs = ["util_cuda.h"],
 )
@@ -408,8 +403,7 @@ cc_library(
     hdrs = ["vectorspace.h"],
 )
 
-# cuda_library
-cc_library(
+cuda_library(
     name = "vectorspace_cuda",
     hdrs = ["vectorspace_cuda.h"],
 )
@@ -462,8 +456,7 @@ cc_library(
     ],
 )
 
-# cuda_library
-cc_library(
+cuda_library(
     name = "statespace_cuda",
     hdrs = [
         "statespace_cuda.h",
@@ -520,8 +513,7 @@ cc_library(
     ],
 )
 
-# cuda_library
-cc_library(
+cuda_library(
     name = "simulator_cuda",
     hdrs = [
         "simulator_cuda.h",
diff --git a/lib/simmux_gpu.h b/lib/simmux_gpu.h
@@ -0,0 +1,30 @@
+// Copyright 2023 Google LLC. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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.
+
+#ifndef SIMMUX_GPU_H_
+#define SIMMUX_GPU_H_
+
+#ifdef __CUSTATEVEC__
+# include "simulator_custatevec.h"
+  namespace qsim {
+    using SimulatorGpu = SimulatorCuStateVec;
+  }
+#else
+# include "simulator_cuda.h"
+  namespace qsim {
+    using SimulatorGpu = SimulatorCUDA;
+  }
+#endif
+
+#endif  // SIMMUX_GPU_H_
diff --git 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
@@ -5,12 +5,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(

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-EIGEN_PREFIX = "d10b27fe37736d2944630ecd7557cefa95cf87c9"`
	`1`	`+EIGEN_PREFIX = "3bb6a48d8c171cf20b5f8e48bfb4e424fbd4f79e"`
`2`	`2`	`EIGEN_URL = "https://gitlab.com/libeigen/eigen/-/archive/"`
`3`	`3`
`4`	`4`	`TARGETS = qsim`