From b22584cf48c4ebdff6d7d30c2e445f2e6e95931a Mon Sep 17 00:00:00 2001 From: Alex Merritt Date: Tue, 19 May 2020 09:40:47 -0400 Subject: [PATCH 1/2] * Upgrade presets for ONNX Runtime 1.3.0 --- onnxruntime/README.md | 6 +- onnxruntime/cppbuild.sh | 4 +- onnxruntime/onnxruntime.patch | 35 +- onnxruntime/platform/gpu/pom.xml | 2 +- onnxruntime/platform/pom.xml | 2 +- onnxruntime/pom.xml | 2 +- onnxruntime/samples/pom.xml | 8 +- .../AllocatorWithDefaultOptions.java | 2 +- .../onnxruntime/BaseCustomOpDomain.java | 2 +- .../org/bytedeco/onnxruntime/BaseEnv.java | 2 +- .../bytedeco/onnxruntime/BaseMemoryInfo.java | 2 +- .../onnxruntime/BaseModelMetadata.java | 2 +- .../bytedeco/onnxruntime/BaseRunOptions.java | 2 +- .../org/bytedeco/onnxruntime/BaseSession.java | 2 +- .../onnxruntime/BaseSessionOptions.java | 2 +- .../BaseTensorTypeAndShapeInfo.java | 2 +- .../bytedeco/onnxruntime/BaseTypeInfo.java | 2 +- .../org/bytedeco/onnxruntime/BaseValue.java | 2 +- .../org/bytedeco/onnxruntime/CustomOpApi.java | 2 +- .../bytedeco/onnxruntime/CustomOpDomain.java | 2 +- .../java/org/bytedeco/onnxruntime/Env.java | 8 +- .../org/bytedeco/onnxruntime/MemoryInfo.java | 2 +- .../bytedeco/onnxruntime/ModelMetadata.java | 5 +- .../bytedeco/onnxruntime/OrtAllocator.java | 2 +- .../java/org/bytedeco/onnxruntime/OrtApi.java | 371 +++++++++++------- .../org/bytedeco/onnxruntime/OrtApiBase.java | 2 +- .../org/bytedeco/onnxruntime/OrtCustomOp.java | 5 +- .../onnxruntime/OrtCustomOpDomain.java | 2 +- .../java/org/bytedeco/onnxruntime/OrtEnv.java | 2 +- .../bytedeco/onnxruntime/OrtException.java | 2 +- .../onnxruntime/OrtKernelContext.java | 2 +- .../bytedeco/onnxruntime/OrtKernelInfo.java | 2 +- .../onnxruntime/OrtLoggingFunction.java | 2 +- .../bytedeco/onnxruntime/OrtMapTypeInfo.java | 2 +- .../bytedeco/onnxruntime/OrtMemoryInfo.java | 2 +- .../onnxruntime/OrtModelMetadata.java | 2 +- .../bytedeco/onnxruntime/OrtRunOptions.java | 2 +- .../onnxruntime/OrtSequenceTypeInfo.java | 2 +- .../org/bytedeco/onnxruntime/OrtSession.java | 2 +- .../onnxruntime/OrtSessionOptions.java | 2 +- .../org/bytedeco/onnxruntime/OrtStatus.java | 2 +- .../OrtTensorTypeAndShapeInfo.java | 2 +- .../onnxruntime/OrtThreadPoolParams.java | 21 + .../onnxruntime/OrtThreadingOptions.java | 21 + .../org/bytedeco/onnxruntime/OrtTypeInfo.java | 2 +- .../org/bytedeco/onnxruntime/OrtValue.java | 2 +- .../org/bytedeco/onnxruntime/RunOptions.java | 2 +- .../org/bytedeco/onnxruntime/Session.java | 2 +- .../bytedeco/onnxruntime/SessionOptions.java | 4 +- .../onnxruntime/TensorTypeAndShapeInfo.java | 2 +- .../org/bytedeco/onnxruntime/TypeInfo.java | 2 +- .../UnownedTensorTypeAndShapeInfo.java | 2 +- .../java/org/bytedeco/onnxruntime/Value.java | 2 +- .../org/bytedeco/onnxruntime/ValueVector.java | 2 +- .../onnxruntime/global/onnxruntime.java | 59 ++- .../onnxruntime/presets/onnxruntime.java | 2 +- platform/pom.xml | 2 +- 57 files changed, 415 insertions(+), 222 deletions(-) create mode 100644 onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtThreadPoolParams.java create mode 100644 onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtThreadingOptions.java diff --git a/onnxruntime/README.md b/onnxruntime/README.md index 82db5a49584..d9da1673de6 100644 --- a/onnxruntime/README.md +++ b/onnxruntime/README.md @@ -5,7 +5,7 @@ Introduction ------------ This directory contains the JavaCPP Presets module for: - * ONNX Runtime 1.2.0 https://microsoft.github.io/onnxruntime/ + * ONNX Runtime 1.3.0 https://microsoft.github.io/onnxruntime/ Please refer to the parent README.md file for more detailed information about the JavaCPP Presets. @@ -42,14 +42,14 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic org.bytedeco onnxruntime-platform - 1.2.0-1.5.3 + 1.3.0-1.5.4-SNAPSHOT org.bytedeco onnxruntime-platform-gpu - 1.2.0-1.5.3 + 1.3.0-1.5.4-SNAPSHOT diff --git a/onnxruntime/cppbuild.sh b/onnxruntime/cppbuild.sh index 043a3756b88..bc51bbbc889 100755 --- a/onnxruntime/cppbuild.sh +++ b/onnxruntime/cppbuild.sh @@ -26,7 +26,7 @@ if [[ "$EXTENSION" == *gpu ]]; then GPU_FLAGS="--use_cuda" fi -ONNXRUNTIME=1.2.0 +ONNXRUNTIME=1.3.0 mkdir -p "$PLATFORM$EXTENSION" cd "$PLATFORM$EXTENSION" @@ -78,6 +78,8 @@ which ctest3 &> /dev/null && CTEST="ctest3" || CTEST="ctest" # install headers and libraries in standard directories cp -r include/* ../include +cp -r orttraining/orttraining/models/runner/training_runner.h ../include +cp -r orttraining/orttraining/models/runner/training_util.h ../include cp -r java/src/main/java/* ../java cp ../build/Release/lib* ../lib || true cp ../build/Release/Release/onnxruntime.dll ../bin || true diff --git a/onnxruntime/onnxruntime.patch b/onnxruntime/onnxruntime.patch index 9fd45ecdce7..a672fccee88 100644 --- a/onnxruntime/onnxruntime.patch +++ b/onnxruntime/onnxruntime.patch @@ -635,14 +635,27 @@ diff --git a/tools/ci_build/build.py b/tools/ci_build/build.py index b6b54fd6..ce945a54 100755 --- a/tools/ci_build/build.py +++ b/tools/ci_build/build.py -@@ -326,7 +326,9 @@ def generate_build_tree(cmake_path, source_dir, build_dir, cuda_home, cudnn_home - cmake_args = [cmake_path, cmake_dir, - "-Donnxruntime_RUN_ONNX_TESTS=" + ("ON" if args.enable_onnx_tests else "OFF"), - "-Donnxruntime_GENERATE_TEST_REPORTS=ON", -- "-Donnxruntime_DEV_MODE=" + ("OFF" if args.android else "ON"), -+ "-Donnxruntime_DEV_MODE=OFF", -+ "-Donnxruntime_ENABLE_LTO=OFF", -+ "-Donnxruntime_BUILD_UNIT_TESTS=OFF", - "-DPYTHON_EXECUTABLE=" + sys.executable, - "-Donnxruntime_USE_CUDA=" + ("ON" if args.use_cuda else "OFF"), - "-Donnxruntime_USE_NSYNC=" + ("OFF" if is_windows() or not args.use_nsync else "ON"), +@@ -518,9 +518,9 @@ + "-Donnxruntime_BUILD_WINML_TESTS=" + ( + "OFF" if args.skip_winml_tests else "ON"), + "-Donnxruntime_GENERATE_TEST_REPORTS=ON", +- "-Donnxruntime_DEV_MODE=" + ( +- "OFF" if args.android or args.use_acl or +- (args.ios and is_macOS()) else "ON"), ++ "-Donnxruntime_DEV_MODE=OFF", ++ "-Donnxruntime_ENABLE_LTO=OFF", ++ "-Donnxruntime_BUILD_UNIT_TESTS=OFF", + "-DPYTHON_EXECUTABLE=" + sys.executable, + "-Donnxruntime_USE_CUDA=" + ("ON" if args.use_cuda else "OFF"), + "-Donnxruntime_CUDNN_HOME=" + (cudnn_home if args.use_cuda else ""), +diff --git a/onnxruntime/java/src/main/native/ai_onnxruntime_OrtSession.c b/onnxruntime/java/src/main/native/ai_onnxruntime_OrtSession.c +--- a/java/src/main/native/ai_onnxruntime_OrtSession.c ++++ b/java/src/main/native/ai_onnxruntime_OrtSession.c +@@ -428,6 +428,6 @@ + // Release the metadata + api->ReleaseModelMetadata(metadata); + +- return metadataJava; ++ return (jstring)metadataJava; + } + } diff --git a/onnxruntime/platform/gpu/pom.xml b/onnxruntime/platform/gpu/pom.xml index 641948b57dc..4c332c14c80 100644 --- a/onnxruntime/platform/gpu/pom.xml +++ b/onnxruntime/platform/gpu/pom.xml @@ -12,7 +12,7 @@ org.bytedeco onnxruntime-platform-gpu - 1.2.0-${project.parent.version} + 1.3.0-${project.parent.version} JavaCPP Presets Platform GPU for ONNX Runtime diff --git a/onnxruntime/platform/pom.xml b/onnxruntime/platform/pom.xml index da9cca7fd77..f31b6c84073 100644 --- a/onnxruntime/platform/pom.xml +++ b/onnxruntime/platform/pom.xml @@ -12,7 +12,7 @@ org.bytedeco onnxruntime-platform - 1.2.0-${project.parent.version} + 1.3.0-${project.parent.version} JavaCPP Presets Platform for ONNX Runtime diff --git a/onnxruntime/pom.xml b/onnxruntime/pom.xml index ff12a3ee706..b7f29c5e8c6 100644 --- a/onnxruntime/pom.xml +++ b/onnxruntime/pom.xml @@ -11,7 +11,7 @@ org.bytedeco onnxruntime - 1.2.0-${project.parent.version} + 1.3.0-${project.parent.version} JavaCPP Presets for ONNX Runtime diff --git a/onnxruntime/samples/pom.xml b/onnxruntime/samples/pom.xml index 2c1f4b3549a..60cdc7766f7 100644 --- a/onnxruntime/samples/pom.xml +++ b/onnxruntime/samples/pom.xml @@ -2,7 +2,7 @@ 4.0.0 org.bytedeco.onnxruntime cxxapisample - 1.5.3 + 1.5.4-SNAPSHOT CXXApiSample 1.8 @@ -12,21 +12,21 @@ org.bytedeco onnxruntime-platform - 1.2.0-1.5.3 + 1.3.0-1.5.4-SNAPSHOT org.bytedeco onnxruntime-platform-gpu - 1.2.0-1.5.3 + 1.3.0-1.5.4-SNAPSHOT org.bytedeco cuda-platform-redist - 10.2-7.6-1.5.3 + 10.2-7.6-1.5.4-SNAPSHOT diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/AllocatorWithDefaultOptions.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/AllocatorWithDefaultOptions.java index 96dcf1b5d37..0dfb4fadcb6 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/AllocatorWithDefaultOptions.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/AllocatorWithDefaultOptions.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.3: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.4-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/BaseCustomOpDomain.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/BaseCustomOpDomain.java index 145a669f0d1..e35d398ab93 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/BaseCustomOpDomain.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/BaseCustomOpDomain.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.3: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.4-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/BaseEnv.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/BaseEnv.java index 580a9a9e2f7..f92133977a8 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/BaseEnv.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/BaseEnv.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.3: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.4-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/BaseMemoryInfo.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/BaseMemoryInfo.java index 869c7dd967b..2ddaf902b3c 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/BaseMemoryInfo.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/BaseMemoryInfo.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.3: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.4-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/BaseModelMetadata.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/BaseModelMetadata.java index 48fc9149f31..04922d90528 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/BaseModelMetadata.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/BaseModelMetadata.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.3: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.4-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/BaseRunOptions.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/BaseRunOptions.java index 3dfc9042bcd..69d829e36d1 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/BaseRunOptions.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/BaseRunOptions.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.3: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.4-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/BaseSession.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/BaseSession.java index cbcc709583f..ee670713dfd 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/BaseSession.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/BaseSession.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.3: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.4-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/BaseSessionOptions.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/BaseSessionOptions.java index ece510497ca..e9cc9faa5ac 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/BaseSessionOptions.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/BaseSessionOptions.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.3: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.4-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/BaseTensorTypeAndShapeInfo.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/BaseTensorTypeAndShapeInfo.java index 91cae79731d..7c3f025594a 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/BaseTensorTypeAndShapeInfo.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/BaseTensorTypeAndShapeInfo.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.3: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.4-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/BaseTypeInfo.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/BaseTypeInfo.java index 04b786988bd..1f8550aad98 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/BaseTypeInfo.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/BaseTypeInfo.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.3: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.4-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/BaseValue.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/BaseValue.java index 5771ca60b6d..4f3368b6bd1 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/BaseValue.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/BaseValue.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.3: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.4-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/CustomOpApi.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/CustomOpApi.java index d83a7204f8e..3dcddf41e50 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/CustomOpApi.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/CustomOpApi.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.3: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.4-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/CustomOpDomain.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/CustomOpDomain.java index a0d4cf5535c..3178f512bda 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/CustomOpDomain.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/CustomOpDomain.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.3: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.4-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/Env.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/Env.java index 9a7524af810..346c617549a 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/Env.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/Env.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.3: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.4-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; @@ -31,6 +31,12 @@ public class Env extends BaseEnv { private native void allocate(); public Env(@Cast("OrtLoggingLevel") int default_logging_level/*=ORT_LOGGING_LEVEL_WARNING*/, String logid/*=""*/) { super((Pointer)null); allocate(default_logging_level, logid); } private native void allocate(@Cast("OrtLoggingLevel") int default_logging_level/*=ORT_LOGGING_LEVEL_WARNING*/, String logid/*=""*/); + public Env(@Const OrtThreadingOptions tp_options, @Cast("OrtLoggingLevel") int default_logging_level/*=ORT_LOGGING_LEVEL_WARNING*/, @Cast("const char*") BytePointer logid/*=""*/) { super((Pointer)null); allocate(tp_options, default_logging_level, logid); } + private native void allocate(@Const OrtThreadingOptions tp_options, @Cast("OrtLoggingLevel") int default_logging_level/*=ORT_LOGGING_LEVEL_WARNING*/, @Cast("const char*") BytePointer logid/*=""*/); + public Env(@Const OrtThreadingOptions tp_options) { super((Pointer)null); allocate(tp_options); } + private native void allocate(@Const OrtThreadingOptions tp_options); + public Env(@Const OrtThreadingOptions tp_options, @Cast("OrtLoggingLevel") int default_logging_level/*=ORT_LOGGING_LEVEL_WARNING*/, String logid/*=""*/) { super((Pointer)null); allocate(tp_options, default_logging_level, logid); } + private native void allocate(@Const OrtThreadingOptions tp_options, @Cast("OrtLoggingLevel") int default_logging_level/*=ORT_LOGGING_LEVEL_WARNING*/, String logid/*=""*/); public Env(@Cast("OrtLoggingLevel") int default_logging_level, @Cast("const char*") BytePointer logid, OrtLoggingFunction logging_function, Pointer logger_param) { super((Pointer)null); allocate(default_logging_level, logid, logging_function, logger_param); } private native void allocate(@Cast("OrtLoggingLevel") int default_logging_level, @Cast("const char*") BytePointer logid, OrtLoggingFunction logging_function, Pointer logger_param); public Env(@Cast("OrtLoggingLevel") int default_logging_level, String logid, OrtLoggingFunction logging_function, Pointer logger_param) { super((Pointer)null); allocate(default_logging_level, logid, logging_function, logger_param); } diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/MemoryInfo.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/MemoryInfo.java index 8a4e8b40ae2..8e45f4b4a8c 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/MemoryInfo.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/MemoryInfo.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.3: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.4-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/ModelMetadata.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/ModelMetadata.java index f775ec7caa6..4cfca552c38 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/ModelMetadata.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/ModelMetadata.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.3: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.4-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; @@ -26,6 +26,9 @@ public class ModelMetadata extends BaseModelMetadata { public native @Cast("char*") BytePointer GetGraphName(OrtAllocator allocator); public native @Cast("char*") BytePointer GetDomain(OrtAllocator allocator); public native @Cast("char*") BytePointer GetDescription(OrtAllocator allocator); + public native @Cast("char**") PointerPointer GetCustomMetadataMapKeys(OrtAllocator allocator, @Cast("int64_t*") @ByRef LongPointer num_keys); + public native @Cast("char**") @ByPtrPtr ByteBuffer GetCustomMetadataMapKeys(OrtAllocator allocator, @Cast("int64_t*") @ByRef LongBuffer num_keys); + public native @Cast("char**") @ByPtrPtr byte[] GetCustomMetadataMapKeys(OrtAllocator allocator, @Cast("int64_t*") @ByRef long[] num_keys); public native @Cast("char*") BytePointer LookupCustomMetadataMap(@Cast("const char*") BytePointer key, OrtAllocator allocator); public native @Cast("char*") ByteBuffer LookupCustomMetadataMap(String key, OrtAllocator allocator); public native @Cast("int64_t") long GetVersion(); diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtAllocator.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtAllocator.java index dfe0d14b1cf..de720df0ced 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtAllocator.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtAllocator.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.3: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.4-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtApi.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtApi.java index 6660e7de0f3..df12727b30a 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtApi.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtApi.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.3: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.4-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; @@ -74,7 +74,7 @@ public static class CreateEnv_int_BytePointer_PointerPointer extends FunctionPoi public CreateEnv_int_BytePointer_PointerPointer(Pointer p) { super(p); } protected CreateEnv_int_BytePointer_PointerPointer() { allocate(); } private native void allocate(); - public native OrtStatus call(@Cast("OrtLoggingLevel") int default_logging_level, @Cast("const char*") BytePointer logid, @Cast("OrtEnv**") PointerPointer out); + public native @Cast("OrtStatusPtr") OrtStatus call( @Cast("OrtLoggingLevel") int default_logging_level, @Cast("const char*") BytePointer logid, @Cast("OrtEnv**") PointerPointer out); } public native CreateEnv_int_BytePointer_PointerPointer CreateEnv(); public native OrtApi CreateEnv(CreateEnv_int_BytePointer_PointerPointer setter); @@ -87,10 +87,8 @@ public static class CreateEnvWithCustomLogger_OrtLoggingFunction_Pointer_int_Byt public CreateEnvWithCustomLogger_OrtLoggingFunction_Pointer_int_BytePointer_PointerPointer(Pointer p) { super(p); } protected CreateEnvWithCustomLogger_OrtLoggingFunction_Pointer_int_BytePointer_PointerPointer() { allocate(); } private native void allocate(); - public native OrtStatus call(OrtLoggingFunction logging_function, - Pointer logger_param, @Cast("OrtLoggingLevel") int default_warning_level, - @Cast("const char*") BytePointer logid, - @Cast("OrtEnv**") PointerPointer out); + public native @Cast("OrtStatusPtr") OrtStatus call( OrtLoggingFunction logging_function, Pointer logger_param, + @Cast("OrtLoggingLevel") int default_warning_level, @Cast("const char*") BytePointer logid, @Cast("OrtEnv**") PointerPointer out); } public native CreateEnvWithCustomLogger_OrtLoggingFunction_Pointer_int_BytePointer_PointerPointer CreateEnvWithCustomLogger(); public native OrtApi CreateEnvWithCustomLogger(CreateEnvWithCustomLogger_OrtLoggingFunction_Pointer_int_BytePointer_PointerPointer setter); @@ -101,7 +99,7 @@ public static class EnableTelemetryEvents_OrtEnv extends FunctionPointer { public EnableTelemetryEvents_OrtEnv(Pointer p) { super(p); } protected EnableTelemetryEvents_OrtEnv() { allocate(); } private native void allocate(); - public native OrtStatus call(@Const OrtEnv env); + public native @Cast("OrtStatusPtr") OrtStatus call( @Const OrtEnv env); } public native EnableTelemetryEvents_OrtEnv EnableTelemetryEvents(); public native OrtApi EnableTelemetryEvents(EnableTelemetryEvents_OrtEnv setter); public static class DisableTelemetryEvents_OrtEnv extends FunctionPointer { @@ -110,7 +108,7 @@ public static class DisableTelemetryEvents_OrtEnv extends FunctionPointer { public DisableTelemetryEvents_OrtEnv(Pointer p) { super(p); } protected DisableTelemetryEvents_OrtEnv() { allocate(); } private native void allocate(); - public native OrtStatus call(@Const OrtEnv env); + public native @Cast("OrtStatusPtr") OrtStatus call( @Const OrtEnv env); } public native DisableTelemetryEvents_OrtEnv DisableTelemetryEvents(); public native OrtApi DisableTelemetryEvents(DisableTelemetryEvents_OrtEnv setter); @@ -125,8 +123,8 @@ public static class CreateSession_OrtEnv_Pointer_OrtSessionOptions_PointerPointe public CreateSession_OrtEnv_Pointer_OrtSessionOptions_PointerPointer(Pointer p) { super(p); } protected CreateSession_OrtEnv_Pointer_OrtSessionOptions_PointerPointer() { allocate(); } private native void allocate(); - public native OrtStatus call(@Const OrtEnv env, @Cast("const ORTCHAR_T*") Pointer model_path, - @Const OrtSessionOptions options, @Cast("OrtSession**") PointerPointer out); + public native @Cast("OrtStatusPtr") OrtStatus call( @Const OrtEnv env, @Cast("const ORTCHAR_T*") Pointer model_path, + @Const OrtSessionOptions options, @Cast("OrtSession**") PointerPointer out); } public native CreateSession_OrtEnv_Pointer_OrtSessionOptions_PointerPointer CreateSession(); public native OrtApi CreateSession(CreateSession_OrtEnv_Pointer_OrtSessionOptions_PointerPointer setter); @@ -136,8 +134,8 @@ public static class CreateSessionFromArray_OrtEnv_Pointer_long_OrtSessionOptions public CreateSessionFromArray_OrtEnv_Pointer_long_OrtSessionOptions_PointerPointer(Pointer p) { super(p); } protected CreateSessionFromArray_OrtEnv_Pointer_long_OrtSessionOptions_PointerPointer() { allocate(); } private native void allocate(); - public native OrtStatus call(@Const OrtEnv env, @Const Pointer model_data, @Cast("size_t") long model_data_length, - @Const OrtSessionOptions options, @Cast("OrtSession**") PointerPointer out); + public native @Cast("OrtStatusPtr") OrtStatus call( @Const OrtEnv env, @Const Pointer model_data, @Cast("size_t") long model_data_length, + @Const OrtSessionOptions options, @Cast("OrtSession**") PointerPointer out); } public native CreateSessionFromArray_OrtEnv_Pointer_long_OrtSessionOptions_PointerPointer CreateSessionFromArray(); public native OrtApi CreateSessionFromArray(CreateSessionFromArray_OrtEnv_Pointer_long_OrtSessionOptions_PointerPointer setter); @@ -147,10 +145,11 @@ public static class Run_OrtSession_OrtRunOptions_PointerPointer_PointerPointer_l public Run_OrtSession_OrtRunOptions_PointerPointer_PointerPointer_long_PointerPointer_long_PointerPointer(Pointer p) { super(p); } protected Run_OrtSession_OrtRunOptions_PointerPointer_PointerPointer_long_PointerPointer_long_PointerPointer() { allocate(); } private native void allocate(); - public native OrtStatus call(OrtSession sess, - @Const OrtRunOptions run_options, - @Cast("const char*const*") PointerPointer input_names, @Cast("const OrtValue*const*") PointerPointer input, @Cast("size_t") long input_len, - @Cast("const char*const*") PointerPointer output_names, @Cast("size_t") long output_names_len, @Cast("OrtValue**") PointerPointer output); + public native @Cast("OrtStatusPtr") OrtStatus call( OrtSession sess, @Const OrtRunOptions run_options, + @Cast("const char*const*") PointerPointer input_names, + @Cast("const OrtValue*const*") PointerPointer input, @Cast("size_t") long input_len, + @Cast("const char*const*") PointerPointer output_names1, @Cast("size_t") long output_names_len, + @Cast("OrtValue**") PointerPointer output); } public native Run_OrtSession_OrtRunOptions_PointerPointer_PointerPointer_long_PointerPointer_long_PointerPointer Run(); public native OrtApi Run(Run_OrtSession_OrtRunOptions_PointerPointer_PointerPointer_long_PointerPointer_long_PointerPointer setter); @@ -163,7 +162,7 @@ public static class CreateSessionOptions_PointerPointer extends FunctionPointer public CreateSessionOptions_PointerPointer(Pointer p) { super(p); } protected CreateSessionOptions_PointerPointer() { allocate(); } private native void allocate(); - public native OrtStatus call(@Cast("OrtSessionOptions**") PointerPointer options); + public native @Cast("OrtStatusPtr") OrtStatus call( @Cast("OrtSessionOptions**") PointerPointer options); } public native CreateSessionOptions_PointerPointer CreateSessionOptions(); public native OrtApi CreateSessionOptions(CreateSessionOptions_PointerPointer setter); @@ -174,7 +173,8 @@ public static class SetOptimizedModelFilePath_OrtSessionOptions_Pointer extends public SetOptimizedModelFilePath_OrtSessionOptions_Pointer(Pointer p) { super(p); } protected SetOptimizedModelFilePath_OrtSessionOptions_Pointer() { allocate(); } private native void allocate(); - public native OrtStatus call(OrtSessionOptions options, @Cast("const ORTCHAR_T*") Pointer optimized_model_filepath); + public native @Cast("OrtStatusPtr") OrtStatus call( OrtSessionOptions options, + @Cast("const ORTCHAR_T*") Pointer optimized_model_filepath); } public native SetOptimizedModelFilePath_OrtSessionOptions_Pointer SetOptimizedModelFilePath(); public native OrtApi SetOptimizedModelFilePath(SetOptimizedModelFilePath_OrtSessionOptions_Pointer setter); @@ -185,7 +185,8 @@ public static class CloneSessionOptions_OrtSessionOptions_PointerPointer extends public CloneSessionOptions_OrtSessionOptions_PointerPointer(Pointer p) { super(p); } protected CloneSessionOptions_OrtSessionOptions_PointerPointer() { allocate(); } private native void allocate(); - public native OrtStatus call(@Const OrtSessionOptions in_options, @Cast("OrtSessionOptions**") PointerPointer out_options); + public native @Cast("OrtStatusPtr") OrtStatus call( @Const OrtSessionOptions in_options, + @Cast("OrtSessionOptions**") PointerPointer out_options); } public native CloneSessionOptions_OrtSessionOptions_PointerPointer CloneSessionOptions(); public native OrtApi CloneSessionOptions(CloneSessionOptions_OrtSessionOptions_PointerPointer setter); @@ -198,7 +199,7 @@ public static class SetSessionExecutionMode_OrtSessionOptions_int extends Functi public SetSessionExecutionMode_OrtSessionOptions_int(Pointer p) { super(p); } protected SetSessionExecutionMode_OrtSessionOptions_int() { allocate(); } private native void allocate(); - public native OrtStatus call(OrtSessionOptions options, @Cast("ExecutionMode") int execution_mode); + public native @Cast("OrtStatusPtr") OrtStatus call( OrtSessionOptions options, @Cast("ExecutionMode") int execution_mode); } public native SetSessionExecutionMode_OrtSessionOptions_int SetSessionExecutionMode(); public native OrtApi SetSessionExecutionMode(SetSessionExecutionMode_OrtSessionOptions_int setter); @@ -209,7 +210,7 @@ public static class EnableProfiling_OrtSessionOptions_Pointer extends FunctionPo public EnableProfiling_OrtSessionOptions_Pointer(Pointer p) { super(p); } protected EnableProfiling_OrtSessionOptions_Pointer() { allocate(); } private native void allocate(); - public native OrtStatus call(OrtSessionOptions options, @Cast("const ORTCHAR_T*") Pointer profile_file_prefix); + public native @Cast("OrtStatusPtr") OrtStatus call( OrtSessionOptions options, @Cast("const ORTCHAR_T*") Pointer profile_file_prefix); } public native EnableProfiling_OrtSessionOptions_Pointer EnableProfiling(); public native OrtApi EnableProfiling(EnableProfiling_OrtSessionOptions_Pointer setter); public static class DisableProfiling_OrtSessionOptions extends FunctionPointer { @@ -218,7 +219,7 @@ public static class DisableProfiling_OrtSessionOptions extends FunctionPointer { public DisableProfiling_OrtSessionOptions(Pointer p) { super(p); } protected DisableProfiling_OrtSessionOptions() { allocate(); } private native void allocate(); - public native OrtStatus call(OrtSessionOptions options); + public native @Cast("OrtStatusPtr") OrtStatus call( OrtSessionOptions options); } public native DisableProfiling_OrtSessionOptions DisableProfiling(); public native OrtApi DisableProfiling(DisableProfiling_OrtSessionOptions setter); @@ -233,7 +234,7 @@ public static class EnableMemPattern_OrtSessionOptions extends FunctionPointer { public EnableMemPattern_OrtSessionOptions(Pointer p) { super(p); } protected EnableMemPattern_OrtSessionOptions() { allocate(); } private native void allocate(); - public native OrtStatus call(OrtSessionOptions options); + public native @Cast("OrtStatusPtr") OrtStatus call( OrtSessionOptions options); } public native EnableMemPattern_OrtSessionOptions EnableMemPattern(); public native OrtApi EnableMemPattern(EnableMemPattern_OrtSessionOptions setter); public static class DisableMemPattern_OrtSessionOptions extends FunctionPointer { @@ -242,7 +243,7 @@ public static class DisableMemPattern_OrtSessionOptions extends FunctionPointer public DisableMemPattern_OrtSessionOptions(Pointer p) { super(p); } protected DisableMemPattern_OrtSessionOptions() { allocate(); } private native void allocate(); - public native OrtStatus call(OrtSessionOptions options); + public native @Cast("OrtStatusPtr") OrtStatus call( OrtSessionOptions options); } public native DisableMemPattern_OrtSessionOptions DisableMemPattern(); public native OrtApi DisableMemPattern(DisableMemPattern_OrtSessionOptions setter); @@ -255,7 +256,7 @@ public static class EnableCpuMemArena_OrtSessionOptions extends FunctionPointer public EnableCpuMemArena_OrtSessionOptions(Pointer p) { super(p); } protected EnableCpuMemArena_OrtSessionOptions() { allocate(); } private native void allocate(); - public native OrtStatus call(OrtSessionOptions options); + public native @Cast("OrtStatusPtr") OrtStatus call( OrtSessionOptions options); } public native EnableCpuMemArena_OrtSessionOptions EnableCpuMemArena(); public native OrtApi EnableCpuMemArena(EnableCpuMemArena_OrtSessionOptions setter); public static class DisableCpuMemArena_OrtSessionOptions extends FunctionPointer { @@ -264,7 +265,7 @@ public static class DisableCpuMemArena_OrtSessionOptions extends FunctionPointer public DisableCpuMemArena_OrtSessionOptions(Pointer p) { super(p); } protected DisableCpuMemArena_OrtSessionOptions() { allocate(); } private native void allocate(); - public native OrtStatus call(OrtSessionOptions options); + public native @Cast("OrtStatusPtr") OrtStatus call( OrtSessionOptions options); } public native DisableCpuMemArena_OrtSessionOptions DisableCpuMemArena(); public native OrtApi DisableCpuMemArena(DisableCpuMemArena_OrtSessionOptions setter); @@ -275,7 +276,7 @@ public static class SetSessionLogId_OrtSessionOptions_BytePointer extends Functi public SetSessionLogId_OrtSessionOptions_BytePointer(Pointer p) { super(p); } protected SetSessionLogId_OrtSessionOptions_BytePointer() { allocate(); } private native void allocate(); - public native OrtStatus call(OrtSessionOptions options, @Cast("const char*") BytePointer logid); + public native @Cast("OrtStatusPtr") OrtStatus call( OrtSessionOptions options, @Cast("const char*") BytePointer logid); } public native SetSessionLogId_OrtSessionOptions_BytePointer SetSessionLogId(); public native OrtApi SetSessionLogId(SetSessionLogId_OrtSessionOptions_BytePointer setter); @@ -286,7 +287,7 @@ public static class SetSessionLogVerbosityLevel_OrtSessionOptions_int extends Fu public SetSessionLogVerbosityLevel_OrtSessionOptions_int(Pointer p) { super(p); } protected SetSessionLogVerbosityLevel_OrtSessionOptions_int() { allocate(); } private native void allocate(); - public native OrtStatus call(OrtSessionOptions options, int session_log_verbosity_level); + public native @Cast("OrtStatusPtr") OrtStatus call( OrtSessionOptions options, int session_log_verbosity_level); } public native SetSessionLogVerbosityLevel_OrtSessionOptions_int SetSessionLogVerbosityLevel(); public native OrtApi SetSessionLogVerbosityLevel(SetSessionLogVerbosityLevel_OrtSessionOptions_int setter); public static class SetSessionLogSeverityLevel_OrtSessionOptions_int extends FunctionPointer { @@ -295,7 +296,7 @@ public static class SetSessionLogSeverityLevel_OrtSessionOptions_int extends Fun public SetSessionLogSeverityLevel_OrtSessionOptions_int(Pointer p) { super(p); } protected SetSessionLogSeverityLevel_OrtSessionOptions_int() { allocate(); } private native void allocate(); - public native OrtStatus call(OrtSessionOptions options, int session_log_severity_level); + public native @Cast("OrtStatusPtr") OrtStatus call( OrtSessionOptions options, int session_log_severity_level); } public native SetSessionLogSeverityLevel_OrtSessionOptions_int SetSessionLogSeverityLevel(); public native OrtApi SetSessionLogSeverityLevel(SetSessionLogSeverityLevel_OrtSessionOptions_int setter); @@ -305,19 +306,22 @@ public static class SetSessionGraphOptimizationLevel_OrtSessionOptions_int exten public SetSessionGraphOptimizationLevel_OrtSessionOptions_int(Pointer p) { super(p); } protected SetSessionGraphOptimizationLevel_OrtSessionOptions_int() { allocate(); } private native void allocate(); - public native OrtStatus call(OrtSessionOptions options, @Cast("GraphOptimizationLevel") int graph_optimization_level); + public native @Cast("OrtStatusPtr") OrtStatus call( OrtSessionOptions options, + @Cast("GraphOptimizationLevel") int graph_optimization_level); } public native SetSessionGraphOptimizationLevel_OrtSessionOptions_int SetSessionGraphOptimizationLevel(); public native OrtApi SetSessionGraphOptimizationLevel(SetSessionGraphOptimizationLevel_OrtSessionOptions_int setter); // Sets the number of threads used to parallelize the execution within nodes // A value of 0 means ORT will pick a default + // Note: If you've built ORT with OpenMP, this API has no effect on the number of threads used. In this case + // use the OpenMP env variables to configure the number of intra op num threads. public static class SetIntraOpNumThreads_OrtSessionOptions_int extends FunctionPointer { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public SetIntraOpNumThreads_OrtSessionOptions_int(Pointer p) { super(p); } protected SetIntraOpNumThreads_OrtSessionOptions_int() { allocate(); } private native void allocate(); - public native OrtStatus call(OrtSessionOptions options, int intra_op_num_threads); + public native @Cast("OrtStatusPtr") OrtStatus call( OrtSessionOptions options, int intra_op_num_threads); } public native SetIntraOpNumThreads_OrtSessionOptions_int SetIntraOpNumThreads(); public native OrtApi SetIntraOpNumThreads(SetIntraOpNumThreads_OrtSessionOptions_int setter); @@ -330,7 +334,7 @@ public static class SetInterOpNumThreads_OrtSessionOptions_int extends FunctionP public SetInterOpNumThreads_OrtSessionOptions_int(Pointer p) { super(p); } protected SetInterOpNumThreads_OrtSessionOptions_int() { allocate(); } private native void allocate(); - public native OrtStatus call(OrtSessionOptions options, int inter_op_num_threads); + public native @Cast("OrtStatusPtr") OrtStatus call( OrtSessionOptions options, int inter_op_num_threads); } public native SetInterOpNumThreads_OrtSessionOptions_int SetInterOpNumThreads(); public native OrtApi SetInterOpNumThreads(SetInterOpNumThreads_OrtSessionOptions_int setter); @@ -343,7 +347,7 @@ public static class CreateCustomOpDomain_BytePointer_PointerPointer extends Func public CreateCustomOpDomain_BytePointer_PointerPointer(Pointer p) { super(p); } protected CreateCustomOpDomain_BytePointer_PointerPointer() { allocate(); } private native void allocate(); - public native OrtStatus call(@Cast("const char*") BytePointer domain, @Cast("OrtCustomOpDomain**") PointerPointer out); + public native @Cast("OrtStatusPtr") OrtStatus call( @Cast("const char*") BytePointer domain, @Cast("OrtCustomOpDomain**") PointerPointer out); } public native CreateCustomOpDomain_BytePointer_PointerPointer CreateCustomOpDomain(); public native OrtApi CreateCustomOpDomain(CreateCustomOpDomain_BytePointer_PointerPointer setter); @@ -357,7 +361,7 @@ public static class CustomOpDomain_Add_OrtCustomOpDomain_OrtCustomOp extends Fun public CustomOpDomain_Add_OrtCustomOpDomain_OrtCustomOp(Pointer p) { super(p); } protected CustomOpDomain_Add_OrtCustomOpDomain_OrtCustomOp() { allocate(); } private native void allocate(); - public native OrtStatus call(OrtCustomOpDomain custom_op_domain, OrtCustomOp op); + public native @Cast("OrtStatusPtr") OrtStatus call( OrtCustomOpDomain custom_op_domain, OrtCustomOp op); } public native CustomOpDomain_Add_OrtCustomOpDomain_OrtCustomOp CustomOpDomain_Add(); public native OrtApi CustomOpDomain_Add(CustomOpDomain_Add_OrtCustomOpDomain_OrtCustomOp setter); @@ -371,7 +375,7 @@ public static class AddCustomOpDomain_OrtSessionOptions_OrtCustomOpDomain extend public AddCustomOpDomain_OrtSessionOptions_OrtCustomOpDomain(Pointer p) { super(p); } protected AddCustomOpDomain_OrtSessionOptions_OrtCustomOpDomain() { allocate(); } private native void allocate(); - public native OrtStatus call(OrtSessionOptions options, OrtCustomOpDomain custom_op_domain); + public native @Cast("OrtStatusPtr") OrtStatus call( OrtSessionOptions options, OrtCustomOpDomain custom_op_domain); } public native AddCustomOpDomain_OrtSessionOptions_OrtCustomOpDomain AddCustomOpDomain(); public native OrtApi AddCustomOpDomain(AddCustomOpDomain_OrtSessionOptions_OrtCustomOpDomain setter); @@ -388,7 +392,8 @@ public static class RegisterCustomOpsLibrary_OrtSessionOptions_BytePointer_Point public RegisterCustomOpsLibrary_OrtSessionOptions_BytePointer_PointerPointer(Pointer p) { super(p); } protected RegisterCustomOpsLibrary_OrtSessionOptions_BytePointer_PointerPointer() { allocate(); } private native void allocate(); - public native OrtStatus call(OrtSessionOptions options, @Cast("const char*") BytePointer library_path, @Cast("void**") PointerPointer library_handle); + public native @Cast("OrtStatusPtr") OrtStatus call( OrtSessionOptions options, @Cast("const char*") BytePointer library_path, + @Cast("void**") PointerPointer library_handle); } public native RegisterCustomOpsLibrary_OrtSessionOptions_BytePointer_PointerPointer RegisterCustomOpsLibrary(); public native OrtApi RegisterCustomOpsLibrary(RegisterCustomOpsLibrary_OrtSessionOptions_BytePointer_PointerPointer setter); @@ -398,7 +403,7 @@ public static class RegisterCustomOpsLibrary_OrtSessionOptions_BytePointer_Point * OrtSessionOptionsAppendExecutionProvider_CPU * OrtSessionOptionsAppendExecutionProvider_CUDA * OrtSessionOptionsAppendExecutionProvider_ - * The order they care called indicates the preference order as well. In other words call this method + * The order they are called indicates the preference order as well. In other words call this method * on your most preferred execution provider first followed by the less preferred ones. * If none are called Ort will use its internal CPU execution provider. */ @@ -409,7 +414,7 @@ public static class SessionGetInputCount_OrtSession_SizeTPointer extends Functio public SessionGetInputCount_OrtSession_SizeTPointer(Pointer p) { super(p); } protected SessionGetInputCount_OrtSession_SizeTPointer() { allocate(); } private native void allocate(); - public native OrtStatus call(@Const OrtSession sess, @Cast("size_t*") SizeTPointer out); + public native @Cast("OrtStatusPtr") OrtStatus call( @Const OrtSession sess, @Cast("size_t*") SizeTPointer out); } public native SessionGetInputCount_OrtSession_SizeTPointer SessionGetInputCount(); public native OrtApi SessionGetInputCount(SessionGetInputCount_OrtSession_SizeTPointer setter); public static class SessionGetOutputCount_OrtSession_SizeTPointer extends FunctionPointer { @@ -418,7 +423,7 @@ public static class SessionGetOutputCount_OrtSession_SizeTPointer extends Functi public SessionGetOutputCount_OrtSession_SizeTPointer(Pointer p) { super(p); } protected SessionGetOutputCount_OrtSession_SizeTPointer() { allocate(); } private native void allocate(); - public native OrtStatus call(@Const OrtSession sess, @Cast("size_t*") SizeTPointer out); + public native @Cast("OrtStatusPtr") OrtStatus call( @Const OrtSession sess, @Cast("size_t*") SizeTPointer out); } public native SessionGetOutputCount_OrtSession_SizeTPointer SessionGetOutputCount(); public native OrtApi SessionGetOutputCount(SessionGetOutputCount_OrtSession_SizeTPointer setter); public static class SessionGetOverridableInitializerCount_OrtSession_SizeTPointer extends FunctionPointer { @@ -427,7 +432,7 @@ public static class SessionGetOverridableInitializerCount_OrtSession_SizeTPointe public SessionGetOverridableInitializerCount_OrtSession_SizeTPointer(Pointer p) { super(p); } protected SessionGetOverridableInitializerCount_OrtSession_SizeTPointer() { allocate(); } private native void allocate(); - public native OrtStatus call(@Const OrtSession sess, @Cast("size_t*") SizeTPointer out); + public native @Cast("OrtStatusPtr") OrtStatus call( @Const OrtSession sess, @Cast("size_t*") SizeTPointer out); } public native SessionGetOverridableInitializerCount_OrtSession_SizeTPointer SessionGetOverridableInitializerCount(); public native OrtApi SessionGetOverridableInitializerCount(SessionGetOverridableInitializerCount_OrtSession_SizeTPointer setter); @@ -440,7 +445,7 @@ public static class SessionGetInputTypeInfo_OrtSession_long_PointerPointer exten public SessionGetInputTypeInfo_OrtSession_long_PointerPointer(Pointer p) { super(p); } protected SessionGetInputTypeInfo_OrtSession_long_PointerPointer() { allocate(); } private native void allocate(); - public native OrtStatus call(@Const OrtSession sess, @Cast("size_t") long index, @Cast("OrtTypeInfo**") PointerPointer type_info); + public native @Cast("OrtStatusPtr") OrtStatus call( @Const OrtSession sess, @Cast("size_t") long index, @Cast("OrtTypeInfo**") PointerPointer type_info); } public native SessionGetInputTypeInfo_OrtSession_long_PointerPointer SessionGetInputTypeInfo(); public native OrtApi SessionGetInputTypeInfo(SessionGetInputTypeInfo_OrtSession_long_PointerPointer setter); @@ -453,7 +458,8 @@ public static class SessionGetOutputTypeInfo_OrtSession_long_PointerPointer exte public SessionGetOutputTypeInfo_OrtSession_long_PointerPointer(Pointer p) { super(p); } protected SessionGetOutputTypeInfo_OrtSession_long_PointerPointer() { allocate(); } private native void allocate(); - public native OrtStatus call(@Const OrtSession sess, @Cast("size_t") long index, @Cast("OrtTypeInfo**") PointerPointer type_info); + public native @Cast("OrtStatusPtr") OrtStatus call( @Const OrtSession sess, @Cast("size_t") long index, + @Cast("OrtTypeInfo**") PointerPointer type_info); } public native SessionGetOutputTypeInfo_OrtSession_long_PointerPointer SessionGetOutputTypeInfo(); public native OrtApi SessionGetOutputTypeInfo(SessionGetOutputTypeInfo_OrtSession_long_PointerPointer setter); @@ -466,7 +472,8 @@ public static class SessionGetOverridableInitializerTypeInfo_OrtSession_long_Poi public SessionGetOverridableInitializerTypeInfo_OrtSession_long_PointerPointer(Pointer p) { super(p); } protected SessionGetOverridableInitializerTypeInfo_OrtSession_long_PointerPointer() { allocate(); } private native void allocate(); - public native OrtStatus call(@Const OrtSession sess, @Cast("size_t") long index, @Cast("OrtTypeInfo**") PointerPointer type_info); + public native @Cast("OrtStatusPtr") OrtStatus call( @Const OrtSession sess, @Cast("size_t") long index, + @Cast("OrtTypeInfo**") PointerPointer type_info); } public native SessionGetOverridableInitializerTypeInfo_OrtSession_long_PointerPointer SessionGetOverridableInitializerTypeInfo(); public native OrtApi SessionGetOverridableInitializerTypeInfo(SessionGetOverridableInitializerTypeInfo_OrtSession_long_PointerPointer setter); @@ -479,8 +486,8 @@ public static class SessionGetInputName_OrtSession_long_OrtAllocator_PointerPoin public SessionGetInputName_OrtSession_long_OrtAllocator_PointerPointer(Pointer p) { super(p); } protected SessionGetInputName_OrtSession_long_OrtAllocator_PointerPointer() { allocate(); } private native void allocate(); - public native OrtStatus call(@Const OrtSession sess, @Cast("size_t") long index, - OrtAllocator allocator, @Cast("char**") PointerPointer value); + public native @Cast("OrtStatusPtr") OrtStatus call( @Const OrtSession sess, @Cast("size_t") long index, OrtAllocator allocator, + @Cast("char**") PointerPointer value); } public native SessionGetInputName_OrtSession_long_OrtAllocator_PointerPointer SessionGetInputName(); public native OrtApi SessionGetInputName(SessionGetInputName_OrtSession_long_OrtAllocator_PointerPointer setter); public static class SessionGetOutputName_OrtSession_long_OrtAllocator_PointerPointer extends FunctionPointer { @@ -489,8 +496,8 @@ public static class SessionGetOutputName_OrtSession_long_OrtAllocator_PointerPoi public SessionGetOutputName_OrtSession_long_OrtAllocator_PointerPointer(Pointer p) { super(p); } protected SessionGetOutputName_OrtSession_long_OrtAllocator_PointerPointer() { allocate(); } private native void allocate(); - public native OrtStatus call(@Const OrtSession sess, @Cast("size_t") long index, - OrtAllocator allocator, @Cast("char**") PointerPointer value); + public native @Cast("OrtStatusPtr") OrtStatus call( @Const OrtSession sess, @Cast("size_t") long index, OrtAllocator allocator, + @Cast("char**") PointerPointer value); } public native SessionGetOutputName_OrtSession_long_OrtAllocator_PointerPointer SessionGetOutputName(); public native OrtApi SessionGetOutputName(SessionGetOutputName_OrtSession_long_OrtAllocator_PointerPointer setter); public static class SessionGetOverridableInitializerName_OrtSession_long_OrtAllocator_PointerPointer extends FunctionPointer { @@ -499,8 +506,8 @@ public static class SessionGetOverridableInitializerName_OrtSession_long_OrtAllo public SessionGetOverridableInitializerName_OrtSession_long_OrtAllocator_PointerPointer(Pointer p) { super(p); } protected SessionGetOverridableInitializerName_OrtSession_long_OrtAllocator_PointerPointer() { allocate(); } private native void allocate(); - public native OrtStatus call(@Const OrtSession sess, @Cast("size_t") long index, - OrtAllocator allocator, @Cast("char**") PointerPointer value); + public native @Cast("OrtStatusPtr") OrtStatus call( @Const OrtSession sess, @Cast("size_t") long index, + OrtAllocator allocator, @Cast("char**") PointerPointer value); } public native SessionGetOverridableInitializerName_OrtSession_long_OrtAllocator_PointerPointer SessionGetOverridableInitializerName(); public native OrtApi SessionGetOverridableInitializerName(SessionGetOverridableInitializerName_OrtSession_long_OrtAllocator_PointerPointer setter); @@ -513,7 +520,7 @@ public static class CreateRunOptions_PointerPointer extends FunctionPointer { public CreateRunOptions_PointerPointer(Pointer p) { super(p); } protected CreateRunOptions_PointerPointer() { allocate(); } private native void allocate(); - public native OrtStatus call(@Cast("OrtRunOptions**") PointerPointer out); + public native @Cast("OrtStatusPtr") OrtStatus call( @Cast("OrtRunOptions**") PointerPointer out); } public native CreateRunOptions_PointerPointer CreateRunOptions(); public native OrtApi CreateRunOptions(CreateRunOptions_PointerPointer setter); @@ -523,7 +530,7 @@ public static class RunOptionsSetRunLogVerbosityLevel_OrtRunOptions_int extends public RunOptionsSetRunLogVerbosityLevel_OrtRunOptions_int(Pointer p) { super(p); } protected RunOptionsSetRunLogVerbosityLevel_OrtRunOptions_int() { allocate(); } private native void allocate(); - public native OrtStatus call(OrtRunOptions options, int value); + public native @Cast("OrtStatusPtr") OrtStatus call( OrtRunOptions options, int value); } public native RunOptionsSetRunLogVerbosityLevel_OrtRunOptions_int RunOptionsSetRunLogVerbosityLevel(); public native OrtApi RunOptionsSetRunLogVerbosityLevel(RunOptionsSetRunLogVerbosityLevel_OrtRunOptions_int setter); public static class RunOptionsSetRunLogSeverityLevel_OrtRunOptions_int extends FunctionPointer { @@ -532,7 +539,7 @@ public static class RunOptionsSetRunLogSeverityLevel_OrtRunOptions_int extends F public RunOptionsSetRunLogSeverityLevel_OrtRunOptions_int(Pointer p) { super(p); } protected RunOptionsSetRunLogSeverityLevel_OrtRunOptions_int() { allocate(); } private native void allocate(); - public native OrtStatus call(OrtRunOptions options, int value); + public native @Cast("OrtStatusPtr") OrtStatus call( OrtRunOptions options, int value); } public native RunOptionsSetRunLogSeverityLevel_OrtRunOptions_int RunOptionsSetRunLogSeverityLevel(); public native OrtApi RunOptionsSetRunLogSeverityLevel(RunOptionsSetRunLogSeverityLevel_OrtRunOptions_int setter); public static class RunOptionsSetRunTag_OrtRunOptions_BytePointer extends FunctionPointer { @@ -541,7 +548,7 @@ public static class RunOptionsSetRunTag_OrtRunOptions_BytePointer extends Functi public RunOptionsSetRunTag_OrtRunOptions_BytePointer(Pointer p) { super(p); } protected RunOptionsSetRunTag_OrtRunOptions_BytePointer() { allocate(); } private native void allocate(); - public native OrtStatus call(OrtRunOptions arg0, @Cast("const char*") BytePointer run_tag); + public native @Cast("OrtStatusPtr") OrtStatus call( OrtRunOptions arg0, @Cast("const char*") BytePointer run_tag); } public native RunOptionsSetRunTag_OrtRunOptions_BytePointer RunOptionsSetRunTag(); public native OrtApi RunOptionsSetRunTag(RunOptionsSetRunTag_OrtRunOptions_BytePointer setter); @@ -551,7 +558,7 @@ public static class RunOptionsGetRunLogVerbosityLevel_OrtRunOptions_IntPointer e public RunOptionsGetRunLogVerbosityLevel_OrtRunOptions_IntPointer(Pointer p) { super(p); } protected RunOptionsGetRunLogVerbosityLevel_OrtRunOptions_IntPointer() { allocate(); } private native void allocate(); - public native OrtStatus call(@Const OrtRunOptions options, IntPointer out); + public native @Cast("OrtStatusPtr") OrtStatus call( @Const OrtRunOptions options, IntPointer out); } public native RunOptionsGetRunLogVerbosityLevel_OrtRunOptions_IntPointer RunOptionsGetRunLogVerbosityLevel(); public native OrtApi RunOptionsGetRunLogVerbosityLevel(RunOptionsGetRunLogVerbosityLevel_OrtRunOptions_IntPointer setter); public static class RunOptionsGetRunLogSeverityLevel_OrtRunOptions_IntPointer extends FunctionPointer { @@ -560,7 +567,7 @@ public static class RunOptionsGetRunLogSeverityLevel_OrtRunOptions_IntPointer ex public RunOptionsGetRunLogSeverityLevel_OrtRunOptions_IntPointer(Pointer p) { super(p); } protected RunOptionsGetRunLogSeverityLevel_OrtRunOptions_IntPointer() { allocate(); } private native void allocate(); - public native OrtStatus call(@Const OrtRunOptions options, IntPointer out); + public native @Cast("OrtStatusPtr") OrtStatus call( @Const OrtRunOptions options, IntPointer out); } public native RunOptionsGetRunLogSeverityLevel_OrtRunOptions_IntPointer RunOptionsGetRunLogSeverityLevel(); public native OrtApi RunOptionsGetRunLogSeverityLevel(RunOptionsGetRunLogSeverityLevel_OrtRunOptions_IntPointer setter); public static class RunOptionsGetRunTag_OrtRunOptions_PointerPointer extends FunctionPointer { @@ -569,7 +576,7 @@ public static class RunOptionsGetRunTag_OrtRunOptions_PointerPointer extends Fun public RunOptionsGetRunTag_OrtRunOptions_PointerPointer(Pointer p) { super(p); } protected RunOptionsGetRunTag_OrtRunOptions_PointerPointer() { allocate(); } private native void allocate(); - public native OrtStatus call(@Const OrtRunOptions arg0, @Cast("const char**") PointerPointer out); + public native @Cast("OrtStatusPtr") OrtStatus call( @Const OrtRunOptions arg0, @Cast("const char**") PointerPointer out); } public native RunOptionsGetRunTag_OrtRunOptions_PointerPointer RunOptionsGetRunTag(); public native OrtApi RunOptionsGetRunTag(RunOptionsGetRunTag_OrtRunOptions_PointerPointer setter); @@ -581,7 +588,7 @@ public static class RunOptionsSetTerminate_OrtRunOptions extends FunctionPointer public RunOptionsSetTerminate_OrtRunOptions(Pointer p) { super(p); } protected RunOptionsSetTerminate_OrtRunOptions() { allocate(); } private native void allocate(); - public native OrtStatus call(OrtRunOptions options); + public native @Cast("OrtStatusPtr") OrtStatus call( OrtRunOptions options); } public native RunOptionsSetTerminate_OrtRunOptions RunOptionsSetTerminate(); public native OrtApi RunOptionsSetTerminate(RunOptionsSetTerminate_OrtRunOptions setter); // Unset the terminate flag to enable this OrtRunOptions instance being used in new OrtRun calls. @@ -591,7 +598,7 @@ public static class RunOptionsUnsetTerminate_OrtRunOptions extends FunctionPoint public RunOptionsUnsetTerminate_OrtRunOptions(Pointer p) { super(p); } protected RunOptionsUnsetTerminate_OrtRunOptions() { allocate(); } private native void allocate(); - public native OrtStatus call(OrtRunOptions options); + public native @Cast("OrtStatusPtr") OrtStatus call( OrtRunOptions options); } public native RunOptionsUnsetTerminate_OrtRunOptions RunOptionsUnsetTerminate(); public native OrtApi RunOptionsUnsetTerminate(RunOptionsUnsetTerminate_OrtRunOptions setter); @@ -606,9 +613,8 @@ public static class CreateTensorAsOrtValue_OrtAllocator_LongPointer_long_int_Poi public CreateTensorAsOrtValue_OrtAllocator_LongPointer_long_int_PointerPointer(Pointer p) { super(p); } protected CreateTensorAsOrtValue_OrtAllocator_LongPointer_long_int_PointerPointer() { allocate(); } private native void allocate(); - public native OrtStatus call(OrtAllocator allocator, - @Cast("const int64_t*") LongPointer shape, @Cast("size_t") long shape_len, @Cast("ONNXTensorElementDataType") int type, - @Cast("OrtValue**") PointerPointer out); + public native @Cast("OrtStatusPtr") OrtStatus call( OrtAllocator allocator, @Cast("const int64_t*") LongPointer shape, @Cast("size_t") long shape_len, + @Cast("ONNXTensorElementDataType") int type, @Cast("OrtValue**") PointerPointer out); } public native CreateTensorAsOrtValue_OrtAllocator_LongPointer_long_int_PointerPointer CreateTensorAsOrtValue(); public native OrtApi CreateTensorAsOrtValue(CreateTensorAsOrtValue_OrtAllocator_LongPointer_long_int_PointerPointer setter); @@ -623,9 +629,9 @@ public static class CreateTensorWithDataAsOrtValue_OrtMemoryInfo_Pointer_long_Lo public CreateTensorWithDataAsOrtValue_OrtMemoryInfo_Pointer_long_LongPointer_long_int_PointerPointer(Pointer p) { super(p); } protected CreateTensorWithDataAsOrtValue_OrtMemoryInfo_Pointer_long_LongPointer_long_int_PointerPointer() { allocate(); } private native void allocate(); - public native OrtStatus call(@Const OrtMemoryInfo info, - Pointer p_data, @Cast("size_t") long p_data_len, @Cast("const int64_t*") LongPointer shape, @Cast("size_t") long shape_len, - @Cast("ONNXTensorElementDataType") int type, @Cast("OrtValue**") PointerPointer out); + public native @Cast("OrtStatusPtr") OrtStatus call( @Const OrtMemoryInfo info, Pointer p_data, + @Cast("size_t") long p_data_len, @Cast("const int64_t*") LongPointer shape, @Cast("size_t") long shape_len, @Cast("ONNXTensorElementDataType") int type, + @Cast("OrtValue**") PointerPointer out); } public native CreateTensorWithDataAsOrtValue_OrtMemoryInfo_Pointer_long_LongPointer_long_int_PointerPointer CreateTensorWithDataAsOrtValue(); public native OrtApi CreateTensorWithDataAsOrtValue(CreateTensorWithDataAsOrtValue_OrtMemoryInfo_Pointer_long_LongPointer_long_int_PointerPointer setter); @@ -638,7 +644,7 @@ public static class IsTensor_OrtValue_IntPointer extends FunctionPointer { public IsTensor_OrtValue_IntPointer(Pointer p) { super(p); } protected IsTensor_OrtValue_IntPointer() { allocate(); } private native void allocate(); - public native OrtStatus call(@Const OrtValue value, IntPointer out); + public native @Cast("OrtStatusPtr") OrtStatus call( @Const OrtValue value, IntPointer out); } public native IsTensor_OrtValue_IntPointer IsTensor(); public native OrtApi IsTensor(IsTensor_OrtValue_IntPointer setter); @@ -650,7 +656,7 @@ public static class GetTensorMutableData_OrtValue_PointerPointer extends Functio public GetTensorMutableData_OrtValue_PointerPointer(Pointer p) { super(p); } protected GetTensorMutableData_OrtValue_PointerPointer() { allocate(); } private native void allocate(); - public native OrtStatus call(OrtValue value, @Cast("void**") PointerPointer out); + public native @Cast("OrtStatusPtr") OrtStatus call( OrtValue value, @Cast("void**") PointerPointer out); } public native GetTensorMutableData_OrtValue_PointerPointer GetTensorMutableData(); public native OrtApi GetTensorMutableData(GetTensorMutableData_OrtValue_PointerPointer setter); @@ -665,7 +671,7 @@ public static class FillStringTensor_OrtValue_PointerPointer_long extends Functi public FillStringTensor_OrtValue_PointerPointer_long(Pointer p) { super(p); } protected FillStringTensor_OrtValue_PointerPointer_long() { allocate(); } private native void allocate(); - public native OrtStatus call(OrtValue value, @Cast("const char*const*") PointerPointer s, @Cast("size_t") long s_len); + public native @Cast("OrtStatusPtr") OrtStatus call( OrtValue value, @Cast("const char*const*") PointerPointer s, @Cast("size_t") long s_len); } public native FillStringTensor_OrtValue_PointerPointer_long FillStringTensor(); public native OrtApi FillStringTensor(FillStringTensor_OrtValue_PointerPointer_long setter); @@ -679,7 +685,7 @@ public static class GetStringTensorDataLength_OrtValue_SizeTPointer extends Func public GetStringTensorDataLength_OrtValue_SizeTPointer(Pointer p) { super(p); } protected GetStringTensorDataLength_OrtValue_SizeTPointer() { allocate(); } private native void allocate(); - public native OrtStatus call(@Const OrtValue value, @Cast("size_t*") SizeTPointer len); + public native @Cast("OrtStatusPtr") OrtStatus call( @Const OrtValue value, @Cast("size_t*") SizeTPointer len); } public native GetStringTensorDataLength_OrtValue_SizeTPointer GetStringTensorDataLength(); public native OrtApi GetStringTensorDataLength(GetStringTensorDataLength_OrtValue_SizeTPointer setter); @@ -694,8 +700,8 @@ public static class GetStringTensorContent_OrtValue_Pointer_long_SizeTPointer_lo public GetStringTensorContent_OrtValue_Pointer_long_SizeTPointer_long(Pointer p) { super(p); } protected GetStringTensorContent_OrtValue_Pointer_long_SizeTPointer_long() { allocate(); } private native void allocate(); - public native OrtStatus call(@Const OrtValue value, Pointer s, @Cast("size_t") long s_len, - @Cast("size_t*") SizeTPointer offsets, @Cast("size_t") long offsets_len); + public native @Cast("OrtStatusPtr") OrtStatus call( @Const OrtValue value, Pointer s, + @Cast("size_t") long s_len, @Cast("size_t*") SizeTPointer offsets, @Cast("size_t") long offsets_len); } public native GetStringTensorContent_OrtValue_Pointer_long_SizeTPointer_long GetStringTensorContent(); public native OrtApi GetStringTensorContent(GetStringTensorContent_OrtValue_Pointer_long_SizeTPointer_long setter); @@ -708,7 +714,8 @@ public static class CastTypeInfoToTensorInfo_OrtTypeInfo_PointerPointer extends public CastTypeInfoToTensorInfo_OrtTypeInfo_PointerPointer(Pointer p) { super(p); } protected CastTypeInfoToTensorInfo_OrtTypeInfo_PointerPointer() { allocate(); } private native void allocate(); - public native OrtStatus call(@Const OrtTypeInfo arg0, @Cast("const OrtTensorTypeAndShapeInfo**") PointerPointer out); + public native @Cast("OrtStatusPtr") OrtStatus call( @Const OrtTypeInfo arg0, + @Cast("const OrtTensorTypeAndShapeInfo**") PointerPointer out); } public native CastTypeInfoToTensorInfo_OrtTypeInfo_PointerPointer CastTypeInfoToTensorInfo(); public native OrtApi CastTypeInfoToTensorInfo(CastTypeInfoToTensorInfo_OrtTypeInfo_PointerPointer setter); @@ -721,7 +728,7 @@ public static class GetOnnxTypeFromTypeInfo_OrtTypeInfo_IntPointer extends Funct public GetOnnxTypeFromTypeInfo_OrtTypeInfo_IntPointer(Pointer p) { super(p); } protected GetOnnxTypeFromTypeInfo_OrtTypeInfo_IntPointer() { allocate(); } private native void allocate(); - public native OrtStatus call(@Const OrtTypeInfo arg0, @Cast("ONNXType*") IntPointer out); + public native @Cast("OrtStatusPtr") OrtStatus call( @Const OrtTypeInfo arg0, @Cast("ONNXType*") IntPointer out); } public native GetOnnxTypeFromTypeInfo_OrtTypeInfo_IntPointer GetOnnxTypeFromTypeInfo(); public native OrtApi GetOnnxTypeFromTypeInfo(GetOnnxTypeFromTypeInfo_OrtTypeInfo_IntPointer setter); @@ -734,7 +741,7 @@ public static class CreateTensorTypeAndShapeInfo_PointerPointer extends Function public CreateTensorTypeAndShapeInfo_PointerPointer(Pointer p) { super(p); } protected CreateTensorTypeAndShapeInfo_PointerPointer() { allocate(); } private native void allocate(); - public native OrtStatus call(@Cast("OrtTensorTypeAndShapeInfo**") PointerPointer out); + public native @Cast("OrtStatusPtr") OrtStatus call( @Cast("OrtTensorTypeAndShapeInfo**") PointerPointer out); } public native CreateTensorTypeAndShapeInfo_PointerPointer CreateTensorTypeAndShapeInfo(); public native OrtApi CreateTensorTypeAndShapeInfo(CreateTensorTypeAndShapeInfo_PointerPointer setter); @@ -744,7 +751,7 @@ public static class SetTensorElementType_OrtTensorTypeAndShapeInfo_int extends F public SetTensorElementType_OrtTensorTypeAndShapeInfo_int(Pointer p) { super(p); } protected SetTensorElementType_OrtTensorTypeAndShapeInfo_int() { allocate(); } private native void allocate(); - public native OrtStatus call(OrtTensorTypeAndShapeInfo arg0, @Cast("ONNXTensorElementDataType") int type); + public native @Cast("OrtStatusPtr") OrtStatus call( OrtTensorTypeAndShapeInfo arg0, @Cast("ONNXTensorElementDataType") int type); } public native SetTensorElementType_OrtTensorTypeAndShapeInfo_int SetTensorElementType(); public native OrtApi SetTensorElementType(SetTensorElementType_OrtTensorTypeAndShapeInfo_int setter); @@ -759,7 +766,7 @@ public static class SetDimensions_OrtTensorTypeAndShapeInfo_LongPointer_long ext public SetDimensions_OrtTensorTypeAndShapeInfo_LongPointer_long(Pointer p) { super(p); } protected SetDimensions_OrtTensorTypeAndShapeInfo_LongPointer_long() { allocate(); } private native void allocate(); - public native OrtStatus call(OrtTensorTypeAndShapeInfo info, @Cast("const int64_t*") LongPointer dim_values, @Cast("size_t") long dim_count); + public native @Cast("OrtStatusPtr") OrtStatus call( OrtTensorTypeAndShapeInfo info, @Cast("const int64_t*") LongPointer dim_values, @Cast("size_t") long dim_count); } public native SetDimensions_OrtTensorTypeAndShapeInfo_LongPointer_long SetDimensions(); public native OrtApi SetDimensions(SetDimensions_OrtTensorTypeAndShapeInfo_LongPointer_long setter); @@ -769,7 +776,8 @@ public static class GetTensorElementType_OrtTensorTypeAndShapeInfo_IntPointer ex public GetTensorElementType_OrtTensorTypeAndShapeInfo_IntPointer(Pointer p) { super(p); } protected GetTensorElementType_OrtTensorTypeAndShapeInfo_IntPointer() { allocate(); } private native void allocate(); - public native OrtStatus call(@Const OrtTensorTypeAndShapeInfo arg0, @Cast("ONNXTensorElementDataType*") IntPointer out); + public native @Cast("OrtStatusPtr") OrtStatus call( @Const OrtTensorTypeAndShapeInfo arg0, + @Cast("ONNXTensorElementDataType*") IntPointer out); } public native GetTensorElementType_OrtTensorTypeAndShapeInfo_IntPointer GetTensorElementType(); public native OrtApi GetTensorElementType(GetTensorElementType_OrtTensorTypeAndShapeInfo_IntPointer setter); public static class GetDimensionsCount_OrtTensorTypeAndShapeInfo_SizeTPointer extends FunctionPointer { @@ -778,7 +786,7 @@ public static class GetDimensionsCount_OrtTensorTypeAndShapeInfo_SizeTPointer ex public GetDimensionsCount_OrtTensorTypeAndShapeInfo_SizeTPointer(Pointer p) { super(p); } protected GetDimensionsCount_OrtTensorTypeAndShapeInfo_SizeTPointer() { allocate(); } private native void allocate(); - public native OrtStatus call(@Const OrtTensorTypeAndShapeInfo info, @Cast("size_t*") SizeTPointer out); + public native @Cast("OrtStatusPtr") OrtStatus call( @Const OrtTensorTypeAndShapeInfo info, @Cast("size_t*") SizeTPointer out); } public native GetDimensionsCount_OrtTensorTypeAndShapeInfo_SizeTPointer GetDimensionsCount(); public native OrtApi GetDimensionsCount(GetDimensionsCount_OrtTensorTypeAndShapeInfo_SizeTPointer setter); public static class GetDimensions_OrtTensorTypeAndShapeInfo_LongPointer_long extends FunctionPointer { @@ -787,7 +795,8 @@ public static class GetDimensions_OrtTensorTypeAndShapeInfo_LongPointer_long ext public GetDimensions_OrtTensorTypeAndShapeInfo_LongPointer_long(Pointer p) { super(p); } protected GetDimensions_OrtTensorTypeAndShapeInfo_LongPointer_long() { allocate(); } private native void allocate(); - public native OrtStatus call(@Const OrtTensorTypeAndShapeInfo info, @Cast("int64_t*") LongPointer dim_values, @Cast("size_t") long dim_values_length); + public native @Cast("OrtStatusPtr") OrtStatus call( @Const OrtTensorTypeAndShapeInfo info, @Cast("int64_t*") LongPointer dim_values, + @Cast("size_t") long dim_values_length); } public native GetDimensions_OrtTensorTypeAndShapeInfo_LongPointer_long GetDimensions(); public native OrtApi GetDimensions(GetDimensions_OrtTensorTypeAndShapeInfo_LongPointer_long setter); public static class GetSymbolicDimensions_OrtTensorTypeAndShapeInfo_PointerPointer_long extends FunctionPointer { @@ -796,7 +805,8 @@ public static class GetSymbolicDimensions_OrtTensorTypeAndShapeInfo_PointerPoint public GetSymbolicDimensions_OrtTensorTypeAndShapeInfo_PointerPointer_long(Pointer p) { super(p); } protected GetSymbolicDimensions_OrtTensorTypeAndShapeInfo_PointerPointer_long() { allocate(); } private native void allocate(); - public native OrtStatus call(@Const OrtTensorTypeAndShapeInfo info, @Cast("const char**") PointerPointer dim_params, @Cast("size_t") long dim_params_length); + public native @Cast("OrtStatusPtr") OrtStatus call( @Const OrtTensorTypeAndShapeInfo info, + @Cast("const char**") PointerPointer dim_params, @Cast("size_t") long dim_params_length); } public native GetSymbolicDimensions_OrtTensorTypeAndShapeInfo_PointerPointer_long GetSymbolicDimensions(); public native OrtApi GetSymbolicDimensions(GetSymbolicDimensions_OrtTensorTypeAndShapeInfo_PointerPointer_long setter); @@ -815,7 +825,7 @@ public static class GetTensorShapeElementCount_OrtTensorTypeAndShapeInfo_SizeTPo public GetTensorShapeElementCount_OrtTensorTypeAndShapeInfo_SizeTPointer(Pointer p) { super(p); } protected GetTensorShapeElementCount_OrtTensorTypeAndShapeInfo_SizeTPointer() { allocate(); } private native void allocate(); - public native OrtStatus call(@Const OrtTensorTypeAndShapeInfo info, @Cast("size_t*") SizeTPointer out); + public native @Cast("OrtStatusPtr") OrtStatus call( @Const OrtTensorTypeAndShapeInfo info, @Cast("size_t*") SizeTPointer out); } public native GetTensorShapeElementCount_OrtTensorTypeAndShapeInfo_SizeTPointer GetTensorShapeElementCount(); public native OrtApi GetTensorShapeElementCount(GetTensorShapeElementCount_OrtTensorTypeAndShapeInfo_SizeTPointer setter); @@ -828,7 +838,7 @@ public static class GetTensorTypeAndShape_OrtValue_PointerPointer extends Functi public GetTensorTypeAndShape_OrtValue_PointerPointer(Pointer p) { super(p); } protected GetTensorTypeAndShape_OrtValue_PointerPointer() { allocate(); } private native void allocate(); - public native OrtStatus call(@Const OrtValue value, @Cast("OrtTensorTypeAndShapeInfo**") PointerPointer out); + public native @Cast("OrtStatusPtr") OrtStatus call( @Const OrtValue value, @Cast("OrtTensorTypeAndShapeInfo**") PointerPointer out); } public native GetTensorTypeAndShape_OrtValue_PointerPointer GetTensorTypeAndShape(); public native OrtApi GetTensorTypeAndShape(GetTensorTypeAndShape_OrtValue_PointerPointer setter); @@ -843,7 +853,7 @@ public static class GetTypeInfo_OrtValue_PointerPointer extends FunctionPointer public GetTypeInfo_OrtValue_PointerPointer(Pointer p) { super(p); } protected GetTypeInfo_OrtValue_PointerPointer() { allocate(); } private native void allocate(); - public native OrtStatus call(@Const OrtValue value, @Cast("OrtTypeInfo**") PointerPointer out); + public native @Cast("OrtStatusPtr") OrtStatus call( @Const OrtValue value, @Cast("OrtTypeInfo**") PointerPointer out); } public native GetTypeInfo_OrtValue_PointerPointer GetTypeInfo(); public native OrtApi GetTypeInfo(GetTypeInfo_OrtValue_PointerPointer setter); @@ -853,7 +863,7 @@ public static class GetValueType_OrtValue_IntPointer extends FunctionPointer { public GetValueType_OrtValue_IntPointer(Pointer p) { super(p); } protected GetValueType_OrtValue_IntPointer() { allocate(); } private native void allocate(); - public native OrtStatus call(@Const OrtValue value, @Cast("ONNXType*") IntPointer out); + public native @Cast("OrtStatusPtr") OrtStatus call( @Const OrtValue value, @Cast("ONNXType*") IntPointer out); } public native GetValueType_OrtValue_IntPointer GetValueType(); public native OrtApi GetValueType(GetValueType_OrtValue_IntPointer setter); @@ -863,7 +873,8 @@ public static class CreateMemoryInfo_BytePointer_int_int_int_PointerPointer exte public CreateMemoryInfo_BytePointer_int_int_int_PointerPointer(Pointer p) { super(p); } protected CreateMemoryInfo_BytePointer_int_int_int_PointerPointer() { allocate(); } private native void allocate(); - public native OrtStatus call(@Cast("const char*") BytePointer name1, @Cast("OrtAllocatorType") int type, int id1, @Cast("OrtMemType") int mem_type1, @Cast("OrtMemoryInfo**") PointerPointer out); + public native @Cast("OrtStatusPtr") OrtStatus call( @Cast("const char*") BytePointer name1, @Cast("OrtAllocatorType") int type, int id1, + @Cast("OrtMemType") int mem_type1, @Cast("OrtMemoryInfo**") PointerPointer out); } public native CreateMemoryInfo_BytePointer_int_int_int_PointerPointer CreateMemoryInfo(); public native OrtApi CreateMemoryInfo(CreateMemoryInfo_BytePointer_int_int_int_PointerPointer setter); @@ -876,7 +887,8 @@ public static class CreateCpuMemoryInfo_int_int_PointerPointer extends FunctionP public CreateCpuMemoryInfo_int_int_PointerPointer(Pointer p) { super(p); } protected CreateCpuMemoryInfo_int_int_PointerPointer() { allocate(); } private native void allocate(); - public native OrtStatus call(@Cast("OrtAllocatorType") int type, @Cast("OrtMemType") int mem_type1, @Cast("OrtMemoryInfo**") PointerPointer out); + public native @Cast("OrtStatusPtr") OrtStatus call( @Cast("OrtAllocatorType") int type, @Cast("OrtMemType") int mem_type1, + @Cast("OrtMemoryInfo**") PointerPointer out); } public native CreateCpuMemoryInfo_int_int_PointerPointer CreateCpuMemoryInfo(); public native OrtApi CreateCpuMemoryInfo(CreateCpuMemoryInfo_int_int_PointerPointer setter); @@ -890,7 +902,7 @@ public static class CompareMemoryInfo_OrtMemoryInfo_OrtMemoryInfo_IntPointer ext public CompareMemoryInfo_OrtMemoryInfo_OrtMemoryInfo_IntPointer(Pointer p) { super(p); } protected CompareMemoryInfo_OrtMemoryInfo_OrtMemoryInfo_IntPointer() { allocate(); } private native void allocate(); - public native OrtStatus call(@Const OrtMemoryInfo info1, @Const OrtMemoryInfo info2, IntPointer out); + public native @Cast("OrtStatusPtr") OrtStatus call( @Const OrtMemoryInfo info1, @Const OrtMemoryInfo info2, IntPointer out); } public native CompareMemoryInfo_OrtMemoryInfo_OrtMemoryInfo_IntPointer CompareMemoryInfo(); public native OrtApi CompareMemoryInfo(CompareMemoryInfo_OrtMemoryInfo_OrtMemoryInfo_IntPointer setter); @@ -903,7 +915,7 @@ public static class MemoryInfoGetName_OrtMemoryInfo_PointerPointer extends Funct public MemoryInfoGetName_OrtMemoryInfo_PointerPointer(Pointer p) { super(p); } protected MemoryInfoGetName_OrtMemoryInfo_PointerPointer() { allocate(); } private native void allocate(); - public native OrtStatus call(@Const OrtMemoryInfo ptr, @Cast("const char**") PointerPointer out); + public native @Cast("OrtStatusPtr") OrtStatus call( @Const OrtMemoryInfo ptr, @Cast("const char**") PointerPointer out); } public native MemoryInfoGetName_OrtMemoryInfo_PointerPointer MemoryInfoGetName(); public native OrtApi MemoryInfoGetName(MemoryInfoGetName_OrtMemoryInfo_PointerPointer setter); public static class MemoryInfoGetId_OrtMemoryInfo_IntPointer extends FunctionPointer { @@ -912,7 +924,7 @@ public static class MemoryInfoGetId_OrtMemoryInfo_IntPointer extends FunctionPoi public MemoryInfoGetId_OrtMemoryInfo_IntPointer(Pointer p) { super(p); } protected MemoryInfoGetId_OrtMemoryInfo_IntPointer() { allocate(); } private native void allocate(); - public native OrtStatus call(@Const OrtMemoryInfo ptr, IntPointer out); + public native @Cast("OrtStatusPtr") OrtStatus call( @Const OrtMemoryInfo ptr, IntPointer out); } public native MemoryInfoGetId_OrtMemoryInfo_IntPointer MemoryInfoGetId(); public native OrtApi MemoryInfoGetId(MemoryInfoGetId_OrtMemoryInfo_IntPointer setter); public static class MemoryInfoGetMemType_OrtMemoryInfo_IntPointer extends FunctionPointer { @@ -921,7 +933,7 @@ public static class MemoryInfoGetMemType_OrtMemoryInfo_IntPointer extends Functi public MemoryInfoGetMemType_OrtMemoryInfo_IntPointer(Pointer p) { super(p); } protected MemoryInfoGetMemType_OrtMemoryInfo_IntPointer() { allocate(); } private native void allocate(); - public native OrtStatus call(@Const OrtMemoryInfo ptr, @Cast("OrtMemType*") IntPointer out); + public native @Cast("OrtStatusPtr") OrtStatus call( @Const OrtMemoryInfo ptr, @Cast("OrtMemType*") IntPointer out); } public native MemoryInfoGetMemType_OrtMemoryInfo_IntPointer MemoryInfoGetMemType(); public native OrtApi MemoryInfoGetMemType(MemoryInfoGetMemType_OrtMemoryInfo_IntPointer setter); public static class MemoryInfoGetType_OrtMemoryInfo_IntPointer extends FunctionPointer { @@ -930,7 +942,7 @@ public static class MemoryInfoGetType_OrtMemoryInfo_IntPointer extends FunctionP public MemoryInfoGetType_OrtMemoryInfo_IntPointer(Pointer p) { super(p); } protected MemoryInfoGetType_OrtMemoryInfo_IntPointer() { allocate(); } private native void allocate(); - public native OrtStatus call(@Const OrtMemoryInfo ptr, @Cast("OrtAllocatorType*") IntPointer out); + public native @Cast("OrtStatusPtr") OrtStatus call( @Const OrtMemoryInfo ptr, @Cast("OrtAllocatorType*") IntPointer out); } public native MemoryInfoGetType_OrtMemoryInfo_IntPointer MemoryInfoGetType(); public native OrtApi MemoryInfoGetType(MemoryInfoGetType_OrtMemoryInfo_IntPointer setter); @@ -940,7 +952,7 @@ public static class AllocatorAlloc_OrtAllocator_long_PointerPointer extends Func public AllocatorAlloc_OrtAllocator_long_PointerPointer(Pointer p) { super(p); } protected AllocatorAlloc_OrtAllocator_long_PointerPointer() { allocate(); } private native void allocate(); - public native OrtStatus call(OrtAllocator ptr, @Cast("size_t") long size, @Cast("void**") PointerPointer out); + public native @Cast("OrtStatusPtr") OrtStatus call( OrtAllocator ptr, @Cast("size_t") long size, @Cast("void**") PointerPointer out); } public native AllocatorAlloc_OrtAllocator_long_PointerPointer AllocatorAlloc(); public native OrtApi AllocatorAlloc(AllocatorAlloc_OrtAllocator_long_PointerPointer setter); public static class AllocatorFree_OrtAllocator_Pointer extends FunctionPointer { @@ -949,7 +961,7 @@ public static class AllocatorFree_OrtAllocator_Pointer extends FunctionPointer { public AllocatorFree_OrtAllocator_Pointer(Pointer p) { super(p); } protected AllocatorFree_OrtAllocator_Pointer() { allocate(); } private native void allocate(); - public native OrtStatus call(OrtAllocator ptr, Pointer p); + public native @Cast("OrtStatusPtr") OrtStatus call( OrtAllocator ptr, Pointer p); } public native AllocatorFree_OrtAllocator_Pointer AllocatorFree(); public native OrtApi AllocatorFree(AllocatorFree_OrtAllocator_Pointer setter); public static class AllocatorGetInfo_OrtAllocator_PointerPointer extends FunctionPointer { @@ -958,7 +970,7 @@ public static class AllocatorGetInfo_OrtAllocator_PointerPointer extends Functio public AllocatorGetInfo_OrtAllocator_PointerPointer(Pointer p) { super(p); } protected AllocatorGetInfo_OrtAllocator_PointerPointer() { allocate(); } private native void allocate(); - public native OrtStatus call(@Const OrtAllocator ptr, @Cast("const OrtMemoryInfo**") PointerPointer out); + public native @Cast("OrtStatusPtr") OrtStatus call( @Const OrtAllocator ptr, @Cast("const OrtMemoryInfo**") PointerPointer out); } public native AllocatorGetInfo_OrtAllocator_PointerPointer AllocatorGetInfo(); public native OrtApi AllocatorGetInfo(AllocatorGetInfo_OrtAllocator_PointerPointer setter); @@ -970,11 +982,11 @@ public static class GetAllocatorWithDefaultOptions_PointerPointer extends Functi public GetAllocatorWithDefaultOptions_PointerPointer(Pointer p) { super(p); } protected GetAllocatorWithDefaultOptions_PointerPointer() { allocate(); } private native void allocate(); - public native OrtStatus call(@Cast("OrtAllocator**") PointerPointer out); + public native @Cast("OrtStatusPtr") OrtStatus call( @Cast("OrtAllocator**") PointerPointer out); } public native GetAllocatorWithDefaultOptions_PointerPointer GetAllocatorWithDefaultOptions(); public native OrtApi GetAllocatorWithDefaultOptions(GetAllocatorWithDefaultOptions_PointerPointer setter); - // Override symbolic dimensions with actual values if known at session initialization time to enable + // Override symbolic dimensions (by specific denotation strings) with actual values if known at session initialization time to enable // optimizations that can take advantage of fixed values (such as memory planning, etc) public static class AddFreeDimensionOverride_OrtSessionOptions_BytePointer_long extends FunctionPointer { static { Loader.load(); } @@ -982,8 +994,8 @@ public static class AddFreeDimensionOverride_OrtSessionOptions_BytePointer_long public AddFreeDimensionOverride_OrtSessionOptions_BytePointer_long(Pointer p) { super(p); } protected AddFreeDimensionOverride_OrtSessionOptions_BytePointer_long() { allocate(); } private native void allocate(); - public native OrtStatus call(OrtSessionOptions options, - @Cast("const char*") BytePointer symbolic_dim, @Cast("int64_t") long dim_override); + public native @Cast("OrtStatusPtr") OrtStatus call( OrtSessionOptions options, @Cast("const char*") BytePointer dim_denotation, + @Cast("int64_t") long dim_value); } public native AddFreeDimensionOverride_OrtSessionOptions_BytePointer_long AddFreeDimensionOverride(); public native OrtApi AddFreeDimensionOverride(AddFreeDimensionOverride_OrtSessionOptions_BytePointer_long setter); @@ -1024,7 +1036,8 @@ public static class GetValue_OrtValue_int_OrtAllocator_PointerPointer extends Fu public GetValue_OrtValue_int_OrtAllocator_PointerPointer(Pointer p) { super(p); } protected GetValue_OrtValue_int_OrtAllocator_PointerPointer() { allocate(); } private native void allocate(); - public native OrtStatus call(@Const OrtValue value, int index, OrtAllocator allocator, @Cast("OrtValue**") PointerPointer out); + public native @Cast("OrtStatusPtr") OrtStatus call( @Const OrtValue value, int index, OrtAllocator allocator, + @Cast("OrtValue**") PointerPointer out); } public native GetValue_OrtValue_int_OrtAllocator_PointerPointer GetValue(); public native OrtApi GetValue(GetValue_OrtValue_int_OrtAllocator_PointerPointer setter); @@ -1038,7 +1051,7 @@ public static class GetValueCount_OrtValue_SizeTPointer extends FunctionPointer public GetValueCount_OrtValue_SizeTPointer(Pointer p) { super(p); } protected GetValueCount_OrtValue_SizeTPointer() { allocate(); } private native void allocate(); - public native OrtStatus call(@Const OrtValue value, @Cast("size_t*") SizeTPointer out); + public native @Cast("OrtStatusPtr") OrtStatus call( @Const OrtValue value, @Cast("size_t*") SizeTPointer out); } public native GetValueCount_OrtValue_SizeTPointer GetValueCount(); public native OrtApi GetValueCount(GetValueCount_OrtValue_SizeTPointer setter); @@ -1055,8 +1068,8 @@ public static class CreateValue_PointerPointer_long_int_PointerPointer extends F public CreateValue_PointerPointer_long_int_PointerPointer(Pointer p) { super(p); } protected CreateValue_PointerPointer_long_int_PointerPointer() { allocate(); } private native void allocate(); - public native OrtStatus call(@Cast("const OrtValue*const*") PointerPointer in, @Cast("size_t") long num_values, @Cast("ONNXType") int value_type, - @Cast("OrtValue**") PointerPointer out); + public native @Cast("OrtStatusPtr") OrtStatus call( @Cast("const OrtValue*const*") PointerPointer in, @Cast("size_t") long num_values, + @Cast("ONNXType") int value_type, @Cast("OrtValue**") PointerPointer out); } public native CreateValue_PointerPointer_long_int_PointerPointer CreateValue(); public native OrtApi CreateValue(CreateValue_PointerPointer_long_int_PointerPointer setter); @@ -1085,8 +1098,8 @@ public static class CreateOpaqueValue_BytePointer_BytePointer_Pointer_long_Point public CreateOpaqueValue_BytePointer_BytePointer_Pointer_long_PointerPointer(Pointer p) { super(p); } protected CreateOpaqueValue_BytePointer_BytePointer_Pointer_long_PointerPointer() { allocate(); } private native void allocate(); - public native OrtStatus call(@Cast("const char*") BytePointer domain_name, @Cast("const char*") BytePointer type_name, - @Const Pointer data_container, @Cast("size_t") long data_container_size, @Cast("OrtValue**") PointerPointer out); + public native @Cast("OrtStatusPtr") OrtStatus call( @Cast("const char*") BytePointer domain_name, @Cast("const char*") BytePointer type_name, + @Const Pointer data_container, @Cast("size_t") long data_container_size, @Cast("OrtValue**") PointerPointer out); } public native CreateOpaqueValue_BytePointer_BytePointer_Pointer_long_PointerPointer CreateOpaqueValue(); public native OrtApi CreateOpaqueValue(CreateOpaqueValue_BytePointer_BytePointer_Pointer_long_PointerPointer setter); @@ -1106,8 +1119,8 @@ public static class GetOpaqueValue_BytePointer_BytePointer_OrtValue_Pointer_long public GetOpaqueValue_BytePointer_BytePointer_OrtValue_Pointer_long(Pointer p) { super(p); } protected GetOpaqueValue_BytePointer_BytePointer_OrtValue_Pointer_long() { allocate(); } private native void allocate(); - public native OrtStatus call(@Cast("const char*") BytePointer domain_name, @Cast("const char*") BytePointer type_name, - @Const OrtValue in, Pointer data_container, @Cast("size_t") long data_container_size); + public native @Cast("OrtStatusPtr") OrtStatus call( @Cast("const char*") BytePointer domain_name, @Cast("const char*") BytePointer type_name, @Const OrtValue in, + Pointer data_container, @Cast("size_t") long data_container_size); } public native GetOpaqueValue_BytePointer_BytePointer_OrtValue_Pointer_long GetOpaqueValue(); public native OrtApi GetOpaqueValue(GetOpaqueValue_BytePointer_BytePointer_OrtValue_Pointer_long setter); @@ -1117,7 +1130,8 @@ public static class KernelInfoGetAttribute_float_OrtKernelInfo_BytePointer_Float public KernelInfoGetAttribute_float_OrtKernelInfo_BytePointer_FloatPointer(Pointer p) { super(p); } protected KernelInfoGetAttribute_float_OrtKernelInfo_BytePointer_FloatPointer() { allocate(); } private native void allocate(); - public native OrtStatus call(@Const OrtKernelInfo info, @Cast("const char*") BytePointer name, FloatPointer out); + public native @Cast("OrtStatusPtr") OrtStatus call( @Const OrtKernelInfo info, @Cast("const char*") BytePointer name, + FloatPointer out); } public native KernelInfoGetAttribute_float_OrtKernelInfo_BytePointer_FloatPointer KernelInfoGetAttribute_float(); public native OrtApi KernelInfoGetAttribute_float(KernelInfoGetAttribute_float_OrtKernelInfo_BytePointer_FloatPointer setter); public static class KernelInfoGetAttribute_int64_OrtKernelInfo_BytePointer_LongPointer extends FunctionPointer { @@ -1126,7 +1140,8 @@ public static class KernelInfoGetAttribute_int64_OrtKernelInfo_BytePointer_LongP public KernelInfoGetAttribute_int64_OrtKernelInfo_BytePointer_LongPointer(Pointer p) { super(p); } protected KernelInfoGetAttribute_int64_OrtKernelInfo_BytePointer_LongPointer() { allocate(); } private native void allocate(); - public native OrtStatus call(@Const OrtKernelInfo info, @Cast("const char*") BytePointer name, @Cast("int64_t*") LongPointer out); + public native @Cast("OrtStatusPtr") OrtStatus call( @Const OrtKernelInfo info, @Cast("const char*") BytePointer name, + @Cast("int64_t*") LongPointer out); } public native KernelInfoGetAttribute_int64_OrtKernelInfo_BytePointer_LongPointer KernelInfoGetAttribute_int64(); public native OrtApi KernelInfoGetAttribute_int64(KernelInfoGetAttribute_int64_OrtKernelInfo_BytePointer_LongPointer setter); public static class KernelInfoGetAttribute_string_OrtKernelInfo_BytePointer_BytePointer_SizeTPointer extends FunctionPointer { @@ -1135,7 +1150,8 @@ public static class KernelInfoGetAttribute_string_OrtKernelInfo_BytePointer_Byte public KernelInfoGetAttribute_string_OrtKernelInfo_BytePointer_BytePointer_SizeTPointer(Pointer p) { super(p); } protected KernelInfoGetAttribute_string_OrtKernelInfo_BytePointer_BytePointer_SizeTPointer() { allocate(); } private native void allocate(); - public native OrtStatus call(@Const OrtKernelInfo info, @Cast("const char*") BytePointer name, @Cast("char*") BytePointer out, @Cast("size_t*") SizeTPointer size); + public native @Cast("OrtStatusPtr") OrtStatus call( @Const OrtKernelInfo info, @Cast("const char*") BytePointer name, @Cast("char*") BytePointer out, + @Cast("size_t*") SizeTPointer size); } public native KernelInfoGetAttribute_string_OrtKernelInfo_BytePointer_BytePointer_SizeTPointer KernelInfoGetAttribute_string(); public native OrtApi KernelInfoGetAttribute_string(KernelInfoGetAttribute_string_OrtKernelInfo_BytePointer_BytePointer_SizeTPointer setter); @@ -1145,7 +1161,7 @@ public static class KernelContext_GetInputCount_OrtKernelContext_SizeTPointer ex public KernelContext_GetInputCount_OrtKernelContext_SizeTPointer(Pointer p) { super(p); } protected KernelContext_GetInputCount_OrtKernelContext_SizeTPointer() { allocate(); } private native void allocate(); - public native OrtStatus call(@Const OrtKernelContext context, @Cast("size_t*") SizeTPointer out); + public native @Cast("OrtStatusPtr") OrtStatus call( @Const OrtKernelContext context, @Cast("size_t*") SizeTPointer out); } public native KernelContext_GetInputCount_OrtKernelContext_SizeTPointer KernelContext_GetInputCount(); public native OrtApi KernelContext_GetInputCount(KernelContext_GetInputCount_OrtKernelContext_SizeTPointer setter); public static class KernelContext_GetOutputCount_OrtKernelContext_SizeTPointer extends FunctionPointer { @@ -1154,7 +1170,7 @@ public static class KernelContext_GetOutputCount_OrtKernelContext_SizeTPointer e public KernelContext_GetOutputCount_OrtKernelContext_SizeTPointer(Pointer p) { super(p); } protected KernelContext_GetOutputCount_OrtKernelContext_SizeTPointer() { allocate(); } private native void allocate(); - public native OrtStatus call(@Const OrtKernelContext context, @Cast("size_t*") SizeTPointer out); + public native @Cast("OrtStatusPtr") OrtStatus call( @Const OrtKernelContext context, @Cast("size_t*") SizeTPointer out); } public native KernelContext_GetOutputCount_OrtKernelContext_SizeTPointer KernelContext_GetOutputCount(); public native OrtApi KernelContext_GetOutputCount(KernelContext_GetOutputCount_OrtKernelContext_SizeTPointer setter); public static class KernelContext_GetInput_OrtKernelContext_long_PointerPointer extends FunctionPointer { @@ -1163,7 +1179,8 @@ public static class KernelContext_GetInput_OrtKernelContext_long_PointerPointer public KernelContext_GetInput_OrtKernelContext_long_PointerPointer(Pointer p) { super(p); } protected KernelContext_GetInput_OrtKernelContext_long_PointerPointer() { allocate(); } private native void allocate(); - public native OrtStatus call(@Const OrtKernelContext context, @Cast("size_t") long index, @Cast("const OrtValue**") PointerPointer out); + public native @Cast("OrtStatusPtr") OrtStatus call( @Const OrtKernelContext context, @Cast("size_t") long index, + @Cast("const OrtValue**") PointerPointer out); } public native KernelContext_GetInput_OrtKernelContext_long_PointerPointer KernelContext_GetInput(); public native OrtApi KernelContext_GetInput(KernelContext_GetInput_OrtKernelContext_long_PointerPointer setter); public static class KernelContext_GetOutput_OrtKernelContext_long_LongPointer_long_PointerPointer extends FunctionPointer { @@ -1172,7 +1189,8 @@ public static class KernelContext_GetOutput_OrtKernelContext_long_LongPointer_lo public KernelContext_GetOutput_OrtKernelContext_long_LongPointer_long_PointerPointer(Pointer p) { super(p); } protected KernelContext_GetOutput_OrtKernelContext_long_LongPointer_long_PointerPointer() { allocate(); } private native void allocate(); - public native OrtStatus call(OrtKernelContext context, @Cast("size_t") long index, @Cast("const int64_t*") LongPointer dim_values, @Cast("size_t") long dim_count, @Cast("OrtValue**") PointerPointer out); + public native @Cast("OrtStatusPtr") OrtStatus call( OrtKernelContext context, @Cast("size_t") long index, + @Cast("const int64_t*") LongPointer dim_values, @Cast("size_t") long dim_count, @Cast("OrtValue**") PointerPointer out); } public native KernelContext_GetOutput_OrtKernelContext_long_LongPointer_long_PointerPointer KernelContext_GetOutput(); public native OrtApi KernelContext_GetOutput(KernelContext_GetOutput_OrtKernelContext_long_LongPointer_long_PointerPointer setter); @@ -1282,7 +1300,8 @@ public static class GetDenotationFromTypeInfo_OrtTypeInfo_PointerPointer_SizeTPo public GetDenotationFromTypeInfo_OrtTypeInfo_PointerPointer_SizeTPointer(Pointer p) { super(p); } protected GetDenotationFromTypeInfo_OrtTypeInfo_PointerPointer_SizeTPointer() { allocate(); } private native void allocate(); - public native OrtStatus call(@Const OrtTypeInfo arg0, @Cast("const char**const") PointerPointer denotation, @Cast("size_t*") SizeTPointer len); + public native @Cast("OrtStatusPtr") OrtStatus call( @Const OrtTypeInfo arg0, @Cast("const char**const") PointerPointer denotation, + @Cast("size_t*") SizeTPointer len); } public native GetDenotationFromTypeInfo_OrtTypeInfo_PointerPointer_SizeTPointer GetDenotationFromTypeInfo(); public native OrtApi GetDenotationFromTypeInfo(GetDenotationFromTypeInfo_OrtTypeInfo_PointerPointer_SizeTPointer setter); @@ -1293,6 +1312,7 @@ public static class GetDenotationFromTypeInfo_OrtTypeInfo_PointerPointer_SizeTPo * This api augments OrtTypeInfo to return an OrtMapTypeInfo when the type is a map. * The OrtMapTypeInfo has additional information about the map's key type and value type. * This is used by WinML to support model reflection APIs. + * This is used by WinML to support model reflection APIs. * * Don't free the 'out' value */ @@ -1302,7 +1322,8 @@ public static class CastTypeInfoToMapTypeInfo_OrtTypeInfo_PointerPointer extends public CastTypeInfoToMapTypeInfo_OrtTypeInfo_PointerPointer(Pointer p) { super(p); } protected CastTypeInfoToMapTypeInfo_OrtTypeInfo_PointerPointer() { allocate(); } private native void allocate(); - public native OrtStatus call(@Const OrtTypeInfo type_info, @Cast("const OrtMapTypeInfo**") PointerPointer out); + public native @Cast("OrtStatusPtr") OrtStatus call( @Const OrtTypeInfo type_info, + @Cast("const OrtMapTypeInfo**") PointerPointer out); } public native CastTypeInfoToMapTypeInfo_OrtTypeInfo_PointerPointer CastTypeInfoToMapTypeInfo(); public native OrtApi CastTypeInfoToMapTypeInfo(CastTypeInfoToMapTypeInfo_OrtTypeInfo_PointerPointer setter); @@ -1320,7 +1341,8 @@ public static class CastTypeInfoToSequenceTypeInfo_OrtTypeInfo_PointerPointer ex public CastTypeInfoToSequenceTypeInfo_OrtTypeInfo_PointerPointer(Pointer p) { super(p); } protected CastTypeInfoToSequenceTypeInfo_OrtTypeInfo_PointerPointer() { allocate(); } private native void allocate(); - public native OrtStatus call(@Const OrtTypeInfo type_info, @Cast("const OrtSequenceTypeInfo**") PointerPointer out); + public native @Cast("OrtStatusPtr") OrtStatus call( @Const OrtTypeInfo type_info, + @Cast("const OrtSequenceTypeInfo**") PointerPointer out); } public native CastTypeInfoToSequenceTypeInfo_OrtTypeInfo_PointerPointer CastTypeInfoToSequenceTypeInfo(); public native OrtApi CastTypeInfoToSequenceTypeInfo(CastTypeInfoToSequenceTypeInfo_OrtTypeInfo_PointerPointer setter); @@ -1337,7 +1359,7 @@ public static class GetMapKeyType_OrtMapTypeInfo_IntPointer extends FunctionPoin public GetMapKeyType_OrtMapTypeInfo_IntPointer(Pointer p) { super(p); } protected GetMapKeyType_OrtMapTypeInfo_IntPointer() { allocate(); } private native void allocate(); - public native OrtStatus call(@Const OrtMapTypeInfo map_type_info, @Cast("ONNXTensorElementDataType*") IntPointer out); + public native @Cast("OrtStatusPtr") OrtStatus call( @Const OrtMapTypeInfo map_type_info, @Cast("ONNXTensorElementDataType*") IntPointer out); } public native GetMapKeyType_OrtMapTypeInfo_IntPointer GetMapKeyType(); public native OrtApi GetMapKeyType(GetMapKeyType_OrtMapTypeInfo_IntPointer setter); @@ -1351,7 +1373,7 @@ public static class GetMapValueType_OrtMapTypeInfo_PointerPointer extends Functi public GetMapValueType_OrtMapTypeInfo_PointerPointer(Pointer p) { super(p); } protected GetMapValueType_OrtMapTypeInfo_PointerPointer() { allocate(); } private native void allocate(); - public native OrtStatus call(@Const OrtMapTypeInfo map_type_info, @Cast("OrtTypeInfo**") PointerPointer type_info); + public native @Cast("OrtStatusPtr") OrtStatus call( @Const OrtMapTypeInfo map_type_info, @Cast("OrtTypeInfo**") PointerPointer type_info); } public native GetMapValueType_OrtMapTypeInfo_PointerPointer GetMapValueType(); public native OrtApi GetMapValueType(GetMapValueType_OrtMapTypeInfo_PointerPointer setter); @@ -1368,7 +1390,8 @@ public static class GetSequenceElementType_OrtSequenceTypeInfo_PointerPointer ex public GetSequenceElementType_OrtSequenceTypeInfo_PointerPointer(Pointer p) { super(p); } protected GetSequenceElementType_OrtSequenceTypeInfo_PointerPointer() { allocate(); } private native void allocate(); - public native OrtStatus call(@Const OrtSequenceTypeInfo sequence_type_info, @Cast("OrtTypeInfo**") PointerPointer type_info); + public native @Cast("OrtStatusPtr") OrtStatus call( @Const OrtSequenceTypeInfo sequence_type_info, + @Cast("OrtTypeInfo**") PointerPointer type_info); } public native GetSequenceElementType_OrtSequenceTypeInfo_PointerPointer GetSequenceElementType(); public native OrtApi GetSequenceElementType(GetSequenceElementType_OrtSequenceTypeInfo_PointerPointer setter); @@ -1402,8 +1425,7 @@ public static class SessionEndProfiling_OrtSession_OrtAllocator_PointerPointer e public SessionEndProfiling_OrtSession_OrtAllocator_PointerPointer(Pointer p) { super(p); } protected SessionEndProfiling_OrtSession_OrtAllocator_PointerPointer() { allocate(); } private native void allocate(); - public native OrtStatus call(OrtSession sess, OrtAllocator allocator, - @Cast("char**") PointerPointer out); + public native @Cast("OrtStatusPtr") OrtStatus call( OrtSession sess, OrtAllocator allocator, @Cast("char**") PointerPointer out); } public native SessionEndProfiling_OrtSession_OrtAllocator_PointerPointer SessionEndProfiling(); public native OrtApi SessionEndProfiling(SessionEndProfiling_OrtSession_OrtAllocator_PointerPointer setter); @@ -1416,8 +1438,7 @@ public static class SessionGetModelMetadata_OrtSession_PointerPointer extends Fu public SessionGetModelMetadata_OrtSession_PointerPointer(Pointer p) { super(p); } protected SessionGetModelMetadata_OrtSession_PointerPointer() { allocate(); } private native void allocate(); - public native OrtStatus call(@Const OrtSession sess, - @Cast("OrtModelMetadata**") PointerPointer out); + public native @Cast("OrtStatusPtr") OrtStatus call( @Const OrtSession sess, @Cast("OrtModelMetadata**") PointerPointer out); } public native SessionGetModelMetadata_OrtSession_PointerPointer SessionGetModelMetadata(); public native OrtApi SessionGetModelMetadata(SessionGetModelMetadata_OrtSession_PointerPointer setter); @@ -1430,8 +1451,8 @@ public static class ModelMetadataGetProducerName_OrtModelMetadata_OrtAllocator_P public ModelMetadataGetProducerName_OrtModelMetadata_OrtAllocator_PointerPointer(Pointer p) { super(p); } protected ModelMetadataGetProducerName_OrtModelMetadata_OrtAllocator_PointerPointer() { allocate(); } private native void allocate(); - public native OrtStatus call(@Const OrtModelMetadata model_metadata, - OrtAllocator allocator, @Cast("char**") PointerPointer value); + public native @Cast("OrtStatusPtr") OrtStatus call( @Const OrtModelMetadata model_metadata, + OrtAllocator allocator, @Cast("char**") PointerPointer value); } public native ModelMetadataGetProducerName_OrtModelMetadata_OrtAllocator_PointerPointer ModelMetadataGetProducerName(); public native OrtApi ModelMetadataGetProducerName(ModelMetadataGetProducerName_OrtModelMetadata_OrtAllocator_PointerPointer setter); public static class ModelMetadataGetGraphName_OrtModelMetadata_OrtAllocator_PointerPointer extends FunctionPointer { @@ -1440,8 +1461,8 @@ public static class ModelMetadataGetGraphName_OrtModelMetadata_OrtAllocator_Poin public ModelMetadataGetGraphName_OrtModelMetadata_OrtAllocator_PointerPointer(Pointer p) { super(p); } protected ModelMetadataGetGraphName_OrtModelMetadata_OrtAllocator_PointerPointer() { allocate(); } private native void allocate(); - public native OrtStatus call(@Const OrtModelMetadata model_metadata, - OrtAllocator allocator, @Cast("char**") PointerPointer value); + public native @Cast("OrtStatusPtr") OrtStatus call( @Const OrtModelMetadata model_metadata, + OrtAllocator allocator, @Cast("char**") PointerPointer value); } public native ModelMetadataGetGraphName_OrtModelMetadata_OrtAllocator_PointerPointer ModelMetadataGetGraphName(); public native OrtApi ModelMetadataGetGraphName(ModelMetadataGetGraphName_OrtModelMetadata_OrtAllocator_PointerPointer setter); public static class ModelMetadataGetDomain_OrtModelMetadata_OrtAllocator_PointerPointer extends FunctionPointer { @@ -1450,8 +1471,8 @@ public static class ModelMetadataGetDomain_OrtModelMetadata_OrtAllocator_Pointer public ModelMetadataGetDomain_OrtModelMetadata_OrtAllocator_PointerPointer(Pointer p) { super(p); } protected ModelMetadataGetDomain_OrtModelMetadata_OrtAllocator_PointerPointer() { allocate(); } private native void allocate(); - public native OrtStatus call(@Const OrtModelMetadata model_metadata, - OrtAllocator allocator, @Cast("char**") PointerPointer value); + public native @Cast("OrtStatusPtr") OrtStatus call( @Const OrtModelMetadata model_metadata, OrtAllocator allocator, + @Cast("char**") PointerPointer value); } public native ModelMetadataGetDomain_OrtModelMetadata_OrtAllocator_PointerPointer ModelMetadataGetDomain(); public native OrtApi ModelMetadataGetDomain(ModelMetadataGetDomain_OrtModelMetadata_OrtAllocator_PointerPointer setter); public static class ModelMetadataGetDescription_OrtModelMetadata_OrtAllocator_PointerPointer extends FunctionPointer { @@ -1460,8 +1481,8 @@ public static class ModelMetadataGetDescription_OrtModelMetadata_OrtAllocator_Po public ModelMetadataGetDescription_OrtModelMetadata_OrtAllocator_PointerPointer(Pointer p) { super(p); } protected ModelMetadataGetDescription_OrtModelMetadata_OrtAllocator_PointerPointer() { allocate(); } private native void allocate(); - public native OrtStatus call(@Const OrtModelMetadata model_metadata, - OrtAllocator allocator, @Cast("char**") PointerPointer value); + public native @Cast("OrtStatusPtr") OrtStatus call( @Const OrtModelMetadata model_metadata, + OrtAllocator allocator, @Cast("char**") PointerPointer value); } public native ModelMetadataGetDescription_OrtModelMetadata_OrtAllocator_PointerPointer ModelMetadataGetDescription(); public native OrtApi ModelMetadataGetDescription(ModelMetadataGetDescription_OrtModelMetadata_OrtAllocator_PointerPointer setter); /** @@ -1474,8 +1495,8 @@ public static class ModelMetadataLookupCustomMetadataMap_OrtModelMetadata_OrtAll public ModelMetadataLookupCustomMetadataMap_OrtModelMetadata_OrtAllocator_BytePointer_PointerPointer(Pointer p) { super(p); } protected ModelMetadataLookupCustomMetadataMap_OrtModelMetadata_OrtAllocator_BytePointer_PointerPointer() { allocate(); } private native void allocate(); - public native OrtStatus call(@Const OrtModelMetadata model_metadata, OrtAllocator allocator, - @Cast("const char*") BytePointer key, @Cast("char**") PointerPointer value); + public native @Cast("OrtStatusPtr") OrtStatus call( @Const OrtModelMetadata model_metadata, + OrtAllocator allocator, @Cast("const char*") BytePointer key, @Cast("char**") PointerPointer value); } public native ModelMetadataLookupCustomMetadataMap_OrtModelMetadata_OrtAllocator_BytePointer_PointerPointer ModelMetadataLookupCustomMetadataMap(); public native OrtApi ModelMetadataLookupCustomMetadataMap(ModelMetadataLookupCustomMetadataMap_OrtModelMetadata_OrtAllocator_BytePointer_PointerPointer setter); @@ -1485,7 +1506,7 @@ public static class ModelMetadataGetVersion_OrtModelMetadata_LongPointer extends public ModelMetadataGetVersion_OrtModelMetadata_LongPointer(Pointer p) { super(p); } protected ModelMetadataGetVersion_OrtModelMetadata_LongPointer() { allocate(); } private native void allocate(); - public native OrtStatus call(@Const OrtModelMetadata model_metadata, @Cast("int64_t*") LongPointer value); + public native @Cast("OrtStatusPtr") OrtStatus call( @Const OrtModelMetadata model_metadata, @Cast("int64_t*") LongPointer value); } public native ModelMetadataGetVersion_OrtModelMetadata_LongPointer ModelMetadataGetVersion(); public native OrtApi ModelMetadataGetVersion(ModelMetadataGetVersion_OrtModelMetadata_LongPointer setter); @@ -1498,4 +1519,88 @@ public static class ReleaseModelMetadata_OrtModelMetadata extends FunctionPointe public native void call(OrtModelMetadata input); } public native ReleaseModelMetadata_OrtModelMetadata ReleaseModelMetadata(); public native OrtApi ReleaseModelMetadata(ReleaseModelMetadata_OrtModelMetadata setter); + + /* + * Creates an environment with global threadpools that will be shared across sessions. + * Use this in conjunction with DisablePerSessionThreads API or else the session will use + * its own thread pools. + */ + public static class CreateEnvWithGlobalThreadPools_int_BytePointer_OrtThreadingOptions_PointerPointer extends FunctionPointer { + static { Loader.load(); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public CreateEnvWithGlobalThreadPools_int_BytePointer_OrtThreadingOptions_PointerPointer(Pointer p) { super(p); } + protected CreateEnvWithGlobalThreadPools_int_BytePointer_OrtThreadingOptions_PointerPointer() { allocate(); } + private native void allocate(); + public native @Cast("OrtStatusPtr") OrtStatus call( @Cast("OrtLoggingLevel") int default_logging_level, @Cast("const char*") BytePointer logid, + @Const OrtThreadingOptions t_options, @Cast("OrtEnv**") PointerPointer out); + } + public native CreateEnvWithGlobalThreadPools_int_BytePointer_OrtThreadingOptions_PointerPointer CreateEnvWithGlobalThreadPools(); public native OrtApi CreateEnvWithGlobalThreadPools(CreateEnvWithGlobalThreadPools_int_BytePointer_OrtThreadingOptions_PointerPointer setter); + + /* TODO: Should there be a version of CreateEnvWithGlobalThreadPools with custom logging function? */ + + /* + * Calling this API will make the session use the global threadpools shared across sessions. + * This API should be used in conjunction with CreateEnvWithGlobalThreadPools API. + */ + public static class DisablePerSessionThreads_OrtSessionOptions extends FunctionPointer { + static { Loader.load(); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public DisablePerSessionThreads_OrtSessionOptions(Pointer p) { super(p); } + protected DisablePerSessionThreads_OrtSessionOptions() { allocate(); } + private native void allocate(); + public native @Cast("OrtStatusPtr") OrtStatus call( OrtSessionOptions options); + } + public native DisablePerSessionThreads_OrtSessionOptions DisablePerSessionThreads(); public native OrtApi DisablePerSessionThreads(DisablePerSessionThreads_OrtSessionOptions setter); + + public static class CreateThreadingOptions_PointerPointer extends FunctionPointer { + static { Loader.load(); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public CreateThreadingOptions_PointerPointer(Pointer p) { super(p); } + protected CreateThreadingOptions_PointerPointer() { allocate(); } + private native void allocate(); + public native @Cast("OrtStatusPtr") OrtStatus call( @Cast("OrtThreadingOptions**") PointerPointer out); + } + public native CreateThreadingOptions_PointerPointer CreateThreadingOptions(); public native OrtApi CreateThreadingOptions(CreateThreadingOptions_PointerPointer setter); + + public static class ReleaseThreadingOptions_OrtThreadingOptions extends FunctionPointer { + static { Loader.load(); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public ReleaseThreadingOptions_OrtThreadingOptions(Pointer p) { super(p); } + protected ReleaseThreadingOptions_OrtThreadingOptions() { allocate(); } + private native void allocate(); + public native void call(OrtThreadingOptions input); + } + public native ReleaseThreadingOptions_OrtThreadingOptions ReleaseThreadingOptions(); public native OrtApi ReleaseThreadingOptions(ReleaseThreadingOptions_OrtThreadingOptions setter); + + /** + * @param num_keys contains the number of keys in the custom metadata map + * @param keys is an array of null terminated strings (array count = num_keys) allocated using 'allocator'. + * The caller is responsible for freeing each string and the pointer array. + * 'keys' will be a nullptr if custom metadata map is empty. + */ + public static class ModelMetadataGetCustomMetadataMapKeys_OrtModelMetadata_OrtAllocator_PointerPointer_LongPointer extends FunctionPointer { + static { Loader.load(); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public ModelMetadataGetCustomMetadataMapKeys_OrtModelMetadata_OrtAllocator_PointerPointer_LongPointer(Pointer p) { super(p); } + protected ModelMetadataGetCustomMetadataMapKeys_OrtModelMetadata_OrtAllocator_PointerPointer_LongPointer() { allocate(); } + private native void allocate(); + public native @Cast("OrtStatusPtr") OrtStatus call( @Const OrtModelMetadata model_metadata, + OrtAllocator allocator, @Cast("char***") @ByPtrPtr PointerPointer keys, @Cast("int64_t*") LongPointer num_keys); + } + public native ModelMetadataGetCustomMetadataMapKeys_OrtModelMetadata_OrtAllocator_PointerPointer_LongPointer ModelMetadataGetCustomMetadataMapKeys(); public native OrtApi ModelMetadataGetCustomMetadataMapKeys(ModelMetadataGetCustomMetadataMapKeys_OrtModelMetadata_OrtAllocator_PointerPointer_LongPointer setter); + + // Override symbolic dimensions (by specific name strings) with actual values + // if known at session initialization time to enable optimizations that can + // take advantage of fixed values (such as memory planning, etc) + public static class AddFreeDimensionOverrideByName_OrtSessionOptions_BytePointer_long extends FunctionPointer { + static { Loader.load(); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public AddFreeDimensionOverrideByName_OrtSessionOptions_BytePointer_long(Pointer p) { super(p); } + protected AddFreeDimensionOverrideByName_OrtSessionOptions_BytePointer_long() { allocate(); } + private native void allocate(); + public native @Cast("OrtStatusPtr") OrtStatus call( + OrtSessionOptions options, @Cast("const char*") BytePointer dim_name, + @Cast("int64_t") long dim_value); + } + public native AddFreeDimensionOverrideByName_OrtSessionOptions_BytePointer_long AddFreeDimensionOverrideByName(); public native OrtApi AddFreeDimensionOverrideByName(AddFreeDimensionOverrideByName_OrtSessionOptions_BytePointer_long setter); } diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtApiBase.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtApiBase.java index c8e02f40dd5..c0a1945a15c 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtApiBase.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtApiBase.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.3: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.4-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtCustomOp.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtCustomOp.java index 3ae5b915ced..3bd6150fa8a 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtCustomOp.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtCustomOp.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.3: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.4-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; @@ -41,7 +41,8 @@ public static class CreateKernel_OrtCustomOp_OrtApi_OrtKernelInfo extends Functi public CreateKernel_OrtCustomOp_OrtApi_OrtKernelInfo(Pointer p) { super(p); } protected CreateKernel_OrtCustomOp_OrtApi_OrtKernelInfo() { allocate(); } private native void allocate(); - public native Pointer call(OrtCustomOp op, @Const OrtApi api, @Const OrtKernelInfo info); + public native Pointer call(OrtCustomOp op, @Const OrtApi api, + @Const OrtKernelInfo info); } public native CreateKernel_OrtCustomOp_OrtApi_OrtKernelInfo CreateKernel(); public native OrtCustomOp CreateKernel(CreateKernel_OrtCustomOp_OrtApi_OrtKernelInfo setter); diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtCustomOpDomain.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtCustomOpDomain.java index d6f09a6f668..bad53f85e67 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtCustomOpDomain.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtCustomOpDomain.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.3: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.4-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtEnv.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtEnv.java index 6e14d2ed66a..deb34e727d0 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtEnv.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtEnv.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.3: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.4-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtException.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtException.java index da156c70d52..5f65d26b82d 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtException.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtException.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.3: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.4-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtKernelContext.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtKernelContext.java index f2337d40f1d..608af2b8352 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtKernelContext.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtKernelContext.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.3: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.4-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtKernelInfo.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtKernelInfo.java index 2e854ca19f7..8e8e003983b 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtKernelInfo.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtKernelInfo.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.3: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.4-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtLoggingFunction.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtLoggingFunction.java index d63ad713f92..477607c4d31 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtLoggingFunction.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtLoggingFunction.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.3: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.4-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtMapTypeInfo.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtMapTypeInfo.java index 294bf993725..f59e0831650 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtMapTypeInfo.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtMapTypeInfo.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.3: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.4-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtMemoryInfo.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtMemoryInfo.java index 92c7da3ffd0..245f453d9df 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtMemoryInfo.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtMemoryInfo.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.3: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.4-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtModelMetadata.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtModelMetadata.java index d695dedd87d..9a1f44296b5 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtModelMetadata.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtModelMetadata.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.3: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.4-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtRunOptions.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtRunOptions.java index 0470612fae9..028cbf756d4 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtRunOptions.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtRunOptions.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.3: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.4-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtSequenceTypeInfo.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtSequenceTypeInfo.java index f3ad13a3b5e..c5ea7562d45 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtSequenceTypeInfo.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtSequenceTypeInfo.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.3: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.4-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtSession.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtSession.java index 4e28a5f9c41..23bcd1da8c3 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtSession.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtSession.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.3: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.4-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtSessionOptions.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtSessionOptions.java index e4489dfae5b..1c61f043e6b 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtSessionOptions.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtSessionOptions.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.3: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.4-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtStatus.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtStatus.java index f2ee300ed9f..ad8f6cc4c17 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtStatus.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtStatus.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.3: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.4-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtTensorTypeAndShapeInfo.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtTensorTypeAndShapeInfo.java index 170b449a91b..215ba08c96c 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtTensorTypeAndShapeInfo.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtTensorTypeAndShapeInfo.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.3: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.4-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtThreadPoolParams.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtThreadPoolParams.java new file mode 100644 index 00000000000..8076f8f2020 --- /dev/null +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtThreadPoolParams.java @@ -0,0 +1,21 @@ +// Targeted by JavaCPP version 1.5.4-SNAPSHOT: DO NOT EDIT THIS FILE + +package org.bytedeco.onnxruntime; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +import static org.bytedeco.javacpp.presets.javacpp.*; +import org.bytedeco.dnnl.*; +import static org.bytedeco.dnnl.global.dnnl.*; + +import static org.bytedeco.onnxruntime.global.onnxruntime.*; + +@Opaque @Properties(inherit = org.bytedeco.onnxruntime.presets.onnxruntime.class) +public class OrtThreadPoolParams extends Pointer { + /** Empty constructor. Calls {@code super((Pointer)null)}. */ + public OrtThreadPoolParams() { super((Pointer)null); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public OrtThreadPoolParams(Pointer p) { super(p); } +} diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtThreadingOptions.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtThreadingOptions.java new file mode 100644 index 00000000000..e819d9bf906 --- /dev/null +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtThreadingOptions.java @@ -0,0 +1,21 @@ +// Targeted by JavaCPP version 1.5.4-SNAPSHOT: DO NOT EDIT THIS FILE + +package org.bytedeco.onnxruntime; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +import static org.bytedeco.javacpp.presets.javacpp.*; +import org.bytedeco.dnnl.*; +import static org.bytedeco.dnnl.global.dnnl.*; + +import static org.bytedeco.onnxruntime.global.onnxruntime.*; + +@Opaque @Properties(inherit = org.bytedeco.onnxruntime.presets.onnxruntime.class) +public class OrtThreadingOptions extends Pointer { + /** Empty constructor. Calls {@code super((Pointer)null)}. */ + public OrtThreadingOptions() { super((Pointer)null); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public OrtThreadingOptions(Pointer p) { super(p); } +} diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtTypeInfo.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtTypeInfo.java index 03816a380ce..b6d09b81b2e 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtTypeInfo.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtTypeInfo.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.3: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.4-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtValue.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtValue.java index 53e66aa2660..ab98cbc3bf9 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtValue.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtValue.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.3: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.4-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/RunOptions.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/RunOptions.java index f410eab1fa0..d33e96280ce 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/RunOptions.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/RunOptions.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.3: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.4-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/Session.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/Session.java index 4a9cbc799f3..472e7517525 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/Session.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/Session.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.3: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.4-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/SessionOptions.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/SessionOptions.java index 3556c41087b..f257eebc360 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/SessionOptions.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/SessionOptions.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.3: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.4-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; @@ -53,4 +53,6 @@ public class SessionOptions extends BaseSessionOptions { public native @ByRef SessionOptions SetLogId(String logid); public native @ByRef SessionOptions Add(OrtCustomOpDomain custom_op_domain); + + public native @ByRef SessionOptions DisablePerSessionThreads(); } diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/TensorTypeAndShapeInfo.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/TensorTypeAndShapeInfo.java index 6673df99e1f..42f9d70934b 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/TensorTypeAndShapeInfo.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/TensorTypeAndShapeInfo.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.3: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.4-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/TypeInfo.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/TypeInfo.java index 6c507964b13..4fce82bb662 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/TypeInfo.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/TypeInfo.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.3: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.4-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/UnownedTensorTypeAndShapeInfo.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/UnownedTensorTypeAndShapeInfo.java index 4580d82d4ba..df8f9f7e189 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/UnownedTensorTypeAndShapeInfo.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/UnownedTensorTypeAndShapeInfo.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.3: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.4-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/Value.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/Value.java index f165024ebb2..ca00feae805 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/Value.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/Value.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.3: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.4-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/ValueVector.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/ValueVector.java index 932dda29774..01ae0fde17b 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/ValueVector.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/ValueVector.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.3: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.4-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/global/onnxruntime.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/global/onnxruntime.java index 24e8d87a64b..32e5760749c 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/global/onnxruntime.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/global/onnxruntime.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.3: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.4-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime.global; @@ -29,7 +29,7 @@ public class onnxruntime extends org.bytedeco.onnxruntime.presets.onnxruntime { // #include // This value is used in structures passed to ORT so that a newer version of ORT will still work with them -public static final int ORT_API_VERSION = 2; +public static final int ORT_API_VERSION = 3; // #ifdef __cplusplus // #endif @@ -37,7 +37,9 @@ public class onnxruntime extends org.bytedeco.onnxruntime.presets.onnxruntime { // SAL2 Definitions // #ifndef _WIN32 // #define _In_ +// #define _In_z_ // #define _In_opt_ +// #define _In_opt_z_ // #define _Out_ // #define _Outptr_ // #define _Out_opt_ @@ -47,7 +49,13 @@ public class onnxruntime extends org.bytedeco.onnxruntime.presets.onnxruntime { // #define _Ret_maybenull_ // #define _Ret_notnull_ // #define _Check_return_ +// #define _Outptr_result_maybenull_ +// #define _In_reads_(X) +// #define _Inout_updates_all_(X) +// #define _Out_writes_bytes_all_(X) +// #define _Out_writes_all_(X) // #define _Success_(X) +// #define _Outptr_result_buffer_maybenull_(X) // #define ORT_ALL_ARGS_NONNULL __attribute__((nonnull)) // #else // #include @@ -146,25 +154,9 @@ public class onnxruntime extends org.bytedeco.onnxruntime.presets.onnxruntime { ORT_INVALID_GRAPH = 10, ORT_EP_FAIL = 11; -// __VA_ARGS__ on Windows and Linux are different -// #define ORT_API(RETURN_TYPE, NAME, ...) -// ORT_EXPORT RETURN_TYPE ORT_API_CALL NAME(__VA_ARGS__) NO_EXCEPTION - -// #define ORT_API_STATUS(NAME, ...) -// ORT_EXPORT _Check_return_ _Success_(return == 0) _Ret_maybenull_ OrtStatus* ORT_API_CALL NAME(__VA_ARGS__) NO_EXCEPTION ORT_MUST_USE_RESULT - -// #define ORT_API2_STATUS(NAME, ...) -// _Check_return_ _Success_(return == 0) _Ret_maybenull_ OrtStatus*(ORT_API_CALL * NAME)(__VA_ARGS__)NO_EXCEPTION ORT_MUST_USE_RESULT - -// Used in *.cc files. Almost as same as ORT_API_STATUS, except without ORT_MUST_USE_RESULT -// #define ORT_API_STATUS_IMPL(NAME, ...) -// ORT_EXPORT _Check_return_ _Success_(return == 0) _Ret_maybenull_ OrtStatus* ORT_API_CALL NAME(__VA_ARGS__) NO_EXCEPTION - // #define ORT_RUNTIME_CLASS(X) // struct Ort##X; // typedef struct Ort##X Ort##X; -// ORT_API(void, OrtRelease##X, _Frees_ptr_opt_ Ort##X* input); -// #define ORT_CLASS_RELEASE(X) void(ORT_API_CALL * Release##X)(_Frees_ptr_opt_ Ort##X * input) // Targeting ../OrtEnv.java @@ -204,6 +196,32 @@ public class onnxruntime extends org.bytedeco.onnxruntime.presets.onnxruntime { // Targeting ../OrtModelMetadata.java +// Targeting ../OrtThreadPoolParams.java + + +// Targeting ../OrtThreadingOptions.java + + + +// #ifdef _WIN32 +// #else +// #endif + +// __VA_ARGS__ on Windows and Linux are different +// #define ORT_API(RETURN_TYPE, NAME, ...) ORT_EXPORT RETURN_TYPE ORT_API_CALL NAME(__VA_ARGS__) NO_EXCEPTION + +// #define ORT_API_STATUS(NAME, ...) +// ORT_EXPORT _Check_return_ _Ret_maybenull_ OrtStatusPtr ORT_API_CALL NAME(__VA_ARGS__) NO_EXCEPTION ORT_MUST_USE_RESULT + +// XXX: Unfortunately, SAL annotations are known to not work with function pointers +// #define ORT_API2_STATUS(NAME, ...) +// _Check_return_ _Ret_maybenull_ OrtStatusPtr(ORT_API_CALL* NAME)(__VA_ARGS__) NO_EXCEPTION ORT_MUST_USE_RESULT + +// Used in *.cc files. Almost as same as ORT_API_STATUS, except without ORT_MUST_USE_RESULT and ORT_EXPORT +// #define ORT_API_STATUS_IMPL(NAME, ...) +// _Check_return_ _Ret_maybenull_ OrtStatusPtr ORT_API_CALL NAME(__VA_ARGS__) NO_EXCEPTION + +// #define ORT_CLASS_RELEASE(X) void(ORT_API_CALL * Release##X)(_Frees_ptr_opt_ Ort##X * input) // Targeting ../OrtAllocator.java @@ -334,6 +352,7 @@ public class onnxruntime extends org.bytedeco.onnxruntime.presets.onnxruntime { @Namespace("Ort") public static native void OrtRelease(OrtTypeInfo ptr); @Namespace("Ort") public static native void OrtRelease(OrtValue ptr); @Namespace("Ort") public static native void OrtRelease(OrtModelMetadata ptr); +@Namespace("Ort") public static native void OrtRelease(OrtThreadingOptions ptr); // Targeting ../BaseMemoryInfo.java @@ -421,7 +440,7 @@ public class onnxruntime extends org.bytedeco.onnxruntime.presets.onnxruntime { /** * @param device_id cuda device id, starts from zero. */ -public static native @Platform(extension="-gpu") OrtStatus OrtSessionOptionsAppendExecutionProvider_CUDA( OrtSessionOptions options, int device_id); +public static native @Cast("OrtStatusPtr") @Platform(extension="-gpu") OrtStatus OrtSessionOptionsAppendExecutionProvider_CUDA( OrtSessionOptions options, int device_id); // #ifdef __cplusplus // #endif @@ -440,7 +459,7 @@ public class onnxruntime extends org.bytedeco.onnxruntime.presets.onnxruntime { /** * @param use_arena zero: false. non-zero: true. */ -public static native OrtStatus OrtSessionOptionsAppendExecutionProvider_Dnnl( OrtSessionOptions options, int use_arena); +public static native @Cast("OrtStatusPtr") OrtStatus OrtSessionOptionsAppendExecutionProvider_Dnnl( OrtSessionOptions options, int use_arena); // #ifdef __cplusplus // #endif diff --git a/onnxruntime/src/main/java/org/bytedeco/onnxruntime/presets/onnxruntime.java b/onnxruntime/src/main/java/org/bytedeco/onnxruntime/presets/onnxruntime.java index 1edd57d3038..3f3e9dccebf 100644 --- a/onnxruntime/src/main/java/org/bytedeco/onnxruntime/presets/onnxruntime.java +++ b/onnxruntime/src/main/java/org/bytedeco/onnxruntime/presets/onnxruntime.java @@ -50,7 +50,7 @@ "onnxruntime/core/providers/cuda/cuda_provider_factory.h", "onnxruntime/core/providers/dnnl/dnnl_provider_factory.h" }, - link = "onnxruntime@.1.2.0" + link = "onnxruntime@.1.3.0" ), @Platform( value = {"linux", "macosx", "windows"}, diff --git a/platform/pom.xml b/platform/pom.xml index 28b451f32f1..378d822672b 100644 --- a/platform/pom.xml +++ b/platform/pom.xml @@ -273,7 +273,7 @@ org.bytedeco onnxruntime-platform - 1.2.0-${project.version} + 1.3.0-${project.version} org.bytedeco From 85b864667208ed61d32880c2ad64c334980592e9 Mon Sep 17 00:00:00 2001 From: Samuel Audet Date: Thu, 21 May 2020 17:29:29 +0900 Subject: [PATCH 2/2] Fix build on Mac and Windows --- CHANGELOG.md | 2 +- README.md | 2 +- onnxruntime/README.md | 4 +- onnxruntime/cppbuild.sh | 2 + onnxruntime/onnxruntime.patch | 211 +++++++++++++++++++++++++++------- 5 files changed, 176 insertions(+), 45 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bce293ab36d..beeb0de2ee4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ * Fix JPMS modules for CUDA, ARPACK-NG, GSL, SciPy, Gym, MXNet ([pull #880](https://github.com/bytedeco/javacpp-presets/pull/880) and [pull #881](https://github.com/bytedeco/javacpp-presets/pull/881)) * Build OpenBLAS with a `TARGET` even for `DYNAMIC_ARCH` to avoid SIGILL ([issue eclipse/deeplearning4j#8747](https://github.com/eclipse/deeplearning4j/issues/8747)) - * Upgrade presets for Arrow 0.17.0, MKL-DNN 0.21.5, DNNL 1.4, NumPy 1.18.3, ONNX 1.7.0 ([pull #882](https://github.com/bytedeco/javacpp-presets/pull/882)), and their dependencies + * Upgrade presets for Arrow 0.17.0, MKL-DNN 0.21.5, DNNL 1.4, NumPy 1.18.3, ONNX 1.7.0 ([pull #882](https://github.com/bytedeco/javacpp-presets/pull/882)), ONNX Runtime 1.3.0 ([pull #887](https://github.com/bytedeco/javacpp-presets/pull/887)), and their dependencies * Add `FullOptimization.h` allowing users to fully optimize LLVM modules ([pull #869](https://github.com/bytedeco/javacpp-presets/pull/869)) ### April 14, 2020 version 1.5.3 diff --git a/README.md b/README.md index 6e1ab3d4778..4690d350b11 100644 --- a/README.md +++ b/README.md @@ -148,7 +148,7 @@ Each child module in turn relies by default on the included [`cppbuild.sh` scrip * The Arcade Learning Environment 0.6.x https://github.com/mgbellemare/Arcade-Learning-Environment * ONNX 1.7.0 https://github.com/onnx/onnx * nGraph 0.26.0 https://github.com/NervanaSystems/ngraph - * ONNX Runtime 1.2.x https://github.com/microsoft/onnxruntime + * ONNX Runtime 1.3.0 https://github.com/microsoft/onnxruntime * LiquidFun http://google.github.io/liquidfun/ * Qt 5.14.x https://download.qt.io/archive/qt/ * Mono/Skia 1.68.x https://github.com/mono/skia diff --git a/onnxruntime/README.md b/onnxruntime/README.md index d9da1673de6..3f2952343bf 100644 --- a/onnxruntime/README.md +++ b/onnxruntime/README.md @@ -34,7 +34,7 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic 4.0.0 org.bytedeco.onnxruntime cxxapisample - 1.5.3 + 1.5.4-SNAPSHOT CXXApiSample @@ -56,7 +56,7 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic org.bytedeco cuda-platform-redist - 10.2-7.6-1.5.3 + 10.2-7.6-1.5.4-SNAPSHOT diff --git a/onnxruntime/cppbuild.sh b/onnxruntime/cppbuild.sh index bc51bbbc889..bc377e4f3d2 100755 --- a/onnxruntime/cppbuild.sh +++ b/onnxruntime/cppbuild.sh @@ -58,6 +58,8 @@ sedinplace 's/Value(std::nullptr_t)/Value(std::nullptr_t = nullptr)/g' include/o for f in java/src/main/native/*.c; do cp $f ${f}pp; done for f in java/src/main/native/ai_onnxruntime_*.cpp; do sedinplace 's/#include "ai_onnxruntime_.*.h"/extern "C" {/g' $f; echo "}" >> $f; done sedinplace 's/(\*jniEnv)->\(.*\)(jniEnv,/jniEnv->\1(/g' java/src/main/native/*.cpp +sedinplace 's/ WIN32/ _WIN32/g' java/src/main/native/*.cpp +sedinplace 's/FreeLibrary(/FreeLibrary((HMODULE)/g' java/src/main/native/*.cpp sedinplace 's/(javaStrings/((jstring)javaStrings/g' java/src/main/native/*.cpp sedinplace 's/(javaInputStrings/((jstring)javaInputStrings/g' java/src/main/native/*.cpp sedinplace 's/(javaOutputStrings/((jstring)javaOutputStrings/g' java/src/main/native/*.cpp diff --git a/onnxruntime/onnxruntime.patch b/onnxruntime/onnxruntime.patch index a672fccee88..659aed0c4c7 100644 --- a/onnxruntime/onnxruntime.patch +++ b/onnxruntime/onnxruntime.patch @@ -1,4 +1,5 @@ diff --git a/onnxruntime/core/providers/dnnl/subgraph/dnnl_conv_batchnorm.h b/onnxruntime/core/providers/dnnl/subgraph/dnnl_conv_batchnorm.h +index aa4a5f6c0..2a223dd51 100644 --- a/onnxruntime/core/providers/dnnl/subgraph/dnnl_conv_batchnorm.h +++ b/onnxruntime/core/providers/dnnl/subgraph/dnnl_conv_batchnorm.h @@ -2,6 +2,7 @@ @@ -7,28 +8,28 @@ diff --git a/onnxruntime/core/providers/dnnl/subgraph/dnnl_conv_batchnorm.h b/on #pragma once +#include #include "dnnl_types.h" - #include "core/framework/op_kernel.h" #include "core/providers/dnnl/dnnl_fwd.h" + #include "core/providers/dnnl/dnnl_execution_provider.h" diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt -index 5de48bfc..5a6698c3 100644 +index 5db7fbc4c..402876415 100644 --- a/cmake/CMakeLists.txt +++ b/cmake/CMakeLists.txt -@@ -430,8 +430,8 @@ if (WIN32) +@@ -637,8 +637,8 @@ if (WIN32) else() add_definitions(-DPLATFORM_POSIX) # Enable warning and enable space optimization in Linux - string(APPEND CMAKE_CXX_FLAGS " -Wall -Wextra -ffunction-sections -fdata-sections") - string(APPEND CMAKE_C_FLAGS " -Wall -Wextra -ffunction-sections -fdata-sections") -+ string(APPEND CMAKE_CXX_FLAGS " -Wall -Wextra") -+ string(APPEND CMAKE_C_FLAGS " -Wall -Wextra") ++ string(APPEND CMAKE_CXX_FLAGS " -Wall -Wextra -I/usr/local/include") ++ string(APPEND CMAKE_C_FLAGS " -Wall -Wextra -I/usr/local/include") if(onnxruntime_DEV_MODE) string(APPEND CMAKE_CXX_FLAGS " -Werror") diff --git a/cmake/onnxruntime.cmake b/cmake/onnxruntime.cmake -index 66bbc6c4..1a3f2467 100644 +index 9a79115ed..7ddaeec32 100644 --- a/cmake/onnxruntime.cmake +++ b/cmake/onnxruntime.cmake -@@ -52,9 +52,9 @@ +@@ -52,9 +52,9 @@ endif() if(UNIX) if (APPLE) @@ -41,10 +42,10 @@ index 66bbc6c4..1a3f2467 100644 else() set(ONNXRUNTIME_SO_LINK_FLAG " -DEF:${SYMBOL_FILE}") diff --git a/include/onnxruntime/core/session/onnxruntime_c_api.h b/include/onnxruntime/core/session/onnxruntime_c_api.h -index 3df205f1..cd674ffd 100644 +index b5dd59970..debeb4fbb 100644 --- a/include/onnxruntime/core/session/onnxruntime_c_api.h +++ b/include/onnxruntime/core/session/onnxruntime_c_api.h -@@ -65,7 +65,7 @@ extern "C" { +@@ -73,7 +73,7 @@ extern "C" { // Windows users should use unicode paths when possible to bypass the MAX_PATH limitation // Every pointer marked with _In_ or _Out_, cannot be NULL. Caller should ensure that. // for ReleaseXXX(...) functions, they can accept NULL pointer. @@ -53,8 +54,30 @@ index 3df205f1..cd674ffd 100644 #else #define NO_EXCEPTION #endif +diff --git a/onnxruntime/core/mlas/lib/x86/SgemmKernelAvx.S b/onnxruntime/core/mlas/lib/x86/SgemmKernelAvx.S +index f874710c1..d21eb958e 100644 +--- a/onnxruntime/core/mlas/lib/x86/SgemmKernelAvx.S ++++ b/onnxruntime/core/mlas/lib/x86/SgemmKernelAvx.S +@@ -344,7 +344,7 @@ C_UNDERSCORE(MlasGemmFloatKernelAvx): + .LOutputMasked8x2Block: + call __x86.get_pc_thunk.bx + add ebx,OFFSET _GLOBAL_OFFSET_TABLE_ +- mov ebx,DWORD PTR C_UNDERSCORE(MlasMaskMoveAvx)@GOT[ebx] ++ mov ebx,DWORD PTR [C_UNDERSCORE(MlasMaskMoveAvx)@GOT+ebx] + mov .LSgemmKernelFrame_CountN[esp],ebp + vbroadcastss xmm0,.LSgemmKernelFrame_CountN[esp] + vpcmpgtd xmm1,xmm0,XMMWORD PTR [ebx+16] +@@ -426,7 +426,7 @@ C_UNDERSCORE(MlasGemmFloatKernelAvx): + .LOutputMasked8x1Block: + call __x86.get_pc_thunk.bx + add ebx,OFFSET _GLOBAL_OFFSET_TABLE_ +- mov ebx,DWORD PTR C_UNDERSCORE(MlasMaskMoveAvx)@GOT[ebx] ++ mov ebx,DWORD PTR [C_UNDERSCORE(MlasMaskMoveAvx)@GOT+ebx] + mov .LSgemmKernelFrame_CountN[esp],ebp + vbroadcastss xmm0,.LSgemmKernelFrame_CountN[esp] + vpcmpgtd xmm1,xmm0,XMMWORD PTR [ebx+16] diff --git a/onnxruntime/core/mlas/lib/x86_64/DgemmKernelSse2.S b/onnxruntime/core/mlas/lib/x86_64/DgemmKernelSse2.S -index cf763054..5d7916ca 100644 +index cf7630545..5d7916cad 100644 --- a/onnxruntime/core/mlas/lib/x86_64/DgemmKernelSse2.S +++ b/onnxruntime/core/mlas/lib/x86_64/DgemmKernelSse2.S @@ -146,7 +146,7 @@ Implicit Arguments: @@ -67,7 +90,7 @@ index cf763054..5d7916ca 100644 EmitIfCountGE \RowCount\(), 1, "mulpd xmm8,xmm2" # multiply by alpha diff --git a/onnxruntime/core/mlas/lib/x86_64/ErfKernelFma3.S b/onnxruntime/core/mlas/lib/x86_64/ErfKernelFma3.S -index 92b7976d..e909490f 100644 +index 92b7976d7..e909490f8 100644 --- a/onnxruntime/core/mlas/lib/x86_64/ErfKernelFma3.S +++ b/onnxruntime/core/mlas/lib/x86_64/ErfKernelFma3.S @@ -93,7 +93,7 @@ Return Value: @@ -89,7 +112,7 @@ index 92b7976d..e909490f 100644 vmaskmovps ymm0,ymm3,YMMWORD PTR [rdi] # original input vx0 diff --git a/onnxruntime/core/mlas/lib/x86_64/FgemmKernelAvx512FCommon.h b/onnxruntime/core/mlas/lib/x86_64/FgemmKernelAvx512FCommon.h -index 22e4c361..db72a7a2 100644 +index 22e4c361d..db72a7a21 100644 --- a/onnxruntime/core/mlas/lib/x86_64/FgemmKernelAvx512FCommon.h +++ b/onnxruntime/core/mlas/lib/x86_64/FgemmKernelAvx512FCommon.h @@ -459,9 +459,9 @@ Return Value: @@ -119,7 +142,7 @@ index 22e4c361..db72a7a2 100644 pop rbx pop rbp diff --git a/onnxruntime/core/mlas/lib/x86_64/FgemmKernelAvxCommon.h b/onnxruntime/core/mlas/lib/x86_64/FgemmKernelAvxCommon.h -index a5abee97..aca8e00c 100644 +index a5abee977..aca8e00c6 100644 --- a/onnxruntime/core/mlas/lib/x86_64/FgemmKernelAvxCommon.h +++ b/onnxruntime/core/mlas/lib/x86_64/FgemmKernelAvxCommon.h @@ -241,7 +241,7 @@ Implicit Arguments: @@ -154,7 +177,7 @@ index a5abee97..aca8e00c 100644 // // Process 4 rows of the matrices. diff --git a/onnxruntime/core/mlas/lib/x86_64/FgemmKernelCommon.h b/onnxruntime/core/mlas/lib/x86_64/FgemmKernelCommon.h -index 941cb8d1..f78edae1 100644 +index 941cb8d1d..f78edae1d 100644 --- a/onnxruntime/core/mlas/lib/x86_64/FgemmKernelCommon.h +++ b/onnxruntime/core/mlas/lib/x86_64/FgemmKernelCommon.h @@ -91,12 +91,12 @@ Implicit Arguments: @@ -175,7 +198,7 @@ index 941cb8d1..f78edae1 100644 .endif sub rbp,4 diff --git a/onnxruntime/core/mlas/lib/x86_64/FgemmKernelFma3Common.h b/onnxruntime/core/mlas/lib/x86_64/FgemmKernelFma3Common.h -index f108b5c8..4e5cac63 100644 +index f108b5c8a..4e5cac638 100644 --- a/onnxruntime/core/mlas/lib/x86_64/FgemmKernelFma3Common.h +++ b/onnxruntime/core/mlas/lib/x86_64/FgemmKernelFma3Common.h @@ -235,7 +235,7 @@ Implicit Arguments: @@ -206,7 +229,7 @@ index f108b5c8..4e5cac63 100644 // diff --git a/onnxruntime/core/mlas/lib/x86_64/FgemmKernelSse2Common.h b/onnxruntime/core/mlas/lib/x86_64/FgemmKernelSse2Common.h -index 88cc1b4f..94994403 100644 +index 88cc1b4fd..949944032 100644 --- a/onnxruntime/core/mlas/lib/x86_64/FgemmKernelSse2Common.h +++ b/onnxruntime/core/mlas/lib/x86_64/FgemmKernelSse2Common.h @@ -142,7 +142,7 @@ Return Value: @@ -219,7 +242,7 @@ index 88cc1b4f..94994403 100644 // // Process CountM rows of the matrices. diff --git a/onnxruntime/core/mlas/lib/x86_64/LogisticKernelFma3.S b/onnxruntime/core/mlas/lib/x86_64/LogisticKernelFma3.S -index 243b3553..2fdb8442 100644 +index 243b35539..2fdb8442c 100644 --- a/onnxruntime/core/mlas/lib/x86_64/LogisticKernelFma3.S +++ b/onnxruntime/core/mlas/lib/x86_64/LogisticKernelFma3.S @@ -72,7 +72,7 @@ Return Value: @@ -245,7 +268,7 @@ index 243b3553..2fdb8442 100644 vmaxps ymm0,ymm4,ymm0 # clamp lower bound vminps ymm0,ymm5,ymm0 # clamp upper bound diff --git a/onnxruntime/core/mlas/lib/x86_64/QgemmU8S8KernelAvx2.S b/onnxruntime/core/mlas/lib/x86_64/QgemmU8S8KernelAvx2.S -index 3d637fb9..1dc6f861 100644 +index 6a6edd7e8..f4d380a89 100644 --- a/onnxruntime/core/mlas/lib/x86_64/QgemmU8S8KernelAvx2.S +++ b/onnxruntime/core/mlas/lib/x86_64/QgemmU8S8KernelAvx2.S @@ -106,17 +106,17 @@ C_UNDERSCORE(MlasGemmU8S8CopyPackAAvx2): @@ -271,7 +294,7 @@ index 3d637fb9..1dc6f861 100644 // // Process 4 rows of matrix A in a loop. -@@ -195,7 +195,7 @@ C_UNDERSCORE(MlasGemmU8S8CopyPackAAvx2): +@@ -193,7 +193,7 @@ C_UNDERSCORE(MlasGemmU8S8CopyPackAAvx2): // .LCopyPackA.CopyRemainingCountKLessThan16M4: @@ -279,8 +302,8 @@ index 3d637fb9..1dc6f861 100644 + lea rbp,[.LGemmU8S8CopyPackAFrame_PaddedMatrixAData+rsp] test bl,8 # (CountK & 8) != 0? jz .LCopyPackA.CopyRemainingCountKLessThan8M4 - lea r13,[rdx+r10*2] # compute matrix A plus 2 rows -@@ -258,10 +258,10 @@ C_UNDERSCORE(MlasGemmU8S8CopyPackAAvx2): + mov rax,QWORD PTR [rdx] +@@ -252,10 +252,10 @@ C_UNDERSCORE(MlasGemmU8S8CopyPackAAvx2): // .LCopyPackA.ProcessPaddedMatrixADataM4: @@ -295,7 +318,7 @@ index 3d637fb9..1dc6f861 100644 lea rax,[rcx+r12*2] # compute matrix D plus 2 rows vpmaskmovd XMMWORD PTR [rcx],xmm10,xmm4 vpmaskmovd XMMWORD PTR [rcx+r12],xmm10,xmm5 -@@ -339,7 +339,7 @@ C_UNDERSCORE(MlasGemmU8S8CopyPackAAvx2): +@@ -333,7 +333,7 @@ C_UNDERSCORE(MlasGemmU8S8CopyPackAAvx2): // .LCopyPackA.CopyRemainingCountKLessThan16M1: @@ -304,7 +327,7 @@ index 3d637fb9..1dc6f861 100644 test bl,8 # (CountK & 8) != 0? jz .LCopyPackA.CopyRemainingCountKLessThan8M1 mov rax,QWORD PTR [rdx] -@@ -374,7 +374,7 @@ C_UNDERSCORE(MlasGemmU8S8CopyPackAAvx2): +@@ -368,7 +368,7 @@ C_UNDERSCORE(MlasGemmU8S8CopyPackAAvx2): // .LCopyPackA.ProcessPaddedMatrixADataM1: @@ -313,7 +336,7 @@ index 3d637fb9..1dc6f861 100644 vpmaskmovd XMMWORD PTR [rcx],xmm10,xmm4 vpmaddubsw ymm4,ymm4,ymm9 # horizontal byte+byte=word per row vpaddw ymm0,ymm0,ymm4 # accumulate per row along columns -@@ -548,14 +548,14 @@ C_UNDERSCORE(MlasGemmU8S8CopyPackBAvx2): +@@ -542,14 +542,14 @@ C_UNDERSCORE(MlasGemmU8S8CopyPackBAvx2): .LCopyPackB.ProcessColumnNUnaligned: vpxor xmm0,xmm0,xmm0 # clear column accumulators vpxor xmm1,xmm1,xmm1 @@ -330,8 +353,8 @@ index 3d637fb9..1dc6f861 100644 + lea rbp,[.LGemmU8S8CopyPackBFrame_PaddedMatrixBData+rsp] test cl,8 # (CountN & 8) != 0? jz .LCopyPackB.CopyRemainingCountNLessThan8K4 - lea r11,[rdx+r10*2] # compute matrix B plus 2 rows -@@ -614,10 +614,10 @@ C_UNDERSCORE(MlasGemmU8S8CopyPackBAvx2): + mov rax,QWORD PTR [rdx] +@@ -604,10 +604,10 @@ C_UNDERSCORE(MlasGemmU8S8CopyPackBAvx2): mov BYTE PTR [rbp+48],al .LCopyPackB.ProcessPaddedMatrixBData: @@ -346,7 +369,7 @@ index 3d637fb9..1dc6f861 100644 vpunpcklbw xmm6,xmm2,xmm3 # interleave row data vpunpckhbw xmm3,xmm2,xmm3 vpunpcklbw xmm2,xmm4,xmm5 -@@ -647,7 +647,7 @@ C_UNDERSCORE(MlasGemmU8S8CopyPackBAvx2): +@@ -637,7 +637,7 @@ C_UNDERSCORE(MlasGemmU8S8CopyPackBAvx2): // Process the less than 4 remaining rows where the row has less than 16 columns. // @@ -356,7 +379,7 @@ index 3d637fb9..1dc6f861 100644 vmovdqu YMMWORD PTR [rbp],ymm6 vmovdqu YMMWORD PTR [rbp+32],ymm6 diff --git a/onnxruntime/core/mlas/lib/x86_64/QgemmU8U8KernelAvx2.S b/onnxruntime/core/mlas/lib/x86_64/QgemmU8U8KernelAvx2.S -index d443561f..163ea076 100644 +index d443561f6..163ea0766 100644 --- a/onnxruntime/core/mlas/lib/x86_64/QgemmU8U8KernelAvx2.S +++ b/onnxruntime/core/mlas/lib/x86_64/QgemmU8U8KernelAvx2.S @@ -107,17 +107,17 @@ C_UNDERSCORE(MlasGemmU8U8CopyPackAAvx2): @@ -472,7 +495,7 @@ index d443561f..163ea076 100644 vextracti128 xmm3,ymm4,1 vpmovzxbw ymm4,xmm4 diff --git a/onnxruntime/core/mlas/lib/x86_64/QgemmU8X8KernelAvx2Common.h b/onnxruntime/core/mlas/lib/x86_64/QgemmU8X8KernelAvx2Common.h -index 172bd9fa..98cfd72b 100644 +index 172bd9fab..98cfd72b3 100644 --- a/onnxruntime/core/mlas/lib/x86_64/QgemmU8X8KernelAvx2Common.h +++ b/onnxruntime/core/mlas/lib/x86_64/QgemmU8X8KernelAvx2Common.h @@ -241,9 +241,9 @@ Implicit Arguments: @@ -489,7 +512,7 @@ index 172bd9fa..98cfd72b 100644 jnz .LSkipAccumulateOutputMasked8xNBlock\@ EmitIfCountGE \RowCount\(), 1, "vpmaskmovd ymm4,ymm0,YMMWORD PTR [rdx]" diff --git a/onnxruntime/core/mlas/lib/x86_64/QgemvU8S8KernelAvx2.S b/onnxruntime/core/mlas/lib/x86_64/QgemvU8S8KernelAvx2.S -index ef6b0afe..96fbaa4e 100644 +index ef6b0afed..96fbaa4e0 100644 --- a/onnxruntime/core/mlas/lib/x86_64/QgemvU8S8KernelAvx2.S +++ b/onnxruntime/core/mlas/lib/x86_64/QgemvU8S8KernelAvx2.S @@ -206,7 +206,7 @@ C_UNDERSCORE(MlasGemvU8S8KernelAvx2): @@ -533,7 +556,7 @@ index ef6b0afe..96fbaa4e 100644 vpmaddwd xmm1,xmm1,xmm6 test r11,r11 # ZeroMode? diff --git a/onnxruntime/core/mlas/lib/x86_64/SgemmKernelM1Avx.S b/onnxruntime/core/mlas/lib/x86_64/SgemmKernelM1Avx.S -index 3a02845a..9c585c94 100644 +index 3a02845a5..9c585c948 100644 --- a/onnxruntime/core/mlas/lib/x86_64/SgemmKernelM1Avx.S +++ b/onnxruntime/core/mlas/lib/x86_64/SgemmKernelM1Avx.S @@ -81,8 +81,8 @@ C_UNDERSCORE(MlasSgemmKernelM1Avx): @@ -548,7 +571,7 @@ index 3a02845a..9c585c94 100644 // diff --git a/onnxruntime/core/mlas/lib/x86_64/SgemmKernelM1TransposeBAvx.S b/onnxruntime/core/mlas/lib/x86_64/SgemmKernelM1TransposeBAvx.S -index b3db3998..9366cb91 100644 +index b3db39989..9366cb916 100644 --- a/onnxruntime/core/mlas/lib/x86_64/SgemmKernelM1TransposeBAvx.S +++ b/onnxruntime/core/mlas/lib/x86_64/SgemmKernelM1TransposeBAvx.S @@ -80,8 +80,8 @@ C_UNDERSCORE(MlasSgemmKernelM1TransposeBAvx): @@ -563,7 +586,7 @@ index b3db3998..9366cb91 100644 // diff --git a/onnxruntime/core/mlas/lib/x86_64/SgemmKernelSse2.S b/onnxruntime/core/mlas/lib/x86_64/SgemmKernelSse2.S -index b51a0956..076cb842 100644 +index b51a0956b..076cb8428 100644 --- a/onnxruntime/core/mlas/lib/x86_64/SgemmKernelSse2.S +++ b/onnxruntime/core/mlas/lib/x86_64/SgemmKernelSse2.S @@ -169,7 +169,7 @@ Implicit Arguments: @@ -575,8 +598,21 @@ index b51a0956..076cb842 100644 shufps xmm2,xmm2,0 EmitIfCountGE \RowCount\(), 1, "mulps xmm8,xmm2" # multiply by alpha +diff --git a/onnxruntime/core/mlas/lib/x86_64/SoftmaxKernelAvx.S b/onnxruntime/core/mlas/lib/x86_64/SoftmaxKernelAvx.S +index 7432ff0f9..e1a2df593 100644 +--- a/onnxruntime/core/mlas/lib/x86_64/SoftmaxKernelAvx.S ++++ b/onnxruntime/core/mlas/lib/x86_64/SoftmaxKernelAvx.S +@@ -45,7 +45,7 @@ Return Value: + .globl C_UNDERSCORE(MlasReduceMaximumF32KernelAvx) + C_UNDERSCORE(MlasReduceMaximumF32KernelAvx): + +- vbroadcastss ymm0,DWORD PTR C_UNDERSCORE(MlasMinimumF32Value)[rip] ++ vbroadcastss ymm0,DWORD PTR [C_UNDERSCORE(MlasMinimumF32Value)+rip] + test rsi,rsi + jz .LReduceMaximum.ExitKernel + cmp rsi,8 diff --git a/onnxruntime/core/mlas/lib/x86_64/SpoolKernelAvx.S b/onnxruntime/core/mlas/lib/x86_64/SpoolKernelAvx.S -index 87490903..495cba0c 100644 +index 874909033..495cba0cf 100644 --- a/onnxruntime/core/mlas/lib/x86_64/SpoolKernelAvx.S +++ b/onnxruntime/core/mlas/lib/x86_64/SpoolKernelAvx.S @@ -43,8 +43,8 @@ Implicit Arguments: @@ -591,7 +627,7 @@ index 87490903..495cba0c 100644 vxorps xmm5,xmm5,xmm5 # initialize default divisor vector .ifeqs "\PoolingType\()","AverageExcludePad" diff --git a/onnxruntime/core/mlas/lib/x86_64/SpoolKernelAvx512F.S b/onnxruntime/core/mlas/lib/x86_64/SpoolKernelAvx512F.S -index 9433ce85..c0ee77d5 100644 +index 9433ce85c..c0ee77d55 100644 --- a/onnxruntime/core/mlas/lib/x86_64/SpoolKernelAvx512F.S +++ b/onnxruntime/core/mlas/lib/x86_64/SpoolKernelAvx512F.S @@ -43,8 +43,8 @@ Implicit Arguments: @@ -606,7 +642,7 @@ index 9433ce85..c0ee77d5 100644 vxorps xmm5,xmm5,xmm5 # initialize default divisor vector .ifeqs "\PoolingType\()","AverageExcludePad" diff --git a/onnxruntime/core/mlas/lib/x86_64/TanhKernelFma3.S b/onnxruntime/core/mlas/lib/x86_64/TanhKernelFma3.S -index dd558464..5ac0d3ac 100644 +index dd5584648..5ac0d3ac1 100644 --- a/onnxruntime/core/mlas/lib/x86_64/TanhKernelFma3.S +++ b/onnxruntime/core/mlas/lib/x86_64/TanhKernelFma3.S @@ -72,7 +72,7 @@ Return Value: @@ -631,11 +667,104 @@ index dd558464..5ac0d3ac 100644 vmaskmovps ymm0,ymm2,YMMWORD PTR [rdi] vmaxps ymm0,ymm4,ymm0 # clamp lower bound vminps ymm0,ymm5,ymm0 # clamp upper bound +diff --git a/onnxruntime/core/mlas/lib/x86_64/TransKernelAvx512F.S b/onnxruntime/core/mlas/lib/x86_64/TransKernelAvx512F.S +index 0eabe85b2..4bf9f98db 100644 +--- a/onnxruntime/core/mlas/lib/x86_64/TransKernelAvx512F.S ++++ b/onnxruntime/core/mlas/lib/x86_64/TransKernelAvx512F.S +@@ -46,7 +46,7 @@ Return Value: + .globl C_UNDERSCORE(MlasComputeExpF32KernelAvx512F) + C_UNDERSCORE(MlasComputeExpF32KernelAvx512F): + +- lea rax,C_UNDERSCORE(MlasExpConstants)[rip] ++ lea rax,[C_UNDERSCORE(MlasExpConstants)+rip] + vbroadcastss zmm21,.LExpConstants_LowerRange[rax] + vbroadcastss zmm22,.LExpConstants_RoundingBias[rax] + vbroadcastss zmm23,.LExpConstants_Log2Reciprocal[rax] +@@ -87,7 +87,7 @@ C_UNDERSCORE(MlasComputeExpF32KernelAvx512F): + .LComputeExp.ProcessRemainingCount: + add rdx,16 # correct for over-subtract above + jz .LComputeExp.ExitKernel +- lea r10,C_UNDERSCORE(MlasOpmask16BitTableAvx512)[rip] ++ lea r10,[C_UNDERSCORE(MlasOpmask16BitTableAvx512)+rip] + kmovw k1,WORD PTR [r10+rdx*2] + vmaxps zmm16{k1}{z},zmm21,ZMMWORD PTR [rdi] + # clamp lower bound +@@ -136,7 +136,7 @@ Return Value: + .globl C_UNDERSCORE(MlasComputeSumExpF32KernelAvx512F) + C_UNDERSCORE(MlasComputeSumExpF32KernelAvx512F): + +- lea rax,C_UNDERSCORE(MlasExpConstants)[rip] ++ lea rax,[C_UNDERSCORE(MlasExpConstants)+rip] + vbroadcastss zmm21,.LExpConstants_LowerRange[rax] + vbroadcastss zmm22,.LExpConstants_RoundingBias[rax] + vbroadcastss zmm23,.LExpConstants_Log2Reciprocal[rax] +@@ -224,7 +224,7 @@ C_UNDERSCORE(MlasComputeSumExpF32KernelAvx512F): + .LComputeSumExp.ComputeExpBy16Loop: + cmp rdx,16 + jae .LComputeSumExp.ProcessSingleVector +- lea r10,C_UNDERSCORE(MlasOpmask16BitTableAvx512)[rip] ++ lea r10,[C_UNDERSCORE(MlasOpmask16BitTableAvx512)+rip] + kmovw k1,WORD PTR [r10+rdx*2] + + .LComputeSumExp.ProcessSingleVector: +diff --git a/onnxruntime/core/mlas/lib/x86_64/TransKernelFma3.S b/onnxruntime/core/mlas/lib/x86_64/TransKernelFma3.S +index ae3712365..559af78ca 100644 +--- a/onnxruntime/core/mlas/lib/x86_64/TransKernelFma3.S ++++ b/onnxruntime/core/mlas/lib/x86_64/TransKernelFma3.S +@@ -46,7 +46,7 @@ Return Value: + .globl C_UNDERSCORE(MlasComputeExpF32KernelFma3) + C_UNDERSCORE(MlasComputeExpF32KernelFma3): + +- lea rax,C_UNDERSCORE(MlasExpConstants)[rip] ++ lea rax,[C_UNDERSCORE(MlasExpConstants)+rip] + vbroadcastss ymm4,.LExpConstants_LowerRange[rax] + vbroadcastss ymm5,.LExpConstants_UpperRange[rax] + vbroadcastss ymm6,.LExpConstants_MinimumExponent[rax] +@@ -97,7 +97,7 @@ C_UNDERSCORE(MlasComputeExpF32KernelFma3): + add rdx,8 # correct for over-subtract above + jz .LComputeExp.ExitKernel + neg rdx +- lea r10,C_UNDERSCORE(MlasMaskMoveTableAvx)[rip+8*4] ++ lea r10,[C_UNDERSCORE(MlasMaskMoveTableAvx)+rip+8*4] + vmovups ymm2,YMMWORD PTR [r10+rdx*4] + vmaskmovps ymm0,ymm2,YMMWORD PTR [rdi] + vmaxps ymm0,ymm4,ymm0 # clamp lower bound +@@ -158,7 +158,7 @@ Return Value: + .globl C_UNDERSCORE(MlasComputeSumExpF32KernelFma3) + C_UNDERSCORE(MlasComputeSumExpF32KernelFma3): + +- lea rax,C_UNDERSCORE(MlasExpConstants)[rip] ++ lea rax,[C_UNDERSCORE(MlasExpConstants)+rip] + vbroadcastss ymm9,DWORD PTR [rcx] # broadcast negative maximum value + vxorps xmm10,xmm10,xmm10 # clear exp() accumulator + sub rdx,24 +@@ -253,7 +253,7 @@ C_UNDERSCORE(MlasComputeSumExpF32KernelFma3): + jmp .LComputeSumExp.ProcessSingleVector + + .LComputeSumExp.LoadPartialVector: +- lea r10,C_UNDERSCORE(MlasMaskMoveTableAvx)[rip+8*4] ++ lea r10,[C_UNDERSCORE(MlasMaskMoveTableAvx)+rip+8*4] + neg rdx # carry flag unchanged + vmovups ymm3,YMMWORD PTR [r10+rdx*4] + vmaskmovps ymm0,ymm3,YMMWORD PTR [rdi] +diff --git a/onnxruntime/core/providers/cuda/cudnn_common.cc b/onnxruntime/core/providers/cuda/cudnn_common.cc +index 200fa352a..71f2acb98 100644 +--- a/onnxruntime/core/providers/cuda/cudnn_common.cc ++++ b/onnxruntime/core/providers/cuda/cudnn_common.cc +@@ -117,7 +117,7 @@ cudnnDataType_t CudnnTensor::GetDataType() { + ORT_THROW("cuDNN engine currently supports only single/double/half/int8/uint8 precision data types. Got:", + typeid(ElemType).name()); + // Not reachable but GCC complains +- return 0; ++ return (cudnnDataType_t)0; + } + + template<> diff --git a/tools/ci_build/build.py b/tools/ci_build/build.py -index b6b54fd6..ce945a54 100755 +index 412502969..727ddba2a 100755 --- a/tools/ci_build/build.py +++ b/tools/ci_build/build.py -@@ -518,9 +518,9 @@ +@@ -517,9 +517,9 @@ def generate_build_tree(cmake_path, source_dir, build_dir, cuda_home, "-Donnxruntime_BUILD_WINML_TESTS=" + ( "OFF" if args.skip_winml_tests else "ON"), "-Donnxruntime_GENERATE_TEST_REPORTS=ON", @@ -648,14 +777,14 @@ index b6b54fd6..ce945a54 100755 "-DPYTHON_EXECUTABLE=" + sys.executable, "-Donnxruntime_USE_CUDA=" + ("ON" if args.use_cuda else "OFF"), "-Donnxruntime_CUDNN_HOME=" + (cudnn_home if args.use_cuda else ""), -diff --git a/onnxruntime/java/src/main/native/ai_onnxruntime_OrtSession.c b/onnxruntime/java/src/main/native/ai_onnxruntime_OrtSession.c +diff --git a/java/src/main/native/ai_onnxruntime_OrtSession.c b/java/src/main/native/ai_onnxruntime_OrtSession.c +index 79a2abc2e..a742571e9 100644 --- a/java/src/main/native/ai_onnxruntime_OrtSession.c +++ b/java/src/main/native/ai_onnxruntime_OrtSession.c -@@ -428,6 +428,6 @@ +@@ -428,5 +428,5 @@ JNIEXPORT jstring JNICALL Java_ai_onnxruntime_OrtSession_constructMetadata // Release the metadata api->ReleaseModelMetadata(metadata); - return metadataJava; + return (jstring)metadataJava; } - }