Hello community,
here is the log from the commit of package mkl-dnn for openSUSE:Leap:15.2
checked in at 2020-02-29 17:15:42
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Leap:15.2/mkl-dnn (Old)
and /work/SRC/openSUSE:Leap:15.2/.mkl-dnn.new.26092 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mkl-dnn"
Sat Feb 29 17:15:42 2020 rev:2 rq:779968 version:1.1.3
Changes:
--------
--- /work/SRC/openSUSE:Leap:15.2/mkl-dnn/mkl-dnn.changes 2020-02-22
17:49:35.633426115 +0100
+++ /work/SRC/openSUSE:Leap:15.2/.mkl-dnn.new.26092/mkl-dnn.changes
2020-02-29 17:16:14.337017101 +0100
@@ -1,0 +2,23 @@
+Thu Feb 27 12:44:00 UTC 2020 - Tomáš Chvátal <tchva...@suse.com>
+
+- Do not disable LTO there is no actual reason for that
+- Export LD_LIBRARY_PATH to fix older releases build
+
+-------------------------------------------------------------------
+Wed Feb 26 10:36:26 UTC 2020 - Tomáš Chvátal <tchva...@suse.com>
+
+- There is no actual reason to not use github tag for tarball
+ fetching -> remove the service
+- Format with spec-cleaner
+- Use proper %cmake macros everywhere
+- Add configure options for cmake to set it up in a way we really
+ want
+- Add patch from Debian to not install OpenCL cmake finder:
+ * cmake-no-install-ocl-cmake.patch
+
+-------------------------------------------------------------------
+Thu Feb 20 10:26:52 UTC 2020 - Christian Goll <cg...@suse.com>
+
+- enabled tests
+
+-------------------------------------------------------------------
@@ -35,2 +57,0 @@
-
-
Old:
----
_service
mkl-dnn-v1.1.3.obscpio
mkl-dnn.obsinfo
New:
----
cmake-no-install-ocl-cmake.patch
mkl-dnn-1.1.3.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mkl-dnn.spec ++++++
--- /var/tmp/diff_new_pack.W2Bz7Y/_old 2020-02-29 17:16:15.077018627 +0100
+++ /var/tmp/diff_new_pack.W2Bz7Y/_new 2020-02-29 17:16:15.089018652 +0100
@@ -1,7 +1,7 @@
#
# spec file for package mkl-dnn
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,23 +17,23 @@
%define libname libdnnl1
-%define _lto_cflags %{nil}
-
Name: mkl-dnn
Version: 1.1.3
Release: 0
Summary: Intel(R) Math Kernel Library for Deep Neural Networks
License: Apache-2.0
-Group: Development/Libraries/C and C++
-Url: https://01.org/mkl-dnn
-Source0: %{name}-v%{version}.tar.xz
+URL: https://01.org/mkl-dnn
+Source0:
https://github.com/intel/mkl-dnn/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
+Patch0: cmake-no-install-ocl-cmake.patch
BuildRequires: cmake
BuildRequires: doxygen
+BuildRequires: fdupes
BuildRequires: gcc-c++
BuildRequires: graphviz
+BuildRequires: opencl-headers
+BuildRequires: pkgconfig
BuildRequires: texlive-dvips-bin
-BuildRequires: fdupes
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
+BuildRequires: pkgconfig(OpenCL)
ExclusiveArch: x86_64
%description
@@ -45,7 +45,6 @@
%package -n benchdnn
Summary: Header files of Intel(R) Math Kernel Library
-Group: Development/Languages/C and C++
Requires: %{libname} = %{version}
%description -n benchdnn
@@ -59,7 +58,6 @@
%package devel
Summary: Header files of Intel(R) Math Kernel Library
-Group: Development/Languages/C and C++
Requires: %{libname} = %{version}
%description devel
@@ -74,7 +72,7 @@
%package doc
Summary: Reference documentation for the Intel(R) Math Kernel Library
-Group: Documentation/HTML
+BuildArch: noarch
%description doc
The reference documentation for the Intel(R) Math Kernel Library can be
installed
@@ -82,7 +80,6 @@
%package -n %{libname}
Summary: Header files of Intel(R) Math Kernel Library
-Group: Development/Languages/C and C++
%description -n %{libname}
Intel(R) Math Kernel Library for Deep Neural Networks (Intel(R) MKL-DNN) is an
@@ -92,64 +89,63 @@
to implement deep neural networks (DNN) with C and C++ interfaces.
%prep
-%setup -q -n %{name}-v%{version}
+%setup -q
+%autopatch -p1
%build
-# If ARCH_OPT_FLAGS is not 'unset', -march=native would be use what could
-# lead to cryptic optimizations as build server may have different CPUs
-export ARCH_OPT_FLAGS=""
-export DNNL_CPU_RUNTIME=OMP
-%cmake
-%make_jobs
-make doc
+%cmake \
+ -DCMAKE_INSTALL_LIBDIR=%{_lib} \
+ -DMKLDNN_ARCH_OPT_FLAGS="" \
+ -DDNNL_CPU_RUNTIME=OMP \
+ -DDNNL_GPU_RUNTIME=OCL \
+ -DDNNL_INSTALL_MODE=DEFAULT \
+ -DDNNL_BUILD_TESTS=ON \
+ -DDNNL_WERROR=OFF
+%cmake_build
+%cmake_build doc
%install
%cmake_install
-# move LICENSE to correct locations
-mkdir -pv %{buildroot}%{_docdir}/%{name}
-#mv %{buildroot}/usr/share/doc/mkldnn/LICENSE %{buildroot}%{_docdir}/%{name}
+# move the built doxygen data to normal location
+mkdir -p %{buildroot}%{_docdir}/%{name}
+mv %{buildroot}%{_datadir}/doc/dnnl/reference/* %{buildroot}%{_docdir}/%{name}
+%fdupes %{buildroot}%{_docdir}/%{name}
+# do use macros to install license/docu
+rm -r %{buildroot}%{_datadir}/doc/dnnl
# move header files to correct location
mkdir -pv %{buildroot}%{_includedir}/%{name}
mv %{buildroot}%{_includedir}/*.h* %{buildroot}%{_includedir}/%{name}
# install the benchmark
install -D build/tests/benchdnn/benchdnn %{buildroot}/%{_bindir}/benchdnn
-#install -D tests/benchdnn/README.md
%{buildroot}/%{_datadir}/benchdnn/README.md
-#cp -vr build/tests/benchdnn/inputs %{buildroot}/%{_datadir}/benchdnn/
-# move reference documentation to right place
-mv %{buildroot}/usr/share/doc/dnnl %{buildroot}%{_docdir}/%{name}
-%fdupes %{buildroot}%{_docdir}/%{name}
#move install shared lib
-mv %{buildroot}/usr/usr/lib64/* %{buildroot}/usr/lib64/
-rmdir -v %{buildroot}/usr/usr/lib64
-rmdir -v %{buildroot}/usr/usr
mkdir -vp %{buildroot}%{_datadir}/benchdnn
cp -vr build/tests/benchdnn/inputs %{buildroot}%{_datadir}/benchdnn
+
%check
-cd build
-#LD_LIBRARY_PATH=%{buildroot}/usr/lib64 make test
+# do not use macro so we can exclude all gpu and cross (gpu and cpu) tests
(they need gpu set up)
+pushd build
+export LD_LIBRARY_PATH=%{buildroot}%{_libdir}
+ctest --output-on-failure --force-new-ctest-process %{_smp_mflags} -E
'(gpu|cross)'
+popd
%post -n %{libname} -p /sbin/ldconfig
%postun -n %{libname} -p /sbin/ldconfig
%files -n benchdnn
-%defattr(-,root,root)
%{_bindir}/benchdnn
%{_datadir}/benchdnn
%files devel
-%defattr(-,root,root)
-%doc README.md
%{_includedir}/%{name}
%{_libdir}/*.so
%{_libdir}/cmake/dnnl
%files doc
-%defattr(-,root,root)
%{_docdir}/%{name}
-%license LICENSE
%files -n %{libname}
-%defattr(-,root,root)
+%license LICENSE
+%doc README.md
%{_libdir}/*.so.*
%changelog
++++++ cmake-no-install-ocl-cmake.patch ++++++
Index: mkl-dnn-1.1.3/src/CMakeLists.txt
===================================================================
--- mkl-dnn-1.1.3.orig/src/CMakeLists.txt
+++ mkl-dnn-1.1.3/src/CMakeLists.txt
@@ -176,12 +176,6 @@ if(DNNL_CPU_RUNTIME STREQUAL "TBB")
endif()
endif()
-if(DNNL_GPU_RUNTIME STREQUAL "OCL")
- install(FILES
- "../cmake/FindOpenCL.cmake"
- DESTINATION ${LIB_CONFIG_INSTALL_DIR})
-endif()
-
# On Windows we need to add dnnl.dll path to CTESTCONFIG_PATH which is later
# passed to ctest and Visual Studio solutions
if(WIN32)
Index: mkl-dnn-1.1.3/cmake/gen_mkldnn_compat_cmakes.cmake
===================================================================
--- mkl-dnn-1.1.3.orig/cmake/gen_mkldnn_compat_cmakes.cmake
+++ mkl-dnn-1.1.3/cmake/gen_mkldnn_compat_cmakes.cmake
@@ -22,7 +22,7 @@
set(DNNL_DIR ${DIR}/dnnl)
set(MKLDNN_DIR ${DIR}/mkldnn)
-file(MAKE_DIRECTORY ${MKLDNN_DIR})
+file(MAKE_DIRECTORY "${MKLDNN_DIR}")
file(GLOB_RECURSE fs "${DNNL_DIR}/*")
foreach(f ${fs})
