numbox 0.2.8__py3-none-any.whl → 0.2.10__py3-none-any.whl

numbox/__init__.py

@@ -1 +1 @@
-__version__ = '0.2.8'
+__version__ = '0.2.10'

numbox/core/work/builder.py

@@ -5,7 +5,7 @@ from io import StringIO
 from itertools import chain
 from numba import njit, typeof
 from numba.core.types import Type
-from typing import Any, Callable, Dict, NamedTuple, Optional, Sequence, Union
+from typing import Any, Callable, Dict, NamedTuple, Optional, Sequence, Tuple as PyTuple, Union
 
 from numbox.core.configurations import default_jit_options
 from numbox.core.work.lowlevel_work_utils import ll_make_work
@@ -22,16 +22,18 @@ _specs_registry = dict()
 class _End(NamedTuple):
     name: str
     init_value: Any
+    registry: dict = None
     ty: Optional[type | Type] = None
 
 
 def _new(cls, super_proxy, *args, **kwargs):
     name = kwargs.get("name")
     assert name, "`name` key-word argument has not been provided"
-    if name in _specs_registry:
+    registry = kwargs.get("registry", _specs_registry)
+    if name in registry:
         raise ValueError(f"Node '{name}' has already been defined on this graph. Pick a different name.")
     spec_ = super_proxy.__new__(cls, *args, **kwargs)
-    _specs_registry[name] = spec_
+    registry[name] = spec_
     return spec_
 
 
@@ -46,7 +48,8 @@ class _Derived(NamedTuple):
     name: str
     init_value: Any
     derive: Callable
-    sources: Sequence[Union['Derived', End]]
+    sources: Sequence[Union['Derived', End]] = ()
+    registry: dict = None
     ty: Optional[type | Type] = None
 
 
@@ -99,7 +102,7 @@ def _derived_line(
     name_ = derived_.name
     init_ = derived_.init_value
     sources_ = ", ".join([s.name for s in derived_.sources])
-    sources_ = sources_ + ", " if "," not in sources_ else sources_
+    sources_ = sources_ + ", " if sources_ and "," not in sources_ else sources_
     ty_ = get_ty(derived_)
     derive_func = derived_.derive
     derive_hashes.append(sha256(getsource(derive_func).encode("utf-8")).hexdigest())
@@ -118,29 +121,35 @@ def code_block_hash(code_txt: str):
     return sha256(code_txt.encode("utf-8")).hexdigest()
 
 
-def _infer_end_and_derived_nodes(spec: SpecTy, all_inputs_: Dict[str, Type], all_derived_: Dict[str, Type]):
+def _infer_end_and_derived_nodes(spec: SpecTy, all_inputs_: Dict[str, Type], all_derived_: Dict[str, Type], registry):
     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_)
+        _infer_end_and_derived_nodes(source, all_inputs_, all_derived_, registry)
     all_derived_[spec.name] = get_ty(spec)
 
 
-def infer_end_and_derived_nodes(access_nodes: SpecTy | Sequence[SpecTy]):
+def infer_end_and_derived_nodes(access_nodes: PyTuple[SpecTy, ...], registry):
     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()]
+        _infer_end_and_derived_nodes(access_node, all_inputs_, all_derived_, registry)
+    all_inputs_lst = [registry[name] for name in all_inputs_.keys()]
+    all_derived_lst = [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)
+def make_graph(
+    *access_nodes: SpecTy,
+    registry: Optional[dict] = None,
+    jit_options: Optional[dict] = None
+):
+    if registry is None:
+        registry = _specs_registry
+    all_inputs_, all_derived_ = infer_end_and_derived_nodes(access_nodes, registry)
     if jit_options is None:
         jit_options = {}
     jit_options = {**default_jit_options, **jit_options}
