diff --git a/.github/actions/deploy-ubuntu/action.yml b/.github/actions/deploy-ubuntu/action.yml index dbc5b85093f..d51c954d50d 100644 --- a/.github/actions/deploy-ubuntu/action.yml +++ b/.github/actions/deploy-ubuntu/action.yml @@ -73,6 +73,8 @@ runs: $SUDO gem install apt-spy2 $SUDO apt-spy2 check $SUDO apt-spy2 fix --commit + $SUDO sed -i 's/azure\.//' /etc/apt/apt-mirrors.txt /etc/apt/sources.list + $SUDO cat /etc/apt/apt-mirrors.txt /etc/apt/sources.list $SUDO apt-get update fi diff --git a/CHANGELOG.md b/CHANGELOG.md index 5fe524c26c9..97e7a01ee82 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,7 @@ * Refactor and improve presets for PyTorch ([pull #1360](https://github.com/bytedeco/javacpp-presets/pull/1360)) * Include `mkl_lapack.h` header file in presets for MKL ([issue #1388](https://github.com/bytedeco/javacpp-presets/issues/1388)) * Map new higher-level C++ API of Triton Inference Server ([pull #1361](https://github.com/bytedeco/javacpp-presets/pull/1361)) - * Upgrade presets for OpenCV 4.8.0, DNNL 3.2.1, CPython 3.11.4, NumPy 1.25.1, SciPy 1.11.1, LLVM 17.0.0, TensorFlow Lite 2.14.0, Triton Inference Server 2.34.0, ONNX Runtime 1.15.1, TVM 0.13.0, and their dependencies + * Upgrade presets for OpenCV 4.8.0, DNNL 3.2.1, OpenBLAS 0.3.24, CPython 3.11.5, NumPy 1.25.2, SciPy 1.11.2, LLVM 17.0.1, TensorFlow Lite 2.14.0, Triton Inference Server 2.34.0, ONNX 1.14.1, ONNX Runtime 1.16.0, TVM 0.13.0, and their dependencies ### June 6, 2023 version 1.5.9 * Virtualize `nvinfer1::IGpuAllocator` from TensorRT to allow customization ([pull #1367](https://github.com/bytedeco/javacpp-presets/pull/1367)) diff --git a/README.md b/README.md index 1f78efca2ca..8087a856b56 100644 --- a/README.md +++ b/README.md @@ -199,7 +199,7 @@ Each child module in turn relies by default on the included [`cppbuild.sh` scrip * MKL 2023.x https://software.intel.com/mkl * MKL-DNN 0.21.x https://github.com/oneapi-src/oneDNN * DNNL 3.2.x https://github.com/oneapi-src/oneDNN - * OpenBLAS 0.3.23 http://www.openblas.net/ + * OpenBLAS 0.3.24 http://www.openblas.net/ * ARPACK-NG 3.9.0 https://github.com/opencollab/arpack-ng * CMINPACK 1.3.8 https://github.com/devernay/cminpack * FFTW 3.3.10 http://www.fftw.org/download.html diff --git a/arpack-ng/platform/pom.xml b/arpack-ng/platform/pom.xml index bdaa6abeb07..b8e9d0833d5 100644 --- a/arpack-ng/platform/pom.xml +++ b/arpack-ng/platform/pom.xml @@ -24,7 +24,7 @@ org.bytedeco openblas-platform - 0.3.23-${project.parent.version} + 0.3.24-${project.parent.version} ${project.groupId} diff --git a/arpack-ng/pom.xml b/arpack-ng/pom.xml index 4aa0f634e83..5d4dcf569b1 100644 --- a/arpack-ng/pom.xml +++ b/arpack-ng/pom.xml @@ -22,7 +22,7 @@ org.bytedeco openblas - 0.3.23-${project.parent.version} + 0.3.24-${project.parent.version} org.bytedeco @@ -45,12 +45,12 @@ org.bytedeco openblas - 0.3.23-${project.parent.version} + 0.3.24-${project.parent.version} org.bytedeco openblas - 0.3.23-${project.parent.version} + 0.3.24-${project.parent.version} ${javacpp.platform} diff --git a/cminpack/platform/pom.xml b/cminpack/platform/pom.xml index 6966667bc4d..fae0994eb93 100644 --- a/cminpack/platform/pom.xml +++ b/cminpack/platform/pom.xml @@ -23,7 +23,7 @@ org.bytedeco openblas-platform - 0.3.23-${project.parent.version} + 0.3.24-${project.parent.version} ${project.groupId} diff --git a/cminpack/pom.xml b/cminpack/pom.xml index b47b755aca7..03d7b66a594 100644 --- a/cminpack/pom.xml +++ b/cminpack/pom.xml @@ -18,7 +18,7 @@ org.bytedeco openblas - 0.3.23-${project.parent.version} + 0.3.24-${project.parent.version} org.bytedeco @@ -41,12 +41,12 @@ org.bytedeco openblas - 0.3.23-${project.parent.version} + 0.3.24-${project.parent.version} org.bytedeco openblas - 0.3.23-${project.parent.version} + 0.3.24-${project.parent.version} ${javacpp.platform} diff --git a/cpython/README.md b/cpython/README.md index 84bedbb0ffd..4566ed93962 100644 --- a/cpython/README.md +++ b/cpython/README.md @@ -14,7 +14,7 @@ Introduction ------------ This directory contains the JavaCPP Presets module for: - * CPython 3.11.4 https://www.python.org/ + * CPython 3.11.5 https://www.python.org/ Please refer to the parent README.md file for more detailed information about the JavaCPP Presets. @@ -54,7 +54,7 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic org.bytedeco cpython-platform - 3.11.4-1.5.10-SNAPSHOT + 3.11.5-1.5.10-SNAPSHOT diff --git a/cpython/cppbuild.sh b/cpython/cppbuild.sh index ac7412f1ffb..c7715a1d320 100755 --- a/cpython/cppbuild.sh +++ b/cpython/cppbuild.sh @@ -7,8 +7,8 @@ if [[ -z "$PLATFORM" ]]; then exit fi -OPENSSL=openssl-3.1.0 -CPYTHON_VERSION=3.11.4 +OPENSSL=openssl-3.1.3 +CPYTHON_VERSION=3.11.5 download https://www.openssl.org/source/$OPENSSL.tar.gz $OPENSSL.tar.gz download https://www.python.org/ftp/python/$CPYTHON_VERSION/Python-$CPYTHON_VERSION.tgz Python-$CPYTHON_VERSION.tgz diff --git a/cpython/platform/pom.xml b/cpython/platform/pom.xml index a736cea0cd5..2b79a761736 100644 --- a/cpython/platform/pom.xml +++ b/cpython/platform/pom.xml @@ -12,7 +12,7 @@ org.bytedeco cpython-platform - 3.11.4-${project.parent.version} + 3.11.5-${project.parent.version} JavaCPP Presets Platform for CPython diff --git a/cpython/pom.xml b/cpython/pom.xml index a19e7345036..db168a95d16 100644 --- a/cpython/pom.xml +++ b/cpython/pom.xml @@ -11,7 +11,7 @@ org.bytedeco cpython - 3.11.4-${project.parent.version} + 3.11.5-${project.parent.version} JavaCPP Presets for CPython diff --git a/cpython/samples/pom.xml b/cpython/samples/pom.xml index 90b2b6898c2..b83e7dc9abe 100644 --- a/cpython/samples/pom.xml +++ b/cpython/samples/pom.xml @@ -12,7 +12,7 @@ org.bytedeco cpython-platform - 3.11.4-1.5.10-SNAPSHOT + 3.11.5-1.5.10-SNAPSHOT diff --git a/cpython/src/gen/java/org/bytedeco/cpython/global/python.java b/cpython/src/gen/java/org/bytedeco/cpython/global/python.java index 198c2196a34..779cd000c83 100644 --- a/cpython/src/gen/java/org/bytedeco/cpython/global/python.java +++ b/cpython/src/gen/java/org/bytedeco/cpython/global/python.java @@ -144,12 +144,12 @@ There is also (independent) API version information in modsupport.h. /*--start constants--*/ public static final int PY_MAJOR_VERSION = 3; public static final int PY_MINOR_VERSION = 11; -public static final int PY_MICRO_VERSION = 4; +public static final int PY_MICRO_VERSION = 5; public static final int PY_RELEASE_LEVEL = PY_RELEASE_LEVEL_FINAL; public static final int PY_RELEASE_SERIAL = 0; /* Version as a string */ -public static final String PY_VERSION = "3.11.4"; +public static final String PY_VERSION = "3.11.5"; /*--end constants--*/ /* Version as a single 4-byte hex number, e.g. 0x010502B2 == 1.5.2b2. @@ -351,40 +351,40 @@ There is also (independent) API version information in modsupport.h. /* #undef HAVE_CTERMID_R */ /* Define if you have the 'filter' function. */ -public static final int HAVE_CURSES_FILTER = 1; +/* #undef HAVE_CURSES_FILTER */ /* Define to 1 if you have the header file. */ -public static final int HAVE_CURSES_H = 1; +/* #undef HAVE_CURSES_H */ /* Define if you have the 'has_key' function. */ -public static final int HAVE_CURSES_HAS_KEY = 1; +/* #undef HAVE_CURSES_HAS_KEY */ /* Define if you have the 'immedok' function. */ -public static final int HAVE_CURSES_IMMEDOK = 1; +/* #undef HAVE_CURSES_IMMEDOK */ /* Define if you have the 'is_pad' function. */ -public static final int HAVE_CURSES_IS_PAD = 1; +/* #undef HAVE_CURSES_IS_PAD */ /* Define if you have the 'is_term_resized' function. */ -public static final int HAVE_CURSES_IS_TERM_RESIZED = 1; +/* #undef HAVE_CURSES_IS_TERM_RESIZED */ /* Define if you have the 'resizeterm' function. */ -public static final int HAVE_CURSES_RESIZETERM = 1; +/* #undef HAVE_CURSES_RESIZETERM */ /* Define if you have the 'resize_term' function. */ -public static final int HAVE_CURSES_RESIZE_TERM = 1; +/* #undef HAVE_CURSES_RESIZE_TERM */ /* Define if you have the 'syncok' function. */ -public static final int HAVE_CURSES_SYNCOK = 1; +/* #undef HAVE_CURSES_SYNCOK */ /* Define if you have the 'typeahead' function. */ -public static final int HAVE_CURSES_TYPEAHEAD = 1; +/* #undef HAVE_CURSES_TYPEAHEAD */ /* Define if you have the 'use_env' function. */ -public static final int HAVE_CURSES_USE_ENV = 1; +/* #undef HAVE_CURSES_USE_ENV */ /* Define if you have the 'wchgat' function. */ -public static final int HAVE_CURSES_WCHGAT = 1; +/* #undef HAVE_CURSES_WCHGAT */ /* Define to 1 if you have the header file. */ public static final int HAVE_DB_H = 1; @@ -884,6 +884,9 @@ There is also (independent) API version information in modsupport.h. /* Define if compiling using Linux 4.1 or later. */ public static final int HAVE_LINUX_CAN_RAW_JOIN_FILTERS = 1; +/* Define to 1 if you have the header file. */ +public static final int HAVE_LINUX_LIMITS_H = 1; + /* Define to 1 if you have the header file. */ public static final int HAVE_LINUX_MEMFD_H = 1; @@ -948,7 +951,7 @@ There is also (independent) API version information in modsupport.h. public static final int HAVE_MEMFD_CREATE = 1; /* Define to 1 if you have the header file. */ -/* #undef HAVE_MEMORY_H */ +public static final int HAVE_MEMORY_H = 1; /* Define to 1 if you have the `memrchr' function. */ public static final int HAVE_MEMRCHR = 1; @@ -981,7 +984,7 @@ There is also (independent) API version information in modsupport.h. public static final int HAVE_NANOSLEEP = 1; /* Define to 1 if you have the header file. */ -public static final int HAVE_NCURSES_H = 1; +/* #undef HAVE_NCURSES_H */ /* Define to 1 if you have the header file. */ public static final int HAVE_NDBM_H = 1; @@ -1549,7 +1552,7 @@ There is also (independent) API version information in modsupport.h. public static final int HAVE_TERMIOS_H = 1; /* Define to 1 if you have the header file. */ -public static final int HAVE_TERM_H = 1; +/* #undef HAVE_TERM_H */ /* Define to 1 if you have the `timegm' function. */ public static final int HAVE_TIMEGM = 1; @@ -1685,7 +1688,7 @@ There is also (independent) API version information in modsupport.h. public static final int MAJOR_IN_SYSMACROS = 1; /* Define if mvwdelch in curses.h is an expression. */ -public static final int MVWDELCH_IS_EXPRESSION = 1; +/* #undef MVWDELCH_IS_EXPRESSION */ /* Define to the address where bug reports for this package should be sent. */ /* #undef PACKAGE_BUGREPORT */ @@ -1866,7 +1869,7 @@ There is also (independent) API version information in modsupport.h. /* Define if WINDOW in curses.h offers a field _flags. */ -public static final int WINDOW_HAS_FLAGS = 1; +/* #undef WINDOW_HAS_FLAGS */ /* Define if you want build the _decimal module using a coroutine-local rather than a thread-local context */ @@ -11406,11 +11409,13 @@ public static native int PyArg_ParseTupleAndKeywords(PyObject arg0, PyObject arg @NoException public static native PyObject Py_VaBuildValue(@Cast("const char*") BytePointer arg0, @ByVal @Cast("va_list*") Pointer arg1); @NoException public static native PyObject Py_VaBuildValue(String arg0, @ByVal @Cast("va_list*") Pointer arg1); +// #if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x030a0000 // Add an attribute with name 'name' and value 'obj' to the module 'mod. // On success, return 0 on success. // On error, raise an exception and return -1. @NoException public static native int PyModule_AddObjectRef(PyObject mod, @Cast("const char*") BytePointer name, PyObject value); @NoException public static native int PyModule_AddObjectRef(PyObject mod, String name, PyObject value); +// #endif /* Py_LIMITED_API */ // Similar to PyModule_AddObjectRef() but steal a reference to 'obj' // (Py_DECREF(obj)) on success (if it returns 0). diff --git a/gsl/platform/pom.xml b/gsl/platform/pom.xml index 17042de642f..76172d682bc 100644 --- a/gsl/platform/pom.xml +++ b/gsl/platform/pom.xml @@ -23,7 +23,7 @@ org.bytedeco openblas-platform - 0.3.23-${project.parent.version} + 0.3.24-${project.parent.version} ${project.groupId} diff --git a/gsl/pom.xml b/gsl/pom.xml index 039a8625ce4..f6b05db252c 100644 --- a/gsl/pom.xml +++ b/gsl/pom.xml @@ -18,7 +18,7 @@ org.bytedeco openblas - 0.3.23-${project.parent.version} + 0.3.24-${project.parent.version} org.bytedeco @@ -44,12 +44,12 @@ org.bytedeco openblas - 0.3.23-${project.parent.version} + 0.3.24-${project.parent.version} org.bytedeco openblas - 0.3.23-${project.parent.version} + 0.3.24-${project.parent.version} ${javacpp.platform} diff --git a/llvm/README.md b/llvm/README.md index 72b21178463..d12c7d71eb7 100644 --- a/llvm/README.md +++ b/llvm/README.md @@ -9,7 +9,7 @@ Introduction ------------ This directory contains the JavaCPP Presets module for: - * LLVM 17.0.0 http://llvm.org/ + * LLVM 17.0.1 http://llvm.org/ Please refer to the parent README.md file for more detailed information about the JavaCPP Presets. @@ -50,7 +50,7 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic org.bytedeco llvm-platform - 17.0.0-1.5.10-SNAPSHOT + 17.0.1-1.5.10-SNAPSHOT diff --git a/llvm/cppbuild.sh b/llvm/cppbuild.sh index b1abe058591..d7b636d5de1 100755 --- a/llvm/cppbuild.sh +++ b/llvm/cppbuild.sh @@ -7,16 +7,15 @@ if [[ -z "$PLATFORM" ]]; then exit fi -LLVM_VERSION=17.0.0-rc3 -LLVM_VERSION2=17.0.0rc3 -download https://github.com/llvm/llvm-project/releases/download/llvmorg-$LLVM_VERSION/llvm-project-$LLVM_VERSION2.src.tar.xz llvm-project-$LLVM_VERSION2.src.tar.xz +LLVM_VERSION=17.0.1 +download https://github.com/llvm/llvm-project/releases/download/llvmorg-$LLVM_VERSION/llvm-project-$LLVM_VERSION.src.tar.xz llvm-project-$LLVM_VERSION.src.tar.xz mkdir -p $PLATFORM cd $PLATFORM INSTALL_PATH=`pwd` echo "Decompressing archives... (ignore any symlink errors)" -tar --totals -xf ../llvm-project-$LLVM_VERSION2.src.tar.xz || true -cd llvm-project-$LLVM_VERSION2.src +tar --totals -xf ../llvm-project-$LLVM_VERSION.src.tar.xz || true +cd llvm-project-$LLVM_VERSION.src patch -Np1 < ../../../llvm.patch sedinplace '/find_package(Git/d' llvm/cmake/modules/AddLLVM.cmake llvm/cmake/modules/VersionFromVCS.cmake sedinplace '/Generating libLLVM is not supported on MSVC/d' llvm/tools/llvm-shlib/CMakeLists.txt diff --git a/llvm/platform/pom.xml b/llvm/platform/pom.xml index c382b58ecce..b702b733d53 100644 --- a/llvm/platform/pom.xml +++ b/llvm/platform/pom.xml @@ -12,7 +12,7 @@ org.bytedeco llvm-platform - 17.0.0-${project.parent.version} + 17.0.1-${project.parent.version} JavaCPP Presets Platform for LLVM diff --git a/llvm/pom.xml b/llvm/pom.xml index c82199841ad..49d8d5083a0 100644 --- a/llvm/pom.xml +++ b/llvm/pom.xml @@ -11,7 +11,7 @@ org.bytedeco llvm - 17.0.0-${project.parent.version} + 17.0.1-${project.parent.version} JavaCPP Presets for LLVM diff --git a/llvm/samples/clang/pom.xml b/llvm/samples/clang/pom.xml index dc6dc4f3130..90d1831fa22 100644 --- a/llvm/samples/clang/pom.xml +++ b/llvm/samples/clang/pom.xml @@ -12,7 +12,7 @@ org.bytedeco llvm-platform - 17.0.0-1.5.10-SNAPSHOT + 17.0.1-1.5.10-SNAPSHOT diff --git a/llvm/samples/llvm/pom.xml b/llvm/samples/llvm/pom.xml index ac9d45bc243..3bb0c3fe694 100644 --- a/llvm/samples/llvm/pom.xml +++ b/llvm/samples/llvm/pom.xml @@ -12,7 +12,7 @@ org.bytedeco llvm-platform - 17.0.0-1.5.10-SNAPSHOT + 17.0.1-1.5.10-SNAPSHOT org.bytedeco diff --git a/llvm/samples/polly/pom.xml b/llvm/samples/polly/pom.xml index 4f83fb9401c..baad1fccb29 100644 --- a/llvm/samples/polly/pom.xml +++ b/llvm/samples/polly/pom.xml @@ -13,7 +13,7 @@ org.bytedeco llvm-platform - 17.0.0-1.5.10-SNAPSHOT + 17.0.1-1.5.10-SNAPSHOT org.bytedeco diff --git a/llvm/src/main/java/org/bytedeco/llvm/presets/LLVM.java b/llvm/src/main/java/org/bytedeco/llvm/presets/LLVM.java index 190e7dccf30..429146f8e9d 100644 --- a/llvm/src/main/java/org/bytedeco/llvm/presets/LLVM.java +++ b/llvm/src/main/java/org/bytedeco/llvm/presets/LLVM.java @@ -38,7 +38,7 @@ "", "", /*"", "", "", "", "", "", "", "",*/ "", "", "", "", ""}, - compiler = "cpp17", link = {"LLVM-17rc", "LTO@.17rc", "Remarks@.17rc"}, resource = {"include", "lib", "libexec", "share"}), + compiler = "cpp17", link = {"LLVM-17", "LTO@.17", "Remarks@.17"}, resource = {"include", "lib", "libexec", "share"}), @Platform(value = "macosx", link = {"LLVM", "LTO", "Remarks"}), @Platform(value = "windows", link = {"LLVM", "LTO", "Remarks"})}) @NoException diff --git a/llvm/src/main/java/org/bytedeco/llvm/presets/clang.java b/llvm/src/main/java/org/bytedeco/llvm/presets/clang.java index c647faec20b..ac670f3ad81 100644 --- a/llvm/src/main/java/org/bytedeco/llvm/presets/clang.java +++ b/llvm/src/main/java/org/bytedeco/llvm/presets/clang.java @@ -30,7 +30,7 @@ include = {"", "", "", "", "", "", "", "", "", ""}, - compiler = "cpp17", link = "clang@.17rc"), @Platform(value = "windows", link = "libclang") }) + compiler = "cpp17", link = "clang@.17"), @Platform(value = "windows", link = "libclang") }) @NoException public class clang implements InfoMapper { public void map(InfoMap infoMap) { diff --git a/llvm/src/main/java/org/bytedeco/llvm/program/clang.java b/llvm/src/main/java/org/bytedeco/llvm/program/clang.java index 443986d2342..546c32e4d7a 100644 --- a/llvm/src/main/java/org/bytedeco/llvm/program/clang.java +++ b/llvm/src/main/java/org/bytedeco/llvm/program/clang.java @@ -41,7 +41,7 @@ value = { @Platform( value = {"linux", "macosx", "windows"}, - preload = {"LLVM-15", "clang-cpp@.15"}, + preload = {"LLVM-17", "clang-cpp@.17"}, executable = { "clang", "clang-check", diff --git a/numpy/README.md b/numpy/README.md index fcf07a6ed4c..3c8dbce0ed4 100644 --- a/numpy/README.md +++ b/numpy/README.md @@ -9,7 +9,7 @@ Introduction ------------ This directory contains the JavaCPP Presets module for: - * NumPy 1.25.1 http://www.numpy.org/ + * NumPy 1.25.2 http://www.numpy.org/ Please refer to the parent README.md file for more detailed information about the JavaCPP Presets. @@ -48,7 +48,7 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic org.bytedeco numpy-platform - 1.25.1-1.5.10-SNAPSHOT + 1.25.2-1.5.10-SNAPSHOT diff --git a/numpy/cppbuild.sh b/numpy/cppbuild.sh index 4ad0df68e97..dd072958d1a 100755 --- a/numpy/cppbuild.sh +++ b/numpy/cppbuild.sh @@ -7,7 +7,7 @@ if [[ -z "$PLATFORM" ]]; then exit fi -NUMPY_VERSION=1.25.1 +NUMPY_VERSION=1.25.2 download https://github.com/numpy/numpy/releases/download/v$NUMPY_VERSION/numpy-$NUMPY_VERSION.tar.gz numpy-$NUMPY_VERSION.tar.gz mkdir -p $PLATFORM diff --git a/numpy/platform/pom.xml b/numpy/platform/pom.xml index d8550483508..09ad4812e28 100644 --- a/numpy/platform/pom.xml +++ b/numpy/platform/pom.xml @@ -12,7 +12,7 @@ org.bytedeco numpy-platform - 1.25.1-${project.parent.version} + 1.25.2-${project.parent.version} JavaCPP Presets Platform for NumPy @@ -23,12 +23,12 @@ org.bytedeco openblas-platform - 0.3.23-${project.parent.version} + 0.3.24-${project.parent.version} org.bytedeco cpython-platform - 3.11.4-${project.parent.version} + 3.11.5-${project.parent.version} ${project.groupId} diff --git a/numpy/pom.xml b/numpy/pom.xml index 4e3ecab17c4..15f0cb6a67b 100644 --- a/numpy/pom.xml +++ b/numpy/pom.xml @@ -11,19 +11,19 @@ org.bytedeco numpy - 1.25.1-${project.parent.version} + 1.25.2-${project.parent.version} JavaCPP Presets for NumPy org.bytedeco openblas - 0.3.23-${project.parent.version} + 0.3.24-${project.parent.version} org.bytedeco cpython - 3.11.4-${project.parent.version} + 3.11.5-${project.parent.version} org.bytedeco @@ -46,23 +46,23 @@ org.bytedeco openblas - 0.3.23-${project.parent.version} + 0.3.24-${project.parent.version} org.bytedeco cpython - 3.11.4-${project.parent.version} + 3.11.5-${project.parent.version} org.bytedeco openblas - 0.3.23-${project.parent.version} + 0.3.24-${project.parent.version} ${javacpp.platform} org.bytedeco cpython - 3.11.4-${project.parent.version} + 3.11.5-${project.parent.version} ${javacpp.platform} @@ -171,7 +171,7 @@ org.bytedeco cpython - 3.11.4-${project.parent.version} + 3.11.5-${project.parent.version} ${os.name}-${os.arch} diff --git a/numpy/samples/pom.xml b/numpy/samples/pom.xml index 6856f0cd471..2353249336d 100644 --- a/numpy/samples/pom.xml +++ b/numpy/samples/pom.xml @@ -12,7 +12,7 @@ org.bytedeco numpy-platform - 1.25.1-1.5.10-SNAPSHOT + 1.25.2-1.5.10-SNAPSHOT diff --git a/onnx/README.md b/onnx/README.md index 272382ad01e..17be1722816 100644 --- a/onnx/README.md +++ b/onnx/README.md @@ -9,7 +9,7 @@ Introduction ------------ This directory contains the JavaCPP Presets module for: - * ONNX 1.14.0 https://onnx.ai/ + * ONNX 1.14.1 https://onnx.ai/ Please refer to the parent README.md file for more detailed information about the JavaCPP Presets. @@ -47,7 +47,7 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic org.bytedeco onnx-platform - 1.14.0-1.5.10-SNAPSHOT + 1.14.1-1.5.10-SNAPSHOT diff --git a/onnx/cppbuild.sh b/onnx/cppbuild.sh index 3198ee2117f..5947b627c40 100755 --- a/onnx/cppbuild.sh +++ b/onnx/cppbuild.sh @@ -12,7 +12,7 @@ export ONNX_ML=1 export CMAKE_BUILD_DIR=.setuptools-cmake-build/ export MAX_JOBS=$MAKEJ -export ONNX=1.14.0 +export ONNX=1.14.1 export PROTO=3.17.3 export PYBIND=2.10.1 diff --git a/onnx/platform/pom.xml b/onnx/platform/pom.xml index 05ec794e3dc..79cf3dd279c 100644 --- a/onnx/platform/pom.xml +++ b/onnx/platform/pom.xml @@ -12,7 +12,7 @@ org.bytedeco onnx-platform - 1.14.0-${project.parent.version} + 1.14.1-${project.parent.version} JavaCPP Presets Platform for ONNX @@ -28,7 +28,7 @@ org.bytedeco cpython-platform - 3.11.4-${project.parent.version} + 3.11.5-${project.parent.version} true diff --git a/onnx/pom.xml b/onnx/pom.xml index a287dddf82b..4875e9bfd99 100644 --- a/onnx/pom.xml +++ b/onnx/pom.xml @@ -11,7 +11,7 @@ org.bytedeco onnx - 1.14.0-${project.parent.version} + 1.14.1-${project.parent.version} JavaCPP Presets for ONNX @@ -22,7 +22,7 @@ org.bytedeco cpython - 3.11.4-${project.parent.version} + 3.11.5-${project.parent.version} true @@ -42,7 +42,7 @@ org.bytedeco cpython-platform - 3.11.4-${project.parent.version} + 3.11.5-${project.parent.version} diff --git a/onnx/samples/pom.xml b/onnx/samples/pom.xml index dd870168a8e..3884364ed34 100644 --- a/onnx/samples/pom.xml +++ b/onnx/samples/pom.xml @@ -12,7 +12,7 @@ org.bytedeco onnx-platform - 1.14.0-1.5.10-SNAPSHOT + 1.14.1-1.5.10-SNAPSHOT diff --git a/onnxruntime/README.md b/onnxruntime/README.md index ecb76741852..0a7385a983a 100644 --- a/onnxruntime/README.md +++ b/onnxruntime/README.md @@ -9,7 +9,7 @@ Introduction ------------ This directory contains the JavaCPP Presets module for: - * ONNX Runtime 1.15.1 https://microsoft.github.io/onnxruntime/ + * ONNX Runtime 1.16.0 https://microsoft.github.io/onnxruntime/ Please refer to the parent README.md file for more detailed information about the JavaCPP Presets. @@ -46,14 +46,14 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic org.bytedeco onnxruntime-platform - 1.15.1-1.5.10-SNAPSHOT + 1.16.0-1.5.10-SNAPSHOT org.bytedeco onnxruntime-platform-gpu - 1.15.1-1.5.10-SNAPSHOT + 1.16.0-1.5.10-SNAPSHOT diff --git a/onnxruntime/cppbuild.sh b/onnxruntime/cppbuild.sh index 94378bb34ea..7324ba9bc55 100755 --- a/onnxruntime/cppbuild.sh +++ b/onnxruntime/cppbuild.sh @@ -21,7 +21,7 @@ if [[ "$EXTENSION" == *gpu ]]; then GPU_FLAGS="--use_cuda" fi -ONNXRUNTIME=1.15.1 +ONNXRUNTIME=1.16.0 mkdir -p "$PLATFORM$EXTENSION" cd "$PLATFORM$EXTENSION" @@ -152,6 +152,11 @@ sedinplace 's/outputValues = allocarray/outputValues = (OrtValue**)allocarray/g' sedinplace 's/(\*jniEnv)->GetMethodID(/jniEnv->GetMethodID(/g' java/src/main/native/ai_onnxruntime_OrtSession.cpp sedinplace 's/jniEnv, metadataClazz/metadataClazz/g' java/src/main/native/ai_onnxruntime_OrtSession.cpp sedinplace 's/return metadataJava/return (jstring)metadataJava/g' java/src/main/native/ai_onnxruntime_OrtSession.cpp +sedinplace 's/return NULL/return/g' java/src/main/native/ai_onnxruntime_OrtSession_SessionOptions.cpp +sedinplace 's/names = allocarray/names = (const char**)allocarray/g' java/src/main/native/ai_onnxruntime_OrtSession_SessionOptions.cpp +sedinplace 's/Strings = allocarray/Strings = (jobject*)allocarray/g' java/src/main/native/ai_onnxruntime_OrtSession_SessionOptions.cpp +sedinplace 's/UTFChars(javaNameStrings/UTFChars((jstring)javaNameStrings/g' java/src/main/native/ai_onnxruntime_OrtSession_SessionOptions.cpp +sedinplace 's/initializers = allocarray/initializers = (const OrtValue**)allocarray/g' java/src/main/native/ai_onnxruntime_OrtSession_SessionOptions.cpp which ctest3 &> /dev/null && CTEST="ctest3" || CTEST="ctest" "$PYTHON_BIN_PATH" tools/ci_build/build.py --build_dir ../build --config Release --cmake_path "$CMAKE" --ctest_path "$CTEST" --build_shared_lib $ARCH_FLAGS $DNNL_FLAGS $OPENMP_FLAGS $GPU_FLAGS @@ -162,7 +167,7 @@ cp -r orttraining/orttraining/models/runner/training_runner.h ../include cp -r orttraining/orttraining/models/runner/training_util.h ../include #sedinplace '/#include "core\/framework\/provider_options.h"/,/};/d' ../include/onnxruntime/core/providers/cuda/cuda_provider_factory.h sedinplace '/struct ProviderInfo_OpenVINO {/,/};/d' ../include/onnxruntime/core/providers/openvino/openvino_provider_factory.h -cp -r java/src/main/java/* ../java +cp -r java/src/main/jvm/* java/src/main/java/* ../java cp -a ../build/Release/lib* ../build/Release/Release/lib* ../lib || true cp ../build/Release/onnxruntime*.dll ../build/Release/Release/onnxruntime*.dll ../bin || true cp ../build/Release/onnxruntime*.lib ../build/Release/Release/onnxruntime*.lib ../lib || true diff --git a/onnxruntime/onnxruntime.patch b/onnxruntime/onnxruntime.patch index 37f0664b9d1..6b680a348be 100644 --- a/onnxruntime/onnxruntime.patch +++ b/onnxruntime/onnxruntime.patch @@ -1,5 +1,5 @@ diff --git a/cmake/adjust_global_compile_flags.cmake b/cmake/adjust_global_compile_flags.cmake -index d4421a6211..219ac9daba 100644 +index 68522a7dda..69432fa783 100644 --- a/cmake/adjust_global_compile_flags.cmake +++ b/cmake/adjust_global_compile_flags.cmake @@ -11,8 +11,8 @@ endif() @@ -12,12 +12,12 @@ index d4421a6211..219ac9daba 100644 + string(APPEND CMAKE_C_FLAGS " -Wextra -I/usr/local/include") endif() - if (onnxruntime_BUILD_WEBASSEMBLY) + if (CMAKE_SYSTEM_NAME STREQUAL "Emscripten") diff --git a/cmake/onnxruntime.cmake b/cmake/onnxruntime.cmake -index 02861458c9..b2a24008a7 100644 +index 59ebf8eca4..2a326e4057 100644 --- a/cmake/onnxruntime.cmake +++ b/cmake/onnxruntime.cmake -@@ -115,9 +115,9 @@ target_compile_definitions(onnxruntime PRIVATE FILE_NAME=\"onnxruntime.dll\") +@@ -131,9 +131,9 @@ target_compile_definitions(onnxruntime PRIVATE FILE_NAME=\"onnxruntime.dll\") if(UNIX) if (APPLE) @@ -30,10 +30,10 @@ index 02861458c9..b2a24008a7 100644 else() set(ONNXRUNTIME_SO_LINK_FLAG " -DEF:${SYMBOL_FILE}") diff --git a/onnxruntime/core/session/provider_bridge_ort.cc b/onnxruntime/core/session/provider_bridge_ort.cc -index 9a4fe6900c..edd12a248b 100644 +index 8f0a5aeaa3..c684682e7d 100644 --- a/onnxruntime/core/session/provider_bridge_ort.cc +++ b/onnxruntime/core/session/provider_bridge_ort.cc -@@ -1070,13 +1070,33 @@ struct ProviderHostImpl : ProviderHost { +@@ -1132,13 +1132,33 @@ struct ProviderHostImpl : ProviderHost { #if defined(_MSC_VER) && !defined(__clang__) #pragma warning(pop) #endif @@ -67,7 +67,7 @@ index 9a4fe6900c..edd12a248b 100644 ORT_THROW_IF_ERROR(Env::Default().LoadDynamicLibrary(full_path, true /*shared_globals on unix*/, &handle_)); void (*PProvider_SetHost)(void*); -@@ -1095,7 +1115,7 @@ struct ProviderSharedLibrary { +@@ -1157,7 +1177,7 @@ struct ProviderSharedLibrary { } } @@ -76,7 +76,7 @@ index 9a4fe6900c..edd12a248b 100644 ~ProviderSharedLibrary() { // assert(!handle_); // We should already be unloaded at this point (disabled until Python shuts down deterministically) } -@@ -1128,6 +1148,18 @@ struct ProviderLibrary { +@@ -1190,6 +1210,18 @@ struct ProviderLibrary { s_library_shared.Ensure(); auto full_path = Env::Default().GetRuntimePath() + filename_; @@ -96,10 +96,10 @@ index 9a4fe6900c..edd12a248b 100644 Provider* (*PGetProvider)(); diff --git a/onnxruntime/core/providers/shared_library/provider_bridge_provider.cc b/onnxruntime/core/providers/shared_library/provider_bridge_provider.cc -index 2e4d5b6bfa..b12b848e93 100644 +index d6546ccdd9..70914d6758 100644 --- a/onnxruntime/core/providers/shared_library/provider_bridge_provider.cc +++ b/onnxruntime/core/providers/shared_library/provider_bridge_provider.cc -@@ -109,18 +109,21 @@ struct OnUnload { +@@ -113,10 +113,11 @@ struct OnUnload { } g_on_unload; @@ -113,17 +113,7 @@ index 2e4d5b6bfa..b12b848e93 100644 return g_host->CreateAllocator(info); } - void AllocatorManager::InsertAllocator(AllocatorPtr allocator) { -+ g_host = Provider_GetHost(); - return g_host->AllocatorManager__InsertAllocator(this, allocator); - } - - AllocatorPtr AllocatorManager::GetAllocator(OrtMemType mem_type, OrtDevice device) const { -+ g_host = Provider_GetHost(); - return g_host->AllocatorManager__GetAllocator(this, mem_type, device); - } - -@@ -220,19 +223,22 @@ MLDataType DataTypeImpl::GetSparseTensorType() { return Provider_GetH +@@ -251,19 +252,22 @@ MLDataType DataTypeImpl::GetSparseTensorType() { return Provider #endif Status IDataTransfer::CopyTensor(const Tensor& src, Tensor& dst) const { @@ -147,7 +137,7 @@ index 2e4d5b6bfa..b12b848e93 100644 TensorShape::TensorShape(gsl::span dims) { Allocate(dims.size()); -@@ -240,16 +246,19 @@ TensorShape::TensorShape(gsl::span dims) { +@@ -271,16 +275,19 @@ TensorShape::TensorShape(gsl::span dims) { } TensorShape& TensorShape::operator=(const TensorShape& other) { @@ -167,7 +157,7 @@ index 2e4d5b6bfa..b12b848e93 100644 g_host->TensorShape__Allocate(this, size); } -@@ -260,6 +269,7 @@ int64_t TensorShape::Size() const { +@@ -291,6 +298,7 @@ int64_t TensorShape::Size() const { } int64_t TensorShape::SizeHelper(size_t start, size_t end) const { @@ -175,7 +165,7 @@ index 2e4d5b6bfa..b12b848e93 100644 return g_host->TensorShape__SizeHelper(this, start, end); } -@@ -269,6 +279,7 @@ TensorShape TensorShape::Slice(size_t dimstart, size_t dimend) const { +@@ -300,74 +308,89 @@ TensorShape TensorShape::Slice(size_t dimstart, size_t dimend) const { } std::string TensorShape::ToString() const { @@ -183,8 +173,13 @@ index 2e4d5b6bfa..b12b848e93 100644 return g_host->TensorShape__ToString(this); } -@@ -278,77 +289,94 @@ int64_t TensorShape::SizeFromDimension(size_t dimension) const { return g_host-> - std::ostream& operator<<(std::ostream& out, const TensorShape& shape) { return g_host->operator_left_shift(out, shape); } +-int64_t TensorShape::SizeToDimension(size_t dimension) const { return g_host->TensorShape__SizeToDimension(this, dimension); } +-int64_t TensorShape::SizeFromDimension(size_t dimension) const { return g_host->TensorShape__SizeFromDimension(this, dimension); } ++int64_t TensorShape::SizeToDimension(size_t dimension) const { g_host = Provider_GetHost(); return g_host->TensorShape__SizeToDimension(this, dimension); } ++int64_t TensorShape::SizeFromDimension(size_t dimension) const { g_host = Provider_GetHost(); return g_host->TensorShape__SizeFromDimension(this, dimension); } + +-std::ostream& operator<<(std::ostream& out, const TensorShape& shape) { return g_host->operator_left_shift(out, shape); } ++std::ostream& operator<<(std::ostream& out, const TensorShape& shape) { g_host = Provider_GetHost(); return g_host->operator_left_shift(out, shape); } AllocatorPtr CreateAllocator(AllocatorCreationInfo info) { + g_host = Provider_GetHost(); @@ -201,16 +196,6 @@ index 2e4d5b6bfa..b12b848e93 100644 return g_host->IAllocator__CalcMemSizeForArrayWithAlignment(nmemb, size, alignment, out); } - AllocatorPtr IExecutionProvider::GetAllocator(OrtMemType mem_type) const { -+ g_host = Provider_GetHost(); - return g_host->IExecutionProvider__GetAllocator(this, mem_type); - } - - void IExecutionProvider::InsertAllocator(AllocatorPtr allocator) { -+ g_host = Provider_GetHost(); - g_host->IExecutionProvider__InsertAllocator(this, allocator); - } - std::vector> IExecutionProvider::GetCapability(const onnxruntime::GraphViewer& graph_viewer, const IKernelLookup& kernel_lookup) const { + g_host = Provider_GetHost(); @@ -227,20 +212,15 @@ index 2e4d5b6bfa..b12b848e93 100644 return g_host->IExecutionProvider__GenerateMetaDefId(this, graph_viewer, model_hash); } - void IExecutionProvider::RegisterAllocator(AllocatorManager& allocator_manager) { -+ g_host = Provider_GetHost(); - return g_host->IExecutionProvider__RegisterAllocator(this, allocator_manager); - } - #ifdef USE_TENSORRT std::unique_ptr CreateCUDAAllocator(int16_t device_id, const char* name) { + g_host = Provider_GetHost(); return g_host->CreateCUDAAllocator(device_id, name); } - std::unique_ptr CreateCUDAPinnedAllocator(int16_t device_id, const char* name) { + std::unique_ptr CreateCUDAPinnedAllocator(const char* name) { + g_host = Provider_GetHost(); - return g_host->CreateCUDAPinnedAllocator(device_id, name); + return g_host->CreateCUDAPinnedAllocator(name); } std::unique_ptr CreateGPUDataTransfer() { @@ -255,9 +235,9 @@ index 2e4d5b6bfa..b12b848e93 100644 return g_host->CreateROCMAllocator(device_id, name); } - std::unique_ptr CreateROCMPinnedAllocator(int16_t device_id, const char* name) { + std::unique_ptr CreateROCMPinnedAllocator(const char* name) { + g_host = Provider_GetHost(); - return g_host->CreateROCMPinnedAllocator(device_id, name); + return g_host->CreateROCMPinnedAllocator(name); } std::unique_ptr CreateGPUDataTransfer() { @@ -278,7 +258,7 @@ index 2e4d5b6bfa..b12b848e93 100644 return g_host->GetCpuPreferredNodes(graph, kernel_lookup, tentative_nodes); } -@@ -449,10 +477,12 @@ std::vector GetStackTrace() { return g_host->GetStackTrace(); } +@@ -464,10 +487,12 @@ std::vector GetStackTrace() { return g_host->GetStackTrace(); } void LogRuntimeError(uint32_t session_id, const common::Status& status, const char* file, const char* function, uint32_t line) { @@ -292,10 +272,10 @@ index 2e4d5b6bfa..b12b848e93 100644 } diff --git a/tools/ci_build/build.py b/tools/ci_build/build.py -index 1065f7397e..9b756c57e9 100644 +index 4c3e8b76e8..24b8b715d7 100644 --- a/tools/ci_build/build.py +++ b/tools/ci_build/build.py -@@ -887,6 +887,9 @@ def generate_build_tree( +@@ -946,6 +946,9 @@ def generate_build_tree( cmake_args += [ "-Donnxruntime_RUN_ONNX_TESTS=" + ("ON" if args.enable_onnx_tests else "OFF"), "-Donnxruntime_GENERATE_TEST_REPORTS=ON", @@ -305,7 +285,7 @@ index 1065f7397e..9b756c57e9 100644 # There are two ways of locating python C API header file. "find_package(PythonLibs 3.5 REQUIRED)" # and "find_package(Python 3.5 COMPONENTS Development.Module)". The first one is deprecated and it # depends on the "PYTHON_EXECUTABLE" variable. The second needs "Python_EXECUTABLE". Here we set both -@@ -2440,6 +2443,9 @@ def main(): +@@ -2525,6 +2528,9 @@ def main(): log.info("Activating emsdk...") run_subprocess([emsdk_file, "activate", emsdk_version], cwd=emsdk_dir) @@ -314,4 +294,4 @@ index 1065f7397e..9b756c57e9 100644 + if is_ubuntu_1604(): if args.arm or args.arm64: - raise BuildError( + raise BuildError("Only Windows ARM(64) cross-compiled builds supported currently through this script") diff --git a/onnxruntime/platform/gpu/pom.xml b/onnxruntime/platform/gpu/pom.xml index 16850ad2cc3..81d46b9f494 100644 --- a/onnxruntime/platform/gpu/pom.xml +++ b/onnxruntime/platform/gpu/pom.xml @@ -12,7 +12,7 @@ org.bytedeco onnxruntime-platform-gpu - 1.15.1-${project.parent.version} + 1.16.0-${project.parent.version} JavaCPP Presets Platform GPU for ONNX Runtime diff --git a/onnxruntime/platform/pom.xml b/onnxruntime/platform/pom.xml index a1ad015f569..bd465efff6c 100644 --- a/onnxruntime/platform/pom.xml +++ b/onnxruntime/platform/pom.xml @@ -12,7 +12,7 @@ org.bytedeco onnxruntime-platform - 1.15.1-${project.parent.version} + 1.16.0-${project.parent.version} JavaCPP Presets Platform for ONNX Runtime diff --git a/onnxruntime/pom.xml b/onnxruntime/pom.xml index 31c749a2f15..fca0c6fe9b5 100644 --- a/onnxruntime/pom.xml +++ b/onnxruntime/pom.xml @@ -11,7 +11,7 @@ org.bytedeco onnxruntime - 1.15.1-${project.parent.version} + 1.16.0-${project.parent.version} JavaCPP Presets for ONNX Runtime diff --git a/onnxruntime/samples/pom.xml b/onnxruntime/samples/pom.xml index 1a705c360fd..f9a8c43ff4a 100644 --- a/onnxruntime/samples/pom.xml +++ b/onnxruntime/samples/pom.xml @@ -12,14 +12,14 @@ org.bytedeco onnxruntime-platform - 1.15.1-1.5.10-SNAPSHOT + 1.16.0-1.5.10-SNAPSHOT org.bytedeco onnxruntime-platform-gpu - 1.15.1-1.5.10-SNAPSHOT + 1.16.0-1.5.10-SNAPSHOT diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/AllocatedFree.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/AllocatedFree.java index eed1789c251..c0ee8b96b89 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/AllocatedFree.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/AllocatedFree.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/Allocator.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/Allocator.java index 7a8a5a9db70..770d00e1927 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/Allocator.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/Allocator.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/AllocatorImpl.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/AllocatorImpl.java index 5a68b07e8db..ba59fac5ef3 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/AllocatorImpl.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/AllocatorImpl.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/AllocatorWithDefaultOptions.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/AllocatorWithDefaultOptions.java index b9990fd60ac..ac0b99d3090 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/AllocatorWithDefaultOptionsImpl.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/AllocatorWithDefaultOptionsImpl.java index f44ad85e6fc..84b70a9a8ff 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/AllocatorWithDefaultOptionsImpl.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/AllocatorWithDefaultOptionsImpl.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/ArenaCfg.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/ArenaCfg.java index 5395542c73e..db7f1d0c94c 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/ArenaCfg.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/ArenaCfg.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/BFloat16_t.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/BFloat16_t.java index 792e42fd805..718979045b5 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/BFloat16_t.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/BFloat16_t.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; @@ -16,34 +16,125 @@ /** \brief bfloat16 (Brain Floating Point) data type - * \details It is necessary for type dispatching to make use of C++ API - * The type is implicitly convertible to/from uint16_t. + * + * \details This struct is used for converting float to bfloat16 and back + * so the user could feed inputs and fetch outputs using these type. + * * The size of the structure should align with uint16_t and one can freely cast * uint16_t buffers to/from Ort::BFloat16_t to feed and retrieve data. * - * See also code examples for Float16_t above. + *
{@code {.unparsed}
+ * // This example demonstrates converion from float to float16
+ * constexpr float values[] = {1.f, 2.f, 3.f, 4.f, 5.f};
+ * std::vector bfp16_values;
+ * bfp16_values.reserve(std::size(values));
+ * std::transform(std::begin(values), std::end(values), std::back_inserter(bfp16_values),
+ *     [](float value) { return Ort::BFloat16_t(value); });
+ *
+ * }
*/ -@Namespace("Ort") @NoOffset @Properties(inherit = org.bytedeco.onnxruntime.presets.onnxruntime.class) +@Namespace("Ort") @Properties(inherit = org.bytedeco.onnxruntime.presets.onnxruntime.class) public class BFloat16_t extends Pointer { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public BFloat16_t(Pointer p) { super(p); } - /** Native array allocator. Access with {@link Pointer#position(long)}. */ - public BFloat16_t(long size) { super((Pointer)null); allocateArray(size); } - private native void allocateArray(long size); - @Override public BFloat16_t position(long position) { - return (BFloat16_t)super.position(position); - } - @Override public BFloat16_t getPointer(long i) { - return new BFloat16_t((Pointer)this).offsetAddress(i); - } - - public native @Cast("uint16_t") short value(); public native BFloat16_t value(short setter); + + public BFloat16_t() { super((Pointer)null); allocate(); } - @NoException(true) private native void allocate(); - public BFloat16_t(@Cast("uint16_t") short v) { super((Pointer)null); allocate(v); } - @NoException(true) private native void allocate(@Cast("uint16_t") short v); - public native @Cast("uint16_t") @Name("operator uint16_t") @NoException(true) short asShort(); - public native @Cast("const bool") @Name("operator ==") @NoException(true) boolean equals(@Const @ByRef BFloat16_t rhs); - public native @Cast("const bool") @Name("operator !=") @NoException(true) boolean notEquals(@Const @ByRef BFloat16_t rhs); + private native void allocate(); + + /** + * Explicit conversion to uint16_t representation of bfloat16. + * + * uint16_t bit representation of bfloat16 + * new instance of BFloat16_t */ + public static native @Const @ByVal @NoException(true) BFloat16_t FromBits(@Cast("uint16_t") short v); + + /** + * __ctor from float. Float is converted into bfloat16 16-bit representation. + * + * float value */ + public BFloat16_t(float v) { super((Pointer)null); allocate(v); } + @NoException(true) private native void allocate(float v); + + /** + * Converts bfloat16 to float + * + * float representation of bfloat16 value */ + public native @NoException(true) float ToFloat(); + + /** + * Checks if the value is negative + * + * true if negative */ + + /** + * Tests if the value is NaN + * + * true if NaN */ + + /** + * Tests if the value is finite + * + * true if finite */ + + /** + * Tests if the value represents positive infinity. + * + * true if positive infinity */ + + /** + * Tests if the value represents negative infinity + * + * true if negative infinity */ + + /** + * Tests if the value is either positive or negative infinity. + * + * True if absolute value is infinity */ + + /** + * Tests if the value is NaN or zero. Useful for comparisons. + * + * True if NaN or zero. */ + + /** + * Tests if the value is normal (not zero, subnormal, infinite, or NaN). + * + * True if so */ + + /** + * Tests if the value is subnormal (denormal). + * + * True if so */ + + /** + * Creates an instance that represents absolute value. + * + * Absolute value */ + + /** + * Creates a new instance with the sign flipped. + * + * Flipped sign instance */ + + /** + * IEEE defines that positive and negative zero are equal, this gives us a quick equality check + * for two values by or'ing the private bits together and stripping the sign. They are both zero, + * and therefore equivalent, if the resulting value is still zero. + * + * first value + * second value + * True if both arguments represent zero */ + + /** + * User defined conversion operator. Converts BFloat16_t to float. + * */ + public native @Name("operator float") @NoException(true) float asFloat(); + + // We do not have an inherited impl for the below operators + // as the internal class implements them a little differently + public native @Cast("bool") @Name("operator ==") @NoException(true) boolean equals(@Const @ByRef BFloat16_t rhs); + public native @Cast("bool") @Name("operator !=") @NoException(true) boolean notEquals(@Const @ByRef BFloat16_t rhs); + public native @Cast("bool") @Name("operator <") @NoException(true) boolean lessThan(@Const @ByRef BFloat16_t rhs); } diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/BaseAllocator.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/BaseAllocator.java index b6caaf7f399..c832d176217 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/BaseAllocator.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/BaseAllocator.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/BaseAllocatorWithDefaultOptions.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/BaseAllocatorWithDefaultOptions.java index 9367269c172..8a0e59fbc01 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/BaseAllocatorWithDefaultOptions.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/BaseAllocatorWithDefaultOptions.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/BaseArenaCfg.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/BaseArenaCfg.java index cff9720dbcb..1eaaf07fec4 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/BaseArenaCfg.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/BaseArenaCfg.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/BaseConstIoBinding.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/BaseConstIoBinding.java index bd83103f8c2..1dada6ee976 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/BaseConstIoBinding.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/BaseConstIoBinding.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/BaseConstMapTypeInfo.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/BaseConstMapTypeInfo.java index a10e7a18880..675fe769021 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/BaseConstMapTypeInfo.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/BaseConstMapTypeInfo.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/BaseConstSession.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/BaseConstSession.java index fddbfed3034..8e4ae522fe2 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/BaseConstSession.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/BaseConstSession.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/BaseConstSessionOptions.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/BaseConstSessionOptions.java index 08be19e33f8..9c2b90c040a 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/BaseConstSessionOptions.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/BaseConstSessionOptions.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/BaseConstTensorTypeAndShapeInfo.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/BaseConstTensorTypeAndShapeInfo.java index 7dcf30e2cca..2643bd97465 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/BaseConstTensorTypeAndShapeInfo.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/BaseConstTensorTypeAndShapeInfo.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/BaseConstValue.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/BaseConstValue.java index f50f6ad3c77..f7b4e844f3d 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/BaseConstValue.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/BaseConstValue.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-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 09edb839e3c..164ec1a6af8 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-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 985af51f6ed..48539eda3e0 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/BaseIoBinding.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/BaseIoBinding.java index 46d8ca17230..865f80d9267 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/BaseIoBinding.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/BaseIoBinding.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/BaseKernelInfo.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/BaseKernelInfo.java index 4564758d8d8..d76adcbc238 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/BaseKernelInfo.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/BaseKernelInfo.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/BaseMapTypeInfo.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/BaseMapTypeInfo.java index 9a19eaf5569..ce049c72cfb 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/BaseMapTypeInfo.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/BaseMapTypeInfo.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-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 a9407f1428d..2782ac4be5e 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-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 87e277c9112..83e3340e67d 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/BaseOpAttr.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/BaseOpAttr.java index 9913dde74ef..67597ac734f 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/BaseOpAttr.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/BaseOpAttr.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/BaseOrtOp.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/BaseOrtOp.java index 3feca7e3d07..fda6d79046c 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/BaseOrtOp.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/BaseOrtOp.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-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 3594e6ca43c..b619cf75980 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/BaseSequenceTypeInfo.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/BaseSequenceTypeInfo.java index 76c4b69ef82..088172e0609 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/BaseSequenceTypeInfo.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/BaseSequenceTypeInfo.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/BaseSequenceTypeInfoImpl.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/BaseSequenceTypeInfoImpl.java index 30a9fbfec70..08565664eb8 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/BaseSequenceTypeInfoImpl.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/BaseSequenceTypeInfoImpl.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-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 7c38fbf2ace..618f3702f2f 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-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 5b5b54eaea3..2aab19d67b8 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/BaseStatus.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/BaseStatus.java index 54b854982b3..fccaeeac4c7 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/BaseStatus.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/BaseStatus.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-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 098e65103e9..dfda211bb9f 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/BaseThreadingOptions.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/BaseThreadingOptions.java index 0d49757d693..e938d204302 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/BaseThreadingOptions.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/BaseThreadingOptions.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-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 c983b4629ae..bd9c25b7def 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-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 fea2fa58fe9..c232d633ef4 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/ConstIoBinding.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/ConstIoBinding.java index bffd431876d..cf0a3436128 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/ConstIoBinding.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/ConstIoBinding.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/ConstIoBindingImpl.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/ConstIoBindingImpl.java index 7c92712fbd7..c350f8164f9 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/ConstIoBindingImpl.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/ConstIoBindingImpl.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/ConstMapTypeInfo.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/ConstMapTypeInfo.java index fc1ec1e5390..3b7d80c7d1e 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/ConstMapTypeInfo.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/ConstMapTypeInfo.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/ConstSession.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/ConstSession.java index fd63bb7ce27..6b6d9f4d032 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/ConstSession.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/ConstSession.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/ConstSessionImpl.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/ConstSessionImpl.java index 3e366a5a36a..8fe7b0243d6 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/ConstSessionImpl.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/ConstSessionImpl.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/ConstSessionOptions.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/ConstSessionOptions.java index c24efa46305..367db333950 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/ConstSessionOptions.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/ConstSessionOptions.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/ConstSessionOptionsImpl.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/ConstSessionOptionsImpl.java index a7438298d0a..a5613f8ab1c 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/ConstSessionOptionsImpl.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/ConstSessionOptionsImpl.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/ConstTensorTypeAndShapeInfo.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/ConstTensorTypeAndShapeInfo.java index 9e1bea387f3..26a645d486e 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/ConstTensorTypeAndShapeInfo.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/ConstTensorTypeAndShapeInfo.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/ConstValue.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/ConstValue.java index cc3614c161e..9d444f54c45 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/ConstValue.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/ConstValue.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/ConstValueImpl.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/ConstValueImpl.java index c805eb6cb99..9c5cb63cc06 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/ConstValueImpl.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/ConstValueImpl.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-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 deleted file mode 100644 index 00dd0e9bd43..00000000000 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/CustomOpApi.java +++ /dev/null @@ -1,280 +0,0 @@ -// Targeted by JavaCPP version 1.5.9: 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.opencl.*; -import static org.bytedeco.opencl.global.OpenCL.*; -import org.bytedeco.dnnl.*; -import static org.bytedeco.dnnl.global.dnnl.*; - -import static org.bytedeco.onnxruntime.global.onnxruntime.*; - - -/** - * This entire structure is deprecated, but we not marking - * it as a whole yet since we want to preserve for the next release. - * */ -@Namespace("Ort") @NoOffset @Properties(inherit = org.bytedeco.onnxruntime.presets.onnxruntime.class) -public class CustomOpApi extends Pointer { - static { Loader.load(); } - /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ - public CustomOpApi(Pointer p) { super(p); } - - public CustomOpApi(@Const @ByRef OrtApi api) { super((Pointer)null); allocate(api); } - private native void allocate(@Const @ByRef OrtApi api); - - /** @deprecated use Ort::Value::GetTensorTypeAndShape() - * [[deprecated]] - * This interface produces a pointer that must be released. Not exception safe. - */ - public native @Deprecated OrtTensorTypeAndShapeInfo GetTensorTypeAndShape(@Const OrtValue value); - - /** @deprecated use Ort::TensorTypeAndShapeInfo::GetElementCount() - * [[deprecated]] - * This interface is redundant. - */ - public native @Cast("size_t") @Deprecated long GetTensorShapeElementCount(@Const OrtTensorTypeAndShapeInfo info); - - /** @deprecated use Ort::TensorTypeAndShapeInfo::GetElementType() - * [[deprecated]] - * This interface is redundant. - */ - public native @Cast("ONNXTensorElementDataType") @Deprecated int GetTensorElementType(@Const OrtTensorTypeAndShapeInfo info); - - /** @deprecated use Ort::TensorTypeAndShapeInfo::GetDimensionsCount() - * [[deprecated]] - * This interface is redundant. - */ - public native @Cast("size_t") @Deprecated long GetDimensionsCount(@Const OrtTensorTypeAndShapeInfo info); - - /** @deprecated use Ort::TensorTypeAndShapeInfo::GetShape() - * [[deprecated]] - * This interface is redundant. - */ - public native @Deprecated void GetDimensions(@Const OrtTensorTypeAndShapeInfo info, @Cast("int64_t*") LongPointer dim_values, @Cast("size_t") long dim_values_length); - public native @Deprecated void GetDimensions(@Const OrtTensorTypeAndShapeInfo info, @Cast("int64_t*") LongBuffer dim_values, @Cast("size_t") long dim_values_length); - public native @Deprecated void GetDimensions(@Const OrtTensorTypeAndShapeInfo info, @Cast("int64_t*") long[] dim_values, @Cast("size_t") long dim_values_length); - - /** @deprecated - * [[deprecated]] - * This interface sets dimensions to TensorTypeAndShapeInfo, but has no effect on the OrtValue. - */ - public native @Deprecated void SetDimensions(OrtTensorTypeAndShapeInfo info, @Cast("const int64_t*") LongPointer dim_values, @Cast("size_t") long dim_count); - public native @Deprecated void SetDimensions(OrtTensorTypeAndShapeInfo info, @Cast("const int64_t*") LongBuffer dim_values, @Cast("size_t") long dim_count); - public native @Deprecated void SetDimensions(OrtTensorTypeAndShapeInfo info, @Cast("const int64_t*") long[] dim_values, @Cast("size_t") long dim_count); - - /** @deprecated use Ort::Value::GetTensorMutableData() - * [[deprecated]] - * This interface is redundant. - */ - - /** @deprecated use Ort::Value::GetTensorData() - * [[deprecated]] - * This interface is redundant. - */ - - /** @deprecated use Ort::Value::GetTensorMemoryInfo() - * [[deprecated]] - * This interface is redundant. - */ - public native @Const @Deprecated OrtMemoryInfo GetTensorMemoryInfo(@Const OrtValue value); - - /** @deprecated use Ort::TensorTypeAndShapeInfo::GetShape() - * [[deprecated]] - * This interface is redundant. - */ - public native @Cast("int64_t*") @StdVector LongPointer GetTensorShape(@Const OrtTensorTypeAndShapeInfo info); - - /** @deprecated use TensorTypeAndShapeInfo instances for automatic ownership. - * [[deprecated]] - * This interface is not exception safe. - */ - public native @Deprecated void ReleaseTensorTypeAndShapeInfo(OrtTensorTypeAndShapeInfo input); - - /** @deprecated use Ort::KernelContext::GetInputCount - * [[deprecated]] - * This interface is redundant. - */ - public native @Cast("size_t") @Deprecated long KernelContext_GetInputCount(@Const OrtKernelContext context); - - /** @deprecated use Ort::KernelContext::GetInput - * [[deprecated]] - * This interface is redundant. - */ - public native @Const @Deprecated OrtValue KernelContext_GetInput(@Const OrtKernelContext context, @Cast("size_t") long index); - - /** @deprecated use Ort::KernelContext::GetOutputCount - * [[deprecated]] - * This interface is redundant. - */ - public native @Cast("size_t") @Deprecated long KernelContext_GetOutputCount(@Const OrtKernelContext context); - - /** @deprecated use Ort::KernelContext::GetOutput - * [[deprecated]] - * This interface is redundant. - */ - public native @Deprecated OrtValue KernelContext_GetOutput(OrtKernelContext context, @Cast("size_t") long index, @Cast("const int64_t*") LongPointer dim_values, @Cast("size_t") long dim_count); - public native @Deprecated OrtValue KernelContext_GetOutput(OrtKernelContext context, @Cast("size_t") long index, @Cast("const int64_t*") LongBuffer dim_values, @Cast("size_t") long dim_count); - public native @Deprecated OrtValue KernelContext_GetOutput(OrtKernelContext context, @Cast("size_t") long index, @Cast("const int64_t*") long[] dim_values, @Cast("size_t") long dim_count); - - /** @deprecated use Ort::KernelContext::GetGPUComputeStream - * [[deprecated]] - * This interface is redundant. - */ - public native @Deprecated Pointer KernelContext_GetGPUComputeStream(@Const OrtKernelContext context); - - /** @deprecated use Ort::ThrowOnError() - * [[deprecated]] - * This interface is redundant. - */ - public native @Deprecated void ThrowOnError(OrtStatus result); - - /** @deprecated use Ort::OpAttr - * [[deprecated]] - * This interface is not exception safe. - */ - public native @Deprecated OrtOpAttr CreateOpAttr(@Cast("const char*") BytePointer name, - @Const Pointer data, - int len, - @Cast("OrtOpAttrType") int type); - public native @Deprecated OrtOpAttr CreateOpAttr(String name, - @Const Pointer data, - int len, - @Cast("OrtOpAttrType") int type); - - /** @deprecated use Ort::OpAttr - * [[deprecated]] - * This interface is not exception safe. - */ - public native @Deprecated void ReleaseOpAttr(OrtOpAttr op_attr); - - /** @deprecated use Ort::Op - * [[deprecated]] - * This interface is not exception safe. - */ - public native @Deprecated OrtOp CreateOp(@Const OrtKernelInfo info, - @Cast("const char*") BytePointer op_name, - @Cast("const char*") BytePointer domain, - int version, - @Cast("const char**") PointerPointer type_constraint_names, - @Cast("const ONNXTensorElementDataType*") IntPointer type_constraint_values, - int type_constraint_count, - @Cast("const OrtOpAttr*const*") PointerPointer attr_values, - int attr_count, - int input_count, - int output_count); - public native @Deprecated OrtOp CreateOp(@Const OrtKernelInfo info, - @Cast("const char*") BytePointer op_name, - @Cast("const char*") BytePointer domain, - int version, - @Cast("const char**") @ByPtrPtr BytePointer type_constraint_names, - @Cast("const ONNXTensorElementDataType*") IntPointer type_constraint_values, - int type_constraint_count, - @Const @ByPtrPtr OrtOpAttr attr_values, - int attr_count, - int input_count, - int output_count); - public native @Deprecated OrtOp CreateOp(@Const OrtKernelInfo info, - String op_name, - String domain, - int version, - @Cast("const char**") @ByPtrPtr ByteBuffer type_constraint_names, - @Cast("const ONNXTensorElementDataType*") IntBuffer type_constraint_values, - int type_constraint_count, - @Const @ByPtrPtr OrtOpAttr attr_values, - int attr_count, - int input_count, - int output_count); - public native @Deprecated OrtOp CreateOp(@Const OrtKernelInfo info, - @Cast("const char*") BytePointer op_name, - @Cast("const char*") BytePointer domain, - int version, - @Cast("const char**") @ByPtrPtr byte[] type_constraint_names, - @Cast("const ONNXTensorElementDataType*") int[] type_constraint_values, - int type_constraint_count, - @Const @ByPtrPtr OrtOpAttr attr_values, - int attr_count, - int input_count, - int output_count); - public native @Deprecated OrtOp CreateOp(@Const OrtKernelInfo info, - String op_name, - String domain, - int version, - @Cast("const char**") @ByPtrPtr BytePointer type_constraint_names, - @Cast("const ONNXTensorElementDataType*") IntPointer type_constraint_values, - int type_constraint_count, - @Const @ByPtrPtr OrtOpAttr attr_values, - int attr_count, - int input_count, - int output_count); - public native @Deprecated OrtOp CreateOp(@Const OrtKernelInfo info, - @Cast("const char*") BytePointer op_name, - @Cast("const char*") BytePointer domain, - int version, - @Cast("const char**") @ByPtrPtr ByteBuffer type_constraint_names, - @Cast("const ONNXTensorElementDataType*") IntBuffer type_constraint_values, - int type_constraint_count, - @Const @ByPtrPtr OrtOpAttr attr_values, - int attr_count, - int input_count, - int output_count); - public native @Deprecated OrtOp CreateOp(@Const OrtKernelInfo info, - String op_name, - String domain, - int version, - @Cast("const char**") @ByPtrPtr byte[] type_constraint_names, - @Cast("const ONNXTensorElementDataType*") int[] type_constraint_values, - int type_constraint_count, - @Const @ByPtrPtr OrtOpAttr attr_values, - int attr_count, - int input_count, - int output_count); - - /** @deprecated use Ort::Op::Invoke - * [[deprecated]] - * This interface is redundant - */ - public native @Deprecated void InvokeOp(@Const OrtKernelContext context, - @Const OrtOp ort_op, - @Cast("const OrtValue*const*") PointerPointer input_values, - int input_count, - @Cast("OrtValue*const*") PointerPointer output_values, - int output_count); - public native @Deprecated void InvokeOp(@Const OrtKernelContext context, - @Const OrtOp ort_op, - @Const @ByPtrPtr OrtValue input_values, - int input_count, - @ByPtrPtr OrtValue output_values, - int output_count); - - /** @deprecated use Ort::Op for automatic lifespan management. - * [[deprecated]] - * This interface is not exception safe. - */ - public native @Deprecated void ReleaseOp(OrtOp ort_op); - - /** @deprecated use Ort::KernelInfo for automatic lifespan management or for - * querying attributes - * [[deprecated]] - * This interface is redundant - */ - - /** @deprecated use Ort::KernelInfo::Copy - * querying attributes - * [[deprecated]] - * This interface is not exception safe - */ - public native @Deprecated OrtKernelInfo CopyKernelInfo(@Const OrtKernelInfo info); - - /** @deprecated use Ort::KernelInfo for lifespan management - * querying attributes - * [[deprecated]] - * This interface is not exception safe - */ - public native @Deprecated void ReleaseKernelInfo(OrtKernelInfo info_copy); -} diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/CustomOpConfigs.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/CustomOpConfigs.java index 1edc8ffaa00..a6456555d69 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/CustomOpConfigs.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/CustomOpConfigs.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-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 32ee33e4501..f756b0f0ea2 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-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 93642eddf5b..490aee34a55 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; @@ -84,4 +84,8 @@ private native void allocate(@Const OrtThreadingOptions tp_options, OrtLoggingFu /** Wraps OrtApi::CreateAndRegisterAllocator */ public native @ByRef Env CreateAndRegisterAllocator(@Const OrtMemoryInfo mem_info, @Const OrtArenaCfg arena_cfg); + + /** Wraps OrtApi::CreateAndRegisterAllocatorV2 */ + public native @ByRef Env CreateAndRegisterAllocatorV2(@StdString BytePointer provider_type, @Const OrtMemoryInfo mem_info, @Const @ByRef StringStringMap options, @Const OrtArenaCfg arena_cfg); + public native @ByRef Env CreateAndRegisterAllocatorV2(@StdString String provider_type, @Const OrtMemoryInfo mem_info, @Const @ByRef StringStringMap options, @Const OrtArenaCfg arena_cfg); } diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/Float16_t.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/Float16_t.java index 60aa090e373..d510835f323 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/Float16_t.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/Float16_t.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; @@ -16,65 +16,122 @@ /** \brief IEEE 754 half-precision floating point data type - * \details It is necessary for type dispatching to make use of C++ API - * The type is implicitly convertible to/from uint16_t. - * The size of the structure should align with uint16_t and one can freely cast - * uint16_t buffers to/from Ort::Float16_t to feed and retrieve data. * - * Generally, you can feed any of your types as float16/blfoat16 data to create a tensor - * on top of it, providing it can form a continuous buffer with 16-bit elements with no padding. - * And you can also feed a array of uint16_t elements directly. For example, + * \details This struct is used for converting float to float16 and back + * so the user could feed inputs and fetch outputs using these type. * - *
{@code {.unparsed}
- * uint16_t values[] = { 15360, 16384, 16896, 17408, 17664};
- * constexpr size_t values_length = sizeof(values) / sizeof(values[0]);
- * std::vector dims = {values_length};  // one dimensional example
- * Ort::MemoryInfo info("Cpu", OrtDeviceAllocator, 0, OrtMemTypeDefault);
- * // Note we are passing bytes count in this api, not number of elements -> sizeof(values)
- * auto float16_tensor = Ort::Value::CreateTensor(info, values, sizeof(values),
- *                                                dims.data(), dims.size(), ONNX_TENSOR_ELEMENT_DATA_TYPE_FLOAT16);
- * }
- * - * Here is another example, a little bit more elaborate. Let's assume that you use your own float16 type and you want to use - * a templated version of the API above so the type is automatically set based on your type. You will need to supply an extra - * template specialization. + * The size of the structure should align with uint16_t and one can freely cast + * uint16_t buffers to/from Ort::Float16_t to feed and retrieve data. * *
{@code {.unparsed}
- * namespace yours { struct half {}; } // assume this is your type, define this:
- * namespace Ort {
- * template<>
- * struct TypeToTensorType { static constexpr ONNXTensorElementDataType type = ONNX_TENSOR_ELEMENT_DATA_TYPE_FLOAT16; };
- * } //namespace Ort
+ * // This example demonstrates converion from float to float16
+ * constexpr float values[] = {1.f, 2.f, 3.f, 4.f, 5.f};
+ * std::vector fp16_values;
+ * fp16_values.reserve(std::size(values));
+ * std::transform(std::begin(values), std::end(values), std::back_inserter(fp16_values),
+ *     [](float value) { return Ort::Float16_t(value); });
  *
- * std::vector values;
- * std::vector dims = {values.size()}; // one dimensional example
- * Ort::MemoryInfo info("Cpu", OrtDeviceAllocator, 0, OrtMemTypeDefault);
- * // Here we are passing element count -> values.size()
- * auto float16_tensor = Ort::Value::CreateTensor(info, values.data(), values.size(), dims.data(), dims.size());
- *
- *  }
+ * } */ -@Namespace("Ort") @NoOffset @Properties(inherit = org.bytedeco.onnxruntime.presets.onnxruntime.class) +@Namespace("Ort") @Properties(inherit = org.bytedeco.onnxruntime.presets.onnxruntime.class) public class Float16_t extends Pointer { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public Float16_t(Pointer p) { super(p); } - /** Native array allocator. Access with {@link Pointer#position(long)}. */ - public Float16_t(long size) { super((Pointer)null); allocateArray(size); } - private native void allocateArray(long size); - @Override public Float16_t position(long position) { - return (Float16_t)super.position(position); - } - @Override public Float16_t getPointer(long i) { - return new Float16_t((Pointer)this).offsetAddress(i); - } - - public native @Cast("uint16_t") short value(); public native Float16_t value(short setter); + + + /** + * Default constructor + * */ public Float16_t() { super((Pointer)null); allocate(); } - @NoException(true) private native void allocate(); - public Float16_t(@Cast("uint16_t") short v) { super((Pointer)null); allocate(v); } - @NoException(true) private native void allocate(@Cast("uint16_t") short v); - public native @Cast("uint16_t") @Name("operator uint16_t") @NoException(true) short asShort(); - public native @Cast("const bool") @Name("operator ==") @NoException(true) boolean equals(@Const @ByRef Float16_t rhs); - public native @Cast("const bool") @Name("operator !=") @NoException(true) boolean notEquals(@Const @ByRef Float16_t rhs); + private native void allocate(); + + /** + * Explicit conversion to uint16_t representation of float16. + * + * uint16_t bit representation of float16 + * new instance of Float16_t */ + public static native @Const @ByVal @NoException(true) Float16_t FromBits(@Cast("uint16_t") short v); + + /** + * __ctor from float. Float is converted into float16 16-bit representation. + * + * float value */ + public Float16_t(float v) { super((Pointer)null); allocate(v); } + @NoException(true) private native void allocate(float v); + + /** + * Converts float16 to float + * + * float representation of float16 value */ + public native @NoException(true) float ToFloat(); + + /** + * Checks if the value is negative + * + * true if negative */ + + /** + * Tests if the value is NaN + * + * true if NaN */ + + /** + * Tests if the value is finite + * + * true if finite */ + + /** + * Tests if the value represents positive infinity. + * + * true if positive infinity */ + + /** + * Tests if the value represents negative infinity + * + * true if negative infinity */ + + /** + * Tests if the value is either positive or negative infinity. + * + * True if absolute value is infinity */ + + /** + * Tests if the value is NaN or zero. Useful for comparisons. + * + * True if NaN or zero. */ + + /** + * Tests if the value is normal (not zero, subnormal, infinite, or NaN). + * + * True if so */ + + /** + * Tests if the value is subnormal (denormal). + * + * True if so */ + + /** + * Creates an instance that represents absolute value. + * + * Absolute value */ + + /** + * Creates a new instance with the sign flipped. + * + * Flipped sign instance */ + + /** + * IEEE defines that positive and negative zero are equal, this gives us a quick equality check + * for two values by or'ing the private bits together and stripping the sign. They are both zero, + * and therefore equivalent, if the resulting value is still zero. + * + * first value + * second value + * True if both arguments represent zero */ + + /** + * User defined conversion operator. Converts Float16_t to float. + * */ + public native @Name("operator float") @NoException(true) float asFloat(); } diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/Float8E4M3FNUZ_t.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/Float8E4M3FNUZ_t.java new file mode 100644 index 00000000000..f4287a970f6 --- /dev/null +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/Float8E4M3FNUZ_t.java @@ -0,0 +1,47 @@ +// Targeted by JavaCPP version 1.5.10-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.opencl.*; +import static org.bytedeco.opencl.global.OpenCL.*; +import org.bytedeco.dnnl.*; +import static org.bytedeco.dnnl.global.dnnl.*; + +import static org.bytedeco.onnxruntime.global.onnxruntime.*; + + +/** \brief float8e4m3fnuz (Float8 Floating Point) data type + * \details It is necessary for type dispatching to make use of C++ API + * The type is implicitly convertible to/from uint8_t. + * See https://onnx.ai/onnx/technical/float8.html for further details. + */ +@Namespace("Ort") @NoOffset @Properties(inherit = org.bytedeco.onnxruntime.presets.onnxruntime.class) +public class Float8E4M3FNUZ_t extends Pointer { + static { Loader.load(); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public Float8E4M3FNUZ_t(Pointer p) { super(p); } + /** Native array allocator. Access with {@link Pointer#position(long)}. */ + public Float8E4M3FNUZ_t(long size) { super((Pointer)null); allocateArray(size); } + private native void allocateArray(long size); + @Override public Float8E4M3FNUZ_t position(long position) { + return (Float8E4M3FNUZ_t)super.position(position); + } + @Override public Float8E4M3FNUZ_t getPointer(long i) { + return new Float8E4M3FNUZ_t((Pointer)this).offsetAddress(i); + } + + public native @Cast("uint8_t") byte value(); public native Float8E4M3FNUZ_t value(byte setter); + public Float8E4M3FNUZ_t() { super((Pointer)null); allocate(); } + @NoException(true) private native void allocate(); + public Float8E4M3FNUZ_t(@Cast("uint8_t") byte v) { super((Pointer)null); allocate(v); } + @NoException(true) private native void allocate(@Cast("uint8_t") byte v); + public native @Cast("uint8_t") @Name("operator uint8_t") @NoException(true) byte asByte(); + // nan values are treated like any other value for operator ==, != + public native @Cast("const bool") @Name("operator ==") @NoException(true) boolean equals(@Const @ByRef Float8E4M3FNUZ_t rhs); + public native @Cast("const bool") @Name("operator !=") @NoException(true) boolean notEquals(@Const @ByRef Float8E4M3FNUZ_t rhs); +} diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/Float8E4M3FN_t.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/Float8E4M3FN_t.java new file mode 100644 index 00000000000..b2057f2a1db --- /dev/null +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/Float8E4M3FN_t.java @@ -0,0 +1,47 @@ +// Targeted by JavaCPP version 1.5.10-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.opencl.*; +import static org.bytedeco.opencl.global.OpenCL.*; +import org.bytedeco.dnnl.*; +import static org.bytedeco.dnnl.global.dnnl.*; + +import static org.bytedeco.onnxruntime.global.onnxruntime.*; + + +/** \brief float8e4m3fn (Float8 Floating Point) data type + * \details It is necessary for type dispatching to make use of C++ API + * The type is implicitly convertible to/from uint8_t. + * See https://onnx.ai/onnx/technical/float8.html for further details. + */ +@Namespace("Ort") @NoOffset @Properties(inherit = org.bytedeco.onnxruntime.presets.onnxruntime.class) +public class Float8E4M3FN_t extends Pointer { + static { Loader.load(); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public Float8E4M3FN_t(Pointer p) { super(p); } + /** Native array allocator. Access with {@link Pointer#position(long)}. */ + public Float8E4M3FN_t(long size) { super((Pointer)null); allocateArray(size); } + private native void allocateArray(long size); + @Override public Float8E4M3FN_t position(long position) { + return (Float8E4M3FN_t)super.position(position); + } + @Override public Float8E4M3FN_t getPointer(long i) { + return new Float8E4M3FN_t((Pointer)this).offsetAddress(i); + } + + public native @Cast("uint8_t") byte value(); public native Float8E4M3FN_t value(byte setter); + public Float8E4M3FN_t() { super((Pointer)null); allocate(); } + @NoException(true) private native void allocate(); + public Float8E4M3FN_t(@Cast("uint8_t") byte v) { super((Pointer)null); allocate(v); } + @NoException(true) private native void allocate(@Cast("uint8_t") byte v); + public native @Cast("uint8_t") @Name("operator uint8_t") @NoException(true) byte asByte(); + // nan values are treated like any other value for operator ==, != + public native @Cast("const bool") @Name("operator ==") @NoException(true) boolean equals(@Const @ByRef Float8E4M3FN_t rhs); + public native @Cast("const bool") @Name("operator !=") @NoException(true) boolean notEquals(@Const @ByRef Float8E4M3FN_t rhs); +} diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/Float8E5M2FNUZ_t.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/Float8E5M2FNUZ_t.java new file mode 100644 index 00000000000..a20bc4e9ec3 --- /dev/null +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/Float8E5M2FNUZ_t.java @@ -0,0 +1,47 @@ +// Targeted by JavaCPP version 1.5.10-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.opencl.*; +import static org.bytedeco.opencl.global.OpenCL.*; +import org.bytedeco.dnnl.*; +import static org.bytedeco.dnnl.global.dnnl.*; + +import static org.bytedeco.onnxruntime.global.onnxruntime.*; + + +/** \brief float8e5m2fnuz (Float8 Floating Point) data type + * \details It is necessary for type dispatching to make use of C++ API + * The type is implicitly convertible to/from uint8_t. + * See https://onnx.ai/onnx/technical/float8.html for further details. + */ +@Namespace("Ort") @NoOffset @Properties(inherit = org.bytedeco.onnxruntime.presets.onnxruntime.class) +public class Float8E5M2FNUZ_t extends Pointer { + static { Loader.load(); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public Float8E5M2FNUZ_t(Pointer p) { super(p); } + /** Native array allocator. Access with {@link Pointer#position(long)}. */ + public Float8E5M2FNUZ_t(long size) { super((Pointer)null); allocateArray(size); } + private native void allocateArray(long size); + @Override public Float8E5M2FNUZ_t position(long position) { + return (Float8E5M2FNUZ_t)super.position(position); + } + @Override public Float8E5M2FNUZ_t getPointer(long i) { + return new Float8E5M2FNUZ_t((Pointer)this).offsetAddress(i); + } + + public native @Cast("uint8_t") byte value(); public native Float8E5M2FNUZ_t value(byte setter); + public Float8E5M2FNUZ_t() { super((Pointer)null); allocate(); } + @NoException(true) private native void allocate(); + public Float8E5M2FNUZ_t(@Cast("uint8_t") byte v) { super((Pointer)null); allocate(v); } + @NoException(true) private native void allocate(@Cast("uint8_t") byte v); + public native @Cast("uint8_t") @Name("operator uint8_t") @NoException(true) byte asByte(); + // nan values are treated like any other value for operator ==, != + public native @Cast("const bool") @Name("operator ==") @NoException(true) boolean equals(@Const @ByRef Float8E5M2FNUZ_t rhs); + public native @Cast("const bool") @Name("operator !=") @NoException(true) boolean notEquals(@Const @ByRef Float8E5M2FNUZ_t rhs); +} diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/Float8E5M2_t.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/Float8E5M2_t.java new file mode 100644 index 00000000000..9286dcfa8f5 --- /dev/null +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/Float8E5M2_t.java @@ -0,0 +1,47 @@ +// Targeted by JavaCPP version 1.5.10-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.opencl.*; +import static org.bytedeco.opencl.global.OpenCL.*; +import org.bytedeco.dnnl.*; +import static org.bytedeco.dnnl.global.dnnl.*; + +import static org.bytedeco.onnxruntime.global.onnxruntime.*; + + +/** \brief float8e5m2 (Float8 Floating Point) data type + * \details It is necessary for type dispatching to make use of C++ API + * The type is implicitly convertible to/from uint8_t. + * See https://onnx.ai/onnx/technical/float8.html for further details. + */ +@Namespace("Ort") @NoOffset @Properties(inherit = org.bytedeco.onnxruntime.presets.onnxruntime.class) +public class Float8E5M2_t extends Pointer { + static { Loader.load(); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public Float8E5M2_t(Pointer p) { super(p); } + /** Native array allocator. Access with {@link Pointer#position(long)}. */ + public Float8E5M2_t(long size) { super((Pointer)null); allocateArray(size); } + private native void allocateArray(long size); + @Override public Float8E5M2_t position(long position) { + return (Float8E5M2_t)super.position(position); + } + @Override public Float8E5M2_t getPointer(long i) { + return new Float8E5M2_t((Pointer)this).offsetAddress(i); + } + + public native @Cast("uint8_t") byte value(); public native Float8E5M2_t value(byte setter); + public Float8E5M2_t() { super((Pointer)null); allocate(); } + @NoException(true) private native void allocate(); + public Float8E5M2_t(@Cast("uint8_t") byte v) { super((Pointer)null); allocate(v); } + @NoException(true) private native void allocate(@Cast("uint8_t") byte v); + public native @Cast("uint8_t") @Name("operator uint8_t") @NoException(true) byte asByte(); + // nan values are treated like any other value for operator ==, != + public native @Cast("const bool") @Name("operator ==") @NoException(true) boolean equals(@Const @ByRef Float8E5M2_t rhs); + public native @Cast("const bool") @Name("operator !=") @NoException(true) boolean notEquals(@Const @ByRef Float8E5M2_t rhs); +} diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/IoBinding.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/IoBinding.java index 1e35e12039c..4ca880be6a9 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/IoBinding.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/IoBinding.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/IoBindingImpl.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/IoBindingImpl.java index 0ace0d0b140..3e624a8d7ca 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/IoBindingImpl.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/IoBindingImpl.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/KernelContext.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/KernelContext.java index e1b00e4c983..b5bc29ae4b8 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/KernelContext.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/KernelContext.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/KernelInfo.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/KernelInfo.java index 1bb0a4b4261..78df4918302 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/KernelInfo.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/KernelInfo.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/KernelInfoImpl.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/KernelInfoImpl.java index 2ce6e4b5a24..b5607d94aa5 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/KernelInfoImpl.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/KernelInfoImpl.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/Logger.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/Logger.java index 248857c95cf..9f8c3035665 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/Logger.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/Logger.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/MapTypeInfo.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/MapTypeInfo.java index aa0fbeaec6a..4e7c8cecd36 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/MapTypeInfo.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/MapTypeInfo.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/MapTypeInfoImpl.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/MapTypeInfoImpl.java index 923c3893c5f..1af5c56758b 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/MapTypeInfoImpl.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/MapTypeInfoImpl.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/MemoryAllocation.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/MemoryAllocation.java index cc4e5267367..80adef35f32 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/MemoryAllocation.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/MemoryAllocation.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/MemoryInfo.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/MemoryInfo.java index e97e83459e8..6349e638e73 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/MemoryInfoImpl.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/MemoryInfoImpl.java index 74aae3bb221..5fd1cafb279 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/MemoryInfoImpl.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/MemoryInfoImpl.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-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 9e56b190df2..dc1903173f2 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/Op.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/Op.java index 0020e599b27..ec595ec127e 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/Op.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/Op.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OpAttr.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OpAttr.java index f37dcbb3224..ac2cf9cb63f 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OpAttr.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OpAttr.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OptionalTypeInfoImpl.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OptionalTypeInfoImpl.java index bdb6798c007..08c99c069dc 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OptionalTypeInfoImpl.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OptionalTypeInfoImpl.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtAllocator.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtAllocator.java index d24586f0505..70367fb0af7 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-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 022566903a6..dd75232022b 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; @@ -355,7 +355,7 @@ public native OrtStatus CloneSessionOptions( @Const OrtSessionOptions in_options /** \brief Set the optimization level to apply when loading a graph * - * Please see https://onnxruntime.ai/docs/performance/graph-optimizations.html for an in-depth explanation + * Please see https://onnxruntime.ai/docs/performance/model-optimizations/graph-optimizations.html for an in-depth explanation * @param options [in,out] The session options object * @param graph_optimization_level [in] The optimization level * @@ -2419,6 +2419,10 @@ public native OrtStatus KernelInfoGetAttributeArray_int64( @Const OrtKernelInfo * crossing which the current chunk is chunked into 2. * "initial_growth_chunk_size_bytes": (Possible) Size of the second allocation in the arena. * Only relevant if arena strategy is {@code kNextPowerOfTwo}. Use -1 to allow ORT to choose the default. + * "max_power_of_two_extend_bytes": The maximum enxtend size if arena strategy is {@code kNextPowerOfTwo}. + * It is not an allocation limit, it is only a limit for extention when requested byte is less than the limit. + * When requested bytes is more than the limit, allocator will still return as requested. + * Use -1 to allow ORT to choose the default 1GB for max_power_of_two_extend_bytes. * Ultimately, the allocation size is determined by the allocation memory request. * Further allocation sizes are governed by the arena extend strategy. * @@ -3481,8 +3485,13 @@ public native OrtStatus InvokeOp( * * QNN supported keys: * "backend_path": file path to QNN backend library. - * "profiling_level": QNN profiling level, options: "basic", "detailed". + * "qnn_context_cache_enable": 1 to enable QNN graph creation from cached QNN context file. If it's enabled: QNN EP will + * load from cached QNN context binary if it exist. It will generate a context binary file if it's not exist + * "qnn_context_cache_path": explicitly provide the QNN context cache file. Default to model_file.onnx.bin if not provided. + * "profiling_level": QNN profiling level, options: "off", "basic", "detailed". Default to off. * "rpc_control_latency": QNN RPC control latency. + * "htp_performance_mode": QNN performance mode, options: "burst", "balanced", "default", "high_performance", + * "high_power_saver", "low_balanced", "low_power_saver", "power_saver", "sustained_high_performance". Default to "default". * * SNPE supported keys: * "runtime": SNPE runtime engine, options: "CPU", "CPU_FLOAT32", "GPU", "GPU_FLOAT32_16_HYBRID", "GPU_FLOAT16", @@ -3496,6 +3505,7 @@ public native OrtStatus InvokeOp( * "buffer_type": ITensor or user buffers, options: "ITENSOR", user buffer with different types - "TF8", "TF16", "UINT8", "FLOAT". * "ITENSOR" -- default, ITensor which is float only. * "TF8" -- quantized model required, "FLOAT" -- for both quantized or non-quantized model + * "enable_init_cache": enable SNPE init caching feature, set to 1 to enabled it. Disabled by default. * If SNPE is not available (due to a non Snpe enabled build or its dependencies not being installed), this function will fail. * * XNNPACK supported keys: @@ -4277,7 +4287,7 @@ public native OrtStatus GetOptionalContainedTypeInfo( @Const OrtOptionalTypeInfo public native OrtStatus GetResizedStringTensorElementBuffer( OrtValue value, @Cast("size_t") long index, @Cast("size_t") long length_in_bytes, @Cast("char**") @ByPtrPtr ByteBuffer buffer); public native OrtStatus GetResizedStringTensorElementBuffer( OrtValue value, @Cast("size_t") long index, @Cast("size_t") long length_in_bytes, @Cast("char**") @ByPtrPtr byte[] buffer); - /** \brief Get Allocator from KernelContext for a specific memoryInfo. + /** \brief Get Allocator from KernelContext for a specific memoryInfo. Please use C API ReleaseAllocator to release out object * * @param context [in] OrtKernelContext instance * @param mem_info [in] OrtMemoryInfo instance @@ -4305,4 +4315,230 @@ public static class BytePointer_GetBuildInfoString extends FunctionPointer { public native @Cast("const char*") BytePointer call(); } public native BytePointer_GetBuildInfoString GetBuildInfoString(); public native OrtApi GetBuildInfoString(BytePointer_GetBuildInfoString setter); + + /** \name OrtROCMProviderOptions + * \{ +

+ /** \brief Create an OrtROCMProviderOptions + * + * @param out [out] Newly created ::OrtROCMProviderOptions. Must be released with OrtApi::ReleaseROCMProviderOptions + * + * \snippet{doc} snippets.dox OrtStatus Return Value + * + * @since Version 1.16. + */ + public native OrtStatus CreateROCMProviderOptions( @Cast("OrtROCMProviderOptions**") PointerPointer out); + public native OrtStatus CreateROCMProviderOptions( @ByPtrPtr OrtROCMProviderOptions out); + + /** \brief Set options in a ROCm Execution Provider. + * + * Please refer to https://onnxruntime.ai/docs/execution-providers/ROCm-ExecutionProvider.html + * to know the available keys and values. Key should be in null terminated string format of the member of + * ::OrtROCMProviderOptions and value should be its related range. + * + * For example, key="device_id" and value="0" + * + * @param rocm_options [in] + * @param provider_options_keys [in] Array of UTF-8 null-terminated string for provider options keys + * @param provider_options_values [in] Array of UTF-8 null-terminated string for provider options values + * @param num_keys [in] Number of elements in the {@code provider_option_keys} and {@code provider_options_values} arrays + * + * \snippet{doc} snippets.dox OrtStatus Return Value + * + * @since Version 1.16. + */ + public native OrtStatus UpdateROCMProviderOptions( OrtROCMProviderOptions rocm_options, + @Cast("const char*const*") PointerPointer provider_options_keys, + @Cast("const char*const*") PointerPointer provider_options_values, + @Cast("size_t") long num_keys); + public native OrtStatus UpdateROCMProviderOptions( OrtROCMProviderOptions rocm_options, + @Cast("const char*const*") @ByPtrPtr BytePointer provider_options_keys, + @Cast("const char*const*") @ByPtrPtr BytePointer provider_options_values, + @Cast("size_t") long num_keys); + public native OrtStatus UpdateROCMProviderOptions( OrtROCMProviderOptions rocm_options, + @Cast("const char*const*") @ByPtrPtr ByteBuffer provider_options_keys, + @Cast("const char*const*") @ByPtrPtr ByteBuffer provider_options_values, + @Cast("size_t") long num_keys); + public native OrtStatus UpdateROCMProviderOptions( OrtROCMProviderOptions rocm_options, + @Cast("const char*const*") @ByPtrPtr byte[] provider_options_keys, + @Cast("const char*const*") @ByPtrPtr byte[] provider_options_values, + @Cast("size_t") long num_keys); + + /** + * Get serialized ROCm provider options string. + * + * For example, "device_id=0;arena_extend_strategy=0;......" + * + * @param rocm_options - OrtROCMProviderOptions instance + * @param allocator - a ptr to an instance of OrtAllocator obtained with CreateAllocator() or GetAllocatorWithDefaultOptions() + * the specified allocator will be used to allocate continuous buffers for output strings and lengths. + * @param ptr - is a UTF-8 null terminated string allocated using 'allocator'. The caller is responsible for using the same allocator to free it. + * + * \snippet{doc} snippets.dox OrtStatus Return Value + * + * @since Version 1.16. + */ + public native OrtStatus GetROCMProviderOptionsAsString( @Const OrtROCMProviderOptions rocm_options, OrtAllocator allocator, @Cast("char**") PointerPointer ptr); + public native OrtStatus GetROCMProviderOptionsAsString( @Const OrtROCMProviderOptions rocm_options, OrtAllocator allocator, @Cast("char**") @ByPtrPtr BytePointer ptr); + public native OrtStatus GetROCMProviderOptionsAsString( @Const OrtROCMProviderOptions rocm_options, OrtAllocator allocator, @Cast("char**") @ByPtrPtr ByteBuffer ptr); + public native OrtStatus GetROCMProviderOptionsAsString( @Const OrtROCMProviderOptions rocm_options, OrtAllocator allocator, @Cast("char**") @ByPtrPtr byte[] ptr); + + /** \brief Release an ::OrtROCMProviderOptions + * + * \note This is an exception in the naming convention of other Release* functions, as the name of the method does not have the V2 suffix, but the type does + * + * @since Version 1.16. + */ + public static class ReleaseROCMProviderOptions_OrtROCMProviderOptions extends FunctionPointer { + static { Loader.load(); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public ReleaseROCMProviderOptions_OrtROCMProviderOptions(Pointer p) { super(p); } + protected ReleaseROCMProviderOptions_OrtROCMProviderOptions() { allocate(); } + private native void allocate(); + public native void call(OrtROCMProviderOptions input); + } + public native ReleaseROCMProviderOptions_OrtROCMProviderOptions ReleaseROCMProviderOptions(); public native OrtApi ReleaseROCMProviderOptions(ReleaseROCMProviderOptions_OrtROCMProviderOptions setter); + + /** \brief Create an allocator with specific type and register it with the ::OrtEnv + * This API enhance CreateAndRegisterAllocator that it can create an allocator with specific type, not just CPU allocator + * Enables sharing the allocator between multiple sessions that use the same env instance. + * Lifetime of the created allocator will be valid for the duration of the environment. + * Returns an error if an allocator with the same ::OrtMemoryInfo is already registered. + * @param env [in] OrtEnv instance + * @param provider_type [in] ExecutionProvider type + * @param mem_info [in] OrtMemoryInfo instance + * @param arena_cfg [in] Arena configuration + * @param provider_options_keys [in] key of the provider options map + * @param provider_options_values [in] value of the provider options map + * @param num_keys [in] Length of the provider options map + */ + public native OrtStatus CreateAndRegisterAllocatorV2( OrtEnv env, @Cast("const char*") BytePointer provider_type, @Const OrtMemoryInfo mem_info, @Const OrtArenaCfg arena_cfg, + @Cast("const char*const*") PointerPointer provider_options_keys, @Cast("const char*const*") PointerPointer provider_options_values, @Cast("size_t") long num_keys); + public native OrtStatus CreateAndRegisterAllocatorV2( OrtEnv env, @Cast("const char*") BytePointer provider_type, @Const OrtMemoryInfo mem_info, @Const OrtArenaCfg arena_cfg, + @Cast("const char*const*") @ByPtrPtr BytePointer provider_options_keys, @Cast("const char*const*") @ByPtrPtr BytePointer provider_options_values, @Cast("size_t") long num_keys); + public native OrtStatus CreateAndRegisterAllocatorV2( OrtEnv env, String provider_type, @Const OrtMemoryInfo mem_info, @Const OrtArenaCfg arena_cfg, + @Cast("const char*const*") @ByPtrPtr ByteBuffer provider_options_keys, @Cast("const char*const*") @ByPtrPtr ByteBuffer provider_options_values, @Cast("size_t") long num_keys); + public native OrtStatus CreateAndRegisterAllocatorV2( OrtEnv env, @Cast("const char*") BytePointer provider_type, @Const OrtMemoryInfo mem_info, @Const OrtArenaCfg arena_cfg, + @Cast("const char*const*") @ByPtrPtr byte[] provider_options_keys, @Cast("const char*const*") @ByPtrPtr byte[] provider_options_values, @Cast("size_t") long num_keys); + public native OrtStatus CreateAndRegisterAllocatorV2( OrtEnv env, String provider_type, @Const OrtMemoryInfo mem_info, @Const OrtArenaCfg arena_cfg, + @Cast("const char*const*") @ByPtrPtr BytePointer provider_options_keys, @Cast("const char*const*") @ByPtrPtr BytePointer provider_options_values, @Cast("size_t") long num_keys); + public native OrtStatus CreateAndRegisterAllocatorV2( OrtEnv env, @Cast("const char*") BytePointer provider_type, @Const OrtMemoryInfo mem_info, @Const OrtArenaCfg arena_cfg, + @Cast("const char*const*") @ByPtrPtr ByteBuffer provider_options_keys, @Cast("const char*const*") @ByPtrPtr ByteBuffer provider_options_values, @Cast("size_t") long num_keys); + public native OrtStatus CreateAndRegisterAllocatorV2( OrtEnv env, String provider_type, @Const OrtMemoryInfo mem_info, @Const OrtArenaCfg arena_cfg, + @Cast("const char*const*") @ByPtrPtr byte[] provider_options_keys, @Cast("const char*const*") @ByPtrPtr byte[] provider_options_values, @Cast("size_t") long num_keys); + + /** \brief Run the model asynchronously in a thread owned by intra op thread pool + * + * @param session [in] + * @param run_options [in] If nullptr, will use a default ::OrtRunOptions + * @param input_names [in] Array of null terminated UTF8 encoded strings of the input names + * @param input [in] Array of ::OrtValue%s of the input values + * @param input_len [in] Number of elements in the input_names and inputs arrays + * @param output_names [in] Array of null terminated UTF8 encoded strings of the output names + * @param output_names_len [in] Number of elements in the output_names and outputs array + * @param output [out] OrtValue* array of size output_names_len. + * On calling RunAsync, output[i] could either be a null or a pointer to a preallocated OrtValue. + * Later, the output array will be passed to run_async_callback with all null(s) filled with valid + * OrtValue pointer(s) allocated by onnxruntime. + * NOTE: it is customer's duty to finally release the output array and each of its member, + * regardless of whether the member (OrtValue*) is allocated by onnxruntime or preallocated by the customer. + * @param run_async_callback [in] Callback function on model run completion + * @param user_data [in] User data that pass back to run_async_callback + */ + public native OrtStatus RunAsync( OrtSession session, @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, + RunAsyncCallbackFn run_async_callback, Pointer user_data); + public native OrtStatus RunAsync( OrtSession session, @Const OrtRunOptions run_options, + @Cast("const char*const*") @ByPtrPtr BytePointer input_names, + @Const @ByPtrPtr OrtValue input, @Cast("size_t") long input_len, + @Cast("const char*const*") @ByPtrPtr BytePointer output_names, @Cast("size_t") long output_names_len, + @ByPtrPtr OrtValue output, + RunAsyncCallbackFn run_async_callback, Pointer user_data); + public native OrtStatus RunAsync( OrtSession session, @Const OrtRunOptions run_options, + @Cast("const char*const*") @ByPtrPtr ByteBuffer input_names, + @Const @ByPtrPtr OrtValue input, @Cast("size_t") long input_len, + @Cast("const char*const*") @ByPtrPtr ByteBuffer output_names, @Cast("size_t") long output_names_len, + @ByPtrPtr OrtValue output, + RunAsyncCallbackFn run_async_callback, Pointer user_data); + public native OrtStatus RunAsync( OrtSession session, @Const OrtRunOptions run_options, + @Cast("const char*const*") @ByPtrPtr byte[] input_names, + @Const @ByPtrPtr OrtValue input, @Cast("size_t") long input_len, + @Cast("const char*const*") @ByPtrPtr byte[] output_names, @Cast("size_t") long output_names_len, + @ByPtrPtr OrtValue output, + RunAsyncCallbackFn run_async_callback, Pointer user_data); + + /** + * Update TensorRT EP provider option where its data type is pointer, for example 'user_compute_stream'. + * If the data type of the provider option can be represented by string please use UpdateTensorRTProviderOptions. + * + * Note: It's caller's responsibility to properly manage the lifetime of the instance pointed by this pointer. + * + * @param tensorrt_options - OrtTensorRTProviderOptionsV2 instance + * @param key - Name of the provider option + * @param value - A pointer to the instance that will be assigned to this provider option + * + * @since Version 1.16. + */ + public native OrtStatus UpdateTensorRTProviderOptionsWithValue( OrtTensorRTProviderOptionsV2 tensorrt_options, @Cast("const char*") BytePointer key, Pointer value); + public native OrtStatus UpdateTensorRTProviderOptionsWithValue( OrtTensorRTProviderOptionsV2 tensorrt_options, String key, Pointer value); + + /** + * Get TensorRT EP provider option where its data type is pointer. + * If the data type of the provider option can be represented by string please use GetTensorRTProviderOptionsAsString. + * + * @param tensorrt_options - OrtTensorRTProviderOptionsV2 instance + * @param key - Name of the provider option + * @param ptr - A pointer to the instance that is kept by the provider option + * + * @since Version 1.16. + */ + public native OrtStatus GetTensorRTProviderOptionsByName( @Const OrtTensorRTProviderOptionsV2 tensorrt_options, @Cast("const char*") BytePointer key, @Cast("void**") PointerPointer ptr); + public native OrtStatus GetTensorRTProviderOptionsByName( @Const OrtTensorRTProviderOptionsV2 tensorrt_options, @Cast("const char*") BytePointer key, @Cast("void**") @ByPtrPtr Pointer ptr); + public native OrtStatus GetTensorRTProviderOptionsByName( @Const OrtTensorRTProviderOptionsV2 tensorrt_options, String key, @Cast("void**") @ByPtrPtr Pointer ptr); + + /** + * Update CUDA EP provider option where its data type is pointer, for example 'user_compute_stream'. + * If the data type of the provider option can be represented by string please use UpdateCUDAProviderOptions. + * + * Note: It's caller's responsibility to properly manage the lifetime of the instance pointed by this pointer. + * + * @param cuda_options - OrtCUDAProviderOptionsV2 instance + * @param key - Name of the provider option + * @param value - A pointer to the instance that will be assigned to this provider option + * + * @since Version 1.16. + */ + public native OrtStatus UpdateCUDAProviderOptionsWithValue( OrtCUDAProviderOptionsV2 cuda_options, @Cast("const char*") BytePointer key, Pointer value); + public native OrtStatus UpdateCUDAProviderOptionsWithValue( OrtCUDAProviderOptionsV2 cuda_options, String key, Pointer value); + + /** + * Get CUDA EP provider option where its data type is pointer. + * If the data type of the provider option can be represented by string please use GetCUDAProviderOptionsAsString. + * + * @param cuda_options - OrtCUDAProviderOptionsV2 instance + * @param key - Name of the provider option + * @param ptr - A pointer to the instance that is kept by the provider option + * + * @since Version 1.16. + */ + public native OrtStatus GetCUDAProviderOptionsByName( @Const OrtCUDAProviderOptionsV2 cuda_options, @Cast("const char*") BytePointer key, @Cast("void**") PointerPointer ptr); + public native OrtStatus GetCUDAProviderOptionsByName( @Const OrtCUDAProviderOptionsV2 cuda_options, @Cast("const char*") BytePointer key, @Cast("void**") @ByPtrPtr Pointer ptr); + public native OrtStatus GetCUDAProviderOptionsByName( @Const OrtCUDAProviderOptionsV2 cuda_options, String key, @Cast("void**") @ByPtrPtr Pointer ptr); + + /** + * Get a EP resoure. + * E.g. a cuda stream or a cublas handle + * + * @param context - Kernel context + * @param resouce_version - Version of the resource + * @param resource_id - Type of resource + * @param resource - A pointer to returned resource + * + * @since Version 1.16. + */ + public native OrtStatus KernelContext_GetResource( @Const OrtKernelContext context, int resouce_version, int resource_id, @Cast("void**") PointerPointer resource); + public native OrtStatus KernelContext_GetResource( @Const OrtKernelContext context, int resouce_version, int resource_id, @Cast("void**") @ByPtrPtr Pointer resource); } diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtApiBase.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtApiBase.java index 9f78c447932..a830c3a7d6d 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtArenaCfg.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtArenaCfg.java index eed751a6c40..bab8175d711 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtArenaCfg.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtArenaCfg.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtCANNProviderOptions.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtCANNProviderOptions.java index 1af091e4a80..54f5fa8f8e0 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtCANNProviderOptions.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtCANNProviderOptions.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtCUDAProviderOptions.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtCUDAProviderOptions.java index bf30914db00..f197a57e494 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtCUDAProviderOptions.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtCUDAProviderOptions.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; @@ -99,4 +99,9 @@ public class OrtCUDAProviderOptions extends Pointer { */ public native int tunable_op_tuning_enable(); public native OrtCUDAProviderOptions tunable_op_tuning_enable(int setter); + /** \brief Max tuning duration time limit for each instance of TunableOp. + * Defaults to 0 to disable the limit. + */ + public native int tunable_op_max_tuning_duration_ms(); public native OrtCUDAProviderOptions tunable_op_max_tuning_duration_ms(int setter); + } diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtCUDAProviderOptionsV2.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtCUDAProviderOptionsV2.java index d211a97f823..c3e817e372b 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtCUDAProviderOptionsV2.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtCUDAProviderOptionsV2.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtCustomCreateThreadFn.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtCustomCreateThreadFn.java index 9fbada87c4b..7222c088ac7 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtCustomCreateThreadFn.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtCustomCreateThreadFn.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtCustomHandleType.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtCustomHandleType.java index 3b0a7e0b22d..068bfbaf709 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtCustomHandleType.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtCustomHandleType.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtCustomJoinThreadFn.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtCustomJoinThreadFn.java index a64cd590af5..1b49df703f9 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtCustomJoinThreadFn.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtCustomJoinThreadFn.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-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 74a8b236790..da3d00442aa 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; @@ -39,7 +39,10 @@ public class OrtCustomOp extends Pointer { public native @Cast("uint32_t") int version(); public native OrtCustomOp version(int setter); // Must be initialized to ORT_API_VERSION - // This callback creates the kernel, which is a user defined parameter that is passed to the Kernel* callbacks below. + // This callback creates the kernel, which is a user defined + // parameter that is passed to the Kernel* callbacks below. It is + // recommended to use CreateKernelV2 which allows for a safe error + // propagation by returning an OrtStatusPtr. public static class CreateKernel_OrtCustomOp_OrtApi_OrtKernelInfo extends FunctionPointer { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ @@ -111,7 +114,9 @@ public static class GetOutputTypeCount_OrtCustomOp extends FunctionPointer { } public native GetOutputTypeCount_OrtCustomOp GetOutputTypeCount(); public native OrtCustomOp GetOutputTypeCount(GetOutputTypeCount_OrtCustomOp setter); - // Op kernel callbacks + // Perform a computation step. It is recommended to use + // KernelComputeV2 which allows for a safe error propagation by + // returning an OrtStatusPtr. public static class KernelCompute_Pointer_OrtKernelContext extends FunctionPointer { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ @@ -215,4 +220,28 @@ public static class GetVariadicOutputHomogeneity_OrtCustomOp extends FunctionPoi public native int call(@Const OrtCustomOp op); } public native GetVariadicOutputHomogeneity_OrtCustomOp GetVariadicOutputHomogeneity(); public native OrtCustomOp GetVariadicOutputHomogeneity(GetVariadicOutputHomogeneity_OrtCustomOp setter); + + // Create the kernel state which is passed to each compute call. + public static class CreateKernelV2_OrtCustomOp_OrtApi_OrtKernelInfo_PointerPointer extends FunctionPointer { + static { Loader.load(); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public CreateKernelV2_OrtCustomOp_OrtApi_OrtKernelInfo_PointerPointer(Pointer p) { super(p); } + protected CreateKernelV2_OrtCustomOp_OrtApi_OrtKernelInfo_PointerPointer() { allocate(); } + private native void allocate(); + public native @Cast("OrtStatusPtr") OrtStatus call(@Const OrtCustomOp op, @Const OrtApi api, + @Const OrtKernelInfo info, + @Cast("void**") PointerPointer kernel); + } + public native CreateKernelV2_OrtCustomOp_OrtApi_OrtKernelInfo_PointerPointer CreateKernelV2(); public native OrtCustomOp CreateKernelV2(CreateKernelV2_OrtCustomOp_OrtApi_OrtKernelInfo_PointerPointer setter); + + // Perform the computation step. + public static class KernelComputeV2_Pointer_OrtKernelContext extends FunctionPointer { + static { Loader.load(); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public KernelComputeV2_Pointer_OrtKernelContext(Pointer p) { super(p); } + protected KernelComputeV2_Pointer_OrtKernelContext() { allocate(); } + private native void allocate(); + public native @Cast("OrtStatusPtr") OrtStatus call(Pointer op_kernel, OrtKernelContext context); + } + public native KernelComputeV2_Pointer_OrtKernelContext KernelComputeV2(); public native OrtCustomOp KernelComputeV2(KernelComputeV2_Pointer_OrtKernelContext setter); } diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtCustomOpDomain.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtCustomOpDomain.java index 37834916763..e0bcc593c51 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtDnnlProviderOptions.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtDnnlProviderOptions.java index e8bb1a3c2cd..d8be3625f96 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtDnnlProviderOptions.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtDnnlProviderOptions.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-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 783456d51cb..2125ffa04d0 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-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 25e31f44493..347ee8aadb6 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtIoBinding.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtIoBinding.java index 3d0940eef25..ee3744f21c7 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtIoBinding.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtIoBinding.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-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 4218d59e090..6dcb81887d0 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-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 3e40fb78f6b..d0c89d21b64 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtLogger.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtLogger.java index 3629f46ae6e..c246151e7e0 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtLogger.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtLogger.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-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 6a967fdc6bb..8698e5e7cdd 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtMIGraphXProviderOptions.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtMIGraphXProviderOptions.java index 61e82d9f8a9..a927e1855ee 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtMIGraphXProviderOptions.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtMIGraphXProviderOptions.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-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 059d7264884..b031228f0de 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-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 b8fe7f9fbc9..d6a587de8d7 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-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 eb9854e5d0b..c7aed58385d 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtOp.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtOp.java index 2aad3195ea2..5b0d723acdb 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtOp.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtOp.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtOpAttr.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtOpAttr.java index 22dc0cb7211..a31af2d5482 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtOpAttr.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtOpAttr.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtOpenVINOProviderOptions.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtOpenVINOProviderOptions.java index 683bf81d9c2..a4bb73ebb35 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtOpenVINOProviderOptions.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtOpenVINOProviderOptions.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtOptionalTypeInfo.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtOptionalTypeInfo.java index f61be4ba30c..69756801eb4 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtOptionalTypeInfo.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtOptionalTypeInfo.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtPrepackedWeightsContainer.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtPrepackedWeightsContainer.java index 66cdd8109e4..a41817bfff4 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtPrepackedWeightsContainer.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtPrepackedWeightsContainer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtROCMProviderOptions.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtROCMProviderOptions.java index 5b82f044558..fbb59d783e0 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtROCMProviderOptions.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtROCMProviderOptions.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; @@ -98,4 +98,9 @@ public class OrtROCMProviderOptions extends Pointer { */ public native int tunable_op_tuning_enable(); public native OrtROCMProviderOptions tunable_op_tuning_enable(int setter); + /** \brief Max tuning duration time limit for each instance of TunableOp. + * Defaults to 0 to disable the limit. + */ + public native int tunable_op_max_tuning_duration_ms(); public native OrtROCMProviderOptions tunable_op_max_tuning_duration_ms(int setter); + } diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtRunOptions.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtRunOptions.java index 9c3e4b3e93f..f784474196b 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-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 53133a04b08..e26ff79b554 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-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 4c75bf15c18..f3595033c54 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-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 0d362fc6a3b..82f440b270f 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtSparseValuesParam.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtSparseValuesParam.java index 812fa276951..5ad548e13d9 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtSparseValuesParam.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtSparseValuesParam.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-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 a0d56d3d690..2d1f63853cf 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtTensorRTProviderOptions.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtTensorRTProviderOptions.java index f5b29062a7a..055c81c9d02 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtTensorRTProviderOptions.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtTensorRTProviderOptions.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtTensorRTProviderOptionsV2.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtTensorRTProviderOptionsV2.java index 141e353303a..8cb473d0658 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtTensorRTProviderOptionsV2.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtTensorRTProviderOptionsV2.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-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 381bf4287f6..741f9afc845 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-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 index d2c4af3a41c..e17e43dbc68 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtThreadPoolParams.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtThreadPoolParams.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtThreadWorkerFn.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtThreadWorkerFn.java index 509551dc085..a975e4b2ba5 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtThreadWorkerFn.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtThreadWorkerFn.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtThreadingOptions.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtThreadingOptions.java index 5767283dda6..ddbd174d04a 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtThreadingOptions.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtThreadingOptions.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtTrainingApi.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtTrainingApi.java index 45f7710c73f..d1ed722ad84 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtTrainingApi.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtTrainingApi.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtTypeInfo.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtTypeInfo.java index 05e5421f7d3..bc3eaf37ba5 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-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 7b6566e8aea..ac437949b01 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/RegisterCustomOpsFn.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/RegisterCustomOpsFn.java index 342f7224dc2..d5d813fae64 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/RegisterCustomOpsFn.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/RegisterCustomOpsFn.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/RunAsyncCallbackFn.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/RunAsyncCallbackFn.java new file mode 100644 index 00000000000..d7c82025425 --- /dev/null +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/RunAsyncCallbackFn.java @@ -0,0 +1,33 @@ +// Targeted by JavaCPP version 1.5.10-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.opencl.*; +import static org.bytedeco.opencl.global.OpenCL.*; +import org.bytedeco.dnnl.*; +import static org.bytedeco.dnnl.global.dnnl.*; + +import static org.bytedeco.onnxruntime.global.onnxruntime.*; + + +/** \brief Callback function for RunAsync + * + * @param user_data [in] User specific data that passed back to the callback + * @param outputs [out] On succeed, outputs host inference results, on error, the value will be nullptr + * @param num_outputs [out] Number of outputs, on error, the value will be zero + * @param status [out] On error, status will provide details + */ +@Properties(inherit = org.bytedeco.onnxruntime.presets.onnxruntime.class) +public class RunAsyncCallbackFn extends FunctionPointer { + static { Loader.load(); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public RunAsyncCallbackFn(Pointer p) { super(p); } + protected RunAsyncCallbackFn() { allocate(); } + private native void allocate(); + public native void call(Pointer user_data, @Cast("OrtValue**") PointerPointer outputs, @Cast("size_t") long num_outputs, @Cast("OrtStatusPtr") OrtStatus status); +} diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/RunOptions.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/RunOptions.java index dcf98650285..27024777ac7 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/SequenceTypeInfo.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/SequenceTypeInfo.java index 568af084047..e7f39122c2e 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/SequenceTypeInfo.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/SequenceTypeInfo.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-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 9748c9b9124..76135760b43 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/SessionImpl.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/SessionImpl.java index 0d73b0108c5..cb39eccad9e 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/SessionImpl.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/SessionImpl.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; @@ -75,6 +75,34 @@ public native void Run(@Const @ByRef RunOptions run_options, @Cast("const char*c /** Wraps OrtApi::RunWithBinding */ public native void Run(@Const @ByRef RunOptions run_options, @Const @ByRef IoBinding arg1); + /** \brief Run the model asynchronously in a thread owned by intra op thread pool + * + * Wraps OrtApi::RunAsync + * + * @param run_options [in] + * @param input_names [in] Array of null terminated UTF8 encoded strings of the input names + * @param input_values [in] Array of Value objects of length input_count + * @param input_count [in] Number of elements in the input_names and inputs arrays + * @param output_names [in] Array of null terminated UTF8 encoded strings of the output names + * @param output_values [out] Array of provided Values to be filled with outputs. + * On calling RunAsync, output_values[i] could either be initialized by a null pointer or a preallocated OrtValue*. + * Later, on invoking the callback, each output_values[i] of null will be filled with an OrtValue* allocated by onnxruntime. + * Then, an OrtValue** pointer will be casted from output_values, and pass to the callback. + * NOTE: it is customer's duty to finally release output_values and each of its member, + * regardless of whether the member (Ort::Value) is allocated by onnxruntime or preallocated by the customer. + * @param output_count [in] Number of elements in the output_names and outputs array + * @param callback [in] Callback function on model run completion + * @param user_data [in] User data that pass back to the callback + */ + public native void RunAsync(@Const @ByRef RunOptions run_options, @Cast("const char*const*") PointerPointer input_names, @Const Value input_values, @Cast("size_t") long input_count, + @Cast("const char*const*") PointerPointer output_names, Value output_values, @Cast("size_t") long output_count, RunAsyncCallbackFn callback, Pointer user_data); + public native void RunAsync(@Const @ByRef RunOptions run_options, @Cast("const char*const*") @ByPtrPtr BytePointer input_names, @Const Value input_values, @Cast("size_t") long input_count, + @Cast("const char*const*") @ByPtrPtr BytePointer output_names, Value output_values, @Cast("size_t") long output_count, RunAsyncCallbackFn callback, Pointer user_data); + public native void RunAsync(@Const @ByRef RunOptions run_options, @Cast("const char*const*") @ByPtrPtr ByteBuffer input_names, @Const Value input_values, @Cast("size_t") long input_count, + @Cast("const char*const*") @ByPtrPtr ByteBuffer output_names, Value output_values, @Cast("size_t") long output_count, RunAsyncCallbackFn callback, Pointer user_data); + public native void RunAsync(@Const @ByRef RunOptions run_options, @Cast("const char*const*") @ByPtrPtr byte[] input_names, @Const Value input_values, @Cast("size_t") long input_count, + @Cast("const char*const*") @ByPtrPtr byte[] output_names, Value output_values, @Cast("size_t") long output_count, RunAsyncCallbackFn callback, Pointer user_data); + /** \brief End profiling and return a copy of the profiling file name. * * @param allocator to allocate memory for the copy of the string returned diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/SessionOptions.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/SessionOptions.java index 16a17bfb4ac..75b6bea9b57 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/SessionOptionsImpl.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/SessionOptionsImpl.java index 428d00a1c8b..3755dd09628 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/SessionOptionsImpl.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/SessionOptionsImpl.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/Shape.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/Shape.java index 07b64480d6b..c74f6e3ebf2 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/Shape.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/Shape.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/Status.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/Status.java index c9c5e77f628..537df4808ac 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/Status.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/Status.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/StringStringMap.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/StringStringMap.java index da8ece4d801..d11c2953ff8 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/StringStringMap.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/StringStringMap.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/StringVector.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/StringVector.java index 2f9642a0848..0c722bf56f1 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/StringVector.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/StringVector.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; @@ -34,6 +34,8 @@ public class StringVector extends Pointer { public void clear() { resize(0); } public native void resize(@Cast("size_t") long n); + public BytePointer front() { return get(0); } + public BytePointer back() { return get(size() - 1); } @Index(function = "at") public native @StdString BytePointer get(@Cast("size_t") long i); public native StringVector put(@Cast("size_t") long i, BytePointer value); @ValueSetter @Index(function = "at") public native StringVector put(@Cast("size_t") long i, @StdString String value); diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/TensorTypeAndShapeInfo.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/TensorTypeAndShapeInfo.java index 472926262b3..f8966f6abd6 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/TensorTypeAndShapeInfoImpl.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/TensorTypeAndShapeInfoImpl.java index 550ed2e9b38..f4189da3910 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/TensorTypeAndShapeInfoImpl.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/TensorTypeAndShapeInfoImpl.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/ThreadingOptions.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/ThreadingOptions.java index 2a7adcc52ab..1e211108ffc 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/ThreadingOptions.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/ThreadingOptions.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-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 2f946f2bae3..4963d15119f 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/TypeInfoImpl.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/TypeInfoImpl.java index ef018cd3ebe..b8b009973ab 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/TypeInfoImpl.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/TypeInfoImpl.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/UnownedAllocator.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/UnownedAllocator.java index d24fb1f0d4e..1d5b0831e87 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/UnownedAllocator.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/UnownedAllocator.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/UnownedMapTypeInfo.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/UnownedMapTypeInfo.java index 27c117bb185..1e98fe3ea5e 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/UnownedMapTypeInfo.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/UnownedMapTypeInfo.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/UnownedMemoryInfo.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/UnownedMemoryInfo.java index b6d1b413798..9007d58a91e 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/UnownedMemoryInfo.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/UnownedMemoryInfo.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/UnownedSequenceTypeInfo.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/UnownedSequenceTypeInfo.java index d67cb2f4b77..e154ec77ac8 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/UnownedSequenceTypeInfo.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/UnownedSequenceTypeInfo.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-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 5b9ea32b43d..0416ed84bd2 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-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 1d5b54739b9..d05085c8d25 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; @@ -93,6 +93,7 @@ public class Value extends ValueImpl { public static native @Name("CreateTensor") @StdMove Value CreateTensorBool(@Const OrtMemoryInfo info, @Cast("bool*") boolean[] p_data, @Cast("size_t") long p_data_element_count, @Cast("const int64_t*") long[] shape, @Cast("size_t") long shape_len); /** \brief Creates a tensor with a user supplied buffer. Wraps OrtApi::CreateTensorWithDataAsOrtValue. + * * @param info Memory description of where the p_data buffer resides (CPU vs GPU etc). * @param p_data Pointer to the data buffer. * @param p_data_byte_count The number of bytes in the data buffer. @@ -107,7 +108,12 @@ public class Value extends ValueImpl { public static native @StdMove Value CreateTensor(@Const OrtMemoryInfo info, Pointer p_data, @Cast("size_t") long p_data_byte_count, @Cast("const int64_t*") long[] shape, @Cast("size_t") long shape_len, @Cast("ONNXTensorElementDataType") int type); - /** \brief Creates a tensor using a supplied OrtAllocator. Wraps OrtApi::CreateTensorAsOrtValue. + /** \brief Creates an OrtValue with a tensor using a supplied OrtAllocator. Wraps OrtApi::CreateTensorAsOrtValue. + * This overload will allocate the buffer for the tensor according to the supplied shape and data type. + * The allocated buffer will be owned by the returned OrtValue and will be freed when the OrtValue is released. + * The input data would need to be copied into the allocated buffer. + * This API is not suitable for strings. + * * \tparam T The numeric datatype. This API is not suitable for strings. * @param allocator The allocator to use. * @param shape Pointer to the tensor shape dimensions. @@ -147,7 +153,12 @@ public class Value extends ValueImpl { public static native @Name("CreateTensor") @StdMove Value CreateTensorBool(OrtAllocator allocator, @Cast("const int64_t*") LongBuffer shape, @Cast("size_t") long shape_len); public static native @Name("CreateTensor") @StdMove Value CreateTensorBool(OrtAllocator allocator, @Cast("const int64_t*") long[] shape, @Cast("size_t") long shape_len); - /** \brief Creates a tensor using a supplied OrtAllocator. Wraps OrtApi::CreateTensorAsOrtValue. + /** \brief Creates an OrtValue with a tensor using the supplied OrtAllocator. + * Wraps OrtApi::CreateTensorAsOrtValue. + * The allocated buffer will be owned by the returned OrtValue and will be freed when the OrtValue is released. + * The input data would need to be copied into the allocated buffer. + * This API is not suitable for strings. + * * @param allocator The allocator to use. * @param shape Pointer to the tensor shape dimensions. * @param shape_len The number of tensor shape dimensions. @@ -157,10 +168,35 @@ public class Value extends ValueImpl { public static native @StdMove Value CreateTensor(OrtAllocator allocator, @Cast("const int64_t*") LongBuffer shape, @Cast("size_t") long shape_len, @Cast("ONNXTensorElementDataType") int type); public static native @StdMove Value CreateTensor(OrtAllocator allocator, @Cast("const int64_t*") long[] shape, @Cast("size_t") long shape_len, @Cast("ONNXTensorElementDataType") int type); + /** \brief Creates an OrtValue with a Map Onnx type representation. + * The API would ref-count the supplied OrtValues and they will be released + * when the returned OrtValue is released. The caller may release keys and values after the call + * returns. + * + * @param keys an OrtValue containing a tensor with primitive data type keys. + * @param values an OrtValue that may contain a tensor. Ort currently supports only primitive data type values. + */ /** Wraps OrtApi::CreateValue */ - public static native @StdMove Value CreateMap(@ByRef Value keys, @ByRef Value values); + public static native @StdMove Value CreateMap(@StdMove Value keys, @StdMove Value values); + + /** \brief Creates an OrtValue with a Sequence Onnx type representation. + * The API would ref-count the supplied OrtValues and they will be released + * when the returned OrtValue is released. The caller may release the values after the call + * returns. + * + * @param values a vector of OrtValues that must have the same Onnx value type. + */ /** Wraps OrtApi::CreateValue */ - public static native @StdMove Value CreateSequence(@ByRef ValueVector values); + public static native @StdMove Value CreateSequence(@StdMove ValueVector values); + + /** \brief Creates an OrtValue wrapping an Opaque type. + * This is used for experimental support of non-tensor types. + * + * \tparam T - the type of the value. + * @param domain - zero terminated utf-8 string. Domain of the type. + * @param type_name - zero terminated utf-8 string. Name of the type. + * @param value - the value to be wrapped. + */ // #if !defined(DISABLE_SPARSE_TENSORS) /**

diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/ValueImpl.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/ValueImpl.java index 4a0634a585b..eac9469e33e 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/ValueImpl.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/ValueImpl.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-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 400e689d46f..7d5e078ef52 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime; @@ -32,6 +32,8 @@ public class ValueVector extends Pointer { public void clear() { resize(0); } public native void resize(@Cast("size_t") long n); + public Value front() { return get(0); } + public Value back() { return get(size() - 1); } @Index(function = "at") public native @StdMove Value get(@Cast("size_t") long i); public native ValueVector put(@Cast("size_t") long i, Value value); 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 5738f400d45..e8ce147a735 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.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.onnxruntime.global; @@ -35,11 +35,11 @@ public class onnxruntime extends org.bytedeco.onnxruntime.presets.onnxruntime { /** \mainpage ONNX Runtime * - * ONNX Runtime is a high-performance inference and training graph execution engine for deeplearning models. + * ONNX Runtime is a high-performance inference and training graph execution engine for deep learning models. * * ONNX Runtime's C, C++ APIs offer an easy to use interface to onboard and execute onnx models. * - \subpage c_cpp_api "Core C, C++ APIs" - * - \subpage training_c_cpp_api "Training C, C++ APIs for learning on the edge" + * - \subpage training_c_cpp_api "Training C, C++ APIs for on-device training" * * \page c_cpp_api Core C, C++ APIs *

C

@@ -67,7 +67,7 @@ public class onnxruntime extends org.bytedeco.onnxruntime.presets.onnxruntime { * * This value is used by some API functions to behave as this version of the header expects. */ -public static final int ORT_API_VERSION = 15; +public static final int ORT_API_VERSION = 16; // #ifdef __cplusplus // #endif @@ -90,6 +90,8 @@ public class onnxruntime extends org.bytedeco.onnxruntime.presets.onnxruntime { // #define _Check_return_ // #define _Outptr_result_maybenull_ // #define _In_reads_(X) +// #define _Inout_updates_(X) +// #define _Out_writes_(X) // #define _Inout_updates_all_(X) // #define _Out_writes_bytes_all_(X) // #define _Out_writes_all_(X) @@ -218,7 +220,12 @@ public class onnxruntime extends org.bytedeco.onnxruntime.presets.onnxruntime { ONNX_TENSOR_ELEMENT_DATA_TYPE_UINT64 = 13, // maps to c type uint64_t ONNX_TENSOR_ELEMENT_DATA_TYPE_COMPLEX64 = 14, // complex with float32 real and imaginary components ONNX_TENSOR_ELEMENT_DATA_TYPE_COMPLEX128 = 15, // complex with float64 real and imaginary components - ONNX_TENSOR_ELEMENT_DATA_TYPE_BFLOAT16 = 16; // Non-IEEE floating-point format based on IEEE754 single-precision + ONNX_TENSOR_ELEMENT_DATA_TYPE_BFLOAT16 = 16, // Non-IEEE floating-point format based on IEEE754 single-precision + // float 8 types were introduced in onnx 1.14, see https://onnx.ai/onnx/technical/float8.html + ONNX_TENSOR_ELEMENT_DATA_TYPE_FLOAT8E4M3FN = 17, // Non-IEEE floating-point format based on IEEE754 single-precision + ONNX_TENSOR_ELEMENT_DATA_TYPE_FLOAT8E4M3FNUZ = 18, // Non-IEEE floating-point format based on IEEE754 single-precision + ONNX_TENSOR_ELEMENT_DATA_TYPE_FLOAT8E5M2 = 19, // Non-IEEE floating-point format based on IEEE754 single-precision + ONNX_TENSOR_ELEMENT_DATA_TYPE_FLOAT8E5M2FNUZ = 20; // Non-IEEE floating-point format based on IEEE754 single-precision // Synced with onnx TypeProto oneof /** enum ONNXType */ @@ -498,6 +505,9 @@ public enum OrtSparseIndicesFormat { // Targeting ../RegisterCustomOpsFn.java +// Targeting ../RunAsyncCallbackFn.java + + // Targeting ../OrtApi.java @@ -534,6 +544,16 @@ public enum OrtSparseIndicesFormat { */ public static native @Platform(extension="-gpu") OrtStatus OrtSessionOptionsAppendExecutionProvider_CUDA( OrtSessionOptions options, int device_id); +/* + * This is the old way to add the ROCm provider to the session, please use + * SessionOptionsAppendExecutionProvider_ROCM above to access the latest functionality + * This function always exists, but will only succeed if Onnxruntime was built with + * HIP support and the ROCm provider shared library exists + * + * \param device_id HIP device id, starts from zero. + */ +public static native OrtStatus OrtSessionOptionsAppendExecutionProvider_ROCM( OrtSessionOptions options, int device_id); + /* * This is the old way to add the MIGraphX provider to the session, please use * SessionOptionsAppendExecutionProvider_MIGraphX above to access the latest functionality @@ -587,6 +607,8 @@ public enum OrtSparseIndicesFormat { // #pragma once // #include "onnxruntime_c_api.h" +// #include "onnxruntime_float16.h" + // #include // #include // #include @@ -670,6 +692,18 @@ public enum OrtSparseIndicesFormat { // Targeting ../BFloat16_t.java +// Targeting ../Float8E4M3FN_t.java + + +// Targeting ../Float8E4M3FNUZ_t.java + + +// Targeting ../Float8E5M2_t.java + + +// Targeting ../Float8E5M2FNUZ_t.java + + // This is used internally by the C++ API. This macro is to make it easy to generate overloaded methods for all of the various OrtRelease* functions for every Ort* type // This can't be done in the C API since C doesn't have function overloading. // #define ORT_DEFINE_RELEASE(NAME) @@ -1107,9 +1141,6 @@ public enum OrtSparseIndicesFormat { // Targeting ../Op.java -// Targeting ../CustomOpApi.java - - // namespace Ort 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 eed07515759..c4f451e0f3d 100644 --- a/onnxruntime/src/main/java/org/bytedeco/onnxruntime/presets/onnxruntime.java +++ b/onnxruntime/src/main/java/org/bytedeco/onnxruntime/presets/onnxruntime.java @@ -42,7 +42,7 @@ value = { @Platform( value = {"linux", "macosx", "windows"}, - compiler = "cpp11", + compiler = "cpp17", define = {"GENERIC_EXCEPTION_CLASS Ort::Exception", "GENERIC_EXCEPTION_TOSTRING what()"}, include = { "onnxruntime/core/session/onnxruntime_c_api.h", @@ -64,16 +64,16 @@ // "onnxruntime/core/providers/rocm/rocm_provider_factory.h", // "onnxruntime/core/providers/dml/dml_provider_factory.h", }, - link = {"onnxruntime_providers_shared", "onnxruntime@.1.15.1"} + link = {"onnxruntime_providers_shared", "onnxruntime@.1.16.0"} ), @Platform( value = {"linux-x86_64", "macosx-x86_64", "windows-x86_64"}, - link = {"onnxruntime_providers_shared", "onnxruntime@.1.15.1", "onnxruntime_providers_dnnl"} + link = {"onnxruntime_providers_shared", "onnxruntime@.1.16.0", "onnxruntime_providers_dnnl"} ), @Platform( value = {"linux-x86_64", "macosx-x86_64", "windows-x86_64"}, extension = "-gpu", - link = {"onnxruntime_providers_shared", "onnxruntime@.1.15.1", "onnxruntime_providers_dnnl", "onnxruntime_providers_cuda"} + link = {"onnxruntime_providers_shared", "onnxruntime@.1.16.0", "onnxruntime_providers_dnnl", "onnxruntime_providers_cuda"} ), }, target = "org.bytedeco.onnxruntime", @@ -117,9 +117,11 @@ public class onnxruntime implements LoadEnabled, InfoMapper { } public void map(InfoMap infoMap) { - infoMap.put(new Info("ORTCHAR_T", "std::basic_string").cppText("").cppTypes().cast().pointerTypes("Pointer")) + infoMap.put(new Info("ORTCHAR_T", "std::basic_string", + "onnxruntime_float16::BFloat16Impl", + "onnxruntime_float16::Float16Impl").cppText("").cppTypes().cast().pointerTypes("Pointer")) .put(new Info("ORT_EXPORT", "ORT_API_CALL", "ORT_FILE", "NO_EXCEPTION", "ORT_ALL_ARGS_NONNULL", "OrtCustomOpApi").cppTypes().annotations()) - .put(new Info("ORT_API_MANUAL_INIT").define(false)) + .put(new Info("ORT_API_MANUAL_INIT", "__cpp_if_constexpr").define(false)) .put(new Info("USE_CUDA", "USE_DNNL").define(true)) .put(new Info("Ort::stub_api", "Ort::Global::api_", "std::nullptr_t", "Ort::Env::s_api", "std::vector").skip()) .put(new Info("Ort::AllocatedStringPtr").valueTypes("@UniquePtr(\"char, Ort::detail::AllocatedFree\") @Cast(\"char*\") BytePointer")) diff --git a/openblas/README.md b/openblas/README.md index 69393b6b235..5ba642bd838 100644 --- a/openblas/README.md +++ b/openblas/README.md @@ -9,7 +9,7 @@ Introduction ------------ This directory contains the JavaCPP Presets module for: - * OpenBLAS 0.3.23 http://www.openblas.net/ + * OpenBLAS 0.3.24 http://www.openblas.net/ Please refer to the parent README.md file for more detailed information about the JavaCPP Presets. @@ -42,7 +42,7 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic 4.0.0 org.bytedeco.openblas openblas - 1.5.9 + 1.5.10-SNAPSHOT ExampleDGELSrowmajor @@ -50,7 +50,7 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic org.bytedeco openblas-platform - 0.3.23-1.5.9 + 0.3.24-1.5.10-SNAPSHOT diff --git a/openblas/cppbuild.sh b/openblas/cppbuild.sh index 5c6a56aa406..59deab3c6ae 100755 --- a/openblas/cppbuild.sh +++ b/openblas/cppbuild.sh @@ -7,7 +7,7 @@ if [[ -z "$PLATFORM" ]]; then exit fi -OPENBLAS_VERSION=0.3.23 +OPENBLAS_VERSION=0.3.24 download https://github.com/xianyi/OpenBLAS/archive/v$OPENBLAS_VERSION.tar.gz OpenBLAS-$OPENBLAS_VERSION.tar.gz @@ -24,8 +24,8 @@ cd OpenBLAS-$OPENBLAS_VERSION cp lapack-netlib/LAPACKE/include/*.h ../include # https://github.com/xianyi/OpenBLAS/issues/3989 -patch -Np1 < ../../../OpenBLAS-cross.patch -patch -Np1 -d ../OpenBLAS-$OPENBLAS_VERSION-nolapack/ < ../../../OpenBLAS-cross.patch +#patch -Np1 < ../../../OpenBLAS-cross.patch +#patch -Np1 -d ../OpenBLAS-$OPENBLAS_VERSION-nolapack/ < ../../../OpenBLAS-cross.patch # remove broken cross-compiler workaround on Mac sedinplace '/if (($os eq "Darwin")/,/}/d' c_check ../OpenBLAS-$OPENBLAS_VERSION-nolapack/c_check @@ -33,6 +33,7 @@ sedinplace 's/common.h/param.h/g' getarch_2nd.c ../OpenBLAS-$OPENBLAS_VERSION-no # blas (requires fortran, e.g. sudo yum install gcc-gfortran) export FEXTRALIB="-lgfortran" +export MAKE_NB_JOBS=$MAKEJ export CROSS_SUFFIX= export HOSTCC=gcc export NO_LAPACK=0 diff --git a/openblas/platform/pom.xml b/openblas/platform/pom.xml index ddf3b7941b4..2844f0d5903 100644 --- a/openblas/platform/pom.xml +++ b/openblas/platform/pom.xml @@ -12,7 +12,7 @@ org.bytedeco openblas-platform - 0.3.23-${project.parent.version} + 0.3.24-${project.parent.version} JavaCPP Presets Platform for OpenBLAS diff --git a/openblas/pom.xml b/openblas/pom.xml index b2bf7c3b1ca..961f90e0678 100644 --- a/openblas/pom.xml +++ b/openblas/pom.xml @@ -11,7 +11,7 @@ org.bytedeco openblas - 0.3.23-${project.parent.version} + 0.3.24-${project.parent.version} JavaCPP Presets for OpenBLAS diff --git a/openblas/samples/pom.xml b/openblas/samples/pom.xml index f27ff6958bb..4121f3ed5d5 100644 --- a/openblas/samples/pom.xml +++ b/openblas/samples/pom.xml @@ -12,7 +12,7 @@ org.bytedeco openblas-platform - 0.3.23-1.5.10-SNAPSHOT + 0.3.24-1.5.10-SNAPSHOT diff --git a/openblas/src/gen/java/org/bytedeco/openblas/global/openblas.java b/openblas/src/gen/java/org/bytedeco/openblas/global/openblas.java index 6afe6a2ffe3..14d78bb577f 100644 --- a/openblas/src/gen/java/org/bytedeco/openblas/global/openblas.java +++ b/openblas/src/gen/java/org/bytedeco/openblas/global/openblas.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.openblas.global; @@ -46,7 +46,7 @@ public class openblas extends org.bytedeco.openblas.presets.openblas { public static final int OPENBLAS_CLOCAL_BUFFER_SIZE = 65536; public static final int OPENBLAS_ZLOCAL_BUFFER_SIZE = 32768; public static final int OPENBLAS_GEMM_MULTITHREAD_THRESHOLD = 4; -public static final String OPENBLAS_VERSION = " OpenBLAS 0.3.23 "; +public static final String OPENBLAS_VERSION = " OpenBLAS 0.3.24 "; /*This is only for "make install" target.*/ // #if defined(OPENBLAS_OS_WINNT) || defined(OPENBLAS_OS_CYGWIN_NT) || defined(OPENBLAS_OS_INTERIX) @@ -9731,6 +9731,55 @@ public static native void LAPACK_zgesdd_base( // #else // #endif + +// #ifdef LAPACK_FORTRAN_STRLEN_END +// #define LAPACK_cgedmd(...) LAPACK_cgedmd_base(__VA_ARGS__, 1, 1, 1, 1) +// #else +// #endif + + + +// #ifdef LAPACK_FORTRAN_STRLEN_END +// #define LAPACK_dgedmd(...) LAPACK_dgedmd_base(__VA_ARGS__, 1, 1, 1, 1) +// #else +// #endif + + +// #ifdef LAPACK_FORTRAN_STRLEN_END +// #define LAPACK_sgedmd(...) LAPACK_sgedmd_base(__VA_ARGS__, 1, 1, 1, 1) +// #else +// #endif + + +// #ifdef LAPACK_FORTRAN_STRLEN_END +// #define LAPACK_zgedmd(...) LAPACK_zgedmd_base(__VA_ARGS__, 1, 1, 1, 1) +// #else +// #endif + + +// #ifdef LAPACK_FORTRAN_STRLEN_END +// #define LAPACK_cgedmdq(...) LAPACK_cgedmdq_base(__VA_ARGS__, 1, 1, 1, 1, 1, 1) +// #else +// #endif + + +// #ifdef LAPACK_FORTRAN_STRLEN_END +// #define LAPACK_dgedmdq(...) LAPACK_dgedmdq_base(__VA_ARGS__, 1, 1, 1, 1, 1, 1) +// #else +// #endif + + +// #ifdef LAPACK_FORTRAN_STRLEN_END +// #define LAPACK_sgedmdq(...) LAPACK_sgedmdq_base(__VA_ARGS__, 1, 1, 1, 1, 1, 1) +// #else +// #endif + + +// #ifdef LAPACK_FORTRAN_STRLEN_END +// #define LAPACK_zgedmdq(...) LAPACK_zgedmdq_base(__VA_ARGS__, 1, 1, 1, 1, 1, 1) +// #else +// #endif + public static native int LAPACK_cgesv( @Const IntPointer n, @Const IntPointer nrhs, @Cast("lapack_complex_float*") FloatPointer A, @Const IntPointer lda, IntPointer ipiv, @@ -33512,6 +33561,10 @@ public static native void LAPACK_sorgtr_base( + + + + public static native void LAPACK_dormbr_base( @Cast("const char*") BytePointer vect, @Cast("const char*") BytePointer side, @Cast("const char*") BytePointer trans, @Const IntPointer m, @Const IntPointer n, @Const IntPointer k, @@ -63298,7 +63351,7 @@ public static native void LAPACK_ztrevc_base( int[] info, @Cast("size_t") long arg15, @Cast("size_t") long arg16 ); // #ifdef LAPACK_FORTRAN_STRLEN_END -// #define LAPACK_ztrevc(...) LAPACK_ztrevc_base(__VA_ARGS__, 1, 1) +// #define LAPACK_ztrevc(...) LAPACK_ztrevc_base(__VA_ARGS__, (size_t)1, 1) // #else // #endif @@ -66810,6 +66863,10 @@ public static native void LAPACK_zungtr_base( + + + + public static native void LAPACK_cunmbr_base( @Cast("const char*") BytePointer vect, @Cast("const char*") BytePointer side, @Cast("const char*") BytePointer trans, @Const IntPointer m, @Const IntPointer n, @Const IntPointer k, @@ -70217,7 +70274,7 @@ public static native int LAPACKE_zgesvdx( int matrix_layout, @Cast("char") byte - + public static native int LAPACKE_sgesvj( int matrix_layout, @Cast("char") byte joba, @Cast("char") byte jobu, @Cast("char") byte jobv, int m, int n, FloatPointer a, int lda, FloatPointer sva, int mv, FloatPointer v, int ldv, @@ -82341,6 +82398,22 @@ public static native int LAPACKE_zgesdd_work( int matrix_layout, @Cast("char") b @Cast("lapack_complex_double*") double[] work, int lwork, double[] rwork, int[] iwork ); + + + + + + + + + + + + + + + + public static native int LAPACKE_sgesv_work( int matrix_layout, int n, int nrhs, FloatPointer a, int lda, IntPointer ipiv, FloatPointer b, int ldb ); @@ -82588,7 +82661,7 @@ public static native int LAPACKE_zgesvdx_work( int matrix_layout, @Cast("char") - + public static native int LAPACKE_sgesvj_work( int matrix_layout, @Cast("char") byte joba, @Cast("char") byte jobu, @Cast("char") byte jobv, int m, int n, FloatPointer a, int lda, FloatPointer sva, int mv, @@ -100602,15 +100675,15 @@ public static native int LAPACKE_zhegv_2stage_work( int matrix_layout, int itype //LAPACK 3.8.0 public static native int LAPACKE_ssysv_aa_2stage( int matrix_layout, @Cast("char") byte uplo, int n, int nrhs, FloatPointer a, int lda, - FloatPointer tb, int ltb, IntPointer ipiv, + FloatPointer tb, int ltb, IntPointer ipiv, IntPointer ipiv2, FloatPointer b, int ldb ); public static native int LAPACKE_ssysv_aa_2stage( int matrix_layout, @Cast("char") byte uplo, int n, int nrhs, FloatBuffer a, int lda, - FloatBuffer tb, int ltb, IntBuffer ipiv, + FloatBuffer tb, int ltb, IntBuffer ipiv, IntBuffer ipiv2, FloatBuffer b, int ldb ); public static native int LAPACKE_ssysv_aa_2stage( int matrix_layout, @Cast("char") byte uplo, int n, int nrhs, float[] a, int lda, - float[] tb, int ltb, int[] ipiv, + float[] tb, int ltb, int[] ipiv, int[] ipiv2, float[] b, int ldb ); public static native int LAPACKE_ssysv_aa_2stage_work( int matrix_layout, @Cast("char") byte uplo, int n, int nrhs, FloatPointer a, int lda, @@ -100630,17 +100703,17 @@ public static native int LAPACKE_ssysv_aa_2stage_work( int matrix_layout, @Cast( public static native int LAPACKE_dsysv_aa_2stage( int matrix_layout, @Cast("char") byte uplo, int n, int nrhs, DoublePointer a, int lda, DoublePointer tb, int ltb, - IntPointer ipiv, IntPointer ipiv2, + IntPointer ipiv, IntPointer ipiv2, DoublePointer b, int ldb ); public static native int LAPACKE_dsysv_aa_2stage( int matrix_layout, @Cast("char") byte uplo, int n, int nrhs, DoubleBuffer a, int lda, DoubleBuffer tb, int ltb, - IntBuffer ipiv, IntBuffer ipiv2, + IntBuffer ipiv, IntBuffer ipiv2, DoubleBuffer b, int ldb ); public static native int LAPACKE_dsysv_aa_2stage( int matrix_layout, @Cast("char") byte uplo, int n, int nrhs, double[] a, int lda, double[] tb, int ltb, - int[] ipiv, int[] ipiv2, + int[] ipiv, int[] ipiv2, double[] b, int ldb ); public static native int LAPACKE_dsysv_aa_2stage_work( int matrix_layout, @Cast("char") byte uplo, int n, int nrhs, DoublePointer a, int lda, @@ -100792,18 +100865,18 @@ public static native int LAPACKE_zhesv_aa_2stage_work( int matrix_layout, @Cast( int ltb, int[] ipiv, int[] ipiv2, @Cast("lapack_complex_double*") double[] b, int ldb, @Cast("lapack_complex_double*") double[] work, int lwork ); - + public static native int LAPACKE_ssytrf_aa_2stage( int matrix_layout, @Cast("char") byte uplo, int n, FloatPointer a, int lda, - FloatPointer tb, int ltb, IntPointer ipiv, + FloatPointer tb, int ltb, IntPointer ipiv, IntPointer ipiv2 ); public static native int LAPACKE_ssytrf_aa_2stage( int matrix_layout, @Cast("char") byte uplo, int n, FloatBuffer a, int lda, - FloatBuffer tb, int ltb, IntBuffer ipiv, + FloatBuffer tb, int ltb, IntBuffer ipiv, IntBuffer ipiv2 ); public static native int LAPACKE_ssytrf_aa_2stage( int matrix_layout, @Cast("char") byte uplo, int n, float[] a, int lda, - float[] tb, int ltb, int[] ipiv, + float[] tb, int ltb, int[] ipiv, int[] ipiv2 ); public static native int LAPACKE_ssytrf_aa_2stage_work( int matrix_layout, @Cast("char") byte uplo, int n, FloatPointer a, int lda, @@ -100959,15 +101032,15 @@ public static native int LAPACKE_zhetrf_aa_2stage_work( int matrix_layout, @Cast public static native int LAPACKE_ssytrs_aa_2stage( int matrix_layout, @Cast("char") byte uplo, int n, int nrhs, FloatPointer a, int lda, - FloatPointer tb, int ltb, IntPointer ipiv, + FloatPointer tb, int ltb, IntPointer ipiv, IntPointer ipiv2, FloatPointer b, int ldb ); public static native int LAPACKE_ssytrs_aa_2stage( int matrix_layout, @Cast("char") byte uplo, int n, int nrhs, FloatBuffer a, int lda, - FloatBuffer tb, int ltb, IntBuffer ipiv, + FloatBuffer tb, int ltb, IntBuffer ipiv, IntBuffer ipiv2, FloatBuffer b, int ldb ); public static native int LAPACKE_ssytrs_aa_2stage( int matrix_layout, @Cast("char") byte uplo, int n, int nrhs, float[] a, int lda, - float[] tb, int ltb, int[] ipiv, + float[] tb, int ltb, int[] ipiv, int[] ipiv2, float[] b, int ldb ); public static native int LAPACKE_ssytrs_aa_2stage_work( int matrix_layout, @Cast("char") byte uplo, int n, int nrhs, FloatPointer a, int lda, @@ -100984,17 +101057,17 @@ public static native int LAPACKE_ssytrs_aa_2stage_work( int matrix_layout, @Cast public static native int LAPACKE_dsytrs_aa_2stage( int matrix_layout, @Cast("char") byte uplo, int n, int nrhs, DoublePointer a, int lda, DoublePointer tb, int ltb, - IntPointer ipiv, IntPointer ipiv2, + IntPointer ipiv, IntPointer ipiv2, DoublePointer b, int ldb ); public static native int LAPACKE_dsytrs_aa_2stage( int matrix_layout, @Cast("char") byte uplo, int n, int nrhs, DoubleBuffer a, int lda, DoubleBuffer tb, int ltb, - IntBuffer ipiv, IntBuffer ipiv2, + IntBuffer ipiv, IntBuffer ipiv2, DoubleBuffer b, int ldb ); public static native int LAPACKE_dsytrs_aa_2stage( int matrix_layout, @Cast("char") byte uplo, int n, int nrhs, double[] a, int lda, double[] tb, int ltb, - int[] ipiv, int[] ipiv2, + int[] ipiv, int[] ipiv2, double[] b, int ldb ); public static native int LAPACKE_dsytrs_aa_2stage_work( int matrix_layout, @Cast("char") byte uplo, int n, int nrhs, DoublePointer a, int lda, @@ -101131,7 +101204,16 @@ public static native int LAPACKE_zhetrs_aa_2stage_work( int matrix_layout, @Cast int lda, @Cast("lapack_complex_double*") double[] tb, int ltb, int[] ipiv, int[] ipiv2, @Cast("lapack_complex_double*") double[] b, int ldb ); - +//LAPACK 3.10.0 + + + + + + + + + /* APIs for set/get nancheck flags */ public static native void LAPACKE_set_nancheck( int flag ); public static native int LAPACKE_get_nancheck( ); diff --git a/openblas/src/gen/java/org/bytedeco/openblas/global/openblas_nolapack.java b/openblas/src/gen/java/org/bytedeco/openblas/global/openblas_nolapack.java index b412ee4b52a..8f17bb43d3e 100644 --- a/openblas/src/gen/java/org/bytedeco/openblas/global/openblas_nolapack.java +++ b/openblas/src/gen/java/org/bytedeco/openblas/global/openblas_nolapack.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.openblas.global; @@ -45,7 +45,7 @@ public class openblas_nolapack extends org.bytedeco.openblas.presets.openblas_no public static final int OPENBLAS_CLOCAL_BUFFER_SIZE = 65536; public static final int OPENBLAS_ZLOCAL_BUFFER_SIZE = 32768; public static final int OPENBLAS_GEMM_MULTITHREAD_THRESHOLD = 4; -public static final String OPENBLAS_VERSION = " OpenBLAS 0.3.23 "; +public static final String OPENBLAS_VERSION = " OpenBLAS 0.3.24 "; /*This is only for "make install" target.*/ // #if defined(OPENBLAS_OS_WINNT) || defined(OPENBLAS_OS_CYGWIN_NT) || defined(OPENBLAS_OS_INTERIX) diff --git a/openblas/src/main/java/org/bytedeco/openblas/presets/openblas_nolapack.java b/openblas/src/main/java/org/bytedeco/openblas/presets/openblas_nolapack.java index 426cea99c6b..a90cbccbfbc 100644 --- a/openblas/src/main/java/org/bytedeco/openblas/presets/openblas_nolapack.java +++ b/openblas/src/main/java/org/bytedeco/openblas/presets/openblas_nolapack.java @@ -147,6 +147,7 @@ public class openblas_nolapack implements LoadEnabled, InfoMapper { "cgetsqrhrt", "dgetsqrhrt", "sgetsqrhrt", "zgetsqrhrt", "dorgtsqr_row", "sorgtsqr_row", "cungtsqr_row", "zungtsqr_row", "clangb", "dlangb", "slangb", "zlangb", "ctrsyl3", "dtrsyl3", "strsyl3", "ztrsyl3", "ctz_trans", "dtz_trans", "stz_trans", "ztz_trans", "ctz_nancheck", "dtz_nancheck", "stz_nancheck", "ztz_nancheck", + "sgedmd", "dgedmd", "cgedmd", "zgedmd", "sgedmdq", "dgedmdq", "cgedmdq", "zgedmdq", "sorhr_col", "dorhr_col", "cunhr_col", "zunhr_col", // deprecated "cgegs", "cggsvd", "ctzrqf", "dgeqpf", "dlatzm", "sgelsx", "slahrd", "zgegv", "zggsvp", "cgegv", "cggsvp", "dgegs", "dggsvd", "dtzrqf", "sgeqpf", "slatzm", "zgelsx", "zlahrd", diff --git a/opencv/README.md b/opencv/README.md index 28e3c671e86..30936023e2c 100644 --- a/opencv/README.md +++ b/opencv/README.md @@ -77,7 +77,7 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic org.bytedeco numpy-platform - 1.25.1-1.5.10-SNAPSHOT + 1.25.2-1.5.10-SNAPSHOT diff --git a/opencv/platform/gpu/pom.xml b/opencv/platform/gpu/pom.xml index 3a657fe6b95..5b9619888f9 100644 --- a/opencv/platform/gpu/pom.xml +++ b/opencv/platform/gpu/pom.xml @@ -24,7 +24,7 @@ org.bytedeco openblas-platform - 0.3.23-${project.parent.version} + 0.3.24-${project.parent.version} ${project.groupId} diff --git a/opencv/platform/pom.xml b/opencv/platform/pom.xml index d7c2e4adfb9..442a19e22a8 100644 --- a/opencv/platform/pom.xml +++ b/opencv/platform/pom.xml @@ -23,7 +23,7 @@ org.bytedeco openblas-platform - 0.3.23-${project.parent.version} + 0.3.24-${project.parent.version} ${project.groupId} diff --git a/opencv/pom.xml b/opencv/pom.xml index 716ff5bea42..0b248728141 100644 --- a/opencv/pom.xml +++ b/opencv/pom.xml @@ -18,12 +18,12 @@ org.bytedeco openblas - 0.3.23-${project.parent.version} + 0.3.24-${project.parent.version} org.bytedeco numpy - 1.25.1-${project.parent.version} + 1.25.2-${project.parent.version} true @@ -62,12 +62,12 @@ org.bytedeco openblas-platform - 0.3.23-${project.parent.version} + 0.3.24-${project.parent.version} org.bytedeco numpy-platform - 1.25.1-${project.parent.version} + 1.25.2-${project.parent.version} diff --git a/opencv/samples/pom.xml b/opencv/samples/pom.xml index cacfaee3e50..25e26a76621 100644 --- a/opencv/samples/pom.xml +++ b/opencv/samples/pom.xml @@ -40,7 +40,7 @@ org.bytedeco numpy-platform - 1.25.1-1.5.10-SNAPSHOT + 1.25.2-1.5.10-SNAPSHOT diff --git a/platform/pom.xml b/platform/pom.xml index 2a0590844f4..608fe7e3f34 100644 --- a/platform/pom.xml +++ b/platform/pom.xml @@ -187,7 +187,7 @@ org.bytedeco openblas-platform - 0.3.23-${project.version} + 0.3.24-${project.version} org.bytedeco @@ -212,17 +212,17 @@ org.bytedeco cpython-platform - 3.11.4-${project.version} + 3.11.5-${project.version} org.bytedeco numpy-platform - 1.25.1-${project.version} + 1.25.2-${project.version} org.bytedeco scipy-platform - 1.11.1-${project.version} + 1.11.2-${project.version} @@ -232,7 +232,7 @@ org.bytedeco llvm-platform - 17.0.0-${project.version} + 17.0.1-${project.version} org.bytedeco @@ -332,7 +332,7 @@ org.bytedeco onnx-platform - 1.14.0-${project.version} + 1.14.1-${project.version} @@ -342,7 +342,7 @@ org.bytedeco onnxruntime-platform - 1.15.1-${project.version} + 1.16.0-${project.version} org.bytedeco diff --git a/pytorch/platform/gpu/pom.xml b/pytorch/platform/gpu/pom.xml index afa003eb5a8..6747350ad93 100644 --- a/pytorch/platform/gpu/pom.xml +++ b/pytorch/platform/gpu/pom.xml @@ -29,12 +29,12 @@ org.bytedeco openblas-platform - 0.3.23-${project.parent.version} + 0.3.24-${project.parent.version} org.bytedeco numpy-platform - 1.25.1-${project.parent.version} + 1.25.2-${project.parent.version} true diff --git a/pytorch/platform/pom.xml b/pytorch/platform/pom.xml index 318a0a846c2..3df21ed15eb 100644 --- a/pytorch/platform/pom.xml +++ b/pytorch/platform/pom.xml @@ -28,12 +28,12 @@ org.bytedeco openblas-platform - 0.3.23-${project.parent.version} + 0.3.24-${project.parent.version} org.bytedeco numpy-platform - 1.25.1-${project.parent.version} + 1.25.2-${project.parent.version} true diff --git a/pytorch/pom.xml b/pytorch/pom.xml index 82c2f3a0ba2..144ae0686c8 100644 --- a/pytorch/pom.xml +++ b/pytorch/pom.xml @@ -22,12 +22,12 @@ org.bytedeco openblas - 0.3.23-${project.parent.version} + 0.3.24-${project.parent.version} org.bytedeco numpy - 1.25.1-${project.parent.version} + 1.25.2-${project.parent.version} true @@ -47,12 +47,12 @@ org.bytedeco openblas-platform - 0.3.23-${project.parent.version} + 0.3.24-${project.parent.version} org.bytedeco numpy-platform - 1.25.1-${project.parent.version} + 1.25.2-${project.parent.version} diff --git a/scipy/README.md b/scipy/README.md index 1be3657c5f1..bc7d83775bb 100644 --- a/scipy/README.md +++ b/scipy/README.md @@ -9,7 +9,7 @@ Introduction ------------ This directory contains the JavaCPP Presets module for: - * SciPy 1.11.1 https://www.scipy.org/ + * SciPy 1.11.2 https://www.scipy.org/ Please refer to the parent README.md file for more detailed information about the JavaCPP Presets. @@ -48,7 +48,7 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic org.bytedeco scipy-platform - 1.11.1-1.5.10-SNAPSHOT + 1.11.2-1.5.10-SNAPSHOT diff --git a/scipy/cppbuild.sh b/scipy/cppbuild.sh index 9c2e9fca637..f37a3587cc2 100755 --- a/scipy/cppbuild.sh +++ b/scipy/cppbuild.sh @@ -8,7 +8,7 @@ if [[ -z "$PLATFORM" ]]; then fi BOOST=1_75_0 -SCIPY_VERSION=1.11.1 +SCIPY_VERSION=1.11.2 download http://downloads.sourceforge.net/project/boost/boost/${BOOST//_/.}/boost_$BOOST.tar.gz boost_$BOOST.tar.gz download https://github.com/scipy/HiGHS/archive/refs/heads/main.tar.gz HiGHS-main.tar.gz download https://github.com/scipy/unuran/archive/refs/heads/main.tar.gz unuran-main.tar.gz @@ -63,6 +63,7 @@ cd scipy-$SCIPY_VERSION mkdir -p scipy/_lib/boost_math/include cp -a scipy/_lib/boost_math/boost scipy/_lib/boost_math/include +mv _setup.py setup.py # prevent setuptools from trying to build NumPy sedinplace '/req_np/d' setup.py @@ -105,7 +106,7 @@ if ! $PYTHON_BIN_PATH -m pip install --no-deps --target=$PYTHON_LIB_PATH $TOOLS; echo "extra_link_args = -lgfortran" >> site.cfg chmod +x "$CPYTHON_HOST_PATH/bin/python3.11" export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$CPYTHON_HOST_PATH/lib/:$CPYTHON_HOST_PATH" - "$CPYTHON_HOST_PATH/bin/python3.11" -m pip install --no-deps --target="$CPYTHON_HOST_PATH/lib/python3.11/" crossenv==1.0 numpy==1.25.1 $TOOLS + "$CPYTHON_HOST_PATH/bin/python3.11" -m pip install --no-deps --target="$CPYTHON_HOST_PATH/lib/python3.11/" crossenv==1.4 numpy==1.25.2 $TOOLS "$CPYTHON_HOST_PATH/bin/python3.11" -m crossenv "$PYTHON_BIN_PATH" crossenv cp -a "$NUMPY_PATH/python/numpy" "$CPYTHON_HOST_PATH/lib/python3.11/" # cp -a "$CPYTHON_HOST_PATH/lib/python3.11/include" "$PYTHON_LIB_PATH" diff --git a/scipy/platform/pom.xml b/scipy/platform/pom.xml index 50c32117dc7..1803f8ceaae 100644 --- a/scipy/platform/pom.xml +++ b/scipy/platform/pom.xml @@ -12,7 +12,7 @@ org.bytedeco scipy-platform - 1.11.1-${project.parent.version} + 1.11.2-${project.parent.version} JavaCPP Presets Platform for SciPy @@ -23,7 +23,7 @@ org.bytedeco numpy-platform - 1.25.1-${project.parent.version} + 1.25.2-${project.parent.version} ${project.groupId} diff --git a/scipy/pom.xml b/scipy/pom.xml index 1dfe25fed9a..55a0277c19f 100644 --- a/scipy/pom.xml +++ b/scipy/pom.xml @@ -11,14 +11,14 @@ org.bytedeco scipy - 1.11.1-${project.parent.version} + 1.11.2-${project.parent.version} JavaCPP Presets for SciPy org.bytedeco numpy - 1.25.1-${project.parent.version} + 1.25.2-${project.parent.version} org.bytedeco @@ -41,24 +41,24 @@ org.bytedeco numpy - 1.25.1-${project.parent.version} + 1.25.2-${project.parent.version} org.bytedeco openblas - 0.3.23-${project.parent.version} + 0.3.24-${project.parent.version} ${javacpp.platform} org.bytedeco cpython - 3.11.4-${project.parent.version} + 3.11.5-${project.parent.version} ${javacpp.platform} org.bytedeco numpy - 1.25.1-${project.parent.version} + 1.25.2-${project.parent.version} ${javacpp.platform} @@ -177,7 +177,7 @@ org.bytedeco cpython - 3.11.4-${project.parent.version} + 3.11.5-${project.parent.version} ${os.name}-${os.arch} diff --git a/scipy/samples/pom.xml b/scipy/samples/pom.xml index 4a7bb84fe68..7d44ccb35dc 100644 --- a/scipy/samples/pom.xml +++ b/scipy/samples/pom.xml @@ -12,7 +12,7 @@ org.bytedeco scipy-platform - 1.11.1-1.5.10-SNAPSHOT + 1.11.2-1.5.10-SNAPSHOT diff --git a/tvm/cppbuild.sh b/tvm/cppbuild.sh index 66003ab286a..76fa1e076e1 100755 --- a/tvm/cppbuild.sh +++ b/tvm/cppbuild.sh @@ -112,7 +112,7 @@ if [[ -f $f ]]; then chmod +x $LLVM_PATH/bin/llvm-config* fi if [[ -f "$LLVM_PATH/lib/libLLVM.dylib" ]]; then - ln -sf libLLVM.dylib $LLVM_PATH/lib/libLLVM-17rc.dylib + ln -sf libLLVM.dylib $LLVM_PATH/lib/libLLVM-17.dylib fi if [[ -f "$LLVM_PATH/lib/LTO.lib" ]]; then ln -sf LTO.lib $LLVM_PATH/lib/LLVM.lib diff --git a/tvm/platform/gpu/pom.xml b/tvm/platform/gpu/pom.xml index 09b5fc7d845..f40d2661d24 100644 --- a/tvm/platform/gpu/pom.xml +++ b/tvm/platform/gpu/pom.xml @@ -29,7 +29,7 @@ org.bytedeco llvm-platform - 17.0.0-${project.parent.version} + 17.0.1-${project.parent.version} org.bytedeco @@ -39,7 +39,7 @@ org.bytedeco scipy-platform - 1.11.1-${project.parent.version} + 1.11.2-${project.parent.version} org.bytedeco diff --git a/tvm/platform/pom.xml b/tvm/platform/pom.xml index 6e4f884939f..e85900db169 100644 --- a/tvm/platform/pom.xml +++ b/tvm/platform/pom.xml @@ -28,7 +28,7 @@ org.bytedeco llvm-platform - 17.0.0-${project.parent.version} + 17.0.1-${project.parent.version} org.bytedeco @@ -38,7 +38,7 @@ org.bytedeco scipy-platform - 1.11.1-${project.parent.version} + 1.11.2-${project.parent.version} org.bytedeco diff --git a/tvm/pom.xml b/tvm/pom.xml index 1b64570e31e..49fa631ec1f 100644 --- a/tvm/pom.xml +++ b/tvm/pom.xml @@ -23,7 +23,7 @@ org.bytedeco llvm - 17.0.0-${project.parent.version} + 17.0.1-${project.parent.version} org.bytedeco @@ -33,7 +33,7 @@ org.bytedeco scipy - 1.11.1-${project.parent.version} + 1.11.2-${project.parent.version} org.bytedeco @@ -61,7 +61,7 @@ org.bytedeco llvm-platform - 17.0.0-${project.parent.version} + 17.0.1-${project.parent.version} org.bytedeco @@ -76,7 +76,7 @@ org.bytedeco scipy-platform - 1.11.1-${project.parent.version} + 1.11.2-${project.parent.version}