fractal-server 2.16.5__py3-none-any.whl → 2.17.0a0__py3-none-any.whl

fractal_server/runner/executors/slurm_common/base_slurm_runner.py

@@ -9,17 +9,17 @@ from typing import Literal
 from pydantic import BaseModel
 from pydantic import ConfigDict
 
-from ..slurm_common._slurm_config import SlurmConfig
 from ..slurm_common.slurm_job_task_models import SlurmJob
 from ..slurm_common.slurm_job_task_models import SlurmTask
 from ._job_states import STATES_FINISHED
+from .slurm_config import SlurmConfig
 from fractal_server import __VERSION__
 from fractal_server.app.db import get_sync_db
 from fractal_server.app.models.v2 import AccountingRecordSlurm
 from fractal_server.app.schemas.v2 import HistoryUnitStatus
 from fractal_server.app.schemas.v2 import TaskType
-from fractal_server.config import get_settings
 from fractal_server.logger import set_logger
+from fractal_server.runner.config import JobRunnerConfigSLURM
 from fractal_server.runner.exceptions import JobExecutionError
 from fractal_server.runner.exceptions import TaskExecutionError
 from fractal_server.runner.executors.base_runner import BaseRunner
@@ -31,7 +31,6 @@ from fractal_server.runner.v2.db_tools import (
     bulk_update_status_of_history_unit,
 )
 from fractal_server.runner.v2.db_tools import update_status_of_history_unit
-from fractal_server.syringe import Inject
 
 SHUTDOWN_ERROR_MESSAGE = "Failed due to job-execution shutdown."
 SHUTDOWN_EXCEPTION = JobExecutionError(SHUTDOWN_ERROR_MESSAGE)
@@ -77,16 +76,18 @@ class BaseSlurmRunner(BaseRunner):
     python_worker_interpreter: str
     slurm_runner_type: Literal["ssh", "sudo"]
     slurm_account: str | None = None
+    shared_config: JobRunnerConfigSLURM
 
     def __init__(
         self,
+        *,
         root_dir_local: Path,
         root_dir_remote: Path,
         slurm_runner_type: Literal["ssh", "sudo"],
         python_worker_interpreter: str,
+        poll_interval: int,
         common_script_lines: list[str] | None = None,
-        user_cache_dir: str | None = None,
-        poll_interval: int | None = None,
+        user_cache_dir: str | None = None,  # FIXME: make required?
         slurm_account: str | None = None,
     ):
         self.slurm_runner_type = slurm_runner_type
@@ -98,11 +99,7 @@ class BaseSlurmRunner(BaseRunner):
         self.python_worker_interpreter = python_worker_interpreter
         self.slurm_account = slurm_account
 
-        settings = Inject(get_settings)
-
-        self.poll_interval = (
-            poll_interval or settings.FRACTAL_SLURM_POLL_INTERVAL
-        )
+        self.poll_interval = poll_interval
         self.poll_interval_internal = self.poll_interval / 10.0
 
         self.check_fractal_server_versions()
@@ -134,12 +131,10 @@ class BaseSlurmRunner(BaseRunner):
     def _run_remote_cmd(self, cmd: str) -> str:
         raise NotImplementedError("Implement in child class.")
 
-    def run_squeue(self, *, job_ids: list[str], **kwargs) -> str:
+    def run_squeue(self, *, job_ids: list[str]) -> str:
         raise NotImplementedError("Implement in child class.")
 
-    def _is_squeue_error_recoverable(
-        self, exception: BaseException
-    ) -> Literal[True]:
+    def _is_squeue_error_recoverable(self, exception: BaseException) -> bool:
         """
         Determine whether a `squeue` error is considered recoverable.
 
@@ -245,7 +240,7 @@ class BaseSlurmRunner(BaseRunner):
             A new, up-to-date, `SlurmConfig` object.
         """
 
