fractal-server 2.18.2__py3-none-any.whl → 2.18.3a0__py3-none-any.whl

fractal_server/__init__.py

@@ -1 +1 @@
-__VERSION__ = "2.18.2"
+__VERSION__ = "2.18.3a0"

fractal_server/runner/config/_slurm.py

@@ -35,6 +35,7 @@ class SlurmConfigSet(BaseModel):
         extra_lines:
         gpus:
         shebang_line: The shell shebang to use for SLURM jobs.
+        use_mem_per_cpu:
     """
 
     model_config = ConfigDict(extra="forbid")
@@ -51,6 +52,7 @@ class SlurmConfigSet(BaseModel):
     extra_lines: list[NonEmptyStr] = Field(default_factory=list)
     gpus: NonEmptyStr | None = None
     shebang_line: str = "#!/bin/sh"
+    use_mem_per_cpu: bool = False
 
 
 class BatchingConfigSet(BaseModel):

fractal_server/runner/executors/slurm_common/base_slurm_runner.py

@@ -365,7 +365,8 @@ class BaseSlurmRunner(BaseRunner):
 
         # Prepare SLURM preamble based on SlurmConfig object
         script_lines = slurm_config.to_sbatch_preamble(
-            remote_export_dir=self.user_cache_dir
+            remote_export_dir=self.user_cache_dir,
+            use_mem_per_cpu=slurm_config.use_mem_per_cpu,
         )
 
         # Extend SLURM preamble with variable which are not in SlurmConfig, and
@@ -389,11 +390,14 @@ class BaseSlurmRunner(BaseRunner):
         script_lines.append("\n")
 
         # Include command lines
-        mem_per_task_MB = slurm_config.mem_per_task_MB
         for cmd in cmdlines:
+            if slurm_config.use_mem_per_cpu:
+                mem_specific = f"--mem-per-cpu={slurm_config.mem_per_cpu_MB}MB"
+            else:
+                mem_specific = f"--mem={slurm_config.mem_per_task_MB}MB"
             script_lines.append(
                 "srun --ntasks=1 --cpus-per-task=$SLURM_CPUS_PER_TASK "
-                f"--mem={mem_per_task_MB}MB "
+                f"{mem_specific} "
                 f"{cmd} &"
             )
         script_lines.append("wait\n\n")

fractal_server/runner/executors/slurm_common/slurm_config.py

@@ -42,6 +42,9 @@ class SlurmConfig(BaseModel):
         exclude: Corresponds to SLURM option.
         prefix: Prefix of configuration lines in SLURM submission scripts.
         shebang_line: Shebang line for SLURM submission scripts.
+        use_mem_per_cpu:
+            If `True`, use `--mem-per-cpu` rather than `--mem`, both at the job
+            level and for `srun` statements.
         extra_lines: Additional lines to include in SLURM submission scripts.
         tasks_per_job: Number of tasks for each SLURM job.
         parallel_tasks_per_job: Number of tasks to run in parallel for
@@ -70,9 +73,12 @@ class SlurmConfig(BaseModel):
     partition: str
     cpus_per_task: int
     mem_per_task_MB: int
+
     prefix: str = "#SBATCH"
     shebang_line: str = "#!/bin/sh"
 
+    use_mem_per_cpu: bool = False
+
     # Optional SLURM parameters
     job_name: str | None = None
     constraint: str | None = None
@@ -139,6 +145,7 @@ class SlurmConfig(BaseModel):
     def to_sbatch_preamble(
         self,
         remote_export_dir: str,
+        use_mem_per_cpu: bool = False,
     ) -> list[str]:
         """
         Compile `SlurmConfig` object into the preamble of a SLURM submission
@@ -148,6 +155,8 @@ class SlurmConfig(BaseModel):
             remote_export_dir:
                 Base directory for exports defined in
                 `self.user_local_exports`.
