numbox 0.2.2__py3-none-any.whl → 0.2.4__py3-none-any.whl

numbox/__init__.py

@@ -1 +1 @@
-__version__ = '0.2.2'
+__version__ = '0.2.4'

numbox/core/work/builder.py

@@ -1,6 +1,7 @@
 from hashlib import md5
-from inspect import getfile, getmodule
+from inspect import getfile, getmodule, getsource
 from io import StringIO
+from itertools import chain
 from numba import njit, typeof
 from numba.core.types import Type
 from typing import Any, Callable, NamedTuple, Optional, Sequence, Union
@@ -31,15 +32,18 @@ class Derived(NamedTuple):
 SpecTy = Derived | End
 
 
-def _input_line(input_: End, ns):
+def _input_line(input_: End, ns: dict, initializers: dict):
     name_ = input_.name
     init_ = input_.init_value
+    init_name = f"{name_}_init"
+    ns[init_name] = init_
+    initializers[init_name] = init_
     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)"""
+        return f"""{name_} = ll_make_work("{name_}", {init_name}, (), None, {type_name})"""
+    return f"""{name_} = ll_make_work("{name_}", {init_name}, (), None)"""
 
 
 def get_ty(spec_):
@@ -57,17 +61,24 @@ def _derived_cres(ty, sources: Sequence[End], derive, jit_options=None):
     return derive_cres
 
 
-def _derived_line(derived_: Derived, ns: dict, _make_args: list, jit_options=None):
+def _derived_line(
+    derived_: Derived, ns: dict, initializers: dict, derive_hashes: list, _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_func = derived_.derive
+    derive_hashes.append(md5(getsource(derive_func).encode("utf-8")).hexdigest())
+    derive_ = _derived_cres(ty_, derived_.sources, derive_func, jit_options)
     derive_name = f"{name_}_derive"
+    init_name = f"{name_}_init"
     _make_args.append(derive_name)
     ns[derive_name] = derive_
-    return f"""{name_} = ll_make_work("{name_}", {init_}, ({sources_}), {derive_name})"""
+    ns[init_name] = init_
+    initializers[init_name] = init_
+    return f"""{name_} = ll_make_work("{name_}", {init_name}, ({sources_}), {derive_name})"""
 
 
 def _verify_access_nodes(
@@ -102,17 +113,20 @@ def make_graph(
     }
     _make_args = []
     code_txt = StringIO()
+    initializers = {}
+    derive_hashes=[]
     for input_ in all_inputs_:
-        line_ = _input_line(input_, ns)
+        line_ = _input_line(input_, ns, initializers)
         code_txt.write(f"\n\t{line_}")
     for derived_ in all_derived_:
-        line_ = _derived_line(derived_, ns, _make_args, jit_options)
+        line_ = _derived_line(derived_, ns, initializers, derive_hashes, _make_args, jit_options)
         code_txt.write(f"\n\t{line_}")
-    hash_ = code_block_hash(code_txt.getvalue())
+    hash_str = f"code_block = {code_txt.getvalue()} initializers = {list(initializers.values())} derive_hashes = {derive_hashes}"
+    hash_ = code_block_hash(hash_str)
     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_params = ", ".join(chain(_make_args, initializers.keys()))
     make_name = f"_make_{hash_}"
     code_txt = f"""
 @njit(**jit_options)

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
@@ -291,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("""
@@ -304,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()
 
@@ -316,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`. """
@@ -325,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_"]

{numbox-0.2.2.dist-info → numbox-0.2.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: numbox
-Version: 0.2.2
+Version: 0.2.4
 Author: Mikhail Goykhman
 License: MIT License (with Citation Clause)
         

{numbox-0.2.2.dist-info → numbox-0.2.4.dist-info}/RECORD

@@ -1,4 +1,4 @@
-numbox/__init__.py,sha256=QQ0yjZQnvXM7JeLLZEZWX6NmVUPu1lSROWOXF49_gug,22
+numbox/__init__.py,sha256=N5-p8dQB8uwuCMpS1ADLf_E6rvWovtRRp3vY9Cq2gw4,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,14 +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/builder.py,sha256=bIWOb9_mSSS4IMQ_kSPF5XlMh-nhzooZmDn_6N04r3c,4648
 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=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=OZ9rRbaOAzQhvw2akORSlqPllwRe1BUhkMFWZOJSmo0,14369
+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
@@ -30,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.2.dist-info/LICENSE,sha256=YYgNvjH_p6-1NsdrIqGJnr1GUbZzA_8DxsP6vVfM6nY,1446
-numbox-0.2.2.dist-info/METADATA,sha256=mbgQDgqnezAK4URoAhC4C4BHwCy5ThKSDkdTkkD6WVQ,2792
-numbox-0.2.2.dist-info/WHEEL,sha256=iAkIy5fosb7FzIOwONchHf19Qu7_1wCWyFNR5gu9nU0,91
-numbox-0.2.2.dist-info/top_level.txt,sha256=A67jOkfqidCSYYm6ifjN_WZyIiR1B27fjxv6nNbPvjc,7
-numbox-0.2.2.dist-info/RECORD,,
+numbox-0.2.4.dist-info/LICENSE,sha256=YYgNvjH_p6-1NsdrIqGJnr1GUbZzA_8DxsP6vVfM6nY,1446
+numbox-0.2.4.dist-info/METADATA,sha256=REXHYfdLyuZ56CPvvesb9uM3bS0PDDHuGgscGDyzzm4,2792
+numbox-0.2.4.dist-info/WHEEL,sha256=iAkIy5fosb7FzIOwONchHf19Qu7_1wCWyFNR5gu9nU0,91
+numbox-0.2.4.dist-info/top_level.txt,sha256=A67jOkfqidCSYYm6ifjN_WZyIiR1B27fjxv6nNbPvjc,7
+numbox-0.2.4.dist-info/RECORD,,