experimaestro 1.8.5__tar.gz → 1.8.7__tar.gz

{experimaestro-1.8.5 → experimaestro-1.8.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: experimaestro
-Version: 1.8.5
+Version: 1.8.7
 Summary: "Experimaestro is a computer science experiment manager"
 License: GPL-3
 Keywords: experiment manager

{experimaestro-1.8.5 → experimaestro-1.8.7}/pyproject.toml

@@ -20,7 +20,7 @@ include = [
     "src/experimaestro/mkdocs/style.css",
     { path="src/experimaestro/server/data/*", format=['sdist', 'wheel']}
 ]
-version = "1.8.5"
+version = "1.8.7"
 repository = "https://github.com/experimaestro/experimaestro-python"
 documentation = "https://experimaestro-python.readthedocs.io/"
 
@@ -122,7 +122,7 @@ warn_unused_ignores = true
 
 [tool.commitizen]
 name = "cz_conventional_commits"
-version = "1.8.5"
+version = "1.8.7"
 changelog_start_rev = "v1.0.0"
 tag_format = "v$major.$minor.$patch$prerelease"
 # update_changelog_on_bump = true

{experimaestro-1.8.5 → experimaestro-1.8.7}/src/experimaestro/core/context.py

@@ -73,7 +73,7 @@ class SerializationContext:
 
 
 class SerializedPathLoader(Protocol):
-    def __call__(path: Union[Path, str, SerializedPath]) -> Path:
+    def __call__(self, path: Union[Path, str, SerializedPath]) -> Path:
         """Get a filesystem path from a relative path
 
         :param path: The relative path

{experimaestro-1.8.5 → experimaestro-1.8.7}/src/experimaestro/core/serialization.py

@@ -66,7 +66,8 @@ def save(obj: Any, save_directory: Optional[Path]):
 def get_data_loader(path: Union[str, Path, SerializedPathLoader]):
     if path is None:
 
-        def data_loader():
+        def data_loader(_: Union[str, Path, SerializedPathLoader]):
+            # Just raise an exception
             raise RuntimeError("No serialization path was given")
 
         return data_loader
@@ -170,7 +171,7 @@ def deserialize(
     with data_loader("definition.json").open("rt") as fh:
         content = json.load(fh)
 
-    object, init_tasks = from_state_dict(content, as_instance=as_instance)
+    object, init_tasks = from_state_dict(content, data_loader, as_instance=as_instance)
 
     if as_instance:
         for init_task in init_tasks:

{experimaestro-1.8.5 → experimaestro-1.8.7}/src/experimaestro/launcherfinder/registry.py

@@ -83,6 +83,7 @@ class LauncherRegistry:
 
         # Register the find launcher function if it exists
         launchers_py = basepath / "launchers.py"
+        print(f"basepath {launchers_py}")
         if launchers_py.is_file():
             logger.info("Loading %s", launchers_py)
 

{experimaestro-1.8.5 → experimaestro-1.8.7}/src/experimaestro/launcherfinder/specs.py

@@ -20,9 +20,6 @@ class CudaSpecification:
     min_memory: int = 0
     """Minimum request memory (in bytes)"""
 
-    def __lt__(self, other: "CudaSpecification"):
-        return self.memory < other.memory
-
     def match(self, spec: "CudaSpecification"):
         """Returns True if the specification matches this host"""
         return (self.memory >= spec.memory) and (self.min_memory <= spec.memory)
@@ -30,7 +27,7 @@ class CudaSpecification:
     def __repr__(self):
         return (
             f"CUDA({self.model} "
-            f"{format_size(self.memory)}/{format_size(self.min_memory)})"
+            f"max={format_size(self.memory)}/min={format_size(self.min_memory)})"
         )
 
 
@@ -48,8 +45,8 @@ class CPUSpecification:
     cpu_per_gpu: int = 0
     """Number of CPU per GPU (0 if not defined)"""
 
-    def __lt__(self, other: "CPUSpecification"):
-        return self.memory < other.memory and self.cores < other.cores
+    def match(self, other: "CPUSpecification"):
+        return (self.memory >= other.memory) and (self.cores >= other.cores)
 
     def total_memory(self, gpus: int = 0):
         return max(
@@ -95,6 +92,7 @@ class HostRequirement:
     """A requirement must be a disjunction of host requirements"""
 
     requirements: List["HostSimpleRequirement"]
+    """List of requirements (by order of priority)"""
 
     def __init__(self) -> None:
         self.requirements = []
@@ -133,7 +131,10 @@ class HostSimpleRequirement(HostRequirement):
     """Simple host requirement"""
 
     cuda_gpus: List["CudaSpecification"]
+    """Specification for CUDA gpus"""
+
     cpu: "CPUSpecification"
+    """Specification for CPU"""
 
     duration: int
     """Requested duration (in seconds)"""
@@ -158,7 +159,7 @@ class HostSimpleRequirement(HostRequirement):
         self.cpu.cores = max(req.cpu.cores, self.cpu.cores)
         self.duration = max(req.duration, self.duration)
         self.cuda_gpus.extend(req.cuda_gpus)
-        self.cuda_gpus.sort()
+        self.cuda_gpus.sort(key=lambda cuda: -cuda.memory)
 
     def match(self, host: HostSpecification) -> Optional[MatchRequirement]:
         if self.cuda_gpus:
@@ -182,7 +183,7 @@ class HostSimpleRequirement(HostRequirement):
             )
             return None
 
-        if host.cpu < self.cpu:
+        if not host.cpu.match(self.cpu):
             return None
 
         if host.max_duration > 0 and self.duration > host.max_duration:
@@ -197,7 +198,7 @@ class HostSimpleRequirement(HostRequirement):
         _self = deepcopy(self)
         for _ in range(count - 1):
             _self.cuda_gpus.extend(self.cuda_gpus)
-        _self.cuda_gpus.sort()
+        _self.cuda_gpus.sort(key=lambda cuda: -cuda.memory)
 
         return _self