Clean tests, remove cc_test for cuda

quantumlib · Mar 18, 2023 · 5ceeacf · 5ceeacf
1 parent 9c0c938
commit 5ceeacf
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 19 deletions.
diff --git 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
+build:cuda --define=using_cuda=true --define=using_cuda_nvcc=true
diff --git 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
@@ -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"],