Support reading v0.13 and v0.14 files

.github/workflows/unittests-rust.yml

@@ -16,8 +16,7 @@ jobs:
       - name: Download test data
         if: steps.cache-test-data.outputs.cache-hit != 'true'
         run: |
-          cd crates/dekoder/tests/data
-          ./download.sh
+          ./tests/data/assets.sh
       - uses: actions/setup-python@v5
       - name: Install task runner
         run: pip install poethepoet

benchmarks/eko/benchmark_evol_to_unity.py

@@ -1,4 +1,4 @@
-import pathlib
+from dataclasses import dataclass
 
 import numpy as np
 import pytest
@@ -10,11 +10,17 @@
 from eko.io.runcards import OperatorCard, TheoryCard
 from eko.matchings import Segment
 from eko.quantities.couplings import CouplingsInfo
-from eko.runner.legacy import Runner
+from eko.runner.parts import _evolve_configs, _managers
 
 # from ekore.matching_conditions.operator_matrix_element import OperatorMatrixElement
 
 
+@dataclass(frozen=True)
+class FakeEKO:
+    theory_card: TheoryCard
+    operator_card: OperatorCard
+
+
 def update_cards(theory: TheoryCard, operator: OperatorCard):
     theory.couplings = CouplingsInfo(
         alphas=0.35,
@@ -40,20 +46,15 @@ def test_operator_grid(
         self,
         theory_card: TheoryCard,
         operator_card: OperatorCard,
-        tmp_path: pathlib.Path,
     ):
         """Test that eko_forward @ eko_backward gives ID matrix or zeros."""
         update_cards(theory_card, operator_card)
-        g = Runner(
-            theory_card=theory_card,
-            operators_card=operator_card,
-            path=tmp_path / "eko.tar",
-        ).op_grid
+        f = FakeEKO(theory_card, operator_card)
 
         seg = Segment(30, 50, 4)
         seg_back = Segment(50, 30, 4)
-        o = Operator(g.config, g.managers, seg)
-        o_back = Operator(g.config, g.managers, seg_back)
+        o = Operator(_evolve_configs(f), _managers(f), seg)
+        o_back = Operator(_evolve_configs(f), _managers(f), seg_back)
         o.compute()
         o_back.compute()
 

doc/source/code/Operators.rst

@@ -19,10 +19,7 @@ The classes are nested as follows:
         PhysicalOperator [label="PhysicalOperator"];
         Operator [label="Operator" ];
         OME [label="OME" ];
-        OperatorGrid [label="OperatorGrid"];
 
-        OperatorGrid -> Operator;
-        OperatorGrid -> OME;
         Operator -> PhysicalOperator [weight=100,style=dashed];
         PhysicalOperator -> ndarray [style=dashed];
         OME -> MatchingCondition [weight=100,style=dashed];
@@ -31,17 +28,8 @@ The classes are nested as follows:
         OpMember -> PhysicalOperator [dir=back];
         OME -> OpMember;
         OpMember -> MatchingCondition [dir=back];
-
-        OperatorGrid -> OpMember -> ndarray [style=invis];
     }
 
-- :class:`~eko.evolution_operator.grid.OperatorGrid`
-
-    * is the master class which administrates all operator tasks
-    * is instantiated once for each run
-    * holds all necessary :doc:`configurations </code/IO>`
-    * holds all necessary instances of the :doc:`/code/Utilities`
-
 - :class:`~eko.evolution_operator.Operator`
 
     * represents a configuration for a fixed final scale :math:`Q_1^2`

pyproject.toml

@@ -43,6 +43,7 @@ scipy = "^1.10.1"
 PyYAML = "^6.0"
 lz4 = "^4.0.2"
 numba = "^0.59.0"
+packaging = "^24.1"
 # ekomark
 banana-hep = { version = "^0.6.12", optional = true }
 sqlalchemy = { version = "^1.4.21", optional = true }

src/eko/__init__.py

@@ -1,13 +1,16 @@
 """Evolution Kernel Operators."""
 
 from . import io, version
+from .io.runcards import OperatorCard, TheoryCard
 from .io.struct import EKO
 from .runner import solve
 
 __version__ = version.__version__
 
 __all__ = [
     "io",
+    "OperatorCard",
+    "TheoryCard",
     "EKO",
     "solve",
 ]

src/eko/evolution_operator/__init__.py

@@ -7,6 +7,7 @@
 import logging
 import os
 import time
+from dataclasses import dataclass
 from multiprocessing import Pool
 from typing import Dict, Tuple
 
@@ -21,14 +22,16 @@
 from .. import basis_rotation as br
 from .. import interpolation, mellin
 from .. import scale_variations as sv
+from ..couplings import Couplings
+from ..interpolation import InterpolatorDispatcher
 from ..io.types import EvolutionMethod, OperatorLabel
 from ..kernels import ev_method
 from ..kernels import non_singlet as ns
 from ..kernels import non_singlet_qed as qed_ns
 from ..kernels import singlet as s
 from ..kernels import singlet_qed as qed_s
 from ..kernels import valence_qed as qed_v
-from ..matchings import Segment, lepton_number
+from ..matchings import Atlas, Segment, lepton_number
 from ..member import OpMember
 from ..scale_variations import expanded as sv_expanded
 from ..scale_variations import exponentiated as sv_exponentiated
