numbox 0.2.7__py3-none-any.whl → 0.2.9__py3-none-any.whl

numbox/__init__.py

@@ -1 +1 @@
-__version__ = '0.2.7'
+__version__ = '0.2.9'

numbox/core/work/builder.py

@@ -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_
 
 
@@ -47,6 +49,7 @@ class _Derived(NamedTuple):
     init_value: Any
     derive: Callable
     sources: Sequence[Union['Derived', End]]
+    registry: dict = None
     ty: Optional[type | Type] = None
 
 
@@ -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: SpecTy | Sequence[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 | Sequence[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}

numbox/core/work/work.py

@@ -166,6 +166,9 @@ def _call_derive(typingctx: Context, derive_ty: FunctionType, sources_ty: Tuple)
     return sig, codegen
 
 
+_source_getter_registry = {}
+
+
 def _make_source_getter(source_ind):
     return f"""
 @intrinsic
@@ -182,8 +185,6 @@ def _get_source_{source_ind}(typingctx: Context, sources_ty: Tuple):
 
 def _make_calculate_code(num_sources):
     code_txt = StringIO()
-    for source_ind_ in range(num_sources):
-        code_txt.write(_make_source_getter(source_ind_))
     code_txt.write("""
 def _calculate_(work_):
     if work_.derived:
@@ -194,7 +195,8 @@ def _calculate_(work_):
         for source_ind_ in range(num_sources):
             code_txt.write(f"""
     source_{source_ind_} = _get_source_{source_ind_}(sources)
-    source_{source_ind_}.calculate()""")
+    if not source_{source_ind_}.derived:
+        source_{source_ind_}.calculate()""")
     code_txt.write("""
     v = _call_derive(work_.derive, work_.sources)
     work_.derived = True
@@ -206,6 +208,15 @@ def _calculate_(work_):
 _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_)
+        _source_getter_registry[source_i] = True
+
+
 @overload_method(WorkTypeClass, "calculate", strict=False, jit_options=default_jit_options)
 def ol_calculate(self_ty):
     derive_ty = self_ty.field_dict["derive"]
@@ -217,13 +228,15 @@ def ol_calculate(self_ty):
     sources_ty = self_ty.field_dict["sources"]
     num_sources = sources_ty.count
     _calculate = _calculate_registry.get(num_sources, None)
-    if _calculate is None:
-        code_txt = _make_calculate_code(num_sources)
-        ns = getmodule(_file_anchor).__dict__
-        code = compile(code_txt, getfile(_file_anchor), mode="exec")
-        exec(code, ns)
-        _calculate = ns["_calculate_"]
-        _calculate_registry[num_sources] = _calculate
+    if _calculate is not None:
+        return _calculate
+    ns = getmodule(_file_anchor).__dict__
+    ensure_presence_of_source_getters_in_ns(num_sources, ns)
+    code_txt = _make_calculate_code(num_sources)
+    code = compile(code_txt, getfile(_file_anchor), mode="exec")
+    exec(code, ns)
+    _calculate = ns["_calculate_"]
+    _calculate_registry[num_sources] = _calculate
     return _calculate
 
 
@@ -246,8 +259,6 @@ def _cast_to_work_data(typingctx, work_ty, data_as_erased_ty: ErasedType):
 
 def _make_loader_code(num_sources):
     code_txt = StringIO()
