Add classical control.

.bazelrc

@@ -23,15 +23,15 @@ common --verbose_failures
 # Windows uses slightly different syntax.
 common --enable_platform_specific_config
 
-build:linux --copt=-std=c++17
-build:linux --cxxopt=-std=c++17
+build:linux --copt=-std=c++20
+build:linux --cxxopt=-std=c++20
 build:linux --per_file_copt="googletest/.*@-Xassembler,-W"
 
-build:macos --copt=-std=c++17
-build:macos --cxxopt=-std=c++17
+build:macos --copt=-std=c++20
+build:macos --cxxopt=-std=c++20
 
-build:windows --copt=/std:c++17
-build:windows --cxxopt=/std:c++17
+build:windows --copt=/std:c++20
+build:windows --cxxopt=/std:c++20
 
 build --copt=-D_GLIBCXX_USE_CXX11_ABI=1
 build --cxxopt=-D_GLIBCXX_USE_CXX11_ABI=1

CMakeLists.txt

@@ -108,7 +108,7 @@ endif()
 
 # Additional miscellanous settings.
 # The following settings mirror what is in our hand-written Makefiles.
-set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
 # Print additional useful info.

Makefile

@@ -38,8 +38,8 @@ CXX ?= g++
 NVCC ?= nvcc
 HIPCC ?= hipcc
 
-BASE_CXXFLAGS := -std=c++17
-BASE_NVCCFLAGS := -std c++17 -Wno-deprecated-gpu-targets
+BASE_CXXFLAGS := -std=c++20
+BASE_NVCCFLAGS := -std c++20 -Wno-deprecated-gpu-targets
 BASE_HIPCCFLAGS :=
 
 CXXFLAGS := $(BASE_CXXFLAGS) $(CXXFLAGS)

apps/make.sh

@@ -16,15 +16,15 @@
 # This file provides an alternate method for building apps in this directory.
 # Prefer using the Makefile (e.g. `make -C apps/`) if possible.
 
-g++ -O3 -march=native -fopenmp -o qsim_base.x qsim_base.cc
-g++ -O3 -march=native -fopenmp -o qsim_von_neumann.x qsim_von_neumann.cc
-g++ -O3 -march=native -fopenmp -o qsim_amplitudes.x qsim_amplitudes.cc
-g++ -O3 -march=native -fopenmp -o qsimh_base.x qsimh_base.cc
-g++ -O3 -march=native -fopenmp -o qsimh_amplitudes.x qsimh_amplitudes.cc
+g++ -O3 -std=c++20 -march=native -fopenmp -o qsim_base.x qsim_base.cc
+g++ -O3 -std=c++20 -march=native -fopenmp -o qsim_von_neumann.x qsim_von_neumann.cc
+g++ -O3 -std=c++20 -march=native -fopenmp -o qsim_amplitudes.x qsim_amplitudes.cc
+g++ -O3 -std=c++20 -march=native -fopenmp -o qsimh_base.x qsimh_base.cc
+g++ -O3 -std=c++20 -march=native -fopenmp -o qsimh_amplitudes.x qsimh_amplitudes.cc
 
 if command -v nvcc &>/dev/null; then
-    nvcc -O3 -o qsim_base_cuda.x qsim_base_cuda.cu
-    nvcc -O3 -o qsim_qtrajectory_cuda.x qsim_qtrajectory_cuda.cu
+    nvcc -O3 -std=c++20 -o qsim_base_cuda.x qsim_base_cuda.cu
+    nvcc -O3 -std=c++20 -o qsim_qtrajectory_cuda.x qsim_qtrajectory_cuda.cu
 
     if [ -n "$CUQUANTUM_ROOT" ]; then
         declare -a CUSTATEVECFLAGS
@@ -35,12 +35,12 @@ if command -v nvcc &>/dev/null; then
             "-lcustatevec"
             "-lcublas"
         )
-        nvcc -O3 "${CUSTATEVECFLAGS[@]}" \
+        nvcc -O3 -std=c++20 "${CUSTATEVECFLAGS[@]}" \
              -o qsim_base_custatevec.x qsim_base_custatevec.cu
-        nvcc -O3 "${CUSTATEVECFLAGS[@]}" \
+        nvcc -O3 -std=c++20 "${CUSTATEVECFLAGS[@]}" \
              -o qsim_base_custatevecex.x qsim_base_custatevecex.cu
     fi
 elif command -v hipcc &>/dev/null; then
-    hipcc -O3 -o qsim_base_hip.x qsim_base_cuda.cu
-    hipcc -O3 -o qsim_qtrajectory_hip.x qsim_qtrajectory_cuda.cu
+    hipcc -O3 -std=c++20 -o qsim_base_hip.x qsim_base_cuda.cu
+    hipcc -O3 -std=c++20 -o qsim_qtrajectory_hip.x qsim_qtrajectory_cuda.cu
 fi

apps/qsim_amplitudes.cc

