experimaestro 1.8.6__py3-none-any.whl → 1.8.8__py3-none-any.whl

experimaestro/launcherfinder/parser.py

@@ -23,7 +23,7 @@ class SuppressStrMatch(StrMatch):
 
 
 def mem_spec():
-    return "mem", "=", RegExMatch(r"\d+(G|M)?")
+    return "mem", "=", RegExMatch(r"\d+(GiB|MiB|G|M)?")
 
 
 def cores_spec():

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/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
 

{experimaestro-1.8.6.dist-info → experimaestro-1.8.8.dist-info}/METADATA

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

{experimaestro-1.8.6.dist-info → experimaestro-1.8.8.dist-info}/RECORD

@@ -34,9 +34,9 @@ experimaestro/huggingface.py,sha256=gnVlr6SZnbutYz4PLH0Q77n1TRF-uk-dR-3UFzFqAY0,
 experimaestro/ipc.py,sha256=Xn3tYME83jLEB0nFak3DwEIhpL5IRZpCl3jirBF_jl4,1570
 experimaestro/launcherfinder/__init__.py,sha256=qRUDyv3B9UsAM8Q31mRrZrTZox0AptwdmOY4f2K-TUo,279
 experimaestro/launcherfinder/base.py,sha256=q47SsF_cXdo5O6ZhFKn5385WVFcx8Wd-BcEpd6tRpbs,515
-experimaestro/launcherfinder/parser.py,sha256=pYbfEJw7osnqZWm7fkVhQawhpNU8dLU_6vEjtXdc8E8,2279
-experimaestro/launcherfinder/registry.py,sha256=4Ix86rrooRucOlKtiCufmdvrebT-FRrzpqQu0qHpJJg,6337
-experimaestro/launcherfinder/specs.py,sha256=G8za6mEmkVxuZY_ab3OhWJIpONpcBMO_iXeB30sUbhI,6448
+experimaestro/launcherfinder/parser.py,sha256=w8JyrBtiD15SYSPmzv06H64WDZAOdrz0xyV703mQ6TQ,2287
+experimaestro/launcherfinder/registry.py,sha256=mhFAVgk8t2qWemUlhgM4nftn2x1THm7LTKSyDVsQQ9M,6379
+experimaestro/launcherfinder/specs.py,sha256=j3rObYRUi8WbU9n8220usOIWJ9p68Uti0BjkQRqGiZc,6560
 experimaestro/launchers/__init__.py,sha256=lXn544sgJExr6uirILWzAXu_IfmfyqFZOt4OzRnjHXg,2525
 experimaestro/launchers/direct.py,sha256=JZh6WOPnO6ED_xlOs8pL4MRFmnRhmXzpVxTl-ByaD2A,258
 experimaestro/launchers/oar.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -150,8 +150,8 @@ experimaestro/utils/jupyter.py,sha256=JcEo2yQK7x3Cr1tNl5FqGMZOICxCv9DwMvL5xsWdQP
 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-1.8.6.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-experimaestro-1.8.6.dist-info/METADATA,sha256=sax7u9-ePHwmRxVtxWYby9INQTgGwKaGxXu4yJ-m5iw,6170
-experimaestro-1.8.6.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-experimaestro-1.8.6.dist-info/entry_points.txt,sha256=TppTNiz5qm5xm1fhAcdLKdCLMrlL-eQggtCrCI00D9c,446
-experimaestro-1.8.6.dist-info/RECORD,,
+experimaestro-1.8.8.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+experimaestro-1.8.8.dist-info/METADATA,sha256=UbtQwG2i6-287cO03zrgv-iV7v9lbXxa9DMoRrc-HQ8,6170
+experimaestro-1.8.8.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+experimaestro-1.8.8.dist-info/entry_points.txt,sha256=TppTNiz5qm5xm1fhAcdLKdCLMrlL-eQggtCrCI00D9c,446
+experimaestro-1.8.8.dist-info/RECORD,,