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

numbox/__init__.py

@@ -1 +1 @@
-__version__ = '0.2.3'
+__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-0.2.3.dist-info → numbox-0.2.4.dist-info}/METADATA

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

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

@@ -1,4 +1,4 @@
-numbox/__init__.py,sha256=XtWUl6HPylv5jZLd2KkgtPptuzuda93kC2REmOrF-Cs,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,7 +15,7 @@ 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
@@ -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.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,,
+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,,