Merge branch 'master' into macos_repair_wheels

Author: 95-martin-orion

.github/workflows/bazeltest.yml

@@ -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/0.26.0/bazel_0.26.0-linux-x86_64.deb
-          sudo dpkg -i bazel_0.26.0-linux-x86_64.deb
+          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
       - 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/0.26.0/bazel_0.26.0-linux-x86_64.deb
-          sudo dpkg -i bazel_0.26.0-linux-x86_64.deb
+          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
       - 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/0.26.0/bazel_0.26.0-linux-x86_64.deb
-          sudo dpkg -i bazel_0.26.0-linux-x86_64.deb
+          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
       - name: Install google-perftools for tcmalloc
         run: sudo apt-get install libgoogle-perftools-dev
       - name: Run C++ tests

.github/workflows/cirq_compatibility.yml

@@ -7,7 +7,7 @@ on:
 jobs:
   consistency:
     name: Nightly Compatibility
-    runs-on: ubuntu-16.04
+    runs-on: ubuntu-18.04
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v1
@@ -18,5 +18,7 @@ jobs:
         run: pip3 install -U cirq --pre
       - name: Install qsim requirements
         run: pip3 install -r requirements.txt
+      - name: Install test requirements
+        run: pip3 install -r dev-requirements.txt
       - name: Run python tests
         run: make run-py-tests

.github/workflows/python_format.yml

@@ -24,9 +24,7 @@ jobs:
         with:
           python-version: '3.7'
           architecture: 'x64'
-      - name: Install flynt
-        run: cat requirements.txt | grep flynt | xargs pip install
-      - name: Install black
-        run: cat requirements.txt | grep black | xargs pip install
+      - name: Install dev requirements
+        run: pip install -r dev-requirements.txt
       - name: Format
         run: check/format-incremental

.github/workflows/release_wheels.yml

@@ -26,7 +26,7 @@ jobs:
             name: win_amd64
             architecture: x64
             cibw:
-              build: "cp*win_amd64"
+              build: "cp36-win_amd64 cp37-win_amd64 cp38-win_amd64 cp39-win_amd64"
     env:
       CIBW_BUILD: "${{ matrix.cibw.build || '*' }}"
       CIBW_ARCHS: "${{ matrix.cibw.arch || 'auto' }}"
@@ -36,7 +36,8 @@ jobs:
       # to install latest delocate package
       CIBW_DEPENDENCY_VERSIONS: "latest"
       # due to package and module name conflict have to temporarily move it away to run tests
-      CIBW_BEFORE_TEST: "mv {package}/qsimcirq /tmp"
+      CIBW_BEFORE_TEST: mv {package}/qsimcirq /tmp
+      CIBW_TEST_EXTRAS: "dev"
       CIBW_TEST_COMMAND: "pytest {package}/qsimcirq_tests/qsimcirq_test.py && mv /tmp/qsimcirq {package}"
     steps:
       - uses: actions/checkout@v2

.github/workflows/testing_wheels.yml

@@ -42,6 +42,7 @@ jobs:
       CIBW_DEPENDENCY_VERSIONS: "latest"
       # due to package and module name conflict have to temporarily move it away to run tests
       CIBW_BEFORE_TEST: "mv {package}/qsimcirq /tmp"
+      CIBW_TEST_EXTRAS: "dev"
       CIBW_TEST_COMMAND: "pytest {package}/qsimcirq_tests/qsimcirq_test.py && mv /tmp/qsimcirq {package}"
     steps:
       - uses: actions/checkout@v2

CMakeLists.txt

@@ -1,5 +1,15 @@
 cmake_minimum_required(VERSION 3.11)
-project(qsim)
+
+execute_process(COMMAND which nvcc OUTPUT_VARIABLE has_nvcc)
+if(has_nvcc STREQUAL "")
+    project(qsim)
+else()
+    project(qsim LANGUAGES CXX CUDA)
+    ADD_SUBDIRECTORY(pybind_interface/cuda)
+    if(DEFINED ENV{CUQUANTUM_DIR})
+        ADD_SUBDIRECTORY(pybind_interface/custatevec)
+    endif()
+endif()
 
 ADD_SUBDIRECTORY(pybind_interface/sse)
 ADD_SUBDIRECTORY(pybind_interface/avx512)

MANIFEST.in

@@ -1,4 +1,5 @@
 include requirements.txt
+include dev-requirements.txt
 include CMakeLists.txt
 
 graft pybind_interface

Makefile

@@ -11,13 +11,17 @@ CXXFLAGS = -O3 -fopenmp
 ARCHFLAGS = -march=native
 NVCCFLAGS = -O3
 
