compiled-knowledge 4.0.0a18__tar.gz → 4.0.0a19__tar.gz

{compiled_knowledge-4.0.0a18/src/compiled_knowledge.egg-info → compiled_knowledge-4.0.0a19}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: compiled-knowledge
-Version: 4.0.0a18
+Version: 4.0.0a19
 Summary: A Python package for compiling and querying discrete probabilistic graphical models.
 Author-email: Barry Drake <barry@compiledknowledge.org>
 License-Expression: MIT

{compiled_knowledge-4.0.0a18 → compiled_knowledge-4.0.0a19}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "compiled-knowledge"
-version = "4.0.0a18"
+version = "4.0.0a19"
 description = "A Python package for compiling and querying discrete probabilistic graphical models."
 readme = "README.md"
 license = "MIT"

{compiled_knowledge-4.0.0a18 → compiled_knowledge-4.0.0a19}/setup.py

@@ -5,7 +5,7 @@
 #    python setup.py sdist bdist_wheel
 import sys
 from pathlib import Path
-from typing import List, Dict, Tuple
+from typing import List, Tuple
 
 import numpy as np
 from Cython.Build import cythonize
@@ -15,11 +15,17 @@ from setuptools import setup
 
 MODULE_CIRCUIT: str = 'ck.circuit._circuit_cy'
 MODULE_CIRCUIT_TABLE: str = 'ck.pgm_compiler.support.circuit_table._circuit_table_cy'
+MODULE_CIRCUIT_ANALYSER: str = 'ck.circuit_compiler.support.circuit_analyser._circuit_analyser_cy'
 MODULE_CIRCUIT_COMPILER: str = 'ck.circuit_compiler.cython_vm_compiler._compiler'
 
 CYTHON_MODULES: List[str] = [MODULE_CIRCUIT, MODULE_CIRCUIT_TABLE, MODULE_CIRCUIT_COMPILER]
 
-COMPILER_ARGS: List[str] = ['-Wno-unreachable-code'] if sys.platform == 'darwin' else []
+COMPILER_ARGS: List[str] = []
+if sys.platform == 'darwin':
+    COMPILER_ARGS += ['-Wno-unreachable-code', '-Wno-unused-function', '-O3']
+if sys.platform == 'win32':
+    COMPILER_ARGS += ['/O2']
+
 DEFINE_MACROS: List[Tuple[str, str]] = [('NPY_NO_DEPRECATED_API', '1')]
 
 INCLUDE_CK: str = str(Path('src').absolute())
@@ -45,6 +51,13 @@ CYTHON_EXTENSIONS: List[Extension] = [
         define_macros=DEFINE_MACROS,
         extra_compile_args=COMPILER_ARGS,
     ),
+    Extension(
+        MODULE_CIRCUIT_ANALYSER,
+        [pyx(MODULE_CIRCUIT_ANALYSER)],
+        include_dirs=[INCLUDE_NP],
+        define_macros=DEFINE_MACROS,
+        extra_compile_args=COMPILER_ARGS,
+    ),
     Extension(
         MODULE_CIRCUIT_COMPILER,
         [pyx(MODULE_CIRCUIT_COMPILER)],

{compiled_knowledge-4.0.0a18 → compiled_knowledge-4.0.0a19}/src/ck/circuit/__init__.py

@@ -1,9 +1,6 @@
 # There are two implementations of the `circuit` module are provided
 # for developer R&D purposes. One is pure Python and the other is Cython.
 # Which implementation is used can be selected here.
-# A similar selection can be made for the `circuit_table` module.
-# Note that if the Cython implementation is chosen for `circuit_table` then
-# the Cython implementation must be chosen for `circuit`.
 
 # from ._circuit_py import (
 from ._circuit_cy import (