experimaestro 2.0.0a5__py3-none-any.whl → 2.0.0a7__py3-none-any.whl

experimaestro/core/identifier.py

@@ -6,7 +6,7 @@ import logging
 import os
 import struct
 from typing import Optional
-from experimaestro.core.objects import Config
+from experimaestro.core.objects import Config, ConfigMixin
 
 
 class ConfigPath:
@@ -116,7 +116,7 @@ class IdentifierComputer:
     CYCLE_REFERENCE = b"\x0b"
     INIT_TASKS = b"\x0c"
 
-    def __init__(self, config: "Config", config_path: ConfigPath, *, version=None):
+    def __init__(self, config: "ConfigMixin", config_path: ConfigPath, *, version=None):
         # Hasher for parameters
         self._hasher = hashlib.sha256()
         self.config = config
@@ -183,7 +183,7 @@ class IdentifierComputer:
                 self.update(value)
 
         # Handles configurations
-        elif isinstance(value, Config):
+        elif isinstance(value, ConfigMixin):
             # Encodes the identifier
             self._hashupdate(IdentifierComputer.OBJECT_ID)
 
@@ -273,12 +273,17 @@ class IdentifierComputer:
                 self._hashupdate(IdentifierComputer.NAME_ID)
                 self.update(argvalue)
 