-        new_slurm_config = slurm_config.model_copy()
+        new_slurm_config = slurm_config.model_copy(deep=True)
 
         # Include SLURM account in `slurm_config`.
         if self.slurm_account is not None:
@@ -473,7 +468,7 @@ class BaseSlurmRunner(BaseRunner):
         *,
         task: SlurmTask,
         was_job_scancelled: bool = False,
-    ) -> tuple[Any, Exception]:
+    ) -> tuple[Any, Exception | None]:
         try:
             with open(task.output_file_local) as f:
                 output = json.load(f)
@@ -566,6 +561,10 @@ class BaseSlurmRunner(BaseRunner):
     def job_ids(self) -> list[str]:
         return list(self.jobs.keys())
 
+    @property
+    def job_ids_int(self) -> list[int]:
+        return list(map(int, self.jobs.keys()))
+
     def wait_and_check_shutdown(self) -> list[str]:
         """
         Wait at most `self.poll_interval`, while also checking for shutdown.
@@ -602,6 +601,7 @@ class BaseSlurmRunner(BaseRunner):
 
     def submit(
         self,
+        *,
         base_command: str,
         workflow_task_order: int,
         workflow_task_id: int,
@@ -612,7 +612,23 @@ class BaseSlurmRunner(BaseRunner):
         config: SlurmConfig,
         task_type: SubmitTaskType,
         user_id: int,
-    ) -> tuple[Any, Exception]:
+    ) -> tuple[Any, Exception | None]:
+        """
+        Run a single fractal task.
+
+        Args:
+            base_command:
+            workflow_task_order:
+            workflow_task_id:
+            task_name:
+            parameters: Dictionary of parameters.
+            history_unit_id:
+                Database ID of the corresponding `HistoryUnit` entry.
+            task_type: Task type.
+            task_files: `TaskFiles` object.
+            config: Runner-specific parameters.
+            user_id:
+        """
         logger.debug("[submit] START")
 
         # Always refresh `executor_error_log` before starting a task
@@ -687,7 +703,7 @@ class BaseSlurmRunner(BaseRunner):
 
             create_accounting_record_slurm(
                 user_id=user_id,
-                slurm_job_ids=self.job_ids,
+                slurm_job_ids=self.job_ids_int,
             )
 
             # Retrieval phase
@@ -757,11 +773,12 @@ class BaseSlurmRunner(BaseRunner):
 
     def multisubmit(
         self,
+        *,
         base_command: str,
         workflow_task_order: int,
         workflow_task_id: int,
         task_name: str,
-        list_parameters: list[dict],
+        list_parameters: list[dict[str, Any]],
         history_unit_ids: list[int],
         list_task_files: list[TaskFiles],
         task_type: MultisubmitTaskType,
@@ -769,9 +786,26 @@ class BaseSlurmRunner(BaseRunner):
         user_id: int,
     ) -> tuple[dict[int, Any], dict[int, BaseException]]:
         """
+        Run a parallel fractal task.
+
         Note: `list_parameters`, `list_task_files` and `history_unit_ids`
         have the same size. For parallel tasks, this is also the number of
         input images, while for compound tasks these can differ.
