summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorlilac2021-03-04 08:41:16 +0800
committerlilac2021-03-04 08:41:16 +0800
commitae3f7ee922a96be6fa4e3f2f074e1b470c5876fc (patch)
treed8edec8a2a071cbbbb5e433e5731eafb004c90ae
parent93cc6f648ca97782d19dc111094c552a053a74a4 (diff)
downloadaur-ae3f7ee922a96be6fa4e3f2f074e1b470c5876fc.tar.gz
[lilac] updated to 1.7.0-2
-rw-r--r--.SRCINFO9
-rw-r--r--PKGBUILD10
-rw-r--r--build-fixes.patch70
3 files changed, 34 insertions, 55 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 15d949bcf3b..c191581245f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = python-onnxruntime
pkgdesc = Cross-platform, high performance scoring engine for ML models
- pkgver = 1.6.0
+ pkgver = 1.7.0
pkgrel = 2
url = https://github.com/microsoft/onnxruntime
arch = x86_64
@@ -13,15 +13,15 @@ pkgbase = python-onnxruntime
makedepends = python-setuptools
makedepends = nlohmann-json
makedepends = chrono-date
+ makedepends = boost
depends = nsync
depends = re2
depends = flatbuffers
depends = python-numpy
depends = python-onnx
depends = python-protobuf
- source = git+https://github.com/microsoft/onnxruntime#tag=v1.6.0
+ source = git+https://github.com/microsoft/onnxruntime#tag=v1.7.0
source = git+https://gitlab.com/libeigen/eigen.git
- source = git+https://github.com/google/gemmlowp.git
source = git+https://github.com/onnx/onnx.git
source = git+https://github.com/dcleblanc/SafeInt.git
source = git+https://github.com/martinmoene/optional-lite.git
@@ -31,8 +31,7 @@ pkgbase = python-onnxruntime
sha512sums = SKIP
sha512sums = SKIP
sha512sums = SKIP
- sha512sums = SKIP
- sha512sums = 978d01b73610aa75fe2c02046f8bce4d26b35a7e0d499bebbb067ba7397388b4bb50280ddd1ae639207478a395c577a343f41c3e2954a1ca7155c98fa91a2cf8
+ sha512sums = 90e67eb144770734b488bf8ac5ad0dc955d2d860d9ed1c32285ffe913e72d27a3ac5b27588f41042fa4008533234e6cf4740c600f2b3fdce90ef8a3f853827eb
pkgname = python-onnxruntime
diff --git a/PKGBUILD b/PKGBUILD
index 15974af572c..537a6714d8d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,21 +1,20 @@
# Maintainer: Chih-Hsuan Yen <yan12125@gmail.com>
pkgname=python-onnxruntime
-pkgver=1.6.0
+pkgver=1.7.0
pkgdesc='Cross-platform, high performance scoring engine for ML models'
pkgrel=2
arch=(x86_64)
url='https://github.com/microsoft/onnxruntime'
license=(MIT)
depends=(nsync re2 flatbuffers python-numpy python-onnx python-protobuf)
-makedepends=(git cmake gtest gmock pybind11 python-setuptools nlohmann-json chrono-date)
+makedepends=(git cmake gtest gmock pybind11 python-setuptools nlohmann-json chrono-date boost)
# not de-vendored libraries
# eigen: API changes a lot since extra/eigen 3.3.7 to the commit onnxruntime uses
# onnx: needs shared libonnx (https://github.com/onnx/onnx/issues/3030)
# https://github.com/microsoft/onnxruntime/blob/v1.1.2/onnxruntime/core/protobuf/onnx-ml.proto#L250-L251
source=("git+https://github.com/microsoft/onnxruntime#tag=v$pkgver"
"git+https://gitlab.com/libeigen/eigen.git"
- "git+https://github.com/google/gemmlowp.git"
"git+https://github.com/onnx/onnx.git"
"git+https://github.com/dcleblanc/SafeInt.git"
"git+https://github.com/martinmoene/optional-lite.git"
@@ -25,8 +24,7 @@ sha512sums=('SKIP'
'SKIP'
'SKIP'
'SKIP'
- 'SKIP'
- '978d01b73610aa75fe2c02046f8bce4d26b35a7e0d499bebbb067ba7397388b4bb50280ddd1ae639207478a395c577a343f41c3e2954a1ca7155c98fa91a2cf8')
+ '90e67eb144770734b488bf8ac5ad0dc955d2d860d9ed1c32285ffe913e72d27a3ac5b27588f41042fa4008533234e6cf4740c600f2b3fdce90ef8a3f853827eb')
prepare() {
cd onnxruntime
@@ -34,7 +32,7 @@ prepare() {
patch -Np1 -i ../build-fixes.patch
git submodule init
- for mod in eigen gemmlowp onnx SafeInt optional-lite; do
+ for mod in eigen onnx SafeInt optional-lite; do
git config submodule.cmake/external/$mod.url "$srcdir"/$mod
git submodule update cmake/external/$mod
done
diff --git a/build-fixes.patch b/build-fixes.patch
index 0e7af3e3778..5c452420288 100644
--- a/build-fixes.patch
+++ b/build-fixes.patch
@@ -1,26 +1,43 @@
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
-index 3cee60f3..3328fc06 100644
+index a07893771c..253843fa5b 100644
--- a/cmake/CMakeLists.txt
+++ b/cmake/CMakeLists.txt
-@@ -327,7 +327,7 @@ if(Protobuf_FOUND OR Protobuf_FOUND)
+@@ -596,7 +596,7 @@ if(Protobuf_FOUND OR Protobuf_FOUND)
if(NOT Protobuf_USE_STATIC_LIBS)
- #Indeed here should be a warning, not a fatal error. ONNX Runtime itself can work in such a
+ #Indeed here should be a warning, not a fatal error. ONNX Runtime itself can work in such a
#setting but it may cause compatibility issue when ONNX Runtime is integrated with the other ONNX ecosystem softwares.
- message(FATAL_ERROR "Please enable Protobuf_USE_STATIC_LIBS")
+ message(WARNING "Please enable Protobuf_USE_STATIC_LIBS")
endif()
else()
set(PROTOBUF_LIB protobuf::libprotobuf-lite)
-@@ -395,7 +395,7 @@ get_filename_component(REPO_ROOT "${REPO_ROOT}" ABSOLUTE)
+@@ -657,7 +657,8 @@ get_filename_component(ORTTRAINING_ROOT "${ORTTRAINING_ROOT}" ABSOLUTE)
+ get_filename_component(REPO_ROOT "${REPO_ROOT}" ABSOLUTE)
set(ONNXRUNTIME_INCLUDE_DIR ${REPO_ROOT}/include/onnxruntime)
-
-add_subdirectory(external/date EXCLUDE_FROM_ALL)
+find_package(date REQUIRED)
++add_library(date_interface ALIAS date::date)
+
+ set(SAFEINT_INCLUDE_DIR ${REPO_ROOT}/cmake/external/SafeInt)
+ add_library(safeint_interface INTERFACE)
+@@ -668,10 +669,13 @@ if(onnxruntime_DISABLE_EXCEPTIONS)
+ add_compile_definitions(optional_CONFIG_NO_EXCEPTIONS=1)
+ endif()
+
+-add_subdirectory(external/mp11 EXCLUDE_FROM_ALL)
++add_library(boost_mp11 INTERFACE)
++add_library(Boost::mp11 ALIAS boost_mp11)
if(onnxruntime_PREFER_SYSTEM_LIB)
- find_package(re2)
-@@ -802,7 +802,8 @@
+- find_package(re2)
++ find_package(PkgConfig)
++ pkg_check_modules(RE2 IMPORTED_TARGET re2)
++ add_library(re2::re2 ALIAS PkgConfig::RE2)
+ endif()
+ if(NOT TARGET re2::re2)
+ add_subdirectory(external/re2 EXCLUDE_FROM_ALL)
+@@ -947,7 +951,8 @@ set(FLATBUFFERS_BUILD_TESTS OFF CACHE BOOL "FLATBUFFERS_BUILD_TESTS" FORCE)
set(FLATBUFFERS_INSTALL OFF CACHE BOOL "FLATBUFFERS_INSTALL" FORCE)
set(FLATBUFFERS_BUILD_FLATHASH OFF CACHE BOOL "FLATBUFFERS_BUILD_FLATHASH" FORCE)
set(FLATBUFFERS_BUILD_FLATLIB ON CACHE BOOL "FLATBUFFERS_BUILD_FLATLIB" FORCE)
@@ -30,46 +47,11 @@ index 3cee60f3..3328fc06 100644
list(APPEND onnxruntime_EXTERNAL_DEPENDENCIES flatbuffers)
list(APPEND onnxruntime_EXTERNAL_LIBRARIES flatbuffers)
-diff --git a/cmake/external/Findre2.cmake b/cmake/external/Findre2.cmake
-new file mode 100644
-index 00000000..4c91696c
---- /dev/null
-+++ b/cmake/external/Findre2.cmake
-@@ -0,0 +1,3 @@
-+find_package(PkgConfig)
-+pkg_check_modules(re2 REQUIRED IMPORTED_TARGET GLOBAL re2)
-+add_library(re2::re2 ALIAS PkgConfig::re2)
-diff --git a/cmake/onnxruntime_common.cmake b/cmake/onnxruntime_common.cmake
-index d33e9e14..5770e818 100644
---- a/cmake/onnxruntime_common.cmake
-+++ b/cmake/onnxruntime_common.cmake
-@@ -86,7 +86,7 @@ if (onnxruntime_USE_MIMALLOC_STL_ALLOCATOR OR onnxruntime_USE_MIMALLOC_ARENA_ALL
- endif()
- endif()
-
--onnxruntime_add_include_to_target(onnxruntime_common date_interface wil)
-+onnxruntime_add_include_to_target(onnxruntime_common date::date wil)
- target_include_directories(onnxruntime_common
- PRIVATE ${CMAKE_CURRENT_BINARY_DIR} ${ONNXRUNTIME_ROOT} ${eigen_INCLUDE_DIRS}
- # safeint is part of onnxruntime_common public interface, so we want to propagate its includes
-diff --git a/cmake/onnxruntime_unittests.cmake b/cmake/onnxruntime_unittests.cmake
-index d1bd347c..0c4b81e4 100644
---- a/cmake/onnxruntime_unittests.cmake
-+++ b/cmake/onnxruntime_unittests.cmake
-@@ -40,7 +40,7 @@ function(AddTest)
- else()
- target_link_libraries(${_UT_TARGET} PRIVATE ${_UT_LIBS} GTest::gtest GTest::gmock ${onnxruntime_EXTERNAL_LIBRARIES})
- endif()
-- onnxruntime_add_include_to_target(${_UT_TARGET} date_interface flatbuffers)
-+ onnxruntime_add_include_to_target(${_UT_TARGET} date::date flatbuffers)
- target_include_directories(${_UT_TARGET} PRIVATE ${TEST_INC_DIR})
- if (onnxruntime_USE_CUDA)
- target_include_directories(${_UT_TARGET} PRIVATE ${CUDA_INCLUDE_DIRS} ${onnxruntime_CUDNN_HOME}/include)
diff --git a/onnxruntime/core/session/inference_session_utils.h b/onnxruntime/core/session/inference_session_utils.h
-index 57159083..9fa7dce0 100644
+index 5899afac8d..2672be649d 100644
--- a/onnxruntime/core/session/inference_session_utils.h
+++ b/onnxruntime/core/session/inference_session_utils.h
-@@ -6,7 +6,7 @@
+@@ -18,7 +18,7 @@
#pragma warning(push)
#pragma warning(disable : 28020)
#endif