PyPI - experimaestro - Versions diffs - 1.10.0__py3-none-any.whl → 1.16.0__py3-none-any.whl - Mend

experimaestro 1.10.0py3-none-any.whl → 1.16.0py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (58) hide show

experimaestro/cli/__init__.py +2 -2
experimaestro/cli/filter.py +1 -1
experimaestro/connectors/__init__.py +2 -2
experimaestro/core/arguments.py +11 -8
experimaestro/core/identifier.py +11 -6
experimaestro/core/objects/config.py +127 -193
experimaestro/core/objects/config_walk.py +4 -6
experimaestro/core/objects.pyi +2 -6
experimaestro/core/serializers.py +1 -8
experimaestro/core/types.py +1 -4
experimaestro/launcherfinder/registry.py +6 -6
experimaestro/launcherfinder/specs.py +8 -1
experimaestro/launchers/slurm/base.py +1 -1
experimaestro/run.py +2 -0
experimaestro/scheduler/base.py +0 -2
experimaestro/scheduler/workspace.py +44 -1
experimaestro/server/__init__.py +12 -6
experimaestro/server/data/0c35d18bf06992036b69.woff2 +0 -0
experimaestro/server/data/1815e00441357e01619e.ttf +0 -0
experimaestro/server/data/219aa9140e099e6c72ed.woff2 +0 -0
experimaestro/server/data/2463b90d9a316e4e5294.woff2 +0 -0
experimaestro/server/data/2582b0e4bcf85eceead0.ttf +0 -0
experimaestro/server/data/3a4004a46a653d4b2166.woff +0 -0
experimaestro/server/data/3baa5b8f3469222b822d.woff +0 -0
experimaestro/server/data/4d73cb90e394b34b7670.woff +0 -0
experimaestro/server/data/4ef4218c522f1eb6b5b1.woff2 +0 -0
experimaestro/server/data/5d681e2edae8c60630db.woff +0 -0
experimaestro/server/data/6f420cf17cc0d7676fad.woff2 +0 -0
experimaestro/server/data/89999bdf5d835c012025.woff2 +0 -0
experimaestro/server/data/914997e1bdfc990d0897.ttf +0 -0
experimaestro/server/data/c210719e60948b211a12.woff2 +0 -0
experimaestro/server/data/c380809fd3677d7d6903.woff2 +0 -0
experimaestro/server/data/f882956fd323fd322f31.woff +0 -0
experimaestro/server/data/favicon.ico +0 -0
experimaestro/server/data/index.css +22963 -0
experimaestro/server/data/index.css.map +1 -0
experimaestro/server/data/index.html +27 -0
experimaestro/server/data/index.js +101770 -0
experimaestro/server/data/index.js.map +1 -0
experimaestro/server/data/login.html +22 -0
experimaestro/server/data/manifest.json +15 -0
experimaestro/tests/tasks/all.py +7 -0
experimaestro/tests/test_dependencies.py +0 -6
experimaestro/tests/test_generators.py +93 -0
experimaestro/tests/test_identifier.py +87 -76
experimaestro/tests/test_instance.py +0 -12
experimaestro/tests/test_param.py +1 -4
experimaestro/tests/test_serializers.py +0 -59
experimaestro/tests/test_tasks.py +10 -23
experimaestro/tests/test_types.py +2 -2
experimaestro/utils/multiprocessing.py +44 -0
experimaestro/utils/resources.py +1 -1
{experimaestro-1.10.0.dist-info → experimaestro-1.16.0.dist-info}/METADATA +5 -4
{experimaestro-1.10.0.dist-info → experimaestro-1.16.0.dist-info}/RECORD +57 -32
{experimaestro-1.10.0.dist-info → experimaestro-1.16.0.dist-info}/WHEEL +1 -1
experimaestro/compat.py +0 -6
{experimaestro-1.10.0.dist-info → experimaestro-1.16.0.dist-info}/entry_points.txt +0 -0
{experimaestro-1.10.0.dist-info → experimaestro-1.16.0.dist-info/licenses}/LICENSE +0 -0

experimaestro/server/data/login.html ADDED Viewed

@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8" />
+    <meta
+      name="viewport"
+      content="width=device-width, initial-scale=1, shrink-to-fit=no"
+    />
+    <meta name="theme-color" content="#000000" />
+    <title>Experimaestro</title>
+  </head>
+  <body>
+    <h1>Experimaestro</h1>
+    <form action="/auth" method="GET">
+      <div>
+        Token
+        <input type="text" name="xpm-token" />
+        <input type="submit" value="submit" />
+      </div>
+    </form>
+  </body>
+</html>

experimaestro/server/data/manifest.json ADDED Viewed