+            use_mem_per_cpu:
+                If `True`, use `--mem-per-cpu` rather than `--mem`.
         """
         if self.parallel_tasks_per_job is None:
             raise ValueError(
@@ -157,13 +166,18 @@ class SlurmConfig(BaseModel):
         if len(self.extra_lines) != len(set(self.extra_lines)):
             raise ValueError(f"{self.extra_lines=} contains repetitions")
 
-        mem_per_job_MB = self.parallel_tasks_per_job * self.mem_per_task_MB
+        if use_mem_per_cpu:
+            memory_line = f"{self.prefix} --mem-per-cpu={self.mem_per_cpu_MB}M"
+        else:
+            mem_per_job_MB = self.parallel_tasks_per_job * self.mem_per_task_MB
+            memory_line = f"{self.prefix} --mem={mem_per_job_MB}M"
+
         lines = [
             self.shebang_line,
             f"{self.prefix} --partition={self.partition}",
             f"{self.prefix} --ntasks={self.parallel_tasks_per_job}",
             f"{self.prefix} --cpus-per-task={self.cpus_per_task}",
-            f"{self.prefix} --mem={mem_per_job_MB}M",
+            memory_line,
         ]
         for key in [
             "job_name",
@@ -214,3 +228,7 @@ class SlurmConfig(BaseModel):
     @property
     def batch_size(self) -> int:
         return self.tasks_per_job
+
+    @property
+    def mem_per_cpu_MB(self) -> int:
+        return int(self.mem_per_task_MB / self.cpus_per_task)

{fractal_server-2.18.2.dist-info → fractal_server-2.18.3a0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fractal-server
-Version: 2.18.2
+Version: 2.18.3a0
 Summary: Backend component of the Fractal analytics platform
 License-Expression: BSD-3-Clause
 License-File: LICENSE

{fractal_server-2.18.2.dist-info → fractal_server-2.18.3a0.dist-info}/RECORD

@@ -1,4 +1,4 @@
-fractal_server/__init__.py,sha256=SYVCzme8G5fCPQcTLY-LEETzoVBgUiF6qN26Eofya8M,23
+fractal_server/__init__.py,sha256=dEhdl9EtyqOPj5CiMlEv2OAVTTkU6dc3GeZ002YM4p8,25
 fractal_server/__main__.py,sha256=QeKoAgqoiozLJDa8kSVe-Aso1WWgrk1yLUYWS8RxZVM,11405
 fractal_server/alembic.ini,sha256=MWwi7GzjzawI9cCAK1LW7NxIBQDUqD12-ptJoq5JpP0,3153
 fractal_server/app/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -178,7 +178,7 @@ fractal_server/runner/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3h
 fractal_server/runner/components.py,sha256=-Ii5l8d_V6f5DFOd-Zsr8VYmOsyqw0Hox9fEFQiuqxY,66
 fractal_server/runner/config/__init__.py,sha256=a-vSrvWBeMVnxTtYoy-f5Ibt_mM8MM3F7jqnPvvjHSY,108
 fractal_server/runner/config/_local.py,sha256=IHWtxpKuJDdsQNpk8Q5bNL4DEJunNkNJkLfetfnwmQM,788
-fractal_server/runner/config/_slurm.py,sha256=eFtfo9mXAoo-MEk-XZIK7OfwD21KjLAtdMzWfSvaypA,3735
+fractal_server/runner/config/_slurm.py,sha256=VPQEqGxdeaXit6LbLGMAyQTDrrN6zG2RiP_ZpI07hvQ,3794
 fractal_server/runner/config/slurm_mem_to_MB.py,sha256=6KmrIC-NymQjb9-bIQjNYQx6mE0OoKoZxdi6WQnWOHw,2003
 fractal_server/runner/exceptions.py,sha256=N8DLn7tuV8zMSdr8xdJN0aIdytPveSCeQ1Y5IoxXW-8,1778
 fractal_server/runner/executors/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -190,10 +190,10 @@ fractal_server/runner/executors/local/runner.py,sha256=0s0u5ONasXdsvS2WD5zxksQgv
 fractal_server/runner/executors/slurm_common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fractal_server/runner/executors/slurm_common/_batching.py,sha256=YQjWRTDI1e6NeLe1R-1QWlt49i42M9ILeExEjdjgy48,8348
 fractal_server/runner/executors/slurm_common/_job_states.py,sha256=nuV-Zba38kDrRESOVB3gaGbrSPZc4q7YGichQaeqTW0,238
-fractal_server/runner/executors/slurm_common/base_slurm_runner.py,sha256=pU2Szcg3tv7vinLJXbzSgYlfEPLY_b0R0YDR-FSYLc8,41873
+fractal_server/runner/executors/slurm_common/base_slurm_runner.py,sha256=NOgf7M1FDfPgKEJvKu8HgU4QYjAk-ZrovOOHMAEr27w,42082
 fractal_server/runner/executors/slurm_common/get_slurm_config.py,sha256=B6EKjob8Y-DiJ8YbXf2CeoY7B8cwvkpKvlW8Ce6bbx0,7115
 fractal_server/runner/executors/slurm_common/remote.py,sha256=8pTMTRp_LjzoUr3FtFTfdvDhuLnqzY6HT-T9pzrVLw4,3845
-fractal_server/runner/executors/slurm_common/slurm_config.py,sha256=JcAV1xNhzBjpZFTRRbQm0EN9Ti4udNOjseGQcFlFnuM,7897
+fractal_server/runner/executors/slurm_common/slurm_config.py,sha256=m65hJ4NJfk74ogKYSbC9l0Y9D3QSkAnMoUdq3loegpw,8498
 fractal_server/runner/executors/slurm_common/slurm_job_task_models.py,sha256=VeX40CvU5fckUpSyXlzb3EDE9xxPXkT2sZKLXq_6Ooc,3493
 fractal_server/runner/executors/slurm_ssh/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fractal_server/runner/executors/slurm_ssh/run_subprocess.py,sha256=SyW6t4egvbiARph2YkFjc88Hj94fCamZVi50L7ph8VM,996
@@ -268,8 +268,8 @@ fractal_server/types/validators/_workflow_task_arguments_validators.py,sha256=zt
 fractal_server/urls.py,sha256=QjIKAC1a46bCdiPMu3AlpgFbcv6a4l3ABcd5xz190Og,471
 fractal_server/utils.py,sha256=-rjg8QTXQcKweXjn0NcmETFs1_uM9PGnbl0Q7c4ERPM,2181
 fractal_server/zip_tools.py,sha256=Uhn-ax4_9g1PJ32BdyaX30hFpAeVOv2tZYTUK-zVn1E,5719
-fractal_server-2.18.2.dist-info/METADATA,sha256=3N5kI9DAFqLXBpWAwI_OmNluYRiksN-dD3PFYB4NPe4,4275
-fractal_server-2.18.2.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
-fractal_server-2.18.2.dist-info/entry_points.txt,sha256=8tV2kynvFkjnhbtDnxAqImL6HMVKsopgGfew0DOp5UY,58
-fractal_server-2.18.2.dist-info/licenses/LICENSE,sha256=QKAharUuhxL58kSoLizKJeZE3mTCBnX6ucmz8W0lxlk,1576
-fractal_server-2.18.2.dist-info/RECORD,,
+fractal_server-2.18.3a0.dist-info/METADATA,sha256=gvMqw6he1Mg5FoCHcVzHL1i3ywNWUhVfVz_Lqa_XF5I,4277
+fractal_server-2.18.3a0.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+fractal_server-2.18.3a0.dist-info/entry_points.txt,sha256=8tV2kynvFkjnhbtDnxAqImL6HMVKsopgGfew0DOp5UY,58
+fractal_server-2.18.3a0.dist-info/licenses/LICENSE,sha256=QKAharUuhxL58kSoLizKJeZE3mTCBnX6ucmz8W0lxlk,1576
+fractal_server-2.18.3a0.dist-info/RECORD,,