+
+        Args:
+            base_command:
+            workflow_task_order:
+            workflow_task_id:
+            task_name:
+            list_parameters:
+                List of dictionaries of parameters (each one must include
+                `zarr_urls` key).
+            history_unit_ids:
+                Database IDs of the corresponding `HistoryUnit` entries.
+            list_task_files: `TaskFiles` objects.
+            task_type: Task type.
+            config: Runner-specific parameters.
+            user_id:
         """
 
         # Always refresh `executor_error_log` before starting a task
@@ -779,6 +813,9 @@ class BaseSlurmRunner(BaseRunner):
 
         config = self._enrich_slurm_config(config)
 
+        results: dict[int, Any] = {}
+        exceptions: dict[int, BaseException] = {}
+
         logger.debug(f"[multisubmit] START, {len(list_parameters)=}")
         try:
             if self.is_shutdown():
@@ -789,8 +826,8 @@ class BaseSlurmRunner(BaseRunner):
                             status=HistoryUnitStatus.FAILED,
                             db_sync=db,
                         )
-                results: dict[int, Any] = {}
-                exceptions: dict[int, BaseException] = {
+                results = {}
+                exceptions = {
                     ind: SHUTDOWN_EXCEPTION
                     for ind in range(len(list_parameters))
                 }
@@ -812,9 +849,6 @@ class BaseSlurmRunner(BaseRunner):
                 self._mkdir_local_folder(workdir_local.as_posix())
                 self._mkdir_remote_folder(folder=workdir_remote.as_posix())
 
-            results: dict[int, Any] = {}
-            exceptions: dict[int, BaseException] = {}
-
             # NOTE: chunking has already taken place in `get_slurm_config`,
             # so that `config.tasks_per_job` is now set.
 
@@ -889,7 +923,7 @@ class BaseSlurmRunner(BaseRunner):
 
             create_accounting_record_slurm(
                 user_id=user_id,
-                slurm_job_ids=self.job_ids,
+                slurm_job_ids=self.job_ids_int,
             )
 
         except Exception as e:

fractal_server/runner/executors/slurm_common/get_slurm_config.py

@@ -1,50 +1,42 @@
-from pathlib import Path
 from typing import Literal
 
 from ._batching import heuristics
-from ._slurm_config import _parse_mem_value
-from ._slurm_config import load_slurm_config_file
-from ._slurm_config import logger
-from ._slurm_config import SlurmConfig
-from ._slurm_config import SlurmConfigError
+from .slurm_config import logger
+from .slurm_config import SlurmConfig
 from fractal_server.app.models.v2 import WorkflowTaskV2
+from fractal_server.runner.config import JobRunnerConfigSLURM
+from fractal_server.runner.config.slurm_mem_to_MB import slurm_mem_to_MB
+from fractal_server.runner.exceptions import SlurmConfigError
 from fractal_server.string_tools import interpret_as_bool
 
 
-def get_slurm_config_internal(
+def _get_slurm_config_internal(
+    shared_config: JobRunnerConfigSLURM,
     wftask: WorkflowTaskV2,
     which_type: Literal["non_parallel", "parallel"],
-    config_path: Path | None = None,
 ) -> SlurmConfig:
     """
-    Prepare a `SlurmConfig` configuration object
 
-    The argument `which_type` determines whether we use `wftask.meta_parallel`
-    or `wftask.meta_non_parallel`. In the following description, let us assume
-    that `which_type="parallel"`.
+    Prepare a specific `SlurmConfig` configuration.
 
-    The sources for `SlurmConfig` attributes, in increasing priority order, are
+    The base configuration is the runner-level `shared_config` object, based
+    on `resource.jobs_runner_config` (note that GPU-specific properties take
+    priority, when `needs_gpu=True`). We then incorporate attributes from
+    `wftask.meta_{non_parallel,parallel}` - with higher priority.
 
-    1. The general content of the Fractal SLURM configuration file.
-    2. The GPU-specific content of the Fractal SLURM configuration file, if
-        appropriate.
-    3. Properties in `wftask.meta_parallel` (which typically include those in
-       `wftask.task.meta_parallel`). Note that `wftask.meta_parallel` may be
-       `None`.
-
-    Arguments:
+    Args:
+        shared_config:
+            Configuration object based on `resource.jobs_runner_config`.
         wftask:
-            WorkflowTask for which the SLURM configuration is is to be
-            prepared.
-        config_path:
-            Path of a Fractal SLURM configuration file; if `None`, use
-            `FRACTAL_SLURM_CONFIG_FILE` variable from settings.
+            WorkflowTaskV2 for which the backend configuration should
+            be prepared.
         which_type:
-            Determines whether to use `meta_parallel` or `meta_non_parallel`.
+            Whether we should look at the non-parallel or parallel part
+            of `wftask`.
+        tot_tasks: Not used here, only present as a common interface.
 
     Returns:
-        slurm_config:
-            The SlurmConfig object
+        A ready-to-use `SlurmConfig` object.
     """
 
     if which_type == "non_parallel":
@@ -60,25 +52,19 @@ def get_slurm_config_internal(
         f"[get_slurm_config] WorkflowTask meta attribute: {wftask_meta=}"
     )
 
-    # Incorporate slurm_env.default_slurm_config
-    slurm_env = load_slurm_config_file(config_path=config_path)
-    slurm_dict = slurm_env.default_slurm_config.model_dump(
+    # Start from `shared_config`
+    slurm_dict = shared_config.default_slurm_config.model_dump(
         exclude_unset=True, exclude={"mem"}
     )
-    if slurm_env.default_slurm_config.mem:
-        slurm_dict["mem_per_task_MB"] = slurm_env.default_slurm_config.mem
+    if shared_config.default_slurm_config.mem:
+        slurm_dict["mem_per_task_MB"] = shared_config.default_slurm_config.mem
 
     # Incorporate slurm_env.batching_config
-    for key, value in slurm_env.batching_config.model_dump().items():
+    for key, value in shared_config.batching_config.model_dump().items():
         slurm_dict[key] = value
 
     # Incorporate slurm_env.user_local_exports
-    slurm_dict["user_local_exports"] = slurm_env.user_local_exports
-
-    logger.debug(
-        "[get_slurm_config] Fractal SLURM configuration file: "
-        f"{slurm_env.model_dump()=}"
-    )
+    slurm_dict["user_local_exports"] = shared_config.user_local_exports
 
     # GPU-related options
     # Notes about priority:
@@ -92,12 +78,12 @@ def get_slurm_config_internal(
         needs_gpu = False
     logger.debug(f"[get_slurm_config] {needs_gpu=}")
     if needs_gpu:
-        for key, value in slurm_env.gpu_slurm_config.model_dump(
+        for key, value in shared_config.gpu_slurm_config.model_dump(
             exclude_unset=True, exclude={"mem"}
         ).items():
             slurm_dict[key] = value
-        if slurm_env.gpu_slurm_config.mem:
-            slurm_dict["mem_per_task_MB"] = slurm_env.gpu_slurm_config.mem
+        if shared_config.gpu_slurm_config.mem:
+            slurm_dict["mem_per_task_MB"] = shared_config.gpu_slurm_config.mem
 
     # Number of CPUs per task, for multithreading
     if wftask_meta is not None and "cpus_per_task" in wftask_meta:
@@ -107,7 +93,7 @@ def get_slurm_config_internal(
     # Required memory per task, in MB
     if wftask_meta is not None and "mem" in wftask_meta:
         raw_mem = wftask_meta["mem"]
-        mem_per_task_MB = _parse_mem_value(raw_mem)
+        mem_per_task_MB = slurm_mem_to_MB(raw_mem)
         slurm_dict["mem_per_task_MB"] = mem_per_task_MB
 
     # Job name
@@ -144,8 +130,7 @@ def get_slurm_config_internal(
     extra_lines = slurm_dict.get("extra_lines", []) + extra_lines
     if len(set(extra_lines)) != len(extra_lines):
         logger.debug(
-            "[get_slurm_config] Removing repeated elements from "
-            f"{extra_lines=}."
+            f"[get_slurm_config] Removing repeated elements in {extra_lines=}."
         )
         extra_lines = list(set(extra_lines))
     slurm_dict["extra_lines"] = extra_lines
@@ -164,8 +149,7 @@ def get_slurm_config_internal(
 
     # Put everything together
     logger.debug(
-        "[get_slurm_config] Now create a SlurmConfig object based on "
-        f"{slurm_dict=}"
+        f"[get_slurm_config] Create SlurmConfig object based on {slurm_dict=}"
     )
     slurm_config = SlurmConfig(**slurm_dict)
 
@@ -173,15 +157,15 @@ def get_slurm_config_internal(
 
 
 def get_slurm_config(
+    shared_config: JobRunnerConfigSLURM,
     wftask: WorkflowTaskV2,
     which_type: Literal["non_parallel", "parallel"],
-    config_path: Path | None = None,
     tot_tasks: int = 1,
 ) -> SlurmConfig:
-    config = get_slurm_config_internal(
-        wftask,
-        which_type,
-        config_path,
+    config = _get_slurm_config_internal(
+        shared_config=shared_config,
+        wftask=wftask,
+        which_type=which_type,
     )
 
     # Set/validate parameters for task batching

fractal_server/runner/executors/slurm_common/remote.py

@@ -23,7 +23,7 @@ def worker(
     """
     Execute a job, possibly on a remote node.
 
