numbox 0.2.5__py3-none-any.whl → 0.2.6__py3-none-any.whl

numbox/__init__.py

@@ -1 +1 @@
-__version__ = '0.2.5'
+__version__ = '0.2.6'

numbox/core/work/builder.py

@@ -1,10 +1,11 @@
+from collections import namedtuple
 from hashlib import md5
 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
+from typing import Any, Callable, Dict, NamedTuple, Optional, Sequence, Union
 
 from numbox.core.configurations import default_jit_options
 from numbox.core.work.lowlevel_work_utils import ll_make_work
@@ -15,7 +16,7 @@ def _file_anchor():
     raise NotImplementedError
 
 
-_nodes_names = set()
+_specs_registry = dict()
 
 
 class _End(NamedTuple):
@@ -27,10 +28,11 @@ class _End(NamedTuple):
 def _new(cls, super_proxy, *args, **kwargs):
     name = kwargs.get("name")
     assert name, "`name` key-word argument has not been provided"
-    if name in _nodes_names:
+    if name in _specs_registry:
         raise ValueError(f"Node '{name}' has already been defined on this graph. Pick a different name.")
-    _nodes_names.add(name)
-    return super_proxy.__new__(cls, *args, **kwargs)
+    spec_ = super_proxy.__new__(cls, *args, **kwargs)
+    _specs_registry[name] = spec_
+    return spec_
 
 
 class End(_End):