@@ -0,0 +1,15 @@
+{
+  "short_name": "Experimaestro",
+  "name": "Experimaestro Client",
+  "icons": [
+    {
+      "src": "favicon.ico",
+      "sizes": "64x64 32x32 24x24 16x16",
+      "type": "image/x-icon"
+    }
+  ],
+  "start_url": "./index.html",
+  "display": "standalone",
+  "theme_color": "#000000",
+  "background_color": "#ffffff"
+}

experimaestro/tests/tasks/all.py CHANGED Viewed

@@ -19,6 +19,13 @@ class SimpleTask(Task):
     def execute(self):
         print(self.x)  # noqa: T201
+    def task_outputs(self, dep):
+        return dep(SimpleTaskOutput.C(task=self))
+class SimpleTaskOutput(Config):
+    task: Param[SimpleTask]
 class Say(Task):
     out: Meta[Path] = field(default_factory=PathGenerator(STDOUT))

experimaestro/tests/test_dependencies.py CHANGED Viewed

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

experimaestro/tests/test_generators.py ADDED Viewed

@@ -0,0 +1,93 @@
+from experimaestro import Config, Task, Param, Meta, Path, field, PathGenerator
+from experimaestro.scheduler.workspace import Workspace
+from experimaestro.settings import Settings, WorkspaceSettings
+import pytest
+from experimaestro.scheduler import RunMode
+class Validation(Config):
+    best_checkpoint: Meta[Path] = field(default_factory=PathGenerator("index"))
+class Learner(Task):
+    validation: Param[Validation]
+    x: Param[int]
+    @staticmethod
+    def create(x: int, validation: Param[Validation]):
+        return Learner.C(x=x, validation=validation)
+class LearnerList(Task):
+    validation: Param[list[Validation]]
+    x: Param[int]
+    @staticmethod
+    def create(x: int, validation: Param[Validation]):
+        return LearnerList.C(x=x, validation=[validation])
+class LearnerDict(Task):
+    validation: Param[dict[str, Validation]]
+    x: Param[int]
+    @staticmethod
+    def create(x: int, validation: Param[Validation]):
+        return LearnerDict.C(x=x, validation={"key": validation})
+class ModuleLoader(Task):
+    validation: Param[Validation] = field(ignore_generated=True)
+@pytest.mark.parametrize("cls", [Learner, LearnerDict, LearnerList])
+def test_generators_reuse_on_submit(cls):
+    # We have one way to select the best model
+    validation = Validation.C()
+    workspace = Workspace(
+        Settings(),
+        WorkspaceSettings("test_generators_reuse", path=Path("/tmp")),
+        run_mode=RunMode.DRY_RUN,
+    )
+    # OK, the path is generated depending on Learner with x=1
+    cls.create(1, validation).submit(workspace=workspace)
+    with pytest.raises((AttributeError)):
+        # Here we have a problem...
+        # the path is still the previous one
+        cls.create(2, validation).submit(workspace=workspace)
+@pytest.mark.parametrize("cls", [Learner, LearnerDict, LearnerList])
+def test_generators_delayed_submit(cls):
+    workspace = Workspace(
+        Settings(),
+        WorkspaceSettings("test_generators_simple", path=Path("/tmp")),
+        run_mode=RunMode.DRY_RUN,
+    )
+    validation = Validation.C()
+    task1 = cls.create(1, validation)
+    task2 = cls.create(2, validation)
+    task1.submit(workspace=workspace)
+    with pytest.raises((AttributeError)):
+        task2.submit(workspace=workspace)
+@pytest.mark.parametrize("cls", [Learner, LearnerDict, LearnerList])
+def test_generators_reuse_on_set(cls):
+    workspace = Workspace(
+        Settings(),
+        WorkspaceSettings("test_generators_simple", path=Path("/tmp")),
+        run_mode=RunMode.DRY_RUN,
+    )
+    validation = Validation.C()
+    cls.create(1, validation).submit(workspace=workspace)
+    with pytest.raises((AttributeError)):
+        # We should not be able to *create* a second task with the same validation,
+        # even without submitting it
+        cls.create(2, validation)
+    # This should run OK
+    ModuleLoader.C(validation=validation)

experimaestro/tests/test_identifier.py CHANGED Viewed

@@ -68,42 +68,42 @@ def assert_notequal(a, b, message=""):
     assert getidentifier(a) != getidentifier(b), message