@@ -161,8 +170,7 @@ def make_graph(*access_nodes: SpecTy | Sequence[SpecTy], jit_options: Optional[d
     hash_str = f"code_block = {code_txt.getvalue()} initializers = {list(initializers.values())} derive_hashes = {derive_hashes}"  # noqa: E501
     hash_ = code_block_hash(hash_str)
     access_nodes_names = [n.name for n in access_nodes]
-    tup_ = ", ".join(access_nodes_names)
-    tup_ = tup_ + ", " if ", " not in tup_ else tup_
+    tup_ = ", ".join(access_nodes_names) + ","
     code_txt.write(f"""\n\taccess_tuple = ({tup_})""")
     code_txt.write("\n\treturn access_tuple")
     code_txt = code_txt.getvalue()

numbox/core/work/builder_utils.py

@@ -0,0 +1,40 @@
+from typing import NamedTuple, Tuple
+
+from numbox.core.work.builder import SpecTy, End
+
+
+def _infer_sources_dependencies(spec: SpecTy, sources_dependencies_):
+    if isinstance(spec, End):
+        return
+    for source in spec.sources:
+        spec_dependencies = sources_dependencies_.setdefault(spec.name, set())
+        sources_dependencies_.setdefault(source.name, set()).add(spec.name)
+        sources_dependencies_[source.name] |= spec_dependencies
+        _infer_sources_dependencies(source, sources_dependencies_)
+
+
+def infer_sources_dependencies(access_nodes: NamedTuple | Tuple):
+    """
+    For all nodes names accessible from the given `access_nodes`,
+    return dictionary of all nodes names that depend on each of the
+    nodes in the accessible graph. For instance::
+
+        m1 -- m2 -- m3 -- m5
+              |
+              m4
+
+    will return::
+
+        {
+            "m1": set(),
+            "m2": {"m1"},
+            "m3": {"m1", "m2"},
+            "m4": {"m1"},
+            "m5": {"m1", "m2", "m3"}
+        }
+
+    """
+    sources_dependencies_ = {}
+    for access_node in access_nodes:
+        _infer_sources_dependencies(access_node, sources_dependencies_)
+    return sources_dependencies_

numbox/core/work/lowlevel_work_utils.py

@@ -106,16 +106,16 @@ def ensure_work_boxing():
 @intrinsic(prefer_literal=False)
 def ll_make_work(typingctx, name_ty, data_ty, sources_ty, derive_ty, data_ty_ref: TypeRef = NoneType):
     """
-    Purely intrinsic work constructor, alternative to overloaded
-    `numbox.core.work.work.Work`.
+    Purely intrinsic work constructor.
 
     Substantially more efficient in memory use, cache disk space, and
     compilation time for inlining multiple `Work` instantiations inside
     jitted context (e.g., in large-graph applications).
 
-    (Alternatively, one can try `inline="always"` for the `make_work`
-    which might save memory and cache disk space demand but significantly
-    lengthens compilation time.)
+    Alternative `make_work`-like constructors with `inline="always"`
+    might save memory and cache disk space demand (when the inlining
+    directive is actually heeded by numba engine) but significantly
+    lengthen the compilation time.
     """
     if data_ty_ref != NoneType:
         data_ty = data_ty_ref.instance_type

numbox/core/work/work.py

@@ -210,7 +210,6 @@ _calculate_registry = {}
 
 def ensure_presence_of_source_getters_in_ns(num_sources_, ns_):
     for source_i in range(num_sources_):
-        _source_getter = _source_getter_registry.get(source_i, None)
         source_getter_code_txt = _make_source_getter(source_i)
         source_getter_code = compile(source_getter_code_txt, getfile(_file_anchor), mode="exec")
         exec(source_getter_code, ns_)

numbox/utils/highlevel.py

@@ -196,6 +196,7 @@ def make_structref(
             "jit_options": jit_options,
             "new": new,
             "njit": njit,
+            "overload": overload,
             "overload_method": overload_method,
             "StructRefProxy": StructRefProxy,
             struct_type_class.__name__: struct_type_class

{numbox-0.2.8.dist-info → numbox-0.2.10.dist-info}/METADATA

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

{numbox-0.2.8.dist-info → numbox-0.2.10.dist-info}/RECORD

@@ -1,4 +1,4 @@
-numbox/__init__.py,sha256=QS1piWKz3Mys2vOiR2kTlrqfdbiwJYEfhOlgbh73Sg8,22
+numbox/__init__.py,sha256=JYwb-C-8s4xwnUp2y3_Hp7caBJyciFJh6lKJs_WcehM,23
 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,25 +15,26 @@ 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=Wt7yzswDmeQXt0yjcTcnLi2coneowSHWXy_IFpZZJMU,3612
 numbox/core/work/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-numbox/core/work/builder.py,sha256=U7hxopSwOc1ke1Hqup6xCliO7bqjq91zVX1SixYPxoM,6072
+numbox/core/work/builder.py,sha256=d0DRwJoyskp-6tYQyV1VE-v9eX99qJbQJ_FdAFrjuiE,6273
+numbox/core/work/builder_utils.py,sha256=z8au1x10AwnzQ0_MAbQ6DnKTp3u9HeYZ1jyfkUMYjVg,1213
 numbox/core/work/combine_utils.py,sha256=qTVGke_ydzaTQ7o29DFjZWZzKjRNKb0L3yJMaR3TLII,2430
 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/lowlevel_work_utils.py,sha256=ouQ9u-wb8N-x2p93H6_72_9AzYxBOvigeU79i7S9qu0,5752
 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=596flxydeHuEJ3oUhNz3PYPtA58nxERifvBCh8BWVug,15091
+numbox/core/work/work.py,sha256=yISGKbXsut5ZSbRT2h6uMAAFsKDQ__fcX27HuI6ydhA,15022
 numbox/core/work/work_utils.py,sha256=3q_nnBdzuxWWcdFpbRL2H0T9ZNkUgx1J1uhiZkX3YG4,1039
 numbox/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-numbox/utils/highlevel.py,sha256=0sUVGOFAzFaGycKrXloGySLjp5EAPaf1B0AcOT1dfbw,8326
+numbox/utils/highlevel.py,sha256=3dEdIbk0OJcBmuWdbuwG-0v80U19sSYMIxOR8qslGsQ,8360
 numbox/utils/lowlevel.py,sha256=ACpf8_HyOIsobPlZ31bapkEyuCsV5dojW3AFrcKykrw,10712
 numbox/utils/meminfo.py,sha256=ykFi8Vt0WcHI3ztgMwvpn6NqaflDSQGL8tjI01jrzm0,1759
 numbox/utils/standard.py,sha256=2fPrMlSXe2TG3CIfjJOT8LQkHEH86oOOj1AvwQkYCfA,450
 numbox/utils/timer.py,sha256=5_d690Fb3L2axJBRxtoB0qe23exBosNR4qu6cno4QfY,641
 numbox/utils/void_type.py,sha256=IkZsjNeAIShYJtvWbvERdHnl_mbF1rCRWiM3gp6II8U,404
-numbox-0.2.8.dist-info/LICENSE,sha256=YYgNvjH_p6-1NsdrIqGJnr1GUbZzA_8DxsP6vVfM6nY,1446
-numbox-0.2.8.dist-info/METADATA,sha256=krcMK7v4WNgTrcuriQAWMASeaRod9KybPc57tRUE7w0,2935
-numbox-0.2.8.dist-info/WHEEL,sha256=iAkIy5fosb7FzIOwONchHf19Qu7_1wCWyFNR5gu9nU0,91
-numbox-0.2.8.dist-info/top_level.txt,sha256=A67jOkfqidCSYYm6ifjN_WZyIiR1B27fjxv6nNbPvjc,7
-numbox-0.2.8.dist-info/RECORD,,
+numbox-0.2.10.dist-info/LICENSE,sha256=YYgNvjH_p6-1NsdrIqGJnr1GUbZzA_8DxsP6vVfM6nY,1446
+numbox-0.2.10.dist-info/METADATA,sha256=VYLHTb3Nzvg7thEEQ3fCKHCxmp3cjXlNEk3OZWxETfI,2936
+numbox-0.2.10.dist-info/WHEEL,sha256=iAkIy5fosb7FzIOwONchHf19Qu7_1wCWyFNR5gu9nU0,91
+numbox-0.2.10.dist-info/top_level.txt,sha256=A67jOkfqidCSYYm6ifjN_WZyIiR1B27fjxv6nNbPvjc,7
+numbox-0.2.10.dist-info/RECORD,,