@@ -23,11 +23,12 @@
 
 #include "../lib/bitstring.h"
 #include "../lib/circuit_qsim_parser.h"
+#include "../lib/classical_control_util.h"
 #include "../lib/formux.h"
 #include "../lib/fuser_mqubit.h"
 #include "../lib/io_file.h"
 #include "../lib/operation.h"
-#include "../lib/run_qsim.h"
+#include "../lib/run_qsim_deprecated.h"
 #include "../lib/simmux.h"
 #include "../lib/util.h"
 #include "../lib/util_cpu.h"
@@ -160,12 +161,8 @@ int main(int argc, char* argv[]) {
     return 1;
   }
 
-  Circuit<Operation<float>> circuit;
-  unsigned maxtime = opt.times.back();
-  if (!CircuitQsimParser<IOFile>::FromFile(maxtime, opt.circuit_file,
-                                           circuit)) {
-    return 1;
-  }
+  auto cstr = cc::ReadFile(opt.circuit_file);
+  auto circuit = CircuitQSimParser<float>::Run(cstr, opt.times.back());
 
   if (opt.denormals_are_zeros) {
     SetFlushToZeroAndDenormalsAreZeros();

apps/qsim_base.cc

@@ -20,11 +20,12 @@
 #include <string>
 
 #include "../lib/circuit_qsim_parser.h"
+#include "../lib/classical_control_util.h"
 #include "../lib/formux.h"
 #include "../lib/fuser_mqubit.h"
 #include "../lib/io_file.h"
 #include "../lib/operation.h"
-#include "../lib/run_qsim.h"
+#include "../lib/run_qsim_deprecated.h"
 #include "../lib/simmux.h"
 #include "../lib/util_cpu.h"
 
@@ -114,11 +115,8 @@ int main(int argc, char* argv[]) {
     return 1;
   }
 
-  Circuit<Operation<float>> circuit;
-  if (!CircuitQsimParser<IOFile>::FromFile(opt.maxtime, opt.circuit_file,
-                                           circuit)) {
-    return 1;
-  }
+  auto cstr = cc::ReadFile(opt.circuit_file);
+  auto circuit = CircuitQSimParser<float>::Run(cstr, opt.maxtime);
 
   if (opt.denormals_are_zeros) {
     SetFlushToZeroAndDenormalsAreZeros();

apps/qsim_base_cuda.cu

@@ -20,11 +20,12 @@
 #include <string>
 
 #include "../lib/circuit_qsim_parser.h"
+#include "../lib/classical_control_util.h"
 #include "../lib/formux.h"
 #include "../lib/fuser_mqubit.h"
 #include "../lib/io_file.h"
 #include "../lib/operation.h"
-#include "../lib/run_qsim.h"
+#include "../lib/run_qsim_deprecated.h"
 #include "../lib/simulator_cuda.h"
 
 struct Options {
@@ -114,11 +115,8 @@ int main(int argc, char* argv[]) {
 
   using fp_type = float;
 
-  Circuit<Operation<fp_type>> circuit;
-  if (!CircuitQsimParser<IOFile>::FromFile(opt.maxtime, opt.circuit_file,
-                                           circuit)) {
-    return 1;
-  }
+  auto cstr = cc::ReadFile(opt.circuit_file);
+  auto circuit = CircuitQSimParser<fp_type>::Run(cstr, opt.maxtime);
 
   struct Factory {
     using Simulator = qsim::SimulatorCUDA<fp_type>;

apps/qsim_base_custatevec.cu

@@ -22,11 +22,12 @@
 #include <custatevec.h>
 
 #include "../lib/circuit_qsim_parser.h"
+#include "../lib/classical_control_util.h"
 #include "../lib/formux.h"
 #include "../lib/fuser_mqubit.h"
 #include "../lib/io_file.h"
 #include "../lib/operation.h"
-#include "../lib/run_qsim.h"
+#include "../lib/run_qsim_deprecated.h"
 #include "../lib/simulator_custatevec.h"
 #include "../lib/util_custatevec.h"
 
@@ -108,11 +109,8 @@ int main(int argc, char* argv[]) {
 
   using fp_type = float;
 
-  Circuit<Operation<fp_type>> circuit;
-  if (!CircuitQsimParser<IOFile>::FromFile(opt.maxtime, opt.circuit_file,
-                                           circuit)) {
-    return 1;
-  }
+  auto cstr = cc::ReadFile(opt.circuit_file);
+  auto circuit = CircuitQSimParser<fp_type>::Run(cstr, opt.maxtime);
 
   struct Factory {
     using Simulator = qsim::SimulatorCuStateVec<fp_type>;

apps/qsim_base_custatevecex.cu

@@ -20,6 +20,7 @@
 #include <string>
 
 #include "../lib/circuit_qsim_parser.h"
+#include "../lib/classical_control_util.h"
 #include "../lib/formux.h"
 #include "../lib/io_file.h"
 #include "../lib/multiprocess_custatevecex.h"
@@ -106,11 +107,8 @@ int main(int argc, char* argv[]) {
 
   using fp_type = float;
 
-  Circuit<Operation<fp_type>> circuit;
-  if (!CircuitQsimParser<IOFile>::FromFile(opt.maxtime, opt.circuit_file,
-                                           circuit)) {
-    return 1;
-  }
+  auto cstr = cc::ReadFile(opt.circuit_file);
+  auto circuit = CircuitQSimParser<fp_type>::Run(cstr, opt.maxtime);
 
   struct Factory {
     using Simulator = qsim::SimulatorCuStateVecEx<fp_type>;

apps/qsim_qtrajectory_cuda.cu

@@ -25,12 +25,13 @@
 
 #include "../lib/channels_qsim.h"
 #include "../lib/circuit_qsim_parser.h"
+#include "../lib/classical_control_util.h"
 #include "../lib/expect.h"
 #include "../lib/fuser_mqubit.h"
 #include "../lib/io_file.h"
 #include "../lib/operation.h"
 #include "../lib/qtrajectory.h"
-#include "../lib/run_qsim.h"
+#include "../lib/run_qsim_deprecated.h"
 #include "../lib/simulator_cuda.h"
 
 struct Options {
@@ -223,12 +224,8 @@ int main(int argc, char* argv[]) {
     return 1;
   }
 
-  Circuit<Operation<fp_type>> circuit;
-  unsigned maxtime = opt.times.back();
-  if (!CircuitQsimParser<IOFile>::FromFile(maxtime, opt.circuit_file,
-                                           circuit)) {
-    return 1;
-  }
+  auto cstr = cc::ReadFile(opt.circuit_file);
+  auto circuit = CircuitQSimParser<fp_type>::Run(cstr, opt.times.back());
 
   if (opt.times.size() == 1
       && opt.times[0] == std::numeric_limits<unsigned>::max()) {

apps/qsim_von_neumann.cc

@@ -22,11 +22,12 @@
 #include <string>
 
 #include "../lib/circuit_qsim_parser.h"
+#include "../lib/classical_control_util.h"
 #include "../lib/formux.h"
 #include "../lib/fuser_mqubit.h"
 #include "../lib/io_file.h"
 #include "../lib/operation.h"
-#include "../lib/run_qsim.h"
+#include "../lib/run_qsim_deprecated.h"
 #include "../lib/simmux.h"
 #include "../lib/util_cpu.h"
 
@@ -99,11 +100,8 @@ int main(int argc, char* argv[]) {
     return 1;
   }
 
-  Circuit<Operation<float>> circuit;
-  if (!CircuitQsimParser<IOFile>::FromFile(opt.maxtime, opt.circuit_file,
-                                           circuit)) {
-    return 1;
-  }
+  auto cstr = cc::ReadFile(opt.circuit_file);
+  auto circuit = CircuitQSimParser<float>::Run(cstr, opt.maxtime);
 
   if (opt.denormals_are_zeros) {
     SetFlushToZeroAndDenormalsAreZeros();

apps/qsimh_amplitudes.cc

@@ -23,6 +23,7 @@
 
 #include "../lib/bitstring.h"
 #include "../lib/circuit_qsim_parser.h"
+#include "../lib/classical_control_util.h"
 #include "../lib/formux.h"
 #include "../lib/fuser_basic.h"
 #include "../lib/io_file.h"
@@ -174,11 +175,8 @@ int main(int argc, char* argv[]) {
     return 1;
   }
 
-  Circuit<Operation<float>> circuit;
-  if (!CircuitQsimParser<IOFile>::FromFile(opt.maxtime, opt.circuit_file,
-                                           circuit)) {
-    return 1;
-  }
+  auto cstr = cc::ReadFile(opt.circuit_file);
+  auto circuit = CircuitQSimParser<float>::Run(cstr, opt.maxtime);
 
   if (!ValidatePart1(circuit.num_qubits, opt.part1)) {
     return 1;

apps/qsimh_base.cc

@@ -23,6 +23,7 @@
 
 #include "../lib/bitstring.h"
 #include "../lib/circuit_qsim_parser.h"
+#include "../lib/classical_control_util.h"
 #include "../lib/formux.h"
 #include "../lib/fuser_basic.h"
 #include "../lib/io_file.h"
@@ -136,11 +137,8 @@ int main(int argc, char* argv[]) {
     return 1;
   }
 
-  Circuit<Operation<float>> circuit;
-  if (!CircuitQsimParser<IOFile>::FromFile(opt.maxtime, opt.circuit_file,
-                                           circuit)) {
-    return 1;
-  }
+  auto cstr = cc::ReadFile(opt.circuit_file);
+  auto circuit = CircuitQSimParser<float>::Run(cstr, opt.maxtime);
 
   if (!ValidatePart1(circuit.num_qubits, opt.part1)) {
     return 1;