-def test_param_int():
-    assert_equal(A(a=1), A(a=1))
+def test_identifier_int():
+    assert_equal(A.C(a=1), A.C(a=1))
-def test_param_different_type():
-    assert_notequal(A(a=1), B(a=1))
+def test_identifier_different_type():
+    assert_notequal(A.C(a=1), B.C(a=1))
-def test_param_order():
-    assert_equal(Values(value1=1, value2=2), Values(value2=2, value1=1))
+def test_identifier_order():
+    assert_equal(Values.C(value1=1, value2=2), Values.C(value2=2, value1=1))
-def test_param_default():
-    assert_equal(C(a=1, b=2), C(b=2))
+def test_identifier_default():
+    assert_equal(C.C(a=1, b=2), C.C(b=2))
 def test_identifier_default_field():
     assert_equal(CField(a=1, b=2), CField(b=2))
-def test_param_inner_eq():
-    assert_equal(D(a=A(a=1)), D(a=A(a=1)))
+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():
-    assert_equal(Float(value=1), Float(value=1))
+def test_identifier_float():
+    assert_equal(Float.C(value=1), Float.C(value=1))
-def test_param_float2():
-    assert_equal(Float(value=1.0), Float(value=1))
+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):
@@ -163,7 +163,7 @@ class TypeWithPath(Config):
     path: Param[Path]
-def test_param_identifier_path():
+def test_identifier_path():
     """Path should be ignored"""
     assert_equal(TypeWithPath(a=1, path="/a/b"), TypeWithPath(a=1, path="/c/d"))
     assert_notequal(TypeWithPath(a=2, path="/a/b"), TypeWithPath(a=1, path="/c/d"))
@@ -172,7 +172,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):
@@ -187,7 +187,7 @@ def test_param_identifier_pathoption():
     assert_equal(A_with_path(a=1), A_without_path(a=1))
-def test_param_identifier_enum():
+def test_identifier_enum():
     """test enum parameters"""
     from enum import Enum
@@ -202,7 +202,7 @@ def test_param_identifier_enum():
     assert_equal(EnumConfig(a=EnumParam.FIRST), EnumConfig(a=EnumParam.FIRST))
-def test_param_identifier_addnone():
+def test_identifier_addnone():
     """Test the case of new parameter (with None default)"""
     class B(Config):
@@ -219,7 +219,7 @@ def test_param_identifier_addnone():
     assert_notequal(A_with_b(b=B(x=1)), A())
-def test_param_defaultnew():
+def test_identifier_defaultnew():
     """Path arguments should be ignored"""
     class A_with_b(Config):
@@ -236,7 +236,7 @@ def test_param_defaultnew():
     assert_equal(A_with_b(a=1), A(a=1))
-def test_param_taskconfigidentifier():
+def test_identifier_taskconfigidentifier():
     """Test whether the embedded task arguments make the configuration different"""
     class MyConfig(Config):
@@ -258,7 +258,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):
@@ -278,7 +278,7 @@ def test_param_constant():
     assert_notequal(A1(), A2())
