Accepting request 1003326 from home:polslinux:branches:science:machinelearning

- Update to 2.6.2:
  * https://github.com/oneapi-src/oneDNN/releases
- Removed onednn-1045.patch.
- Removed onednn-xbyak-aarch64.patch.

OBS-URL: https://build.opensuse.org/request/show/1003326
OBS-URL: https://build.opensuse.org/package/show/science:machinelearning/onednn?expand=0&rev=16

oneDNN-2.2.4.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ebb383078fa8f81c24310e73984a0d9e759eb9febe73887956953824f780fc32
-size 9535666

oneDNN-2.6.2.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:baed0a7426189c6e5f1cb242c6d282d3638802cbd05772e1c4810a83bd7bc4df
+size 5846494

onednn-1045.patch

@@ -1,21 +0,0 @@
-From a94acd4e2dfaf51552dd2a60b059df1c1f14e452 Mon Sep 17 00:00:00 2001
-From: Alexandre Truong <alexandre.truong@arm.com>
-Date: Wed, 28 Apr 2021 10:32:35 +0100
-Subject: [PATCH] cpu: aarch64: missing include for arm_compute::Scheduler
-
----
- src/cpu/aarch64/acl_indirect_gemm_convolution.hpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/cpu/aarch64/acl_indirect_gemm_convolution.hpp b/src/cpu/aarch64/acl_indirect_gemm_convolution.hpp
-index 86d2bed73..040311f8c 100644
---- a/src/cpu/aarch64/acl_indirect_gemm_convolution.hpp
-+++ b/src/cpu/aarch64/acl_indirect_gemm_convolution.hpp
-@@ -26,6 +26,7 @@
- 
- #include "arm_compute/runtime/FunctionDescriptors.h"
- #include "arm_compute/runtime/NEON/NEFunctions.h"
-+#include "arm_compute/runtime/Scheduler.h"
- 
- namespace dnnl {
- namespace impl {

onednn-xbyak-aarch64.patch

@@ -1,21 +0,0 @@
-From ecb940c16aef22ee5a3aa64a3745c277f6de52c0 Mon Sep 17 00:00:00 2001
-From: Kentaro Kawakami <kawakami.k@fujitsu.com>
-Date: Sun, 13 Jun 2021 13:14:34 +0900
-Subject: [PATCH] fix gcc-11 compile error
-
----
- src/cpu/aarch64/xbyak_aarch64/xbyak_aarch64/xbyak_aarch64.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/cpu/aarch64/xbyak_aarch64/xbyak_aarch64/xbyak_aarch64.h b/src/cpu/aarch64/xbyak_aarch64/xbyak_aarch64/xbyak_aarch64.h
-index 20e4665..7e03812 100644
---- a/src/cpu/aarch64/xbyak_aarch64/xbyak_aarch64/xbyak_aarch64.h
-+++ b/src/cpu/aarch64/xbyak_aarch64/xbyak_aarch64/xbyak_aarch64.h
-@@ -28,6 +28,7 @@
- #include <deque>
- #include <initializer_list>
- #include <iostream>
-+#include <limits>
- #include <list>
- #include <type_traits>
- #include <unordered_map>

onednn.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Tue Sep 13 05:22:52 UTC 2022 - Paolo Stivanin <info@paolostivanin.com>
+
+- Update to 2.6.2:
+  * https://github.com/oneapi-src/oneDNN/releases
+- Removed onednn-1045.patch.
+- Removed onednn-xbyak-aarch64.patch.
+
 -------------------------------------------------------------------
 Tue Jun 15 12:10:39 UTC 2021 - Guillaume GARDET <guillaume.gardet@opensuse.org>
 

onednn.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package onednn
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -31,16 +31,13 @@
 
 %define libname libdnnl2
 Name:           onednn
-Version:        2.2.4
+Version:        2.6.2
 Release:        0
 Summary:        Intel Math Kernel Library for Deep Neural Networks
 License:        Apache-2.0
 URL:            https://01.org/onednn
 Source0:        https://github.com/oneapi-src/oneDNN/archive/v%{version}/oneDNN-%{version}.tar.gz
-# PATCH-FIX-UPSTREAM onednn-1045.patch -- https://github.com/oneapi-src/oneDNN/pull/1045
-Patch0:         onednn-1045.patch
-# PATCH-FIX-UPSTREAM - https://github.com/oneapi-src/oneDNN/issues/1085
-Patch1:         onednn-xbyak-aarch64.patch
+BuildRequires:  chrpath
 BuildRequires:  cmake
 BuildRequires:  doxygen
 BuildRequires:  fdupes
@@ -135,7 +132,7 @@ to implement deep neural networks (DNN) with C and C++ interfaces.
   -DDNNL_BUILD_TESTS=ON \
   -DDNNL_WERROR=OFF
 %cmake_build
-%cmake_build doc
+%cmake_build doc_doxygen
 
 %install
 %cmake_install
@@ -151,10 +148,12 @@ ln -s . mkl-dnn
 popd
 # install the benchmark
 install -D build/tests/benchdnn/benchdnn %{buildroot}/%{_bindir}/benchdnn
-#move install shared lib
+# move install shared lib
 mkdir -vp %{buildroot}%{_datadir}/benchdnn
 cp -vr build/tests/benchdnn/inputs  %{buildroot}%{_datadir}/benchdnn
 
+chrpath -d %{buildroot}/%{_bindir}/benchdnn
+
 %check
 # do not use macro so we can exclude all gpu and cross (gpu and cpu) tests (they need gpu set up)
 pushd build
@@ -171,18 +170,15 @@ popd
 
 %files devel
 %doc README.md
+%license LICENSE
 %{_includedir}/mkl-dnn
-%{_includedir}/mkldnn*.h*
 %{_includedir}/dnnl*.h*
 %dir %{_includedir}/oneapi
 %dir %{_includedir}/oneapi/dnnl
 %{_includedir}/oneapi/dnnl/dnnl*.h*
 %{_libdir}/libdnnl.so
-%{_libdir}/libmkldnn.so
 %dir %{_libdir}/cmake/dnnl
 %{_libdir}/cmake/dnnl/*.cmake
-%dir %{_libdir}/cmake/mkldnn
-%{_libdir}/cmake/mkldnn/*.cmake
 
 %files doc
 %{_docdir}/%{name}
@@ -190,6 +186,5 @@ popd
 %files -n %{libname}
 %license LICENSE
 %{_libdir}/libdnnl.so.*
-%{_libdir}/libmkldnn.so.*
 
 %changelog