-    Arguments:
+    Args:
         in_fname: Absolute path to the input file (must be readable).
         out_fname: Absolute path of the output file (must be writeable).
     """

fractal_server/runner/executors/slurm_common/{_slurm_config.py → slurm_config.py}

@@ -1,208 +1,17 @@
-# Copyright 2022 (C) Friedrich Miescher Institute for Biomedical Research and
-# University of Zurich
-#
-# Original authors:
-# Jacopo Nespolo <jacopo.nespolo@exact-lab.it>
-# Tommaso Comparin <tommaso.comparin@exact-lab.it>
-#
-# This file is part of Fractal and was originally developed by eXact lab S.r.l.
-# <exact-lab.it> under contract with Liberali Lab from the Friedrich Miescher
-# Institute for Biomedical Research and Pelkmans Lab from the University of
-# Zurich.
 """
 Submodule to handle the SLURM configuration for a WorkflowTask
 """
-import json
 from pathlib import Path
 
 from pydantic import BaseModel
 from pydantic import ConfigDict
 from pydantic import Field
-from pydantic import ValidationError
 
-from fractal_server.config import get_settings
 from fractal_server.logger import set_logger
-from fractal_server.syringe import Inject
 
 logger = set_logger(__name__)
 
 
-class SlurmConfigError(ValueError):
-    """
-    Slurm configuration error
-    """
-
-    pass
-
-
-class _SlurmConfigSet(BaseModel):
-    """
-    Options that can be set in `FRACTAL_SLURM_CONFIG_FILE` for the default/gpu
-    SLURM config. Only used as part of `SlurmConfigFile`.
-
-    Attributes:
-        partition:
-        cpus_per_task:
-        mem:
-            See `_parse_mem_value` for details on allowed values.
-        constraint:
-        gres:
-        time:
-        exclude:
-        nodelist:
-        account:
-        extra_lines:
-    """
-
-    model_config = ConfigDict(extra="forbid")
-
-    partition: str | None = None
-    cpus_per_task: int | None = None
-    mem: int | str | None = None
-    constraint: str | None = None
-    gres: str | None = None
-    exclude: str | None = None
-    nodelist: str | None = None
-    time: str | None = None
-    account: str | None = None
-    extra_lines: list[str] | None = None
-    gpus: str | None = None
-
-
-class _BatchingConfigSet(BaseModel):
-    """
-    Options that can be set in `FRACTAL_SLURM_CONFIG_FILE` to configure the
-    batching strategy (that is, how to combine several tasks in a single SLURM
-    job). Only used as part of `SlurmConfigFile`.
-
-    Attributes:
-        target_cpus_per_job:
-        max_cpus_per_job:
-        target_mem_per_job:
-            (see `_parse_mem_value` for details on allowed values)
-        max_mem_per_job:
-            (see `_parse_mem_value` for details on allowed values)
-        target_num_jobs:
-        max_num_jobs:
-    """
-
-    model_config = ConfigDict(extra="forbid")
-
-    target_cpus_per_job: int
-    max_cpus_per_job: int
-    target_mem_per_job: int | str
-    max_mem_per_job: int | str
-    target_num_jobs: int
-    max_num_jobs: int
-
-
-class SlurmConfigFile(BaseModel):
-    """
-    Specifications for the content of `FRACTAL_SLURM_CONFIG_FILE`
-
-    This must be a JSON file, and a valid example is
-    ```JSON
-    {
-      "default_slurm_config": {
-          "partition": "main",
-          "cpus_per_task": 1
-      },
-      "gpu_slurm_config": {
-          "partition": "gpu",
-          "extra_lines": ["#SBATCH --gres=gpu:v100:1"]
-      },
-      "batching_config": {
-          "target_cpus_per_job": 1,
-          "max_cpus_per_job": 1,
-          "target_mem_per_job": 200,
-          "max_mem_per_job": 500,
-          "target_num_jobs": 2,
-          "max_num_jobs": 4
-      },
-      "user_local_exports": {
-          "CELLPOSE_LOCAL_MODELS_PATH": "CELLPOSE_LOCAL_MODELS_PATH",
-          "NAPARI_CONFIG": "napari_config.json"
-      }
-    }
-    ```
-
-    See `_SlurmConfigSet` and `_BatchingConfigSet` for more details.
-
-    Attributes:
-        default_slurm_config:
-            Common default options for all tasks.
-        gpu_slurm_config:
-            Default configuration for all GPU tasks.
-        batching_config:
-            Configuration of the batching strategy.
-        user_local_exports:
-            Key-value pairs to be included as `export`-ed variables in SLURM
-            submission script, after prepending values with the user's cache
-            directory.
-    """
-
-    model_config = ConfigDict(extra="forbid")
-
-    default_slurm_config: _SlurmConfigSet
-    gpu_slurm_config: _SlurmConfigSet | None = None
-    batching_config: _BatchingConfigSet
-    user_local_exports: dict[str, str] | None = None
-
-
-def load_slurm_config_file(
-    config_path: Path | None = None,
-) -> SlurmConfigFile:
-    """
-    Load a SLURM configuration file and validate its content with
-    `SlurmConfigFile`.
-
-    Arguments:
-        config_path:
-    """
-
-    if not config_path:
-        settings = Inject(get_settings)
-        config_path = settings.FRACTAL_SLURM_CONFIG_FILE
-
-    # Load file
-    logger.debug(f"[get_slurm_config] Now loading {config_path=}")
-    try:
-        with config_path.open("r") as f:
-            slurm_env = json.load(f)
-    except Exception as e:
-        raise SlurmConfigError(
-            f"Error while loading {config_path=}. "
-            f"Original error:\n{str(e)}"
-        )
-
-    # Validate file content
-    logger.debug(f"[load_slurm_config_file] Now validating {config_path=}")
-    logger.debug(f"[load_slurm_config_file] {slurm_env=}")
-    try:
-        obj = SlurmConfigFile(**slurm_env)
-    except ValidationError as e:
-        raise SlurmConfigError(
-            f"Error while loading {config_path=}. "
-            f"Original error:\n{str(e)}"
-        )
-
-    # Convert memory to MB units, in all relevant attributes
-    if obj.default_slurm_config.mem:
-        obj.default_slurm_config.mem = _parse_mem_value(
-            obj.default_slurm_config.mem
-        )
-    if obj.gpu_slurm_config and obj.gpu_slurm_config.mem:
-        obj.gpu_slurm_config.mem = _parse_mem_value(obj.gpu_slurm_config.mem)
-    obj.batching_config.target_mem_per_job = _parse_mem_value(
-        obj.batching_config.target_mem_per_job
-    )
-    obj.batching_config.max_mem_per_job = _parse_mem_value(
-        obj.batching_config.max_mem_per_job
-    )
-
-    return obj
-
-
 class SlurmConfig(BaseModel):
     """
     Abstraction for SLURM parameters
@@ -210,9 +19,7 @@ class SlurmConfig(BaseModel):
     **NOTE**: `SlurmConfig` objects are created internally in `fractal-server`,
     and they are not meant to be initialized by the user; the same holds for
     `SlurmConfig` attributes (e.g. `mem_per_task_MB`), which are not meant to
-    be part of the `FRACTAL_SLURM_CONFIG_FILE` JSON file (details on the
-    expected file content are defined in
-    [`SlurmConfigFile`](#fractal_server.runner._slurm._slurm_config.SlurmConfigFile)).
+    be part of the superuser-defined `resource.jobs_runner_config` JSON field.
 
     Part of the attributes map directly to some of the SLURM attributes (see
     https://slurm.schedmd.com/sbatch.html), e.g. `partition`. Other attributes
@@ -313,7 +120,7 @@ class SlurmConfig(BaseModel):
         2. Lines starting with `self.prefix`;
         3. Other lines.
 
-        Arguments:
+        Args:
             script_lines:
         """
 
@@ -335,7 +142,7 @@ class SlurmConfig(BaseModel):
         Compile `SlurmConfig` object into the preamble of a SLURM submission
         script.
 
-        Arguments:
+        Args:
             remote_export_dir:
                 Base directory for exports defined in
                 `self.user_local_exports`.
@@ -411,61 +218,3 @@ class SlurmConfig(BaseModel):
     @property
     def batch_size(self) -> int:
         return self.tasks_per_job
-
-
-def _parse_mem_value(raw_mem: str | int) -> int:
-    """
-    Convert a memory-specification string into an integer (in MB units), or
-    simply return the input if it is already an integer.
-
-    Supported units are `"M", "G", "T"`, with `"M"` being the default; some
-    parsing examples are: `"10M" -> 10000`, `"3G" -> 3000000`.
-
-    Arguments:
-        raw_mem:
-            A string (e.g. `"100M"`) or an integer (in MB).
-
-    Returns:
-        Integer value of memory in MB units.
-    """
-
-    info = f"[_parse_mem_value] {raw_mem=}"
-    error_msg = (
-        f"{info}, invalid specification of memory requirements "
-        "(valid examples: 93, 71M, 93G, 71T)."
-    )
-
-    # Handle integer argument
-    if type(raw_mem) is int:
-        return raw_mem
-
-    # Handle string argument
-    if not raw_mem[0].isdigit():  # fail e.g. for raw_mem="M100"
-        logger.error(error_msg)
-        raise SlurmConfigError(error_msg)
-    if raw_mem.isdigit():
-        mem_MB = int(raw_mem)
-    elif raw_mem.endswith("M"):
-        stripped_raw_mem = raw_mem.strip("M")
-        if not stripped_raw_mem.isdigit():
-            logger.error(error_msg)
-            raise SlurmConfigError(error_msg)
-        mem_MB = int(stripped_raw_mem)
-    elif raw_mem.endswith("G"):
-        stripped_raw_mem = raw_mem.strip("G")
-        if not stripped_raw_mem.isdigit():
-            logger.error(error_msg)
-            raise SlurmConfigError(error_msg)
-        mem_MB = int(stripped_raw_mem) * 10**3
-    elif raw_mem.endswith("T"):
-        stripped_raw_mem = raw_mem.strip("T")
-        if not stripped_raw_mem.isdigit():
-            logger.error(error_msg)
-            raise SlurmConfigError(error_msg)
-        mem_MB = int(stripped_raw_mem) * 10**6
-    else:
-        logger.error(error_msg)
-        raise SlurmConfigError(error_msg)
-
-    logger.debug(f"{info}, return {mem_MB}")
-    return mem_MB