numbox 0.2.1__py3-none-any.whl → 0.2.3__py3-none-any.whl

numbox/__init__.py

@@ -1 +1 @@
-__version__ = '0.2.1'
+__version__ = '0.2.3'

numbox/core/work/builder.py

@@ -0,0 +1,125 @@
+from hashlib import md5
+from inspect import getfile, getmodule
+from io import StringIO
+from numba import njit, typeof
+from numba.core.types import Type
+from typing import Any, Callable, NamedTuple, Optional, Sequence, Union
+
+from numbox.core.configurations import default_jit_options
+from numbox.core.work.lowlevel_work_utils import ll_make_work
+from numbox.utils.highlevel import cres
+
+
+def _file_anchor():
+    raise NotImplementedError
+
+
+class End(NamedTuple):
+    name: str
+    init_value: Any
+    ty: Optional[type | Type] = None
+
+
+class Derived(NamedTuple):
+    name: str
+    init_value: Any
+    derive: Callable
+    sources: Sequence[Union['Derived', End]]
+    ty: Optional[type | Type] = None
+
+
+SpecTy = Derived | End
+
+
+def _input_line(input_: End, ns):
+    name_ = input_.name
+    init_ = input_.init_value
+    ty_ = input_.ty
+    if ty_ is not None:
+        type_name = f"{name_}_ty"
+        ns[type_name] = ty_
+        return f"""{name_} = ll_make_work("{name_}", {init_}, (), None, {type_name})"""
+    return f"""{name_} = ll_make_work("{name_}", {init_}, (), None)"""
+
+
+def get_ty(spec_):
+    return spec_.ty or typeof(spec_.init_value)
+
+
+def _derived_cres(ty, sources: Sequence[End], derive, jit_options=None):
+    jit_options = jit_options if jit_options is not None else {}
+    sources_ty = []
+    for source in sources:
+        source_ty = get_ty(source)
+        sources_ty.append(source_ty)
+    derive_sig = ty(*sources_ty)
+    derive_cres = cres(derive_sig, **jit_options)(derive)
+    return derive_cres
+
+
+def _derived_line(derived_: Derived, ns: dict, _make_args: list, jit_options=None):
+    name_ = derived_.name
+    init_ = derived_.init_value
+    sources_ = ", ".join([s.name for s in derived_.sources])
+    sources_ = sources_ + ", " if "," not in sources_ else sources_
+    ty_ = get_ty(derived_)
+    derive_ = _derived_cres(ty_, derived_.sources, derived_.derive, jit_options)
+    derive_name = f"{name_}_derive"
+    _make_args.append(derive_name)
+    ns[derive_name] = derive_
+    return f"""{name_} = ll_make_work("{name_}", {init_}, ({sources_}), {derive_name})"""
+
+
+def _verify_access_nodes(
+    all_inputs_: Sequence[End],
+    all_derived_: Sequence[Derived],
+    access_nodes: Sequence[SpecTy]
+):
+    for access_node in access_nodes:
+        assert access_node in all_inputs_ or access_node in all_derived_, f"{access_node} cannot be reached"
+
+
+def code_block_hash(code_txt: str):
+    """ Re-compile and re-save cache when source code has changed. """
+    return md5(code_txt.encode("utf-8")).hexdigest()
+
+
+def make_graph(
+    all_inputs_: Sequence[End],
+    all_derived_: Sequence[Derived],
+    access_nodes: SpecTy | Sequence[SpecTy],
+    jit_options: Optional[dict] = None
+):
+    if isinstance(access_nodes, SpecTy):
+        access_nodes = (access_nodes,)
+    _verify_access_nodes(all_inputs_, all_derived_, access_nodes)
+    if jit_options is None:
+        jit_options = {}
+    jit_options = {**default_jit_options, **jit_options}
+    ns = {
+        **getmodule(_file_anchor).__dict__,
+        **{"jit_options": jit_options, "ll_make_work": ll_make_work, "njit": njit}
+    }
+    _make_args = []
+    code_txt = StringIO()
+    for input_ in all_inputs_:
+        line_ = _input_line(input_, ns)
+        code_txt.write(f"\n\t{line_}")
+    for derived_ in all_derived_:
+        line_ = _derived_line(derived_, ns, _make_args, jit_options)
+        code_txt.write(f"\n\t{line_}")
+    hash_ = code_block_hash(code_txt.getvalue())
+    code_txt.write(f"""\n\taccess_tuple = ({", ".join([n.name for n in access_nodes])})""")
+    code_txt.write(f"\n\treturn access_tuple")
+    code_txt = code_txt.getvalue()
+    make_params = ", ".join(_make_args)
+    make_name = f"_make_{hash_}"
+    code_txt = f"""
+@njit(**jit_options)
+def {make_name}({make_params}):""" + code_txt + f"""
+return_node_ = {make_name}({make_params})
+"""
+    code = compile(code_txt, getfile(_file_anchor), mode="exec")
+    exec(code, ns)
+    return_node_ = ns["return_node_"]
+    return return_node_

