quantumlib · iamvamsikrishnad · Feb 25, 2020 · Feb 20, 2020 · Feb 20, 2020 · Feb 20, 2020
diff --git a/interfaces/CMakeLists.txt → CMakeLists.txt b/interfaces/CMakeLists.txt → CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.11)
 project(qsim)
 
 set(CMAKE_CXX_FLAGS "-O3 -mavx2 -mfma -fopenmp -lgomp")

diff --git a/MANIFEST.in b/MANIFEST.in
@@ -0,0 +1,5 @@
+include requirements.txt
+include CMakeLists.txt
+
+graft pybind_interface
+graft lib
diff --git a/Makefile b/Makefile
@@ -22,7 +22,7 @@ qsim:
 
 .PHONY: pybind
 pybind:
-	$(MAKE) -C interfaces/ pybind
+	$(MAKE) -C pybind_interface/ pybind
 
 .PHONY: cxx-tests
 tests:
@@ -33,10 +33,11 @@ tests:
 run-cxx-tests: cxx-tests
 	$(MAKE) -C tests/ run-all
 
-# TODO: support python tests
+PYTESTS = $(shell find interfaces/tests/ -name '*_test.py')
+
 .PHONY: run-py-tests
 run-py-tests: pybind
-	$(MAKE) -C interfaces/ run-tests
+	for exe in $(PYTESTS); do if ! python3 -m pytest $$exe; then exit 1; fi; done
 
 .PHONY: run-tests
 run-tests: $(TESTS)
@@ -45,4 +46,4 @@ run-tests: $(TESTS)
 clean:
 	-$(MAKE) -C apps/ clean
 	-$(MAKE) -C tests/ clean
-	-$(MAKE) -C interfaces/ clean
+	-$(MAKE) -C pybind_interface/ clean
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -19,6 +19,6 @@ services:
         container_name: qsim-py-tests
         build:
             context: ./
-            dockerfile: interfaces/Dockerfile
+            dockerfile: pybind_interface/Dockerfile
         depends_on:
         - qsim
diff --git a/interfaces/Makefile b/interfaces/Makefile
diff --git a/interfaces/examples/pybind_interface_examples.py b/interfaces/examples/pybind_interface_examples.py
diff --git a/interfaces/examples/qsimcirq_examples.py b/interfaces/examples/qsimcirq_examples.py
diff --git a/interfaces/pybind_interface/make.sh b/interfaces/pybind_interface/make.sh
diff --git a/interfaces/qsimcirq/__init__.py b/interfaces/qsimcirq/__init__.py
diff --git a/interfaces/Dockerfile → pybind_interface/Dockerfile b/interfaces/Dockerfile → pybind_interface/Dockerfile
@@ -6,6 +6,8 @@ RUN apt-get install -y python3-dev python3-pybind11 python3-pytest python3-pip
 RUN pip3 install cirq
 
 # Copy relevant files
+COPY ./pybind_interface/ /qsim/pybind_interface/
+COPY ./qsimcirq/ /qsim/qsimcirq/
 COPY ./interfaces/ /qsim/interfaces/
 
 WORKDIR /qsim/

diff --git a/pybind_interface/Makefile b/pybind_interface/Makefile
@@ -0,0 +1,13 @@
+# The name of the shared library that results after compiling qsim for Pybind11
+QSIMLIB = ../qsimcirq/qsim`python3-config --extension-suffix`
+
+# The flags for the compilation of the Pybind11 interface
+PYBINDFLAGS = -Wall -shared -std=c++17 -fPIC `python3 -m pybind11 --includes`
+
+.PHONY: pybind
+pybind:
+	$(CXX) pybind_main.cpp -o $(QSIMLIB) $(CXXFLAGS) $(PYBINDFLAGS)
+
+.PHONY: clean
+clean:
+	-rm -f ./*.x ./*.a ./*.so ./*.mod $(QSIMLIB)
diff --git a/interfaces/pybind_interface/pybind_main.cpp → pybind_interface/pybind_main.cpp b/interfaces/pybind_interface/pybind_main.cpp → pybind_interface/pybind_main.cpp
@@ -22,16 +22,16 @@
 #include <string>
 #include <vector>
 
-#include "../../lib/bitstring.h"
-#include "../../lib/circuit_reader.h"
-#include "../../lib/fuser_basic.h"
-#include "../../lib/gate.h"
-#include "../../lib/io.h"
-#include "../../lib/parfor.h"
-#include "../../lib/run_qsim.h"
-#include "../../lib/run_qsimh.h"
-#include "../../lib/simulator_avx.h"
-#include "../../lib/util.h"
+#include "../lib/bitstring.h"
+#include "../lib/circuit_reader.h"
+#include "../lib/fuser_basic.h"
+#include "../lib/gate.h"
+#include "../lib/io.h"
+#include "../lib/parfor.h"
+#include "../lib/run_qsim.h"
+#include "../lib/run_qsimh.h"
+#include "../lib/simulator_avx.h"
+#include "../lib/util.h"
 
 using namespace qsim;
 

diff --git a/interfaces/pybind_interface/pybind_main.h → pybind_interface/pybind_main.h b/interfaces/pybind_interface/pybind_main.h → pybind_interface/pybind_main.h
diff --git a/interfaces/qsimcirq/qsim_circuit.py → qsimcirq/qsim_circuit.py b/interfaces/qsimcirq/qsim_circuit.py → qsimcirq/qsim_circuit.py
diff --git a/interfaces/qsimcirq/qsim_simulator.py → qsimcirq/qsim_simulator.py b/interfaces/qsimcirq/qsim_simulator.py → qsimcirq/qsim_simulator.py
diff --git a/interfaces/qsimcirq/qsimh_simulator.py → qsimcirq/qsimh_simulator.py b/interfaces/qsimcirq/qsimh_simulator.py → qsimcirq/qsimh_simulator.py
diff --git a/interfaces/requirements.txt → requirements.txt b/interfaces/requirements.txt → requirements.txt
diff --git a/interfaces/setup.py → setup.py b/interfaces/setup.py → setup.py
@@ -74,7 +74,7 @@ def build_extension(self, ext):
     version='0.0.1',
     author='Vamsi Krishna Devabathini',
     author_email='devabathini92@gmail.com',
-    python_requires=('>=3.0.0'),
+    python_requires=('>=3.3.0'),
     install_requires=requirements,
     license='Apache 2',
     description='',