+            # Add init tasks
+            if value.__xpm__.init_tasks:
+                self._hashupdate(IdentifierComputer.INIT_TASKS)
+                for init_task in value.__xpm__.init_tasks:
+                    self.update(init_task)
         else:
             raise NotImplementedError("Cannot compute hash of type %s" % type(value))
 
     @staticmethod
     def compute(
-        config: "Config", config_path: ConfigPath | None = None, version=None
+        config: "ConfigMixin", config_path: ConfigPath | None = None, version=None
     ) -> Identifier:
         """Compute the identifier for a configuration
 
@@ -290,7 +295,7 @@ class IdentifierComputer:
         # Try to use the cached value first
         # (if there are no loops)
         if config.__xpm__._sealed:
-            identifier = config.__xpm__._raw_identifier
+            identifier = config.__xpm__._identifier
             if identifier is not None and not identifier.has_loops:
                 return identifier
 

experimaestro/core/objects/config.py

@@ -9,7 +9,6 @@ from experimaestro import taskglobals
 
 from termcolor import cprint
 from pathlib import Path
-import hashlib
 import logging
 import io
 from enum import Enum
@@ -20,7 +19,6 @@ from typing import (
     Callable,
     ClassVar,
     Dict,
-    Iterator,
     List,
     Optional,
     Set,
@@ -48,7 +46,6 @@ from .config_walk import ConfigWalk, ConfigWalkContext
 from .config_utils import (
     getqualattr,
     add_to_path,
-    SealedError,
     TaggedValue,
     ObjectStore,
     classproperty,
@@ -148,9 +145,6 @@ class ConfigInformation:
         # This is used to check typevars coherence
         self.concrete_typevars: Dict[TypeVar, type] = {}
 
-        # Lightweight tasks
-        self.pre_tasks: List["LightweightTask"] = []
-
         # Initialization tasks
         self.init_tasks: List["LightweightTask"] = []
 
@@ -159,11 +153,8 @@ class ConfigInformation:
 
         # Cached information
 
-        self._full_identifier = None
-        """The full identifier (with pre-tasks)"""
-
-        self._raw_identifier = None
-        """The identifier without taking into account pre-tasks"""
+        self._identifier = None
+        """The configuration identifier (cached when sealed)"""
 
         self._validated = False
         self._sealed = False
@@ -366,10 +357,6 @@ class ConfigInformation:
                             % (k, self.xpmtype, self._initinfo)
                         )
 
-            # Validate pre-tasks
-            for pre_task in self.pre_tasks:
-                pre_task.__xpm__.validate()
-
             # Validate init tasks
             for init_task in self.init_tasks:
                 init_task.__xpm__.validate()
@@ -465,90 +452,29 @@ class ConfigInformation:
         context = ConfigWalkContext()
 
         class Unsealer(ConfigWalk):
-            def preprocess(self, config: Config):
+            def preprocess(self, config: ConfigMixin):
                 return config.__xpm__._sealed, config
 
-            def postprocess(self, stub, config: Config, values):
+            def postprocess(self, stub, config: ConfigMixin, values):
                 config.__xpm__._sealed = False
                 config.__xpm__._identifier = None
 
         Unsealer(context, recurse_task=True)(self.pyobject)
 
-    def collect_pre_tasks(self) -> Iterator["Config"]:
-        context = ConfigWalkContext()
-        pre_tasks: Dict[int, "Config"] = {}
-
-        class PreTaskCollect(ConfigWalk):
-            def preprocess(self, config: Config):
-                # Do not cross tasks
-                return not isinstance(config.__xpm__, Task), config
-
-            def postprocess(self, stub, config: Config, values):
-                pre_tasks.update(
-                    {id(pre_task): pre_task for pre_task in config.__xpm__.pre_tasks}
-                )
-
-        PreTaskCollect(context, recurse_task=True)(self.pyobject)
-        return pre_tasks.values()
-
-    def identifiers(self, only_raw: bool):
+    @property
+    def identifier(self):
         """Computes the unique identifier"""
-        from ..identifier import IdentifierComputer, Identifier
-
-        raw_identifier = self._raw_identifier
-        full_identifier = self._full_identifier
+        from ..identifier import IdentifierComputer
 
         # Computes raw identifier if needed
-        if raw_identifier is None or not self._sealed:
-            # Get the main identifier
-            raw_identifier = IdentifierComputer.compute(self.pyobject)
-            if self._sealed:
-                self._raw_identifier = raw_identifier
-
-        if only_raw:
-            return raw_identifier, full_identifier
-
-        # OK, let's compute the full identifier
-        if full_identifier is None or not self._sealed:
-            # Compute the full identifier by including the pre-tasks
-            hasher = hashlib.sha256()
-            hasher.update(raw_identifier.all)
-            pre_tasks_ids = [
-                pre_task.__xpm__.raw_identifier.all
-                for pre_task in self.collect_pre_tasks()
-            ]
-            for task_id in sorted(pre_tasks_ids):
-                hasher.update(task_id)
-
-            # Adds init tasks
-            if self.init_tasks:
-                hasher.update(IdentifierComputer.INIT_TASKS)
-                for init_task in self.init_tasks:
-                    hasher.update(init_task.__xpm__.raw_identifier.all)
-
-            full_identifier = Identifier(hasher.digest())
-            full_identifier.has_loops = raw_identifier.has_loops
-
-            # Only cache the identifier if sealed
-            if self._sealed:
-                self._full_identifier = full_identifier
-
-        return raw_identifier, full_identifier
-
-    @property
-    def raw_identifier(self) -> "Identifier":
-        """Computes the unique identifier (without task modifiers)"""
-        raw_identifier, _ = self.identifiers(True)
-        return raw_identifier
-
-    @property
-    def full_identifier(self) -> "Identifier":
-        """Computes the unique identifier (with task modifiers)"""
-        _, full_identifier = self.identifiers(False)
-        return full_identifier
+        if self._identifier is not None:
+            return self._identifier
 
-    identifier = full_identifier
-    """Deprecated: use full_identifier"""
+        # Get the main identifier
+        identifier = IdentifierComputer.compute(self.pyobject)
+        if self._sealed:
+            self._identifier = identifier
+        return identifier
 
     def dependency(self):
         """Returns a dependency"""
@@ -563,12 +489,6 @@ class ConfigInformation:
         path: List[str],
         taskids: Set[int],
     ):
-        # Add pre-tasks
-        for pre_task in self.pre_tasks:
-            pre_task.__xpm__.updatedependencies(
-                dependencies, path + ["__pre_tasks__"], taskids
-            )
-
         # Add initialization tasks
         for init_task in self.init_tasks:
             init_task.__xpm__.updatedependencies(
@@ -841,9 +761,6 @@ class ConfigInformation:
         if self.task is not None and self.task is not self:
             ConfigInformation.__collect_objects__(self.task, objects, context)
 
-        # Serialize pre-tasks
-        ConfigInformation.__collect_objects__(self.pre_tasks, objects, context)
-
         # Serialize initialization tasks
         ConfigInformation.__collect_objects__(self.init_tasks, objects, context)
 
@@ -857,8 +774,6 @@ class ConfigInformation:
         }
 
         # Add pre/init tasks
-        if self.pre_tasks:
-            state_dict["pre-tasks"] = [id(pre_task) for pre_task in self.pre_tasks]
         if self.init_tasks:
             state_dict["init-tasks"] = [id(init_task) for init_task in self.init_tasks]
 
@@ -1191,12 +1106,6 @@ class ConfigInformation:
                 o.__post_init__()
 
             else:
-                # Sets pre-tasks
-                o.__xpm__.pre_tasks = [
-                    objects[pre_task_id]
-                    for pre_task_id in definition.get("pre-tasks", [])
-                ]
-
                 if task_id := definition.get("task", None):
                     o.__xpm__.task = objects[task_id]
 
@@ -1230,15 +1139,6 @@ class ConfigInformation:
 
         # Run pre-task (or returns them)
         if as_instance or return_tasks:
-            # Collect pre-tasks (just once)
-            completed_pretasks = set()
-            pre_tasks = []
-            for definition in definitions:
-                for pre_task_id in definition.get("pre-tasks", []):
-                    if pre_task_id not in completed_pretasks:
-                        completed_pretasks.add(pre_task_id)
-                        pre_tasks.append(objects[pre_task_id])
-
             # Collect init tasks
             init_tasks = []
             for init_task_id in definitions[-1].get("init-tasks", []):
@@ -1246,14 +1146,11 @@ class ConfigInformation:
                 init_tasks.append(init_task)
 
             if as_instance:
-                for pre_task in pre_tasks:
-                    logger.info("Executing pre-task %s", type(pre_task))
-                    pre_task.execute()
                 for init_task in init_tasks:
                     logger.info("Executing init task %s", type(init_task))
                     init_task.execute()
             else:
-                return o, pre_tasks, pre_task + init_tasks
+                return o, init_tasks
 
         return o
 
@@ -1261,7 +1158,6 @@ class ConfigInformation:
         def __init__(self, context: ConfigWalkContext, *, objects: ObjectStore = None):
             super().__init__(context)
             self.objects = ObjectStore() if objects is None else objects
-            self.pre_tasks = {}
 
         def preprocess(self, config: "Config"):
             if self.objects.is_constructed(id(config)):
@@ -1288,10 +1184,6 @@ class ConfigInformation:
             # Call __post_init__
             stub.__post_init__()
 
-            # Gather pre-tasks
-            for pre_task in config.__xpm__.pre_tasks:
-                self.pre_tasks[id(pre_task)] = self.stub(pre_task)
-
             self.objects.set_constructed(id(config))
             return stub
 
@@ -1305,10 +1197,6 @@ class ConfigInformation:
         processor = ConfigInformation.FromPython(context, objects=objects)
         last_object = processor(self.pyobject)
 
-        # Execute pre-tasks
-        for pre_task in processor.pre_tasks.values():
-            pre_task.execute()
-
         return last_object
 
     def add_dependencies(self, *dependencies):
@@ -1509,32 +1397,7 @@ class ConfigMixin:
         attributes)"""
         return clone(self)
 
