Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion tests/synth/halobench/halobench.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
class HalobenchBuildTest(rfm.RegressionTest):
"""Halobench build test class"""

valid_systems = ["archer2:compute"]
valid_systems = ["archer2:compute", "cirrus-ex:compute"]
valid_prog_environs = ["PrgEnv-cray"]

build_system = "Make"
Expand Down
27 changes: 21 additions & 6 deletions tests/synth/mpi_osu/osu_benchmarks.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,17 @@ class OSUDownload(rfm.RunOnlyRegressionTest):
"""Download test"""

descr = "OSU benchmarks download sources"
valid_systems = ["archer2:login", "cirrus:login", "cirrus-ex:login"]
valid_prog_environs = [
"PrgEnv-gnu",
"PrgEnv-cray",
"PrgEnv-aocc",
"PrgEnv-intel",
"gcc",
"intel",
]
executable = "wget"
executable_opts = ["http://mvapich.cse.ohio-state.edu/download/mvapich/osu-micro-benchmarks-5.6.2.tar.gz"]
executable_opts = ["http://mvapich.cse.ohio-state.edu/download/mvapich/osu-micro-benchmarks-7.5.1.tar.gz"]
local = True

@sanity_function
Expand All @@ -38,11 +40,12 @@ class OSUBuild(rfm.CompileOnlyRegressionTest):
"""Build Test"""

descr = "OSU benchmarks build test (currently fails with Cray)"
valid_systems = ["archer2:compute", "cirrus:compute"]
valid_systems = ["archer2:compute", "cirrus:compute", "cirrus-ex:compute"]
valid_prog_environs = [
"PrgEnv-gnu",
"PrgEnv-cray",
"PrgEnv-aocc",
"PrgEnv-intel",
"gcc",
"intel",
]
Expand All @@ -54,7 +57,7 @@ class OSUBuild(rfm.CompileOnlyRegressionTest):
@run_before("compile")
def set_build_system_attrs(self):
"""setup concurrency"""
tarball = "osu-micro-benchmarks-5.6.2.tar.gz"
tarball = "osu-micro-benchmarks-7.5.1.tar.gz"
self.build_prefix = tarball[:-7]
fullpath = os.path.join(self.osu_benchmarks.stagedir, tarball)
self.prebuild_cmds += [
Expand All @@ -73,11 +76,12 @@ def validate_build(self):
class OSUBenchmarkTestBase(rfm.RunOnlyRegressionTest):
"""Base class of OSU benchmarks runtime tests"""

valid_systems = ["archer2:compute", "cirrus:compute"]
valid_systems = ["archer2:compute", "cirrus:compute", "cirrus-ex:compute"]
valid_prog_environs = [
"PrgEnv-gnu",
"PrgEnv-cray",
"PrgEnv-aocc",
"PrgEnv-intel",
"gcc",
"intel",
]
Expand Down Expand Up @@ -105,8 +109,10 @@ def set_executable(self):
self.executable = os.path.join(
self.osu_binaries.stagedir,
self.osu_binaries.build_prefix,
"c",
"mpi",
"pt2pt",
"standard",
"osu_latency",
)
self.executable_opts = ["-x", "100", "-i", "1000"]
Expand All @@ -130,8 +136,10 @@ def set_executable(self):
self.executable = os.path.join(
self.osu_binaries.stagedir,
self.osu_binaries.build_prefix,
"c",
"mpi",
"pt2pt",
"standard",
"osu_bw",
)
self.executable_opts = ["-x", "100", "-i", "1000"]
Expand Down Expand Up @@ -159,9 +167,16 @@ def set_num_tasks(self):
def set_executable(self):
"""Setup executable"""
self.executable = os.path.join(
self.osu_binaries.stagedir, self.osu_binaries.build_prefix, "mpi", "collective", "osu_allreduce"
self.osu_binaries.stagedir,
self.osu_binaries.build_prefix,
"c",
"mpi",
"collective",
"blocking",
"osu_allreduce",
)
self.executable_opts = ["-m", "8", "-x", "1000", "-i", "20000"]
# "-m 4:8" is needed as OSU seems to segfault in some cases with "-m 8"
self.executable_opts = ["-m", "4:8", "-x", "1000", "-i", "20000"]

@performance_function("us")
def latency(self):
Expand Down