Fix icpc pybind11.

src/Makefile.in

@@ -14,14 +14,11 @@ CXXFLAGS += -Idocopt/ -fPIC
 # The flags for the compilation of the Pybind11 interface
 PYBINDFLAGS = -shared `python3 -m pybind11 --includes`
 
-# commented out because pip install pybind11
-#-Ipybind11/include
-
 $(TARGET1): main.cpp $(OBJS1)
 	$(CXX) -o $(@).x $< $(OBJS1) $(CXXFLAGS)
 
 pybind: $(OBJS1) pybind_main.h
-	$(CXX) pybind_main.cpp -o $(QFLEXLIB) $^ $(CXXFLAGS) $(PYBINDFLAGS)
+	g++ -std=c++17 -O3 -fPIC pybind_main.cpp -o $(QFLEXLIB) $^ $(PYBINDFLAGS)
 
 %.o: %.cpp %.h
 	$(CXX) -c $< $(CXXFLAGS) -o $@

src/evaluate_circuit.h

@@ -33,25 +33,10 @@
 #include "read_circuit.h"
 #include "circuit.h"
 #include "tensor.h"
+#include "input.h"
 
 namespace qflex {
 
-struct QflexGrid {
-  int I{0}, J{0};
-  std::vector<std::vector<int>> qubits_off;
-  void load(std::istream& istream);
-  void load(const std::string& filename);
-};
-
-struct QflexInput {
-  std::istream* ordering_data;
-  QflexCircuit circuit;
-  QflexGrid grid;
-  std::string initial_state;
-  std::string final_state;
-  bool enable_timing_logs = false;
-};
-
 /**
  * Reads in grid layout from a file, which should be formatted as an I x J grid
  * of zeroes (for "off" qubits) and ones (for "on" qubits).\

src/input.h

@@ -0,0 +1,26 @@
+#ifndef INPUT__H
+#define INPUT__H
+
+#include "circuit.h"
+
+namespace qflex {
+
+struct QflexGrid {
+  int I{0}, J{0};
+  std::vector<std::vector<int>> qubits_off;
+  void load(std::istream& istream);
+  void load(const std::string& filename);
+};
+
+struct QflexInput {
+  std::istream* ordering_data;
+  QflexCircuit circuit;
+  QflexGrid grid;
+  std::string initial_state;
+  std::string final_state;
+  bool enable_timing_logs = false;
+};
+
+}
+
+#endif

src/pybind_main.h

@@ -8,8 +8,11 @@ namespace py = pybind11;
 
 #include <vector>
 
-#include "evaluate_circuit.h"
-#include "read_circuit.h"
+#include "input.h"
+
+namespace qflex {
+  extern std::vector<std::pair<std::string, std::complex<double>>> EvaluateCircuit(QflexInput* input);
+}
 
 std::vector<std::pair<std::string, std::complex<double>>> simulate(
     const py::dict &options);