-    def add_pretasks(self, *tasks: "LightweightTask"):
-        assert all(
-            [isinstance(task, ConfigMixin) for task in tasks]
-        ), "One of the parameters is not a configuration object"
-        assert all(
-            [isinstance(task, LightweightTask) for task in tasks]
-        ), "One of the pre-tasks are not lightweight tasks"
-        if self.__xpm__._sealed:
-            raise SealedError("Cannot add pre-tasks to a sealed configuration")
-        self.__xpm__.pre_tasks.extend(tasks)
-        return self
-
-    def add_pretasks_from(self, *configs: "Config"):
-        assert all(
-            [isinstance(config, ConfigMixin) for config in configs]
-        ), "One of the parameters is not a configuration object"
-        for config in configs:
-            self.add_pretasks(*config.__xpm__.pre_tasks)
-        return self
-
-    @property
-    def pre_tasks(self) -> List["LightweightTask"]:
-        """Access pre-tasks"""
-        return self.__xpm__.pre_tasks
-
-    def copy_dependencies(self, other: "Config"):
+    def copy_dependencies(self, other: "ConfigMixin"):
         """Add all the dependencies from other configuration"""
 
         # Add task dependency
@@ -1598,17 +1461,7 @@ class Config:
         return self.__xpm__.__json__()
 
     def __identifier__(self) -> "Identifier":
-        return self.__xpm__.full_identifier
-
-    def add_pretasks(self, *tasks: "LightweightTask"):
-        """Add pre-tasks"""
-        raise AssertionError("This method can only be used during configuration")
-
-    def add_pretasks_from(self, *configs: "Config"):
-        """Add pre-tasks from the listed configurations"""
-        raise AssertionError(
-            "The 'add_pretasks_from' can only be used during configuration"
-        )
+        return self.__xpm__.identifier
 
     def copy_dependencies(self, other: "Config"):
         """Add pre-tasks from the listed configurations"""
@@ -1616,11 +1469,6 @@ class Config:
             "The 'copy_dependencies' method can only be used during configuration"
         )
 
-    @property
-    def pre_tasks(self) -> List["LightweightTask"]:
-        """Access pre-tasks"""
-        raise AssertionError("Pre-tasks can be accessed only during configuration")
-
     def register_task_output(self, method, *args, **kwargs):
         # Determine the path for this...
         path = taskglobals.Env.instance().xpm_path / "task-outputs.jsonl"

experimaestro/core/objects/config_walk.py

@@ -109,11 +109,7 @@ class ConfigWalk:
                 else:
                     result[arg.name] = None
 
-            # Deals with pre-tasks
-            if info.pre_tasks:
-                with self.map("__pre_tasks__"):
-                    self(info.pre_tasks)
-
+            # Deals with init tasks
             if info.init_tasks:
                 with self.map("__init_tasks__"):
                     self(info.init_tasks)

experimaestro/core/objects.pyi

@@ -168,7 +168,7 @@ class ConfigMixin:
         *,
         workspace: Incomplete | None = ...,
         launcher: Incomplete | None = ...,
-        run_mode: RunMode = ...
+        run_mode: RunMode = ...,
     ): ...
     def stdout(self): ...
     def stderr(self): ...
@@ -195,11 +195,7 @@ class Config:
     def __post_init__(self) -> None: ...
     def __json__(self): ...
     def __identifier__(self) -> Identifier: ...
-    def add_pretasks(self, *tasks: "LightweightTask"): ...
-    def add_pretasks_from(self, configs: "Config"): ...
     def copy_dependencies(self, other: "Config"): ...
-    @property
-    def pre_tasks(self) -> List["LightweightTask"]: ...
 
 class LightweightTask(Config):
     def execute(self) -> None: ...
@@ -213,7 +209,7 @@ class Task(LightweightTask):
         workspace: Incomplete | None = ...,
         launcher: Incomplete | None = ...,
         run_mode: RunMode = ...,
-        init_tasks: List["LightweightTask"] = []
+        init_tasks: List["LightweightTask"] = [],
     ): ...
     def task_outputs(self, dep: Callable[[Config], None]) -> Any: ...
 

experimaestro/core/serializers.py

@@ -1,10 +1,8 @@
-from typing import List, TypeVar, Callable, Any
-from pathlib import Path
+from typing import List, TypeVar
 from experimaestro import Param
 
 from .objects import Config, LightweightTask
 from .arguments import DataPath
-from experimaestro import copyconfig
 
 
 class SerializationLWTask(LightweightTask):
