Merge branch 'fix-cython-install'

MANIFEST.in

@@ -0,0 +1,2 @@
+recursive-include pecos *.c *.cpp *.h *.pyx *.pxd
+prune pecos/?/build

pecos/simulators/__init__.py

@@ -26,3 +26,10 @@
     from .sparsesim import State as SparseSim
 
 StabSim = SparseSim  # Default stabilizer simulator
+
+try:
+    import cython
+    from . import compile_cython
+
+except ImportError:
+    pass

pecos/simulators/compile_cython.py

@@ -20,8 +20,7 @@
 import subprocess
 
 
-def main():
-
+def compile():
     # See if Cython has been installed...
     try:
         import cython
@@ -30,7 +29,7 @@ def main():
 
     current_location = os.path.dirname(os.path.abspath(__file__))
 
-    print('!!!', current_location)
+    # print('!!!', current_location)
 
     cython_dirs = [
         'cysparsesim',
@@ -48,13 +47,6 @@ def main():
         if p.returncode:
             failed[d] = error
 
-    return failed, cython_dirs
-
-
-if __name__ == '__main__':
-
-    failed, cython_dirs = main()
-
     successful = set(cython_dirs) - set(failed.keys())
 
     if successful:

pecos/simulators/cysparsesim/.gitignore

@@ -1,2 +1,2 @@
 build
-*.pyd
+*.pyd

pecos/simulators/cysparsesim/__init__.py

@@ -14,6 +14,6 @@
 #   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #   See the License for the specific language governing permissions and
 #   limitations under the License.
-#  =========================================================================  #
+#  =========================================================================
 
 from .cysparsesim import State

pecos/simulators/cysparsesim/src/cysparsesim.pyx

@@ -19,11 +19,11 @@
 #   limitations under the License.
 #  =========================================================================  #
 
-from libcpp cimport bool
 cimport cysparsesim_header as s
 from cysparsesim_header cimport int_num
 
 from .src.logical_sign import find_logical_signs
+from ..
 
 
 cdef dict gate_dict = {

setup.cfg

@@ -0,0 +1,9 @@
+[metadata]
+description-file = README.md
+license-file = LICENSE
+
+[build_ext]
+inplace=1
+
+[bdist_wheel]
+universal = 1

setup.py

@@ -45,7 +45,10 @@
                 'and study of quantum error correcting codes.',
     long_description=long_description,
     long_description_content_type="text/markdown",
+
     packages=find_packages(),
+    include_package_data=True,
+
     python_requires='>=3.5.2',
     install_requires=[
         'numpy>=1.15.0',
@@ -66,4 +69,14 @@
         "License :: OSI Approved :: Apache Software License",
         "Operating System :: OS Independent",
     ],
-    )
+)
+
+try:
+    import cython
+    # Have to have Cython already installed before running this setup file
+    # Otherwise, just run:
+    from pecos.simulators import compile_cython
+    compile_cython.compile()
+    # TODO: compile Cython directly using this setup script ... or could trigger compile at init if Cython is available
+except ImportError:
+    pass