Skip to content

Commit 039f40c

Browse files
authored
Merge branch 'master' into fix-qe
2 parents 2c6dc9b + 52a313e commit 039f40c

File tree

124 files changed

+1494
-616
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

124 files changed

+1494
-616
lines changed

bootstrap.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,10 @@ if $python -c 'import sys; sys.exit(sys.version_info[:2] >= (3, 6))'; then
6969
exit 1
7070
fi
7171

72+
# Disable the user installation scheme which is the default for Debian and
73+
# cannot be combined with `--target`
74+
export PIP_USER=0
75+
7276
# Check if ensurepip is installed
7377
$python -m ensurepip --version &> /dev/null
7478
epip=$?

config/cscs.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -767,6 +767,7 @@
767767
'cpeIntel'
768768
],
769769
'max_jobs': 100,
770+
'access': ['-Cmc', f'--account={osext.osgroup()}'],
770771
'resources': [
771772
{
772773
'name': 'switches',

cscs-checks/apps/amber/amber_check.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,8 @@ def __init__(self, variant, arch, scale):
6767
'perf': (30.0, -0.05, None, 'ns/day')
6868
},
6969
}
70+
if variant == 'prod' and scale == 'small':
71+
self.tags.add('health')
7072
elif arch == 'CPU':
7173
self.valid_systems = ['daint:mc']
7274
if scale == 'small':

cscs-checks/apps/cp2k/cp2k_check.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,11 +123,11 @@ def __init__(self, scale, variant):
123123
self.reference = references[variant][scale]
124124
self.tags |= {'maintenance' if variant == 'maint' else 'production'}
125125

126-
@rfm.run_before('run')
126+
@run_before('run')
127127
def set_task_distribution(self):
128128
self.job.options = ['--distribution=block:block']
129129

130-
@rfm.run_before('run')
130+
@run_before('run')
131131
def set_cpu_binding(self):
132132
self.job.launcher.options = ['--cpu-bind=cores']
133133

cscs-checks/apps/greasy/greasy_check.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,13 +90,13 @@ def __init__(self, variant, partition, num_greasy_tasks, nworkes_per_node,
9090
self.maintainers = ['VH', 'SK']
9191
self.tags = {'production'}
9292

93-
@rfm.run_before('run')
93+
@run_before('run')
9494
def generate_tasks_file(self):
9595
with open(os.path.join(self.stagedir, self.tasks_file), 'w') as fp:
9696
for i in range(self.num_greasy_tasks):
9797
fp.write(f'./{self.executable} output-{i}\n')
9898

99-
@rfm.run_before('run')
99+
@run_before('run')
100100
def daint_dom_gpu_specific_workaround(self):
101101
if self.current_partition.fullname in ['daint:gpu', 'dom:gpu']:
102102
self.variables['CRAY_CUDA_MPS'] = '1'
@@ -121,13 +121,13 @@ def daint_dom_gpu_specific_workaround(self):
121121
}
122122
}
123123

124-
@rfm.run_before('run')
124+
@run_before('run')
125125
def change_executable_name(self):
126126
# After compiling the code we can change the executable to be
127127
# the greasy one
128128
self.executable = 'greasy'
129129

130-
@rfm.run_before('run')
130+
@run_before('run')
131131
def set_launcher(self):
132132
# The job launcher has to be changed to local since greasy
133133
# make calls to srun

cscs-checks/apps/jupyter/check_ipcmagic.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ def __init__(self):
5858
self.maintainers = ['RS', 'TR']
5959
self.tags = {'production'}
6060

61-
@rfm.run_before('run')
61+
@run_before('run')
6262
def prepare_run(self):
6363
# Change the job launcher since `ipython`
6464
# needs to be launched without `srun`.

cscs-checks/apps/paraview/paraview_check.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ def __init__(self):
2626
self.maintainers = ['JF', 'TM']
2727
self.tags = {'scs', 'production'}
2828

29-
@rfm.run_before('sanity')
29+
@run_before('sanity')
3030
def set_sanity(self):
3131
if self.current_partition.name == 'mc':
3232
self.sanity_patterns = sn.all([

cscs-checks/apps/quantumespresso/quantumespresso_check.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,11 +123,11 @@ def __init__(self):
123123
'maintenance' if self.variant == 'maint' else 'production'
124124
}
125125

126-
@rfm.run_before('run')
126+
@run_before('run')
127127
def set_task_distribution(self):
128128
self.job.options = ['--distribution=block:block']
129129

130-
@rfm.run_before('run')
130+
@run_before('run')
131131
def set_cpu_binding(self):
132132
self.job.launcher.options = ['--cpu-bind=cores']
133133

cscs-checks/apps/spark/spark_check.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ def __init__(self):
3030
self.maintainers = ['TM', 'RS']
3131
self.tags = {'production'}
3232

33-
@rfm.run_before('run')
33+
@run_before('run')
3434
def prepare_run(self):
3535
if self.current_partition.fullname in ['daint:gpu', 'dom:gpu']:
3636
num_workers = 12

cscs-checks/apps/vasp/vasp_check.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,11 +82,11 @@ def __init__(self, variant):
8282
self.reference = references[variant]
8383
self.tags |= {'maintenance' if variant == 'maint' else 'production'}
8484

85-
@rfm.run_before('run')
85+
@run_before('run')
8686
def set_task_distribution(self):
8787
self.job.options = ['--distribution=block:block']
8888

89-
@rfm.run_before('run')
89+
@run_before('run')
9090
def set_cpu_binding(self):
9191
self.job.launcher.options = ['--cpu-bind=cores']
9292

0 commit comments

Comments
 (0)