-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"""
@@ -300,7 +300,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]] = []
@@ -315,7 +315,7 @@ class MetaA(Config):
     x: Param[int]
-def test_param_identifier_meta():
+def test_identifier_meta():
     """Test forced meta-parameter"""
     class B(Config):
@@ -354,7 +354,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]] = {}
@@ -370,7 +370,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]] = []
@@ -386,37 +386,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(x=MyConfig()).submit(run_mode=RunMode.DRY_RUN)
-    task_with_pre = (
-        IdentifierPreTask(x=MyConfig())
-        .add_pretasks(IdentifierPreLightTask())
-        .submit(run_mode=RunMode.DRY_RUN)
-    )
-    task_with_pre_2 = (
-        IdentifierPreTask(x=MyConfig())
-        .add_pretasks(IdentifierPreLightTask())
-        .submit(run_mode=RunMode.DRY_RUN)
-    )
-    task_with_pre_3 = IdentifierPreTask(
-        x=MyConfig().add_pretasks(IdentifierPreLightTask())
-    ).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
@@ -426,26 +396,67 @@ def test_param_identifier_init_task():
     class IdentifierInitTask2(Task):
         pass
-    class IdentierTask(Task):
+    class IdentifierTask(Task):
         x: Param[MyConfig]
-    task = IdentierTask(x=MyConfig()).submit(run_mode=RunMode.DRY_RUN)
-    task_with_pre = IdentierTask(x=MyConfig()).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(), IdentifierInitTask2()],
     )
-    task_with_pre_2 = IdentierTask(x=MyConfig()).submit(
+    task_with_pre_2 = IdentifierTask.C(x=MyConfig.C()).submit(
         run_mode=RunMode.DRY_RUN,
         init_tasks=[IdentifierInitTask(), IdentifierInitTask2()],
     )
-    task_with_pre_3 = IdentierTask(x=MyConfig()).submit(
+    task_with_pre_3 = IdentifierTask.C(x=MyConfig.C()).submit(
         run_mode=RunMode.DRY_RUN,
         init_tasks=[IdentifierInitTask2(), IdentifierInitTask()],
     )
-    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
@@ -463,7 +474,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
@@ -473,7 +484,7 @@ class IdentifierReloadConfig(Config):
     id: Param[str]
-def test_param_identifier_reload_config():
+def test_identifier_reload_config():
     # Creates the configuration
     check_reload(IdentifierReloadConfig(id="123"))
@@ -489,7 +500,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
@@ -511,7 +522,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
@@ -522,7 +533,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(id="123").submit(run_mode=RunMode.DRY_RUN)
@@ -545,10 +556,10 @@ class LoopC(Config):
     param_b: Param["LoopB"]
-def test_param_identifier_loop():
-    c = LoopC()
-    b = LoopB(param_c=c)
-    a = LoopA(param_b=b)
+def test_identifier_loop():
+    c = LoopC.C()
+    b = LoopB.C(param_c=c)
+    a = LoopA.C(param_b=b)
     c.param_a = a
     c.param_b = b

experimaestro/tests/test_instance.py CHANGED Viewed

@@ -46,18 +46,6 @@ class LoadModel(SerializationLWTask):
         self.value.initialized = True
-def test_instance_serialized():
-    model = Model()
-    model.add_pretasks(LoadModel(value=model))
-    trainer = Evaluator(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_param.py CHANGED Viewed

@@ -5,7 +5,6 @@ Test annotation handling for configurations and tasks
 # Annotation specific tests
-import sys
 from pathlib import Path
 from typing import Dict, Optional, List
 from experimaestro.core.context import SerializationContext
@@ -336,6 +335,4 @@ def test_help():
     assert xpmtype.description.strip() == "Long description of A."
     assert xpmtype.arguments["y"].help == "Parameter y"
-    # Only python >= 3.9
-    if sys.version_info.major == 3 and sys.version_info.minor > 8:
-        assert xpmtype.arguments["x"].help == "Parameter x"
+    assert xpmtype.arguments["x"].help == "Parameter x"

experimaestro/tests/test_serializers.py CHANGED Viewed

@@ -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(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(submodel=SubModel())
-        trained_model: Model = Trainer(model=model).submit()
-        # Use the model itself
-        Evaluate(model=trained_model).submit()
-        # Use a submodel
-        Evaluate(model=trained_model.submodel, is_submodel=True).add_pretasks_from(
-            trained_model
-        ).submit()
 class Object1(Config):

experimaestro/tests/test_tasks.py CHANGED Viewed

@@ -123,9 +123,16 @@ def test_restart(terminate):
 def test_submitted_twice():
     """Check that a job cannot be submitted twice within the same experiment"""
     with TemporaryExperiment("duplicate", maxwait=20):
-        task1 = SimpleTask(x=1).submit()
-        task2 = SimpleTask(x=1).submit()
-        assert task1 is task2, f"{id(task1)} != {id(task2)}"
+        task1 = SimpleTask.C(x=1)
+        o1 = task1.submit()
+        task2 = SimpleTask.C(x=1)
+        o2 = task2.submit()
+        print(o1)
+        assert o1.task is not o2.task
+        assert task1.__xpm__.job is task2.__xpm__.job, f"{id(task1)} != {id(task2)}"
 def test_configcache():
@@ -299,26 +306,6 @@ class MyLightweightTask(Task):
         assert self.x.data == 1
-def test_task_lightweight():
-    with TemporaryExperiment("lightweight", maxwait=20):
-        x = LightweightConfig()
-        lwtask = LightweightTask(x=x)
-        assert (
-            MyLightweightTask(x=x).add_pretasks(lwtask).submit().__xpm__.job.wait()
-            == JobState.DONE
-        ), "Pre-tasks should be executed"
-        x_2 = LightweightConfig()
-        lwtask_2 = LightweightTask(x=x)
-        assert (
-            MyLightweightTask(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()

experimaestro/tests/test_types.py CHANGED Viewed

@@ -26,7 +26,7 @@ def test_multiple_inheritance():
     for C in (C1, C2):
         logging.info("Testing %s", C)
-        ctype = C.__xpmtype__
+        ctype = C.C.__xpmtype__
         assert issubclass(C, A)
         assert issubclass(C, B)
         assert issubclass(C, B1)
@@ -49,7 +49,7 @@ def test_missing_hierarchy():
     class B(A1):
         pass
-    B.__xpmtype__
+    B.C.__xpmtype__
     assert issubclass(B, A)
     assert issubclass(B, A1)

experimaestro 1.10.0__py3-none-any.whl → 1.16.0__py3-none-any.whl

experimaestro 1.10.0py3-none-any.whl → 1.16.0py3-none-any.whl