@@ -39,8 +37,3 @@ class PathSerializationLWTask(SerializationLWTask):
 
     path: DataPath
     """Path containing the data"""
-
-    @classmethod
-    def construct(cls, value: T, path: Path, dep: Callable[[Config], Any]) -> T:
-        value = copyconfig(value)
-        return value.add_pretasks(dep(cls(value=value, path=path)))

experimaestro/tests/test_dependencies.py

@@ -85,9 +85,3 @@ def test_dependencies_inner_task_output(xp):
     a = task_a.submit()
     b = Inner_TaskB.C(param_a=a).submit()
     check_dependencies(b, task_a)
-
-
-def test_dependencies_pre_task(xp):
-    a = TaskA.C().submit()
-    a2 = TaskA.C().add_pretasks(a).submit()
-    check_dependencies(a2, a)

experimaestro/tests/test_identifier.py

@@ -68,19 +68,19 @@ def assert_notequal(a, b, message=""):
     assert getidentifier(a) != getidentifier(b), message
 
 
-def test_param_int():
+def test_identifier_int():
     assert_equal(A.C(a=1), A.C(a=1))
 
 
-def test_param_different_type():
+def test_identifier_different_type():
     assert_notequal(A.C(a=1), B.C(a=1))
 
 
-def test_param_order():
+def test_identifier_order():
     assert_equal(Values.C(value1=1, value2=2), Values.C(value2=2, value1=1))
 
 
-def test_param_default():
+def test_identifier_default():
     assert_equal(C.C(a=1, b=2), C.C(b=2))
 
 
@@ -88,22 +88,22 @@ def test_identifier_default_field():
     assert_equal(CField.C(a=1, b=2), CField.C(b=2))
 
 
-def test_param_inner_eq():
+def test_identifier_inner_eq():
     assert_equal(D.C(a=A.C(a=1)), D.C(a=A.C(a=1)))
 
 
-def test_param_float():
+def test_identifier_float():
     assert_equal(Float.C(value=1), Float.C(value=1))
 
 
-def test_param_float2():
+def test_identifier_float2():
     assert_equal(Float.C(value=1.0), Float.C(value=1))
 
 
 # --- Argument name
 
 
-def test_param_name():
+def test_identifier_name():
     """The identifier fully determines the hash code"""
 
     class Config0(Config):
@@ -125,7 +125,7 @@ def test_param_name():
 # --- Test option
 
 
-def test_param_option():
+def test_identifier_option():
     class OptionConfig(Config):
         __xpmid__ = "test.identifier.option"
         a: Param[int]
@@ -139,7 +139,7 @@ def test_param_option():
 # --- Dictionnary
 
 
-def test_param_identifier_dict():
+def test_identifier_dict():
     """Test identifiers of dictionary structures"""
 
     class B(Config):
@@ -166,7 +166,7 @@ class TypeWithPath(Config):
     path: Param[Path]
 
 
-def test_param_identifier_path():
+def test_identifier_path():
     """Path should be ignored"""
     assert_equal(TypeWithPath.C(a=1, path="/a/b"), TypeWithPath.C(a=1, path="/c/d"))
     assert_notequal(TypeWithPath.C(a=2, path="/a/b"), TypeWithPath.C(a=1, path="/c/d"))
@@ -175,7 +175,7 @@ def test_param_identifier_path():
 # --- Test with added arguments
 
 
-def test_param_identifier_pathoption():
+def test_identifier_pathoption():
     """Path arguments should be ignored"""
 
     class A_with_path(Config):
@@ -190,7 +190,7 @@ def test_param_identifier_pathoption():
     assert_equal(A_with_path.C(a=1), A_without_path.C(a=1))
 
 
-def test_param_identifier_enum():
+def test_identifier_enum():
     """test enum parameters"""
     from enum import Enum
 
@@ -205,7 +205,7 @@ def test_param_identifier_enum():
     assert_equal(EnumConfig.C(a=EnumParam.FIRST), EnumConfig.C(a=EnumParam.FIRST))
 
 
-def test_param_identifier_addnone():
+def test_identifier_addnone():
     """Test the case of new parameter (with None default)"""
 
     class B(Config):
@@ -222,7 +222,7 @@ def test_param_identifier_addnone():
     assert_notequal(A_with_b.C(b=B.C(x=1)), A.C())
 
 
-def test_param_defaultnew():
+def test_identifier_defaultnew():
     """Path arguments should be ignored"""
 
     class A_with_b(Config):
@@ -239,7 +239,7 @@ def test_param_defaultnew():
     assert_equal(A_with_b.C(a=1), A.C(a=1))
 
 
-def test_param_taskconfigidentifier():
+def test_identifier_taskconfigidentifier():
     """Test whether the embedded task arguments make the configuration different"""
 
     class MyConfig(Config):
@@ -261,7 +261,7 @@ def test_param_taskconfigidentifier():
     )
 
 
-def test_param_constant():
+def test_identifier_constant():
     """Test if constants are taken into account for signature computation"""
 
     class A1(Config):
@@ -281,7 +281,7 @@ def test_param_constant():
     assert_notequal(A1.C(), A2.C())
 
 
-def test_param_identifier_deprecated_class():
+def test_identifier_deprecated_class():
     """Test that when submitting the task, the computed identifier is the one of
     the new class"""
 
@@ -305,7 +305,7 @@ def test_param_identifier_deprecated_class():
     )
 
 
