Hello community,
here is the log from the commit of package tvm for openSUSE:Factory checked in
at 2020-10-23 16:09:15
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/tvm (Old)
and /work/SRC/openSUSE:Factory/.tvm.new.3463 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "tvm"
Fri Oct 23 16:09:15 2020 rev:4 rq:839532 version:0.6.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/tvm/tvm.changes 2020-10-02 17:44:07.346982606
+0200
+++ /work/SRC/openSUSE:Factory/.tvm.new.3463/tvm.changes 2020-10-23
16:09:39.807772176 +0200
@@ -1,0 +2,10 @@
+Fri Oct 2 12:16:21 UTC 2020 - Guillaume GARDET <guillaume.gar...@opensuse.org>
+
+- Enable onednn (formerly mkl-dnn) for aarch64 and ppc64le as well
+- Add support to:
+ * Antlr4
+ * openBLAS
+- Add patch to fix build with openblas enabled:
+ * tvm-fix-openblas.patch
+
+-------------------------------------------------------------------
New:
----
tvm-fix-openblas.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ tvm.spec ++++++
--- /var/tmp/diff_new_pack.Pqcqi0/_old 2020-10-23 16:09:40.867772726 +0200
+++ /var/tmp/diff_new_pack.Pqcqi0/_new 2020-10-23 16:09:40.867772726 +0200
@@ -18,10 +18,10 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
%define skip_python2 1
-%ifarch x86_64
-%bcond_without mkldnn
+%ifarch aarch64 x86_64 ppc64le
+%bcond_without onednn
%else
-%bcond_with mkldnn
+%bcond_with onednn
%endif
# regular cmake builddir conflicts with the python singlespec
%global __builddir build_cmake
@@ -33,6 +33,8 @@
URL: https://tvm.apache.org/
Source:
https://github.com/apache/incubator-tvm/archive/v%{version}.tar.gz
Patch0: lib-finder-python-cmake.patch
+# Fix cblas.h path
+Patch1: tvm-fix-openblas.patch
BuildRequires: %{python_module Cython}
BuildRequires: %{python_module attrs}
BuildRequires: %{python_module decorator}
@@ -42,14 +44,16 @@
BuildRequires: %{python_module scipy}
BuildRequires: %{python_module setuptools}
BuildRequires: %{python_module tornado}
+BuildRequires: antlr4-java
BuildRequires: cmake
BuildRequires: dlpack-devel
BuildRequires: dmlc-core-devel
BuildRequires: fdupes
BuildRequires: gcc-c++
BuildRequires: gtest
-#BuildRequires: openblas-devel
BuildRequires: memory-constraints
+BuildRequires: openblas-devel
+BuildRequires: opencl-headers
BuildRequires: pkgconfig
BuildRequires: rang-devel
BuildRequires: spirv-headers
@@ -77,8 +81,8 @@
%else
BuildRequires: llvm-devel
%endif
-%if %{with mkldnn}
-BuildRequires: mkl-dnn-devel
+%if %{with onednn}
+BuildRequires: onednn-devel
%endif
%python_subpackages
@@ -131,29 +135,24 @@
%build
%limit_build -m 800
-# USE_ANTLR - fails to find the antlr4 we provide
# USE_CUDA - we would need cuda
# USE_METAL
# USE_MICRO USE_MICRO_STANDALONE_RUNTIME
-# USE_GRAPH_RUNTIME
# USE_NNPACK
# USE_ROCBLAS USE_ROCM
%cmake \
-DDMLC_PATH="%{_includedir}/dmlc" \
-DDLPACK_PATH="%{_includedir}/dlpack" \
-DRANG_PATH="%{_includedir}/rang" \
+ -DUSE_GRAPH_RUNTIME=ON \
-DUSE_LLVM=ON \
- -DUSE_BLAS="none" \
-%if %{with mkldnn}
+ -DUSE_BLAS="openblas" \
+%if %{with onednn}
-DUSE_MKLDNN=ON \
%else
-DUSE_MKLDNN=OFF \
%endif
-%if 0%{?suse_version} > 1500
-DUSE_OPENCL=ON \
-%else
- -DUSE_OPENCL=OFF \
-%endif
-DUSE_OPENGL=ON \
-DUSE_OPENMP=ON \
-DUSE_RANDOM=ON \
@@ -162,6 +161,7 @@
-DUSE_SORT=ON \
-DUSE_THREADS=ON \
-DUSE_VULKAN=ON \
+ -DUSE_ANTLR="/usr/share/java/antlr4/antlr4-runtime.jar" \
-DINSTALL_DEV=ON
%cmake_build
cd ..
++++++ tvm-fix-openblas.patch ++++++
--- incubator-tvm-0.6.1.orig/src/runtime/contrib/cblas/cblas.cc 2020-10-02
14:17:41.273707898 +0200
+++ incubator-tvm-0.6.1/src/runtime/contrib/cblas/cblas.cc 2020-10-05
09:28:06.788585163 +0200
@@ -29,7 +29,7 @@ extern "C" {
#if USE_MKL_BLAS == 1
#include <mkl_cblas.h>
#else
-#include <cblas.h>
+#include <openblas/cblas.h>
#endif
#if USE_DNNL == 1
#include <dnnl.h>
