Merge branch 'master' into qsim-invert-masks

Author: 95-martin-orion

lib/BUILD

@@ -40,6 +40,7 @@ cc_library(
         "run_qsimh.h",
         "seqfor.h",
         "simmux.h",
+        "simulator.h",
         "simulator_avx.h",
         "simulator_avx512.h",
         "simulator_basic.h",
@@ -97,6 +98,7 @@ cc_library(
         "run_qsimh.h",
         "seqfor.h",
         "simmux.h",
+        "simulator.h",
         "simulator_avx.h",
         "simulator_avx512.h",
         "simulator_basic.h",
@@ -149,6 +151,7 @@ cc_library(
         "run_qsim.h",
         "seqfor.h",
         "simmux.h",
+        "simulator.h",
         "simulator_avx.h",
         "simulator_avx512.h",
         "simulator_basic.h",
@@ -194,6 +197,7 @@ cc_library(
         "run_qsimh.h",
         "seqfor.h",
         "simmux.h",
+        "simulator.h",
         "simulator_avx.h",
         "simulator_avx512.h",
         "simulator_basic.h",
@@ -465,11 +469,17 @@ cc_library(
 
 ### Simulator libraries ###
 
+cc_library(
+    name = "simulator_base",
+    hdrs = ["simulator.h"],
+    deps = [":bits"],
+)
+
 cc_library(
     name = "simulator_avx",
     hdrs = ["simulator_avx.h"],
     deps = [
-        ":bits",
+        ":simulator_base",
         ":statespace_avx",
     ],
 )
@@ -478,7 +488,7 @@ cc_library(
     name = "simulator_avx512",
     hdrs = ["simulator_avx512.h"],
     deps = [
-        ":bits",
+        ":simulator_base",
         ":statespace_avx512",
     ],
 )
@@ -487,7 +497,7 @@ cc_library(
     name = "simulator_basic",
     hdrs = ["simulator_basic.h"],
     deps = [
-        ":bits",
+        ":simulator_base",
         ":statespace_basic",
     ],
 )
@@ -496,7 +506,7 @@ cc_library(
     name = "simulator_sse",
     hdrs = ["simulator_sse.h"],
     deps = [
-        ":bits",
+        ":simulator_base",
         ":statespace_sse",
     ],
 )
@@ -624,7 +634,7 @@ cc_library(
     name = "unitary_calculator_avx",
     hdrs = ["unitary_calculator_avx.h"],
     deps = [
-        ":bits",
+        ":simulator_base",
         ":unitaryspace_avx",
     ],
 )
@@ -633,7 +643,7 @@ cc_library(
     name = "unitary_calculator_avx512",
     hdrs = ["unitary_calculator_avx512.h"],
     deps = [
-        ":bits",
+        ":simulator_base",
         ":unitaryspace_avx512",
     ],
 )
@@ -642,7 +652,7 @@ cc_library(
     name = "unitary_calculator_basic",
     hdrs = ["unitary_calculator_basic.h"],
     deps = [
-        ":bits",
+        ":simulator_base",
         ":unitaryspace_basic",
     ],
 )
@@ -651,7 +661,7 @@ cc_library(
     name = "unitary_calculator_sse",
     hdrs = ["unitary_calculator_sse.h"],
     deps = [
-        ":bits",
+        ":simulator_base",
         ":unitaryspace_sse",
     ],
 )