diff options
| author | eugeneswalker <38933153+eugeneswalker@users.noreply.github.com> | 2024-01-18 13:57:24 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-18 13:57:24 -0800 |
| commit | eb5494e9cc279488d73e86983ddee157924cb245 (patch) | |
| tree | 7022f94764d6091657618cbd4863e8de5326d525 | |
| parent | 671dab97d5d7804147866f77b26b95fa1c336637 (diff) | |
| download | spack-eb5494e9cc279488d73e86983ddee157924cb245.tar.gz spack-eb5494e9cc279488d73e86983ddee157924cb245.tar.bz2 spack-eb5494e9cc279488d73e86983ddee157924cb245.tar.xz spack-eb5494e9cc279488d73e86983ddee157924cb245.zip | |
ginkgo@1.7.0 %oneapi: patch sycl w changes from ginkgo pr #1524 (#42151)
* ginkgo@1.7.0 %oneapi: patch sycl w changes from ginkgo pr #1524
* constrain patch to %oneapi@2024:
| -rw-r--r-- | var/spack/repos/builtin/packages/ginkgo/ginkgo-sycl-pr1524.patch | 13 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/ginkgo/package.py | 3 |
2 files changed, 16 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/ginkgo/ginkgo-sycl-pr1524.patch b/var/spack/repos/builtin/packages/ginkgo/ginkgo-sycl-pr1524.patch new file mode 100644 index 0000000000..7d1f97fc15 --- /dev/null +++ b/var/spack/repos/builtin/packages/ginkgo/ginkgo-sycl-pr1524.patch @@ -0,0 +1,13 @@ +diff -ruN spack-src/dpcpp/components/cooperative_groups.dp.hpp spack-src-patched/dpcpp/components/cooperative_groups.dp.hpp +--- spack-src/dpcpp/components/cooperative_groups.dp.hpp 2024-01-18 17:25:05.336926061 +0000 ++++ spack-src-patched/dpcpp/components/cooperative_groups.dp.hpp 2024-01-18 17:26:50.649595478 +0000 +@@ -240,7 +240,8 @@ + { + // todo: change it when OneAPI update the mask related api + return sycl::reduce_over_group( +- *this, (predicate != 0) ? mask_type(1) << data_.rank : mask_type(0), ++ static_cast<sycl::sub_group>(*this), ++ (predicate != 0) ? mask_type(1) << data_.rank : mask_type(0), + sycl::plus<mask_type>()); + } + diff --git a/var/spack/repos/builtin/packages/ginkgo/package.py b/var/spack/repos/builtin/packages/ginkgo/package.py index 36363ba3cc..d0ea6b619d 100644 --- a/var/spack/repos/builtin/packages/ginkgo/package.py +++ b/var/spack/repos/builtin/packages/ginkgo/package.py @@ -98,6 +98,9 @@ class Ginkgo(CMakePackage, CudaPackage, ROCmPackage): "+sycl", when="@:1.4.0", msg="For SYCL support, please use Ginkgo version 1.4.0 and newer." ) + # https://github.com/ginkgo-project/ginkgo/pull/1524 + patch("ginkgo-sycl-pr1524.patch", when="@1.7.0 +sycl %oneapi@2024:") + # Skip smoke tests if compatible hardware isn't found patch("1.4.0_skip_invalid_smoke_tests.patch", when="@1.4.0") |