fractal-server 2.18.2__tar.gz → 2.18.3a0__tar.gz

{fractal_server-2.18.2 → fractal_server-2.18.3a0}/PKG-INFO

@@ -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.3a0/fractal_server/__init__.py

@@ -0,0 +1 @@
+__VERSION__ = "2.18.3a0"

{fractal_server-2.18.2 → fractal_server-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-2.18.2 → fractal_server-2.18.3a0}/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-2.18.2 → fractal_server-2.18.3a0}/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 → fractal_server-2.18.3a0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "fractal-server"
-version = "2.18.2"
+version = "2.18.3a0"
 description = "Backend component of the Fractal analytics platform"
 authors = [
     { name="Tommaso Comparin", email="tommaso.comparin@exact-lab.it" },
@@ -95,7 +95,7 @@ filterwarnings = [
 markers = ["container", "ssh", "fails_on_macos", "oauth"]
 
 [tool.bumpver]
-current_version = "2.18.2"
+current_version = "2.18.3a0"
 version_pattern = "MAJOR.MINOR.PATCH[PYTAGNUM]"
 commit_message = "bump version {old_version} -> {new_version}"
 commit = true

fractal_server-2.18.2/fractal_server/__init__.py

@@ -1 +0,0 @@
-__VERSION__ = "2.18.2"