Merge branch 'master' into update-alloc_speed

Author: Vasileios Karakasis

.github/workflows/main.yml

@@ -9,9 +9,9 @@ jobs:
       matrix:
         python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v3
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies
@@ -36,9 +36,9 @@ jobs:
   unittest-macos:
     runs-on: macos-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up Python 3.9
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v3
       with:
         python-version: 3.9
     - name: Install dependencies
@@ -54,7 +54,7 @@ jobs:
       matrix:
         modules-version: [Lmod, Lmod77, Tmod32, Tmod4]
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Build Image for ${{ matrix.modules-version }}
       run: |
         docker build -f ci-scripts/dockerfiles/${{ matrix.modules-version }}.dockerfile -t reframe:${{ matrix.modules-version }} .
@@ -65,7 +65,7 @@ jobs:
   tutorialtest:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Build Image for Tutorial Tests
       run: |
         docker build -f ci-scripts/dockerfiles/tutorials.dockerfile -t reframe:tutorials .
@@ -76,7 +76,7 @@ jobs:
   unusedimports:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
       with:
         fetch-depth: 0
     - name: Lint Code Base
@@ -89,9 +89,9 @@ jobs:
   wheelvalidation:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Setup up Python 3.8
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v3
         with:
           python-version: 3.8
       - name: Generate Wheel
@@ -109,9 +109,9 @@ jobs:
   docvalidation:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Setup up Python 3.8
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v3
         with:
           python-version: 3.8
       - name: Install Doc Requirements

.github/workflows/publish.yml

@@ -8,9 +8,9 @@ jobs:
   publish:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Setup up Python 3.8
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v3
         with:
           python-version: 3.8
       - name: Generate dist packages

cscs-checks/apps/lammps/lammps_check.py

@@ -11,9 +11,8 @@
 
 class LAMMPSCheck(rfm.RunOnlyRegressionTest):
     scale = parameter(['small', 'large'])
-    variant = parameter(['maint', 'prod'])
     modules = ['cray-python', 'LAMMPS']
-    tags = {'scs', 'external-resources'}
+    tags = {'external-resources', 'maintenance', 'production'}
     maintainers = ['LM']
     strict_check = False
     extra_resources = {
@@ -78,14 +77,13 @@ def setup_by_scale(self):
             self.num_tasks = 32
             self.num_tasks_per_node = 2
 
-        self.reference = self.references_by_variant[self.variant][self.scale]
-        self.tags |= {'maintenance', 'production'}
+        self.reference = self.refs_by_scale[self.scale]
 
 
 @rfm.simple_test
 class LAMMPSCPUCheck(LAMMPSCheck):
     valid_systems = ['daint:mc', 'eiger:mc', 'pilatus:mc']
-    res_by_scale = {
+    refs_by_scale = {
         'small': {
             'dom:mc': {'perf': (4394, -0.05, None, 'timesteps/s')},
             'daint:mc': {'perf': (3350, -0.30, None, 'timesteps/s')},
@@ -121,5 +119,4 @@ def setup_by_scale(self):
             self.num_tasks_per_node = 128
             self.num_tasks = 256 if self.scale == 'small' else 512
 
-        self.reference = self.references_by_variant[self.variant][self.scale]
-        self.tags |= {'maintenance', 'production'}
+        self.reference = self.refs_by_scale[self.scale]

docs/dependencies.rst

@@ -24,7 +24,8 @@ This can be expressed inside :class:`T1` using the :func:`depends_on` method:
        valid_systems = ['P0', 'P1']
        valid_prog_environs = ['E0', 'E1']
 
-       def __init__(self):
+       @run_after('init')
+       def setup_deps(self):
            self.depends_on('T0')
 
 Conceptually, this dependency can be viewed at the test level as follows:
@@ -58,8 +59,9 @@ You can achieve this as follows:
 
    @rfm.simple_test
    class T1(rfm.RegressionTest):
-       def __init__(self):
-           ...
+       ...
+       @run_after('init')
+       def setup_deps(self):
            self.depends_on('T0', how=udeps.fully)
 
 
@@ -154,8 +156,9 @@ The following code will create dependencies only if the source partition is ``P0
 
    @rfm.simple_test
    class T1(rfm.RegressionTest):
-       def __init__(self):
-           ...
+       ...
+       @run_after('init')
+       def setup_deps(self):
            self.depends_on('T0', how=myway)