Merge pull request #194 from vespa-engine/balder/build-onnxruntime-1.…

…16.2 Build onnxruntime 1.16.2
vespa-engine · Nov 9, 2023 · 5cefe8a · 5cefe8a
2 parents 5321da0 + 1bc0749
commit 5cefe8a
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 268 deletions.
diff --git a/build-dependencies/.copr/Makefile b/build-dependencies/.copr/Makefile
@@ -4,7 +4,7 @@ TOP = $(realpath $(dir $(lastword $(MAKEFILE_LIST))))
 # Version
 MAJOR=1
 MINOR=2
-PATCH=1
+PATCH=2
 RELEASE=1
 PKGNAME=vespa-build-dependencies
 

diff --git a/build-dependencies/vespa-build-dependencies.spec.tmpl b/build-dependencies/vespa-build-dependencies.spec.tmpl
@@ -45,7 +45,7 @@ Requires: vespa-openblas-devel >= 0.3.21
 Requires: vespa-openssl-devel >= 3.1.2
 Requires: vespa-gtest = 1.13.0
 Requires: vespa-lz4-devel >= 1.9.4-1
-Requires: vespa-onnxruntime-devel = 1.16.1
+Requires: vespa-onnxruntime-devel = 1.16.2
 Requires: vespa-protobuf-devel = 3.21.12
 Requires: vespa-toolset-12-meta >= 12.0.1
 %endif
@@ -66,7 +66,7 @@ Requires: openblas-devel
 Requires: openssl-devel
 Requires: vespa-libzstd-devel >= 1.5.4-1
 Requires: vespa-lz4-devel >= 1.9.4-1
-Requires: vespa-onnxruntime-devel = 1.16.1
+Requires: vespa-onnxruntime-devel = 1.16.2
 Requires: vespa-protobuf-devel = 3.21.12
 Requires: vespa-toolset-12-meta >= 12.0.1
 %endif
@@ -85,7 +85,7 @@ Requires: openblas-devel
 Requires: openssl-devel
 Requires: protobuf-devel
 Requires: vespa-lz4-devel >= 1.9.4-1
-Requires: vespa-onnxruntime-devel = 1.16.1
+Requires: vespa-onnxruntime-devel = 1.16.2
 Requires: vespa-libzstd-devel >= 1.5.4-1
 
 %endif

diff --git a/onnxruntime-build-cuda/.copr/Makefile b/onnxruntime-build-cuda/.copr/Makefile
diff --git a/onnxruntime-build-cuda/patches.use-origin-rpath-for-jni-library.diff b/onnxruntime-build-cuda/patches.use-origin-rpath-for-jni-library.diff
diff --git a/onnxruntime-build-cuda/vespa-onnxruntime.spec.tmpl b/onnxruntime-build-cuda/vespa-onnxruntime.spec.tmpl
diff --git a/onnxruntime/.copr/Makefile b/onnxruntime/.copr/Makefile
@@ -4,8 +4,8 @@ TOP = $(realpath $(dir $(lastword $(MAKEFILE_LIST))))
 # Version
 MAJOR=1
 MINOR=16
-PATCH=1
-RELEASE=3
+PATCH=2
+RELEASE=1
 PKGNAME=vespa-onnxruntime
 
 RPMTOPDIR=$(TOP)/rpmbuild

diff --git a/onnxruntime/vespa-onnxruntime.spec.tmpl b/onnxruntime/vespa-onnxruntime.spec.tmpl
@@ -31,7 +31,6 @@ Patch0:         patches.use-origin-rpath-for-jni-library.diff
 Patch1:         patches.no-array-bounds.diff
 Patch2:         patches.use-gradle.diff
 Patch3:         patches.apply-cpuinfo.diff
-Patch4:         patches.no-asm-mrs.diff
 
 %if 0%{?fedora} && !0%{?amzn}
 BuildRequires: cmake
@@ -112,7 +111,6 @@ about packaging.
 %patch1 -p1
 %patch2 -p0
 %patch3 -p1
-%patch4 -p0
 
 %build
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,7 +4,7 @@ TOP = $(realpath $(dir $(lastword $(MAKEFILE_LIST)))) @@
     # Version
     MAJOR=1
     MINOR=2
-    PATCH=1
+    PATCH=2
     RELEASE=1
     PKGNAME=vespa-build-dependencies
@@ Expand Down @@