-    for source_ind_ in range(num_sources):
-        code_txt.write(_make_source_getter(source_ind_))
     code_txt.write("""
 def _loader_(work_, data_):
     reset = False
@@ -282,20 +293,20 @@ def ol_load(work_ty, data_ty: DictType):
     sources_ty = work_ty.field_dict["sources"]
     num_sources = sources_ty.count
     _loader = _loader_registry.get(num_sources, None)
-    if _loader is None:
-        code_txt = _make_loader_code(num_sources)
-        ns = getmodule(_file_anchor).__dict__
-        code = compile(code_txt, getfile(_file_anchor), mode="exec")
-        exec(code, ns)
-        _loader = ns["_loader_"]
-        _loader_registry[num_sources] = _loader
+    if _loader is not None:
+        return _loader
+    ns = getmodule(_file_anchor).__dict__
+    ensure_presence_of_source_getters_in_ns(num_sources, ns)
+    code_txt = _make_loader_code(num_sources)
+    code = compile(code_txt, getfile(_file_anchor), mode="exec")
+    exec(code, ns)
+    _loader = ns["_loader_"]
+    _loader_registry[num_sources] = _loader
     return _loader
 
 
 def _make_combine_code(num_sources):
     code_txt = StringIO()
-    for source_ind_ in range(num_sources):
-        code_txt.write(_make_source_getter(source_ind_))
     code_txt.write("""
 def _combine_(work_, data_, harvested_=None):
     if harvested_ is None:
@@ -331,13 +342,15 @@ def ol_combine(work_ty, data_ty: DictType, harvested_ty=NoneType):
     sources_ty = work_ty.field_dict["sources"]
     num_sources = sources_ty.count
     _combine = _combine_registry.get(num_sources, None)
-    if _combine is None:
-        code_txt = _make_combine_code(num_sources)
-        ns = {**getmodule(_file_anchor).__dict__, **{"boolean": boolean, "Dict": Dict}}
-        code = compile(code_txt, getfile(_file_anchor), mode="exec")
-        exec(code, ns)
-        _combine = ns["_combine_"]
-        _combine_registry[num_sources] = _combine
+    if _combine is not None:
+        return _combine
+    ns = {**getmodule(_file_anchor).__dict__, **{"boolean": boolean, "Dict": Dict}}
+    ensure_presence_of_source_getters_in_ns(num_sources, ns)
+    code_txt = _make_combine_code(num_sources)
+    code = compile(code_txt, getfile(_file_anchor), mode="exec")
+    exec(code, ns)
+    _combine = ns["_combine_"]
+    _combine_registry[num_sources] = _combine
     return _combine
 
 
@@ -364,8 +377,6 @@ def ol_get_inputs_names(self_ty):
 
 def _make_inputs_vector_code(num_sources):
     code_txt = StringIO()
-    for source_ind_ in range(num_sources):
-        code_txt.write(_make_source_getter(source_ind_))
     code_txt.write("""
 def _inputs_vector_(work_):
     node = work_.node
@@ -399,13 +410,15 @@ def ol_make_inputs_vector(self_ty):
             return inputs_vector
         return _
     _inputs_vector = _inputs_vector_registry.get(num_sources, None)
-    if _inputs_vector is None:
-        code_txt = _make_inputs_vector_code(num_sources)
-        ns = {**getmodule(_file_anchor).__dict__, **{"new": new}}
-        code = compile(code_txt, getfile(_file_anchor), mode="exec")
-        exec(code, ns)
-        _inputs_vector = ns["_inputs_vector_"]
-        _inputs_vector_registry[num_sources] = _inputs_vector
+    if _inputs_vector is not None:
+        return _inputs_vector
+    ns = {**getmodule(_file_anchor).__dict__, **{"new": new}}
+    ensure_presence_of_source_getters_in_ns(num_sources, ns)
+    code_txt = _make_inputs_vector_code(num_sources)
+    code = compile(code_txt, getfile(_file_anchor), mode="exec")
+    exec(code, ns)
+    _inputs_vector = ns["_inputs_vector_"]
+    _inputs_vector_registry[num_sources] = _inputs_vector
     return _inputs_vector
 
 

numbox/utils/timer.py

@@ -9,13 +9,16 @@ logging.basicConfig(level=logging.WARNING)
 class Timer:
     times = {}
 
+    def __init__(self, precision=3):
+        self.precision = precision
+
     def __call__(self, func):
         def _(*args, **kws):
             t_start = perf_counter()
             res = func(*args, **kws)
             t_end = perf_counter()
             duration = t_end - t_start
-            logger.warning(f"Execution of {func.__name__} took {duration:.3f}s")
+            logger.warning(f"Execution of {func.__name__} took {duration:.{self.precision}f}s")
             self.times[func.__name__] = duration
             return res
         return _

{numbox-0.2.7.dist-info → numbox-0.2.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: numbox
-Version: 0.2.7
+Version: 0.2.9
 Author: Mikhail Goykhman
 License: MIT License (with Citation Clause)
         
@@ -34,8 +34,12 @@ Keywords: llvmlite,numba,numpy
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: llvmlite==0.44.0
+Requires-Dist: numba~=0.61.0
+Requires-Dist: numpy~=2.1.3
 Provides-Extra: docs
 Requires-Dist: sphinx==8.1.3; extra == "docs"
+Requires-Dist: sphinx-sitemap==2.7.2; extra == "docs"
 Requires-Dist: sphinx-rtd-theme; extra == "docs"
 
 # numbox

{numbox-0.2.7.dist-info → numbox-0.2.9.dist-info}/RECORD

@@ -1,4 +1,4 @@
-numbox/__init__.py,sha256=e3cfQy_iVs9ILsymUalJnJu5D_dd7HuUVoVwKKurcL0,22
+numbox/__init__.py,sha256=bd8hlxKMc0Fh_2w5GWfqBtuwa8uTepTMjT8w7F-EKvY,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=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=jH9lIxpJcU-eJ8SMQe7TzV8xci7FQgK8ZOhFma0n5DI,6308
 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
@@ -23,17 +23,17 @@ numbox/core/work/lowlevel_work_utils.py,sha256=TgRRcNfks0oaOXGXXr3ptafd_Xv_lpmH8
 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=V_pYW0sqdYHh45ago3aMz0fG4U_UfsNLIcpBejn_ttU,14725
+numbox/core/work/work.py,sha256=596flxydeHuEJ3oUhNz3PYPtA58nxERifvBCh8BWVug,15091
 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/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=KkAkWOHQ72WtPjyiAzt_tF1q0DcOnCDkITTb85DvkUM,553
+numbox/utils/timer.py,sha256=5_d690Fb3L2axJBRxtoB0qe23exBosNR4qu6cno4QfY,641
 numbox/utils/void_type.py,sha256=IkZsjNeAIShYJtvWbvERdHnl_mbF1rCRWiM3gp6II8U,404
-numbox-0.2.7.dist-info/LICENSE,sha256=YYgNvjH_p6-1NsdrIqGJnr1GUbZzA_8DxsP6vVfM6nY,1446
-numbox-0.2.7.dist-info/METADATA,sha256=J-Ash1idpJn-eUghPfVjNlVQhkbT0DHKa1D4K-A3ZTs,2792
-numbox-0.2.7.dist-info/WHEEL,sha256=iAkIy5fosb7FzIOwONchHf19Qu7_1wCWyFNR5gu9nU0,91
-numbox-0.2.7.dist-info/top_level.txt,sha256=A67jOkfqidCSYYm6ifjN_WZyIiR1B27fjxv6nNbPvjc,7
-numbox-0.2.7.dist-info/RECORD,,
+numbox-0.2.9.dist-info/LICENSE,sha256=YYgNvjH_p6-1NsdrIqGJnr1GUbZzA_8DxsP6vVfM6nY,1446
+numbox-0.2.9.dist-info/METADATA,sha256=s-0iSTOHKbHEyDL5u8DgOPcbgHSs1897HV9T3963x9E,2935
+numbox-0.2.9.dist-info/WHEEL,sha256=iAkIy5fosb7FzIOwONchHf19Qu7_1wCWyFNR5gu9nU0,91
+numbox-0.2.9.dist-info/top_level.txt,sha256=A67jOkfqidCSYYm6ifjN_WZyIiR1B27fjxv6nNbPvjc,7
+numbox-0.2.9.dist-info/RECORD,,