@@ -111,29 +113,34 @@ def _derived_line(
     return f"""{name_} = ll_make_work("{name_}", {init_name}, ({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)
+def _infer_end_and_derived_nodes(spec: SpecTy, all_inputs_: Dict[str, Type], all_derived_: Dict[str, Type]):
+    if spec.name in all_inputs_ or spec.name in all_derived_:
+        return
+    if isinstance(spec, End):
+        all_inputs_[spec.name] = get_ty(spec)
+        return
+    for source in spec.sources:
+        _infer_end_and_derived_nodes(source, all_inputs_, all_derived_)
+    all_derived_[spec.name] = get_ty(spec)
+
+
+def infer_end_and_derived_nodes(access_nodes: SpecTy | Sequence[SpecTy]):
+    all_inputs_ = dict()
+    all_derived_ = dict()
+    for access_node in access_nodes:
+        _infer_end_and_derived_nodes(access_node, all_inputs_, all_derived_)
+    all_inputs_lst = [_specs_registry[name] for name in all_inputs_.keys()]
+    all_derived_lst = [_specs_registry[name] for name in all_derived_.keys()]
+    return all_inputs_lst, all_derived_lst
+
+
+def make_graph(*access_nodes: SpecTy | Sequence[SpecTy], jit_options: Optional[dict] = None):
+    all_inputs_, all_derived_ = infer_end_and_derived_nodes(access_nodes)
     if jit_options is None:
         jit_options = {}
     jit_options = {**default_jit_options, **jit_options}
@@ -144,26 +151,30 @@ def make_graph(
     _make_args = []
     code_txt = StringIO()
     initializers = {}
-    derive_hashes=[]
+    derive_hashes = []
     for input_ in all_inputs_:
         line_ = _input_line(input_, ns, initializers)
         code_txt.write(f"\n\t{line_}")
     for derived_ in all_derived_:
         line_ = _derived_line(derived_, ns, initializers, derive_hashes, _make_args, jit_options)
         code_txt.write(f"\n\t{line_}")
-    hash_str = f"code_block = {code_txt.getvalue()} initializers = {list(initializers.values())} derive_hashes = {derive_hashes}"
+    hash_str = f"code_block = {code_txt.getvalue()} initializers = {list(initializers.values())} derive_hashes = {derive_hashes}"  # noqa: E501
     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")
+    access_nodes_names = [n.name for n in access_nodes]
+    tup_ = ", ".join(access_nodes_names)
+    tup_ = tup_ + ", " if ", " not in tup_ else tup_
+    code_txt.write(f"""\n\taccess_tuple = ({tup_})""")
+    code_txt.write("\n\treturn access_tuple")
     code_txt = code_txt.getvalue()
     make_params = ", ".join(chain(_make_args, initializers.keys()))
     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})
+access_tuple_ = {make_name}({make_params})
 """
     code = compile(code_txt, getfile(_file_anchor), mode="exec")
     exec(code, ns)
-    return_node_ = ns["return_node_"]
-    return return_node_
+    access_tuple_ = ns["access_tuple_"]
+    Access = namedtuple("Access", access_nodes_names)
+    return Access(*access_tuple_)

numbox/core/work/explain.py

@@ -30,6 +30,9 @@ def _explain(work: Work, derivation_: list, derived_: set):
 
 
 def explain(work: Work):
+    all_end_nodes = work.all_end_nodes()
     derivation = []
     _explain(work, derivation, set())
-    return "\n".join(derivation)
+    explain_txt = f"All required end nodes: {all_end_nodes}\n\n"
+    explain_txt += "\n".join(derivation)
+    return explain_txt

{numbox-0.2.5.dist-info → numbox-0.2.6.dist-info}/METADATA

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

{numbox-0.2.5.dist-info → numbox-0.2.6.dist-info}/RECORD

@@ -1,4 +1,4 @@
-numbox/__init__.py,sha256=8f4ummWTPl6PtdE9DzSUgZhPjGioA_NDC-hDpqzB9qI,22
+numbox/__init__.py,sha256=T150U4daRZ7ULOwxGUzzoBDAqm3bW9UydvCf0KJii9I,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,9 +15,9 @@ 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=tfrizyZuBy21zsoILELzQIj-wtYAuPitDqtVg7V1atw,5362
+numbox/core/work/builder.py,sha256=WFZmH8dHTQNx1TwjpJVtZXN5ud4K2j500HgbF-Msu4c,6063
 numbox/core/work/combine_utils.py,sha256=qTVGke_ydzaTQ7o29DFjZWZzKjRNKb0L3yJMaR3TLII,2430
-numbox/core/work/explain.py,sha256=qEorYHRSe8P2MygodCYsz57UtWeRfaS27xHSw3hBgmo,1063
+numbox/core/work/explain.py,sha256=ESwvsTgfe0w7UnM13yyVpVDtfJyAK2A1sNdF3RNb-jU,1200
 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
@@ -31,8 +31,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.5.dist-info/LICENSE,sha256=YYgNvjH_p6-1NsdrIqGJnr1GUbZzA_8DxsP6vVfM6nY,1446
-numbox-0.2.5.dist-info/METADATA,sha256=kHcNZstr-whJ0XoJ6IcoXACjnAn33yjvJgdn4Ksx6sk,2792
-numbox-0.2.5.dist-info/WHEEL,sha256=iAkIy5fosb7FzIOwONchHf19Qu7_1wCWyFNR5gu9nU0,91
-numbox-0.2.5.dist-info/top_level.txt,sha256=A67jOkfqidCSYYm6ifjN_WZyIiR1B27fjxv6nNbPvjc,7
-numbox-0.2.5.dist-info/RECORD,,
+numbox-0.2.6.dist-info/LICENSE,sha256=YYgNvjH_p6-1NsdrIqGJnr1GUbZzA_8DxsP6vVfM6nY,1446
+numbox-0.2.6.dist-info/METADATA,sha256=H7eyqJTneiiqllMj4Boqaxpj-gwZpLjkQlGEhiOuJlE,2792
+numbox-0.2.6.dist-info/WHEEL,sha256=iAkIy5fosb7FzIOwONchHf19Qu7_1wCWyFNR5gu9nU0,91
+numbox-0.2.6.dist-info/top_level.txt,sha256=A67jOkfqidCSYYm6ifjN_WZyIiR1B27fjxv6nNbPvjc,7
+numbox-0.2.6.dist-info/RECORD,,