From 1644b6d377104970004e11e6b015490777897129cf641045f4a8782046508039 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Thu, 9 Jan 2025 23:56:48 +0000 Subject: [PATCH 1/3] [info=f520dc5c59d582f1cc1439ef11d39e927c7c6fb1d66f00a29387cdc206274a17] OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/unified-runtime?expand=0&rev=4 --- _scmsync.obsinfo | 4 ++-- unified-runtime.changes | 7 ++++++- unified-runtime.spec | 24 +++++++++++++++++++++--- 3 files changed, 29 insertions(+), 6 deletions(-) diff --git a/_scmsync.obsinfo b/_scmsync.obsinfo index 8ea0bc3..d6586fd 100644 --- a/_scmsync.obsinfo +++ b/_scmsync.obsinfo @@ -1,4 +1,4 @@ -mtime: 1735986864 -commit: bb787aecd0c45eef702d3ca46c99bb7b7fcd0480ae304d455c03b362461f1a02 +mtime: 1736463510 +commit: f520dc5c59d582f1cc1439ef11d39e927c7c6fb1d66f00a29387cdc206274a17 url: https://src.opensuse.org/clibs/unified-runtime revision: master diff --git a/unified-runtime.changes b/unified-runtime.changes index 9c2a5a6..b587a5f 100644 --- a/unified-runtime.changes +++ b/unified-runtime.changes @@ -1,4 +1,9 @@ +------------------------------------------------------------------- +Mon Jan 6 17:06:15 UTC 2025 - Eyad Issa + +- Build OpenCL adapter only on supported platforms (OpenCL 3.0) + ------------------------------------------------------------------- Sat Jan 4 01:01:14 UTC 2025 - Eyad Issa -- Initial packaging at v0.11.2 +- Initial packaging at v0.11.2 diff --git a/unified-runtime.spec b/unified-runtime.spec index c622ea9..e60de5e 100644 --- a/unified-runtime.spec +++ b/unified-runtime.spec @@ -16,6 +16,11 @@ # +%if 0%{?suse_version} > 1600 +%bcond_without opencl_adapter +%else +%bcond_with opencl_adapter +%endif Name: unified-runtime Version: 0.11.2 Release: 0 @@ -27,9 +32,11 @@ Patch1: remove-link.patch BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: ninja -BuildRequires: ocl-icd-devel -BuildRequires: opencl-headers BuildRequires: unified-memory-framework-devel +BuildRequires: pkgconfig +%if %{with opencl_adapter} +BuildRequires: pkgconfig(OpenCL) +%endif %description oneAPI Unified Runtime (UR) provides a unified interface to device @@ -66,6 +73,7 @@ agnostic runtimes such as DPC++. This package contains the oneAPI Unified Runtime native CPU adapter. +%if %{with opencl_adapter} %package -n libur_adapter_opencl0 Summary: oneAPI Unified Runtime OpenCL adapter @@ -74,6 +82,7 @@ oneAPI Unified Runtime (UR) provides a unified interface to device agnostic runtimes such as DPC++. This package contains the oneAPI Unified Runtime OpenCL adapter. +%endif %prep %autosetup -p1 @@ -84,8 +93,10 @@ This package contains the oneAPI Unified Runtime OpenCL adapter. -DUR_USE_EXTERNAL_UMF=ON \ -DUR_BUILD_TESTS=OFF \ -DUR_BUILD_ADAPTER_NATIVE_CPU=ON \ +%if %{with opencl_adapter} -DUR_BUILD_ADAPTER_OPENCL=ON \ -DUR_OPENCL_INCLUDE_DIR=%{_includedir} \ +%endif -DCMAKE_SKIP_RPATH=ON %cmake_build %cmake_build urinfo @@ -100,7 +111,10 @@ rm %{buildroot}%{_libdir}/libur_common.a %ldconfig_scriptlets -n libur_loader0 %ldconfig_scriptlets -n libur_adapter_native_cpu0 + +%if %{with opencl_adapter} %ldconfig_scriptlets -n libur_adapter_opencl0 +%endif %files %license LICENSE.TXT @@ -117,10 +131,12 @@ rm %{buildroot}%{_libdir}/libur_common.a %dir %{_prefix}/lib/cmake/ %{_prefix}/lib/cmake/unified-runtime/ - %{_libdir}/libur_loader.so %{_libdir}/libur_adapter_native_cpu.so + +%if %{with opencl_adapter} %{_libdir}/libur_adapter_opencl.so +%endif %files -n libur_loader0 %{_libdir}/libur_loader.so.0 @@ -130,8 +146,10 @@ rm %{buildroot}%{_libdir}/libur_common.a %{_libdir}/libur_adapter_native_cpu.so.0 %{_libdir}/libur_adapter_native_cpu.so.0.11.2 +%if %{with opencl_adapter} %files -n libur_adapter_opencl0 %{_libdir}/libur_adapter_opencl.so.0 %{_libdir}/libur_adapter_opencl.so.0.11.2 +%endif %changelog From d5efb3241443a5e7ad41764da601d768feaec65b49503df93bcde50d979d5f51 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Thu, 9 Jan 2025 23:57:26 +0000 Subject: [PATCH 2/3] [info=42cf4a393a0970dd32bb3919f2406e68129430917d2b56830c138c131d3c839b] OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/unified-runtime?expand=0&rev=5 --- _scmsync.obsinfo | 4 ++-- unified-runtime.spec | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/_scmsync.obsinfo b/_scmsync.obsinfo index d6586fd..ac564f3 100644 --- a/_scmsync.obsinfo +++ b/_scmsync.obsinfo @@ -1,4 +1,4 @@ -mtime: 1736463510 -commit: f520dc5c59d582f1cc1439ef11d39e927c7c6fb1d66f00a29387cdc206274a17 +mtime: 1736467033 +commit: 42cf4a393a0970dd32bb3919f2406e68129430917d2b56830c138c131d3c839b url: https://src.opensuse.org/clibs/unified-runtime revision: master diff --git a/unified-runtime.spec b/unified-runtime.spec index e60de5e..42df612 100644 --- a/unified-runtime.spec +++ b/unified-runtime.spec @@ -73,7 +73,6 @@ agnostic runtimes such as DPC++. This package contains the oneAPI Unified Runtime native CPU adapter. -%if %{with opencl_adapter} %package -n libur_adapter_opencl0 Summary: oneAPI Unified Runtime OpenCL adapter @@ -82,7 +81,6 @@ oneAPI Unified Runtime (UR) provides a unified interface to device agnostic runtimes such as DPC++. This package contains the oneAPI Unified Runtime OpenCL adapter. -%endif %prep %autosetup -p1 From b55b8ae8097ca0de0f466cd326f37f599af661fe574e16da00a0de85cfb36710 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Fri, 17 Jan 2025 01:21:38 +0000 Subject: [PATCH 3/3] [info=5310eda1249daad245a0f2a4390ff4848af0097b720f540187655e9a41ddec72] OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/unified-runtime?expand=0&rev=6 --- _scmsync.obsinfo | 4 ++-- unified-runtime.changes | 5 +++++ unified-runtime.spec | 6 +++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/_scmsync.obsinfo b/_scmsync.obsinfo index ac564f3..d70c064 100644 --- a/_scmsync.obsinfo +++ b/_scmsync.obsinfo @@ -1,4 +1,4 @@ -mtime: 1736467033 -commit: 42cf4a393a0970dd32bb3919f2406e68129430917d2b56830c138c131d3c839b +mtime: 1736534830 +commit: 5310eda1249daad245a0f2a4390ff4848af0097b720f540187655e9a41ddec72 url: https://src.opensuse.org/clibs/unified-runtime revision: master diff --git a/unified-runtime.changes b/unified-runtime.changes index b587a5f..221f7ad 100644 --- a/unified-runtime.changes +++ b/unified-runtime.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Jan 10 18:46:12 UTC 2025 - Eyad Issa + +- Added the static library to the devel package + ------------------------------------------------------------------- Mon Jan 6 17:06:15 UTC 2025 - Eyad Issa diff --git a/unified-runtime.spec b/unified-runtime.spec index 42df612..eb02145 100644 --- a/unified-runtime.spec +++ b/unified-runtime.spec @@ -87,6 +87,9 @@ This package contains the oneAPI Unified Runtime OpenCL adapter. %build %define __builder ninja +# the static library is needed by the produced cmake files +# otherwise, when using find_package, CMake throws an error +%global _lto_cflags %{?_lto_cflags} -ffat-lto-objects %cmake \ -DUR_USE_EXTERNAL_UMF=ON \ -DUR_BUILD_TESTS=OFF \ @@ -105,7 +108,6 @@ This package contains the oneAPI Unified Runtime OpenCL adapter. install -Dm 755 build/bin/urinfo %{buildroot}%{_bindir}/urinfo rm %{buildroot}%{_includedir}/.clang-format -rm %{buildroot}%{_libdir}/libur_common.a %ldconfig_scriptlets -n libur_loader0 %ldconfig_scriptlets -n libur_adapter_native_cpu0 @@ -131,11 +133,13 @@ rm %{buildroot}%{_libdir}/libur_common.a %{_prefix}/lib/cmake/unified-runtime/ %{_libdir}/libur_loader.so %{_libdir}/libur_adapter_native_cpu.so +%{_libdir}/libur_common.a %if %{with opencl_adapter} %{_libdir}/libur_adapter_opencl.so %endif + %files -n libur_loader0 %{_libdir}/libur_loader.so.0 %{_libdir}/libur_loader.so.0.11.2