-def test_param_identifier_deprecated_attribute():
+def test_identifier_deprecated_attribute():
     class Values(Config):
         values: Param[List[int]] = []
 
@@ -320,7 +320,7 @@ class MetaA(Config):
     x: Param[int]
 
 
-def test_param_identifier_meta():
+def test_identifier_meta():
     """Test forced meta-parameter"""
 
     class B(Config):
@@ -363,7 +363,7 @@ def test_param_identifier_meta():
     )
 
 
-def test_param_identifier_meta_default_dict():
+def test_identifier_meta_default_dict():
     class DictConfig(Config):
         params: Param[Dict[str, MetaA]] = {}
 
@@ -379,7 +379,7 @@ def test_param_identifier_meta_default_dict():
     )
 
 
-def test_param_identifier_meta_default_array():
+def test_identifier_meta_default_array():
     class ArrayConfigWithDefault(Config):
         array: Param[List[MetaA]] = []
 
@@ -395,37 +395,7 @@ def test_param_identifier_meta_default_array():
     )
 
 
-def test_param_identifier_pre_task():
-    class MyConfig(Config):
-        pass
-
-    class IdentifierPreLightTask(LightweightTask):
-        pass
-
-    class IdentifierPreTask(Task):
-        x: Param[MyConfig]
-
-    task = IdentifierPreTask.C(x=MyConfig.C()).submit(run_mode=RunMode.DRY_RUN)
-    task_with_pre = (
-        IdentifierPreTask.C(x=MyConfig.C())
-        .add_pretasks(IdentifierPreLightTask.C())
-        .submit(run_mode=RunMode.DRY_RUN)
-    )
-    task_with_pre_2 = (
-        IdentifierPreTask.C(x=MyConfig.C())
-        .add_pretasks(IdentifierPreLightTask.C())
-        .submit(run_mode=RunMode.DRY_RUN)
-    )
-    task_with_pre_3 = IdentifierPreTask.C(
-        x=MyConfig.C().add_pretasks(IdentifierPreLightTask.C())
-    ).submit(run_mode=RunMode.DRY_RUN)
-
-    assert_notequal(task, task_with_pre, "No pre-task")
-    assert_equal(task_with_pre, task_with_pre_2, "Same parameters")
-    assert_equal(task_with_pre, task_with_pre_3, "Pre-tasks are order-less")
-
-
-def test_param_identifier_init_task():
+def test_identifier_init_task():
     class MyConfig(Config):
         pass
 
@@ -435,26 +405,67 @@ def test_param_identifier_init_task():
     class IdentifierInitTask2(Task):
         pass
 
-    class IdentierTask(Task):
+    class IdentifierTask(Task):
         x: Param[MyConfig]
 
