compiled-knowledge 4.0.0a21__tar.gz → 4.0.0a22__tar.gz

{compiled_knowledge-4.0.0a21/src/compiled_knowledge.egg-info → compiled_knowledge-4.0.0a22}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: compiled-knowledge
-Version: 4.0.0a21
+Version: 4.0.0a22
 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.0a21 → compiled_knowledge-4.0.0a22}/pyproject.toml

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

{compiled_knowledge-4.0.0a21 → compiled_knowledge-4.0.0a22}/src/ck/circuit_compiler/interpret_compiler.py

@@ -139,6 +139,7 @@ def _make_instructions(
     for node_id, const_idx in node_to_const_idx.items():
         node_to_element[node_id] = _ElementID(_CONSTS, const_idx)
     # var nodes
+    var_node: VarNode
     for i, var_node in enumerate(analysis.var_nodes):
         if var_node.is_const():
             node_to_element[id(var_node)] = node_to_element[id(var_node.const)]

{compiled_knowledge-4.0.0a21 → compiled_knowledge-4.0.0a22}/src/ck/circuit_compiler/llvm_compiler.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 from dataclasses import dataclass
 from enum import Enum
-from typing import Sequence, Optional, Tuple, Dict, Protocol
+from typing import Sequence, Optional, Tuple, Dict, Protocol, assert_never
 
 import llvmlite.binding as llvm
 import llvmlite.ir as ir
@@ -238,7 +238,7 @@ class _FunctionBuilderTmps(_FunctionBuilder):
         if idx is not None:
             return builder.load(builder.gep(self.out_args, [ir.Constant(self.llvm_idx_type, idx)]))
 
-        assert False, 'not reached'
+        assert_never('not reached')
 
     def store_calculation(self, value: ir.Value, op_node: OpNode) -> None:
         """
@@ -262,7 +262,7 @@ class _FunctionBuilderTmps(_FunctionBuilder):
             builder.store(value, ptr)
             return
 
-        assert False, 'not reached'
+        assert_never('not reached')
 
     def store_result(self, value: ir.Value, idx: int) -> None:
         """
@@ -359,7 +359,7 @@ class _FunctionBuilderStack(_FunctionBuilder):
         if idx is not None:
             return builder.load(builder.gep(self.out_args, [ir.Constant(self.llvm_idx_type, idx)]))
 
-        assert False, 'not reached'
+        assert_never('not reached')
 
     def store_calculation(self, value: ir.Value, op_node: OpNode) -> None:
         """

{compiled_knowledge-4.0.0a21 → compiled_knowledge-4.0.0a22}/src/ck/pgm.py

@@ -2935,7 +2935,7 @@ class CPTPotentialFunction(PotentialFunction):
             return True
         else:
             # The requested tolerance is tighter than ensured.
-            # Need to use the default method
+            # Need to use the default method.
             return super().is_cpt(tolerance)
 
     @property

{compiled_knowledge-4.0.0a21 → compiled_knowledge-4.0.0a22}/src/ck/pgm_circuit/mpe_program.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 from dataclasses import dataclass
 from functools import partial
-from typing import Sequence, Optional, Tuple, List, Dict, Set
+from typing import Sequence, Optional, Tuple, List, Dict, Set, assert_never
 
 from ck.circuit import CircuitNode, Circuit, VarNode, OpNode, ADD, MUL
 from ck.circuit_compiler import llvm_vm_compiler, CircuitCompiler
@@ -207,7 +207,7 @@ class MPEProgram(ProgramWithSlotmap):
                             self._trace_var(child, states)
                             return
                 # No child value equaled the value for node! We should never get here
-                assert False, 'not reached'
+                assert_never('not reached')
             elif node.symbol == MUL:
                 # Recurse though each child node
                 for child in node.args:

{compiled_knowledge-4.0.0a21 → compiled_knowledge-4.0.0a22}/src/ck/pgm_circuit/support/compile_circuit.py

@@ -2,7 +2,6 @@ from typing import Optional, Sequence
 
 from ck.circuit import CircuitNode, TmpConst, Circuit
 from ck.circuit_compiler import CircuitCompiler
-from ck.circuit_compiler.llvm_compiler import DataType, DEFAULT_TYPE_INFO, compile_circuit
 from ck.circuit_compiler import DEFAULT_CIRCUIT_COMPILER
 from ck.pgm_circuit import PGMCircuit
 from ck.program import RawProgram
@@ -48,7 +47,7 @@ def compile_param_derivatives(
         pgm_circuit: PGMCircuit,
         self_multiply: bool = False,
         params_value: Optional[float | int] = 1,
-        data_type: DataType = DEFAULT_TYPE_INFO,
+        compiler: CircuitCompiler = DEFAULT_CIRCUIT_COMPILER,
 ) -> RawProgram:
     """
     Compile the circuit to a program for computing the partial derivatives of the parameters.
@@ -56,14 +55,12 @@ def compile_param_derivatives(
 
     Typically, this will grow the circuit by the addition of circuit nodes to compute the derivatives.
 
-    This uses the LLVM circuit compiler.
-
     Args:
         pgm_circuit: The circuit (and PGM) that will be compiled to a program.
         self_multiply: if true then each partial derivative df/dx will be multiplied by x.
         params_value: if not None, then circuit vars representing parameters will be temporarily
             set to this value for compiling the program. Default is 1.
-        data_type: What data type to use for arithmetic calculations. Either a DataType member or TypeInfo.
+        compiler: function from circuit nodes to raw program.
     """
     top: CircuitNode = pgm_circuit.circuit_top
     circuit: Circuit = top.circuit
@@ -76,8 +73,8 @@ def compile_param_derivatives(
     if params_value is not None:
         with TmpConst(circuit) as tmp:
             tmp.set_const(param_vars, params_value)
-            raw_program: RawProgram = compile_circuit(*derivatives, circuit=circuit, data_type=data_type)
+            raw_program: RawProgram = compiler(*derivatives, circuit=circuit)
     else:
-        raw_program: RawProgram = compile_circuit(*derivatives, circuit=circuit, data_type=data_type)
+        raw_program: RawProgram = compiler(*derivatives, circuit=circuit)
 
     return raw_program

{compiled_knowledge-4.0.0a21 → compiled_knowledge-4.0.0a22}/src/ck/pgm_compiler/named_pgm_compilers.py

@@ -16,7 +16,6 @@ class NamedPGMCompiler(Enum):
     Wrapping in a tuple is needed otherwise Python erases the type of the member, which can cause problems.
     Each member itself is callable, confirming to the PGMCompiler protocol, delegating to the compiler function.
     """
-    # @formatter:off
 
     VE_MIN_DEGREE = _get_compiler_algorithm(variable_elimination, 'MIN_DEGREE')
     VE_MIN_DEGREE_THEN_FILL = _get_compiler_algorithm(variable_elimination, 'MIN_DEGREE_THEN_FILL')
@@ -45,8 +44,6 @@ class NamedPGMCompiler(Enum):
 
     ACE = _get_compiler(ace)
 
-    # @formatter:on
-
     def __call__(self, pgm: PGM, const_parameters: bool = True) -> PGMCircuit:
         """
         Each member of the enum is a PGMCompiler function.

{compiled_knowledge-4.0.0a21 → compiled_knowledge-4.0.0a22}/src/ck/pgm_compiler/support/clusters.py

@@ -295,7 +295,7 @@ class Clusters:
         Returns:
             the maximum `len(cluster)` over all clusters.
         """
-        return max(len(cluster) for cluster in self.clusters)
+        return max((len(cluster) for cluster in self.clusters), default=0)
 
     def max_cluster_weighted_size(self, rv_log_sizes: Sequence[float]) -> float:
         """
@@ -303,13 +303,17 @@ class Clusters:
 
         Args:
             rv_log_sizes: is an array of random variable sizes, such that
-                for a random variable `rv`, `rv_log_sizes[rv.idx] = log2(len(rv))`.
+                for a random variable `rv`, `rv_log_sizes[rv.idx] = log2(len(rv))`,
+                e.g., `self.pgm.rv_log_sizes`.
         Returns:
             the maximum `sum(rv_log_sizes[rv_idx] for rv_idx in cluster)` over all clusters.
         """
         return max(
-            sum(rv_log_sizes[rv_idx] for rv_idx in cluster)
-            for cluster in self.clusters
+            (
+                sum(rv_log_sizes[rv_idx] for rv_idx in cluster)
+                for cluster in self.clusters
+            ),
+            default=0
         )
 
     def eliminate(self, rv_index: int) -> None:

{compiled_knowledge-4.0.0a21 → compiled_knowledge-4.0.0a22}/src/ck/program/raw_program.py

@@ -23,14 +23,13 @@ class RawProgram:
 
     A `RawProgram` is a `Callable` with the signature:
 
-
     Fields:
         function: is a function of three ctypes arrays, returning nothing.
         dtype: the numpy data type of  the array values.
         number_of_vars: the number of input values (first function argument).
         number_of_tmps: the number of working memory values (second function argument).
         number_of_results: the number of result values (third function argument).
-        var_indices:  maps the index of inputs (from 0 to self.number_of_vars - 1) to the index
+        var_indices: maps the index of inputs (from 0 to self.number_of_vars - 1) to the index
             of the corresponding circuit var.
     """
 

{compiled_knowledge-4.0.0a21 → compiled_knowledge-4.0.0a22}/src/ck/utils/np_extras.py

@@ -29,17 +29,17 @@ NDArrayNumeric = NDArray[DTypeNumeric]
 
 
 # Constants for maximum number of states.
-_MAX_STATES_8: int = 2 ** 8 - 1
-_MAX_STATES_16: int = 2 ** 16 - 1
-_MAX_STATES_32: int = 2 ** 32 - 1
-_MAX_STATES_64: int = 2 ** 64 - 1
+_MAX_STATES_8: int = 2 ** 8
+_MAX_STATES_16: int = 2 ** 16
+_MAX_STATES_32: int = 2 ** 32
+_MAX_STATES_64: int = 2 ** 64
 
 
 def dtype_for_number_of_states(number_of_states: int) -> DTypeStates:
     """
     Infer the numpy dtype required to store any state index of the given PGM.
     """
-    # Infer the needed size of
+    # Infer the needed dtype required to hold a number of states
     if number_of_states <= _MAX_STATES_8:
         return np.uint8
     if number_of_states <= _MAX_STATES_16:

{compiled_knowledge-4.0.0a21 → compiled_knowledge-4.0.0a22/src/compiled_knowledge.egg-info}/PKG-INFO

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