diff options
| -rw-r--r-- | dependency-versions/pom.xml | 2 | ||||
| -rw-r--r-- | dist/vespa.spec | 8 | ||||
| -rw-r--r-- | eval/src/vespa/eval/onnx/onnx_wrapper.cpp | 2 | ||||
| -rw-r--r-- | vespa-dependencies-enforcer/allowed-maven-dependencies.txt | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/dependency-versions/pom.xml b/dependency-versions/pom.xml index 074cb2190da..1b4f5b86201 100644 --- a/dependency-versions/pom.xml +++ b/dependency-versions/pom.xml @@ -104,7 +104,7 @@ <mockito.vespa.version>4.0.0</mockito.vespa.version> <netty.vespa.version>4.1.94.Final</netty.vespa.version> <netty-tcnative.vespa.version>2.0.61.Final</netty-tcnative.vespa.version> - <onnxruntime.vespa.version>1.13.1</onnxruntime.vespa.version> + <onnxruntime.vespa.version>1.15.1</onnxruntime.vespa.version> <opennlp.vespa.version>1.9.3</opennlp.vespa.version> <opentest4j.vespa.version>1.2.0</opentest4j.vespa.version> <org.json.vespa.version>20230227</org.json.vespa.version> diff --git a/dist/vespa.spec b/dist/vespa.spec index c1a409e057f..142c16f73c6 100644 --- a/dist/vespa.spec +++ b/dist/vespa.spec @@ -93,7 +93,7 @@ BuildRequires: vespa-openssl-devel >= 1.1.1o-1 BuildRequires: vespa-gtest = 1.13.0 %define _use_vespa_gtest 1 BuildRequires: vespa-lz4-devel >= 1.9.4-1 -BuildRequires: vespa-onnxruntime-devel = 1.13.1 +BuildRequires: vespa-onnxruntime-devel = 1.15.1 BuildRequires: vespa-protobuf-devel = 3.21.12 %define _use_vespa_protobuf 1 BuildRequires: vespa-libzstd-devel >= 1.5.4-1 @@ -104,7 +104,7 @@ BuildRequires: maven BuildRequires: maven-openjdk17 BuildRequires: openssl-devel BuildRequires: vespa-lz4-devel >= 1.9.4-1 -BuildRequires: vespa-onnxruntime-devel = 1.13.1 +BuildRequires: vespa-onnxruntime-devel = 1.15.1 BuildRequires: vespa-libzstd-devel >= 1.5.4-1 BuildRequires: vespa-protobuf-devel = 3.21.12 %define _use_vespa_protobuf 1 @@ -126,7 +126,7 @@ BuildRequires: maven-openjdk17 %endif BuildRequires: openssl-devel BuildRequires: vespa-lz4-devel >= 1.9.4-1 -BuildRequires: vespa-onnxruntime-devel = 1.13.1 +BuildRequires: vespa-onnxruntime-devel = 1.15.1 BuildRequires: vespa-libzstd-devel >= 1.5.4-1 BuildRequires: protobuf-devel BuildRequires: llvm-devel @@ -297,7 +297,7 @@ Requires: vespa-protobuf = 3.21.12 Requires: protobuf Requires: llvm-libs %endif -Requires: vespa-onnxruntime = 1.13.1 +Requires: vespa-onnxruntime = 1.15.1 %description libs diff --git a/eval/src/vespa/eval/onnx/onnx_wrapper.cpp b/eval/src/vespa/eval/onnx/onnx_wrapper.cpp index 7b2de4dfaa1..8f9450c2660 100644 --- a/eval/src/vespa/eval/onnx/onnx_wrapper.cpp +++ b/eval/src/vespa/eval/onnx/onnx_wrapper.cpp @@ -184,7 +184,7 @@ public: }; Ort::AllocatorWithDefaultOptions OnnxString::_alloc; -std::vector<Onnx::DimSize> make_dimensions(const Ort::TensorTypeAndShapeInfo &tensor_info) { +std::vector<Onnx::DimSize> make_dimensions(const Ort::ConstTensorTypeAndShapeInfo &tensor_info) { std::vector<const char *> symbolic_sizes(tensor_info.GetDimensionsCount(), nullptr); tensor_info.GetSymbolicDimensions(symbolic_sizes.data(), symbolic_sizes.size()); auto shape = tensor_info.GetShape(); diff --git a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt index 581ccd1d317..8406ffe4af4 100644 --- a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt +++ b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt @@ -40,7 +40,7 @@ com.google.j2objc:j2objc-annotations:2.8 com.google.protobuf:protobuf-java:3.24.0 com.ibm.icu:icu4j:70.1 com.intellij:annotations:9.0.4 -com.microsoft.onnxruntime:onnxruntime:1.13.1 +com.microsoft.onnxruntime:onnxruntime:1.15.1 com.sun.activation:javax.activation:1.2.0 com.sun.istack:istack-commons-runtime:3.0.8 com.sun.xml.bind:jaxb-core:2.3.0 |