-    task = IdentierTask.C(x=MyConfig.C()).submit(run_mode=RunMode.DRY_RUN)
-    task_with_pre = IdentierTask.C(x=MyConfig.C()).submit(
+    task = IdentifierTask.C(x=MyConfig.C()).submit(run_mode=RunMode.DRY_RUN)
+    task_with_pre = IdentifierTask.C(x=MyConfig.C()).submit(
         run_mode=RunMode.DRY_RUN,
         init_tasks=[IdentifierInitTask.C(), IdentifierInitTask2.C()],
     )
-    task_with_pre_2 = IdentierTask.C(x=MyConfig.C()).submit(
+    task_with_pre_2 = IdentifierTask.C(x=MyConfig.C()).submit(
         run_mode=RunMode.DRY_RUN,
         init_tasks=[IdentifierInitTask.C(), IdentifierInitTask2.C()],
     )
-    task_with_pre_3 = IdentierTask.C(x=MyConfig.C()).submit(
+    task_with_pre_3 = IdentifierTask.C(x=MyConfig.C()).submit(
         run_mode=RunMode.DRY_RUN,
         init_tasks=[IdentifierInitTask2.C(), IdentifierInitTask.C()],
     )
 
-    assert_notequal(task, task_with_pre, "No pre-task")
+    assert_notequal(task, task_with_pre, "Should be different with init-task")
     assert_equal(task_with_pre, task_with_pre_2, "Same parameters")
-    assert_notequal(task_with_pre, task_with_pre_3, "Same parameters")
+    assert_notequal(task_with_pre, task_with_pre_3, "Other parameters")
+
+
+def test_identifier_init_task_dep():
+    class Loader(LightweightTask):
+        param1: Param[float]
+
+        def execute(self):
+            pass
+
+    class FirstTask(Task):
+        def task_outputs(self, dep):
+            return dep(Loader.C(param1=1))
+
+        def execute(self):
+            pass
+
+    class SecondTask(Task):
+        param3: Param[int]
+
+        def execute(self):
+            pass
+
+    # Two identical tasks
+    task_a_1 = FirstTask.C()
+    task_a_2 = FirstTask.C()
+    assert_equal(task_a_1, task_a_2)
+
+    # We process them with two different init tasks
+    loader_1 = task_a_1.submit(
+        init_tasks=[Loader.C(param1=0.5)], run_mode=RunMode.DRY_RUN
+    )
+    loader_2 = task_a_2.submit(
+        init_tasks=[Loader.C(param1=5)], run_mode=RunMode.DRY_RUN
+    )
+    assert_notequal(loader_1, loader_2)
+
+    # Now, we process
+    c_1 = SecondTask.C(param3=2).submit(init_tasks=[loader_1], run_mode=RunMode.DRY_RUN)
+
+    c_2 = SecondTask.C(param3=2).submit(init_tasks=[loader_2], run_mode=RunMode.DRY_RUN)
+    assert_notequal(c_1, c_2)
 
 
 # --- Check configuration reloads
@@ -472,7 +483,7 @@ def check_reload(config):
     new_config = ConfigInformation.fromParameters(
         data, as_instance=False, discard_id=True
     )
-    assert new_config.__xpm__._full_identifier is None
+    assert new_config.__xpm__._identifier is None
     new_identifier = new_config.__xpm__.identifier.all
 
     assert new_identifier == old_identifier
@@ -482,7 +493,7 @@ class IdentifierReloadConfig(Config):
     id: Param[str]
 
 
-def test_param_identifier_reload_config():
+def test_identifier_reload_config():
     # Creates the configuration
     check_reload(IdentifierReloadConfig.C(id="123"))
 
@@ -498,7 +509,7 @@ class IdentifierReloadDerived(Config):
     task: Param[IdentifierReloadConfig]
 
 
-def test_param_identifier_reload_taskoutput():
+def test_identifier_reload_taskoutput():
     """When using a task output, the identifier should not be different"""
 
     # Creates the configuration
@@ -520,7 +531,7 @@ class IdentifierReloadTaskDerived(Config):
     other: Param[IdentifierReloadTaskConfig]
 
 
-def test_param_identifier_reload_task_direct():
+def test_identifier_reload_task_direct():
     """When using a direct task output, the identifier should not be different"""
 
     # Creates the configuration
@@ -531,7 +542,7 @@ def test_param_identifier_reload_task_direct():
     check_reload(config)
 
 
-def test_param_identifier_reload_meta():
+def test_identifier_reload_meta():
     """Test identifier don't change when using meta"""
     # Creates the configuration
     task = IdentifierReloadTask.C(id="123").submit(run_mode=RunMode.DRY_RUN)
@@ -554,7 +565,7 @@ class LoopC(Config):
     param_b: Param["LoopB"]
 
 
-def test_param_identifier_loop():
+def test_identifier_loop():
     c = LoopC.C()
     b = LoopB.C(param_c=c)
     a = LoopA.C(param_b=b)

experimaestro/tests/test_instance.py

@@ -46,18 +46,6 @@ class LoadModel(SerializationLWTask):
         self.value.initialized = True
 
 
-def test_instance_serialized():
-    model = Model.C()
-    model.add_pretasks(LoadModel.C(value=model))
-    trainer = Evaluator.C(model=model)
-    instance = trainer.instance()
-
-    assert isinstance(
-        instance.model, Model
-    ), f"The model is not a Model but a {type(instance.model).__qualname__}"
-    assert instance.model.initialized, "The model was not initialized"
-
-
 class ConfigWithOptional(Config):
     x: Param[int] = 1
     y: Param[Optional[int]]

experimaestro/tests/test_serializers.py

@@ -1,71 +1,12 @@
 from typing import Optional
 from experimaestro import (
     Config,
-    Task,
     Param,
-    SerializationLWTask,
-    copyconfig,
     state_dict,
     from_state_dict,
 )
 from experimaestro.core.context import SerializationContext
 from experimaestro.core.objects import ConfigMixin
-from experimaestro.tests.utils import TemporaryExperiment
-
-
-class SubModel(Config):
-    pass
-
-
-class Model(Config):
-    submodel: Param[SubModel]
-
-    def __post_init__(self):
-        self.initialized = False
-        self.submodel.initialized = False
-
-
-class LoadModel(SerializationLWTask):
-    def execute(self):
-        self.value.initialized = True
-        self.value.submodel.initialized = True
-
-
-class Trainer(Task):
-    model: Param[Config]
-
-    def task_outputs(self, dep):
-        model = copyconfig(self.model)
-        return model.add_pretasks(dep(LoadModel.C(value=model)))
-
-    def execute(self):
-        assert not self.model.initialized, "Model not initialized"
-
-
-class Evaluate(Task):
-    model: Param[Config]
-    is_submodel: Param[bool] = False
-
-    def execute(self):
-        assert self.model.initialized, "Model not initialized"
-        if self.is_submodel:
-            assert isinstance(self.model, SubModel)
-        else:
-            assert isinstance(self.model, Model)
-
-
-def test_serializers_xp():
-    with TemporaryExperiment("serializers", maxwait=20, port=0):
-        model = Model.C(submodel=SubModel.C())
-        trained_model: Model = Trainer.C(model=model).submit()
-
-        # Use the model itself
-        Evaluate.C(model=trained_model).submit()
-
-        # Use a submodel
-        Evaluate.C(model=trained_model.submodel, is_submodel=True).add_pretasks_from(
-            trained_model
-        ).submit()
 
 
 class Object1(Config):

experimaestro/tests/test_tasks.py

@@ -303,26 +303,6 @@ class MyLightweightTask(Task):
         assert self.x.data == 1
 
 
-def test_task_lightweight():
-    with TemporaryExperiment("lightweight", maxwait=20):
-        x = LightweightConfig.C()
-        lwtask = LightweightTask.C(x=x)
-        assert (
-            MyLightweightTask.C(x=x).add_pretasks(lwtask).submit().__xpm__.job.wait()
-            == JobState.DONE
-        ), "Pre-tasks should be executed"
-
-        x_2 = LightweightConfig.C()
-        lwtask_2 = LightweightTask.C(x=x)
-        assert (
-            MyLightweightTask.C(x=x_2.add_pretasks(lwtask_2))
-            .add_pretasks(lwtask_2)
-            .submit()
-            .__xpm__.job.wait()
-            == JobState.DONE
-        ), "Pre-tasks should be run just once"
-
-
 def test_task_lightweight_init():
     with TemporaryExperiment("lightweight_init", maxwait=20):
         x = LightweightConfig.C()

{experimaestro-2.0.0a5.dist-info → experimaestro-2.0.0a7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: experimaestro
-Version: 2.0.0a5
+Version: 2.0.0a7
 Summary: "Experimaestro is a computer science experiment manager"
 License: GPL-3
 License-File: LICENSE

{experimaestro-2.0.0a5.dist-info → experimaestro-2.0.0a7.dist-info}/RECORD

@@ -16,14 +16,14 @@ experimaestro/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuF
 experimaestro/core/arguments.py,sha256=gB0Kq9XL0_mYbm9WHL-mDx2tUGHI1pvsu1ahMaDxIY0,7170
 experimaestro/core/callbacks.py,sha256=59JfeUgWcCCdIQ3pvh-xNnoRp9BX8f4iOAkgm16wBzE,1660
 experimaestro/core/context.py,sha256=1tLmX7WcgEKSbGw77vfziTzS8KNsoZJ02JBWMBCqqOk,2606
-experimaestro/core/identifier.py,sha256=d-DczyKvQhqyGD9I1ndHrPoOFRDcBHNzeqQx6EOrDPo,10552
+experimaestro/core/identifier.py,sha256=GmS3HtfLwirjoaVx6cZvLJL4r4546P0FFUSu2Nt0W9g,10812
 experimaestro/core/objects/__init__.py,sha256=ucJY5e17QQ1Kc-GYXeL7g8GFj8rP0XB4g2vrl32uhxY,721
-experimaestro/core/objects/config.py,sha256=iZDKunz03N7O5Dd-jxdyhJyfmIvLPLAHsjiGsPCbdWA,58887
+experimaestro/core/objects/config.py,sha256=wmSCkpYPhhs-lj6qA4KFDH4e-qN6eKfsSeO_yeRYes0,53137
 experimaestro/core/objects/config_utils.py,sha256=ZLECGkeIWdzunm8vwWsQhvcSgV1e064BgXbLiZnxSEM,1288
-experimaestro/core/objects/config_walk.py,sha256=b8u6oohf1gXyva4Y_Cyyl_3BNivzI2y-I2B6MUPV2aU,4353
-experimaestro/core/objects.pyi,sha256=xvlsRj4u1xsJxbevJl5Ner_HwmxR8x1JlAeIVDJzuy0,6498
+experimaestro/core/objects/config_walk.py,sha256=SYBrGuT7HV12no9mQd1HjnebiyygHyO-zq_TO1brUtc,4233
+experimaestro/core/objects.pyi,sha256=Q1tq4F8LrExPm00E-P5aaygxMvViYZqhHvByo_TTZRE,6315
 experimaestro/core/serialization.py,sha256=CSPEwOzlDsgAz6V2og-TgyU0RXDtzt_nXaoXFZleDZE,5775
-experimaestro/core/serializers.py,sha256=R_CAMyjjfU1oi-eHU6VlEUixJpFayGqEPaYu7VsD9xA,1197
+experimaestro/core/serializers.py,sha256=iOBuASEgD8dRKPnL16iOLBsM0GHChCJgjBd7LixFui4,919
 experimaestro/core/types.py,sha256=aI-Qad27tkBFR5HyBCeeUwmZFIQif70__AR7enzpjvY,20938
 experimaestro/core/utils.py,sha256=JfC3qGUS9b6FUHc2VxIYUI9ysNpXSQ1LjOBkjfZ8n7o,495
 experimaestro/exceptions.py,sha256=cUy83WHM3GeynxmMk6QRr5xsnpqUAdAoc-m3KQVrE2o,44
@@ -122,24 +122,24 @@ experimaestro/tests/tasks/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJW
 experimaestro/tests/tasks/all.py,sha256=OMkHsWZkErCmTajiNO7hNhvnk9eKzJC-VatWgabWlsI,1955
 experimaestro/tests/tasks/foreign.py,sha256=uhXDOcWozkcm26ybbeEU9RElJpbhjC-zdzmlSKfPcdY,122
 experimaestro/tests/test_checkers.py,sha256=e6Rv2TlePRY__VXs0vUb6a5Aw_KIq_cs4N86VhnYHtw,407
-experimaestro/tests/test_dependencies.py,sha256=cu8M3mWBqOcYybQ2mAOIW3MKL3iCklFci99fdXSp5Yw,2029
+experimaestro/tests/test_dependencies.py,sha256=LvpmMcfnRzQPzUIuFNCIQnJot8YBSxCA827xh9gYlq0,1890
 experimaestro/tests/test_experiment.py,sha256=Nfevu_aMyX4c5xTjDHMeKXZWs2HMOhy96tsQlnF-IVs,1693
 experimaestro/tests/test_file_progress.py,sha256=uNUUq-ptcnxu56zRvUUZ5EYM9ZIQbUmOU_LI0roMgSw,15119
 experimaestro/tests/test_file_progress_integration.py,sha256=ejXASpdnpi6HUy569Q5Vx5F8SV_RDU-4o3yuQka6vS4,16751
 experimaestro/tests/test_findlauncher.py,sha256=KPy8ow--NXS1KFCIpxrmEJFRvjo-v-PwlVHVyoVKLPg,3134
 experimaestro/tests/test_forward.py,sha256=9y1zYm7hT_Lx5citxnK7n20cMZ2WJbsaEeY5irCZ9U4,735
 experimaestro/tests/test_generators.py,sha256=R0UypTzxX0dPYvY4A_kozpLDHhGzQDNfLQyc0oRaSx8,2891
-experimaestro/tests/test_identifier.py,sha256=PfUK-IYXCTyK1YMrsphkQx4BmsST5Z3bWSNgu-ZameU,14284
-experimaestro/tests/test_instance.py,sha256=QaJAxZzyUQiEwx5lmfJKDw4vg1p6ASPhR6QJPXWjhnw,1705
+experimaestro/tests/test_identifier.py,sha256=0uv7lsgLLzKHLinlq2J9yj9UyKG6ud1EYtxIyeXbyhE,14368
+experimaestro/tests/test_instance.py,sha256=VFRvjy1OXGtGgkh__mf73KmJq4Lom7ppvBDkhE7rjTA,1325
 experimaestro/tests/test_objects.py,sha256=hGku35h1qkNMIdgP_gWM7HeviaqW7jrZDffOsCJh-_Q,1787
 experimaestro/tests/test_outputs.py,sha256=vilnECNfc-cyzDZjTvCgCSMesC7QwWTfhJtlOyM9kIM,797
 experimaestro/tests/test_param.py,sha256=OW3uguPjy9U6f9BrLr8z4ieo88EH6da2zMho-FVwmKQ,7324
 experimaestro/tests/test_progress.py,sha256=j-V65Adk9psBzMcSzlH7uSqDiLkYDd3Udpy1UCT8j2Y,7588
-experimaestro/tests/test_serializers.py,sha256=q_uUExeWeUP1K_phpUVzyFpn25PObqyYgqxaWvEvawk,2734
+experimaestro/tests/test_serializers.py,sha256=dQkiuvHAQ1g-SCRCfOy977nQMWR7CFuBUud65N_vfiI,1248
 experimaestro/tests/test_snippets.py,sha256=rojnyDjtmAMnSuDUj6Bv9XEgdP8oQf2nVc132JF8vsM,3081
 experimaestro/tests/test_ssh.py,sha256=KS1NWltiXrJBSStY9d4mwrexeqgNGWmhxuAU_WLQDAU,1449
 experimaestro/tests/test_tags.py,sha256=_FE0g1kCwrgy7AlLNmgYHol07lMk8Iyera60-gO2k-s,2886
-experimaestro/tests/test_tasks.py,sha256=k-DejgObLDmDtHaKoIgCTai_uNM3GHkbts-Wwyh5WkI,9555
+experimaestro/tests/test_tasks.py,sha256=fr0e4X5xhzHtDUVyHU4wB00IXggWs-f5MzBBi_kHVZA,8895
 experimaestro/tests/test_tokens.py,sha256=0PPVCBcYWzFqgCQEbJsNAZOIVZt4VVv2vu-W4sk0Ogg,7859
 experimaestro/tests/test_types.py,sha256=Y76TvSv9euJqI6Zu14cnD8ldToWxts43yvGa7-HV2kA,1363
 experimaestro/tests/test_validation.py,sha256=tinkXETcAGtgPIsmbioKSU00kGIV1YnniHTGDDcUOq8,4118
@@ -159,8 +159,8 @@ experimaestro/utils/multiprocessing.py,sha256=am3DkHP_kmWbpynbck2c9QystCUtPBoSAC
 experimaestro/utils/resources.py,sha256=j-nvsTFwmgENMoVGOD2Ap-UD3WU85WkI0IgeSszMCX4,1328
 experimaestro/utils/settings.py,sha256=jpFMqF0DLL4_P1xGal0zVR5cOrdD8O0Y2IOYvnRgN3k,793
 experimaestro/xpmutils.py,sha256=S21eMbDYsHfvmZ1HmKpq5Pz5O-1HnCLYxKbyTBbASyQ,638
-experimaestro-2.0.0a5.dist-info/METADATA,sha256=bv8FXmTGVQ5PzyPgUCQvw8LHxqilh2eqhWbpSFUD0c4,5712
-experimaestro-2.0.0a5.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
-experimaestro-2.0.0a5.dist-info/entry_points.txt,sha256=TppTNiz5qm5xm1fhAcdLKdCLMrlL-eQggtCrCI00D9c,446
-experimaestro-2.0.0a5.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-experimaestro-2.0.0a5.dist-info/RECORD,,
+experimaestro-2.0.0a7.dist-info/METADATA,sha256=S9XtZbUQv51cDw0OWhCHshfsqzn2p1TxLnJ4G2mkVQI,5712
+experimaestro-2.0.0a7.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+experimaestro-2.0.0a7.dist-info/entry_points.txt,sha256=TppTNiz5qm5xm1fhAcdLKdCLMrlL-eQggtCrCI00D9c,446
+experimaestro-2.0.0a7.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+experimaestro-2.0.0a7.dist-info/RECORD,,