numbox/core/work/node.py

@@ -40,6 +40,13 @@ class Node(NodeBase):
     def _all_inputs_names(self):
         return self.all_inputs_names()
 
+    def all_end_nodes(self):
+        return list(self._all_end_nodes())
+
+    @njit(**default_jit_options)
+    def _all_end_nodes(self):
+        return self.all_end_nodes()
+
     @njit(**default_jit_options)
     def depends_on(self, obj_):
         return self.depends_on(obj_)
@@ -116,6 +123,31 @@ def ol_all_inputs_names(self_ty):
     return _
 
 
+@njit(**default_jit_options)
+def _all_end_nodes(node_, names_):
+    node = _cast(node_, NodeType)
+    for i in range(len(node.inputs)):
+        input_ = node.get_input(i)
+        name_ = input_.name
+        if name_ not in names_ and len(_cast(input_, NodeType).inputs) == 0:
+            names_.append(name_)
+        _all_end_nodes(input_, names_)
+
+
+@overload_method(NodeTypeClass, "all_end_nodes", strict=False, jit_options=default_jit_options)
+def ol_all_end_nodes(self_ty):
+    def _(self):
+        names = List.empty_list(unicode_type)
+        for i in range(len(self.inputs)):
+            input_ = self.get_input(i)
+            name_ = input_.name
+            if name_ not in names and len(_cast(input_, NodeType).inputs) == 0:
+                names.append(name_)
+            _all_end_nodes(input_, names)
+        return names
+    return _
+
+
 @overload_method(NodeTypeClass, "depends_on", strict=False, jit_options=default_jit_options)
 def ol_depends_on(self_ty, obj_ty):
     if isinstance(obj_ty, (Literal, UnicodeType,)):

numbox/core/work/work.py

@@ -3,11 +3,12 @@ from io import StringIO
 from numba import njit
 from numba.core.errors import NumbaError
 from numba.core.types import (
-    DictType, FunctionType, Integer, Literal, NoneType, Tuple, unicode_type, UnicodeType
+    boolean, DictType, FunctionType, Literal, NoneType, Tuple, unicode_type, UnicodeType
 )
 from numba.core.typing.context import Context
 from numba.experimental.structref import define_boxing, new
 from numba.extending import intrinsic, overload, overload_method
+from numba.typed.typeddict import Dict
 from numba.typed.typedlist import List
 
 from numbox.core.any.erased_type import ErasedType
@@ -115,6 +116,13 @@ class Work(NodeBase):
     def _all_inputs_names(self):
         return self.all_inputs_names()
 
+    def all_end_nodes(self):
+        return list(self._all_end_nodes())
+
+    @njit(**default_jit_options)
+    def _all_end_nodes(self):
+        return self.all_end_nodes()
+
     @njit(**default_jit_options)
     def depends_on(self, obj_):
         return self.depends_on(obj_)
