Skip to content

[test] Sort cores list in affinity test before comparing #739

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
Apr 6, 2019
Merged

[test] Sort cores list in affinity test before comparing #739

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4b7e3fc
sorted compare of cores list
sekelle Apr 5, 2019
0e33e7a
Address PR comments
Apr 5, 2019
9d4213f
Merge branch 'master' into checks/affinity
vkarak Apr 6, 2019
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
7 changes: 4 additions & 3 deletions cscs-checks/prgenv/affinity_check.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ def __init__(self, variant):
'dom:gpu', 'dom:mc']
self.valid_prog_environs = ['PrgEnv-gnu']
self.build_system = 'Make'
self.build_system.options = ['--directory=affinity', 'MPI=1']
self.build_system.options = ['-C affinity', 'MPI=1']
# The github URL can not be specifid as `self.sourcedir` as that
# would prevent the src folder from being copied to stage which is
# necessary since these tests need files from it.
self.prebuild_cmd = ['git clone https://github.com/vkarak/affinity']
self.executable = 'affinity/affinity'
self.executable = './affinity/affinity'
self.variant = variant
self.maintainers = ['RS', 'VK']
self.tags = {'production', 'scs', 'maintenance'}
Expand Down Expand Up @@ -50,7 +50,8 @@ def parse_cpus(x):
self.sanity_patterns = sn.all([
sn.assert_eq(self.aff_thrds, self.ref_thrds),
sn.assert_eq(self.aff_ranks, self.ref_ranks),
sn.assert_eq(self.aff_cores, self.ref_cores)])
sn.assert_eq(sn.sorted(self.aff_cores), sn.sorted(self.ref_cores))
])

super().setup(partition, environ, **job_opts)

Expand Down