squidient 2.5.1__tar.gz → 2.5.2__tar.gz

{squidient-2.5.1 → squidient-2.5.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: squidient
-Version: 2.5.1
+Version: 2.5.2
 Summary: CI/CD framework for alya
 Project-URL: Homepage, https://alya.gitlab.bsc.es/alya/ci-cd/squidient
 Project-URL: Bug Tracker, https://alya.gitlab.bsc.es/alya/ci-cd/squidient/issues

{squidient-2.5.1 → squidient-2.5.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "squidient"
-version = "2.5.1"
+version = "2.5.2"
 authors = [
   { name="Damien Dosimont", email="damien.dosimont@gmail.com" },
 ]

{squidient-2.5.1 → squidient-2.5.2}/src/squidient/builds/executablebuild.py

@@ -170,19 +170,57 @@ class ExecutableBuild(Build):
         options.options("$" + cmake_link_dir, spath + remote_cc_dir + "/" + self._build_id, (spath + "/" + alya_dir).replace("//", "/"), mpirun_options)
         self._options = options
 
+    def _resolve_slurm_resources(self):
+        cpus_per_task = self._sbatch.get("--cpus-per-task", self._sys.get_cpus_per_task())
+        if "--ntasks-per-node" in self._sbatch:
+            return {
+                "--cpus-per-task": cpus_per_task,
+                "--ntasks-per-node": self._sbatch["--ntasks-per-node"],
+            }
+
+        tasks_per_node = self._sys.get_tasks_per_node()
+        try:
+            node_cpus = int(self._sys.get_cpus_per_task()) * int(self._sys.get_tasks_per_node())
+            requested_cpus_per_task = int(cpus_per_task)
+            requested_tasks = max(1, int(self._threads))
+        except (TypeError, ValueError):
+            return {
+                "--cpus-per-task": cpus_per_task,
+                "--ntasks-per-node": tasks_per_node,
+            }
+        if requested_cpus_per_task <= 0:
+            return {
+                "--cpus-per-task": cpus_per_task,
+                "--ntasks-per-node": tasks_per_node,
+            }
+
+        tasks_per_node = min(
+            int(tasks_per_node),
+            requested_tasks,
+            max(1, node_cpus // requested_cpus_per_task),
+        )
+        return {
+            "--cpus-per-task": cpus_per_task,
+            "--ntasks-per-node": tasks_per_node,
+        }
+
     def generate_job(self):
         self.set_queue()
         spath = self._server_path + "/"
+        slurm_resources = self._resolve_slurm_resources()
         script = open(self._report_dir + "/JOB.SB", 'w')
         script.write("#!/bin/bash\n")
         script.write("#SBATCH -D " + spath + self._build_path + "\n")
         script.write("#SBATCH --output=" + build_out_file + "\n")
         script.write("#SBATCH --error=" + build_err_file + "\n")
         script.write("#SBATCH --job-name=" + jtitle + self._hash + "\n")
-        script.write("#SBATCH --ntasks-per-node=" + str(self._sys.get_tasks_per_node()) + "\n")
+        script.write("#SBATCH --cpus-per-task=" + str(slurm_resources["--cpus-per-task"]) + "\n")
+        script.write("#SBATCH --ntasks-per-node=" + str(slurm_resources["--ntasks-per-node"]) + "\n")
         script.write("#SBATCH --ntasks=" + str(self._threads)+"\n")
         script.write("#SBATCH --time=" + self._timeout + "\n")
         for parameter in self._sbatch:
+            if parameter in slurm_resources:
+                continue
             if str(self._sbatch[parameter]) == "":
                 line = "#SBATCH " + parameter + "\n"
             else:

{squidient-2.5.1 → squidient-2.5.2}/src/squidient/configure.py

@@ -519,7 +519,7 @@ def set_mr(type):
             config = open_json(config_file)
             config["db"]["user"] = "alya_user"
             config["db"]["database"] = database_name["test"]
-            config["benchmarks"]["tests"] = ["elbow", "sphere-16M"]
+            config["benchmarks"]["tests"] = ["elbow", "sphere-16M", "bolund-32M"]
             save_json(config, config_file)
 
 

{squidient-2.5.1 → squidient-2.5.2}/src/squidient/data/builds/predefined.json

@@ -60,7 +60,8 @@
             "cmake-acc-nvhpc-24.11-i4-gpu-ndimepar-vecsize2048k"
         ],
         "mr": [
-            "cmake-gpp-gnu-13.2.0-i4-ndimepar"
+            "cmake-gpp-gnu-13.2.0-i4-ndimepar",
+            "cmake-acc-nvhpc-24.11-i4-gpu-ndimepar-vecsize2048k"
         ]
     }
 }

{squidient-2.5.1 → squidient-2.5.2}/src/squidient/reports/report.py

@@ -48,6 +48,7 @@ class Report:
     def open(self):
         try:
             self._data = open_critical_json(self._report)
+            self._valid = self._data.get("valid", True)
         except:
             self.init()
 

{squidient-2.5.1 → squidient-2.5.2}/src/squidient/testing/instance.py

@@ -140,13 +140,47 @@ class Instance:
         return int(self._sys.get_test_max_tasks())<int(self._mpi)*int(max(1,int(self._openmp)))
 
     def set_sbatch(self):
-
-        self._sbatch["--cpus-per-task"] = self._sys.get_cpus_per_task()
-        self._sbatch["--ntasks-per-node"] = self._sys.get_tasks_per_node()
-        if "sbatch" in self._execution:
-            for parameter in self._execution["sbatch"]:
-                self._sbatch[parameter] = self._execution["sbatch"][parameter]
-                self._mergeable = False
+        execution_sbatch = self._execution.get("sbatch", {})
+        self._sbatch.update(self._resolve_slurm_resources(execution_sbatch))
+
+        for parameter in execution_sbatch:
+            if parameter not in self._sbatch:
+                self._sbatch[parameter] = execution_sbatch[parameter]
+            self._mergeable = False
+
+    def _resolve_slurm_resources(self, execution_sbatch):
+        cpus_per_task = execution_sbatch.get("--cpus-per-task", self._sys.get_cpus_per_task())
+        if "--ntasks-per-node" in execution_sbatch:
+            return {
+                "--cpus-per-task": cpus_per_task,
+                "--ntasks-per-node": execution_sbatch["--ntasks-per-node"],
+            }
+
+        tasks_per_node = self._sys.get_tasks_per_node()
+        try:
+            node_cpus = int(self._sys.get_cpus_per_task()) * int(self._sys.get_tasks_per_node())
+            requested_cpus_per_task = int(cpus_per_task)
+            requested_tasks = max(1, int(self.get_tasks()))
+        except (TypeError, ValueError):
+            return {
+                "--cpus-per-task": cpus_per_task,
+                "--ntasks-per-node": tasks_per_node,
+            }
+        if requested_cpus_per_task <= 0:
+            return {
+                "--cpus-per-task": cpus_per_task,
+                "--ntasks-per-node": tasks_per_node,
+            }
+
+        tasks_per_node = min(
+            int(tasks_per_node),
+            requested_tasks,
+            max(1, node_cpus // requested_cpus_per_task),
+        )
+        return {
+            "--cpus-per-task": cpus_per_task,
+            "--ntasks-per-node": tasks_per_node,
+        }
 
     def set_bind_and_map(self):
         if "commands" in self._execution: