Skip to content

Commit 985e61a

Browse files
author
Vasileios Karakasis
committed
Merge branch 'master' into feat/restart-from-jsonreport
2 parents 259445f + 39aa59a commit 985e61a

File tree

18 files changed

+713
-364
lines changed

18 files changed

+713
-364
lines changed

‎.github/linters/.flake8‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
[flake8]
2+
select = F401

‎.github/workflows/main.yml‎

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -47,24 +47,15 @@ jobs:
4747
run: |
4848
docker run reframe:${{ matrix.modules-version }}
4949
50-
flake8:
51-
if: github.event_name == 'pull_request'
50+
unusedimports:
5251
runs-on: ubuntu-latest
5352
steps:
5453
- uses: actions/checkout@v2
5554
with:
5655
fetch-depth: 0
57-
- name: Changed Python Files
58-
run: |
59-
echo 'CHANGED_PYTHON_FILES<<EOF' >> $GITHUB_ENV
60-
git diff --name-only ${{ github.event.pull_request.base.sha }}..${{ github.sha }} | grep '.py' >> $GITHUB_ENV
61-
echo 'EOF' >> $GITHUB_ENV
62-
- uses: actions/setup-python@v2
63-
with:
64-
python-version: 3.8
65-
- name: Unused Imports Check
66-
run: |
67-
pip install flake8
68-
echo 'Checking Python Files:'
69-
for f in "$CHANGED_PYTHON_FILES"; do echo "$f"; done
70-
flake8 --select F401 $CHANGED_PYTHON_FILES
56+
- name: Lint Code Base
57+
uses: github/super-linter@v3
58+
env:
59+
VALIDATE_ALL_CODEBASE: false
60+
VALIDATE_PYTHON_FLAKE8: true
61+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎config/cscs.py‎

Lines changed: 141 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -267,8 +267,9 @@
267267
'builtin'
268268
],
269269
'access': [
270-
'-Cgpu',
271-
'--reservation=jupyter_gpu'
270+
f'-Cgpu',
271+
f'--reservation=jupyter_gpu',
272+
f'--account={osext.osgroup()}'
272273
],
273274
'descr': 'JupyterHub GPU nodes',
274275
'max_jobs': 10,
@@ -281,8 +282,9 @@
281282
'builtin'
282283
],
283284
'access': [
284-
'-Cmc',
285-
'--reservation=jupyter_mc'
285+
f'-Cmc',
286+
f'--reservation=jupyter_mc',
287+
f'--account={osext.osgroup()}'
286288
],
287289
'descr': 'JupyterHub multicore nodes',
288290
'max_jobs': 10,
@@ -404,8 +406,9 @@
404406
'builtin'
405407
],
406408
'access': [
407-
'-Cgpu',
408-
'--reservation=jupyter_gpu'
409+
f'-Cgpu',
410+
f'--reservation=jupyter_gpu',
411+
f'--account={osext.osgroup()}'
409412
],
410413
'descr': 'JupyterHub GPU nodes',
411414
'max_jobs': 10,
@@ -418,8 +421,9 @@
418421
'builtin'
419422
],
420423
'access': [
421-
'-Cmc',
422-
'--reservation=jupyter_mc'
424+
f'-Cmc',
425+
f'--reservation=jupyter_mc',
426+
f'--account={osext.osgroup()}'
423427
],
424428
'descr': 'JupyterHub multicore nodes',
425429
'max_jobs': 10,
@@ -627,6 +631,108 @@
627631
}
628632
]
629633
},
634+
{
635+
'name': 'pilatus',
636+
'descr': 'Alps Cray EX Supercomputer (TDS)',
637+
'hostnames': [
638+
'pilatus'
639+
],
640+
'modules_system': 'lmod',
641+
'resourcesdir': '/apps/common/UES/reframe/resources',
642+
'partitions': [
643+
{
644+
'name': 'login',
645+
'scheduler': 'local',
646+
'environs': [
647+
'builtin',
648+
'PrgEnv-cray',
649+
'PrgEnv-gnu',
650+
'PrgEnv-aocc'
651+
],
652+
'descr': 'Login nodes',
653+
'max_jobs': 4,
654+
'launcher': 'local'
655+
},
656+
{
657+
'name': 'mc',
658+
'descr': 'Multicore nodes (AMD EPYC 7742, 256|512GB/cn)',
659+
'scheduler': 'slurm',
660+
'environs': [
661+
'builtin',
662+
'PrgEnv-cray',
663+
'PrgEnv-gnu',
664+
'PrgEnv-aocc'
665+
],
666+
'max_jobs': 100,
667+
'resources': [
668+
{
669+
'name': 'switches',
670+
'options': [
671+
'--switches={num_switches}'
672+
]
673+
},
674+
{
675+
'name': 'memory',
676+
'options': [
677+
'--mem={mem_per_node}'
678+
]
679+
},
680+
],
681+
'launcher': 'srun'
682+
},
683+
]
684+
},
685+
{
686+
'name': 'eiger',
687+
'descr': 'Alps Cray EX Supercomputer',
688+
'hostnames': [
689+
'eiger'
690+
],
691+
'modules_system': 'lmod',
692+
'resourcesdir': '/apps/common/UES/reframe/resources',
693+
'partitions': [
694+
{
695+
'name': 'login',
696+
'scheduler': 'local',
697+
'environs': [
698+
'builtin',
699+
'PrgEnv-cray',
700+
'PrgEnv-gnu',
701+
'PrgEnv-aocc'
702+
],
703+
'descr': 'Login nodes',
704+
'max_jobs': 4,
705+
'launcher': 'local'
706+
},
707+
{
708+
'name': 'mc',
709+
'descr': 'Multicore nodes (AMD EPYC 7742, 256|512GB/cn)',
710+
'scheduler': 'slurm',
711+
'environs': [
712+
'builtin',
713+
'PrgEnv-cray',
714+
'PrgEnv-gnu',
715+
'PrgEnv-aocc'
716+
],
717+
'max_jobs': 100,
718+
'resources': [
719+
{
720+
'name': 'switches',
721+
'options': [
722+
'--switches={num_switches}'
723+
]
724+
},
725+
{
726+
'name': 'memory',
727+
'options': [
728+
'--mem={mem_per_node}'
729+
]
730+
},
731+
],
732+
'launcher': 'srun'
733+
},
734+
]
735+
},
630736
{
631737
'name': 'generic',
632738
'descr': 'Generic fallback system',
@@ -773,6 +879,33 @@
773879
'cxx': 'g++',
774880
'ftn': 'gfortran'
775881
},
882+
{
883+
'name': 'PrgEnv-cray',
884+
'target_systems': [
885+
'eiger', 'pilatus'
886+
],
887+
'modules': [
888+
{'name': 'PrgEnv-cray', 'collection': True}
889+
]
890+
},
891+
{
892+
'name': 'PrgEnv-gnu',
893+
'target_systems': [
894+
'eiger', 'pilatus'
895+
],
896+
'modules': [
897+
{'name': 'PrgEnv-gnu', 'collection': True}
898+
]
899+
},
900+
{
901+
'name': 'PrgEnv-aocc',
902+
'target_systems': [
903+
'eiger', 'pilatus'
904+
],
905+
'modules': [
906+
{'name': 'PrgEnv-aocc', 'collection': True}
907+
]
908+
},
776909
{
777910
'name': 'PrgEnv-cray',
778911
'modules': [

0 commit comments

Comments
 (0)