@@ -284,12 +292,14 @@ def _make_combine_code(num_sources):
     for source_ind_ in range(num_sources):
         code_txt.write(_make_source_getter(source_ind_))
     code_txt.write("""
-def _combine_(work_, data_, ct_=0):
-    if ct_ == len(data_):
-        return ct_
+def _combine_(work_, data_, harvested_=None):
+    if harvested_ is None:
+        harvested_ = Dict.empty(key_type=unicode_type, value_type=boolean)
+    if len(harvested_) == len(data_):
+        return
     work_name = work_.name
     if work_name in data_:
-        ct_ += 1
+        harvested_[work_name] = True
         data_[work_name].reset(work_.data)""")
     if num_sources > 0:
         code_txt.write("""
@@ -297,10 +307,10 @@ def _combine_(work_, data_, ct_=0):
         for source_ind_ in range(num_sources):
             code_txt.write(f"""
     source_{source_ind_} = _get_source_{source_ind_}(sources)
-    ct_ = source_{source_ind_}.combine(data_, ct_)
+    source_{source_ind_}.combine(data_, harvested_)
 """)
     code_txt.write("""
-    return ct_
+    return
 """)
     return code_txt.getvalue()
 
@@ -309,7 +319,7 @@ _combine_registry = {}
 
 
 @overload_method(WorkTypeClass, "combine", strict=False, jit_options=default_jit_options)
-def ol_combine(work_ty, data_ty: DictType, ct_ty=Integer):
+def ol_combine(work_ty, data_ty: DictType, harvested_ty=NoneType):
     """ Harvest nodes data from the graph with the root node `work`.
      `data` is provided as dictionary mapping node name to `Any` type
      containing erased payload `p` to be reset to `data`. """
@@ -318,7 +328,7 @@ def ol_combine(work_ty, data_ty: DictType, ct_ty=Integer):
     _combine = _combine_registry.get(num_sources, None)
     if _combine is None:
         code_txt = _make_combine_code(num_sources)
-        ns = getmodule(_file_anchor).__dict__
+        ns = {**getmodule(_file_anchor).__dict__, **{"boolean": boolean, "Dict": Dict}}
         code = compile(code_txt, getfile(_file_anchor), mode="exec")
         exec(code, ns)
         _combine = ns["_combine_"]
@@ -416,6 +426,14 @@ def ol_all_inputs_names(self_ty):
     return _
 
 
+@overload_method(WorkTypeClass, "all_end_nodes", strict=False, jit_options=default_jit_options)
+def ol_all_end_nodes(self_ty):
+    def _(self):
+        node = self.as_node()
+        return node.all_end_nodes()
+    return _
+
+
 @overload_method(WorkTypeClass, "depends_on", strict=False, jit_options=default_jit_options)
 def ol_depends_on(self_ty, obj_ty):
     if isinstance(obj_ty, (Literal, UnicodeType,)):

{numbox-0.2.1.dist-info → numbox-0.2.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: numbox
-Version: 0.2.1
+Version: 0.2.3
 Author: Mikhail Goykhman
 License: MIT License (with Citation Clause)
         
@@ -49,7 +49,7 @@ Documentation is available at [numbox](https://goykhman.github.io/numbox).
 - **Any**: A lightweight structure that wraps any value into the same type leveraging a variant of the type erasure technique.
 - **Bindings**: JIT-wrappers of functions imported from dynamically linked libraries.
 - **Node** A lightweight JIT-compatible graph node with type-erased dependencies in a uniform dynamically-sized vector (numba List). 
-- **proxy**: Create a proxy for a decorated function with specified signatures, enabling efficient JIT compilation and caching.
+- **Proxy**: Create a proxy for a decorated function with specified signatures, enabling efficient JIT compilation and caching.
 - **Work**: JIT-compatible unit of calculation work with dependencies, inner states, and custom calculation.
 
 ## Installation

{numbox-0.2.1.dist-info → numbox-0.2.3.dist-info}/RECORD

@@ -1,4 +1,4 @@
-numbox/__init__.py,sha256=PmcQ2PI2oP8irnLtJLJby2YfW6sBvLAmL-VpABzTqwc,22
+numbox/__init__.py,sha256=XtWUl6HPylv5jZLd2KkgtPptuzuda93kC2REmOrF-Cs,22
 numbox/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 numbox/core/configurations.py,sha256=0bCmxXL-QMwtvyIDhpXLeT-1KJMf_QpH0wLuEvYLGxQ,68
 numbox/core/any/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -15,13 +15,14 @@ numbox/core/bindings/utils.py,sha256=aRtN8oUYBk9vgoUGaUJosGx0Za-vvCNwwbZg_g_-LRs
 numbox/core/proxy/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 numbox/core/proxy/proxy.py,sha256=kGYlEdLK40lxxu56e_S32s9YuQ6AuQnFegt5uQrUw5w,3889
 numbox/core/work/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+numbox/core/work/builder.py,sha256=QaklRb-IciVNPlk1WnQ3Hfc8tHbWbuAQqdrlp51XCcM,3991
 numbox/core/work/combine_utils.py,sha256=qTVGke_ydzaTQ7o29DFjZWZzKjRNKb0L3yJMaR3TLII,2430
 numbox/core/work/loader_utils.py,sha256=g83mDWidZJ8oLWP3I3rK8aGISYOO2S-w6HDgtosCyck,1572
 numbox/core/work/lowlevel_work_utils.py,sha256=TgRRcNfks0oaOXGXXr3ptafd_Xv_lpmH8sjBrJ9bPuI,5748
-numbox/core/work/node.py,sha256=4-0p4o94bg54JOvmgAlEVlgR5tSev5SGTqMq9Ht3bd0,4076
+numbox/core/work/node.py,sha256=CMolyoRQjG2A-pTQqZQ0kxKOYTKipWRC0mu8RWHuTUI,5096
 numbox/core/work/node_base.py,sha256=uI7asM2itQcHuOByXyJtqvrd4ovW6EXDRdHYp3JVHQ0,998
 numbox/core/work/print_tree.py,sha256=y2u7xmbHvpcA57y8PrGSqOunLNCqhgNXdVtXHqvy1M0,2340
-numbox/core/work/work.py,sha256=fdqeqtH8gDXkHFnc0lsFVCn5idP4reSBhYP_ccoiZBQ,13971
+numbox/core/work/work.py,sha256=oC71F2y-NkIF9Ox63trlv061nYBxla6R-F2Nj-7NXI4,14595
 numbox/core/work/work_utils.py,sha256=3q_nnBdzuxWWcdFpbRL2H0T9ZNkUgx1J1uhiZkX3YG4,1039
 numbox/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 numbox/utils/highlevel.py,sha256=gXYzLsFPKHQfGqaz-Z4DWcCQddv0dS6SKwIsM-_xjYg,1487
@@ -29,8 +30,8 @@ numbox/utils/lowlevel.py,sha256=ACpf8_HyOIsobPlZ31bapkEyuCsV5dojW3AFrcKykrw,1071
 numbox/utils/meminfo.py,sha256=ykFi8Vt0WcHI3ztgMwvpn6NqaflDSQGL8tjI01jrzm0,1759
 numbox/utils/timer.py,sha256=KkAkWOHQ72WtPjyiAzt_tF1q0DcOnCDkITTb85DvkUM,553
 numbox/utils/void_type.py,sha256=IkZsjNeAIShYJtvWbvERdHnl_mbF1rCRWiM3gp6II8U,404
-numbox-0.2.1.dist-info/LICENSE,sha256=YYgNvjH_p6-1NsdrIqGJnr1GUbZzA_8DxsP6vVfM6nY,1446
-numbox-0.2.1.dist-info/METADATA,sha256=Hk7ONk6PjPPkOpgYG7rgzUAICj86x4ubbLZ_JWepmP8,2792
-numbox-0.2.1.dist-info/WHEEL,sha256=iAkIy5fosb7FzIOwONchHf19Qu7_1wCWyFNR5gu9nU0,91
-numbox-0.2.1.dist-info/top_level.txt,sha256=A67jOkfqidCSYYm6ifjN_WZyIiR1B27fjxv6nNbPvjc,7
-numbox-0.2.1.dist-info/RECORD,,
+numbox-0.2.3.dist-info/LICENSE,sha256=YYgNvjH_p6-1NsdrIqGJnr1GUbZzA_8DxsP6vVfM6nY,1446
+numbox-0.2.3.dist-info/METADATA,sha256=e7MF4nI2ntAqX8CGKWS1FvUiEswd2rtRW-rysf4WWJc,2792
+numbox-0.2.3.dist-info/WHEEL,sha256=iAkIy5fosb7FzIOwONchHf19Qu7_1wCWyFNR5gu9nU0,91
+numbox-0.2.3.dist-info/top_level.txt,sha256=A67jOkfqidCSYYm6ifjN_WZyIiR1B27fjxv6nNbPvjc,7
+numbox-0.2.3.dist-info/RECORD,,