Merge pull request ukri-excalibur#311 from gokmenkilic/gk/cosma-spack…

…-env Cosma8 Update Configurations and Spack Environments
gokmenkilic · May 23, 2024 · 5db9612 · 5db9612
2 parents 7bbe54a + 049a580
commit 5db9612
Show file tree

Hide file tree

Showing 5 changed files with 81 additions and 12 deletions.
diff --git a/benchmarks/apps/grid/grid.py b/benchmarks/apps/grid/grid.py
@@ -36,7 +36,7 @@ class GridBenchmark_ITT(GridBenchmark):
 
     reference = {
         'cosma8': {
-            'Performance': (425000, None, None, 'Mflop/s per node')
+            'Performance': (625000, None, None, 'Mflop/s per node')
         },
         'csd3-centos7:cascadelake': {
             'Performance': (350000, None, None, 'Mflop/s per node')

diff --git a/benchmarks/apps/swift/swift.py b/benchmarks/apps/swift/swift.py
@@ -21,7 +21,7 @@ class SwiftBenchmark(SpackTest):
     time_limit = '20m'
     reference = {
         'cosma8': {
-            'duration': (50, None, 0.2, 'seconds'),
+            'duration': (40, None, 0.2, 'seconds'),
         },
         'csd3-centos7:cascadelake': {
             'duration': (37, None, 0.2, 'seconds'),

diff --git a/benchmarks/examples/sombrero/sombrero.py b/benchmarks/examples/sombrero/sombrero.py
@@ -67,7 +67,7 @@ class SombreroBenchmark(SpackTest):
             'flops': (1.2, None, None, 'Gflops/seconds'),
         },
         'cosma8': {
-            'flops': (3.8, -0.2, None, 'Gflops/seconds'),
+            'flops': (8.0, -0.2, None, 'Gflops/seconds'),
         },
         'csd3-centos7:cascadelake': {
             'flops': (8.0, -0.2, None, 'Gflops/seconds'),

diff --git a/benchmarks/spack/cosma8/compute-node/spack.yaml b/benchmarks/spack/cosma8/compute-node/spack.yaml
@@ -138,6 +138,38 @@ spack:
       modules: []
       environment: {}
       extra_rpaths: []
+  - compiler:
+      spec: [email protected]
+      paths:
+        cc: /cosma/local/aocc/aocc-compiler-3.1.0/bin/clang
+        cxx: /cosma/local/aocc/aocc-compiler-3.1.0/bin/clang++
+        f77: /cosma/local/aocc/aocc-compiler-3.1.0/bin/flang
+        fc: /cosma/local/aocc/aocc-compiler-3.1.0/bin/flang
+      flags:
+        cflags: -Wno-unused-command-line-argument -mllvm -eliminate-similar-expr=false
+        cxxflags: -Wno-unused-command-line-argument -mllvm -eliminate-similar-expr=false
+        fflags: -Wno-unused-command-line-argument -mllvm -eliminate-similar-expr=false
+      operating_system: centos7
+      target: x86_64
+      modules: []
+      environment: {}
+      extra_rpaths: []    
+  - compiler:
+      spec: [email protected]
+      paths:
+        cc: /cosma/local/aocc/aocc-compiler-4.0.0/bin/clang
+        cxx: /cosma/local/aocc/aocc-compiler-4.0.0/bin/clang++
+        f77: /cosma/local/aocc/aocc-compiler-4.0.0/bin/flang
+        fc: /cosma/local/aocc/aocc-compiler-4.0.0/bin/flang
+      flags:
+        cflags: -Wno-unused-command-line-argument -mllvm -eliminate-similar-expr=false
+        cxxflags: -Wno-unused-command-line-argument -mllvm -eliminate-similar-expr=false
+        fflags: -Wno-unused-command-line-argument -mllvm -eliminate-similar-expr=false
+      operating_system: centos7
+      target: x86_64
+      modules: []
+      environment: {}
+      extra_rpaths: []        
   - compiler:
       spec: [email protected]
       paths:
@@ -216,6 +248,19 @@ spack:
       modules: []
       environment: {}
       extra_rpaths: []
+  - compiler:
+      spec: [email protected]
+      paths:
+        cc: /cosma/local/gcc/13.1.0/bin/gcc
+        cxx: /cosma/local/gcc/13.1.0/bin/g++
+        f77: /cosma/local/gcc/13.1.0/bin/gfortran
+        fc: /cosma/local/gcc/13.1.0/bin/gfortran
+      flags: {}
+      operating_system: centos7
+      target: x86_64
+      modules: []
+      environment: {}
+      extra_rpaths: []    
   - compiler:
       spec: [email protected]
       paths:
@@ -413,6 +458,8 @@ spack:
       externals:
       - spec: [email protected]
         prefix: /usr
+      - spec: [email protected]
+        prefix: /cosma/local/autoconf/2.71/ 
     automake:
       externals:
       - spec: [email protected]
@@ -421,6 +468,8 @@ spack:
       externals:
       - spec: [email protected]
         prefix: /usr
+      - spec: [email protected]
+        prefix: /cosma/local/bash/5.2.21/
     boost:
       externals:
       - spec: [email protected]%[email protected] arch=linux-centos7-zen2
@@ -437,14 +486,22 @@ spack:
         prefix: /cosma/local/cmake/3.11.4/
       - spec: [email protected]
         prefix: /cosma/local/cmake/3.18.1/
+      - spec: [email protected]
+        prefix: /cosma/local/cmake/3.25.1/
+      - spec: [email protected].
+        prefix: /cosma/local/cmake/3.28.3/    
     cpio:
       externals:
       - spec: [email protected]
         prefix: /usr
     cuda:
       externals:
-      - spec: [email protected].243
+      - spec: [email protected]
         prefix: /cosma/local/cuda/10.1
+      - spec: [email protected]
+        prefix: /cosma/local/cuda/11.0
+      - spec: [email protected]
+        prefix: /cosma/local/cuda/11.2
     diffutils:
       externals:
       - spec: [email protected]
@@ -551,7 +608,7 @@ spack:
         prefix: /usr
     libtool:
       externals:
-      - spec: [email protected]
+      - spec: [email protected].2
         prefix: /usr
     lustre:
       externals:
@@ -603,7 +660,7 @@ spack:
       - spec: [email protected]~cuda+cxx+cxx_exceptions~java+lustre~memchecker+pmi~sqlite3+static~thread_multiple~wrapper-rpath%[email protected]
           fabrics=ucx schedulers=slurm
         prefix: /cosma/local/openmpi/aocc_2.2.0/4.0.5
-      - spec: [email protected].0a1~cuda~cxx~cxx_exceptions~java~memchecker+pmi~sqlite3~static~thread_multiple~wrapper-rpath%[email protected]
+      - spec: [email protected].1~cuda~cxx~cxx_exceptions~java~memchecker+pmi~sqlite3~static~thread_multiple~wrapper-rpath%[email protected]
           fabrics=ucx schedulers=slurm
         prefix: /cosma/local/openmpi/gnu_7.3.0/20190429
       - spec: [email protected]~cuda+cxx+cxx_exceptions~java+lustre~memchecker+pmi~sqlite3+static~thread_multiple~wrapper-rpath%[email protected]
@@ -612,6 +669,18 @@ spack:
       - spec: [email protected]~cuda+cxx+cxx_exceptions~java+lustre~memchecker+pmi~sqlite3+static~thread_multiple~wrapper-rpath%[email protected]
           schedulers=slurm
         prefix: /cosma/local/openmpi/gnu_11.1.0/4.1.1.no-ucx
+      - spec: [email protected]~cuda+cxx+cxx_exceptions~java+lustre~memchecker+pmi~sqlite3+static~thread_multiple~wrapper-rpath%[email protected]
+          schedulers=slurm
+        prefix: /cosma/local/openmpi/gnu_13.1.0/4.1.4
+      - spec: [email protected]~cuda+cxx+cxx_exceptions~java+lustre~memchecker+pmi~sqlite3+static~thread_multiple~wrapper-rpath%[email protected]
+          schedulers=slurm
+        prefix: /cosma/local/openmpi/gnu_13.1.0/4.1.4    
+      - spec: [email protected]~cuda+cxx+cxx_exceptions~java+lustre~memchecker+pmi~sqlite3+static~thread_multiple~wrapper-rpath%[email protected]
+          schedulers=slurm
+        prefix: /cosma/local/openmpi/gnu_13.1.0/4.1.5    
+      - spec: [email protected]~cuda+cxx+cxx_exceptions~java+lustre~memchecker+pmi~sqlite3+static~thread_multiple~wrapper-rpath%[email protected]
+          schedulers=slurm
+        prefix: /cosma/local/openmpi/gnu_14.1.0/4.1.5   
     openssh:
       externals:
       - spec: [email protected]

diff --git a/docs/systems.md b/docs/systems.md
@@ -65,21 +65,21 @@ When submitting jobs to compute nodes, you need to specify the job queue, with t
 To do this, when you run a benchmark you can use the `-J`/`--job-option` flag to `reframe` to specify the account, for example:
 
 ```
-reframe -c benchmarks/examples/sombrero -r --performance-report --system csd3-skylake:compute-node -J'--accout=<ACCOUNT>'
+reframe -c benchmarks/examples/sombrero -r --performance-report --system csd3-skylake:compute-node -J'--account=<ACCOUNT>'
 ```
 
 where `<ACCOUNT>` is the project you want to charge.
 You can see the account balance of your projects with the `mybalance` command.
 
-## Cosma
+## Cosma8
 
 ### Queue options
 
 When submitting jobs to compute nodes, you need to specify the job queue, with the `--account` option to the scheduler.
 To do this, when you run a benchmark you can use the `-J`/`--job-option` flag to `reframe` to specify the account, for example:
 
 ```
-reframe -c benchmarks/examples/sombrero -r --performance-report --system cosma8:compute-node -J'--accout=<ACCOUNT>'
+reframe -c benchmarks/examples/sombrero -r --performance-report --system cosma8:compute-node -J'--account=<ACCOUNT>'
 ```
 
 where `<ACCOUNT>` is the project you want to charge. DiRAC users can find the account codes
@@ -93,7 +93,7 @@ When submitting jobs to compute nodes, you need to specify the job queue, with t
 To do this, when you run a benchmark you can use the `-J`/`--job-option` flag to `reframe` to specify the account, for example:
 
 ```
-reframe -c benchmarks/examples/sombrero -r --performance-report --system dial2:compute-node -J'--accout=<ACCOUNT>'
+reframe -c benchmarks/examples/sombrero -r --performance-report --system dial2:compute-node -J'--account=<ACCOUNT>'
 ```
 
 where `<ACCOUNT>` is the project you want to charge.
@@ -108,7 +108,7 @@ When submitting jobs to compute nodes, you need to specify the job queue, with t
 To do this, when you run a benchmark you can use the `-J`/`--job-option` flag to `reframe` to specify the account, for example:
 
 ```
-reframe -c benchmarks/examples/sombrero -r --performance-report --system dial3:compute-node -J'--accout=<ACCOUNT>'
+reframe -c benchmarks/examples/sombrero -r --performance-report --system dial3:compute-node -J'--account=<ACCOUNT>'
 ```
 
 where `<ACCOUNT>` is the project you want to charge.
@@ -165,7 +165,7 @@ When submitting jobs to compute nodes, you need to specify the job queue, with t
 To do this, when you run a benchmark you can use the `-J`/`--job-option` flag to `reframe` to specify the account, for example:
 
 ```
-reframe -c benchmarks/examples/sombrero -r --performance-report --system tursa:compute-node -J'--accout=<ACCOUNT>'
+reframe -c benchmarks/examples/sombrero -r --performance-report --system tursa:compute-node -J'--account=<ACCOUNT>'
 ```
 
 where `<ACCOUNT>` is the project you want to charge.