experimaestro 1.10.0__tar.gz → 1.11.1__tar.gz

{experimaestro-1.10.0 → experimaestro-1.11.1}/PKG-INFO

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

{experimaestro-1.10.0 → experimaestro-1.11.1}/pyproject.toml

@@ -16,12 +16,6 @@ classifiers = [
     "Programming Language :: Python :: 3",
     "Topic :: Software Development :: Libraries :: Python Modules",
 ]
-include = [
-    "src/experimaestro/server/data/*",
-    "src/experimaestro/sphinx/static/experimaestro.css",
-    "src/experimaestro/mkdocs/style.css",
-    { path="src/experimaestro/server/data/*", format=['sdist', 'wheel']}
-]
 repository = "https://github.com/experimaestro/experimaestro-python"
 documentation = "https://experimaestro-python.readthedocs.io/"
 dynamic = []
@@ -54,7 +48,7 @@ dependencies = [
     "typing-extensions >=4.2; python_version < \"3.12\"",
     "watchdog >=2"
 ]
-version = "1.10.0"
+version = "1.11.1"
 
 [tool.poetry-dynamic-versioning]
 enable = false
@@ -67,6 +61,12 @@ format-jinja = """{%- set pre = [] -%}{%- set metadata = [] -%}
 {{ serialize_semver(base, pre, metadata)}}"""
 
 [tool.poetry]
+include = [
+    "src/experimaestro/server/data/*",
+    "src/experimaestro/sphinx/static/experimaestro.css",
+    "src/experimaestro/mkdocs/style.css",
+    { path="src/experimaestro/server/data/*", format=['sdist', 'wheel']}
+]
 
 [tool.poetry-dynamic-versioning.files."src/experimaestro/version.py"]
 persistent-substitution = true
@@ -140,7 +140,7 @@ warn_unused_ignores = true
 
 [tool.commitizen]
 name = "cz_conventional_commits"
-version = "1.10.0"
+version = "1.11.1"
 changelog_start_rev = "v1.0.0"
 tag_format = "v$major.$minor.$patch$prerelease"
 # update_changelog_on_bump = true

{experimaestro-1.10.0 → experimaestro-1.11.1}/src/experimaestro/launcherfinder/specs.py

@@ -29,7 +29,7 @@ class CudaSpecification:
     def __repr__(self):
         return (
             f"CUDA({self.model} "
-            f"max={format_size(self.memory)}/min={format_size(self.min_memory)})"
+            f"max={format_size(self.memory, binary=True)}/min={format_size(self.min_memory, binary=True)})"
         )
 
 
@@ -47,6 +47,13 @@ class CPUSpecification:
     cpu_per_gpu: int = 0
     """Number of CPU per GPU (0 if not defined)"""
 
+    def __repr__(self):
+        return (
+            f"CPU("
+            f"mem={format_size(self.memory, binary=True)}, cores={self.cores}"
+            ")"
+        )
+
     def match(self, other: "CPUSpecification"):
         return (self.memory >= other.memory) and (self.cores >= other.cores)
 

{experimaestro-1.10.0 → experimaestro-1.11.1}/src/experimaestro/run.py

@@ -8,6 +8,7 @@ import json
 from typing import List
 import fasteners
 from experimaestro.notifications import progress, report_eoj
+from experimaestro.utils.multiprocessing import delayed_shutdown
 from .core.types import ObjectType
 from experimaestro.utils import logger
 from experimaestro.core.objects import ConfigInformation
@@ -96,6 +97,7 @@ class TaskRunner:
         self.failedpath.write_text(str(code))
         self.cleanup()
         logger.info("Exiting")
+        delayed_shutdown(60, exit_code=code)
         sys.exit(1)
 
     def run(self):