@@ -608,6 +611,15 @@ def quad_ker_qed(
 """Map of all operators."""
 
 
+@dataclass(frozen=True)
+class Managers:
+    """Set of steering objects."""
+
+    atlas: Atlas
+    couplings: Couplings
+    interpolator: InterpolatorDispatcher
+
+
 class Operator(sv.ScaleVariationModeMixin):
     """Internal representation of a single EKO.
 
@@ -637,7 +649,12 @@ class Operator(sv.ScaleVariationModeMixin):
     full_labels_qed: Tuple[OperatorLabel, ...] = br.full_unified_labels
 
     def __init__(
-        self, config, managers, segment: Segment, mellin_cut=5e-2, is_threshold=False
+        self,
+        config,
+        managers: Managers,
+        segment: Segment,
+        mellin_cut=5e-2,
+        is_threshold=False,
     ):
         self.config = config
         self.managers = managers
@@ -669,7 +686,7 @@ def xif2(self):
         return self.config["xif2"]
 
     @property
-    def int_disp(self):
+    def int_disp(self) -> InterpolatorDispatcher:
         """Return the interpolation dispatcher."""
         return self.managers.interpolator
 

src/eko/evolution_operator/__init__.py.patch

@@ -1,30 +1,45 @@
 diff --git a/src/eko/evolution_operator/__init__.py b/src/eko/evolution_operator/__init__.py
-index bd1b19d6..f543f7bc 100644
+index 366f934c..73edf44f 100644
 --- a/src/eko/evolution_operator/__init__.py
 +++ b/src/eko/evolution_operator/__init__.py
-@@ -3,16 +3,16 @@ r"""Contains the central operator classes.
+@@ -3,7 +3,6 @@ r"""Contains the central operator classes.
  See :doc:`Operator overview </code/Operators>`.
  """
 
 -import functools
  import logging
  import os
  import time
+@@ -11,13 +10,10 @@ from dataclasses import dataclass
  from multiprocessing import Pool
  from typing import Dict, Tuple
 
 +import ekors
  import numba as nb
  import numpy as np
 -from scipy import integrate
+-
+-import ekore.anomalous_dimensions.polarized.space_like as ad_ps
+-import ekore.anomalous_dimensions.unpolarized.space_like as ad_us
+-import ekore.anomalous_dimensions.unpolarized.time_like as ad_ut
 +from scipy import LowLevelCallable, integrate
 
- import ekore.anomalous_dimensions.polarized.space_like as ad_ps
- import ekore.anomalous_dimensions.unpolarized.space_like as ad_us
-@@ -32,91 +32,10 @@ from ..matchings import Segment, lepton_number
+ from .. import basis_rotation as br
+ from .. import interpolation, mellin
+@@ -26,100 +22,12 @@ from ..couplings import Couplings
+ from ..interpolation import InterpolatorDispatcher
+ from ..io.types import EvolutionMethod, OperatorLabel
+ from ..kernels import ev_method
+-from ..kernels import non_singlet as ns
+-from ..kernels import non_singlet_qed as qed_ns
+-from ..kernels import singlet as s
+-from ..kernels import singlet_qed as qed_s
+-from ..kernels import valence_qed as qed_v
+-from ..matchings import Atlas, Segment, lepton_number
++from ..matchings import Atlas, Segment
  from ..member import OpMember
- from ..scale_variations import expanded as sv_expanded
- from ..scale_variations import exponentiated as sv_exponentiated
+-from ..scale_variations import expanded as sv_expanded
+-from ..scale_variations import exponentiated as sv_exponentiated
 +from .quad_ker import cb_quad_ker_qcd
 
  logger = logging.getLogger(__name__)
@@ -114,7 +129,7 @@ index bd1b19d6..f543f7bc 100644
  spec = [
      ("is_singlet", nb.boolean),
      ("is_QEDsinglet", nb.boolean),
-@@ -188,421 +107,6 @@ class QuadKerBase:
+@@ -191,422 +99,6 @@ class QuadKerBase:
          return self.path.prefactor * pj * self.path.jac
 
 
@@ -533,10 +548,11 @@ index bd1b19d6..f543f7bc 100644
 -            )
 -    return ker
 -
-
+-
  OpMembers = Dict[OperatorLabel, OpMember]
  """Map of all operators."""
-@@ -792,49 +296,6 @@ class Operator(sv.ScaleVariationModeMixin):
+
+@@ -809,49 +301,6 @@ class Operator(sv.ScaleVariationModeMixin):
          """Return the evolution method."""
          return ev_method(EvolutionMethod(self.config["method"]))
 
@@ -586,7 +602,7 @@ index bd1b19d6..f543f7bc 100644
      def initialize_op_members(self):
          """Init all operators with the identity or zeros."""
          eye = OpMember(
-@@ -857,10 +318,14 @@ class Operator(sv.ScaleVariationModeMixin):
+@@ -874,10 +323,14 @@ class Operator(sv.ScaleVariationModeMixin):
              else:
                  self.op_members[n] = zero.copy()
 
@@ -605,7 +621,7 @@ index bd1b19d6..f543f7bc 100644
          """Run the integration for each grid point.
 
          Parameters
-@@ -875,18 +339,53 @@ class Operator(sv.ScaleVariationModeMixin):
+@@ -892,18 +345,53 @@ class Operator(sv.ScaleVariationModeMixin):
          """
          column = []
          k, logx = log_grid