Skip to content
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.

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

Add CP2K regression tests to the test suite #5

Open
wants to merge 20 commits into
base: develop
Choose a base branch
from
Open
Changes from 3 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
11 changes: 6 additions & 5 deletions cfg.py
Original file line number Diff line number Diff line change
@@ -42,7 +42,8 @@
ROCM_PATH = None

# None/offload target
build_for_target = None
build_for_gfx_target = None
build_for_cuda_target = "compute_70"

# -I.
# None/List of paths
@@ -107,11 +108,11 @@
"quicksilver": {
"repo_url": "https://github.com/LLNL/Quicksilver.git",
"branch": "AMD-HIP",
"commit_id": "bf073887bf73ef34de8025adaba51c6ad7fb15be"
"commit_id": "3eddfc36003de27ee404499923b18e04efef8dad"
},
"gridtools": {
"repo_url": "https://github.com/GridTools/gridtools.git",
"branch": None,
"branch": "v1.1.3",
"commit_id": "d33fa6fecee0a7bd9e080212c1038f0dbd31fe97"
},
"gtbench": {
@@ -126,8 +127,8 @@
},
"mfem": {
"repo_url": "https://github.com/mfem/mfem.git ./mfem",
"branch": None,
"commit_id": "a3f0a5bb7ca874ec260d6f85afa3693cd6542497"
"branch": "amd",
"commit_id": "1ded8554ea470e2018284a881594b888b938ed0b"
},
"Laghos": {
"repo_url": "https://github.com/CEED/Laghos.git",
8 changes: 5 additions & 3 deletions src/hiptestsuite/Test.py
Original file line number Diff line number Diff line change
@@ -85,7 +85,8 @@ def loadConfig(self):
class CompileData(AMDObject):
def __init__(self):
AMDObject.__init__(self)
self.build_for_target: Union[None, Set[Target]] = None
self.build_for_gfx_target: Union[None, Set[Target]] = None
self.build_for_cuda_target: Union[None, Set[Target]] = None


class GitData(AMDObject):
@@ -145,7 +146,7 @@ def __init__(self):
self.CUDA_PATH: Union[None, str] = None
self.ROCM_PATH: Union[None, str] = None

# if self.build_for_target, then --offload_arch=
# if self.build_for_gfx_target, then --offload_arch=

# -I ./
self.includes_path: Union[None, List[str]] = None
@@ -193,7 +194,8 @@ def loadConfig(self):
self.ROCM_PATH = self.config.ROCM_PATH
self.CUDA_PATH = self.config.CUDA_PATH

self.build_for_target = self.config.build_for_target
self.build_for_gfx_target = self.config.build_for_gfx_target
self.build_for_cuda_target = self.config.build_for_cuda_target
self.includes_path = self.config.includes_path
self.link_libs = self.config.link_libs
self.link_libs_path = self.config.link_libs_path
Original file line number Diff line number Diff line change
@@ -19,7 +19,8 @@
# THE SOFTWARE.

import os
from hiptestsuite.common.hip_shell import execshellcmd
import tempfile
from hiptestsuite.common.hip_shell import *
from hiptestsuite.applications.cuda_grep.cuda_grep_parser_common import CudaGrepParser

class BuildRunAmd():
@@ -52,7 +53,10 @@ def buildtest(self):
def runtest(self):
print("Running cuda_grep..")
cmdexc = "cd " + self.runpath + ";" + "./runtests.sh;"
execshellcmd(cmdexc, self.logFile, None)
envtoset = os.environ.copy()
runlogdump = tempfile.TemporaryFile("w+")
execshellcmd_largedump(cmdexc, self.logFile, runlogdump, envtoset)
runlogdump.close()

def clean(self):
print("Cleaning cuda_grep..")
Original file line number Diff line number Diff line change
@@ -19,7 +19,8 @@
# THE SOFTWARE.

import os
from hiptestsuite.common.hip_shell import execshellcmd
import tempfile
from hiptestsuite.common.hip_shell import *
from hiptestsuite.applications.cuda_grep.cuda_grep_parser_common import CudaGrepParser

class BuildRunNvidia():
@@ -61,7 +62,10 @@ def runtest(self):
print("Running cuda_grep..")
env = self.getenvironmentvariables()
cmdexc = "cd " + self.runpath + ";" + "./runtests.sh;"
execshellcmd(cmdexc, self.logFile, env)
runlogdump = tempfile.TemporaryFile("w+")
execshellcmd_largedump(cmdexc, self.logFile, runlogdump, env)
runlogdump.close()


def clean(self):
print("Cleaning cuda_grep..")
Loading