Merge branch 'master' into mh-add-bazelrc-verbose

Author: mhucka

WORKSPACE

@@ -11,9 +11,9 @@ http_archive(
 
 http_archive(
     name = "com_google_googletest",
-    sha256 = "ab78fa3f912d44d38b785ec011a25f26512aaedc5291f51f3807c592b506d33a",
-    strip_prefix = "googletest-58d77fa8070e8cec2dc1ed015d66b454c8d78850",
-    url = "https://github.com/google/googletest/archive/58d77fa8070e8cec2dc1ed015d66b454c8d78850.zip",
+    sha256 = "40d4ec942217dcc84a9ebe2a68584ada7d4a33a8ee958755763278ea1c5e18ff",
+    strip_prefix = "googletest-1.17.0",
+    url = "https://github.com/google/googletest/archive/refs/tags/v1.17.0.zip",
 )
 
 # Required for testing compatibility with TF Quantum:

dev-requirements.txt

@@ -1,3 +1,4 @@
 black~=25.1.0
 flynt~=1.0
 pytest
+pytest-xdist

tests/BUILD

@@ -360,6 +360,7 @@ cc_test(
 cc_test(
     name = "simulator_sse_test",
     size = "small",
+    tags = ["sse"],
     srcs = ["simulator_sse_test.cc"],
     deps = [
         ":simulator_testfixture",
@@ -451,6 +452,7 @@ cc_test(
 cc_test(
     name = "statespace_sse_test",
     size = "small",
+    tags = ["sse"],
     srcs = ["statespace_sse_test.cc"],
     deps = [
         ":statespace_testfixture",
@@ -532,6 +534,7 @@ cc_test(
 cc_test(
     name = "unitaryspace_sse_test",
     size = "small",
+    tags = ["sse"],
     srcs = ["unitaryspace_sse_test.cc"],
     copts = select({
         ":windows": windows_copts,
@@ -617,6 +620,7 @@ cc_test(
 cc_test(
     name = "unitary_calculator_sse_test",
     size = "small",
+    tags = ["sse"],
     srcs = ["unitary_calculator_sse_test.cc"],
     copts = select({
         ":windows": windows_copts,

tests/Makefile

@@ -22,7 +22,7 @@ GMOCK_DIR = $(CURDIR)/googletest/googlemock
 
 CMAKE=cmake
 
-TESTFLAGS = -I$(GTEST_DIR)/include -L$(GTEST_DIR)/make/lib -lgtest
+TESTFLAGS = -I$(GTEST_DIR)/include -L$(GTEST_DIR)/build/lib -lgtest
 
 .PHONY: cxx-tests
 cxx-tests: $(CXX_TARGETS)
@@ -52,24 +52,25 @@ run-custatevec-tests: custatevec-tests
 run-hip-tests: hip-tests
 	for exe in $(HIP_TARGETS); do if ! ./$$exe; then exit 1; fi; done
 
-$(GTEST_DIR)/make:
+$(GTEST_DIR)/build:
 	-git submodule update --init --recursive googletest
-	mkdir -p $(GTEST_DIR)/make
-	cd $(GTEST_DIR)/make &&	$(CMAKE) .. && $(MAKE)
+	mkdir -p $(GTEST_DIR)/build
+	cd $(GTEST_DIR) && $(CMAKE) -B build -S ..
+	cd $(GTEST_DIR)/build && make
 
-%.x: %.cc $(GTEST_DIR)/make
+%.x: %.cc $(GTEST_DIR)/build
 	$(CXX) -o ./$@ $< $(TESTFLAGS) $(CXXFLAGS) $(ARCHFLAGS)
 
-%cuda_test.x: %cuda_test.cu $(GTEST_DIR)/make
+%cuda_test.x: %cuda_test.cu $(GTEST_DIR)/build
 	$(NVCC) -o ./$@ $< $(TESTFLAGS) $(NVCCFLAGS)
 
-%custatevec_test.x: %custatevec_test.cu $(GTEST_DIR)/make
+%custatevec_test.x: %custatevec_test.cu $(GTEST_DIR)/build
 	$(NVCC) -o ./$@ $< $(TESTFLAGS) $(NVCCFLAGS) $(CUSTATEVECFLAGS)
 
-%hip_test.x: %cuda_test.cu $(GTEST_DIR)/make
+%hip_test.x: %cuda_test.cu $(GTEST_DIR)/build
 	$(HIPCC) -o ./$@ $< $(TESTFLAGS) $(HIPCCFLAGS)
 
 .PHONY: clean
 clean:
 	-rm -f ./*.x ./*.a ./*.so ./*.mod
-	rm -rf $(GTEST_DIR)/make
+	rm -rf $(GTEST_DIR)/build