Skip to content

[test] Fail if test is not compiled with OpenACC #615

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Dec 13, 2018
Merged

[test] Fail if test is not compiled with OpenACC #615

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
111e03b
Fail if test is not compiled with OpenACC
lxavier Nov 29, 2018
3dd6203
all changes automatic_arrays
ajocksch Dec 4, 2018
26f26ec
Merge branch 'master' into patch-2
Dec 13, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 2 additions & 9 deletions cscs-checks/mch/automatic_arrays.py → cscs-checks/mch/automatic_arrays_acc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ def __init__(self):
super().__init__()
self.valid_systems = ['daint:gpu', 'dom:gpu', 'kesch:cn']
self.valid_prog_environs = ['PrgEnv-cray', 'PrgEnv-pgi',
'PrgEnv-gnu', 'PrgEnv-cray-c2sm-gpu',
'PrgEnv-cray-c2sm-gpu',
'PrgEnv-pgi-c2sm-gpu']
if self.current_system.name in ['daint', 'dom']:
self.modules = ['craype-accel-nvidia60']
Expand All @@ -23,7 +23,7 @@ def __init__(self):
self.num_tasks = 1
self.num_gpus_per_node = 1
self.num_tasks_per_node = 1
self.sourcepath = 'automatic_arrays.f90'
self.sourcepath = 'automatic_arrays_OpenACC.F90'
self.build_system = 'SingleSource'
self.build_system.fflags = ['-O2']
self.sanity_patterns = sn.assert_found(r'Result: ', self.stdout)
Expand All @@ -38,11 +38,6 @@ def __init__(self):
'dom:gpu': {'time': (5.8E-05, None, 0.15)},
'kesch:cn': {'time': (2.9E-04, None, 0.15)},
},
'PrgEnv-gnu': {
'daint:gpu': {'time': (7.0E-03, None, 0.15)},
'dom:gpu': {'time': (7.3E-03, None, 0.15)},
'kesch:cn': {'time': (6.5E-03, None, 0.15)},
},
'PrgEnv-pgi': {
'daint:gpu': {'time': (6.4E-05, None, 0.15)},
'dom:gpu': {'time': (6.3E-05, None, 0.15)},
Expand All @@ -64,8 +59,6 @@ def setup(self, partition, environ, **job_opts):
self.build_system.fflags += ['-ta=tesla,cc35,cuda8.0']
elif self.current_system.name in ['daint', 'dom']:
self.build_system.fflags += ['-ta=tesla,cc60', '-Mnorpath']
elif environ.name.startswith('PrgEnv-gnu'):
envname = 'PrgEnv-gnu'
else:
envname = environ.name

Expand Down
6 changes: 6 additions & 0 deletions cscs-checks/mch/src/automatic_arrays.f90 → ...ecks/mch/src/automatic_arrays_OpenACC.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,6 +357,12 @@ program AutomaticArrays
call MPI_Comm_size(MPI_COMM_WORLD, mpi_size, ierr)
call MPI_Comm_rank(MPI_COMM_WORLD, mpi_rank, ierr)

#ifndef _OPENACC
write (*,'(A)') "Error: this test must be compield with OpenACC on"
write (*,'(A)') "Result: FAIL"
CALL MPI_Abort(MPI_COMM_WORLD, ierr)
#endif

!----------------------------------------------------------------------------!
! CPU reference with work arrays

Expand Down