+# CUQUANTUM_DIR should be set.
+CUSTATEVECFLAGS = -I$(CUQUANTUM_DIR)/include -L${CUQUANTUM_DIR}/lib -L$(CUQUANTUM_DIR)/lib64 -lcustatevec -lcublas
+
 PYBIND11 = true
 
 export CXX
 export CXXFLAGS
 export ARCHFLAGS
 export NVCC
 export NVCCFLAGS
+export CUSTATEVECFLAGS
 
 ifeq ($(PYBIND11), true)
   TARGETS += pybind
@@ -35,6 +39,10 @@ qsim:
 qsim-cuda:
 	$(MAKE) -C apps/ qsim-cuda
 
+.PHONY: qsim-custatevec
+qsim-custatevec:
+	$(MAKE) -C apps/ qsim-custatevec
+
 .PHONY: pybind
 pybind:
 	$(MAKE) -C pybind_interface/ pybind
@@ -47,6 +55,10 @@ cxx-tests: eigen
 cuda-tests:
 	$(MAKE) -C tests/ cuda-tests
 
+.PHONY: custatevec-tests
+custatevec-tests:
+	$(MAKE) -C tests/ custatevec-tests
+
 .PHONY: run-cxx-tests
 run-cxx-tests: cxx-tests
 	$(MAKE) -C tests/ run-cxx-tests
@@ -55,6 +67,10 @@ run-cxx-tests: cxx-tests
 run-cuda-tests: cuda-tests
 	$(MAKE) -C tests/ run-cuda-tests
 
+.PHONY: run-custatevec-tests
+run-custatevec-tests: custatevec-tests
+	$(MAKE) -C tests/ run-custatevec-tests
+
 PYTESTS = $(shell find qsimcirq_tests/ -name '*_test.py')
 
 .PHONY: run-py-tests

README.md

@@ -85,12 +85,14 @@ located in [tests](https://github.com/quantumlib/qsim/tree/master/tests).
 Python tests use pytest, and are located in
 [qsimcirq_tests](https://github.com/quantumlib/qsim/tree/master/qsimcirq_tests).
 
-To build and run all tests, navigate to the test directory and run:
+To build and run all tests, run:
 ```
-make run-all
+make run-tests
 ```
 This will compile all test binaries to files with `.x` extensions, and run each
-test in series. Testing will stop early if a test fails.
+test in series. Testing will stop early if a test fails. It will also run tests
+of the `qsimcirq` python interface. To run C++ or python tests only, run
+`make run-cxx-tests` or `make run-py-tests`, respectively.
 
 To clean up generated test files, run `make clean` from the test directory.
 
@@ -125,4 +127,4 @@ An equivalent BibTex format reference is below for all the versions:
   doi          = {10.5281/zenodo.4023103},
   url          = {https://doi.org/10.5281/zenodo.4023103}
 }
-```
+```

apps/Makefile

@@ -1,21 +1,30 @@
 CXX_TARGETS = $(shell find . -maxdepth 1 -name '*.cc')
 CXX_TARGETS := $(CXX_TARGETS:%.cc=%.x)
 
-CUDA_TARGETS = $(shell find . -maxdepth 1 -name '*.cu')
-CUDA_TARGETS := $(CUDA_TARGETS:%.cu=%.x)
+CUDA_TARGETS = $(shell find . -maxdepth 1 -name '*cuda.cu')
+CUDA_TARGETS := $(CUDA_TARGETS:%cuda.cu=%cuda.x)
+
+CUSTATEVEC_TARGETS = $(shell find . -maxdepth 1 -name "*custatevec.cu")
+CUSTATEVEC_TARGETS := $(CUSTATEVEC_TARGETS:%custatevec.cu=%custatevec.x)
 
 .PHONY: qsim
 qsim: $(CXX_TARGETS)
 
 .PHONY: qsim-cuda
 qsim-cuda: $(CUDA_TARGETS)
 
+.PHONY: qsim-custatevec
+qsim-custatevec: $(CUSTATEVEC_TARGETS)
+
 %.x: %.cc
 	$(CXX) -o ./$@ $< $(CXXFLAGS) $(ARCHFLAGS)
 
-%.x: %.cu
+%cuda.x: %cuda.cu
 	$(NVCC) -o ./$@ $< $(NVCCFLAGS)
 
+%custatevec.x: %custatevec.cu
+	$(NVCC) -o ./$@ $< $(NVCCFLAGS) $(CUSTATEVECFLAGS)
+
 .PHONY: clean
 clean:
 	-rm -f ./*.x ./*.a ./*.so ./*.mod