From 8c4f6857bd24a951c1993ef1253813f6545869e0 Mon Sep 17 00:00:00 2001 From: Rupam Chetia Date: Mon, 4 Oct 2021 19:09:54 +0530 Subject: [PATCH] Changes and bug fixes 1. Changed testsuite to hiptesuite 2. Update messages during clone 3. Take make target for samples and use target for hipInfo 4. Fixed wrong string output in Kokkos 5. Removed openmpi cloning and building for laghos. Change-Id: I462d1c288dd2e39a572544eb6feeeac87b2e3420 --- cfg.py | 5 - run.py | 4 +- src/{testsuite => hiptestsuite}/AMD.py | 0 src/{testsuite => hiptestsuite}/Test.py | 10 +- .../TesterRepository.py | 14 +-- .../TestersExecutor.py | 8 +- src/{testsuite => hiptestsuite}/__init__.py | 0 .../applications/__init__.py | 0 .../application_test_classifier.py | 2 +- .../applications/cuda_grep/__init__.py | 0 .../applications/cuda_grep/cuda_grep.py | 16 +-- .../cuda_grep/cuda_grep_build_amd.py | 4 +- .../cuda_grep/cuda_grep_build_nvidia.py | 4 +- .../cuda_grep/cuda_grep_parser_common.py | 2 +- .../applications/cuda_memtest/__init__.py | 0 .../applications/cuda_memtest/cuda_memtest.py | 16 +-- .../cuda_memtest/cuda_memtest_build_amd.py | 4 +- .../cuda_memtest/cuda_memtest_build_nvidia.py | 4 +- .../cuda_memtest_parser_common.py | 2 +- .../cuda_memtest/cuda_memtest_patch | 0 .../applications/hip_examples/__init__.py | 0 .../applications/hip_examples/hip_examples.py | 16 +-- .../hip_examples/hip_examples_build_amd.py | 6 +- .../hip_examples/hip_examples_build_common.py | 4 +- .../hip_examples/hip_examples_build_nvidia.py | 8 +- .../hip_examples/hip_examples_parser.py | 0 .../hip_samples/Samples_Patch_4.2.x | 0 .../applications/hip_samples/__init__.py | 0 .../applications/hip_samples/hip_samples.py | 22 ++-- .../hip_samples/hip_samples_build_amd.py | 8 +- .../hip_samples/hip_samples_build_common.py | 9 +- .../hip_samples/hip_samples_build_nvidia.py | 10 +- .../applications/hpc_apps/__init__.py | 0 .../hpc_apps/gridtools/__init__.py | 0 .../hpc_apps/gridtools/gridtools.py | 22 ++-- .../hpc_apps/gridtools/gridtools_build_amd.py | 6 +- .../gridtools/gridtools_parser_common.py | 2 +- .../hpc_apps/gridtools/gtbench.patch | 0 .../applications/hpc_apps/kokkos/__init__.py | 0 .../applications/hpc_apps/kokkos/kokkos.py | 14 +-- .../hpc_apps/kokkos/kokkos_build_amd.py | 8 +- .../hpc_apps/kokkos/kokkos_parser_common.py | 2 +- .../applications/hpc_apps/laghos/__init__.py | 0 .../applications/hpc_apps/laghos/laghos.py | 38 ++----- .../hpc_apps/laghos/laghos_build_amd.py | 99 +++--------------- .../hpc_apps/laghos/laghos_parser_common.py | 2 +- .../hpc_apps/quicksilver/__init__.py | 0 .../hpc_apps/quicksilver/quicksilver.py | 14 +-- .../quicksilver/quicksilver_build_amd.py | 4 +- .../quicksilver/quicksilver_diff_patch | 0 .../quicksilver/quicksilver_parser_common.py | 2 +- .../keccaktreegpu/KeccakTreeGpu/KeccakF.c | 0 .../keccaktreegpu/KeccakTreeGpu/KeccakF.h | 0 .../keccaktreegpu/KeccakTreeGpu/KeccakTree.h | 0 .../KeccakTreeGpu/KeccakTreeCPU.c | 0 .../KeccakTreeGpu/KeccakTreeCPU.h | 0 .../KeccakTreeGpu/KeccakTreeGPU.cu | 0 .../KeccakTreeGpu/KeccakTreeGPU.h | 0 .../keccaktreegpu/KeccakTreeGpu/KeccakTypes.h | 0 .../keccaktreegpu/KeccakTreeGpu/Makefile | 0 .../keccaktreegpu/KeccakTreeGpu/README.txt | 0 .../keccaktreegpu/KeccakTreeGpu/Test.c | 0 .../keccaktreegpu/KeccakTreeGpu/Test.h | 0 .../VCKeccakTree/Release/BuildLog.htm | Bin .../VCKeccakTree/Release/KeccakF.obj | Bin .../VCKeccakTree/Release/KeccakTreeCPU.obj | Bin .../VCKeccakTree/Release/KeccakTreeGPU.cu.obj | Bin .../VCKeccakTree/Release/Test.obj | Bin .../Release/VCKeccakTree.ex.renameit | Bin .../VCKeccakTree.exe.intermediate.manifest | 0 .../VCKeccakTree/Release/VCKeccakTree.pdb | Bin .../VCKeccakTree/Release/cudart32_30_14.dll | Bin .../VCKeccakTree/Release/main.obj | Bin .../KeccakTreeGpu/VCKeccakTree/Release/mt.dep | 0 .../VCKeccakTree/Release/vc90.idb | Bin .../VCKeccakTree/Release/vc90.pdb | Bin .../VCKeccakTree/VCKeccakTree.ncb | Bin .../VCKeccakTree/VCKeccakTree.sln | 0 .../VCKeccakTree/VCKeccakTree.suo | Bin .../VCKeccakTree/VCKeccakTree.vcproj | 0 .../VCKeccakTree.vcproj.DELLM24.guigui.user | 0 .../KeccakTreeGpu/VCKeccakTree/vc90.pdb | Bin .../keccaktreegpu/KeccakTreeGpu/main.c | 0 .../applications/keccaktreegpu/__init__.py | 0 .../keccaktreegpu/keccaktreegpu.py | 16 +-- .../keccaktreegpu/keccaktreegpu_build_amd.py | 4 +- .../keccaktreegpu_build_nvidia.py | 4 +- .../keccaktreegpu_parser_common.py | 2 +- .../applications/mgbench/__init__.py | 0 .../applications/mgbench/mgbench.py | 16 +-- .../applications/mgbench/mgbench_build_amd.py | 4 +- .../mgbench/mgbench_build_nvidia.py | 4 +- .../mgbench/mgbench_parser_common.py | 2 +- .../common/__init__.py | 0 .../common/hip_get_packages.py | 34 +++--- .../common/hip_shell.py | 0 .../config_processor.py | 2 +- .../conformance/CMakePatch | 0 .../conformance/__init__.py | 0 .../conformance_test_classifier.py | 2 +- .../conformance/hip_dtest.py | 16 +-- .../conformance/hip_dtest_build_amd.py | 4 +- .../conformance/hip_dtest_build_common.py | 4 +- .../conformance/hip_dtest_build_nvidia.py | 4 +- src/{testsuite => hiptestsuite}/list_tests.py | 6 +- .../match_fun_args_call.py | 0 .../stress/__init__.py | 0 src/{testsuite => hiptestsuite}/targets.py | 2 +- .../test_classifier.py | 2 +- .../test_selector.py | 4 +- .../thirdparty/__init__.py | 0 src/{testsuite => hiptestsuite}/version.py | 0 112 files changed, 216 insertions(+), 307 deletions(-) rename src/{testsuite => hiptestsuite}/AMD.py (100%) rename src/{testsuite => hiptestsuite}/Test.py (96%) rename src/{testsuite => hiptestsuite}/TesterRepository.py (93%) rename src/{testsuite => hiptestsuite}/TestersExecutor.py (98%) rename src/{testsuite => hiptestsuite}/__init__.py (100%) rename src/{testsuite => hiptestsuite}/applications/__init__.py (100%) rename src/{testsuite => hiptestsuite}/applications/application_test_classifier.py (96%) rename src/{testsuite => hiptestsuite}/applications/cuda_grep/__init__.py (100%) rename src/{testsuite => hiptestsuite}/applications/cuda_grep/cuda_grep.py (91%) rename src/{testsuite => hiptestsuite}/applications/cuda_grep/cuda_grep_build_amd.py (95%) rename src/{testsuite => hiptestsuite}/applications/cuda_grep/cuda_grep_build_nvidia.py (95%) rename src/{testsuite => hiptestsuite}/applications/cuda_grep/cuda_grep_parser_common.py (96%) rename src/{testsuite => hiptestsuite}/applications/cuda_memtest/__init__.py (100%) rename src/{testsuite => hiptestsuite}/applications/cuda_memtest/cuda_memtest.py (97%) rename src/{testsuite => hiptestsuite}/applications/cuda_memtest/cuda_memtest_build_amd.py (95%) rename src/{testsuite => hiptestsuite}/applications/cuda_memtest/cuda_memtest_build_nvidia.py (95%) rename src/{testsuite => hiptestsuite}/applications/cuda_memtest/cuda_memtest_parser_common.py (96%) rename src/{testsuite => hiptestsuite}/applications/cuda_memtest/cuda_memtest_patch (100%) rename src/{testsuite => hiptestsuite}/applications/hip_examples/__init__.py (100%) rename src/{testsuite => hiptestsuite}/applications/hip_examples/hip_examples.py (99%) rename src/{testsuite => hiptestsuite}/applications/hip_examples/hip_examples_build_amd.py (90%) rename src/{testsuite => hiptestsuite}/applications/hip_examples/hip_examples_build_common.py (99%) rename src/{testsuite => hiptestsuite}/applications/hip_examples/hip_examples_build_nvidia.py (88%) rename src/{testsuite => hiptestsuite}/applications/hip_examples/hip_examples_parser.py (100%) rename src/{testsuite => hiptestsuite}/applications/hip_samples/Samples_Patch_4.2.x (100%) rename src/{testsuite => hiptestsuite}/applications/hip_samples/__init__.py (100%) rename src/{testsuite => hiptestsuite}/applications/hip_samples/hip_samples.py (98%) rename src/{testsuite => hiptestsuite}/applications/hip_samples/hip_samples_build_amd.py (87%) rename src/{testsuite => hiptestsuite}/applications/hip_samples/hip_samples_build_common.py (89%) rename src/{testsuite => hiptestsuite}/applications/hip_samples/hip_samples_build_nvidia.py (87%) rename src/{testsuite => hiptestsuite}/applications/hpc_apps/__init__.py (100%) rename src/{testsuite => hiptestsuite}/applications/hpc_apps/gridtools/__init__.py (100%) rename src/{testsuite => hiptestsuite}/applications/hpc_apps/gridtools/gridtools.py (93%) rename src/{testsuite => hiptestsuite}/applications/hpc_apps/gridtools/gridtools_build_amd.py (96%) rename src/{testsuite => hiptestsuite}/applications/hpc_apps/gridtools/gridtools_parser_common.py (97%) rename src/{testsuite => hiptestsuite}/applications/hpc_apps/gridtools/gtbench.patch (100%) rename src/{testsuite => hiptestsuite}/applications/hpc_apps/kokkos/__init__.py (100%) rename src/{testsuite => hiptestsuite}/applications/hpc_apps/kokkos/kokkos.py (94%) rename src/{testsuite => hiptestsuite}/applications/hpc_apps/kokkos/kokkos_build_amd.py (93%) rename src/{testsuite => hiptestsuite}/applications/hpc_apps/kokkos/kokkos_parser_common.py (96%) rename src/{testsuite => hiptestsuite}/applications/hpc_apps/laghos/__init__.py (100%) rename src/{testsuite => hiptestsuite}/applications/hpc_apps/laghos/laghos.py (84%) rename src/{testsuite => hiptestsuite}/applications/hpc_apps/laghos/laghos_build_amd.py (64%) rename src/{testsuite => hiptestsuite}/applications/hpc_apps/laghos/laghos_parser_common.py (97%) rename src/{testsuite => hiptestsuite}/applications/hpc_apps/quicksilver/__init__.py (100%) rename src/{testsuite => hiptestsuite}/applications/hpc_apps/quicksilver/quicksilver.py (92%) rename src/{testsuite => hiptestsuite}/applications/hpc_apps/quicksilver/quicksilver_build_amd.py (94%) rename src/{testsuite => hiptestsuite}/applications/hpc_apps/quicksilver/quicksilver_diff_patch (100%) rename src/{testsuite => hiptestsuite}/applications/hpc_apps/quicksilver/quicksilver_parser_common.py (97%) rename src/{testsuite => hiptestsuite}/applications/keccaktreegpu/KeccakTreeGpu/KeccakF.c (100%) rename src/{testsuite => hiptestsuite}/applications/keccaktreegpu/KeccakTreeGpu/KeccakF.h (100%) rename src/{testsuite => hiptestsuite}/applications/keccaktreegpu/KeccakTreeGpu/KeccakTree.h (100%) rename src/{testsuite => hiptestsuite}/applications/keccaktreegpu/KeccakTreeGpu/KeccakTreeCPU.c (100%) rename src/{testsuite => hiptestsuite}/applications/keccaktreegpu/KeccakTreeGpu/KeccakTreeCPU.h (100%) rename src/{testsuite => hiptestsuite}/applications/keccaktreegpu/KeccakTreeGpu/KeccakTreeGPU.cu (100%) rename src/{testsuite => hiptestsuite}/applications/keccaktreegpu/KeccakTreeGpu/KeccakTreeGPU.h (100%) rename src/{testsuite => hiptestsuite}/applications/keccaktreegpu/KeccakTreeGpu/KeccakTypes.h (100%) rename src/{testsuite => hiptestsuite}/applications/keccaktreegpu/KeccakTreeGpu/Makefile (100%) rename src/{testsuite => hiptestsuite}/applications/keccaktreegpu/KeccakTreeGpu/README.txt (100%) rename src/{testsuite => hiptestsuite}/applications/keccaktreegpu/KeccakTreeGpu/Test.c (100%) rename src/{testsuite => hiptestsuite}/applications/keccaktreegpu/KeccakTreeGpu/Test.h (100%) rename src/{testsuite => hiptestsuite}/applications/keccaktreegpu/KeccakTreeGpu/VCKeccakTree/Release/BuildLog.htm (100%) rename src/{testsuite => hiptestsuite}/applications/keccaktreegpu/KeccakTreeGpu/VCKeccakTree/Release/KeccakF.obj (100%) rename src/{testsuite => hiptestsuite}/applications/keccaktreegpu/KeccakTreeGpu/VCKeccakTree/Release/KeccakTreeCPU.obj (100%) rename src/{testsuite => hiptestsuite}/applications/keccaktreegpu/KeccakTreeGpu/VCKeccakTree/Release/KeccakTreeGPU.cu.obj (100%) rename src/{testsuite => hiptestsuite}/applications/keccaktreegpu/KeccakTreeGpu/VCKeccakTree/Release/Test.obj (100%) rename src/{testsuite => hiptestsuite}/applications/keccaktreegpu/KeccakTreeGpu/VCKeccakTree/Release/VCKeccakTree.ex.renameit (100%) rename src/{testsuite => hiptestsuite}/applications/keccaktreegpu/KeccakTreeGpu/VCKeccakTree/Release/VCKeccakTree.exe.intermediate.manifest (100%) rename src/{testsuite => hiptestsuite}/applications/keccaktreegpu/KeccakTreeGpu/VCKeccakTree/Release/VCKeccakTree.pdb (100%) rename src/{testsuite => hiptestsuite}/applications/keccaktreegpu/KeccakTreeGpu/VCKeccakTree/Release/cudart32_30_14.dll (100%) rename src/{testsuite => hiptestsuite}/applications/keccaktreegpu/KeccakTreeGpu/VCKeccakTree/Release/main.obj (100%) rename src/{testsuite => hiptestsuite}/applications/keccaktreegpu/KeccakTreeGpu/VCKeccakTree/Release/mt.dep (100%) rename src/{testsuite => hiptestsuite}/applications/keccaktreegpu/KeccakTreeGpu/VCKeccakTree/Release/vc90.idb (100%) rename src/{testsuite => hiptestsuite}/applications/keccaktreegpu/KeccakTreeGpu/VCKeccakTree/Release/vc90.pdb (100%) rename src/{testsuite => hiptestsuite}/applications/keccaktreegpu/KeccakTreeGpu/VCKeccakTree/VCKeccakTree.ncb (100%) rename src/{testsuite => hiptestsuite}/applications/keccaktreegpu/KeccakTreeGpu/VCKeccakTree/VCKeccakTree.sln (100%) rename src/{testsuite => hiptestsuite}/applications/keccaktreegpu/KeccakTreeGpu/VCKeccakTree/VCKeccakTree.suo (100%) rename src/{testsuite => hiptestsuite}/applications/keccaktreegpu/KeccakTreeGpu/VCKeccakTree/VCKeccakTree.vcproj (100%) rename src/{testsuite => hiptestsuite}/applications/keccaktreegpu/KeccakTreeGpu/VCKeccakTree/VCKeccakTree.vcproj.DELLM24.guigui.user (100%) rename src/{testsuite => hiptestsuite}/applications/keccaktreegpu/KeccakTreeGpu/VCKeccakTree/vc90.pdb (100%) rename src/{testsuite => hiptestsuite}/applications/keccaktreegpu/KeccakTreeGpu/main.c (100%) rename src/{testsuite => hiptestsuite}/applications/keccaktreegpu/__init__.py (100%) rename src/{testsuite => hiptestsuite}/applications/keccaktreegpu/keccaktreegpu.py (88%) rename src/{testsuite => hiptestsuite}/applications/keccaktreegpu/keccaktreegpu_build_amd.py (94%) rename src/{testsuite => hiptestsuite}/applications/keccaktreegpu/keccaktreegpu_build_nvidia.py (94%) rename src/{testsuite => hiptestsuite}/applications/keccaktreegpu/keccaktreegpu_parser_common.py (97%) rename src/{testsuite => hiptestsuite}/applications/mgbench/__init__.py (100%) rename src/{testsuite => hiptestsuite}/applications/mgbench/mgbench.py (94%) rename src/{testsuite => hiptestsuite}/applications/mgbench/mgbench_build_amd.py (95%) rename src/{testsuite => hiptestsuite}/applications/mgbench/mgbench_build_nvidia.py (96%) rename src/{testsuite => hiptestsuite}/applications/mgbench/mgbench_parser_common.py (97%) rename src/{testsuite => hiptestsuite}/common/__init__.py (100%) rename src/{testsuite => hiptestsuite}/common/hip_get_packages.py (81%) rename src/{testsuite => hiptestsuite}/common/hip_shell.py (100%) rename src/{testsuite => hiptestsuite}/config_processor.py (97%) rename src/{testsuite => hiptestsuite}/conformance/CMakePatch (100%) rename src/{testsuite => hiptestsuite}/conformance/__init__.py (100%) rename src/{testsuite => hiptestsuite}/conformance/conformance_test_classifier.py (96%) rename src/{testsuite => hiptestsuite}/conformance/hip_dtest.py (89%) rename src/{testsuite => hiptestsuite}/conformance/hip_dtest_build_amd.py (94%) rename src/{testsuite => hiptestsuite}/conformance/hip_dtest_build_common.py (95%) rename src/{testsuite => hiptestsuite}/conformance/hip_dtest_build_nvidia.py (95%) rename src/{testsuite => hiptestsuite}/list_tests.py (96%) rename src/{testsuite => hiptestsuite}/match_fun_args_call.py (100%) rename src/{testsuite => hiptestsuite}/stress/__init__.py (100%) rename src/{testsuite => hiptestsuite}/targets.py (98%) rename src/{testsuite => hiptestsuite}/test_classifier.py (97%) rename src/{testsuite => hiptestsuite}/test_selector.py (98%) rename src/{testsuite => hiptestsuite}/thirdparty/__init__.py (100%) rename src/{testsuite => hiptestsuite}/version.py (100%) diff --git a/cfg.py b/cfg.py index 4507ae8..ab3c13c 100644 --- a/cfg.py +++ b/cfg.py @@ -130,10 +130,5 @@ "repo_url": "https://github.com/CEED/Laghos.git", "branch": None, "commit_id": "a7f6123d42847f6bdbdb614f5af876541f49cd16" - }, - "openmpi": { - "repo_url": "http://github.com/open-mpi/ompi.git openmpi", - "branch": "v4.0.x", - "commit_id": "4dc196d8c60aadeb34b0df9d226ab4c341004704" } } diff --git a/run.py b/run.py index 1484323..24afbe4 100644 --- a/run.py +++ b/run.py @@ -26,8 +26,8 @@ sys.path.append(os.path.join(os.path.dirname(__file__), "src")) -from testsuite.TestersExecutor import TestersExecutor -from testsuite.list_tests import list_tests +from hiptestsuite.TestersExecutor import TestersExecutor +from hiptestsuite.list_tests import list_tests import cfg diff --git a/src/testsuite/AMD.py b/src/hiptestsuite/AMD.py similarity index 100% rename from src/testsuite/AMD.py rename to src/hiptestsuite/AMD.py diff --git a/src/testsuite/Test.py b/src/hiptestsuite/Test.py similarity index 96% rename from src/testsuite/Test.py rename to src/hiptestsuite/Test.py index eed9beb..b3840fd 100644 --- a/src/testsuite/Test.py +++ b/src/hiptestsuite/Test.py @@ -19,17 +19,17 @@ # THE SOFTWARE. from typing import List, Union, Set, Dict -from testsuite.AMD import AMDObject -from testsuite.targets import Target +from hiptestsuite.AMD import AMDObject +from hiptestsuite.targets import Target from enum import Enum, auto -from testsuite.test_classifier import TestClassifier -from testsuite.config_processor import ConfigProcessor +from hiptestsuite.test_classifier import TestClassifier +from hiptestsuite.config_processor import ConfigProcessor class Test(AMDObject): def __init__(self): # Cycle Import - from testsuite.TesterRepository import Tester + from hiptestsuite.TesterRepository import Tester AMDObject.__init__(self) self.test_name: Union[None, str] = None diff --git a/src/testsuite/TesterRepository.py b/src/hiptestsuite/TesterRepository.py similarity index 93% rename from src/testsuite/TesterRepository.py rename to src/hiptestsuite/TesterRepository.py index 2081302..5f2248e 100644 --- a/src/testsuite/TesterRepository.py +++ b/src/hiptestsuite/TesterRepository.py @@ -18,12 +18,12 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -from testsuite.Test import Test, TestData, GetTestsData, LogLocation, Quick -from testsuite.test_classifier import TestClassifier -from testsuite.AMD import AMDObject -from testsuite.config_processor import ConfigProcessor -from testsuite.match_fun_args_call import match_fun_args_call -import testsuite +from hiptestsuite.Test import Test, TestData, GetTestsData, LogLocation, Quick +from hiptestsuite.test_classifier import TestClassifier +from hiptestsuite.AMD import AMDObject +from hiptestsuite.config_processor import ConfigProcessor +from hiptestsuite.match_fun_args_call import match_fun_args_call +import hiptestsuite from typing import List, Union import pkgutil @@ -54,7 +54,7 @@ def clean(self): class TesterRepository(AMDObject): def __init__(self): AMDObject.__init__(self) - self.getTestersFrom = [testsuite] + self.getTestersFrom = [hiptestsuite] self.testers: Union[None, List[Tester]] = None def getTesters(self) -> List[Tester]: diff --git a/src/testsuite/TestersExecutor.py b/src/hiptestsuite/TestersExecutor.py similarity index 98% rename from src/testsuite/TestersExecutor.py rename to src/hiptestsuite/TestersExecutor.py index a33f368..1b33003 100644 --- a/src/testsuite/TestersExecutor.py +++ b/src/hiptestsuite/TestersExecutor.py @@ -18,10 +18,10 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -from testsuite.TesterRepository import TesterRepository, Tester, Test -from testsuite.test_selector import TestSelector -from testsuite.config_processor import ConfigProcessor -from testsuite.Test import TestResult +from hiptestsuite.TesterRepository import TesterRepository, Tester, Test +from hiptestsuite.test_selector import TestSelector +from hiptestsuite.config_processor import ConfigProcessor +from hiptestsuite.Test import TestResult import os import traceback diff --git a/src/testsuite/__init__.py b/src/hiptestsuite/__init__.py similarity index 100% rename from src/testsuite/__init__.py rename to src/hiptestsuite/__init__.py diff --git a/src/testsuite/applications/__init__.py b/src/hiptestsuite/applications/__init__.py similarity index 100% rename from src/testsuite/applications/__init__.py rename to src/hiptestsuite/applications/__init__.py diff --git a/src/testsuite/applications/application_test_classifier.py b/src/hiptestsuite/applications/application_test_classifier.py similarity index 96% rename from src/testsuite/applications/application_test_classifier.py rename to src/hiptestsuite/applications/application_test_classifier.py index 21c0ea4..757d30c 100644 --- a/src/testsuite/applications/application_test_classifier.py +++ b/src/hiptestsuite/applications/application_test_classifier.py @@ -18,7 +18,7 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -from testsuite.test_classifier import TestClassifier +from hiptestsuite.test_classifier import TestClassifier from typing import Union diff --git a/src/testsuite/applications/cuda_grep/__init__.py b/src/hiptestsuite/applications/cuda_grep/__init__.py similarity index 100% rename from src/testsuite/applications/cuda_grep/__init__.py rename to src/hiptestsuite/applications/cuda_grep/__init__.py diff --git a/src/testsuite/applications/cuda_grep/cuda_grep.py b/src/hiptestsuite/applications/cuda_grep/cuda_grep.py similarity index 91% rename from src/testsuite/applications/cuda_grep/cuda_grep.py rename to src/hiptestsuite/applications/cuda_grep/cuda_grep.py index f43cc27..2b19bbc 100644 --- a/src/testsuite/applications/cuda_grep/cuda_grep.py +++ b/src/hiptestsuite/applications/cuda_grep/cuda_grep.py @@ -18,14 +18,14 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -from testsuite.TesterRepository import Tester, Test, TestData -from testsuite.Test import HIPTestData, TestResult, HIP_PLATFORM +from hiptestsuite.TesterRepository import Tester, Test, TestData +from hiptestsuite.Test import HIPTestData, TestResult, HIP_PLATFORM from typing import Union, List -from testsuite.test_classifier import TestClassifier -from testsuite.applications.cuda_grep.cuda_grep_build_amd import BuildRunAmd -from testsuite.applications.cuda_grep.cuda_grep_build_nvidia import BuildRunNvidia -from testsuite.common.hip_get_packages import HipPackages -from testsuite.common.hip_shell import execshellcmd +from hiptestsuite.test_classifier import TestClassifier +from hiptestsuite.applications.cuda_grep.cuda_grep_build_amd import BuildRunAmd +from hiptestsuite.applications.cuda_grep.cuda_grep_build_nvidia import BuildRunNvidia +from hiptestsuite.common.hip_get_packages import HipPackages +from hiptestsuite.common.hip_shell import execshellcmd import os import re @@ -35,7 +35,7 @@ def __init__(self, cwd, binary): self.cwdAbs = cwd self.binary = binary self.app_path = os.path.join(self.cwdAbs,\ - "src/testsuite/applications/cuda_grep/") + "src/hiptestsuite/applications/cuda_grep/") self.app_root = os.path.join(self.app_path, "CUDA-grep/") self.thistestpath = self.app_root self.prepareobj = None diff --git a/src/testsuite/applications/cuda_grep/cuda_grep_build_amd.py b/src/hiptestsuite/applications/cuda_grep/cuda_grep_build_amd.py similarity index 95% rename from src/testsuite/applications/cuda_grep/cuda_grep_build_amd.py rename to src/hiptestsuite/applications/cuda_grep/cuda_grep_build_amd.py index 528384e..7f2e879 100644 --- a/src/testsuite/applications/cuda_grep/cuda_grep_build_amd.py +++ b/src/hiptestsuite/applications/cuda_grep/cuda_grep_build_amd.py @@ -19,8 +19,8 @@ # THE SOFTWARE. import os -from testsuite.common.hip_shell import execshellcmd -from testsuite.applications.cuda_grep.cuda_grep_parser_common import CudaGrepParser +from hiptestsuite.common.hip_shell import execshellcmd +from hiptestsuite.applications.cuda_grep.cuda_grep_parser_common import CudaGrepParser class BuildRunAmd(): def __init__(self, thistestpath, logFile, binary): diff --git a/src/testsuite/applications/cuda_grep/cuda_grep_build_nvidia.py b/src/hiptestsuite/applications/cuda_grep/cuda_grep_build_nvidia.py similarity index 95% rename from src/testsuite/applications/cuda_grep/cuda_grep_build_nvidia.py rename to src/hiptestsuite/applications/cuda_grep/cuda_grep_build_nvidia.py index 897dfd5..91ecb4c 100644 --- a/src/testsuite/applications/cuda_grep/cuda_grep_build_nvidia.py +++ b/src/hiptestsuite/applications/cuda_grep/cuda_grep_build_nvidia.py @@ -19,8 +19,8 @@ # THE SOFTWARE. import os -from testsuite.common.hip_shell import execshellcmd -from testsuite.applications.cuda_grep.cuda_grep_parser_common import CudaGrepParser +from hiptestsuite.common.hip_shell import execshellcmd +from hiptestsuite.applications.cuda_grep.cuda_grep_parser_common import CudaGrepParser class BuildRunNvidia(): def __init__(self, thistestpath, logFile, binary): diff --git a/src/testsuite/applications/cuda_grep/cuda_grep_parser_common.py b/src/hiptestsuite/applications/cuda_grep/cuda_grep_parser_common.py similarity index 96% rename from src/testsuite/applications/cuda_grep/cuda_grep_parser_common.py rename to src/hiptestsuite/applications/cuda_grep/cuda_grep_parser_common.py index 4ff0a75..ca183f8 100644 --- a/src/testsuite/applications/cuda_grep/cuda_grep_parser_common.py +++ b/src/hiptestsuite/applications/cuda_grep/cuda_grep_parser_common.py @@ -18,7 +18,7 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -from testsuite.common.hip_shell import execshellcmd +from hiptestsuite.common.hip_shell import execshellcmd class CudaGrepParser(): def __init__(self, results): diff --git a/src/testsuite/applications/cuda_memtest/__init__.py b/src/hiptestsuite/applications/cuda_memtest/__init__.py similarity index 100% rename from src/testsuite/applications/cuda_memtest/__init__.py rename to src/hiptestsuite/applications/cuda_memtest/__init__.py diff --git a/src/testsuite/applications/cuda_memtest/cuda_memtest.py b/src/hiptestsuite/applications/cuda_memtest/cuda_memtest.py similarity index 97% rename from src/testsuite/applications/cuda_memtest/cuda_memtest.py rename to src/hiptestsuite/applications/cuda_memtest/cuda_memtest.py index 6d73f9b..1b5a556 100644 --- a/src/testsuite/applications/cuda_memtest/cuda_memtest.py +++ b/src/hiptestsuite/applications/cuda_memtest/cuda_memtest.py @@ -18,14 +18,14 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -from testsuite.TesterRepository import Tester, Test, TestData -from testsuite.Test import HIPTestData, TestResult, HIP_PLATFORM +from hiptestsuite.TesterRepository import Tester, Test, TestData +from hiptestsuite.Test import HIPTestData, TestResult, HIP_PLATFORM from typing import Union, List -from testsuite.test_classifier import TestClassifier -from testsuite.applications.cuda_memtest.cuda_memtest_build_amd import BuildRunAmd -from testsuite.applications.cuda_memtest.cuda_memtest_build_nvidia import BuildRunNvidia -from testsuite.common.hip_get_packages import HipPackages -from testsuite.common.hip_shell import execshellcmd +from hiptestsuite.test_classifier import TestClassifier +from hiptestsuite.applications.cuda_memtest.cuda_memtest_build_amd import BuildRunAmd +from hiptestsuite.applications.cuda_memtest.cuda_memtest_build_nvidia import BuildRunNvidia +from hiptestsuite.common.hip_get_packages import HipPackages +from hiptestsuite.common.hip_shell import execshellcmd import os import re @@ -35,7 +35,7 @@ def __init__(self, cwd, binary): self.cwdAbs = cwd self.binary = binary self.app_path = os.path.join(self.cwdAbs,\ - "src/testsuite/applications/cuda_memtest/") + "src/hiptestsuite/applications/cuda_memtest/") self.app_root = os.path.join(self.app_path, "cuda_memtest/") self.thistestpath = self.app_root self.prepareobj = None diff --git a/src/testsuite/applications/cuda_memtest/cuda_memtest_build_amd.py b/src/hiptestsuite/applications/cuda_memtest/cuda_memtest_build_amd.py similarity index 95% rename from src/testsuite/applications/cuda_memtest/cuda_memtest_build_amd.py rename to src/hiptestsuite/applications/cuda_memtest/cuda_memtest_build_amd.py index 78d6e55..05bb539 100644 --- a/src/testsuite/applications/cuda_memtest/cuda_memtest_build_amd.py +++ b/src/hiptestsuite/applications/cuda_memtest/cuda_memtest_build_amd.py @@ -19,8 +19,8 @@ # THE SOFTWARE. import os -from testsuite.common.hip_shell import execshellcmd -from testsuite.applications.cuda_memtest.cuda_memtest_parser_common import CudaMemtestParser +from hiptestsuite.common.hip_shell import execshellcmd +from hiptestsuite.applications.cuda_memtest.cuda_memtest_parser_common import CudaMemtestParser class BuildRunAmd(): def __init__(self, thistestpath, logFile, binary): diff --git a/src/testsuite/applications/cuda_memtest/cuda_memtest_build_nvidia.py b/src/hiptestsuite/applications/cuda_memtest/cuda_memtest_build_nvidia.py similarity index 95% rename from src/testsuite/applications/cuda_memtest/cuda_memtest_build_nvidia.py rename to src/hiptestsuite/applications/cuda_memtest/cuda_memtest_build_nvidia.py index 408839e..0070976 100644 --- a/src/testsuite/applications/cuda_memtest/cuda_memtest_build_nvidia.py +++ b/src/hiptestsuite/applications/cuda_memtest/cuda_memtest_build_nvidia.py @@ -19,8 +19,8 @@ # THE SOFTWARE. import os -from testsuite.common.hip_shell import execshellcmd -from testsuite.applications.cuda_memtest.cuda_memtest_parser_common import CudaMemtestParser +from hiptestsuite.common.hip_shell import execshellcmd +from hiptestsuite.applications.cuda_memtest.cuda_memtest_parser_common import CudaMemtestParser class BuildRunNvidia(): def __init__(self, thistestpath, logFile, binary): diff --git a/src/testsuite/applications/cuda_memtest/cuda_memtest_parser_common.py b/src/hiptestsuite/applications/cuda_memtest/cuda_memtest_parser_common.py similarity index 96% rename from src/testsuite/applications/cuda_memtest/cuda_memtest_parser_common.py rename to src/hiptestsuite/applications/cuda_memtest/cuda_memtest_parser_common.py index d3eea70..701cf38 100644 --- a/src/testsuite/applications/cuda_memtest/cuda_memtest_parser_common.py +++ b/src/hiptestsuite/applications/cuda_memtest/cuda_memtest_parser_common.py @@ -18,7 +18,7 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -from testsuite.common.hip_shell import execshellcmd +from hiptestsuite.common.hip_shell import execshellcmd import re class CudaMemtestParser(): diff --git a/src/testsuite/applications/cuda_memtest/cuda_memtest_patch b/src/hiptestsuite/applications/cuda_memtest/cuda_memtest_patch similarity index 100% rename from src/testsuite/applications/cuda_memtest/cuda_memtest_patch rename to src/hiptestsuite/applications/cuda_memtest/cuda_memtest_patch diff --git a/src/testsuite/applications/hip_examples/__init__.py b/src/hiptestsuite/applications/hip_examples/__init__.py similarity index 100% rename from src/testsuite/applications/hip_examples/__init__.py rename to src/hiptestsuite/applications/hip_examples/__init__.py diff --git a/src/testsuite/applications/hip_examples/hip_examples.py b/src/hiptestsuite/applications/hip_examples/hip_examples.py similarity index 99% rename from src/testsuite/applications/hip_examples/hip_examples.py rename to src/hiptestsuite/applications/hip_examples/hip_examples.py index 04a8351..38ff571 100644 --- a/src/testsuite/applications/hip_examples/hip_examples.py +++ b/src/hiptestsuite/applications/hip_examples/hip_examples.py @@ -18,14 +18,14 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -from testsuite.TesterRepository import Tester, Test, TestData -from testsuite.Test import HIPTestData, TestResult, HIP_PLATFORM +from hiptestsuite.TesterRepository import Tester, Test, TestData +from hiptestsuite.Test import HIPTestData, TestResult, HIP_PLATFORM from typing import Union, List -from testsuite.test_classifier import TestClassifier -from testsuite.applications.hip_examples.hip_examples_build_amd import BuildRunAmd -from testsuite.applications.hip_examples.hip_examples_build_nvidia import BuildRunNvidia -from testsuite.common.hip_get_packages import HipPackages -from testsuite.common.hip_shell import * +from hiptestsuite.test_classifier import TestClassifier +from hiptestsuite.applications.hip_examples.hip_examples_build_amd import BuildRunAmd +from hiptestsuite.applications.hip_examples.hip_examples_build_nvidia import BuildRunNvidia +from hiptestsuite.common.hip_get_packages import HipPackages +from hiptestsuite.common.hip_shell import * import os @@ -34,7 +34,7 @@ class PrepareTest(): def __init__(self, path, cwd): self.cwdAbs = cwd self.appPath = os.path.join(self.cwdAbs,\ - "src/testsuite/applications/hip_examples/") + "src/hiptestsuite/applications/hip_examples/") self.examplepath = os.path.join(self.appPath, "HIP-Examples/") self.thistestpath = os.path.join(self.examplepath, path) self.prepareobj = None diff --git a/src/testsuite/applications/hip_examples/hip_examples_build_amd.py b/src/hiptestsuite/applications/hip_examples/hip_examples_build_amd.py similarity index 90% rename from src/testsuite/applications/hip_examples/hip_examples_build_amd.py rename to src/hiptestsuite/applications/hip_examples/hip_examples_build_amd.py index 4ad70ec..3fe9155 100644 --- a/src/testsuite/applications/hip_examples/hip_examples_build_amd.py +++ b/src/hiptestsuite/applications/hip_examples/hip_examples_build_amd.py @@ -19,9 +19,9 @@ # THE SOFTWARE. import os -from testsuite.applications.hip_examples.hip_examples_parser import Hip_examples_parser -from testsuite.applications.hip_examples.hip_examples_build_common import BuildRunCommon -from testsuite.common.hip_shell import * +from hiptestsuite.applications.hip_examples.hip_examples_parser import Hip_examples_parser +from hiptestsuite.applications.hip_examples.hip_examples_build_common import BuildRunCommon +from hiptestsuite.common.hip_shell import * class BuildRunAmd(BuildRunCommon): def __init__(self, path): diff --git a/src/testsuite/applications/hip_examples/hip_examples_build_common.py b/src/hiptestsuite/applications/hip_examples/hip_examples_build_common.py similarity index 99% rename from src/testsuite/applications/hip_examples/hip_examples_build_common.py rename to src/hiptestsuite/applications/hip_examples/hip_examples_build_common.py index 5952beb..6292a28 100644 --- a/src/testsuite/applications/hip_examples/hip_examples_build_common.py +++ b/src/hiptestsuite/applications/hip_examples/hip_examples_build_common.py @@ -21,8 +21,8 @@ import os import tempfile -from testsuite.applications.hip_examples.hip_examples_parser import Hip_examples_parser -from testsuite.common.hip_shell import * +from hiptestsuite.applications.hip_examples.hip_examples_parser import Hip_examples_parser +from hiptestsuite.common.hip_shell import * class BuildRunCommon(): ''' diff --git a/src/testsuite/applications/hip_examples/hip_examples_build_nvidia.py b/src/hiptestsuite/applications/hip_examples/hip_examples_build_nvidia.py similarity index 88% rename from src/testsuite/applications/hip_examples/hip_examples_build_nvidia.py rename to src/hiptestsuite/applications/hip_examples/hip_examples_build_nvidia.py index fa15172..a1f85c1 100644 --- a/src/testsuite/applications/hip_examples/hip_examples_build_nvidia.py +++ b/src/hiptestsuite/applications/hip_examples/hip_examples_build_nvidia.py @@ -20,13 +20,13 @@ import os -from testsuite.applications.hip_examples.hip_examples_parser import Hip_examples_parser -from testsuite.applications.hip_examples.hip_examples_build_common import BuildRunCommon -from testsuite.common.hip_shell import * +from hiptestsuite.applications.hip_examples.hip_examples_parser import Hip_examples_parser +from hiptestsuite.applications.hip_examples.hip_examples_build_common import BuildRunCommon +from hiptestsuite.common.hip_shell import * class BuildRunNvidia(BuildRunCommon): def __init__(self, path): - self.hippath = os.path.join(os.getcwd(),"src/testsuite/conformance/HIP/") + self.hippath = os.path.join(os.getcwd(),"src/hiptestsuite/conformance/HIP/") BuildRunCommon.__init__(self, path) def getenvironmentvariables(self): diff --git a/src/testsuite/applications/hip_examples/hip_examples_parser.py b/src/hiptestsuite/applications/hip_examples/hip_examples_parser.py similarity index 100% rename from src/testsuite/applications/hip_examples/hip_examples_parser.py rename to src/hiptestsuite/applications/hip_examples/hip_examples_parser.py diff --git a/src/testsuite/applications/hip_samples/Samples_Patch_4.2.x b/src/hiptestsuite/applications/hip_samples/Samples_Patch_4.2.x similarity index 100% rename from src/testsuite/applications/hip_samples/Samples_Patch_4.2.x rename to src/hiptestsuite/applications/hip_samples/Samples_Patch_4.2.x diff --git a/src/testsuite/applications/hip_samples/__init__.py b/src/hiptestsuite/applications/hip_samples/__init__.py similarity index 100% rename from src/testsuite/applications/hip_samples/__init__.py rename to src/hiptestsuite/applications/hip_samples/__init__.py diff --git a/src/testsuite/applications/hip_samples/hip_samples.py b/src/hiptestsuite/applications/hip_samples/hip_samples.py similarity index 98% rename from src/testsuite/applications/hip_samples/hip_samples.py rename to src/hiptestsuite/applications/hip_samples/hip_samples.py index 8325b0e..e24042c 100644 --- a/src/testsuite/applications/hip_samples/hip_samples.py +++ b/src/hiptestsuite/applications/hip_samples/hip_samples.py @@ -18,14 +18,14 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -from testsuite.TesterRepository import Tester, Test, TestData -from testsuite.Test import HIPTestData, TestResult, HIP_PLATFORM +from hiptestsuite.TesterRepository import Tester, Test, TestData +from hiptestsuite.Test import HIPTestData, TestResult, HIP_PLATFORM from typing import Union, List -from testsuite.test_classifier import TestClassifier -from testsuite.applications.hip_samples.hip_samples_build_amd import BuildRunAmd -from testsuite.applications.hip_samples.hip_samples_build_nvidia import BuildRunNvidia -from testsuite.common.hip_get_packages import HipPackages -from testsuite.common.hip_shell import execshellcmd +from hiptestsuite.test_classifier import TestClassifier +from hiptestsuite.applications.hip_samples.hip_samples_build_amd import BuildRunAmd +from hiptestsuite.applications.hip_samples.hip_samples_build_nvidia import BuildRunNvidia +from hiptestsuite.common.hip_get_packages import HipPackages +from hiptestsuite.common.hip_shell import execshellcmd import os import re @@ -33,7 +33,7 @@ class PrepareTest(): def __init__(self, path, binary, cwd): self.cwdAbs = cwd - self.conformancePath = os.path.join(self.cwdAbs, "src/testsuite/conformance/") + self.conformancePath = os.path.join(self.cwdAbs, "src/hiptestsuite/conformance/") self.hippath = os.path.join(self.conformancePath, "HIP/") self.thistestpath = os.path.join(self.hippath, path) self.binary = binary @@ -61,7 +61,7 @@ def downloadtest(self, logFile): self.hipcommitId, "HIP") return ret - def buildtest(self, logFile, platform): + def buildtest(self, logFile, platform, target=None): isBinaryPresent = True if platform == HIP_PLATFORM.nvidia: self.prepareobj = BuildRunNvidia(self.thistestpath, logFile) @@ -70,7 +70,7 @@ def buildtest(self, logFile, platform): else: print("Invalid Platform") return False - self.prepareobj.buildtest() + self.prepareobj.buildtest(target) if not os.path.isfile(\ os.path.join(self.thistestpath, self.binary)): @@ -1275,7 +1275,7 @@ def test(self, test_data: HIPTestData): if not res: test_data.test_result = TestResult.FAIL return - res = self.buildtest(testLogger, test_data.HIP_PLATFORM) + res = self.buildtest(testLogger, test_data.HIP_PLATFORM, "hipInfo") if not res: test_data.test_result = TestResult.FAIL return diff --git a/src/testsuite/applications/hip_samples/hip_samples_build_amd.py b/src/hiptestsuite/applications/hip_samples/hip_samples_build_amd.py similarity index 87% rename from src/testsuite/applications/hip_samples/hip_samples_build_amd.py rename to src/hiptestsuite/applications/hip_samples/hip_samples_build_amd.py index c72fc71..badcd88 100644 --- a/src/testsuite/applications/hip_samples/hip_samples_build_amd.py +++ b/src/hiptestsuite/applications/hip_samples/hip_samples_build_amd.py @@ -19,19 +19,19 @@ # THE SOFTWARE. import os -from testsuite.common.hip_shell import execshellcmd -from testsuite.applications.hip_samples.hip_samples_build_common import BuildRunCommon +from hiptestsuite.common.hip_shell import execshellcmd +from hiptestsuite.applications.hip_samples.hip_samples_build_common import BuildRunCommon class BuildRunAmd(BuildRunCommon): def __init__(self, path, logfile): BuildRunCommon.__init__(self, path, logfile) - def buildtest(self): + def buildtest(self, target): # In this function put the build steps for test cases # which differ across platforms (amd/nvidia/intel) else # invoke BuildRunCommon.buildtest if not os.path.exists("/opt/rocm"): print("ROCm not installed. Exiting!") return False - ret = BuildRunCommon.buildtest(self) + ret = BuildRunCommon.buildtest(self, target) return ret diff --git a/src/testsuite/applications/hip_samples/hip_samples_build_common.py b/src/hiptestsuite/applications/hip_samples/hip_samples_build_common.py similarity index 89% rename from src/testsuite/applications/hip_samples/hip_samples_build_common.py rename to src/hiptestsuite/applications/hip_samples/hip_samples_build_common.py index deb7855..cc3f668 100644 --- a/src/testsuite/applications/hip_samples/hip_samples_build_common.py +++ b/src/hiptestsuite/applications/hip_samples/hip_samples_build_common.py @@ -19,7 +19,7 @@ # THE SOFTWARE. import os -from testsuite.common.hip_shell import execshellcmd +from hiptestsuite.common.hip_shell import execshellcmd class BuildRunCommon(): ''' @@ -30,10 +30,13 @@ def __init__(self, path, logfile): self.thistestpath = path self.logfile = logfile - def buildtest(self, env = None): + def buildtest(self, target, env = None): cmdcd = "cd " + self.thistestpath + ";" cmd_clean = "make clean;" - cmd_build = "make" + if target != None: + cmd_build = "make " + target + ";" + else: + cmd_build = "make;" cmdexc = cmdcd + cmd_clean + cmd_build execshellcmd(cmdexc, self.logfile, env) diff --git a/src/testsuite/applications/hip_samples/hip_samples_build_nvidia.py b/src/hiptestsuite/applications/hip_samples/hip_samples_build_nvidia.py similarity index 87% rename from src/testsuite/applications/hip_samples/hip_samples_build_nvidia.py rename to src/hiptestsuite/applications/hip_samples/hip_samples_build_nvidia.py index d456b69..62a97af 100644 --- a/src/testsuite/applications/hip_samples/hip_samples_build_nvidia.py +++ b/src/hiptestsuite/applications/hip_samples/hip_samples_build_nvidia.py @@ -19,12 +19,12 @@ # THE SOFTWARE. import os -from testsuite.common.hip_shell import execshellcmd -from testsuite.applications.hip_samples.hip_samples_build_common import BuildRunCommon +from hiptestsuite.common.hip_shell import execshellcmd +from hiptestsuite.applications.hip_samples.hip_samples_build_common import BuildRunCommon class BuildRunNvidia(BuildRunCommon): def __init__(self, path, logfile): - self.hippath = os.path.join(os.getcwd(), "src/testsuite/conformance/HIP/") + self.hippath = os.path.join(os.getcwd(), "src/hiptestsuite/conformance/HIP/") BuildRunCommon.__init__(self, path, logfile) def getenvironmentvariables(self): @@ -42,7 +42,7 @@ def applypatch(self): # To be deleted cmd += "patch -p0 < ../../applications/hip_samples/Samples_Patch_4.2.x; touch patched;" execshellcmd(cmd, self.logfile, None) - def buildtest(self): + def buildtest(self, target): # In this function put the build steps for test cases # which differ across platforms (testsuite/nvidia/intel) else # invoke BuildRunCommon.buildtest @@ -53,5 +53,5 @@ def buildtest(self): # are available in HIP public repository. envtoset = self.getenvironmentvariables() self.applypatch() - ret = BuildRunCommon.buildtest(self, envtoset) + ret = BuildRunCommon.buildtest(self, target, envtoset) return ret diff --git a/src/testsuite/applications/hpc_apps/__init__.py b/src/hiptestsuite/applications/hpc_apps/__init__.py similarity index 100% rename from src/testsuite/applications/hpc_apps/__init__.py rename to src/hiptestsuite/applications/hpc_apps/__init__.py diff --git a/src/testsuite/applications/hpc_apps/gridtools/__init__.py b/src/hiptestsuite/applications/hpc_apps/gridtools/__init__.py similarity index 100% rename from src/testsuite/applications/hpc_apps/gridtools/__init__.py rename to src/hiptestsuite/applications/hpc_apps/gridtools/__init__.py diff --git a/src/testsuite/applications/hpc_apps/gridtools/gridtools.py b/src/hiptestsuite/applications/hpc_apps/gridtools/gridtools.py similarity index 93% rename from src/testsuite/applications/hpc_apps/gridtools/gridtools.py rename to src/hiptestsuite/applications/hpc_apps/gridtools/gridtools.py index c4bf490..f5c128b 100644 --- a/src/testsuite/applications/hpc_apps/gridtools/gridtools.py +++ b/src/hiptestsuite/applications/hpc_apps/gridtools/gridtools.py @@ -18,13 +18,13 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -from testsuite.TesterRepository import Tester, Test, TestData -from testsuite.Test import HIPTestData, TestResult, HIP_PLATFORM +from hiptestsuite.TesterRepository import Tester, Test, TestData +from hiptestsuite.Test import HIPTestData, TestResult, HIP_PLATFORM from typing import Union, List -from testsuite.test_classifier import TestClassifier -from testsuite.applications.hpc_apps.gridtools.gridtools_build_amd import BuildRunAmd -from testsuite.common.hip_get_packages import HipPackages -from testsuite.common.hip_shell import execshellcmd +from hiptestsuite.test_classifier import TestClassifier +from hiptestsuite.applications.hpc_apps.gridtools.gridtools_build_amd import BuildRunAmd +from hiptestsuite.common.hip_get_packages import HipPackages +from hiptestsuite.common.hip_shell import execshellcmd import os import re @@ -33,7 +33,7 @@ class PrepareTest(): def __init__(self, cwd): self.cwdAbs = cwd self.app_path = os.path.join(self.cwdAbs,\ - "src/testsuite/applications/hpc_apps/gridtools") + "src/hiptestsuite/applications/hpc_apps/gridtools") self.thistestpath = self.app_path self.prepareobj = None self.gridtoolsrepo = "" # Default @@ -140,8 +140,8 @@ def test(self, test_data: HIPTestData): # Check if Boost package exists if not os.path.isfile(\ os.path.join(self.thistestpath, "boost_1_72_0.tar.bz2")): - print("Boost Package boost_1_72_0.tar.bz2 not available under src/testsuite/applications/hpc_apps/gridtools/.") - print("Please download and copy Boost package in src/testsuite/applications/hpc_apps/gridtools folder.") + print("Boost Package boost_1_72_0.tar.bz2 not available under src/hiptestsuite/applications/hpc_apps/gridtools/.") + print("Please download and copy Boost package in src/hiptestsuite/applications/hpc_apps/gridtools folder.") test_data.test_result = TestResult.ERROR return # Create GT_TREE_DIR @@ -203,8 +203,8 @@ def test(self, test_data: HIPTestData): # Check if Boost package exists if not os.path.isfile(\ os.path.join(self.thistestpath, "boost_1_72_0.tar.bz2")): - print("Boost Package boost_1_72_0.tar.bz2 not available under src/testsuite/applications/hpc_apps/gridtools/.") - print("Please download and copy Boost package in src/testsuite/applications/hpc_apps/gridtools folder.") + print("Boost Package boost_1_72_0.tar.bz2 not available under src/hiptestsuite/applications/hpc_apps/gridtools/.") + print("Please download and copy Boost package in src/hiptestsuite/applications/hpc_apps/gridtools folder.") test_data.test_result = TestResult.ERROR return diff --git a/src/testsuite/applications/hpc_apps/gridtools/gridtools_build_amd.py b/src/hiptestsuite/applications/hpc_apps/gridtools/gridtools_build_amd.py similarity index 96% rename from src/testsuite/applications/hpc_apps/gridtools/gridtools_build_amd.py rename to src/hiptestsuite/applications/hpc_apps/gridtools/gridtools_build_amd.py index 11b4b27..ce80af5 100644 --- a/src/testsuite/applications/hpc_apps/gridtools/gridtools_build_amd.py +++ b/src/hiptestsuite/applications/hpc_apps/gridtools/gridtools_build_amd.py @@ -20,8 +20,8 @@ import os import tempfile -from testsuite.common.hip_shell import * -from testsuite.applications.hpc_apps.gridtools.gridtools_parser_common import GridtoolsParser +from hiptestsuite.common.hip_shell import * +from hiptestsuite.applications.hpc_apps.gridtools.gridtools_parser_common import GridtoolsParser class BuildRunAmd(): def __init__(self, thistestpath, logFile): @@ -37,7 +37,7 @@ def setenv(self, gpu_arch): env += "export ROCMHOME=/opt/rocm;" env += "export PATH=$ROCMHOME/bin:$ROCMHOME/llvm/bin:$ROCMHOME/hip/bin:$ROCMHOME/opencl/bin:$ROCMHOME/rocprofiler/bin:$PATH;" env += "export LD_LIBRARY_PATH=/$ROCMHOME/lib:$ROCMHOME/llvm/lib:$LD_LIBRARY_PATH;" - env += "export GT_ALL_DIR=$PWD/src/testsuite/applications/hpc_apps/gridtools;" + env += "export GT_ALL_DIR=$PWD/src/hiptestsuite/applications/hpc_apps/gridtools;" env += "export GT_TREE_DIR=$GT_ALL_DIR/GridTools;" env += "export BOOST_TREE_DIR=$GT_TREE_DIR/boost_1_72_0;" env += "export BOOST_INSTALL_DIR=$GT_ALL_DIR/boost_1_72_0;" diff --git a/src/testsuite/applications/hpc_apps/gridtools/gridtools_parser_common.py b/src/hiptestsuite/applications/hpc_apps/gridtools/gridtools_parser_common.py similarity index 97% rename from src/testsuite/applications/hpc_apps/gridtools/gridtools_parser_common.py rename to src/hiptestsuite/applications/hpc_apps/gridtools/gridtools_parser_common.py index 099003e..356fe25 100644 --- a/src/testsuite/applications/hpc_apps/gridtools/gridtools_parser_common.py +++ b/src/hiptestsuite/applications/hpc_apps/gridtools/gridtools_parser_common.py @@ -18,7 +18,7 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -from testsuite.common.hip_shell import execshellcmd +from hiptestsuite.common.hip_shell import execshellcmd import re class GridtoolsParser(): diff --git a/src/testsuite/applications/hpc_apps/gridtools/gtbench.patch b/src/hiptestsuite/applications/hpc_apps/gridtools/gtbench.patch similarity index 100% rename from src/testsuite/applications/hpc_apps/gridtools/gtbench.patch rename to src/hiptestsuite/applications/hpc_apps/gridtools/gtbench.patch diff --git a/src/testsuite/applications/hpc_apps/kokkos/__init__.py b/src/hiptestsuite/applications/hpc_apps/kokkos/__init__.py similarity index 100% rename from src/testsuite/applications/hpc_apps/kokkos/__init__.py rename to src/hiptestsuite/applications/hpc_apps/kokkos/__init__.py diff --git a/src/testsuite/applications/hpc_apps/kokkos/kokkos.py b/src/hiptestsuite/applications/hpc_apps/kokkos/kokkos.py similarity index 94% rename from src/testsuite/applications/hpc_apps/kokkos/kokkos.py rename to src/hiptestsuite/applications/hpc_apps/kokkos/kokkos.py index d8720e8..b8fe373 100644 --- a/src/testsuite/applications/hpc_apps/kokkos/kokkos.py +++ b/src/hiptestsuite/applications/hpc_apps/kokkos/kokkos.py @@ -18,13 +18,13 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -from testsuite.TesterRepository import Tester, Test, TestData -from testsuite.Test import HIPTestData, TestResult, HIP_PLATFORM +from hiptestsuite.TesterRepository import Tester, Test, TestData +from hiptestsuite.Test import HIPTestData, TestResult, HIP_PLATFORM from typing import Union, List -from testsuite.test_classifier import TestClassifier -from testsuite.applications.hpc_apps.kokkos.kokkos_build_amd import BuildRunAmd -from testsuite.common.hip_get_packages import HipPackages -from testsuite.common.hip_shell import execshellcmd +from hiptestsuite.test_classifier import TestClassifier +from hiptestsuite.applications.hpc_apps.kokkos.kokkos_build_amd import BuildRunAmd +from hiptestsuite.common.hip_get_packages import HipPackages +from hiptestsuite.common.hip_shell import execshellcmd import os import re @@ -33,7 +33,7 @@ class PrepareTest(): def __init__(self, cwd): self.cwdAbs = cwd self.app_path = os.path.join(self.cwdAbs,\ - "src/testsuite/applications/hpc_apps/kokkos/") + "src/hiptestsuite/applications/hpc_apps/kokkos/") self.app_root = os.path.join(self.app_path, "kokkos/") self.thistestpath = self.app_root self.prepareobj = None diff --git a/src/testsuite/applications/hpc_apps/kokkos/kokkos_build_amd.py b/src/hiptestsuite/applications/hpc_apps/kokkos/kokkos_build_amd.py similarity index 93% rename from src/testsuite/applications/hpc_apps/kokkos/kokkos_build_amd.py rename to src/hiptestsuite/applications/hpc_apps/kokkos/kokkos_build_amd.py index 8bd81c4..95e1a35 100644 --- a/src/testsuite/applications/hpc_apps/kokkos/kokkos_build_amd.py +++ b/src/hiptestsuite/applications/hpc_apps/kokkos/kokkos_build_amd.py @@ -21,8 +21,8 @@ import os import re import tempfile -from testsuite.common.hip_shell import * -from testsuite.applications.hpc_apps.kokkos.kokkos_parser_common import KokkosParser +from hiptestsuite.common.hip_shell import * +from hiptestsuite.applications.hpc_apps.kokkos.kokkos_parser_common import KokkosParser class BuildRunAmd(): def __init__(self, thistestpath, logFile): @@ -56,7 +56,7 @@ def buildtest(self): return True def runtest(self, testnum): - print("Running Quicksilver Test..") + print("Running Kokkos Test..") cmdcd = "cd " + self.thistestpath + "/build;" if testnum == 0: cmdrun = "ctest -R;" @@ -66,7 +66,7 @@ def runtest(self, testnum): self.runlog = execshellcmd(cmdexc, self.logFile, None) def clean(self): - print("Cleaning Quicksilver..") + print("Cleaning Kokkos..") def parse_result(self, testnum): return KokkosParser(self.runlog).parse(testnum) diff --git a/src/testsuite/applications/hpc_apps/kokkos/kokkos_parser_common.py b/src/hiptestsuite/applications/hpc_apps/kokkos/kokkos_parser_common.py similarity index 96% rename from src/testsuite/applications/hpc_apps/kokkos/kokkos_parser_common.py rename to src/hiptestsuite/applications/hpc_apps/kokkos/kokkos_parser_common.py index ec10152..919e0bf 100644 --- a/src/testsuite/applications/hpc_apps/kokkos/kokkos_parser_common.py +++ b/src/hiptestsuite/applications/hpc_apps/kokkos/kokkos_parser_common.py @@ -18,7 +18,7 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -from testsuite.common.hip_shell import execshellcmd +from hiptestsuite.common.hip_shell import execshellcmd import re class KokkosParser(): diff --git a/src/testsuite/applications/hpc_apps/laghos/__init__.py b/src/hiptestsuite/applications/hpc_apps/laghos/__init__.py similarity index 100% rename from src/testsuite/applications/hpc_apps/laghos/__init__.py rename to src/hiptestsuite/applications/hpc_apps/laghos/__init__.py diff --git a/src/testsuite/applications/hpc_apps/laghos/laghos.py b/src/hiptestsuite/applications/hpc_apps/laghos/laghos.py similarity index 84% rename from src/testsuite/applications/hpc_apps/laghos/laghos.py rename to src/hiptestsuite/applications/hpc_apps/laghos/laghos.py index a092c2d..8af0ee7 100644 --- a/src/testsuite/applications/hpc_apps/laghos/laghos.py +++ b/src/hiptestsuite/applications/hpc_apps/laghos/laghos.py @@ -18,13 +18,13 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -from testsuite.TesterRepository import Tester, Test, TestData -from testsuite.Test import HIPTestData, TestResult, HIP_PLATFORM +from hiptestsuite.TesterRepository import Tester, Test, TestData +from hiptestsuite.Test import HIPTestData, TestResult, HIP_PLATFORM from typing import Union, List -from testsuite.test_classifier import TestClassifier -from testsuite.applications.hpc_apps.laghos.laghos_build_amd import BuildRunAmd -from testsuite.common.hip_get_packages import HipPackages -from testsuite.common.hip_shell import execshellcmd +from hiptestsuite.test_classifier import TestClassifier +from hiptestsuite.applications.hpc_apps.laghos.laghos_build_amd import BuildRunAmd +from hiptestsuite.common.hip_get_packages import HipPackages +from hiptestsuite.common.hip_shell import execshellcmd import os import re @@ -33,7 +33,7 @@ class PrepareTest(): def __init__(self, cwd): self.cwdAbs = cwd self.app_path = os.path.join(self.cwdAbs,\ - "src/testsuite/applications/hpc_apps/laghos/") + "src/hiptestsuite/applications/hpc_apps/laghos/") self.thistestpath = self.app_path self.prepareobj = None @@ -41,10 +41,6 @@ def __init__(self, cwd): self.laghos_branch = "" self.laghos_commitId = "" - self.openmpi_repo = "" # Default - self.openmpi_branch = "" - self.openmpi_commitId = "" - self.mfem_repo = "" # Default self.mfem_branch = "" self.mfem_commitId = "" @@ -68,16 +64,6 @@ def set_laghos_repoinfo(self, test_data: HIPTestData): self.laghos_branch = test_data.repos["Laghos"].branch if test_data.repos["Laghos"].commit_id != None: self.laghos_commitId = test_data.repos["Laghos"].commit_id - - if test_data.repos["openmpi"].repo_url != None: - self.openmpi_repo = test_data.repos["openmpi"].repo_url - else: - validrepconfig &= False - if test_data.repos["openmpi"].branch != None: - self.openmpi_branch = test_data.repos["openmpi"].branch - if test_data.repos["openmpi"].commit_id != None: - self.openmpi_commitId = test_data.repos["openmpi"].commit_id - return validrepconfig def downloadtest(self, logFile, test_data: HIPTestData): @@ -86,17 +72,15 @@ def downloadtest(self, logFile, test_data: HIPTestData): self.mfem_branch, self.mfem_commitId, "mfem") ret = ret & HipPackages().pull_repo(logFile, self.laghos_repo,\ self.laghos_branch, self.laghos_commitId, "Laghos") - ret = ret & HipPackages().pull_repo(logFile, self.openmpi_repo,\ - self.openmpi_branch, self.openmpi_commitId, "openmpi") return ret - def buildtest(self, logFile, test_data: HIPTestData, platform): + def buildtest(self, logFile, platform): if platform == HIP_PLATFORM.amd: self.prepareobj = BuildRunAmd(self.thistestpath, logFile) else: print("Invalid Platform") return False - buildstatus = self.prepareobj.buildtest(test_data) + buildstatus = self.prepareobj.buildtest() if buildstatus == False: return False @@ -166,7 +150,7 @@ def test(self, test_data: HIPTestData): if not res: test_data.test_result = TestResult.FAIL return - res = self.buildtest(testLogger, test_data, test_data.HIP_PLATFORM) + res = self.buildtest(testLogger, test_data.HIP_PLATFORM) if not res: test_data.test_result = TestResult.FAIL return @@ -214,7 +198,7 @@ def test(self, test_data: HIPTestData): if not res: test_data.test_result = TestResult.FAIL return - res = self.buildtest(testLogger, test_data, test_data.HIP_PLATFORM) + res = self.buildtest(testLogger, test_data.HIP_PLATFORM) if not res: test_data.test_result = TestResult.FAIL return diff --git a/src/testsuite/applications/hpc_apps/laghos/laghos_build_amd.py b/src/hiptestsuite/applications/hpc_apps/laghos/laghos_build_amd.py similarity index 64% rename from src/testsuite/applications/hpc_apps/laghos/laghos_build_amd.py rename to src/hiptestsuite/applications/hpc_apps/laghos/laghos_build_amd.py index d90993f..2e81a5e 100644 --- a/src/testsuite/applications/hpc_apps/laghos/laghos_build_amd.py +++ b/src/hiptestsuite/applications/hpc_apps/laghos/laghos_build_amd.py @@ -21,9 +21,8 @@ import os import re import tempfile -from testsuite.Test import HIPTestData -from testsuite.common.hip_shell import * -from testsuite.applications.hpc_apps.laghos.laghos_parser_common import LaghosParser +from hiptestsuite.common.hip_shell import * +from hiptestsuite.applications.hpc_apps.laghos.laghos_parser_common import LaghosParser class BuildRunAmd(): def __init__(self, thistestpath, logFile): @@ -38,79 +37,6 @@ def set_env(self): cmd += "export PATH=${MPI_PATH}/bin:$PATH;" return cmd - def configure_build_openmpi(self, test_data: HIPTestData): - # Check if OpenMPI is already installed. Then return. - if os.path.exists("/usr/local/openmpi/bin") and os.path.exists("/usr/local/openmpi/etc")\ - and os.path.exists("/usr/local/openmpi/lib") and os.path.exists("/usr/local/openmpi/include")\ - and os.path.exists("/usr/local/openmpi/share"): - print("Openmpi already installed. Returning ..") - return True - openmpi_rootdir = os.path.join(self.thistestpath, "openmpi") - cmd = self.set_env() - cmd += "cd " + openmpi_rootdir + ";" - cmd += "./autogen.pl;" - print("Open MPI autogen in progress ..") - runlogdump = tempfile.TemporaryFile("w+") - execshellcmd_largedump(cmd, self.logFile, runlogdump, None) - autogensuccess = False - for line in runlogdump: - if re.search("Open\s+MPI\s+autogen:\s+completed\s+successfully.\s+w00t!", line): - autogensuccess = True - runlogdump.close() - if not autogensuccess: - print("Open MPI autogen in failed! Check if prerequisites (autoconf, automake, libtool and flex) are installed.") - return False - cmd = self.set_env() - cmd += "cd " + openmpi_rootdir + ";" - cmd += "./configure --enable-mpi-cxx --enable-mpi1-compatibility --prefix=/usr/local/openmpi;" - cmd += "make -j;" - cmd += "echo " + test_data.user_password + " | sudo -S make -j install;" - print("Open MPI Configuration+Build in progress ..") - runlogdump = tempfile.TemporaryFile("w+") - execshellcmd_largedump(cmd, self.logFile, runlogdump, None) - runlogdump.close() - # Check if Openmpi is installed - count = 0 - lib32_present = False - lib64_present = False - if os.path.exists("/usr/local/openmpi"): - if os.path.exists("/usr/local/openmpi/bin"): - count = count + 1 - if os.path.exists("/usr/local/openmpi/etc"): - count = count + 1 - if os.path.exists("/usr/local/openmpi/lib"): - count = count + 1 - else: - if os.path.exists("/usr/local/openmpi/lib32"): - count = count + 1 - lib32_present = True - elif os.path.exists("/usr/local/openmpi/lib64"): - count = count + 1 - lib64_present = True - if os.path.exists("/usr/local/openmpi/include"): - count = count + 1 - if os.path.exists("/usr/local/openmpi/share"): - count = count + 1 - else: - print("Openmpi not installed. Build failed!") - return False - if count != 5: - print("Openmpi not installed. Build failed!") - return False - # This step might be necessary on SLES machines - if lib32_present: - print("lib softlink to lib32 needs to be created") - cmd = "cd /usr/local/openmpi/;" - cmd += "echo " + test_data.user_password + "| sudo -S ln -s lib32 lib;" - execshellcmd(cmd, self.logFile, None) - elif lib64_present: - print("lib softlink to lib64 needs to be created") - cmd = "cd /usr/local/openmpi/;" - cmd += "echo " + test_data.user_password + "| sudo -S ln -s lib64 lib;" - execshellcmd(cmd, self.logFile, None) - - return True - def configure_build_hypre(self): if os.path.exists(os.path.join(self.thistestpath, "hypre/src/lib/libHYPRE.a")): print("Hypre already built") @@ -150,7 +76,7 @@ def configure_build_metis(self): return False return True - def configure_build_mfem(self, test_data: HIPTestData): + def configure_build_mfem(self): if os.path.exists(os.path.join(self.thistestpath, "mfem/libmfem.a")): print("Mfem already built") return True @@ -169,7 +95,7 @@ def configure_build_mfem(self, test_data: HIPTestData): return False return True - def configure_build_laghos(self, test_data: HIPTestData): + def configure_build_laghos(self): if os.path.exists(os.path.join(self.thistestpath, "Laghos/laghos")): print("Laghos already built") return True @@ -185,23 +111,28 @@ def configure_build_laghos(self, test_data: HIPTestData): return False return True - def buildtest(self, test_data: HIPTestData): + def buildtest(self): # In this function put the build steps for test cases # which differ across platforms (amd/nvidia/intel) - # print("Password is = ", test_data.user_password) - if not self.configure_build_openmpi(test_data): - print("Openmpi configuration and build failed ..") + # Check if OpenMPI is already installed. Else return. + if os.path.exists("/usr/local/openmpi/bin") and os.path.exists("/usr/local/openmpi/etc")\ + and os.path.exists("/usr/local/openmpi/lib") and os.path.exists("/usr/local/openmpi/include")\ + and os.path.exists("/usr/local/openmpi/share"): + print("Openmpi installed.") + else: + print("Openmpi not installed. Exiting test!") return False + if not self.configure_build_hypre(): print("Hypre configuration and build failed ..") return False if not self.configure_build_metis(): print("Metis configuration and build failed ..") return False - if not self.configure_build_mfem(test_data): + if not self.configure_build_mfem(): print("Mfem configuration and build failed ..") return False - if not self.configure_build_laghos(test_data): + if not self.configure_build_laghos(): print("Laghos configuration and build failed ..") return False diff --git a/src/testsuite/applications/hpc_apps/laghos/laghos_parser_common.py b/src/hiptestsuite/applications/hpc_apps/laghos/laghos_parser_common.py similarity index 97% rename from src/testsuite/applications/hpc_apps/laghos/laghos_parser_common.py rename to src/hiptestsuite/applications/hpc_apps/laghos/laghos_parser_common.py index 0d4b9a2..35c3d9a 100644 --- a/src/testsuite/applications/hpc_apps/laghos/laghos_parser_common.py +++ b/src/hiptestsuite/applications/hpc_apps/laghos/laghos_parser_common.py @@ -18,7 +18,7 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -from testsuite.common.hip_shell import execshellcmd +from hiptestsuite.common.hip_shell import execshellcmd import re class LaghosParser(): diff --git a/src/testsuite/applications/hpc_apps/quicksilver/__init__.py b/src/hiptestsuite/applications/hpc_apps/quicksilver/__init__.py similarity index 100% rename from src/testsuite/applications/hpc_apps/quicksilver/__init__.py rename to src/hiptestsuite/applications/hpc_apps/quicksilver/__init__.py diff --git a/src/testsuite/applications/hpc_apps/quicksilver/quicksilver.py b/src/hiptestsuite/applications/hpc_apps/quicksilver/quicksilver.py similarity index 92% rename from src/testsuite/applications/hpc_apps/quicksilver/quicksilver.py rename to src/hiptestsuite/applications/hpc_apps/quicksilver/quicksilver.py index 1080094..147e52b 100644 --- a/src/testsuite/applications/hpc_apps/quicksilver/quicksilver.py +++ b/src/hiptestsuite/applications/hpc_apps/quicksilver/quicksilver.py @@ -18,13 +18,13 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -from testsuite.TesterRepository import Tester, Test, TestData -from testsuite.Test import HIPTestData, TestResult, HIP_PLATFORM +from hiptestsuite.TesterRepository import Tester, Test, TestData +from hiptestsuite.Test import HIPTestData, TestResult, HIP_PLATFORM from typing import Union, List -from testsuite.test_classifier import TestClassifier -from testsuite.applications.hpc_apps.quicksilver.quicksilver_build_amd import BuildRunAmd -from testsuite.common.hip_get_packages import HipPackages -from testsuite.common.hip_shell import execshellcmd +from hiptestsuite.test_classifier import TestClassifier +from hiptestsuite.applications.hpc_apps.quicksilver.quicksilver_build_amd import BuildRunAmd +from hiptestsuite.common.hip_get_packages import HipPackages +from hiptestsuite.common.hip_shell import execshellcmd import os import re @@ -34,7 +34,7 @@ def __init__(self, cwd, binary): self.cwdAbs = cwd self.binary = binary self.app_path = os.path.join(self.cwdAbs,\ - "src/testsuite/applications/hpc_apps/quicksilver/") + "src/hiptestsuite/applications/hpc_apps/quicksilver/") self.app_root = os.path.join(self.app_path, "Quicksilver/") self.thistestpath = self.app_root self.prepareobj = None diff --git a/src/testsuite/applications/hpc_apps/quicksilver/quicksilver_build_amd.py b/src/hiptestsuite/applications/hpc_apps/quicksilver/quicksilver_build_amd.py similarity index 94% rename from src/testsuite/applications/hpc_apps/quicksilver/quicksilver_build_amd.py rename to src/hiptestsuite/applications/hpc_apps/quicksilver/quicksilver_build_amd.py index 25acea0..8afc662 100644 --- a/src/testsuite/applications/hpc_apps/quicksilver/quicksilver_build_amd.py +++ b/src/hiptestsuite/applications/hpc_apps/quicksilver/quicksilver_build_amd.py @@ -19,8 +19,8 @@ # THE SOFTWARE. import os -from testsuite.common.hip_shell import execshellcmd -from testsuite.applications.hpc_apps.quicksilver.quicksilver_parser_common import QuicksilverParser +from hiptestsuite.common.hip_shell import execshellcmd +from hiptestsuite.applications.hpc_apps.quicksilver.quicksilver_parser_common import QuicksilverParser class BuildRunAmd(): def __init__(self, thistestpath, logFile): diff --git a/src/testsuite/applications/hpc_apps/quicksilver/quicksilver_diff_patch b/src/hiptestsuite/applications/hpc_apps/quicksilver/quicksilver_diff_patch similarity index 100% rename from src/testsuite/applications/hpc_apps/quicksilver/quicksilver_diff_patch rename to src/hiptestsuite/applications/hpc_apps/quicksilver/quicksilver_diff_patch diff --git a/src/testsuite/applications/hpc_apps/quicksilver/quicksilver_parser_common.py b/src/hiptestsuite/applications/hpc_apps/quicksilver/quicksilver_parser_common.py similarity index 97% rename from src/testsuite/applications/hpc_apps/quicksilver/quicksilver_parser_common.py rename to src/hiptestsuite/applications/hpc_apps/quicksilver/quicksilver_parser_common.py index 5b3e06b..b5c9289 100644 --- a/src/testsuite/applications/hpc_apps/quicksilver/quicksilver_parser_common.py +++ b/src/hiptestsuite/applications/hpc_apps/quicksilver/quicksilver_parser_common.py @@ -18,7 +18,7 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -from testsuite.common.hip_shell import execshellcmd +from hiptestsuite.common.hip_shell import execshellcmd import re class QuicksilverParser(): diff --git a/src/testsuite/applications/keccaktreegpu/KeccakTreeGpu/KeccakF.c b/src/hiptestsuite/applications/keccaktreegpu/KeccakTreeGpu/KeccakF.c similarity index 100% rename from src/testsuite/applications/keccaktreegpu/KeccakTreeGpu/KeccakF.c rename to src/hiptestsuite/applications/keccaktreegpu/KeccakTreeGpu/KeccakF.c diff --git a/src/testsuite/applications/keccaktreegpu/KeccakTreeGpu/KeccakF.h b/src/hiptestsuite/applications/keccaktreegpu/KeccakTreeGpu/KeccakF.h similarity index 100% rename from src/testsuite/applications/keccaktreegpu/KeccakTreeGpu/KeccakF.h rename to src/hiptestsuite/applications/keccaktreegpu/KeccakTreeGpu/KeccakF.h diff --git a/src/testsuite/applications/keccaktreegpu/KeccakTreeGpu/KeccakTree.h b/src/hiptestsuite/applications/keccaktreegpu/KeccakTreeGpu/KeccakTree.h similarity index 100% rename from src/testsuite/applications/keccaktreegpu/KeccakTreeGpu/KeccakTree.h rename to src/hiptestsuite/applications/keccaktreegpu/KeccakTreeGpu/KeccakTree.h diff --git a/src/testsuite/applications/keccaktreegpu/KeccakTreeGpu/KeccakTreeCPU.c b/src/hiptestsuite/applications/keccaktreegpu/KeccakTreeGpu/KeccakTreeCPU.c similarity index 100% rename from src/testsuite/applications/keccaktreegpu/KeccakTreeGpu/KeccakTreeCPU.c rename to src/hiptestsuite/applications/keccaktreegpu/KeccakTreeGpu/KeccakTreeCPU.c diff --git a/src/testsuite/applications/keccaktreegpu/KeccakTreeGpu/KeccakTreeCPU.h b/src/hiptestsuite/applications/keccaktreegpu/KeccakTreeGpu/KeccakTreeCPU.h similarity index 100% rename from src/testsuite/applications/keccaktreegpu/KeccakTreeGpu/KeccakTreeCPU.h rename to src/hiptestsuite/applications/keccaktreegpu/KeccakTreeGpu/KeccakTreeCPU.h diff --git a/src/testsuite/applications/keccaktreegpu/KeccakTreeGpu/KeccakTreeGPU.cu b/src/hiptestsuite/applications/keccaktreegpu/KeccakTreeGpu/KeccakTreeGPU.cu similarity index 100% rename from src/testsuite/applications/keccaktreegpu/KeccakTreeGpu/KeccakTreeGPU.cu rename to src/hiptestsuite/applications/keccaktreegpu/KeccakTreeGpu/KeccakTreeGPU.cu diff --git a/src/testsuite/applications/keccaktreegpu/KeccakTreeGpu/KeccakTreeGPU.h b/src/hiptestsuite/applications/keccaktreegpu/KeccakTreeGpu/KeccakTreeGPU.h similarity index 100% rename from src/testsuite/applications/keccaktreegpu/KeccakTreeGpu/KeccakTreeGPU.h rename to src/hiptestsuite/applications/keccaktreegpu/KeccakTreeGpu/KeccakTreeGPU.h diff --git a/src/testsuite/applications/keccaktreegpu/KeccakTreeGpu/KeccakTypes.h b/src/hiptestsuite/applications/keccaktreegpu/KeccakTreeGpu/KeccakTypes.h similarity index 100% rename from src/testsuite/applications/keccaktreegpu/KeccakTreeGpu/KeccakTypes.h rename to src/hiptestsuite/applications/keccaktreegpu/KeccakTreeGpu/KeccakTypes.h diff --git a/src/testsuite/applications/keccaktreegpu/KeccakTreeGpu/Makefile b/src/hiptestsuite/applications/keccaktreegpu/KeccakTreeGpu/Makefile similarity index 100% rename from src/testsuite/applications/keccaktreegpu/KeccakTreeGpu/Makefile rename to src/hiptestsuite/applications/keccaktreegpu/KeccakTreeGpu/Makefile diff --git a/src/testsuite/applications/keccaktreegpu/KeccakTreeGpu/README.txt b/src/hiptestsuite/applications/keccaktreegpu/KeccakTreeGpu/README.txt similarity index 100% rename from src/testsuite/applications/keccaktreegpu/KeccakTreeGpu/README.txt rename to src/hiptestsuite/applications/keccaktreegpu/KeccakTreeGpu/README.txt diff --git a/src/testsuite/applications/keccaktreegpu/KeccakTreeGpu/Test.c b/src/hiptestsuite/applications/keccaktreegpu/KeccakTreeGpu/Test.c similarity index 100% rename from src/testsuite/applications/keccaktreegpu/KeccakTreeGpu/Test.c rename to src/hiptestsuite/applications/keccaktreegpu/KeccakTreeGpu/Test.c diff --git a/src/testsuite/applications/keccaktreegpu/KeccakTreeGpu/Test.h b/src/hiptestsuite/applications/keccaktreegpu/KeccakTreeGpu/Test.h similarity index 100% rename from src/testsuite/applications/keccaktreegpu/KeccakTreeGpu/Test.h rename to src/hiptestsuite/applications/keccaktreegpu/KeccakTreeGpu/Test.h diff --git a/src/testsuite/applications/keccaktreegpu/KeccakTreeGpu/VCKeccakTree/Release/BuildLog.htm b/src/hiptestsuite/applications/keccaktreegpu/KeccakTreeGpu/VCKeccakTree/Release/BuildLog.htm similarity index 100% rename from src/testsuite/applications/keccaktreegpu/KeccakTreeGpu/VCKeccakTree/Release/BuildLog.htm rename to src/hiptestsuite/applications/keccaktreegpu/KeccakTreeGpu/VCKeccakTree/Release/BuildLog.htm diff --git a/src/testsuite/applications/keccaktreegpu/KeccakTreeGpu/VCKeccakTree/Release/KeccakF.obj b/src/hiptestsuite/applications/keccaktreegpu/KeccakTreeGpu/VCKeccakTree/Release/KeccakF.obj similarity index 100% rename from src/testsuite/applications/keccaktreegpu/KeccakTreeGpu/VCKeccakTree/Release/KeccakF.obj rename to src/hiptestsuite/applications/keccaktreegpu/KeccakTreeGpu/VCKeccakTree/Release/KeccakF.obj diff --git a/src/testsuite/applications/keccaktreegpu/KeccakTreeGpu/VCKeccakTree/Release/KeccakTreeCPU.obj b/src/hiptestsuite/applications/keccaktreegpu/KeccakTreeGpu/VCKeccakTree/Release/KeccakTreeCPU.obj similarity index 100% rename from src/testsuite/applications/keccaktreegpu/KeccakTreeGpu/VCKeccakTree/Release/KeccakTreeCPU.obj rename to src/hiptestsuite/applications/keccaktreegpu/KeccakTreeGpu/VCKeccakTree/Release/KeccakTreeCPU.obj diff --git a/src/testsuite/applications/keccaktreegpu/KeccakTreeGpu/VCKeccakTree/Release/KeccakTreeGPU.cu.obj b/src/hiptestsuite/applications/keccaktreegpu/KeccakTreeGpu/VCKeccakTree/Release/KeccakTreeGPU.cu.obj similarity index 100% rename from src/testsuite/applications/keccaktreegpu/KeccakTreeGpu/VCKeccakTree/Release/KeccakTreeGPU.cu.obj rename to src/hiptestsuite/applications/keccaktreegpu/KeccakTreeGpu/VCKeccakTree/Release/KeccakTreeGPU.cu.obj diff --git a/src/testsuite/applications/keccaktreegpu/KeccakTreeGpu/VCKeccakTree/Release/Test.obj b/src/hiptestsuite/applications/keccaktreegpu/KeccakTreeGpu/VCKeccakTree/Release/Test.obj similarity index 100% rename from src/testsuite/applications/keccaktreegpu/KeccakTreeGpu/VCKeccakTree/Release/Test.obj rename to src/hiptestsuite/applications/keccaktreegpu/KeccakTreeGpu/VCKeccakTree/Release/Test.obj diff --git a/src/testsuite/applications/keccaktreegpu/KeccakTreeGpu/VCKeccakTree/Release/VCKeccakTree.ex.renameit b/src/hiptestsuite/applications/keccaktreegpu/KeccakTreeGpu/VCKeccakTree/Release/VCKeccakTree.ex.renameit similarity index 100% rename from src/testsuite/applications/keccaktreegpu/KeccakTreeGpu/VCKeccakTree/Release/VCKeccakTree.ex.renameit rename to src/hiptestsuite/applications/keccaktreegpu/KeccakTreeGpu/VCKeccakTree/Release/VCKeccakTree.ex.renameit diff --git a/src/testsuite/applications/keccaktreegpu/KeccakTreeGpu/VCKeccakTree/Release/VCKeccakTree.exe.intermediate.manifest b/src/hiptestsuite/applications/keccaktreegpu/KeccakTreeGpu/VCKeccakTree/Release/VCKeccakTree.exe.intermediate.manifest similarity index 100% rename from src/testsuite/applications/keccaktreegpu/KeccakTreeGpu/VCKeccakTree/Release/VCKeccakTree.exe.intermediate.manifest rename to src/hiptestsuite/applications/keccaktreegpu/KeccakTreeGpu/VCKeccakTree/Release/VCKeccakTree.exe.intermediate.manifest diff --git a/src/testsuite/applications/keccaktreegpu/KeccakTreeGpu/VCKeccakTree/Release/VCKeccakTree.pdb b/src/hiptestsuite/applications/keccaktreegpu/KeccakTreeGpu/VCKeccakTree/Release/VCKeccakTree.pdb similarity index 100% rename from src/testsuite/applications/keccaktreegpu/KeccakTreeGpu/VCKeccakTree/Release/VCKeccakTree.pdb rename to src/hiptestsuite/applications/keccaktreegpu/KeccakTreeGpu/VCKeccakTree/Release/VCKeccakTree.pdb diff --git a/src/testsuite/applications/keccaktreegpu/KeccakTreeGpu/VCKeccakTree/Release/cudart32_30_14.dll b/src/hiptestsuite/applications/keccaktreegpu/KeccakTreeGpu/VCKeccakTree/Release/cudart32_30_14.dll similarity index 100% rename from src/testsuite/applications/keccaktreegpu/KeccakTreeGpu/VCKeccakTree/Release/cudart32_30_14.dll rename to src/hiptestsuite/applications/keccaktreegpu/KeccakTreeGpu/VCKeccakTree/Release/cudart32_30_14.dll diff --git a/src/testsuite/applications/keccaktreegpu/KeccakTreeGpu/VCKeccakTree/Release/main.obj b/src/hiptestsuite/applications/keccaktreegpu/KeccakTreeGpu/VCKeccakTree/Release/main.obj similarity index 100% rename from src/testsuite/applications/keccaktreegpu/KeccakTreeGpu/VCKeccakTree/Release/main.obj rename to src/hiptestsuite/applications/keccaktreegpu/KeccakTreeGpu/VCKeccakTree/Release/main.obj diff --git a/src/testsuite/applications/keccaktreegpu/KeccakTreeGpu/VCKeccakTree/Release/mt.dep b/src/hiptestsuite/applications/keccaktreegpu/KeccakTreeGpu/VCKeccakTree/Release/mt.dep similarity index 100% rename from src/testsuite/applications/keccaktreegpu/KeccakTreeGpu/VCKeccakTree/Release/mt.dep rename to src/hiptestsuite/applications/keccaktreegpu/KeccakTreeGpu/VCKeccakTree/Release/mt.dep diff --git a/src/testsuite/applications/keccaktreegpu/KeccakTreeGpu/VCKeccakTree/Release/vc90.idb b/src/hiptestsuite/applications/keccaktreegpu/KeccakTreeGpu/VCKeccakTree/Release/vc90.idb similarity index 100% rename from src/testsuite/applications/keccaktreegpu/KeccakTreeGpu/VCKeccakTree/Release/vc90.idb rename to src/hiptestsuite/applications/keccaktreegpu/KeccakTreeGpu/VCKeccakTree/Release/vc90.idb diff --git a/src/testsuite/applications/keccaktreegpu/KeccakTreeGpu/VCKeccakTree/Release/vc90.pdb b/src/hiptestsuite/applications/keccaktreegpu/KeccakTreeGpu/VCKeccakTree/Release/vc90.pdb similarity index 100% rename from src/testsuite/applications/keccaktreegpu/KeccakTreeGpu/VCKeccakTree/Release/vc90.pdb rename to src/hiptestsuite/applications/keccaktreegpu/KeccakTreeGpu/VCKeccakTree/Release/vc90.pdb diff --git a/src/testsuite/applications/keccaktreegpu/KeccakTreeGpu/VCKeccakTree/VCKeccakTree.ncb b/src/hiptestsuite/applications/keccaktreegpu/KeccakTreeGpu/VCKeccakTree/VCKeccakTree.ncb similarity index 100% rename from src/testsuite/applications/keccaktreegpu/KeccakTreeGpu/VCKeccakTree/VCKeccakTree.ncb rename to src/hiptestsuite/applications/keccaktreegpu/KeccakTreeGpu/VCKeccakTree/VCKeccakTree.ncb diff --git a/src/testsuite/applications/keccaktreegpu/KeccakTreeGpu/VCKeccakTree/VCKeccakTree.sln b/src/hiptestsuite/applications/keccaktreegpu/KeccakTreeGpu/VCKeccakTree/VCKeccakTree.sln similarity index 100% rename from src/testsuite/applications/keccaktreegpu/KeccakTreeGpu/VCKeccakTree/VCKeccakTree.sln rename to src/hiptestsuite/applications/keccaktreegpu/KeccakTreeGpu/VCKeccakTree/VCKeccakTree.sln diff --git a/src/testsuite/applications/keccaktreegpu/KeccakTreeGpu/VCKeccakTree/VCKeccakTree.suo b/src/hiptestsuite/applications/keccaktreegpu/KeccakTreeGpu/VCKeccakTree/VCKeccakTree.suo similarity index 100% rename from src/testsuite/applications/keccaktreegpu/KeccakTreeGpu/VCKeccakTree/VCKeccakTree.suo rename to src/hiptestsuite/applications/keccaktreegpu/KeccakTreeGpu/VCKeccakTree/VCKeccakTree.suo diff --git a/src/testsuite/applications/keccaktreegpu/KeccakTreeGpu/VCKeccakTree/VCKeccakTree.vcproj b/src/hiptestsuite/applications/keccaktreegpu/KeccakTreeGpu/VCKeccakTree/VCKeccakTree.vcproj similarity index 100% rename from src/testsuite/applications/keccaktreegpu/KeccakTreeGpu/VCKeccakTree/VCKeccakTree.vcproj rename to src/hiptestsuite/applications/keccaktreegpu/KeccakTreeGpu/VCKeccakTree/VCKeccakTree.vcproj diff --git a/src/testsuite/applications/keccaktreegpu/KeccakTreeGpu/VCKeccakTree/VCKeccakTree.vcproj.DELLM24.guigui.user b/src/hiptestsuite/applications/keccaktreegpu/KeccakTreeGpu/VCKeccakTree/VCKeccakTree.vcproj.DELLM24.guigui.user similarity index 100% rename from src/testsuite/applications/keccaktreegpu/KeccakTreeGpu/VCKeccakTree/VCKeccakTree.vcproj.DELLM24.guigui.user rename to src/hiptestsuite/applications/keccaktreegpu/KeccakTreeGpu/VCKeccakTree/VCKeccakTree.vcproj.DELLM24.guigui.user diff --git a/src/testsuite/applications/keccaktreegpu/KeccakTreeGpu/VCKeccakTree/vc90.pdb b/src/hiptestsuite/applications/keccaktreegpu/KeccakTreeGpu/VCKeccakTree/vc90.pdb similarity index 100% rename from src/testsuite/applications/keccaktreegpu/KeccakTreeGpu/VCKeccakTree/vc90.pdb rename to src/hiptestsuite/applications/keccaktreegpu/KeccakTreeGpu/VCKeccakTree/vc90.pdb diff --git a/src/testsuite/applications/keccaktreegpu/KeccakTreeGpu/main.c b/src/hiptestsuite/applications/keccaktreegpu/KeccakTreeGpu/main.c similarity index 100% rename from src/testsuite/applications/keccaktreegpu/KeccakTreeGpu/main.c rename to src/hiptestsuite/applications/keccaktreegpu/KeccakTreeGpu/main.c diff --git a/src/testsuite/applications/keccaktreegpu/__init__.py b/src/hiptestsuite/applications/keccaktreegpu/__init__.py similarity index 100% rename from src/testsuite/applications/keccaktreegpu/__init__.py rename to src/hiptestsuite/applications/keccaktreegpu/__init__.py diff --git a/src/testsuite/applications/keccaktreegpu/keccaktreegpu.py b/src/hiptestsuite/applications/keccaktreegpu/keccaktreegpu.py similarity index 88% rename from src/testsuite/applications/keccaktreegpu/keccaktreegpu.py rename to src/hiptestsuite/applications/keccaktreegpu/keccaktreegpu.py index 919a3b0..66f00ca 100644 --- a/src/testsuite/applications/keccaktreegpu/keccaktreegpu.py +++ b/src/hiptestsuite/applications/keccaktreegpu/keccaktreegpu.py @@ -18,14 +18,14 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -from testsuite.TesterRepository import Tester, Test, TestData -from testsuite.Test import HIPTestData, TestResult, HIP_PLATFORM +from hiptestsuite.TesterRepository import Tester, Test, TestData +from hiptestsuite.Test import HIPTestData, TestResult, HIP_PLATFORM from typing import Union, List -from testsuite.test_classifier import TestClassifier -from testsuite.applications.keccaktreegpu.keccaktreegpu_build_amd import BuildRunAmd -from testsuite.applications.keccaktreegpu.keccaktreegpu_build_nvidia import BuildRunNvidia -from testsuite.common.hip_get_packages import HipPackages -from testsuite.common.hip_shell import execshellcmd +from hiptestsuite.test_classifier import TestClassifier +from hiptestsuite.applications.keccaktreegpu.keccaktreegpu_build_amd import BuildRunAmd +from hiptestsuite.applications.keccaktreegpu.keccaktreegpu_build_nvidia import BuildRunNvidia +from hiptestsuite.common.hip_get_packages import HipPackages +from hiptestsuite.common.hip_shell import execshellcmd import os import re @@ -35,7 +35,7 @@ def __init__(self, cwd, binary): self.cwdAbs = cwd self.binary = binary self.app_path = os.path.join(self.cwdAbs,\ - "src/testsuite/applications/keccaktreegpu/KeccakTreeGpu/") + "src/hiptestsuite/applications/keccaktreegpu/KeccakTreeGpu/") self.thistestpath = self.app_path self.prepareobj = None diff --git a/src/testsuite/applications/keccaktreegpu/keccaktreegpu_build_amd.py b/src/hiptestsuite/applications/keccaktreegpu/keccaktreegpu_build_amd.py similarity index 94% rename from src/testsuite/applications/keccaktreegpu/keccaktreegpu_build_amd.py rename to src/hiptestsuite/applications/keccaktreegpu/keccaktreegpu_build_amd.py index 5cc5777..2825856 100644 --- a/src/testsuite/applications/keccaktreegpu/keccaktreegpu_build_amd.py +++ b/src/hiptestsuite/applications/keccaktreegpu/keccaktreegpu_build_amd.py @@ -19,8 +19,8 @@ # THE SOFTWARE. import os -from testsuite.common.hip_shell import execshellcmd -from testsuite.applications.keccaktreegpu.keccaktreegpu_parser_common import KeccakTreeParser +from hiptestsuite.common.hip_shell import execshellcmd +from hiptestsuite.applications.keccaktreegpu.keccaktreegpu_parser_common import KeccakTreeParser class BuildRunAmd(): def __init__(self, thistestpath, logFile, binary): diff --git a/src/testsuite/applications/keccaktreegpu/keccaktreegpu_build_nvidia.py b/src/hiptestsuite/applications/keccaktreegpu/keccaktreegpu_build_nvidia.py similarity index 94% rename from src/testsuite/applications/keccaktreegpu/keccaktreegpu_build_nvidia.py rename to src/hiptestsuite/applications/keccaktreegpu/keccaktreegpu_build_nvidia.py index c015ffa..47e35c8 100644 --- a/src/testsuite/applications/keccaktreegpu/keccaktreegpu_build_nvidia.py +++ b/src/hiptestsuite/applications/keccaktreegpu/keccaktreegpu_build_nvidia.py @@ -19,8 +19,8 @@ # THE SOFTWARE. import os -from testsuite.common.hip_shell import execshellcmd -from testsuite.applications.keccaktreegpu.keccaktreegpu_parser_common import KeccakTreeParser +from hiptestsuite.common.hip_shell import execshellcmd +from hiptestsuite.applications.keccaktreegpu.keccaktreegpu_parser_common import KeccakTreeParser class BuildRunNvidia(): def __init__(self, thistestpath, logFile, binary): diff --git a/src/testsuite/applications/keccaktreegpu/keccaktreegpu_parser_common.py b/src/hiptestsuite/applications/keccaktreegpu/keccaktreegpu_parser_common.py similarity index 97% rename from src/testsuite/applications/keccaktreegpu/keccaktreegpu_parser_common.py rename to src/hiptestsuite/applications/keccaktreegpu/keccaktreegpu_parser_common.py index 86aab4f..2774344 100644 --- a/src/testsuite/applications/keccaktreegpu/keccaktreegpu_parser_common.py +++ b/src/hiptestsuite/applications/keccaktreegpu/keccaktreegpu_parser_common.py @@ -19,7 +19,7 @@ # THE SOFTWARE. import re -from testsuite.common.hip_shell import execshellcmd +from hiptestsuite.common.hip_shell import execshellcmd class KeccakTreeParser(): def __init__(self, results): diff --git a/src/testsuite/applications/mgbench/__init__.py b/src/hiptestsuite/applications/mgbench/__init__.py similarity index 100% rename from src/testsuite/applications/mgbench/__init__.py rename to src/hiptestsuite/applications/mgbench/__init__.py diff --git a/src/testsuite/applications/mgbench/mgbench.py b/src/hiptestsuite/applications/mgbench/mgbench.py similarity index 94% rename from src/testsuite/applications/mgbench/mgbench.py rename to src/hiptestsuite/applications/mgbench/mgbench.py index 1560842..bf34da8 100644 --- a/src/testsuite/applications/mgbench/mgbench.py +++ b/src/hiptestsuite/applications/mgbench/mgbench.py @@ -18,14 +18,14 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -from testsuite.TesterRepository import Tester, Test, TestData -from testsuite.Test import HIPTestData, TestResult, HIP_PLATFORM +from hiptestsuite.TesterRepository import Tester, Test, TestData +from hiptestsuite.Test import HIPTestData, TestResult, HIP_PLATFORM from typing import Union, List -from testsuite.test_classifier import TestClassifier -from testsuite.applications.mgbench.mgbench_build_amd import BuildRunAmd -from testsuite.applications.mgbench.mgbench_build_nvidia import BuildRunNvidia -from testsuite.common.hip_get_packages import HipPackages -from testsuite.common.hip_shell import execshellcmd +from hiptestsuite.test_classifier import TestClassifier +from hiptestsuite.applications.mgbench.mgbench_build_amd import BuildRunAmd +from hiptestsuite.applications.mgbench.mgbench_build_nvidia import BuildRunNvidia +from hiptestsuite.common.hip_get_packages import HipPackages +from hiptestsuite.common.hip_shell import execshellcmd import os import re @@ -36,7 +36,7 @@ def __init__(self, cwd, testpath, mgtestfile, binary): self.mgtestfile = mgtestfile self.binary = binary self.app_path = os.path.join(self.cwdAbs,\ - "src/testsuite/applications/mgbench/") + "src/hiptestsuite/applications/mgbench/") self.app_root = os.path.join(self.app_path, "mgbench/") self.thistestpath = os.path.join(self.app_root, testpath) self.prepareobj = None diff --git a/src/testsuite/applications/mgbench/mgbench_build_amd.py b/src/hiptestsuite/applications/mgbench/mgbench_build_amd.py similarity index 95% rename from src/testsuite/applications/mgbench/mgbench_build_amd.py rename to src/hiptestsuite/applications/mgbench/mgbench_build_amd.py index 6f7d038..bb8f9ab 100644 --- a/src/testsuite/applications/mgbench/mgbench_build_amd.py +++ b/src/hiptestsuite/applications/mgbench/mgbench_build_amd.py @@ -19,8 +19,8 @@ # THE SOFTWARE. import os -from testsuite.common.hip_shell import execshellcmd -from testsuite.applications.mgbench.mgbench_parser_common import MgbenchParser +from hiptestsuite.common.hip_shell import execshellcmd +from hiptestsuite.applications.mgbench.mgbench_parser_common import MgbenchParser class BuildRunAmd(): def __init__(self, app_root, thistestpath, logFile, mgtestfile, binary): diff --git a/src/testsuite/applications/mgbench/mgbench_build_nvidia.py b/src/hiptestsuite/applications/mgbench/mgbench_build_nvidia.py similarity index 96% rename from src/testsuite/applications/mgbench/mgbench_build_nvidia.py rename to src/hiptestsuite/applications/mgbench/mgbench_build_nvidia.py index 7f474ab..0230705 100644 --- a/src/testsuite/applications/mgbench/mgbench_build_nvidia.py +++ b/src/hiptestsuite/applications/mgbench/mgbench_build_nvidia.py @@ -19,8 +19,8 @@ # THE SOFTWARE. import os -from testsuite.common.hip_shell import execshellcmd -from testsuite.applications.mgbench.mgbench_parser_common import MgbenchParser +from hiptestsuite.common.hip_shell import execshellcmd +from hiptestsuite.applications.mgbench.mgbench_parser_common import MgbenchParser class BuildRunNvidia(): def __init__(self, app_root, thistestpath, logFile, mgtestfile, binary): diff --git a/src/testsuite/applications/mgbench/mgbench_parser_common.py b/src/hiptestsuite/applications/mgbench/mgbench_parser_common.py similarity index 97% rename from src/testsuite/applications/mgbench/mgbench_parser_common.py rename to src/hiptestsuite/applications/mgbench/mgbench_parser_common.py index 6d6fd8d..2c0c3e2 100644 --- a/src/testsuite/applications/mgbench/mgbench_parser_common.py +++ b/src/hiptestsuite/applications/mgbench/mgbench_parser_common.py @@ -20,7 +20,7 @@ import os import re -from testsuite.common.hip_shell import execshellcmd +from hiptestsuite.common.hip_shell import execshellcmd class MgbenchParser(): def __init__(self, results): diff --git a/src/testsuite/common/__init__.py b/src/hiptestsuite/common/__init__.py similarity index 100% rename from src/testsuite/common/__init__.py rename to src/hiptestsuite/common/__init__.py diff --git a/src/testsuite/common/hip_get_packages.py b/src/hiptestsuite/common/hip_get_packages.py similarity index 81% rename from src/testsuite/common/hip_get_packages.py rename to src/hiptestsuite/common/hip_get_packages.py index f625153..99e310b 100644 --- a/src/testsuite/common/hip_get_packages.py +++ b/src/hiptestsuite/common/hip_get_packages.py @@ -18,7 +18,7 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -from testsuite.common.hip_shell import execshellcmd +from hiptestsuite.common.hip_shell import execshellcmd import os @@ -26,12 +26,12 @@ class HipPackages(): def __init__(self): self.cwdAbs = os.getcwd() - self.conformancePath = os.path.join(self.cwdAbs, "src/testsuite/conformance/") + self.conformancePath = os.path.join(self.cwdAbs, "src/hiptestsuite/conformance/") # HIP & HIPAMD self.hippath = os.path.join(self.conformancePath, "HIP/") self.hipamdpath = os.path.join(self.conformancePath, "HIPAMD/") # HIP-Examples - self.appPath = os.path.join(self.cwdAbs,"src/testsuite/applications/hip_examples/") + self.appPath = os.path.join(self.cwdAbs,"src/hiptestsuite/applications/hip_examples/") self.examplepath = os.path.join(self.appPath, "HIP-Examples/") self.mixbenchpath = os.path.join(self.appPath, "mixbench/") self.gpustrmpath = os.path.join(self.appPath, "GPU-STREAM/") @@ -39,32 +39,30 @@ def __init__(self): self.rocclrpath = os.path.join(self.conformancePath, "ROCclr/") self.openclpath = os.path.join(self.conformancePath, "ROCm-OpenCL-Runtime/") # mgbench - self.mgbenchrootpath = os.path.join(self.cwdAbs, "src/testsuite/applications/mgbench/") + self.mgbenchrootpath = os.path.join(self.cwdAbs, "src/hiptestsuite/applications/mgbench/") self.mgbenchapppath = os.path.join(self.mgbenchrootpath, "mgbench/") # CUDA-grep - self.cudagreprootpath = os.path.join(self.cwdAbs, "src/testsuite/applications/cuda_grep/") + self.cudagreprootpath = os.path.join(self.cwdAbs, "src/hiptestsuite/applications/cuda_grep/") self.cudagrepapppath = os.path.join(self.cudagreprootpath, "CUDA-grep/") # cuda_memtest - self.cudamemrootpath = os.path.join(self.cwdAbs, "src/testsuite/applications/cuda_memtest/") + self.cudamemrootpath = os.path.join(self.cwdAbs, "src/hiptestsuite/applications/cuda_memtest/") self.cudamemapppath = os.path.join(self.cudamemrootpath, "cuda_memtest/") # Quicksilver - self.qsrootpath = os.path.join(self.cwdAbs, "src/testsuite/applications/hpc_apps/quicksilver/") + self.qsrootpath = os.path.join(self.cwdAbs, "src/hiptestsuite/applications/hpc_apps/quicksilver/") self.qsapppath = os.path.join(self.qsrootpath, "Quicksilver/") # Gridtools - self.gridtoolsrootpath = os.path.join(self.cwdAbs, "src/testsuite/applications/hpc_apps/gridtools/GridTools/") + self.gridtoolsrootpath = os.path.join(self.cwdAbs, "src/hiptestsuite/applications/hpc_apps/gridtools/GridTools/") self.gridtoolsapppath = os.path.join(self.gridtoolsrootpath, "gridtools/") - self.gtbenchrootpath = os.path.join(self.cwdAbs, "src/testsuite/applications/hpc_apps/gridtools/GridTools/") + self.gtbenchrootpath = os.path.join(self.cwdAbs, "src/hiptestsuite/applications/hpc_apps/gridtools/GridTools/") self.gtbenchapppath = os.path.join(self.gtbenchrootpath, "gtbench/") # Kokkos - self.kokkosrootpath = os.path.join(self.cwdAbs, "src/testsuite/applications/hpc_apps/kokkos/") + self.kokkosrootpath = os.path.join(self.cwdAbs, "src/hiptestsuite/applications/hpc_apps/kokkos/") self.kokkosapppath = os.path.join(self.kokkosrootpath, "kokkos/") # Laghos - self.mfemrootpath = os.path.join(self.cwdAbs, "src/testsuite/applications/hpc_apps/laghos/") + self.mfemrootpath = os.path.join(self.cwdAbs, "src/hiptestsuite/applications/hpc_apps/laghos/") self.mfemapppath = os.path.join(self.mfemrootpath, "mfem/") - self.laghosrootpath = os.path.join(self.cwdAbs, "src/testsuite/applications/hpc_apps/laghos/") + self.laghosrootpath = os.path.join(self.cwdAbs, "src/hiptestsuite/applications/hpc_apps/laghos/") self.laghosapppath = os.path.join(self.laghosrootpath, "Laghos/") - self.mpirootpath = os.path.join(self.cwdAbs, "src/testsuite/applications/hpc_apps/laghos/") - self.mpiapppath = os.path.join(self.mpirootpath, "openmpi/") def pull_repo(self, logFile, repo, branch, commitId, reponame): repo_root_path = "" @@ -134,10 +132,6 @@ def pull_repo(self, logFile, repo, branch, commitId, reponame): repo_root_path = self.laghosapppath repo_location = self.laghosrootpath repo_dir = "Laghos" - elif reponame == "openmpi": - repo_root_path = self.mpiapppath - repo_location = self.mpirootpath - repo_dir = "openmpi" if os.path.isdir(repo_root_path) and os.path.isdir(repo_root_path + "/.git"): print(reponame + " already exist") @@ -163,11 +157,12 @@ def pull_repo(self, logFile, repo, branch, commitId, reponame): cmdcd = "cd " + repo_location + ";" cmdcd += "rm -Rf " + repo_dir + "/;" cmdPull = "" + print("Cloning " + reponame + " to " + repo_location) if branch == "": #No branch name provided. Clone from main branch. cmdPull = "git clone " + repo else: + print("From branch: " + branch) cmdPull = "git clone -b " + branch + " " + repo - print("Cloning the latest repo from branch = " + branch + "...") cmdexc = cmdcd + cmdPull # Clone the latest version from repo execshellcmd(cmdexc, logFile, None) @@ -178,6 +173,7 @@ def pull_repo(self, logFile, repo, branch, commitId, reponame): print(reponame + " cloned successfully") # At this point check ensure git head is pointing to commitId if commitId != "": + print("Resetting to commit: " + commitId) cmdcd = "cd " + repo_root_path + ";" cmdexc = cmdcd + "git reset --hard " + commitId + ";" execshellcmd(cmdexc, logFile, None) diff --git a/src/testsuite/common/hip_shell.py b/src/hiptestsuite/common/hip_shell.py similarity index 100% rename from src/testsuite/common/hip_shell.py rename to src/hiptestsuite/common/hip_shell.py diff --git a/src/testsuite/config_processor.py b/src/hiptestsuite/config_processor.py similarity index 97% rename from src/testsuite/config_processor.py rename to src/hiptestsuite/config_processor.py index 0cd99e4..46a22de 100644 --- a/src/testsuite/config_processor.py +++ b/src/hiptestsuite/config_processor.py @@ -18,7 +18,7 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -from testsuite.AMD import AMDObject +from hiptestsuite.AMD import AMDObject class ConfigProcessor(AMDObject): diff --git a/src/testsuite/conformance/CMakePatch b/src/hiptestsuite/conformance/CMakePatch similarity index 100% rename from src/testsuite/conformance/CMakePatch rename to src/hiptestsuite/conformance/CMakePatch diff --git a/src/testsuite/conformance/__init__.py b/src/hiptestsuite/conformance/__init__.py similarity index 100% rename from src/testsuite/conformance/__init__.py rename to src/hiptestsuite/conformance/__init__.py diff --git a/src/testsuite/conformance/conformance_test_classifier.py b/src/hiptestsuite/conformance/conformance_test_classifier.py similarity index 96% rename from src/testsuite/conformance/conformance_test_classifier.py rename to src/hiptestsuite/conformance/conformance_test_classifier.py index 54edc0f..8b805e4 100644 --- a/src/testsuite/conformance/conformance_test_classifier.py +++ b/src/hiptestsuite/conformance/conformance_test_classifier.py @@ -18,7 +18,7 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -from testsuite.test_classifier import TestClassifier +from hiptestsuite.test_classifier import TestClassifier from typing import Union diff --git a/src/testsuite/conformance/hip_dtest.py b/src/hiptestsuite/conformance/hip_dtest.py similarity index 89% rename from src/testsuite/conformance/hip_dtest.py rename to src/hiptestsuite/conformance/hip_dtest.py index e86b267..c62b701 100644 --- a/src/testsuite/conformance/hip_dtest.py +++ b/src/hiptestsuite/conformance/hip_dtest.py @@ -18,15 +18,15 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -from testsuite.TesterRepository import Tester -from testsuite.Test import HIPTestData, TestResult, Test, HIPBuildData, HIP_PLATFORM +from hiptestsuite.TesterRepository import Tester +from hiptestsuite.Test import HIPTestData, TestResult, Test, HIPBuildData, HIP_PLATFORM from typing import Union, List -from testsuite.conformance.conformance_test_classifier import CONFORMANCE -from testsuite.test_classifier import TestClassifier -from testsuite.conformance.hip_dtest_build_amd import BuildRunAmd -from testsuite.conformance.hip_dtest_build_nvidia import BuildRunNvidia -from testsuite.common.hip_get_packages import HipPackages -from testsuite.common.hip_shell import * +from hiptestsuite.conformance.conformance_test_classifier import CONFORMANCE +from hiptestsuite.test_classifier import TestClassifier +from hiptestsuite.conformance.hip_dtest_build_amd import BuildRunAmd +from hiptestsuite.conformance.hip_dtest_build_nvidia import BuildRunNvidia +from hiptestsuite.common.hip_get_packages import HipPackages +from hiptestsuite.common.hip_shell import * import os diff --git a/src/testsuite/conformance/hip_dtest_build_amd.py b/src/hiptestsuite/conformance/hip_dtest_build_amd.py similarity index 94% rename from src/testsuite/conformance/hip_dtest_build_amd.py rename to src/hiptestsuite/conformance/hip_dtest_build_amd.py index bd355af..fce86cb 100644 --- a/src/testsuite/conformance/hip_dtest_build_amd.py +++ b/src/hiptestsuite/conformance/hip_dtest_build_amd.py @@ -22,8 +22,8 @@ import tempfile import json import re -from testsuite.common.hip_shell import execshellcmd_largedump, execshellcmd -from testsuite.conformance.hip_dtest_build_common import BuildRunCommon +from hiptestsuite.common.hip_shell import execshellcmd_largedump, execshellcmd +from hiptestsuite.conformance.hip_dtest_build_common import BuildRunCommon class BuildRunAmd(BuildRunCommon): ''' diff --git a/src/testsuite/conformance/hip_dtest_build_common.py b/src/hiptestsuite/conformance/hip_dtest_build_common.py similarity index 95% rename from src/testsuite/conformance/hip_dtest_build_common.py rename to src/hiptestsuite/conformance/hip_dtest_build_common.py index 5b758f7..e88ff39 100644 --- a/src/testsuite/conformance/hip_dtest_build_common.py +++ b/src/hiptestsuite/conformance/hip_dtest_build_common.py @@ -21,7 +21,7 @@ import os import tempfile import re -from testsuite.common.hip_shell import execshellcmd_largedump, execshellcmd +from hiptestsuite.common.hip_shell import execshellcmd_largedump, execshellcmd class BuildRunCommon(): ''' @@ -30,7 +30,7 @@ class BuildRunCommon(): ''' def __init__(self, logfile): self.logfile = logfile - self.hippath = os.path.join(os.getcwd(), "src/testsuite/conformance/HIP") + self.hippath = os.path.join(os.getcwd(), "src/hiptestsuite/conformance/HIP") self.ctest_file = os.path.join(self.hippath, "build/ctest.txt") self.builddir = os.path.join(self.hippath, "build") self.expected_catch_binaries = ["ABMTests","MultiProcTests","UnitTests"] diff --git a/src/testsuite/conformance/hip_dtest_build_nvidia.py b/src/hiptestsuite/conformance/hip_dtest_build_nvidia.py similarity index 95% rename from src/testsuite/conformance/hip_dtest_build_nvidia.py rename to src/hiptestsuite/conformance/hip_dtest_build_nvidia.py index 2ed3ea6..334e058 100644 --- a/src/testsuite/conformance/hip_dtest_build_nvidia.py +++ b/src/hiptestsuite/conformance/hip_dtest_build_nvidia.py @@ -22,8 +22,8 @@ import tempfile import json import re -from testsuite.common.hip_shell import execshellcmd_largedump, execshellcmd -from testsuite.conformance.hip_dtest_build_common import BuildRunCommon +from hiptestsuite.common.hip_shell import execshellcmd_largedump, execshellcmd +from hiptestsuite.conformance.hip_dtest_build_common import BuildRunCommon class BuildRunNvidia(BuildRunCommon): ''' diff --git a/src/testsuite/list_tests.py b/src/hiptestsuite/list_tests.py similarity index 96% rename from src/testsuite/list_tests.py rename to src/hiptestsuite/list_tests.py index fe09c1e..0c09f15 100644 --- a/src/testsuite/list_tests.py +++ b/src/hiptestsuite/list_tests.py @@ -22,9 +22,9 @@ import typing from typing import Union, List -from testsuite.TesterRepository import TesterRepository, GetTests -from testsuite.Test import Test, Quick -from testsuite.test_classifier import TestClassifier +from hiptestsuite.TesterRepository import TesterRepository, GetTests +from hiptestsuite.Test import Test, Quick +from hiptestsuite.test_classifier import TestClassifier def list_tests(quick: bool, cfg, tester_repository=None): diff --git a/src/testsuite/match_fun_args_call.py b/src/hiptestsuite/match_fun_args_call.py similarity index 100% rename from src/testsuite/match_fun_args_call.py rename to src/hiptestsuite/match_fun_args_call.py diff --git a/src/testsuite/stress/__init__.py b/src/hiptestsuite/stress/__init__.py similarity index 100% rename from src/testsuite/stress/__init__.py rename to src/hiptestsuite/stress/__init__.py diff --git a/src/testsuite/targets.py b/src/hiptestsuite/targets.py similarity index 98% rename from src/testsuite/targets.py rename to src/hiptestsuite/targets.py index 070b52f..16fc502 100644 --- a/src/testsuite/targets.py +++ b/src/hiptestsuite/targets.py @@ -18,7 +18,7 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -from testsuite.AMD import AMDObject +from hiptestsuite.AMD import AMDObject class Target: diff --git a/src/testsuite/test_classifier.py b/src/hiptestsuite/test_classifier.py similarity index 97% rename from src/testsuite/test_classifier.py rename to src/hiptestsuite/test_classifier.py index a99f0a0..4998766 100644 --- a/src/testsuite/test_classifier.py +++ b/src/hiptestsuite/test_classifier.py @@ -18,7 +18,7 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -from testsuite.AMD import AMDObject +from hiptestsuite.AMD import AMDObject from typing import Union diff --git a/src/testsuite/test_selector.py b/src/hiptestsuite/test_selector.py similarity index 98% rename from src/testsuite/test_selector.py rename to src/hiptestsuite/test_selector.py index f1740f2..5438c39 100644 --- a/src/testsuite/test_selector.py +++ b/src/hiptestsuite/test_selector.py @@ -18,8 +18,8 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -from testsuite.AMD import AMDObject -from testsuite.TesterRepository import TesterRepository, Test, GetTests +from hiptestsuite.AMD import AMDObject +from hiptestsuite.TesterRepository import TesterRepository, Test, GetTests from typing import Union, List, Dict import re diff --git a/src/testsuite/thirdparty/__init__.py b/src/hiptestsuite/thirdparty/__init__.py similarity index 100% rename from src/testsuite/thirdparty/__init__.py rename to src/hiptestsuite/thirdparty/__init__.py diff --git a/src/testsuite/version.py b/src/hiptestsuite/version.py similarity index 100% rename from src/testsuite/version.py rename to src/hiptestsuite/version.py