forked from spack/spack
-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
update hipblas rocalution, rocsolver, rocsparse to new syntax (spack#…
…40135) * initial commit to update hipblas rocalution, rocsolver, rocsparse to new syntax * add rocblas test changes and fixes for hipblas and rocsolver tests * fix styling * remove updates for rocblas
- Loading branch information
Showing
5 changed files
with
44 additions
and
15 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -132,10 +132,7 @@ class Hipblas(CMakePackage, CudaPackage, ROCmPackage): | |
patch("link-clients-blas.patch", when="@4.3.0:4.3.2") | ||
patch("link-clients-blas-4.5.0.patch", when="@4.5.0:4.5.2") | ||
patch("hipblas-link-clients-blas-5.0.0.patch", when="@5.0.0:5.0.2") | ||
|
||
def check(self): | ||
exe = join_path(self.build_directory, "clients", "staging", "hipblas-test") | ||
self.run_test(exe, options=["--gtest_filter=-*known_bug*"]) | ||
patch("remove-hipblas-clients-file-installation.patch", when="@5.5:") | ||
|
||
depends_on("[email protected]:", type="build", when="@5.2.0:") | ||
depends_on("[email protected]:", type="build", when="@4.5.0:") | ||
|
@@ -222,3 +219,9 @@ def cmake_args(self): | |
args.append("-DCMAKE_INSTALL_LIBDIR=lib") | ||
|
||
return args | ||
|
||
@run_after("build") | ||
@on_package_attributes(run_tests=True) | ||
def check_build(self): | ||
exe = Executable(join_path(self.build_directory, "clients", "staging", "hipblas-test")) | ||
exe("--gtest_filter=-*known_bug*") |
18 changes: 18 additions & 0 deletions
18
var/spack/repos/builtin/packages/hipblas/remove-hipblas-clients-file-installation.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
diff --git a/clients/CMakeLists.txt b/clients/CMakeLists.txt | ||
index 2ae1535..c956e00 100644 | ||
--- a/clients/CMakeLists.txt | ||
+++ b/clients/CMakeLists.txt | ||
@@ -134,13 +134,3 @@ add_custom_command( OUTPUT "${HIPBLAS_GENTEST}" | ||
|
||
add_custom_target( hipblas-common DEPENDS "${HIPBLAS_COMMON}" "${HIPBLAS_TEMPLATE}" "${HIPBLAS_SMOKE}" "${HIPBLAS_GENTEST}" ) | ||
|
||
-rocm_install( | ||
- FILES ${HIPBLAS_COMMON} ${HIPBLAS_TEMPLATE} ${HIPBLAS_SMOKE} | ||
- DESTINATION "${CMAKE_INSTALL_BINDIR}" | ||
- COMPONENT clients-common | ||
-) | ||
-rocm_install( | ||
- PROGRAMS ${HIPBLAS_GENTEST} | ||
- DESTINATION "${CMAKE_INSTALL_BINDIR}" | ||
- COMPONENT clients-common | ||
-) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -126,6 +126,7 @@ class Rocsolver(CMakePackage): | |
depends_on("[email protected]:", type="build", when="@4.1.0:") | ||
depends_on("[email protected]:", type="build") | ||
depends_on("fmt@7:", type="build", when="@4.5.0:") | ||
depends_on("fmt@7:8.0.1", type="test", when="@5.6:") | ||
|
||
depends_on("[email protected]:", type="test") | ||
depends_on("[email protected]:", type="test") | ||
|
@@ -136,10 +137,6 @@ class Rocsolver(CMakePackage): | |
# Maximize compatibility with other libraries that are using fmt. | ||
patch("fmt-9-compatibility.patch", when="@5.2.0:5.5") | ||
|
||
def check(self): | ||
exe = join_path(self.build_directory, "clients", "staging", "rocsolver-test") | ||
self.run_test(exe, options=["--gtest_filter=checkin*-*known_bug*"]) | ||
|
||
depends_on("[email protected]:", when="@4.1.0:") | ||
depends_on("rocm-cmake@master", type="build", when="@master:") | ||
depends_on("[email protected]:", type="build", when="@4.5.0:") | ||
|
@@ -236,3 +233,9 @@ def cmake_args(self): | |
|
||
def setup_build_environment(self, env): | ||
env.set("CXX", self.spec["hip"].hipcc) | ||
|
||
@run_after("build") | ||
@on_package_attributes(run_tests=True) | ||
def check_build(self): | ||
exe = Executable(join_path(self.build_directory, "clients", "staging", "rocsolver-test")) | ||
exe("--gtest_filter=checkin*-*known_bug*") |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters