cleanup, factor project_id, add hpc.env to proejct, add quotas #193

feelpp · Dec 13, 2024 · 2befb2b · 2befb2b
1 parent d545da9
commit 2befb2b
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 13 deletions.
diff --git a/pyproject.toml b/pyproject.toml
@@ -5,6 +5,9 @@ build-backend = "setuptools.build_meta"
 [tool.setuptools.packages.find]
 where = ["src"]
 
+[tool.setuptools.package-data]
+'feelpp.benchmarking' = ['reframe/config/machineConfigs/hpc.env']
+
 [project]
 name = "benchmarking"
 version = "0.0.1"

diff --git a/src/feelpp/benchmarking/reframe/config/machineConfigs/discoverer.py b/src/feelpp/benchmarking/reframe/config/machineConfigs/discoverer.py
@@ -1,3 +1,11 @@
+from dotenv import load_dotenv
+from pathlib import Path
+import os
+
+load_dotenv(os.path.join(Path(__file__).resolve().parent,"hpc.env"))
+
+project_id = os.getenv("discoverer_project_id")
+
 site_configuration = {
     'systems':[
         {
@@ -11,7 +19,7 @@
                     'scheduler': 'slurm',
                     'launcher': 'srun',
                     'max_jobs': 8,
-                    'access': ['--partition=cn --account=ehpc-dev-2024d05-047 --qos=ehpc-dev-2024d05-047'],
+                    'access': [f"--partition=cn --account={project_id} --qos={project_id}"],
                     'environs': ['default'],
                     'processor': {
                         'num_cpus': 128

diff --git a/src/feelpp/benchmarking/reframe/config/machineConfigs/discoverer.sh b/src/feelpp/benchmarking/reframe/config/machineConfigs/discoverer.sh
@@ -1,16 +1,16 @@
 #!/bin/bash -l
-#SBATCH --nodes=1                                                       # number of nodes
-#SBATCH --ntasks=1                                                      # number of tasks
-#SBATCH --qos=default                                                   # SLURM qos
-#SBATCH --ntasks-per-node=8                                             # number of tasks per node
-#SBATCH --cpus-per-task=1                                               # number of cores per task
-#SBATCH --time=02:00:00                                                 # time (HH:MM:SS)
-#SBATCH --partition=cn                                                  # partition
-#SBATCH --account=ehpc-dev-2024d05-047 --qos=ehpc-dev-2024d05-047     # project account
-
-
-source /etc/profile.d/modules.sh
-export MODULEPATH=/opt/software/modulefiles
+
+SCRIPT_DIR=$(dirname "$0")
+source "$SCRIPT_DIR/hpc.env"
+
+echo "================================================"
+sacctmgr show association where account=$discoverer_project_id
+
+sshare -A $discoverer_project_id -u " " -o account,user,GrpTRESRaw%80,GrpTRESMins,RawUsage
+
+lfs quota -g $discoverer_project_id /discofs
+lfs quota -g $discoverer_project_id /disco2fs
+echo "==============================================="
 
 matrix_config=""
 benchmark_config=""

diff --git a/src/feelpp/benchmarking/reframe/config/machineConfigs/hpc.env b/src/feelpp/benchmarking/reframe/config/machineConfigs/hpc.env
@@ -0,0 +1 @@
+discoverer_project_id="ehpc-dev-2024d05-047"