squidient 3.2.0__tar.gz → 3.3.0__tar.gz

{squidient-3.2.0 → squidient-3.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: squidient
-Version: 3.2.0
+Version: 3.3.0
 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-3.2.0 → squidient-3.3.0}/pyproject.toml

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

{squidient-3.2.0 → squidient-3.3.0}/src/squidient/builds/build_presets.py

@@ -18,14 +18,38 @@
 #########################################################################
 
 from ..definitions import build_presets_file
-from ..utils.utils import open_json
+from ..utils.utils import open_critical_json
 
 
 class BuildPresets:
 
     def __init__(self, preset_category):
-        self._presets = open_json(build_presets_file)[preset_category]
+        preset_file = open_critical_json(build_presets_file)
+        if not isinstance(preset_file, dict):
+            raise RuntimeError(
+                "{} must contain a JSON object, got {}".format(
+                    build_presets_file,
+                    type(preset_file).__name__))
+        if preset_category not in preset_file:
+            raise RuntimeError(
+                "{} is missing required top-level field '{}'".format(
+                    build_presets_file,
+                    preset_category))
+        self._presets = preset_file[preset_category]
+        if not isinstance(self._presets, dict):
+            raise RuntimeError(
+                "{}.{} must be a JSON object, got {}".format(
+                    build_presets_file,
+                    preset_category,
+                    type(self._presets).__name__))
         if preset_category == "builds":
+            if "gpp" not in self._presets:
+                raise RuntimeError("{}.builds is missing required field 'gpp'".format(build_presets_file))
+            if not isinstance(self._presets["gpp"], list):
+                raise RuntimeError(
+                    "{}.builds.gpp must be a list, got {}".format(
+                        build_presets_file,
+                        type(self._presets["gpp"]).__name__))
             self._presets["all"] = (
                     self._presets["gpp"]
             )

{squidient-3.2.0 → squidient-3.3.0}/src/squidient/data/builds/builds.json

@@ -404,6 +404,53 @@
         ],
 	"threads": 40
     },
+    "cmake-acc-nvhpc-26.5-i4": {
+        "from": "cmake-acc-nvhpc-24.3-i4",
+        "modules": [
+            "nvidia-hpc-sdk/26.5",
+            "cmake/3.25.1"
+        ],
+	"threads": 20,
+        "version": "26.5"
+    },    
+    "cmake-acc-nvhpc-26.5-i4-gpu": {
+        "from": "cmake-acc-nvhpc-26.5-i4",
+        "configuration": "nvhpc-i4-gpu",
+        "ctest": true,
+        "sbatch": {
+            "--gres": "gpu:1"
+        },
+        "tags": [
+            "special",
+            "i4",
+            "gpu"
+        ],
+	"threads": 20
+    },
+    "cmake-acc-nvhpc-26.5-i4-gpu-ndimepar": {
+        "from": "cmake-acc-nvhpc-26.5-i4-gpu",
+        "configuration": "nvhpc-i4-gpu-ndimepar",
+        "ctest": true,
+        "tags": [
+            "special",
+            "i4",
+            "gpu",
+	    "ndimepar"
+        ],
+	"threads": 20
+    },
+    "cmake-acc-nvhpc-26.5-i4-gpu-ndimepar-vecsize2048k": {
+        "from": "cmake-acc-nvhpc-26.5-i4-gpu",
+        "configuration": "nvhpc-i4-gpu-ndimepar-vecsize2048k",
+        "ctest": true,
+        "tags": [
+            "special",
+            "i4",
+            "gpu",
+	    "ndimepar"
+        ],
+	"threads": 20
+    },
     "cmake-gpp-oneapi-2023.2-i4-chemint-cpu": {
         "configuration": "intel-i4-chemint-cpu-gpp",
         "file": "cmake-chemint.json",

{squidient-3.2.0 → squidient-3.3.0}/src/squidient/data/builds/predefined.json

@@ -21,10 +21,10 @@
             "cmake-gpp-gnu-13.2.0-i8-openmp"
         ],
         "acc": [
-            "cmake-acc-nvhpc-24.11-i4",
-            "cmake-acc-nvhpc-24.11-i4-gpu",
-            "cmake-acc-nvhpc-24.11-i4-gpu-ndimepar-vecsize2048k",
-            "cmake-acc-nvhpc-25.3-gnu-13.2.0-i4-chemint-gpu"
+            "cmake-acc-nvhpc-25.3-gnu-13.2.0-i4-chemint-gpu",
+            "cmake-acc-nvhpc-26.5-i4",
+            "cmake-acc-nvhpc-26.5-i4-gpu",
+            "cmake-acc-nvhpc-26.5-i4-gpu-ndimepar-vecsize2048k"
         ],
         "grace": [
             "cmake-grace-gnu-14.2.0-i4"
@@ -57,11 +57,11 @@
             "cmake-gpp-oneapi-2024.1-i8-talp-ndimepar",
             "cmake-gpp-gnu-13.2.0-i4-ndimepar",
             "cmake-gpp-gnu-13.2.0-i8-ndimepar",
-            "cmake-acc-nvhpc-24.11-i4-gpu-ndimepar-vecsize2048k"
+            "cmake-acc-nvhpc-26.5-i4-gpu-ndimepar-vecsize2048k"
         ],
         "mr": [
             "cmake-gpp-gnu-13.2.0-i4-ndimepar",
-            "cmake-acc-nvhpc-24.11-i4-gpu-ndimepar-vecsize2048k"
+            "cmake-acc-nvhpc-26.5-i4-gpu-ndimepar-vecsize2048k"
         ]
     }
 }

{squidient-3.2.0 → squidient-3.3.0}/src/squidient/data/configurations/projects.json

@@ -28,5 +28,24 @@
                 }
             }
         }
+    },
+    "eurohpc-acc": {
+        "systems": {
+            "bsc": {
+                "platforms": {
+                    "acc": {
+                        "account": "ehpc640",
+                        "queues": {
+                            "builds": "acc_ehpc",
+                            "tests": "acc_ehpc",
+                            "benchmarks": "acc_ehpc",
+                            "flex": "acc_ehpc",
+                            "install": "acc_ehpc",
+                            "default": "acc_ehpc"
+                        }
+                    }
+                }
+            }
+        }
     }
 }