From 1b963b20b19eb0f922609f7d5b263e1b8df86927 Mon Sep 17 00:00:00 2001 From: Samuel Audet Date: Sun, 6 Oct 2024 20:36:54 +0900 Subject: [PATCH] * Upgrade presets for CPython 3.12.7, NumPy 2.1.2, SciPy 1.14.1, ONNX 1.17.0, ONNX Runtime 1.19.2 --- CHANGELOG.md | 2 +- README.md | 8 +- cpython/README.md | 4 +- cpython/cppbuild.sh | 4 +- cpython/platform/pom.xml | 2 +- cpython/pom.xml | 2 +- cpython/samples/pom.xml | 2 +- .../org/bytedeco/cpython/global/python.java | 4 +- numpy/README.md | 4 +- numpy/cppbuild.sh | 2 +- numpy/platform/pom.xml | 4 +- numpy/pom.xml | 10 +- numpy/samples/pom.xml | 2 +- .../numpy/PyArrayMultiIterObject.java | 2 +- .../org/bytedeco/numpy/PyUFuncObject.java | 7 +- .../numpy/PyUFunc_ProcessCoreDimsFunc.java | 58 +++++++ .../java/org/bytedeco/numpy/global/numpy.java | 42 +++-- .../org/bytedeco/numpy/presets/numpy.java | 6 +- onnx/README.md | 4 +- onnx/cppbuild.sh | 2 +- onnx/platform/pom.xml | 4 +- onnx/pom.xml | 6 +- onnx/samples/pom.xml | 2 +- .../org/bytedeco/onnx/Acos_Onnx_ver22.java | 19 +++ .../org/bytedeco/onnx/Acosh_Onnx_ver22.java | 19 +++ .../org/bytedeco/onnx/Asin_Onnx_ver22.java | 19 +++ .../org/bytedeco/onnx/Asinh_Onnx_ver22.java | 19 +++ .../org/bytedeco/onnx/Atan_Onnx_ver22.java | 19 +++ .../org/bytedeco/onnx/Atanh_Onnx_ver22.java | 19 +++ .../bytedeco/onnx/AveragePool_Onnx_ver22.java | 19 +++ .../bytedeco/onnx/Bernoulli_Onnx_ver22.java | 19 +++ .../onnx/ConvTranspose_Onnx_ver22.java | 19 +++ .../org/bytedeco/onnx/Conv_Onnx_ver22.java | 19 +++ .../org/bytedeco/onnx/Cos_Onnx_ver22.java | 19 +++ .../org/bytedeco/onnx/Cosh_Onnx_ver22.java | 19 +++ .../bytedeco/onnx/DeformConv_Onnx_ver22.java | 19 +++ .../org/bytedeco/onnx/Det_Onnx_ver22.java | 19 +++ .../org/bytedeco/onnx/Dropout_Onnx_ver22.java | 19 +++ .../org/bytedeco/onnx/Elu_Onnx_ver22.java | 19 +++ .../org/bytedeco/onnx/EyeLike_Onnx_ver22.java | 21 +++ .../org/bytedeco/onnx/GRU_Onnx_ver22.java | 19 +++ .../onnx/GlobalAveragePool_Onnx_ver22.java | 19 +++ .../onnx/GlobalLpPool_Onnx_ver22.java | 19 +++ .../onnx/GlobalMaxPool_Onnx_ver22.java | 19 +++ .../bytedeco/onnx/GridSample_Onnx_ver22.java | 19 +++ .../bytedeco/onnx/HardSigmoid_Onnx_ver22.java | 19 +++ .../bytedeco/onnx/HardSwish_Onnx_ver22.java | 19 +++ .../org/bytedeco/onnx/InferenceContext.java | 2 + .../InstanceNormalization_Onnx_ver22.java | 19 +++ .../org/bytedeco/onnx/LSTM_Onnx_ver22.java | 19 +++ .../onnx/LpNormalization_Onnx_ver22.java | 19 +++ .../org/bytedeco/onnx/LpPool_Onnx_ver22.java | 19 +++ .../org/bytedeco/onnx/MaxPool_Onnx_ver22.java | 19 +++ .../bytedeco/onnx/MaxRoiPool_Onnx_ver22.java | 19 +++ .../bytedeco/onnx/MaxUnpool_Onnx_ver22.java | 19 +++ .../org/bytedeco/onnx/Mish_Onnx_ver22.java | 19 +++ .../bytedeco/onnx/Multinomial_Onnx_ver22.java | 19 +++ .../NegativeLogLikelihoodLoss_Onnx_ver22.java | 19 +++ .../gen/java/org/bytedeco/onnx/OpSchema.java | 6 + .../org/bytedeco/onnx/OpSet_Onnx_ver22.java | 33 ++++ .../org/bytedeco/onnx/RNN_Onnx_ver22.java | 19 +++ .../onnx/RandomNormalLike_Onnx_ver22.java | 19 +++ .../onnx/RandomNormal_Onnx_ver22.java | 19 +++ .../onnx/RandomUniformLike_Onnx_ver22.java | 19 +++ .../onnx/RandomUniform_Onnx_ver22.java | 19 +++ .../bytedeco/onnx/RoiAlign_Onnx_ver22.java | 19 +++ .../org/bytedeco/onnx/Round_Onnx_ver22.java | 19 +++ .../org/bytedeco/onnx/Selu_Onnx_ver22.java | 19 +++ .../org/bytedeco/onnx/Sin_Onnx_ver22.java | 19 +++ .../org/bytedeco/onnx/Sinh_Onnx_ver22.java | 19 +++ .../bytedeco/onnx/Softplus_Onnx_ver22.java | 19 +++ .../bytedeco/onnx/Softsign_Onnx_ver22.java | 19 +++ .../org/bytedeco/onnx/Tan_Onnx_ver22.java | 19 +++ .../onnx/ThresholdedRelu_Onnx_ver22.java | 19 +++ .../java/org/bytedeco/onnx/global/onnx.java | 148 ++++++++++++++++++ onnxruntime/README.md | 6 +- onnxruntime/cppbuild.sh | 2 +- onnxruntime/onnxruntime.patch | 51 +++--- onnxruntime/platform/gpu/pom.xml | 2 +- onnxruntime/platform/pom.xml | 2 +- onnxruntime/pom.xml | 2 +- onnxruntime/samples/pom.xml | 4 +- .../java/org/bytedeco/onnxruntime/OrtApi.java | 26 +-- .../onnxruntime/OrtCUDAProviderOptions.java | 4 +- .../OrtMIGraphXProviderOptions.java | 4 + .../onnxruntime/OrtROCMProviderOptions.java | 4 +- .../onnxruntime/ShapeInferContext.java | 1 + .../onnxruntime/global/onnxruntime.java | 7 +- .../onnxruntime/presets/onnxruntime.java | 6 +- opencv/README.md | 2 +- opencv/pom.xml | 4 +- opencv/samples/pom.xml | 2 +- platform/pom.xml | 10 +- pytorch/pom.xml | 4 +- scipy/README.md | 4 +- scipy/cppbuild.sh | 4 +- scipy/platform/pom.xml | 4 +- scipy/pom.xml | 12 +- scipy/samples/pom.xml | 2 +- tvm/platform/gpu/pom.xml | 2 +- tvm/platform/pom.xml | 2 +- tvm/pom.xml | 4 +- 102 files changed, 1326 insertions(+), 137 deletions(-) create mode 100644 numpy/src/gen/java/org/bytedeco/numpy/PyUFunc_ProcessCoreDimsFunc.java create mode 100644 onnx/src/gen/java/org/bytedeco/onnx/Acos_Onnx_ver22.java create mode 100644 onnx/src/gen/java/org/bytedeco/onnx/Acosh_Onnx_ver22.java create mode 100644 onnx/src/gen/java/org/bytedeco/onnx/Asin_Onnx_ver22.java create mode 100644 onnx/src/gen/java/org/bytedeco/onnx/Asinh_Onnx_ver22.java create mode 100644 onnx/src/gen/java/org/bytedeco/onnx/Atan_Onnx_ver22.java create mode 100644 onnx/src/gen/java/org/bytedeco/onnx/Atanh_Onnx_ver22.java create mode 100644 onnx/src/gen/java/org/bytedeco/onnx/AveragePool_Onnx_ver22.java create mode 100644 onnx/src/gen/java/org/bytedeco/onnx/Bernoulli_Onnx_ver22.java create mode 100644 onnx/src/gen/java/org/bytedeco/onnx/ConvTranspose_Onnx_ver22.java create mode 100644 onnx/src/gen/java/org/bytedeco/onnx/Conv_Onnx_ver22.java create mode 100644 onnx/src/gen/java/org/bytedeco/onnx/Cos_Onnx_ver22.java create mode 100644 onnx/src/gen/java/org/bytedeco/onnx/Cosh_Onnx_ver22.java create mode 100644 onnx/src/gen/java/org/bytedeco/onnx/DeformConv_Onnx_ver22.java create mode 100644 onnx/src/gen/java/org/bytedeco/onnx/Det_Onnx_ver22.java create mode 100644 onnx/src/gen/java/org/bytedeco/onnx/Dropout_Onnx_ver22.java create mode 100644 onnx/src/gen/java/org/bytedeco/onnx/Elu_Onnx_ver22.java create mode 100644 onnx/src/gen/java/org/bytedeco/onnx/EyeLike_Onnx_ver22.java create mode 100644 onnx/src/gen/java/org/bytedeco/onnx/GRU_Onnx_ver22.java create mode 100644 onnx/src/gen/java/org/bytedeco/onnx/GlobalAveragePool_Onnx_ver22.java create mode 100644 onnx/src/gen/java/org/bytedeco/onnx/GlobalLpPool_Onnx_ver22.java create mode 100644 onnx/src/gen/java/org/bytedeco/onnx/GlobalMaxPool_Onnx_ver22.java create mode 100644 onnx/src/gen/java/org/bytedeco/onnx/GridSample_Onnx_ver22.java create mode 100644 onnx/src/gen/java/org/bytedeco/onnx/HardSigmoid_Onnx_ver22.java create mode 100644 onnx/src/gen/java/org/bytedeco/onnx/HardSwish_Onnx_ver22.java create mode 100644 onnx/src/gen/java/org/bytedeco/onnx/InstanceNormalization_Onnx_ver22.java create mode 100644 onnx/src/gen/java/org/bytedeco/onnx/LSTM_Onnx_ver22.java create mode 100644 onnx/src/gen/java/org/bytedeco/onnx/LpNormalization_Onnx_ver22.java create mode 100644 onnx/src/gen/java/org/bytedeco/onnx/LpPool_Onnx_ver22.java create mode 100644 onnx/src/gen/java/org/bytedeco/onnx/MaxPool_Onnx_ver22.java create mode 100644 onnx/src/gen/java/org/bytedeco/onnx/MaxRoiPool_Onnx_ver22.java create mode 100644 onnx/src/gen/java/org/bytedeco/onnx/MaxUnpool_Onnx_ver22.java create mode 100644 onnx/src/gen/java/org/bytedeco/onnx/Mish_Onnx_ver22.java create mode 100644 onnx/src/gen/java/org/bytedeco/onnx/Multinomial_Onnx_ver22.java create mode 100644 onnx/src/gen/java/org/bytedeco/onnx/NegativeLogLikelihoodLoss_Onnx_ver22.java create mode 100644 onnx/src/gen/java/org/bytedeco/onnx/OpSet_Onnx_ver22.java create mode 100644 onnx/src/gen/java/org/bytedeco/onnx/RNN_Onnx_ver22.java create mode 100644 onnx/src/gen/java/org/bytedeco/onnx/RandomNormalLike_Onnx_ver22.java create mode 100644 onnx/src/gen/java/org/bytedeco/onnx/RandomNormal_Onnx_ver22.java create mode 100644 onnx/src/gen/java/org/bytedeco/onnx/RandomUniformLike_Onnx_ver22.java create mode 100644 onnx/src/gen/java/org/bytedeco/onnx/RandomUniform_Onnx_ver22.java create mode 100644 onnx/src/gen/java/org/bytedeco/onnx/RoiAlign_Onnx_ver22.java create mode 100644 onnx/src/gen/java/org/bytedeco/onnx/Round_Onnx_ver22.java create mode 100644 onnx/src/gen/java/org/bytedeco/onnx/Selu_Onnx_ver22.java create mode 100644 onnx/src/gen/java/org/bytedeco/onnx/Sin_Onnx_ver22.java create mode 100644 onnx/src/gen/java/org/bytedeco/onnx/Sinh_Onnx_ver22.java create mode 100644 onnx/src/gen/java/org/bytedeco/onnx/Softplus_Onnx_ver22.java create mode 100644 onnx/src/gen/java/org/bytedeco/onnx/Softsign_Onnx_ver22.java create mode 100644 onnx/src/gen/java/org/bytedeco/onnx/Tan_Onnx_ver22.java create mode 100644 onnx/src/gen/java/org/bytedeco/onnx/ThresholdedRelu_Onnx_ver22.java diff --git a/CHANGELOG.md b/CHANGELOG.md index 03da7f5cec2..cc05685b149 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,7 +9,7 @@ * Build FFmpeg with zimg to enable zscale filter ([pull #1481](https://github.com/bytedeco/javacpp-presets/pull/1481)) * Enable PulseAudio support for FFmpeg on Linux ([pull #1472](https://github.com/bytedeco/javacpp-presets/pull/1472)) * Virtualize `btCollisionWorld`, `btOverlapFilterCallback`, `btOverlapCallback` from Bullet Physics SDK ([pull #1475](https://github.com/bytedeco/javacpp-presets/pull/1475)) - * Upgrade presets for OpenCV 4.10.0, FFmpeg 7.0.2, Spinnaker 4.0.0.116 ([pull #1524](https://github.com/bytedeco/javacpp-presets/pull/1524)), DNNL 3.5.3, OpenBLAS 0.3.28, CMINPACK 1.3.9, GSL 2.8, CPython 3.12.5, NumPy 2.0.1, SciPy 1.14.0, LLVM 18.1.8, LibRaw 0.21.2 ([pull #1520](https://github.com/bytedeco/javacpp-presets/pull/1520)), Tesseract 5.4.1, libffi 3.4.6, CUDA 12.6.0, cuDNN 9.3.0, NCCL 2.22.3, nvCOMP 4.0.0, OpenCL 3.0.16, NVIDIA Video Codec SDK 12.2.72, PyTorch 2.4.0 ([pull #1466](https://github.com/bytedeco/javacpp-presets/pull/1466)), SentencePiece 0.2.0, TensorFlow Lite 2.17.0, TensorRT 10.3.0.26, Triton Inference Server 2.48.0, ONNX 1.16.2, ONNX Runtime 1.18.1, TVM 0.17.0, and their dependencies + * Upgrade presets for OpenCV 4.10.0, FFmpeg 7.0.2, Spinnaker 4.0.0.116 ([pull #1524](https://github.com/bytedeco/javacpp-presets/pull/1524)), DNNL 3.5.3, OpenBLAS 0.3.28, CMINPACK 1.3.9, GSL 2.8, CPython 3.12.7, NumPy 2.1.2, SciPy 1.14.1, LLVM 18.1.8, LibRaw 0.21.2 ([pull #1520](https://github.com/bytedeco/javacpp-presets/pull/1520)), Tesseract 5.4.1, libffi 3.4.6, CUDA 12.6.0, cuDNN 9.3.0, NCCL 2.22.3, nvCOMP 4.0.0, OpenCL 3.0.16, NVIDIA Video Codec SDK 12.2.72, PyTorch 2.4.0 ([pull #1466](https://github.com/bytedeco/javacpp-presets/pull/1466)), SentencePiece 0.2.0, TensorFlow Lite 2.17.0, TensorRT 10.3.0.26, Triton Inference Server 2.48.0, ONNX 1.17.0, ONNX Runtime 1.19.2, TVM 0.17.0, and their dependencies ### January 29, 2024 version 1.5.10 * Introduce `macosx-arm64` builds for PyTorch ([pull #1463](https://github.com/bytedeco/javacpp-presets/pull/1463)) diff --git a/README.md b/README.md index 5be8c141bdc..395e067615c 100644 --- a/README.md +++ b/README.md @@ -134,7 +134,7 @@ Further, in the case of Android, the JavaCPP Presets also rely on: Manual Installation ------------------- -Simply put all the desired JAR files (`opencv*.jar`, `ffmpeg*.jar`, etc.), in addition to `javacpp.jar`, somewhere in your class path. The JAR files available as pre-built artifacts are meant to be used with [JavaCPP](https://github.com/bytedeco/javacpp). The binaries for Linux are built with Ubuntu, so they should work on most distributions currently in use. The ones for Android were compiled for ARMv7 processors featuring an FPU, so they will not work on ancient devices such as the HTC Magic or some others with an ARMv6 CPU. Here are some more specific instructions for common cases: +Simply put all the desired JAR files (`opencv*.jar`, `ffmpeg*.jar`, etc.), in addition to `javacpp.jar`, somewhere in your class path. The JAR files available as pre-built artifacts are meant to be used with [JavaCPP](https://github.com/bytedeco/javacpp). The binaries for Linux are built with Ubuntu, so they should work on most distributions currently in use. Here are some more specific instructions for common cases: NetBeans (Java SE 7 or newer): @@ -205,7 +205,7 @@ Each child module in turn relies by default on the included [`cppbuild.sh` scrip * FFTW 3.3.10 http://www.fftw.org/download.html * GSL 2.8 http://www.gnu.org/software/gsl/#downloading * CPython 3.12.x https://www.python.org/downloads/ - * NumPy 2.0.x https://github.com/numpy/numpy + * NumPy 2.1.x https://github.com/numpy/numpy * SciPy 1.14.x https://github.com/scipy/scipy * Gym 0.26.x https://github.com/openai/gym * LLVM 18.1.x http://llvm.org/releases/download.html @@ -231,9 +231,9 @@ Each child module in turn relies by default on the included [`cppbuild.sh` scrip * Triton Inference Server 2.48.x https://developer.nvidia.com/nvidia-triton-inference-server * The Arcade Learning Environment 0.8.x https://github.com/mgbellemare/Arcade-Learning-Environment * DepthAI 2.24.x https://github.com/luxonis/depthai-core - * ONNX 1.16.x https://github.com/onnx/onnx + * ONNX 1.17.x https://github.com/onnx/onnx * nGraph 0.26.0 https://github.com/NervanaSystems/ngraph - * ONNX Runtime 1.18.x https://github.com/microsoft/onnxruntime + * ONNX Runtime 1.19.x https://github.com/microsoft/onnxruntime * TVM 0.17.x https://github.com/apache/tvm * Bullet Physics SDK 3.25 https://pybullet.org * LiquidFun http://google.github.io/liquidfun/ diff --git a/cpython/README.md b/cpython/README.md index 244f026db5d..5fe3145d75a 100644 --- a/cpython/README.md +++ b/cpython/README.md @@ -14,7 +14,7 @@ Introduction ------------ This directory contains the JavaCPP Presets module for: - * CPython 3.12.5 https://www.python.org/ + * CPython 3.12.7 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.12.5-1.5.11-SNAPSHOT + 3.12.7-1.5.11-SNAPSHOT diff --git a/cpython/cppbuild.sh b/cpython/cppbuild.sh index 9fea5a806ed..f1d2d87da9f 100755 --- a/cpython/cppbuild.sh +++ b/cpython/cppbuild.sh @@ -7,8 +7,8 @@ if [[ -z "$PLATFORM" ]]; then exit fi -OPENSSL=openssl-3.3.1 -CPYTHON_VERSION=3.12.5 +OPENSSL=openssl-3.3.2 +CPYTHON_VERSION=3.12.7 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 bf0fdfc3ca7..b3f3e5ce7ef 100644 --- a/cpython/platform/pom.xml +++ b/cpython/platform/pom.xml @@ -12,7 +12,7 @@ org.bytedeco cpython-platform - 3.12.5-${project.parent.version} + 3.12.7-${project.parent.version} JavaCPP Presets Platform for CPython diff --git a/cpython/pom.xml b/cpython/pom.xml index e8906987fca..21a73ec037e 100644 --- a/cpython/pom.xml +++ b/cpython/pom.xml @@ -11,7 +11,7 @@ org.bytedeco cpython - 3.12.5-${project.parent.version} + 3.12.7-${project.parent.version} JavaCPP Presets for CPython diff --git a/cpython/samples/pom.xml b/cpython/samples/pom.xml index 97112da2b86..58390199db4 100644 --- a/cpython/samples/pom.xml +++ b/cpython/samples/pom.xml @@ -12,7 +12,7 @@ org.bytedeco cpython-platform - 3.12.5-1.5.11-SNAPSHOT + 3.12.7-1.5.11-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 59f041a87ff..0559c346d66 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 = 12; -public static final int PY_MICRO_VERSION = 5; +public static final int PY_MICRO_VERSION = 7; 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.12.5"; +public static final String PY_VERSION = "3.12.7"; /*--end constants--*/ /* Version as a single 4-byte hex number, e.g. 0x010502B2 == 1.5.2b2. diff --git a/numpy/README.md b/numpy/README.md index f89874e9a51..da8860aa01f 100644 --- a/numpy/README.md +++ b/numpy/README.md @@ -9,7 +9,7 @@ Introduction ------------ This directory contains the JavaCPP Presets module for: - * NumPy 2.0.1 http://www.numpy.org/ + * NumPy 2.1.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 - 2.0.1-1.5.11-SNAPSHOT + 2.1.2-1.5.11-SNAPSHOT diff --git a/numpy/cppbuild.sh b/numpy/cppbuild.sh index 7677ff151a5..7fba132c02d 100755 --- a/numpy/cppbuild.sh +++ b/numpy/cppbuild.sh @@ -7,7 +7,7 @@ if [[ -z "$PLATFORM" ]]; then exit fi -NUMPY_VERSION=2.0.1 +NUMPY_VERSION=2.1.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 d1d9dbaf68b..959598de487 100644 --- a/numpy/platform/pom.xml +++ b/numpy/platform/pom.xml @@ -12,7 +12,7 @@ org.bytedeco numpy-platform - 2.0.1-${project.parent.version} + 2.1.2-${project.parent.version} JavaCPP Presets Platform for NumPy @@ -28,7 +28,7 @@ org.bytedeco cpython-platform - 3.12.5-${project.parent.version} + 3.12.7-${project.parent.version} ${project.groupId} diff --git a/numpy/pom.xml b/numpy/pom.xml index 4296ef03c5f..e68fb8f4c3d 100644 --- a/numpy/pom.xml +++ b/numpy/pom.xml @@ -11,7 +11,7 @@ org.bytedeco numpy - 2.0.1-${project.parent.version} + 2.1.2-${project.parent.version} JavaCPP Presets for NumPy @@ -23,7 +23,7 @@ org.bytedeco cpython - 3.12.5-${project.parent.version} + 3.12.7-${project.parent.version} org.bytedeco @@ -51,7 +51,7 @@ org.bytedeco cpython - 3.12.5-${project.parent.version} + 3.12.7-${project.parent.version} org.bytedeco @@ -62,7 +62,7 @@ org.bytedeco cpython - 3.12.5-${project.parent.version} + 3.12.7-${project.parent.version} ${javacpp.platform} @@ -171,7 +171,7 @@ org.bytedeco cpython - 3.12.5-${project.parent.version} + 3.12.7-${project.parent.version} ${os.name}-${os.arch} diff --git a/numpy/samples/pom.xml b/numpy/samples/pom.xml index 9ac0e9ef8f0..c1a410cd67f 100644 --- a/numpy/samples/pom.xml +++ b/numpy/samples/pom.xml @@ -12,7 +12,7 @@ org.bytedeco numpy-platform - 2.0.1-1.5.11-SNAPSHOT + 2.1.2-1.5.11-SNAPSHOT diff --git a/numpy/src/gen/java/org/bytedeco/numpy/PyArrayMultiIterObject.java b/numpy/src/gen/java/org/bytedeco/numpy/PyArrayMultiIterObject.java index d3b0355b100..5e64ec6908d 100644 --- a/numpy/src/gen/java/org/bytedeco/numpy/PyArrayMultiIterObject.java +++ b/numpy/src/gen/java/org/bytedeco/numpy/PyArrayMultiIterObject.java @@ -58,7 +58,7 @@ public class PyArrayMultiIterObject extends Pointer { @MemberGetter public native @Cast("PyArrayIterObject**") PointerPointer iters(); // #elif defined(__cplusplus) /* - * C++ doesn't stricly support flexible members and gives compilers + * C++ doesn't strictly support flexible members and gives compilers * warnings (pedantic only), so we lie. We can't make it 64 because * then Cython is unhappy (larger struct at runtime is OK smaller not). */ diff --git a/numpy/src/gen/java/org/bytedeco/numpy/PyUFuncObject.java b/numpy/src/gen/java/org/bytedeco/numpy/PyUFuncObject.java index 047b20693d6..6830499fd71 100644 --- a/numpy/src/gen/java/org/bytedeco/numpy/PyUFuncObject.java +++ b/numpy/src/gen/java/org/bytedeco/numpy/PyUFuncObject.java @@ -15,7 +15,6 @@ import static org.bytedeco.numpy.global.numpy.*; - @Properties(inherit = org.bytedeco.numpy.presets.numpy.class) public class PyUFuncObject extends Pointer { static { Loader.load(); } @@ -160,4 +159,10 @@ public class PyUFuncObject extends Pointer { /* A PyListObject of `(tuple of DTypes, ArrayMethod/Promoter)` */ public native PyObject _loops(); public native PyUFuncObject _loops(PyObject setter); // #endif +// #if NPY_FEATURE_VERSION >= NPY_2_1_API_VERSION + /* + * Optional function to process core dimensions of a gufunc. + */ + public native PyUFunc_ProcessCoreDimsFunc process_core_dims_func(); public native PyUFuncObject process_core_dims_func(PyUFunc_ProcessCoreDimsFunc setter); +// #endif } diff --git a/numpy/src/gen/java/org/bytedeco/numpy/PyUFunc_ProcessCoreDimsFunc.java b/numpy/src/gen/java/org/bytedeco/numpy/PyUFunc_ProcessCoreDimsFunc.java new file mode 100644 index 00000000000..41fef878b3c --- /dev/null +++ b/numpy/src/gen/java/org/bytedeco/numpy/PyUFunc_ProcessCoreDimsFunc.java @@ -0,0 +1,58 @@ +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE + +package org.bytedeco.numpy; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +import static org.bytedeco.javacpp.presets.javacpp.*; +import static org.bytedeco.openblas.global.openblas_nolapack.*; +import static org.bytedeco.openblas.global.openblas.*; +import org.bytedeco.cpython.*; +import static org.bytedeco.cpython.global.python.*; + +import static org.bytedeco.numpy.global.numpy.*; + + +/* + * This is the signature for the functions that may be assigned to the + * `process_core_dims_func` field of the PyUFuncObject structure. + * Implementation of this function is optional. This function is only used + * by generalized ufuncs (i.e. those with the field `core_enabled` set to 1). + * The function is called by the ufunc during the processing of the arguments + * of a call of the ufunc. The function can check the core dimensions of the + * input and output arrays and return -1 with an exception set if any + * requirements are not satisfied. If the caller of the ufunc didn't provide + * output arrays, the core dimensions associated with the output arrays (i.e. + * those that are not also used in input arrays) will have the value -1 in + * `core_dim_sizes`. This function can replace any output core dimensions + * that are -1 with a value that is appropriate for the ufunc. + * + * Parameter Description + * --------------- ------------------------------------------------------ + * ufunc The ufunc object + * core_dim_sizes An array with length `ufunc->core_num_dim_ix`. + * The core dimensions of the arrays passed to the ufunc + * will have been set. If the caller of the ufunc didn't + * provide the output array(s), the output-only core + * dimensions will have the value -1. + * + * The function must not change any element in `core_dim_sizes` that is + * not -1 on input. Doing so will result in incorrect output from the + * ufunc, and could result in a crash of the Python interpreter. + * + * The function must return 0 on success, -1 on failure (with an exception + * set). + */ +@Properties(inherit = org.bytedeco.numpy.presets.numpy.class) +public class PyUFunc_ProcessCoreDimsFunc extends FunctionPointer { + static { Loader.load(); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public PyUFunc_ProcessCoreDimsFunc(Pointer p) { super(p); } + protected PyUFunc_ProcessCoreDimsFunc() { allocate(); } + private native void allocate(); + public native int call( + PyUFuncObject ufunc, + @Cast("npy_intp*") SizeTPointer core_dim_sizes); +} diff --git a/numpy/src/gen/java/org/bytedeco/numpy/global/numpy.java b/numpy/src/gen/java/org/bytedeco/numpy/global/numpy.java index 514b137099a..ddd9e994311 100644 --- a/numpy/src/gen/java/org/bytedeco/numpy/global/numpy.java +++ b/numpy/src/gen/java/org/bytedeco/numpy/global/numpy.java @@ -50,7 +50,7 @@ public class numpy extends org.bytedeco.numpy.presets.numpy { // #define NPY_VISIBILITY_HIDDEN __attribute__((visibility("hidden"))) public static final int NPY_ABI_VERSION = 0x02000000; -public static final int NPY_API_VERSION = 0x00000012; +public static final int NPY_API_VERSION = 0x00000013; // #ifndef __STDC_FORMAT_MACROS public static final int __STDC_FORMAT_MACROS = 1; @@ -132,6 +132,7 @@ public class numpy extends org.bytedeco.numpy.presets.numpy { public static final int NPY_1_24_API_VERSION = 0x00000010; public static final int NPY_1_25_API_VERSION = 0x00000011; public static final int NPY_2_0_API_VERSION = 0x00000012; +public static final int NPY_2_1_API_VERSION = 0x00000013; /* @@ -169,8 +170,8 @@ public class numpy extends org.bytedeco.numpy.presets.numpy { /* user provided a target version, use it */ // #define NPY_FEATURE_VERSION NPY_TARGET_VERSION // #else - /* Use the default (increase when dropping Python 3.9 support) */ -// #define NPY_FEATURE_VERSION NPY_1_19_API_VERSION + /* Use the default (increase when dropping Python 3.10 support) */ +// #define NPY_FEATURE_VERSION NPY_1_21_API_VERSION // #endif /* Sanity check the (requested) feature version */ @@ -198,6 +199,7 @@ public class numpy extends org.bytedeco.numpy.presets.numpy { // #elif NPY_FEATURE_VERSION == NPY_1_23_API_VERSION /* also 1.24 */ // #elif NPY_FEATURE_VERSION == NPY_1_25_API_VERSION // #elif NPY_FEATURE_VERSION == NPY_2_0_API_VERSION +// #elif NPY_FEATURE_VERSION == NPY_2_1_API_VERSION // #else // #error "Missing version string define for new NumPy version." // #endif @@ -322,14 +324,18 @@ public class numpy extends org.bytedeco.numpy.presets.numpy { // #define NPY_NOINLINE static // #endif -// #ifdef HAVE___THREAD +// #ifdef __cplusplus +// #define NPY_TLS thread_local +// #elif defined(HAVE_THREAD_LOCAL) +// #define NPY_TLS thread_local +// #elif defined(HAVE__THREAD_LOCAL) +// #define NPY_TLS _Thread_local +// #elif defined(HAVE___THREAD) // #define NPY_TLS __thread +// #elif defined(HAVE___DECLSPEC_THREAD_) +// #define NPY_TLS __declspec(thread) // #else -// #ifdef HAVE___DECLSPEC_THREAD_ -// #define NPY_TLS __declspec(thread) -// #else -// #define NPY_TLS -// #endif +// #define NPY_TLS // #endif // #ifdef WITH_CPYCHECKER_RETURNS_BORROWED_REF_ATTRIBUTE @@ -506,11 +512,6 @@ public class numpy extends org.bytedeco.numpy.presets.numpy { // #include -// Downstream libraries like sympy would like to use I -// see https://github.com/numpy/numpy/issues/26787 -// #ifdef I -// #undef I -// #endif // #if defined(_MSC_VER) && !defined(__INTEL_COMPILER) // #else /* !defined(_MSC_VER) || defined(__INTEL_COMPILER) */ @@ -4262,6 +4263,11 @@ entry of the tuple (i.e. a duplicate dictionary entry in the fields // #if defined(PY_ARRAY_UNIQUE_SYMBOL) // #endif +/* By default do not export API in an .so (was never the case on windows) */ +// #ifndef NPY_API_SYMBOL_ATTRIBUTE +// #define NPY_API_SYMBOL_ATTRIBUTE NPY_VISIBILITY_HIDDEN +// #endif + // #if defined(NO_IMPORT) || defined(NO_IMPORT_ARRAY) public static native Pointer PyArray_API(int i); public static native void PyArray_API(int i, Pointer setter); public static native @Cast("void**") PointerPointer PyArray_API(); public static native void PyArray_API(PointerPointer setter); @@ -4519,6 +4525,11 @@ entry of the tuple (i.e. a duplicate dictionary entry in the fields // #if defined(PY_UFUNC_UNIQUE_SYMBOL) // #endif +/* By default do not export API in an .so (was never the case on windows) */ +// #ifndef NPY_API_SYMBOL_ATTRIBUTE +// #define NPY_API_SYMBOL_ATTRIBUTE NPY_VISIBILITY_HIDDEN +// #endif + // #if defined(NO_IMPORT) || defined(NO_IMPORT_UFUNC) public static native Pointer PyUFunc_API(int i); public static native void PyUFunc_API(int i, Pointer setter); public static native @Cast("void**") PointerPointer PyUFunc_API(); public static native void PyUFunc_API(PointerPointer setter); @@ -4550,6 +4561,9 @@ entry of the tuple (i.e. a duplicate dictionary entry in the fields // Targeting ../PyUFunc_TypeResolutionFunc.java +// Targeting ../PyUFunc_ProcessCoreDimsFunc.java + + // Targeting ../PyUFuncObject.java diff --git a/numpy/src/main/java/org/bytedeco/numpy/presets/numpy.java b/numpy/src/main/java/org/bytedeco/numpy/presets/numpy.java index c850c9aedc8..ef168caa2f1 100644 --- a/numpy/src/main/java/org/bytedeco/numpy/presets/numpy.java +++ b/numpy/src/main/java/org/bytedeco/numpy/presets/numpy.java @@ -44,7 +44,7 @@ inherit = {openblas.class, python.class}, value = { @Platform( - define = "NPY_TARGET_VERSION NPY_2_0_API_VERSION", + define = "NPY_TARGET_VERSION NPY_2_1_API_VERSION", cinclude = { "_numpyconfig.h", "numpyconfig.h", @@ -145,7 +145,8 @@ public void map(InfoMap infoMap) { "NPY_BEGIN_THREADS_DEF", "NPY_BEGIN_ALLOW_THREADS", "NPY_END_ALLOW_THREADS", "NPY_BEGIN_THREADS", "NPY_END_THREADS", "NPY_ALLOW_C_API_DEF", "NPY_ALLOW_C_API", "NPY_DISABLE_C_API", "PyArray_IsNativeByteOrder", "NPY_REFCOUNT", "NUMPY_IMPORT_ARRAY_RETVAL", - "NPY_LOOP_BEGIN_THREADS", "NPY_LOOP_END_THREADS", "NUMPY_IMPORT_UMATH_RETVAL", "UFUNC_NOFPE").cppTypes().annotations()) + "NPY_LOOP_BEGIN_THREADS", "NPY_LOOP_END_THREADS", "NUMPY_IMPORT_UMATH_RETVAL", "UFUNC_NOFPE", + "NPY_API_SYMBOL_ATTRIBUTE").cppTypes().annotations()) .put(new Info("defined(_MSC_VER) && defined(_WIN64) && (_MSC_VER > 1400) ||" + " defined(__MINGW32__) || defined(__MINGW64__)", @@ -166,6 +167,7 @@ public void map(InfoMap infoMap) { .put(new Info("NPY_BITSOF_LONG == 64", "NPY_BITSOF_LONGLONG == 64", "NPY_BITSOF_INT == 32", "NPY_BITSOF_SHORT == 16", + "NPY_FEATURE_VERSION >= NPY_2_1_API_VERSION", "NPY_FEATURE_VERSION >= NPY_2_0_API_VERSION", "NPY_FEATURE_VERSION >= NPY_1_20_API_VERSION", "NPY_FEATURE_VERSION >= NPY_1_22_API_VERSION", diff --git a/onnx/README.md b/onnx/README.md index 8b1f5ff9336..ec05d0f9113 100644 --- a/onnx/README.md +++ b/onnx/README.md @@ -9,7 +9,7 @@ Introduction ------------ This directory contains the JavaCPP Presets module for: - * ONNX 1.16.2 https://onnx.ai/ + * ONNX 1.17.0 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.16.2-1.5.11-SNAPSHOT + 1.17.0-1.5.11-SNAPSHOT diff --git a/onnx/cppbuild.sh b/onnx/cppbuild.sh index f870dcbea0a..f4a3cae134a 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.16.2 +export ONNX=1.17.0 export PROTO=3.20.3 export PYBIND=2.11.0 diff --git a/onnx/platform/pom.xml b/onnx/platform/pom.xml index 5df513cddc3..1714ddd5175 100644 --- a/onnx/platform/pom.xml +++ b/onnx/platform/pom.xml @@ -12,7 +12,7 @@ org.bytedeco onnx-platform - 1.16.2-${project.parent.version} + 1.17.0-${project.parent.version} JavaCPP Presets Platform for ONNX @@ -28,7 +28,7 @@ org.bytedeco cpython-platform - 3.12.5-${project.parent.version} + 3.12.7-${project.parent.version} true diff --git a/onnx/pom.xml b/onnx/pom.xml index e3404d7a6f3..90c85836986 100644 --- a/onnx/pom.xml +++ b/onnx/pom.xml @@ -11,7 +11,7 @@ org.bytedeco onnx - 1.16.2-${project.parent.version} + 1.17.0-${project.parent.version} JavaCPP Presets for ONNX @@ -22,7 +22,7 @@ org.bytedeco cpython - 3.12.5-${project.parent.version} + 3.12.7-${project.parent.version} true @@ -42,7 +42,7 @@ org.bytedeco cpython-platform - 3.12.5-${project.parent.version} + 3.12.7-${project.parent.version} diff --git a/onnx/samples/pom.xml b/onnx/samples/pom.xml index b8e14bf60e9..499d0b0d61a 100644 --- a/onnx/samples/pom.xml +++ b/onnx/samples/pom.xml @@ -12,7 +12,7 @@ org.bytedeco onnx-platform - 1.16.2-1.5.11-SNAPSHOT + 1.17.0-1.5.11-SNAPSHOT diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Acos_Onnx_ver22.java b/onnx/src/gen/java/org/bytedeco/onnx/Acos_Onnx_ver22.java new file mode 100644 index 00000000000..dc83e40cfe9 --- /dev/null +++ b/onnx/src/gen/java/org/bytedeco/onnx/Acos_Onnx_ver22.java @@ -0,0 +1,19 @@ +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE + +package org.bytedeco.onnx; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +import static org.bytedeco.javacpp.presets.javacpp.*; + +import static org.bytedeco.onnx.global.onnx.*; + +@Namespace("onnx") @Opaque @Properties(inherit = org.bytedeco.onnx.presets.onnx.class) +public class Acos_Onnx_ver22 extends Pointer { + /** Empty constructor. Calls {@code super((Pointer)null)}. */ + public Acos_Onnx_ver22() { super((Pointer)null); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public Acos_Onnx_ver22(Pointer p) { super(p); } +} diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Acosh_Onnx_ver22.java b/onnx/src/gen/java/org/bytedeco/onnx/Acosh_Onnx_ver22.java new file mode 100644 index 00000000000..7df00e3fb9a --- /dev/null +++ b/onnx/src/gen/java/org/bytedeco/onnx/Acosh_Onnx_ver22.java @@ -0,0 +1,19 @@ +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE + +package org.bytedeco.onnx; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +import static org.bytedeco.javacpp.presets.javacpp.*; + +import static org.bytedeco.onnx.global.onnx.*; + +@Namespace("onnx") @Opaque @Properties(inherit = org.bytedeco.onnx.presets.onnx.class) +public class Acosh_Onnx_ver22 extends Pointer { + /** Empty constructor. Calls {@code super((Pointer)null)}. */ + public Acosh_Onnx_ver22() { super((Pointer)null); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public Acosh_Onnx_ver22(Pointer p) { super(p); } +} diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Asin_Onnx_ver22.java b/onnx/src/gen/java/org/bytedeco/onnx/Asin_Onnx_ver22.java new file mode 100644 index 00000000000..a85e9f6c1fc --- /dev/null +++ b/onnx/src/gen/java/org/bytedeco/onnx/Asin_Onnx_ver22.java @@ -0,0 +1,19 @@ +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE + +package org.bytedeco.onnx; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +import static org.bytedeco.javacpp.presets.javacpp.*; + +import static org.bytedeco.onnx.global.onnx.*; + +@Namespace("onnx") @Opaque @Properties(inherit = org.bytedeco.onnx.presets.onnx.class) +public class Asin_Onnx_ver22 extends Pointer { + /** Empty constructor. Calls {@code super((Pointer)null)}. */ + public Asin_Onnx_ver22() { super((Pointer)null); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public Asin_Onnx_ver22(Pointer p) { super(p); } +} diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Asinh_Onnx_ver22.java b/onnx/src/gen/java/org/bytedeco/onnx/Asinh_Onnx_ver22.java new file mode 100644 index 00000000000..0aeec11390d --- /dev/null +++ b/onnx/src/gen/java/org/bytedeco/onnx/Asinh_Onnx_ver22.java @@ -0,0 +1,19 @@ +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE + +package org.bytedeco.onnx; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +import static org.bytedeco.javacpp.presets.javacpp.*; + +import static org.bytedeco.onnx.global.onnx.*; + +@Namespace("onnx") @Opaque @Properties(inherit = org.bytedeco.onnx.presets.onnx.class) +public class Asinh_Onnx_ver22 extends Pointer { + /** Empty constructor. Calls {@code super((Pointer)null)}. */ + public Asinh_Onnx_ver22() { super((Pointer)null); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public Asinh_Onnx_ver22(Pointer p) { super(p); } +} diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Atan_Onnx_ver22.java b/onnx/src/gen/java/org/bytedeco/onnx/Atan_Onnx_ver22.java new file mode 100644 index 00000000000..ce0a52905af --- /dev/null +++ b/onnx/src/gen/java/org/bytedeco/onnx/Atan_Onnx_ver22.java @@ -0,0 +1,19 @@ +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE + +package org.bytedeco.onnx; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +import static org.bytedeco.javacpp.presets.javacpp.*; + +import static org.bytedeco.onnx.global.onnx.*; + +@Namespace("onnx") @Opaque @Properties(inherit = org.bytedeco.onnx.presets.onnx.class) +public class Atan_Onnx_ver22 extends Pointer { + /** Empty constructor. Calls {@code super((Pointer)null)}. */ + public Atan_Onnx_ver22() { super((Pointer)null); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public Atan_Onnx_ver22(Pointer p) { super(p); } +} diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Atanh_Onnx_ver22.java b/onnx/src/gen/java/org/bytedeco/onnx/Atanh_Onnx_ver22.java new file mode 100644 index 00000000000..0f85ea8498c --- /dev/null +++ b/onnx/src/gen/java/org/bytedeco/onnx/Atanh_Onnx_ver22.java @@ -0,0 +1,19 @@ +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE + +package org.bytedeco.onnx; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +import static org.bytedeco.javacpp.presets.javacpp.*; + +import static org.bytedeco.onnx.global.onnx.*; + +@Namespace("onnx") @Opaque @Properties(inherit = org.bytedeco.onnx.presets.onnx.class) +public class Atanh_Onnx_ver22 extends Pointer { + /** Empty constructor. Calls {@code super((Pointer)null)}. */ + public Atanh_Onnx_ver22() { super((Pointer)null); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public Atanh_Onnx_ver22(Pointer p) { super(p); } +} diff --git a/onnx/src/gen/java/org/bytedeco/onnx/AveragePool_Onnx_ver22.java b/onnx/src/gen/java/org/bytedeco/onnx/AveragePool_Onnx_ver22.java new file mode 100644 index 00000000000..29cb837e9a1 --- /dev/null +++ b/onnx/src/gen/java/org/bytedeco/onnx/AveragePool_Onnx_ver22.java @@ -0,0 +1,19 @@ +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE + +package org.bytedeco.onnx; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +import static org.bytedeco.javacpp.presets.javacpp.*; + +import static org.bytedeco.onnx.global.onnx.*; + +@Namespace("onnx") @Opaque @Properties(inherit = org.bytedeco.onnx.presets.onnx.class) +public class AveragePool_Onnx_ver22 extends Pointer { + /** Empty constructor. Calls {@code super((Pointer)null)}. */ + public AveragePool_Onnx_ver22() { super((Pointer)null); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public AveragePool_Onnx_ver22(Pointer p) { super(p); } +} diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Bernoulli_Onnx_ver22.java b/onnx/src/gen/java/org/bytedeco/onnx/Bernoulli_Onnx_ver22.java new file mode 100644 index 00000000000..bee5c62a815 --- /dev/null +++ b/onnx/src/gen/java/org/bytedeco/onnx/Bernoulli_Onnx_ver22.java @@ -0,0 +1,19 @@ +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE + +package org.bytedeco.onnx; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +import static org.bytedeco.javacpp.presets.javacpp.*; + +import static org.bytedeco.onnx.global.onnx.*; + +@Namespace("onnx") @Opaque @Properties(inherit = org.bytedeco.onnx.presets.onnx.class) +public class Bernoulli_Onnx_ver22 extends Pointer { + /** Empty constructor. Calls {@code super((Pointer)null)}. */ + public Bernoulli_Onnx_ver22() { super((Pointer)null); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public Bernoulli_Onnx_ver22(Pointer p) { super(p); } +} diff --git a/onnx/src/gen/java/org/bytedeco/onnx/ConvTranspose_Onnx_ver22.java b/onnx/src/gen/java/org/bytedeco/onnx/ConvTranspose_Onnx_ver22.java new file mode 100644 index 00000000000..0f13083e911 --- /dev/null +++ b/onnx/src/gen/java/org/bytedeco/onnx/ConvTranspose_Onnx_ver22.java @@ -0,0 +1,19 @@ +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE + +package org.bytedeco.onnx; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +import static org.bytedeco.javacpp.presets.javacpp.*; + +import static org.bytedeco.onnx.global.onnx.*; + +@Namespace("onnx") @Opaque @Properties(inherit = org.bytedeco.onnx.presets.onnx.class) +public class ConvTranspose_Onnx_ver22 extends Pointer { + /** Empty constructor. Calls {@code super((Pointer)null)}. */ + public ConvTranspose_Onnx_ver22() { super((Pointer)null); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public ConvTranspose_Onnx_ver22(Pointer p) { super(p); } +} diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Conv_Onnx_ver22.java b/onnx/src/gen/java/org/bytedeco/onnx/Conv_Onnx_ver22.java new file mode 100644 index 00000000000..30bdd4be596 --- /dev/null +++ b/onnx/src/gen/java/org/bytedeco/onnx/Conv_Onnx_ver22.java @@ -0,0 +1,19 @@ +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE + +package org.bytedeco.onnx; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +import static org.bytedeco.javacpp.presets.javacpp.*; + +import static org.bytedeco.onnx.global.onnx.*; + +@Namespace("onnx") @Opaque @Properties(inherit = org.bytedeco.onnx.presets.onnx.class) +public class Conv_Onnx_ver22 extends Pointer { + /** Empty constructor. Calls {@code super((Pointer)null)}. */ + public Conv_Onnx_ver22() { super((Pointer)null); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public Conv_Onnx_ver22(Pointer p) { super(p); } +} diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Cos_Onnx_ver22.java b/onnx/src/gen/java/org/bytedeco/onnx/Cos_Onnx_ver22.java new file mode 100644 index 00000000000..794226cb9ec --- /dev/null +++ b/onnx/src/gen/java/org/bytedeco/onnx/Cos_Onnx_ver22.java @@ -0,0 +1,19 @@ +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE + +package org.bytedeco.onnx; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +import static org.bytedeco.javacpp.presets.javacpp.*; + +import static org.bytedeco.onnx.global.onnx.*; + +@Namespace("onnx") @Opaque @Properties(inherit = org.bytedeco.onnx.presets.onnx.class) +public class Cos_Onnx_ver22 extends Pointer { + /** Empty constructor. Calls {@code super((Pointer)null)}. */ + public Cos_Onnx_ver22() { super((Pointer)null); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public Cos_Onnx_ver22(Pointer p) { super(p); } +} diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Cosh_Onnx_ver22.java b/onnx/src/gen/java/org/bytedeco/onnx/Cosh_Onnx_ver22.java new file mode 100644 index 00000000000..f2a25ddd076 --- /dev/null +++ b/onnx/src/gen/java/org/bytedeco/onnx/Cosh_Onnx_ver22.java @@ -0,0 +1,19 @@ +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE + +package org.bytedeco.onnx; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +import static org.bytedeco.javacpp.presets.javacpp.*; + +import static org.bytedeco.onnx.global.onnx.*; + +@Namespace("onnx") @Opaque @Properties(inherit = org.bytedeco.onnx.presets.onnx.class) +public class Cosh_Onnx_ver22 extends Pointer { + /** Empty constructor. Calls {@code super((Pointer)null)}. */ + public Cosh_Onnx_ver22() { super((Pointer)null); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public Cosh_Onnx_ver22(Pointer p) { super(p); } +} diff --git a/onnx/src/gen/java/org/bytedeco/onnx/DeformConv_Onnx_ver22.java b/onnx/src/gen/java/org/bytedeco/onnx/DeformConv_Onnx_ver22.java new file mode 100644 index 00000000000..5fc27c10501 --- /dev/null +++ b/onnx/src/gen/java/org/bytedeco/onnx/DeformConv_Onnx_ver22.java @@ -0,0 +1,19 @@ +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE + +package org.bytedeco.onnx; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +import static org.bytedeco.javacpp.presets.javacpp.*; + +import static org.bytedeco.onnx.global.onnx.*; + +@Namespace("onnx") @Opaque @Properties(inherit = org.bytedeco.onnx.presets.onnx.class) +public class DeformConv_Onnx_ver22 extends Pointer { + /** Empty constructor. Calls {@code super((Pointer)null)}. */ + public DeformConv_Onnx_ver22() { super((Pointer)null); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public DeformConv_Onnx_ver22(Pointer p) { super(p); } +} diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Det_Onnx_ver22.java b/onnx/src/gen/java/org/bytedeco/onnx/Det_Onnx_ver22.java new file mode 100644 index 00000000000..82ceef1a96d --- /dev/null +++ b/onnx/src/gen/java/org/bytedeco/onnx/Det_Onnx_ver22.java @@ -0,0 +1,19 @@ +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE + +package org.bytedeco.onnx; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +import static org.bytedeco.javacpp.presets.javacpp.*; + +import static org.bytedeco.onnx.global.onnx.*; + +@Namespace("onnx") @Opaque @Properties(inherit = org.bytedeco.onnx.presets.onnx.class) +public class Det_Onnx_ver22 extends Pointer { + /** Empty constructor. Calls {@code super((Pointer)null)}. */ + public Det_Onnx_ver22() { super((Pointer)null); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public Det_Onnx_ver22(Pointer p) { super(p); } +} diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Dropout_Onnx_ver22.java b/onnx/src/gen/java/org/bytedeco/onnx/Dropout_Onnx_ver22.java new file mode 100644 index 00000000000..6e65500a0e3 --- /dev/null +++ b/onnx/src/gen/java/org/bytedeco/onnx/Dropout_Onnx_ver22.java @@ -0,0 +1,19 @@ +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE + +package org.bytedeco.onnx; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +import static org.bytedeco.javacpp.presets.javacpp.*; + +import static org.bytedeco.onnx.global.onnx.*; + +@Namespace("onnx") @Opaque @Properties(inherit = org.bytedeco.onnx.presets.onnx.class) +public class Dropout_Onnx_ver22 extends Pointer { + /** Empty constructor. Calls {@code super((Pointer)null)}. */ + public Dropout_Onnx_ver22() { super((Pointer)null); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public Dropout_Onnx_ver22(Pointer p) { super(p); } +} diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Elu_Onnx_ver22.java b/onnx/src/gen/java/org/bytedeco/onnx/Elu_Onnx_ver22.java new file mode 100644 index 00000000000..0ff38a7aa38 --- /dev/null +++ b/onnx/src/gen/java/org/bytedeco/onnx/Elu_Onnx_ver22.java @@ -0,0 +1,19 @@ +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE + +package org.bytedeco.onnx; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +import static org.bytedeco.javacpp.presets.javacpp.*; + +import static org.bytedeco.onnx.global.onnx.*; + +@Namespace("onnx") @Opaque @Properties(inherit = org.bytedeco.onnx.presets.onnx.class) +public class Elu_Onnx_ver22 extends Pointer { + /** Empty constructor. Calls {@code super((Pointer)null)}. */ + public Elu_Onnx_ver22() { super((Pointer)null); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public Elu_Onnx_ver22(Pointer p) { super(p); } +} diff --git a/onnx/src/gen/java/org/bytedeco/onnx/EyeLike_Onnx_ver22.java b/onnx/src/gen/java/org/bytedeco/onnx/EyeLike_Onnx_ver22.java new file mode 100644 index 00000000000..e8aa6c36dcf --- /dev/null +++ b/onnx/src/gen/java/org/bytedeco/onnx/EyeLike_Onnx_ver22.java @@ -0,0 +1,21 @@ +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE + +package org.bytedeco.onnx; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +import static org.bytedeco.javacpp.presets.javacpp.*; + +import static org.bytedeco.onnx.global.onnx.*; + + +// Forward declarations for ai.onnx version 22 +@Namespace("onnx") @Opaque @Properties(inherit = org.bytedeco.onnx.presets.onnx.class) +public class EyeLike_Onnx_ver22 extends Pointer { + /** Empty constructor. Calls {@code super((Pointer)null)}. */ + public EyeLike_Onnx_ver22() { super((Pointer)null); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public EyeLike_Onnx_ver22(Pointer p) { super(p); } +} diff --git a/onnx/src/gen/java/org/bytedeco/onnx/GRU_Onnx_ver22.java b/onnx/src/gen/java/org/bytedeco/onnx/GRU_Onnx_ver22.java new file mode 100644 index 00000000000..b4e52f76588 --- /dev/null +++ b/onnx/src/gen/java/org/bytedeco/onnx/GRU_Onnx_ver22.java @@ -0,0 +1,19 @@ +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE + +package org.bytedeco.onnx; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +import static org.bytedeco.javacpp.presets.javacpp.*; + +import static org.bytedeco.onnx.global.onnx.*; + +@Namespace("onnx") @Opaque @Properties(inherit = org.bytedeco.onnx.presets.onnx.class) +public class GRU_Onnx_ver22 extends Pointer { + /** Empty constructor. Calls {@code super((Pointer)null)}. */ + public GRU_Onnx_ver22() { super((Pointer)null); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public GRU_Onnx_ver22(Pointer p) { super(p); } +} diff --git a/onnx/src/gen/java/org/bytedeco/onnx/GlobalAveragePool_Onnx_ver22.java b/onnx/src/gen/java/org/bytedeco/onnx/GlobalAveragePool_Onnx_ver22.java new file mode 100644 index 00000000000..2a125ab0fa7 --- /dev/null +++ b/onnx/src/gen/java/org/bytedeco/onnx/GlobalAveragePool_Onnx_ver22.java @@ -0,0 +1,19 @@ +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE + +package org.bytedeco.onnx; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +import static org.bytedeco.javacpp.presets.javacpp.*; + +import static org.bytedeco.onnx.global.onnx.*; + +@Namespace("onnx") @Opaque @Properties(inherit = org.bytedeco.onnx.presets.onnx.class) +public class GlobalAveragePool_Onnx_ver22 extends Pointer { + /** Empty constructor. Calls {@code super((Pointer)null)}. */ + public GlobalAveragePool_Onnx_ver22() { super((Pointer)null); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public GlobalAveragePool_Onnx_ver22(Pointer p) { super(p); } +} diff --git a/onnx/src/gen/java/org/bytedeco/onnx/GlobalLpPool_Onnx_ver22.java b/onnx/src/gen/java/org/bytedeco/onnx/GlobalLpPool_Onnx_ver22.java new file mode 100644 index 00000000000..069ca9d6317 --- /dev/null +++ b/onnx/src/gen/java/org/bytedeco/onnx/GlobalLpPool_Onnx_ver22.java @@ -0,0 +1,19 @@ +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE + +package org.bytedeco.onnx; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +import static org.bytedeco.javacpp.presets.javacpp.*; + +import static org.bytedeco.onnx.global.onnx.*; + +@Namespace("onnx") @Opaque @Properties(inherit = org.bytedeco.onnx.presets.onnx.class) +public class GlobalLpPool_Onnx_ver22 extends Pointer { + /** Empty constructor. Calls {@code super((Pointer)null)}. */ + public GlobalLpPool_Onnx_ver22() { super((Pointer)null); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public GlobalLpPool_Onnx_ver22(Pointer p) { super(p); } +} diff --git a/onnx/src/gen/java/org/bytedeco/onnx/GlobalMaxPool_Onnx_ver22.java b/onnx/src/gen/java/org/bytedeco/onnx/GlobalMaxPool_Onnx_ver22.java new file mode 100644 index 00000000000..d321923b6ef --- /dev/null +++ b/onnx/src/gen/java/org/bytedeco/onnx/GlobalMaxPool_Onnx_ver22.java @@ -0,0 +1,19 @@ +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE + +package org.bytedeco.onnx; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +import static org.bytedeco.javacpp.presets.javacpp.*; + +import static org.bytedeco.onnx.global.onnx.*; + +@Namespace("onnx") @Opaque @Properties(inherit = org.bytedeco.onnx.presets.onnx.class) +public class GlobalMaxPool_Onnx_ver22 extends Pointer { + /** Empty constructor. Calls {@code super((Pointer)null)}. */ + public GlobalMaxPool_Onnx_ver22() { super((Pointer)null); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public GlobalMaxPool_Onnx_ver22(Pointer p) { super(p); } +} diff --git a/onnx/src/gen/java/org/bytedeco/onnx/GridSample_Onnx_ver22.java b/onnx/src/gen/java/org/bytedeco/onnx/GridSample_Onnx_ver22.java new file mode 100644 index 00000000000..dc529c0efdd --- /dev/null +++ b/onnx/src/gen/java/org/bytedeco/onnx/GridSample_Onnx_ver22.java @@ -0,0 +1,19 @@ +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE + +package org.bytedeco.onnx; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +import static org.bytedeco.javacpp.presets.javacpp.*; + +import static org.bytedeco.onnx.global.onnx.*; + +@Namespace("onnx") @Opaque @Properties(inherit = org.bytedeco.onnx.presets.onnx.class) +public class GridSample_Onnx_ver22 extends Pointer { + /** Empty constructor. Calls {@code super((Pointer)null)}. */ + public GridSample_Onnx_ver22() { super((Pointer)null); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public GridSample_Onnx_ver22(Pointer p) { super(p); } +} diff --git a/onnx/src/gen/java/org/bytedeco/onnx/HardSigmoid_Onnx_ver22.java b/onnx/src/gen/java/org/bytedeco/onnx/HardSigmoid_Onnx_ver22.java new file mode 100644 index 00000000000..7b9e527d675 --- /dev/null +++ b/onnx/src/gen/java/org/bytedeco/onnx/HardSigmoid_Onnx_ver22.java @@ -0,0 +1,19 @@ +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE + +package org.bytedeco.onnx; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +import static org.bytedeco.javacpp.presets.javacpp.*; + +import static org.bytedeco.onnx.global.onnx.*; + +@Namespace("onnx") @Opaque @Properties(inherit = org.bytedeco.onnx.presets.onnx.class) +public class HardSigmoid_Onnx_ver22 extends Pointer { + /** Empty constructor. Calls {@code super((Pointer)null)}. */ + public HardSigmoid_Onnx_ver22() { super((Pointer)null); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public HardSigmoid_Onnx_ver22(Pointer p) { super(p); } +} diff --git a/onnx/src/gen/java/org/bytedeco/onnx/HardSwish_Onnx_ver22.java b/onnx/src/gen/java/org/bytedeco/onnx/HardSwish_Onnx_ver22.java new file mode 100644 index 00000000000..302c04aa76b --- /dev/null +++ b/onnx/src/gen/java/org/bytedeco/onnx/HardSwish_Onnx_ver22.java @@ -0,0 +1,19 @@ +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE + +package org.bytedeco.onnx; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +import static org.bytedeco.javacpp.presets.javacpp.*; + +import static org.bytedeco.onnx.global.onnx.*; + +@Namespace("onnx") @Opaque @Properties(inherit = org.bytedeco.onnx.presets.onnx.class) +public class HardSwish_Onnx_ver22 extends Pointer { + /** Empty constructor. Calls {@code super((Pointer)null)}. */ + public HardSwish_Onnx_ver22() { super((Pointer)null); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public HardSwish_Onnx_ver22(Pointer p) { super(p); } +} diff --git a/onnx/src/gen/java/org/bytedeco/onnx/InferenceContext.java b/onnx/src/gen/java/org/bytedeco/onnx/InferenceContext.java index 5184bb6663e..8391dedd40c 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/InferenceContext.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/InferenceContext.java @@ -28,4 +28,6 @@ public class InferenceContext extends Pointer { public native @Const SparseTensorProto getInputSparseData(@Cast("size_t") long index); // Gets the shape inputs computed by partial data propagation. public native @Const TensorShapeProto getSymbolicInput(@Cast("size_t") long index); + // To display a name the user can use to narrow its search. + public native @StdString BytePointer getDisplayName(); } diff --git a/onnx/src/gen/java/org/bytedeco/onnx/InstanceNormalization_Onnx_ver22.java b/onnx/src/gen/java/org/bytedeco/onnx/InstanceNormalization_Onnx_ver22.java new file mode 100644 index 00000000000..b891241668e --- /dev/null +++ b/onnx/src/gen/java/org/bytedeco/onnx/InstanceNormalization_Onnx_ver22.java @@ -0,0 +1,19 @@ +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE + +package org.bytedeco.onnx; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +import static org.bytedeco.javacpp.presets.javacpp.*; + +import static org.bytedeco.onnx.global.onnx.*; + +@Namespace("onnx") @Opaque @Properties(inherit = org.bytedeco.onnx.presets.onnx.class) +public class InstanceNormalization_Onnx_ver22 extends Pointer { + /** Empty constructor. Calls {@code super((Pointer)null)}. */ + public InstanceNormalization_Onnx_ver22() { super((Pointer)null); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public InstanceNormalization_Onnx_ver22(Pointer p) { super(p); } +} diff --git a/onnx/src/gen/java/org/bytedeco/onnx/LSTM_Onnx_ver22.java b/onnx/src/gen/java/org/bytedeco/onnx/LSTM_Onnx_ver22.java new file mode 100644 index 00000000000..be8bda4296d --- /dev/null +++ b/onnx/src/gen/java/org/bytedeco/onnx/LSTM_Onnx_ver22.java @@ -0,0 +1,19 @@ +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE + +package org.bytedeco.onnx; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +import static org.bytedeco.javacpp.presets.javacpp.*; + +import static org.bytedeco.onnx.global.onnx.*; + +@Namespace("onnx") @Opaque @Properties(inherit = org.bytedeco.onnx.presets.onnx.class) +public class LSTM_Onnx_ver22 extends Pointer { + /** Empty constructor. Calls {@code super((Pointer)null)}. */ + public LSTM_Onnx_ver22() { super((Pointer)null); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public LSTM_Onnx_ver22(Pointer p) { super(p); } +} diff --git a/onnx/src/gen/java/org/bytedeco/onnx/LpNormalization_Onnx_ver22.java b/onnx/src/gen/java/org/bytedeco/onnx/LpNormalization_Onnx_ver22.java new file mode 100644 index 00000000000..c5a4e3a64dc --- /dev/null +++ b/onnx/src/gen/java/org/bytedeco/onnx/LpNormalization_Onnx_ver22.java @@ -0,0 +1,19 @@ +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE + +package org.bytedeco.onnx; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +import static org.bytedeco.javacpp.presets.javacpp.*; + +import static org.bytedeco.onnx.global.onnx.*; + +@Namespace("onnx") @Opaque @Properties(inherit = org.bytedeco.onnx.presets.onnx.class) +public class LpNormalization_Onnx_ver22 extends Pointer { + /** Empty constructor. Calls {@code super((Pointer)null)}. */ + public LpNormalization_Onnx_ver22() { super((Pointer)null); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public LpNormalization_Onnx_ver22(Pointer p) { super(p); } +} diff --git a/onnx/src/gen/java/org/bytedeco/onnx/LpPool_Onnx_ver22.java b/onnx/src/gen/java/org/bytedeco/onnx/LpPool_Onnx_ver22.java new file mode 100644 index 00000000000..7e0cb501060 --- /dev/null +++ b/onnx/src/gen/java/org/bytedeco/onnx/LpPool_Onnx_ver22.java @@ -0,0 +1,19 @@ +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE + +package org.bytedeco.onnx; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +import static org.bytedeco.javacpp.presets.javacpp.*; + +import static org.bytedeco.onnx.global.onnx.*; + +@Namespace("onnx") @Opaque @Properties(inherit = org.bytedeco.onnx.presets.onnx.class) +public class LpPool_Onnx_ver22 extends Pointer { + /** Empty constructor. Calls {@code super((Pointer)null)}. */ + public LpPool_Onnx_ver22() { super((Pointer)null); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public LpPool_Onnx_ver22(Pointer p) { super(p); } +} diff --git a/onnx/src/gen/java/org/bytedeco/onnx/MaxPool_Onnx_ver22.java b/onnx/src/gen/java/org/bytedeco/onnx/MaxPool_Onnx_ver22.java new file mode 100644 index 00000000000..a2ad97d0c64 --- /dev/null +++ b/onnx/src/gen/java/org/bytedeco/onnx/MaxPool_Onnx_ver22.java @@ -0,0 +1,19 @@ +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE + +package org.bytedeco.onnx; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +import static org.bytedeco.javacpp.presets.javacpp.*; + +import static org.bytedeco.onnx.global.onnx.*; + +@Namespace("onnx") @Opaque @Properties(inherit = org.bytedeco.onnx.presets.onnx.class) +public class MaxPool_Onnx_ver22 extends Pointer { + /** Empty constructor. Calls {@code super((Pointer)null)}. */ + public MaxPool_Onnx_ver22() { super((Pointer)null); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public MaxPool_Onnx_ver22(Pointer p) { super(p); } +} diff --git a/onnx/src/gen/java/org/bytedeco/onnx/MaxRoiPool_Onnx_ver22.java b/onnx/src/gen/java/org/bytedeco/onnx/MaxRoiPool_Onnx_ver22.java new file mode 100644 index 00000000000..7776a1648ec --- /dev/null +++ b/onnx/src/gen/java/org/bytedeco/onnx/MaxRoiPool_Onnx_ver22.java @@ -0,0 +1,19 @@ +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE + +package org.bytedeco.onnx; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +import static org.bytedeco.javacpp.presets.javacpp.*; + +import static org.bytedeco.onnx.global.onnx.*; + +@Namespace("onnx") @Opaque @Properties(inherit = org.bytedeco.onnx.presets.onnx.class) +public class MaxRoiPool_Onnx_ver22 extends Pointer { + /** Empty constructor. Calls {@code super((Pointer)null)}. */ + public MaxRoiPool_Onnx_ver22() { super((Pointer)null); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public MaxRoiPool_Onnx_ver22(Pointer p) { super(p); } +} diff --git a/onnx/src/gen/java/org/bytedeco/onnx/MaxUnpool_Onnx_ver22.java b/onnx/src/gen/java/org/bytedeco/onnx/MaxUnpool_Onnx_ver22.java new file mode 100644 index 00000000000..29a1c066d93 --- /dev/null +++ b/onnx/src/gen/java/org/bytedeco/onnx/MaxUnpool_Onnx_ver22.java @@ -0,0 +1,19 @@ +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE + +package org.bytedeco.onnx; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +import static org.bytedeco.javacpp.presets.javacpp.*; + +import static org.bytedeco.onnx.global.onnx.*; + +@Namespace("onnx") @Opaque @Properties(inherit = org.bytedeco.onnx.presets.onnx.class) +public class MaxUnpool_Onnx_ver22 extends Pointer { + /** Empty constructor. Calls {@code super((Pointer)null)}. */ + public MaxUnpool_Onnx_ver22() { super((Pointer)null); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public MaxUnpool_Onnx_ver22(Pointer p) { super(p); } +} diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Mish_Onnx_ver22.java b/onnx/src/gen/java/org/bytedeco/onnx/Mish_Onnx_ver22.java new file mode 100644 index 00000000000..e09743a4066 --- /dev/null +++ b/onnx/src/gen/java/org/bytedeco/onnx/Mish_Onnx_ver22.java @@ -0,0 +1,19 @@ +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE + +package org.bytedeco.onnx; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +import static org.bytedeco.javacpp.presets.javacpp.*; + +import static org.bytedeco.onnx.global.onnx.*; + +@Namespace("onnx") @Opaque @Properties(inherit = org.bytedeco.onnx.presets.onnx.class) +public class Mish_Onnx_ver22 extends Pointer { + /** Empty constructor. Calls {@code super((Pointer)null)}. */ + public Mish_Onnx_ver22() { super((Pointer)null); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public Mish_Onnx_ver22(Pointer p) { super(p); } +} diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Multinomial_Onnx_ver22.java b/onnx/src/gen/java/org/bytedeco/onnx/Multinomial_Onnx_ver22.java new file mode 100644 index 00000000000..00062338fbf --- /dev/null +++ b/onnx/src/gen/java/org/bytedeco/onnx/Multinomial_Onnx_ver22.java @@ -0,0 +1,19 @@ +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE + +package org.bytedeco.onnx; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +import static org.bytedeco.javacpp.presets.javacpp.*; + +import static org.bytedeco.onnx.global.onnx.*; + +@Namespace("onnx") @Opaque @Properties(inherit = org.bytedeco.onnx.presets.onnx.class) +public class Multinomial_Onnx_ver22 extends Pointer { + /** Empty constructor. Calls {@code super((Pointer)null)}. */ + public Multinomial_Onnx_ver22() { super((Pointer)null); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public Multinomial_Onnx_ver22(Pointer p) { super(p); } +} diff --git a/onnx/src/gen/java/org/bytedeco/onnx/NegativeLogLikelihoodLoss_Onnx_ver22.java b/onnx/src/gen/java/org/bytedeco/onnx/NegativeLogLikelihoodLoss_Onnx_ver22.java new file mode 100644 index 00000000000..3932d5b0ca8 --- /dev/null +++ b/onnx/src/gen/java/org/bytedeco/onnx/NegativeLogLikelihoodLoss_Onnx_ver22.java @@ -0,0 +1,19 @@ +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE + +package org.bytedeco.onnx; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +import static org.bytedeco.javacpp.presets.javacpp.*; + +import static org.bytedeco.onnx.global.onnx.*; + +@Namespace("onnx") @Opaque @Properties(inherit = org.bytedeco.onnx.presets.onnx.class) +public class NegativeLogLikelihoodLoss_Onnx_ver22 extends Pointer { + /** Empty constructor. Calls {@code super((Pointer)null)}. */ + public NegativeLogLikelihoodLoss_Onnx_ver22() { super((Pointer)null); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public NegativeLogLikelihoodLoss_Onnx_ver22(Pointer p) { super(p); } +} diff --git a/onnx/src/gen/java/org/bytedeco/onnx/OpSchema.java b/onnx/src/gen/java/org/bytedeco/onnx/OpSchema.java index 30745911bec..beebf5290dc 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/OpSchema.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/OpSchema.java @@ -599,8 +599,12 @@ private native void allocate( public static native @Const @ByRef StringVector all_tensor_types_ir4(); + public static native @Const @ByRef StringVector all_non_complex_numeric_types_plus_bool_ir4(); + public static native @Const @ByRef StringVector all_float_types_ir4(); + public static native @Const @ByRef StringVector all_float_types_plus_Xint8_ir4(); + public static native @Const @ByRef StringVector all_float_types_ir9(); public static native @Const @ByRef StringVector all_float_types_ir10(); @@ -609,6 +613,8 @@ private native void allocate( public static native @Const @ByRef StringVector all_tensor_types_ir10(); + public static native @Const @ByRef StringVector all_non_complex_tensor_types_ir10(); + public static native @Const @ByRef StringVector all_tensor_sequence_types(); public static native @Const @ByRef StringVector all_tensor_sequence_types_ir4(); diff --git a/onnx/src/gen/java/org/bytedeco/onnx/OpSet_Onnx_ver22.java b/onnx/src/gen/java/org/bytedeco/onnx/OpSet_Onnx_ver22.java new file mode 100644 index 00000000000..8b8d095d66f --- /dev/null +++ b/onnx/src/gen/java/org/bytedeco/onnx/OpSet_Onnx_ver22.java @@ -0,0 +1,33 @@ +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE + +package org.bytedeco.onnx; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +import static org.bytedeco.javacpp.presets.javacpp.*; + +import static org.bytedeco.onnx.global.onnx.*; + + +// Iterate over schema from ai.onnx version 22 +@Namespace("onnx") @Properties(inherit = org.bytedeco.onnx.presets.onnx.class) +public class OpSet_Onnx_ver22 extends Pointer { + static { Loader.load(); } + /** Default native constructor. */ + public OpSet_Onnx_ver22() { super((Pointer)null); allocate(); } + /** Native array allocator. Access with {@link Pointer#position(long)}. */ + public OpSet_Onnx_ver22(long size) { super((Pointer)null); allocateArray(size); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public OpSet_Onnx_ver22(Pointer p) { super(p); } + private native void allocate(); + private native void allocateArray(long size); + @Override public OpSet_Onnx_ver22 position(long position) { + return (OpSet_Onnx_ver22)super.position(position); + } + @Override public OpSet_Onnx_ver22 getPointer(long i) { + return new OpSet_Onnx_ver22((Pointer)this).offsetAddress(i); + } + +} diff --git a/onnx/src/gen/java/org/bytedeco/onnx/RNN_Onnx_ver22.java b/onnx/src/gen/java/org/bytedeco/onnx/RNN_Onnx_ver22.java new file mode 100644 index 00000000000..4d9037e797f --- /dev/null +++ b/onnx/src/gen/java/org/bytedeco/onnx/RNN_Onnx_ver22.java @@ -0,0 +1,19 @@ +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE + +package org.bytedeco.onnx; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +import static org.bytedeco.javacpp.presets.javacpp.*; + +import static org.bytedeco.onnx.global.onnx.*; + +@Namespace("onnx") @Opaque @Properties(inherit = org.bytedeco.onnx.presets.onnx.class) +public class RNN_Onnx_ver22 extends Pointer { + /** Empty constructor. Calls {@code super((Pointer)null)}. */ + public RNN_Onnx_ver22() { super((Pointer)null); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public RNN_Onnx_ver22(Pointer p) { super(p); } +} diff --git a/onnx/src/gen/java/org/bytedeco/onnx/RandomNormalLike_Onnx_ver22.java b/onnx/src/gen/java/org/bytedeco/onnx/RandomNormalLike_Onnx_ver22.java new file mode 100644 index 00000000000..763c931ad40 --- /dev/null +++ b/onnx/src/gen/java/org/bytedeco/onnx/RandomNormalLike_Onnx_ver22.java @@ -0,0 +1,19 @@ +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE + +package org.bytedeco.onnx; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +import static org.bytedeco.javacpp.presets.javacpp.*; + +import static org.bytedeco.onnx.global.onnx.*; + +@Namespace("onnx") @Opaque @Properties(inherit = org.bytedeco.onnx.presets.onnx.class) +public class RandomNormalLike_Onnx_ver22 extends Pointer { + /** Empty constructor. Calls {@code super((Pointer)null)}. */ + public RandomNormalLike_Onnx_ver22() { super((Pointer)null); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public RandomNormalLike_Onnx_ver22(Pointer p) { super(p); } +} diff --git a/onnx/src/gen/java/org/bytedeco/onnx/RandomNormal_Onnx_ver22.java b/onnx/src/gen/java/org/bytedeco/onnx/RandomNormal_Onnx_ver22.java new file mode 100644 index 00000000000..4701ba9c3fb --- /dev/null +++ b/onnx/src/gen/java/org/bytedeco/onnx/RandomNormal_Onnx_ver22.java @@ -0,0 +1,19 @@ +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE + +package org.bytedeco.onnx; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +import static org.bytedeco.javacpp.presets.javacpp.*; + +import static org.bytedeco.onnx.global.onnx.*; + +@Namespace("onnx") @Opaque @Properties(inherit = org.bytedeco.onnx.presets.onnx.class) +public class RandomNormal_Onnx_ver22 extends Pointer { + /** Empty constructor. Calls {@code super((Pointer)null)}. */ + public RandomNormal_Onnx_ver22() { super((Pointer)null); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public RandomNormal_Onnx_ver22(Pointer p) { super(p); } +} diff --git a/onnx/src/gen/java/org/bytedeco/onnx/RandomUniformLike_Onnx_ver22.java b/onnx/src/gen/java/org/bytedeco/onnx/RandomUniformLike_Onnx_ver22.java new file mode 100644 index 00000000000..ed64be0a78b --- /dev/null +++ b/onnx/src/gen/java/org/bytedeco/onnx/RandomUniformLike_Onnx_ver22.java @@ -0,0 +1,19 @@ +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE + +package org.bytedeco.onnx; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +import static org.bytedeco.javacpp.presets.javacpp.*; + +import static org.bytedeco.onnx.global.onnx.*; + +@Namespace("onnx") @Opaque @Properties(inherit = org.bytedeco.onnx.presets.onnx.class) +public class RandomUniformLike_Onnx_ver22 extends Pointer { + /** Empty constructor. Calls {@code super((Pointer)null)}. */ + public RandomUniformLike_Onnx_ver22() { super((Pointer)null); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public RandomUniformLike_Onnx_ver22(Pointer p) { super(p); } +} diff --git a/onnx/src/gen/java/org/bytedeco/onnx/RandomUniform_Onnx_ver22.java b/onnx/src/gen/java/org/bytedeco/onnx/RandomUniform_Onnx_ver22.java new file mode 100644 index 00000000000..7ae11b7a3aa --- /dev/null +++ b/onnx/src/gen/java/org/bytedeco/onnx/RandomUniform_Onnx_ver22.java @@ -0,0 +1,19 @@ +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE + +package org.bytedeco.onnx; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +import static org.bytedeco.javacpp.presets.javacpp.*; + +import static org.bytedeco.onnx.global.onnx.*; + +@Namespace("onnx") @Opaque @Properties(inherit = org.bytedeco.onnx.presets.onnx.class) +public class RandomUniform_Onnx_ver22 extends Pointer { + /** Empty constructor. Calls {@code super((Pointer)null)}. */ + public RandomUniform_Onnx_ver22() { super((Pointer)null); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public RandomUniform_Onnx_ver22(Pointer p) { super(p); } +} diff --git a/onnx/src/gen/java/org/bytedeco/onnx/RoiAlign_Onnx_ver22.java b/onnx/src/gen/java/org/bytedeco/onnx/RoiAlign_Onnx_ver22.java new file mode 100644 index 00000000000..4f18e0e88bb --- /dev/null +++ b/onnx/src/gen/java/org/bytedeco/onnx/RoiAlign_Onnx_ver22.java @@ -0,0 +1,19 @@ +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE + +package org.bytedeco.onnx; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +import static org.bytedeco.javacpp.presets.javacpp.*; + +import static org.bytedeco.onnx.global.onnx.*; + +@Namespace("onnx") @Opaque @Properties(inherit = org.bytedeco.onnx.presets.onnx.class) +public class RoiAlign_Onnx_ver22 extends Pointer { + /** Empty constructor. Calls {@code super((Pointer)null)}. */ + public RoiAlign_Onnx_ver22() { super((Pointer)null); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public RoiAlign_Onnx_ver22(Pointer p) { super(p); } +} diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Round_Onnx_ver22.java b/onnx/src/gen/java/org/bytedeco/onnx/Round_Onnx_ver22.java new file mode 100644 index 00000000000..dc3d73ff5a4 --- /dev/null +++ b/onnx/src/gen/java/org/bytedeco/onnx/Round_Onnx_ver22.java @@ -0,0 +1,19 @@ +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE + +package org.bytedeco.onnx; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +import static org.bytedeco.javacpp.presets.javacpp.*; + +import static org.bytedeco.onnx.global.onnx.*; + +@Namespace("onnx") @Opaque @Properties(inherit = org.bytedeco.onnx.presets.onnx.class) +public class Round_Onnx_ver22 extends Pointer { + /** Empty constructor. Calls {@code super((Pointer)null)}. */ + public Round_Onnx_ver22() { super((Pointer)null); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public Round_Onnx_ver22(Pointer p) { super(p); } +} diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Selu_Onnx_ver22.java b/onnx/src/gen/java/org/bytedeco/onnx/Selu_Onnx_ver22.java new file mode 100644 index 00000000000..82748acb729 --- /dev/null +++ b/onnx/src/gen/java/org/bytedeco/onnx/Selu_Onnx_ver22.java @@ -0,0 +1,19 @@ +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE + +package org.bytedeco.onnx; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +import static org.bytedeco.javacpp.presets.javacpp.*; + +import static org.bytedeco.onnx.global.onnx.*; + +@Namespace("onnx") @Opaque @Properties(inherit = org.bytedeco.onnx.presets.onnx.class) +public class Selu_Onnx_ver22 extends Pointer { + /** Empty constructor. Calls {@code super((Pointer)null)}. */ + public Selu_Onnx_ver22() { super((Pointer)null); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public Selu_Onnx_ver22(Pointer p) { super(p); } +} diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Sin_Onnx_ver22.java b/onnx/src/gen/java/org/bytedeco/onnx/Sin_Onnx_ver22.java new file mode 100644 index 00000000000..41aeca74637 --- /dev/null +++ b/onnx/src/gen/java/org/bytedeco/onnx/Sin_Onnx_ver22.java @@ -0,0 +1,19 @@ +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE + +package org.bytedeco.onnx; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +import static org.bytedeco.javacpp.presets.javacpp.*; + +import static org.bytedeco.onnx.global.onnx.*; + +@Namespace("onnx") @Opaque @Properties(inherit = org.bytedeco.onnx.presets.onnx.class) +public class Sin_Onnx_ver22 extends Pointer { + /** Empty constructor. Calls {@code super((Pointer)null)}. */ + public Sin_Onnx_ver22() { super((Pointer)null); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public Sin_Onnx_ver22(Pointer p) { super(p); } +} diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Sinh_Onnx_ver22.java b/onnx/src/gen/java/org/bytedeco/onnx/Sinh_Onnx_ver22.java new file mode 100644 index 00000000000..1b9f5e94898 --- /dev/null +++ b/onnx/src/gen/java/org/bytedeco/onnx/Sinh_Onnx_ver22.java @@ -0,0 +1,19 @@ +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE + +package org.bytedeco.onnx; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +import static org.bytedeco.javacpp.presets.javacpp.*; + +import static org.bytedeco.onnx.global.onnx.*; + +@Namespace("onnx") @Opaque @Properties(inherit = org.bytedeco.onnx.presets.onnx.class) +public class Sinh_Onnx_ver22 extends Pointer { + /** Empty constructor. Calls {@code super((Pointer)null)}. */ + public Sinh_Onnx_ver22() { super((Pointer)null); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public Sinh_Onnx_ver22(Pointer p) { super(p); } +} diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Softplus_Onnx_ver22.java b/onnx/src/gen/java/org/bytedeco/onnx/Softplus_Onnx_ver22.java new file mode 100644 index 00000000000..2db7ff0b5ec --- /dev/null +++ b/onnx/src/gen/java/org/bytedeco/onnx/Softplus_Onnx_ver22.java @@ -0,0 +1,19 @@ +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE + +package org.bytedeco.onnx; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +import static org.bytedeco.javacpp.presets.javacpp.*; + +import static org.bytedeco.onnx.global.onnx.*; + +@Namespace("onnx") @Opaque @Properties(inherit = org.bytedeco.onnx.presets.onnx.class) +public class Softplus_Onnx_ver22 extends Pointer { + /** Empty constructor. Calls {@code super((Pointer)null)}. */ + public Softplus_Onnx_ver22() { super((Pointer)null); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public Softplus_Onnx_ver22(Pointer p) { super(p); } +} diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Softsign_Onnx_ver22.java b/onnx/src/gen/java/org/bytedeco/onnx/Softsign_Onnx_ver22.java new file mode 100644 index 00000000000..25c3344d30b --- /dev/null +++ b/onnx/src/gen/java/org/bytedeco/onnx/Softsign_Onnx_ver22.java @@ -0,0 +1,19 @@ +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE + +package org.bytedeco.onnx; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +import static org.bytedeco.javacpp.presets.javacpp.*; + +import static org.bytedeco.onnx.global.onnx.*; + +@Namespace("onnx") @Opaque @Properties(inherit = org.bytedeco.onnx.presets.onnx.class) +public class Softsign_Onnx_ver22 extends Pointer { + /** Empty constructor. Calls {@code super((Pointer)null)}. */ + public Softsign_Onnx_ver22() { super((Pointer)null); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public Softsign_Onnx_ver22(Pointer p) { super(p); } +} diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Tan_Onnx_ver22.java b/onnx/src/gen/java/org/bytedeco/onnx/Tan_Onnx_ver22.java new file mode 100644 index 00000000000..c3bf1a6e562 --- /dev/null +++ b/onnx/src/gen/java/org/bytedeco/onnx/Tan_Onnx_ver22.java @@ -0,0 +1,19 @@ +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE + +package org.bytedeco.onnx; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +import static org.bytedeco.javacpp.presets.javacpp.*; + +import static org.bytedeco.onnx.global.onnx.*; + +@Namespace("onnx") @Opaque @Properties(inherit = org.bytedeco.onnx.presets.onnx.class) +public class Tan_Onnx_ver22 extends Pointer { + /** Empty constructor. Calls {@code super((Pointer)null)}. */ + public Tan_Onnx_ver22() { super((Pointer)null); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public Tan_Onnx_ver22(Pointer p) { super(p); } +} diff --git a/onnx/src/gen/java/org/bytedeco/onnx/ThresholdedRelu_Onnx_ver22.java b/onnx/src/gen/java/org/bytedeco/onnx/ThresholdedRelu_Onnx_ver22.java new file mode 100644 index 00000000000..67a52be594b --- /dev/null +++ b/onnx/src/gen/java/org/bytedeco/onnx/ThresholdedRelu_Onnx_ver22.java @@ -0,0 +1,19 @@ +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE + +package org.bytedeco.onnx; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +import static org.bytedeco.javacpp.presets.javacpp.*; + +import static org.bytedeco.onnx.global.onnx.*; + +@Namespace("onnx") @Opaque @Properties(inherit = org.bytedeco.onnx.presets.onnx.class) +public class ThresholdedRelu_Onnx_ver22 extends Pointer { + /** Empty constructor. Calls {@code super((Pointer)null)}. */ + public ThresholdedRelu_Onnx_ver22() { super((Pointer)null); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public ThresholdedRelu_Onnx_ver22(Pointer p) { super(p); } +} diff --git a/onnx/src/gen/java/org/bytedeco/onnx/global/onnx.java b/onnx/src/gen/java/org/bytedeco/onnx/global/onnx.java index 77a7bc6d2e6..57171d746b4 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/global/onnx.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/global/onnx.java @@ -101,6 +101,7 @@ public class onnx extends org.bytedeco.onnx.presets.onnx { // #include // #include // #include +// #include // #include // #include // #include @@ -1819,6 +1820,153 @@ public class onnx extends org.bytedeco.onnx.presets.onnx { // Targeting ../OpSet_Onnx_ver21.java +// Targeting ../EyeLike_Onnx_ver22.java + + +// Targeting ../RandomUniform_Onnx_ver22.java + + +// Targeting ../RandomNormal_Onnx_ver22.java + + +// Targeting ../RandomUniformLike_Onnx_ver22.java + + +// Targeting ../RandomNormalLike_Onnx_ver22.java + + +// Targeting ../Multinomial_Onnx_ver22.java + + +// Targeting ../Bernoulli_Onnx_ver22.java + + +// Targeting ../ThresholdedRelu_Onnx_ver22.java + + +// Targeting ../Selu_Onnx_ver22.java + + +// Targeting ../Elu_Onnx_ver22.java + + +// Targeting ../Mish_Onnx_ver22.java + + +// Targeting ../HardSigmoid_Onnx_ver22.java + + +// Targeting ../HardSwish_Onnx_ver22.java + + +// Targeting ../Softsign_Onnx_ver22.java + + +// Targeting ../Softplus_Onnx_ver22.java + + +// Targeting ../Sin_Onnx_ver22.java + + +// Targeting ../Cos_Onnx_ver22.java + + +// Targeting ../Tan_Onnx_ver22.java + + +// Targeting ../Asin_Onnx_ver22.java + + +// Targeting ../Acos_Onnx_ver22.java + + +// Targeting ../Atan_Onnx_ver22.java + + +// Targeting ../Sinh_Onnx_ver22.java + + +// Targeting ../Cosh_Onnx_ver22.java + + +// Targeting ../Asinh_Onnx_ver22.java + + +// Targeting ../Acosh_Onnx_ver22.java + + +// Targeting ../Atanh_Onnx_ver22.java + + +// Targeting ../Round_Onnx_ver22.java + + +// Targeting ../Det_Onnx_ver22.java + + +// Targeting ../NegativeLogLikelihoodLoss_Onnx_ver22.java + + +// Targeting ../AveragePool_Onnx_ver22.java + + +// Targeting ../MaxPool_Onnx_ver22.java + + +// Targeting ../MaxUnpool_Onnx_ver22.java + + +// Targeting ../LpPool_Onnx_ver22.java + + +// Targeting ../MaxRoiPool_Onnx_ver22.java + + +// Targeting ../Conv_Onnx_ver22.java + + +// Targeting ../ConvTranspose_Onnx_ver22.java + + +// Targeting ../DeformConv_Onnx_ver22.java + + +// Targeting ../GlobalAveragePool_Onnx_ver22.java + + +// Targeting ../GlobalMaxPool_Onnx_ver22.java + + +// Targeting ../GlobalLpPool_Onnx_ver22.java + + +// Targeting ../InstanceNormalization_Onnx_ver22.java + + +// Targeting ../LpNormalization_Onnx_ver22.java + + +// Targeting ../Dropout_Onnx_ver22.java + + +// Targeting ../RoiAlign_Onnx_ver22.java + + +// Targeting ../RNN_Onnx_ver22.java + + +// Targeting ../GRU_Onnx_ver22.java + + +// Targeting ../LSTM_Onnx_ver22.java + + +// Targeting ../GridSample_Onnx_ver22.java + + +// Targeting ../OpSet_Onnx_ver22.java + + @Namespace("onnx") public static native void RegisterOnnxOperatorSetSchema(); diff --git a/onnxruntime/README.md b/onnxruntime/README.md index de05c535e9a..2167fdab1e8 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.18.1 https://microsoft.github.io/onnxruntime/ + * ONNX Runtime 1.19.2 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.18.1-1.5.11-SNAPSHOT + 1.19.2-1.5.11-SNAPSHOT org.bytedeco onnxruntime-platform-gpu - 1.18.1-1.5.11-SNAPSHOT + 1.19.2-1.5.11-SNAPSHOT diff --git a/onnxruntime/cppbuild.sh b/onnxruntime/cppbuild.sh index 0e479e6174d..a78df6bf455 100755 --- a/onnxruntime/cppbuild.sh +++ b/onnxruntime/cppbuild.sh @@ -22,7 +22,7 @@ if [[ "$EXTENSION" == *gpu ]]; then GPU_FLAGS="--use_cuda" fi -ONNXRUNTIME=1.18.1 +ONNXRUNTIME=1.19.2 mkdir -p "$PLATFORM$EXTENSION" cd "$PLATFORM$EXTENSION" diff --git a/onnxruntime/onnxruntime.patch b/onnxruntime/onnxruntime.patch index 2ffc367583d..0279f3b3444 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 690b6d4e66..cc99e69580 100644 +index 6eb784a406..64c6ee243d 100644 --- a/cmake/adjust_global_compile_flags.cmake +++ b/cmake/adjust_global_compile_flags.cmake @@ -20,8 +20,8 @@ endif() @@ -14,26 +14,26 @@ index 690b6d4e66..cc99e69580 100644 if (CMAKE_SYSTEM_NAME STREQUAL "Emscripten") diff --git a/cmake/onnxruntime.cmake b/cmake/onnxruntime.cmake -index e15c8a046d..0504f81348 100644 +index 927b4ac84b..307d4a4fd1 100644 --- a/cmake/onnxruntime.cmake +++ b/cmake/onnxruntime.cmake -@@ -117,9 +117,9 @@ target_compile_definitions(onnxruntime PRIVATE FILE_NAME=\"onnxruntime.dll\") +@@ -127,9 +127,9 @@ target_compile_definitions(onnxruntime PRIVATE FILE_NAME=\"onnxruntime.dll\") if(UNIX) if (APPLE) - set(ONNXRUNTIME_SO_LINK_FLAG " -Xlinker -dead_strip") + set(ONNXRUNTIME_SO_LINK_FLAG " -L/usr/local/lib -lomp") - else() + elseif(NOT ${CMAKE_SYSTEM_NAME} MATCHES "AIX") - set(ONNXRUNTIME_SO_LINK_FLAG " -Xlinker --version-script=${SYMBOL_FILE} -Xlinker --no-undefined -Xlinker --gc-sections -z noexecstack") + set(ONNXRUNTIME_SO_LINK_FLAG " -Xlinker --no-undefined -Xlinker -z -Xlinker noexecstack") endif() 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 80bd301c20..e7e4b1ce4f 100644 +index 62e9cfe24c..300a5f176f 100644 --- a/onnxruntime/core/session/provider_bridge_ort.cc +++ b/onnxruntime/core/session/provider_bridge_ort.cc -@@ -1365,13 +1365,33 @@ struct ProviderHostImpl : ProviderHost { +@@ -1576,13 +1576,33 @@ struct ProviderHostImpl : ProviderHost { #if defined(_MSC_VER) && !defined(__clang__) #pragma warning(pop) #endif @@ -67,7 +67,7 @@ index 80bd301c20..e7e4b1ce4f 100644 ORT_THROW_IF_ERROR(Env::Default().LoadDynamicLibrary(full_path, true /*shared_globals on unix*/, &handle_)); void (*PProvider_SetHost)(void*); -@@ -1390,7 +1410,7 @@ struct ProviderSharedLibrary { +@@ -1601,7 +1621,7 @@ struct ProviderSharedLibrary { } } @@ -76,7 +76,7 @@ index 80bd301c20..e7e4b1ce4f 100644 ~ProviderSharedLibrary() { // assert(!handle_); // We should already be unloaded at this point (disabled until Python shuts down deterministically) } -@@ -1423,6 +1443,18 @@ struct ProviderLibrary { +@@ -1634,6 +1654,18 @@ struct ProviderLibrary { s_library_shared.Ensure(); auto full_path = Env::Default().GetRuntimePath() + filename_; @@ -96,7 +96,7 @@ index 80bd301c20..e7e4b1ce4f 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 575434d19b..272893301a 100644 +index 7fb9fd3c8c..e0487e67f0 100644 --- a/onnxruntime/core/providers/shared_library/provider_bridge_provider.cc +++ b/onnxruntime/core/providers/shared_library/provider_bridge_provider.cc @@ -114,10 +114,11 @@ struct OnUnload { @@ -113,7 +113,7 @@ index 575434d19b..272893301a 100644 return g_host->CreateAllocator(info); } -@@ -252,19 +253,22 @@ MLDataType DataTypeImpl::GetSparseTensorType() { return Provider +@@ -260,19 +261,22 @@ MLDataType DataTypeImpl::GetSparseTensorType() { return Provider #endif Status IDataTransfer::CopyTensor(const Tensor& src, Tensor& dst) const { @@ -137,7 +137,7 @@ index 575434d19b..272893301a 100644 TensorShape::TensorShape(gsl::span dims) { Allocate(dims.size()); -@@ -272,16 +276,19 @@ TensorShape::TensorShape(gsl::span dims) { +@@ -280,16 +284,19 @@ TensorShape::TensorShape(gsl::span dims) { } TensorShape& TensorShape::operator=(const TensorShape& other) { @@ -157,7 +157,7 @@ index 575434d19b..272893301a 100644 g_host->TensorShape__Allocate(this, size); } -@@ -292,6 +299,7 @@ int64_t TensorShape::Size() const { +@@ -300,6 +307,7 @@ int64_t TensorShape::Size() const { } int64_t TensorShape::SizeHelper(size_t start, size_t end) const { @@ -165,7 +165,7 @@ index 575434d19b..272893301a 100644 return g_host->TensorShape__SizeHelper(this, start, end); } -@@ -301,84 +309,98 @@ TensorShape TensorShape::Slice(size_t dimstart, size_t dimend) const { +@@ -309,80 +317,93 @@ TensorShape TensorShape::Slice(size_t dimstart, size_t dimend) const { } std::string TensorShape::ToString() const { @@ -225,19 +225,14 @@ index 575434d19b..272893301a 100644 #endif #ifdef USE_MIGRAPHX - std::unique_ptr CreateROCMAllocator(int16_t device_id, const char* name) { + std::unique_ptr CreateMIGraphXAllocator(int16_t device_id, const char* name) { + g_host = Provider_GetHost(); - return g_host->CreateROCMAllocator(device_id, name); + return g_host->CreateMIGraphXAllocator(device_id, name); } - std::unique_ptr CreateROCMPinnedAllocator(const char* name) { + std::unique_ptr CreateMIGraphXPinnedAllocator(int16_t device_id, const char* name) { + g_host = Provider_GetHost(); - return g_host->CreateROCMPinnedAllocator(name); - } - - std::unique_ptr CreateGPUDataTransfer() { -+ g_host = Provider_GetHost(); - return g_host->CreateGPUDataTransfer(); + return g_host->CreateMIGraphXPinnedAllocator(device_id, name); } #endif @@ -271,7 +266,7 @@ index 575434d19b..272893301a 100644 const char* Category::onnxruntime = "onnxruntime"; -@@ -461,10 +483,12 @@ std::vector GetStackTrace() { return g_host->GetStackTrace(); } +@@ -465,10 +486,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) { @@ -285,10 +280,10 @@ index 575434d19b..272893301a 100644 } diff --git a/tools/ci_build/build.py b/tools/ci_build/build.py -index 3df351711a..6a75127088 100644 +index 587d035541..812dc850a4 100644 --- a/tools/ci_build/build.py +++ b/tools/ci_build/build.py -@@ -1003,6 +1003,9 @@ def generate_build_tree( +@@ -993,6 +993,9 @@ def generate_build_tree( cmake_args += [ "-Donnxruntime_RUN_ONNX_TESTS=" + ("ON" if args.enable_onnx_tests else "OFF"), "-Donnxruntime_GENERATE_TEST_REPORTS=ON", @@ -298,7 +293,7 @@ index 3df351711a..6a75127088 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 -@@ -2795,6 +2798,9 @@ def main(): +@@ -2811,6 +2814,9 @@ def main(): log.info("Activating emsdk...") run_subprocess([emsdk_file, "activate", emsdk_version], cwd=emsdk_dir) @@ -306,5 +301,5 @@ index 3df351711a..6a75127088 100644 + cmake_extra_args = ["-DCMAKE_SYSTEM_NAME=Linux", "-DCMAKE_SYSTEM_PROCESSOR=aarch64"] + if args.enable_pybind and is_windows(): - install_python_deps(args.numpy_version) - + run_subprocess( + [sys.executable, "-m", "pip", "install", "-r", "requirements/pybind/requirements.txt"], diff --git a/onnxruntime/platform/gpu/pom.xml b/onnxruntime/platform/gpu/pom.xml index 7fa142d98c9..f3cd3f606de 100644 --- a/onnxruntime/platform/gpu/pom.xml +++ b/onnxruntime/platform/gpu/pom.xml @@ -12,7 +12,7 @@ org.bytedeco onnxruntime-platform-gpu - 1.18.1-${project.parent.version} + 1.19.2-${project.parent.version} JavaCPP Presets Platform GPU for ONNX Runtime diff --git a/onnxruntime/platform/pom.xml b/onnxruntime/platform/pom.xml index 3c412925cd2..44450fe29ba 100644 --- a/onnxruntime/platform/pom.xml +++ b/onnxruntime/platform/pom.xml @@ -12,7 +12,7 @@ org.bytedeco onnxruntime-platform - 1.18.1-${project.parent.version} + 1.19.2-${project.parent.version} JavaCPP Presets Platform for ONNX Runtime diff --git a/onnxruntime/pom.xml b/onnxruntime/pom.xml index e0a60dbcf08..c74404d3096 100644 --- a/onnxruntime/pom.xml +++ b/onnxruntime/pom.xml @@ -11,7 +11,7 @@ org.bytedeco onnxruntime - 1.18.1-${project.parent.version} + 1.19.2-${project.parent.version} JavaCPP Presets for ONNX Runtime diff --git a/onnxruntime/samples/pom.xml b/onnxruntime/samples/pom.xml index 1bfae2d17cb..77b521a4f67 100644 --- a/onnxruntime/samples/pom.xml +++ b/onnxruntime/samples/pom.xml @@ -12,14 +12,14 @@ org.bytedeco onnxruntime-platform - 1.18.1-1.5.11-SNAPSHOT + 1.19.2-1.5.11-SNAPSHOT org.bytedeco onnxruntime-platform-gpu - 1.18.1-1.5.11-SNAPSHOT + 1.19.2-1.5.11-SNAPSHOT diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtApi.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtApi.java index 2bd68e616bd..6b10694a81a 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtApi.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtApi.java @@ -1340,8 +1340,8 @@ public native OrtStatus KernelInfoGetAttribute_string( @Const OrtKernelInfo info * and not present, the function returns success and out is set to nullptr. * * @param context [in] ::OrtKernelContext instance - * @param input [in] index. See KernelContext_GetInputCount for boundaries check. - * @param returns [in, out] a ptr to OrtValue if the input is present + * @param index [in] See KernelContext_GetInputCount for boundaries check. + * @param out [out] OrtValue if the input is present otherwise is set nullptr * * \snippet{doc} snippets.dox OrtStatus Return Value */ @@ -1356,8 +1356,10 @@ public native OrtStatus KernelContext_GetInput( @Const OrtKernelContext context, * and not present, the function returns success and out is set to nullptr. * * @param context [in] ::OrtKernelContext instance - * @param output [in] index. See KernelContext_GetOutputCount for boundaries check. - * @param returns [in, out] a ptr to OrtValue if the output is present + * @param index [in] See KernelContext_GetOutputCount for boundaries check. + * @param dim_values [in] output dimensions + * @param dim_count [in] number of dimensions + * @param out [out] a ptr to OrtValue to output otherwise set to nullptr * * \snippet{doc} snippets.dox OrtStatus Return Value */ @@ -2439,7 +2441,7 @@ public native OrtStatus KernelInfoGetAttributeArray_int64( @Const OrtKernelInfo * "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. + * It is not an allocation limit, it is only a limit for extension 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. @@ -4572,14 +4574,16 @@ public native OrtStatus RunAsync( OrtSession session, @Const OrtRunOptions run_o * E.g. a cuda stream or a cublas handle * * @param context - Kernel context - * @param resouce_version - Version of the resource + * @param resource_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); + public native OrtStatus KernelContext_GetResource( @Const OrtKernelContext context, int resource_version, + int resource_id, @Cast("void**") PointerPointer resource); + public native OrtStatus KernelContext_GetResource( @Const OrtKernelContext context, int resource_version, + int resource_id, @Cast("void**") @ByPtrPtr Pointer resource); /** \brief Set user logging function * @@ -4637,10 +4641,10 @@ public native OrtStatus SetUserLoggingFunction( OrtSessionOptions options, public native OrtStatus ShapeInferContext_GetAttribute( @Const OrtShapeInferContext context, String attr_name, @Const @ByPtrPtr OrtOpAttr attr); /** - * Set type and shape info of an ouput + * Set type and shape info of an output * * @param context [in] - * @param index [in] The index of the ouput + * @param index [in] The index of the output * @param info [out] Type shape info of the output * * @since Version 1.17. @@ -4802,7 +4806,7 @@ public native OrtStatus SessionOptionsAppendExecutionProvider_VitisAI( * will occur before any of the optimizations take place. The data will be copied into the graph * since TensorProto can't refer to the user provided buffers. * - * @param session [in] options + * @param options [in] * @param external_initializer_file_names [in] Array of null terminated UTF-8 encoded strings of the file names * which holds the external initializers. * @param external_initializer_file_buffer_array [in] Array of pointers to the buffer of the file content. diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtCUDAProviderOptions.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtCUDAProviderOptions.java index b4e8c89bda7..6893a618012 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtCUDAProviderOptions.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtCUDAProviderOptions.java @@ -89,13 +89,13 @@ public class OrtCUDAProviderOptions extends Pointer { /** \brief Enable TunableOp for using. * Set it to 1/0 to enable/disable TunableOp. Otherwise, it is disabled by default. - * This option can be overriden by environment variable ORT_CUDA_TUNABLE_OP_ENABLE. + * This option can be overridden by environment variable ORT_CUDA_TUNABLE_OP_ENABLE. */ public native int tunable_op_enable(); public native OrtCUDAProviderOptions tunable_op_enable(int setter); /** \brief Enable TunableOp for tuning. * Set it to 1/0 to enable/disable TunableOp tuning. Otherwise, it is disabled by default. - * This option can be overriden by environment variable ORT_CUDA_TUNABLE_OP_TUNING_ENABLE. + * This option can be overridden by environment variable ORT_CUDA_TUNABLE_OP_TUNING_ENABLE. */ public native int tunable_op_tuning_enable(); public native OrtCUDAProviderOptions tunable_op_tuning_enable(int setter); diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtMIGraphXProviderOptions.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtMIGraphXProviderOptions.java index dc8f2765f6f..4a75c6b211d 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtMIGraphXProviderOptions.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtMIGraphXProviderOptions.java @@ -42,4 +42,8 @@ public class OrtMIGraphXProviderOptions extends Pointer { public native int migraphx_int8_enable(); public native OrtMIGraphXProviderOptions migraphx_int8_enable(int setter); // MIGraphX INT8 precision. Default 0 = false, nonzero = true public native int migraphx_use_native_calibration_table(); public native OrtMIGraphXProviderOptions migraphx_use_native_calibration_table(int setter); // MIGraphx INT8 cal table. Default 0 = false, noznero = true public native @Cast("const char*") BytePointer migraphx_int8_calibration_table_name(); public native OrtMIGraphXProviderOptions migraphx_int8_calibration_table_name(BytePointer setter); // MIGraphx INT8 calibration table name + public native int migraphx_save_compiled_model(); public native OrtMIGraphXProviderOptions migraphx_save_compiled_model(int setter); // migraphx save compiled model. Default 0 = false, noznero = true + public native @Cast("const char*") BytePointer migraphx_save_model_path(); public native OrtMIGraphXProviderOptions migraphx_save_model_path(BytePointer setter); // migraphx model path name + public native int migraphx_load_compiled_model(); public native OrtMIGraphXProviderOptions migraphx_load_compiled_model(int setter); // migraphx int8 cal table. Default 0 = false, noznero = true + public native @Cast("const char*") BytePointer migraphx_load_model_path(); public native OrtMIGraphXProviderOptions migraphx_load_model_path(BytePointer setter); // migraphx model path name } diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtROCMProviderOptions.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtROCMProviderOptions.java index 7d701021a0f..3e95203cef2 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtROCMProviderOptions.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/OrtROCMProviderOptions.java @@ -90,13 +90,13 @@ public class OrtROCMProviderOptions extends Pointer { /** \brief Enable TunableOp for using. * Set it to 1/0 to enable/disable TunableOp. Otherwise, it is disabled by default. - * This option can be overriden by environment variable ORT_ROCM_TUNABLE_OP_ENABLE. + * This option can be overridden by environment variable ORT_ROCM_TUNABLE_OP_ENABLE. */ public native int tunable_op_enable(); public native OrtROCMProviderOptions tunable_op_enable(int setter); /** \brief Enable TunableOp for tuning. * Set it to 1/0 to enable/disable TunableOp tuning. Otherwise, it is disabled by default. - * This option can be overriden by environment variable ORT_ROCM_TUNABLE_OP_TUNING_ENABLE. + * This option can be overridden by environment variable ORT_ROCM_TUNABLE_OP_TUNING_ENABLE. */ public native int tunable_op_tuning_enable(); public native OrtROCMProviderOptions tunable_op_tuning_enable(int setter); diff --git a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/ShapeInferContext.java b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/ShapeInferContext.java index d4af3163523..7d096db6b88 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/ShapeInferContext.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/ShapeInferContext.java @@ -57,6 +57,7 @@ public class ShapeInferContext extends Pointer { public native @Cast("size_t") long GetInputCount(); + public native @ByVal Status SetOutputShape(@Cast("size_t") long indice, @StdVector SymbolicInteger shape, @Cast("ONNXTensorElementDataType") int type/*=ONNX_TENSOR_ELEMENT_DATA_TYPE_FLOAT*/); public native @ByVal Status SetOutputShape(@Cast("size_t") long indice, @StdVector SymbolicInteger shape); public native @Cast("int64_t") long GetAttrInt(@Cast("const char*") BytePointer attr_name); 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 a80ac244277..90c725945d4 100644 --- a/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/global/onnxruntime.java +++ b/onnxruntime/src/gen/java/org/bytedeco/onnxruntime/global/onnxruntime.java @@ -74,7 +74,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 = 18; +public static final int ORT_API_VERSION = 19; // #ifdef __cplusplus // #endif @@ -232,7 +232,10 @@ public class onnxruntime extends org.bytedeco.onnxruntime.presets.onnxruntime { 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 + ONNX_TENSOR_ELEMENT_DATA_TYPE_FLOAT8E5M2FNUZ = 20, // Non-IEEE floating-point format based on IEEE754 single-precision + // Int4 types were introduced in ONNX 1.16. See https://onnx.ai/onnx/technical/int4.html + ONNX_TENSOR_ELEMENT_DATA_TYPE_UINT4 = 21, // maps to a pair of packed uint4 values (size == 1 byte) + ONNX_TENSOR_ELEMENT_DATA_TYPE_INT4 = 22; // maps to a pair of packed int4 values (size == 1 byte) // Synced with onnx TypeProto oneof /** enum ONNXType */ 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 fc28ad3cba8..963b4a82ea7 100644 --- a/onnxruntime/src/main/java/org/bytedeco/onnxruntime/presets/onnxruntime.java +++ b/onnxruntime/src/main/java/org/bytedeco/onnxruntime/presets/onnxruntime.java @@ -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.18.1"} + link = {"onnxruntime_providers_shared", "onnxruntime@.1.19.2"} ), @Platform( value = {"linux-x86_64", "macosx-x86_64", "windows-x86_64"}, - link = {"onnxruntime_providers_shared", "onnxruntime@.1.18.1", "onnxruntime_providers_dnnl"} + link = {"onnxruntime_providers_shared", "onnxruntime@.1.19.2", "onnxruntime_providers_dnnl"} ), @Platform( value = {"linux-x86_64", "macosx-x86_64", "windows-x86_64"}, extension = "-gpu", - link = {"onnxruntime_providers_shared", "onnxruntime@.1.18.1", "onnxruntime_providers_dnnl", "onnxruntime_providers_cuda"} + link = {"onnxruntime_providers_shared", "onnxruntime@.1.19.2", "onnxruntime_providers_dnnl", "onnxruntime_providers_cuda"} ), }, target = "org.bytedeco.onnxruntime", diff --git a/opencv/README.md b/opencv/README.md index d0f1293e803..76c0037ff82 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 - 2.0.1-1.5.11-SNAPSHOT + 2.1.2-1.5.11-SNAPSHOT diff --git a/opencv/pom.xml b/opencv/pom.xml index f5217eb41f4..7a3946febc3 100644 --- a/opencv/pom.xml +++ b/opencv/pom.xml @@ -23,7 +23,7 @@ org.bytedeco numpy - 2.0.1-${project.parent.version} + 2.1.2-${project.parent.version} true @@ -67,7 +67,7 @@ org.bytedeco numpy-platform - 2.0.1-${project.parent.version} + 2.1.2-${project.parent.version} diff --git a/opencv/samples/pom.xml b/opencv/samples/pom.xml index 8e33f26bb97..5df35f052ce 100644 --- a/opencv/samples/pom.xml +++ b/opencv/samples/pom.xml @@ -40,7 +40,7 @@ org.bytedeco numpy-platform - 2.0.1-1.5.11-SNAPSHOT + 2.1.2-1.5.11-SNAPSHOT diff --git a/platform/pom.xml b/platform/pom.xml index 1f42863c6cc..a2858f5cd45 100644 --- a/platform/pom.xml +++ b/platform/pom.xml @@ -212,17 +212,17 @@ org.bytedeco cpython-platform - 3.12.5-${project.version} + 3.12.7-${project.version} org.bytedeco numpy-platform - 2.0.1-${project.version} + 2.1.2-${project.version} org.bytedeco scipy-platform - 1.14.0-${project.version} + 1.14.1-${project.version} @@ -332,7 +332,7 @@ org.bytedeco onnx-platform - 1.16.2-${project.version} + 1.17.0-${project.version} @@ -342,7 +342,7 @@ org.bytedeco onnxruntime-platform - 1.18.1-${project.version} + 1.19.2-${project.version} org.bytedeco diff --git a/pytorch/pom.xml b/pytorch/pom.xml index 9335ad36cd8..79e8b96d9ff 100644 --- a/pytorch/pom.xml +++ b/pytorch/pom.xml @@ -57,12 +57,12 @@ org.bytedeco numpy-platform - 2.0.1-${project.parent.version} + 2.1.2-${project.parent.version} org.bytedeco cpython - 3.12.5-${project.parent.version} + 3.12.7-${project.parent.version} ${os.name}-${os.arch} diff --git a/scipy/README.md b/scipy/README.md index 10edbc2a1cb..a61b4d70ec3 100644 --- a/scipy/README.md +++ b/scipy/README.md @@ -9,7 +9,7 @@ Introduction ------------ This directory contains the JavaCPP Presets module for: - * SciPy 1.14.0 https://www.scipy.org/ + * SciPy 1.14.1 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.14.0-1.5.11-SNAPSHOT + 1.14.1-1.5.11-SNAPSHOT diff --git a/scipy/cppbuild.sh b/scipy/cppbuild.sh index 3be8de5f103..2bcb90dc0c4 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.14.0 +SCIPY_VERSION=1.14.1 download http://downloads.sourceforge.net/project/boost/boost/${BOOST//_/.}/boost_$BOOST.tar.gz boost_$BOOST.tar.gz download https://github.com/data-apis/array-api-compat/archive/fd22a73.tar.gz array-api-compat-fd22a73.tar.gz download https://github.com/cobyqa/cobyqa/archive/7f40b6d.tar.gz cobyqa-7f40b6d.tar.gz @@ -124,7 +124,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.12" export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$CPYTHON_HOST_PATH/lib/:$CPYTHON_HOST_PATH" - "$CPYTHON_HOST_PATH/bin/python3.12" -m pip install --no-deps --target="$CPYTHON_HOST_PATH/lib/python3.12/" crossenv==1.4 numpy==2.0.1 $TOOLS + "$CPYTHON_HOST_PATH/bin/python3.12" -m pip install --no-deps --target="$CPYTHON_HOST_PATH/lib/python3.12/" crossenv==1.4 numpy==2.1.2 $TOOLS "$CPYTHON_HOST_PATH/bin/python3.12" -m crossenv "$PYTHON_BIN_PATH" crossenv cp -a "$NUMPY_PATH/python/numpy" "$CPYTHON_HOST_PATH/lib/python3.12/" # cp -a "$CPYTHON_HOST_PATH/lib/python3.12/include" "$PYTHON_LIB_PATH" diff --git a/scipy/platform/pom.xml b/scipy/platform/pom.xml index ddab59b55bd..3e3689ba4d8 100644 --- a/scipy/platform/pom.xml +++ b/scipy/platform/pom.xml @@ -12,7 +12,7 @@ org.bytedeco scipy-platform - 1.14.0-${project.parent.version} + 1.14.1-${project.parent.version} JavaCPP Presets Platform for SciPy @@ -23,7 +23,7 @@ org.bytedeco numpy-platform - 2.0.1-${project.parent.version} + 2.1.2-${project.parent.version} ${project.groupId} diff --git a/scipy/pom.xml b/scipy/pom.xml index 2bac08dd478..eb8318852a7 100644 --- a/scipy/pom.xml +++ b/scipy/pom.xml @@ -11,14 +11,14 @@ org.bytedeco scipy - 1.14.0-${project.parent.version} + 1.14.1-${project.parent.version} JavaCPP Presets for SciPy org.bytedeco numpy - 2.0.1-${project.parent.version} + 2.1.2-${project.parent.version} org.bytedeco @@ -41,7 +41,7 @@ org.bytedeco numpy - 2.0.1-${project.parent.version} + 2.1.2-${project.parent.version} org.bytedeco @@ -52,13 +52,13 @@ org.bytedeco cpython - 3.12.5-${project.parent.version} + 3.12.7-${project.parent.version} ${javacpp.platform} org.bytedeco numpy - 2.0.1-${project.parent.version} + 2.1.2-${project.parent.version} ${javacpp.platform} @@ -177,7 +177,7 @@ org.bytedeco cpython - 3.12.5-${project.parent.version} + 3.12.7-${project.parent.version} ${os.name}-${os.arch} diff --git a/scipy/samples/pom.xml b/scipy/samples/pom.xml index a577aa2135f..cd1b692cc16 100644 --- a/scipy/samples/pom.xml +++ b/scipy/samples/pom.xml @@ -12,7 +12,7 @@ org.bytedeco scipy-platform - 1.14.0-1.5.11-SNAPSHOT + 1.14.1-1.5.11-SNAPSHOT diff --git a/tvm/platform/gpu/pom.xml b/tvm/platform/gpu/pom.xml index d6cfbeee657..599bcde2e91 100644 --- a/tvm/platform/gpu/pom.xml +++ b/tvm/platform/gpu/pom.xml @@ -39,7 +39,7 @@ org.bytedeco scipy-platform - 1.14.0-${project.parent.version} + 1.14.1-${project.parent.version} org.bytedeco diff --git a/tvm/platform/pom.xml b/tvm/platform/pom.xml index 80cc7f280be..3c993c7eaaa 100644 --- a/tvm/platform/pom.xml +++ b/tvm/platform/pom.xml @@ -38,7 +38,7 @@ org.bytedeco scipy-platform - 1.14.0-${project.parent.version} + 1.14.1-${project.parent.version} org.bytedeco diff --git a/tvm/pom.xml b/tvm/pom.xml index e6b87ac40ac..af4ddbcfcf9 100644 --- a/tvm/pom.xml +++ b/tvm/pom.xml @@ -33,7 +33,7 @@ org.bytedeco scipy - 1.14.0-${project.parent.version} + 1.14.1-${project.parent.version} org.bytedeco @@ -71,7 +71,7 @@ org.bytedeco scipy-platform - 1.14.0-${project.parent.version} + 1.14.1-${project.parent.version}