zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kripke: update version to 1.2.7 (#44791)

Browse Source 
* initial commit to update kripke to 1.2.7
* fix style errors
This commit is contained in:
afzpatel
2024-07-08 04:16:24 -04:00
committed by GitHub
parent 5e7430975a
commit cef9c36183
2 changed files with 56 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
var/spack/repos/builtin/packages/kripke/001-remove-googletest-from-cmake.patch Normal file
View File

@@ -0,0 +1,25 @@
m aa630efbd686c8581bb893b512dbf1613e1e574d Mon Sep 17 00:00:00 2001
From: Afzal Patel <Afzal.Patel@amd.com>
Date: Thu, 20 Jun 2024 18:40:02 +0000
Subject: [PATCH] Comment out googletest folder
---
CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2f9bff0..3059e26 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -64,7 +64,7 @@ endif()
#
# Add googletest (needed by RAJA, etc)
#
-add_subdirectory(tpl/googletest)
+# add_subdirectory(tpl/googletest)
#
--
2.31.1

33
var/spack/repos/builtin/packages/kripke/package.py
View File

@@ -21,6 +21,15 @@ class Kripke(CMakePackage, CudaPackage, ROCmPackage):
license("BSD-3-Clause")
version("develop", branch="develop", submodules=False)
version(
"1.2.7", submodules=True, tag="v1.2.7", commit="ddcac43cdad999f0346eb682065ef0af1847029d"
)
version(
"1.2.6", submodules=True, tag="v1.2.6", commit="55b39f34b68c68b2d828a33a75568abd66e1019f"
)
version(
"1.2.5", submodules=True, tag="v1.2.5", commit="20e9ea975f1bf567829323a18927b69bed3f4ebd"
)
version(
"1.2.4", submodules=False, tag="v1.2.4", commit="d85c6bc462f17a2382b11ba363059febc487f771"
)
@@ -55,10 +64,26 @@ class Kripke(CMakePackage, CudaPackage, ROCmPackage):
depends_on("caliper", when="+caliper")
depends_on("adiak@0.4:", when="+caliper")
depends_on("chai~examples+raja")
depends_on("raja~exercises~examples")
depends_on("raja@:2024.02.1~exercises~examples")
depends_on("umpire~examples")
with when("+rocm @1.2.5:"):
depends_on("raja+rocm", when="+rocm")
depends_on("chai+rocm", when="+rocm")
for arch in ROCmPackage.amdgpu_targets:
depends_on(
"raja+rocm amdgpu_target={0}".format(arch), when="amdgpu_target={0}".format(arch)
)
depends_on(
"chai+rocm amdgpu_target={0}".format(arch), when="amdgpu_target={0}".format(arch)
)
conflicts("^blt@:0.3.6", when="+rocm")
# googletest folder version hasn't been updated in over 5 years
# and is commented out in later releases
patch("001-remove-googletest-from-cmake.patch", when="@1.2.5:1.2.6")
def cmake_args(self):
spec = self.spec
args = []
@@ -85,6 +110,7 @@ def cmake_args(self):
# Set up the hip macros needed by the build
args.append("-DENABLE_HIP=ON")
args.append("-DHIP_ROOT_DIR={0}".format(spec["hip"].prefix))
args.append(self.define("CMAKE_CXX_COMPILER", self.spec["hip"].hipcc))
rocm_archs = spec.variants["amdgpu_target"].value
if "none" not in rocm_archs:
args.append("-DHIP_HIPCC_FLAGS=--amdgpu-target={0}".format(",".join(rocm_archs)))
@@ -113,4 +139,7 @@ def install(self, spec, prefix):
# Kripke does not provide install target, so we have to copy
# things into place.
mkdirp(prefix.bin)
install(join_path(self.build_directory, "kripke.exe"), prefix.bin)
if spec.satisfies("@:1.2.4") or spec.satisfies("@1.2.7:"):
install(join_path(self.build_directory, "kripke.exe"), prefix.bin)
else:
install(join_path(self.build_directory, "bin", "kripke.exe"), prefix.bin)