resubmit 0.0.4__py3-none-any.whl → 0.0.6__py3-none-any.whl

resubmit/__bookkeeping.py

@@ -5,27 +5,6 @@ from itertools import product
 import logging
 
 
-def _is_regex_spec(val: Any) -> bool:
-    """Return True if val looks like a regex specifier.
-
-    Accepted forms:
-    - compiled `re.Pattern`
-    - tuple (`re.Pattern`, exclude: bool)
-    - dict with keys `pattern` (re.Pattern) and optional `exclude` (bool)
-    - string starting with 're:' (e.g. 're:^foo.*') meaning include matches
-    - string starting with '!re:' meaning exclude matches
-    """
-    if hasattr(val, "search") and callable(val.search):
-        return True
-    if isinstance(val, tuple) and len(val) >= 1 and hasattr(val[0], "search"):
-        return True
-    if isinstance(val, dict) and "pattern" in val:
-        return True
-    if isinstance(val, str) and (val.startswith("re:") or val.startswith("!re:")):
-        return True
-    return False
-
-
 def _normalize_regex_spec(val: Any) -> Tuple[re.Pattern, bool]:
     """Return (compiled_pattern, exclude_flag) for a given regex spec.
 
@@ -115,11 +94,6 @@ def create_jobs_dataframe(params: Dict[str, Any]) -> pd.DataFrame:
                 base = k[: -len("_unique")]
             unique_items[base] = v
             continue
-        elif callable(v):
-            callables[k] = v
-        elif _is_regex_spec(v):
-            # treat a regex spec provided under the same key as a filter for that column
-            regex_specs[k] = v
         else:
             static_items[k] = v
 
@@ -206,7 +180,7 @@ def submit_jobs(
 
     jobs_df = create_jobs_dataframe(jobs_args)
     records = jobs_df.to_dict(orient="records")
-    from .__submit import submit_jobs as _submit_jobs
+    from .__submit import _submit_jobs
 
     return _submit_jobs(
         records,

resubmit/__submit.py

@@ -3,7 +3,7 @@
 from typing import Any, Callable, Iterable, List, Optional, Dict
 
 
-def submit_jobs(
+def _submit_jobs(
     jobs_args: Iterable[dict],
     func: Callable[[List[dict]], Any],
     *,
@@ -15,6 +15,7 @@ def submit_jobs(
     block: bool,
     prompt: bool,
     local_run: bool,
+    job_name: Optional[str] = "resubmit",
     slurm_additional_parameters: Optional[Dict] = None,
 ):
     """Submit jobs described by `jobs_args` where each entry is a dict of kwargs for `func`.
@@ -48,18 +49,13 @@ def submit_jobs(
     print("submitting jobs")
     executor = submitit.AutoExecutor(folder=folder)
 
-    # default slurm params (keep cluster-specific options out unless explicitly set)
-    if slurm_additional_parameters is None:
-        slurm_additional_parameters = {"gpus": num_gpus}
-    else:
-        slurm_additional_parameters = dict(slurm_additional_parameters)
-        slurm_additional_parameters.setdefault("gpus", num_gpus)
-
     print("Slurm additional parameters:", slurm_additional_parameters)
 
     executor.update_parameters(
+        name=job_name,
         timeout_min=timeout_min,
         cpus_per_task=cpus_per_task,
+        gpus_per_node=num_gpus,
         mem_gb=mem_gb,
         slurm_additional_parameters=slurm_additional_parameters,
     )

{resubmit-0.0.4.dist-info → resubmit-0.0.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: resubmit
-Version: 0.0.4
+Version: 0.0.6
 Summary: Small wrapper around submitit to simplify cluster submissions
 Author: Amir Mehrpanah
 License: MIT

resubmit-0.0.6.dist-info/RECORD

@@ -0,0 +1,9 @@
+resubmit/__bookkeeping.py,sha256=VX2cCD82nibVM4Tf7peeqylyUXRVwH7ZWLGj1CcfzRU,7219
+resubmit/__debug.py,sha256=8RINyz7eSAiT47d018wR0R3B_u4PllQJCiLy0zTSQDE,887
+resubmit/__init__.py,sha256=FLKq6KZeI973gBXzdnSkvK1aEdxF--5V2T82fxyzv0U,219
+resubmit/__submit.py,sha256=SgtZFb-Yi7zIv9BGVyXgbsjca_s6_kZlA9mBO9ZWGtg,2149
+resubmit-0.0.6.dist-info/licenses/LICENSE,sha256=v2spsd7N1pKFFh2G8wGP_45iwe5S0DYiJzG4im8Rupc,1066
+resubmit-0.0.6.dist-info/METADATA,sha256=nYs7CVd-qHcAAYdxFQ85LR_g-HMCwSZ49J66HfO2PLY,2976
+resubmit-0.0.6.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+resubmit-0.0.6.dist-info/top_level.txt,sha256=BfCexfX-VhUZuNi8sI88i0HF_e3ppausQ76hxPeXjYc,9
+resubmit-0.0.6.dist-info/RECORD,,

resubmit-0.0.4.dist-info/RECORD

@@ -1,9 +0,0 @@
-resubmit/__bookkeeping.py,sha256=FhC9WamX907uyZh7idk-1hfDvX025LOPskUE0KSKypc,8210
-resubmit/__debug.py,sha256=8RINyz7eSAiT47d018wR0R3B_u4PllQJCiLy0zTSQDE,887
-resubmit/__init__.py,sha256=FLKq6KZeI973gBXzdnSkvK1aEdxF--5V2T82fxyzv0U,219
-resubmit/__submit.py,sha256=w3-1_SbB5u9xPpuOUxEvwvH7GXMLWlke_gb4S7RjCRQ,2385
-resubmit-0.0.4.dist-info/licenses/LICENSE,sha256=v2spsd7N1pKFFh2G8wGP_45iwe5S0DYiJzG4im8Rupc,1066
-resubmit-0.0.4.dist-info/METADATA,sha256=kJ07kk1jUq6zAe3btefCSNFqf9Mvp3ZszzoDYtvA-_E,2976
-resubmit-0.0.4.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-resubmit-0.0.4.dist-info/top_level.txt,sha256=BfCexfX-VhUZuNi8sI88i0HF_e3ppausQ76hxPeXjYc,9
-resubmit-0.0.4.dist-info/RECORD,,