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

ginkgo@1.7 %oneapi@2024.1: icpx 2024.1 no longer accepts sycl::ext::intel::ctz (#43476)

Browse Source
This commit is contained in:
eugeneswalker
2024-04-03 14:46:42 -07:00
committed by GitHub
parent efaed17f91
commit 4517c7fa9b
2 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
var/spack/repos/builtin/packages/ginkgo/ginkgo-dpcpp-intrinsincs-oneapi-2024.1.patch Normal file
View File

@@ -0,0 +1,19 @@
diff -ruN spack-src/dpcpp/components/intrinsics.dp.hpp spack-src-patched/dpcpp/components/intrinsics.dp.hpp
--- spack-src/dpcpp/components/intrinsics.dp.hpp 2024-04-03 18:53:42.724032846 +0000
+++ spack-src-patched/dpcpp/components/intrinsics.dp.hpp 2024-04-03 18:55:01.744543032 +0000
@@ -67,13 +67,13 @@
*/
__dpct_inline__ int ffs(uint32 mask)
{
- return (mask == 0) ? 0 : (sycl::ext::intel::ctz(mask) + 1);
+ return (mask == 0) ? 0 : (sycl::ctz(mask) + 1);
}
/** @copydoc ffs */
__dpct_inline__ int ffs(uint64 mask)
{
- return (mask == 0) ? 0 : (sycl::ext::intel::ctz(mask) + 1);
+ return (mask == 0) ? 0 : (sycl::ctz(mask) + 1);
}

3
var/spack/repos/builtin/packages/ginkgo/package.py
View File

@@ -106,6 +106,9 @@ class Ginkgo(CMakePackage, CudaPackage, ROCmPackage):
# https://github.com/ginkgo-project/ginkgo/pull/1524 # https://github.com/ginkgo-project/ginkgo/pull/1524
patch("ginkgo-sycl-pr1524.patch", when="@1.7.0 +sycl %oneapi@2024:") patch("ginkgo-sycl-pr1524.patch", when="@1.7.0 +sycl %oneapi@2024:")
# https://github.com/ginkgo-project/ginkgo/pull/1585
patch("ginkgo-dpcpp-intrinsincs-oneapi-2024.1.patch", when="@1.7.0 +sycl %oneapi@2024.1:")
# Skip smoke tests if compatible hardware isn't found # Skip smoke tests if compatible hardware isn't found
patch("1.4.0_skip_invalid_smoke_tests.patch", when="@1.4.0") patch("1.4.0_skip_invalid_smoke_tests.patch", when="@1.4.0")