* Upgrade presets for OpenCV 4.10.0, CMINPACK 1.3.9, GSL 2.8, CPython 3.12.4, SciPy 1.13.1, ONNX 1.16.1, ONNX Runtime 1.18.0

Author: saudet

CHANGELOG.md

@@ -4,7 +4,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 FFmpeg 7.0, DNNL 3.4.1, OpenBLAS 0.3.27, CPython 3.12.3, NumPy 1.26.4, SciPy 1.13.0, LLVM 18.1.4, libffi 3.4.6, PyTorch 2.3.0 ([pull #1466](https://github.com/bytedeco/javacpp-presets/pull/1466)), SentencePiece 0.2.0, TensorFlow Lite 2.16.1, TensorRT 10.0.1.6, Triton Inference Server 2.44.0, ONNX 1.16.0, ONNX Runtime 1.17.3, TVM 0.16.0, and their dependencies
+ * Upgrade presets for OpenCV 4.10.0, FFmpeg 7.0, DNNL 3.4.1, OpenBLAS 0.3.27, CMINPACK 1.3.9, GSL 2.8, CPython 3.12.4, NumPy 1.26.4, SciPy 1.13.1, LLVM 18.1.4, libffi 3.4.6, PyTorch 2.3.0 ([pull #1466](https://github.com/bytedeco/javacpp-presets/pull/1466)), SentencePiece 0.2.0, TensorFlow Lite 2.16.1, TensorRT 10.0.1.6, Triton Inference Server 2.44.0, ONNX 1.16.1, ONNX Runtime 1.18.0, TVM 0.16.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))

README.md

@@ -179,7 +179,7 @@ The JavaCPP Presets depend on Maven, a powerful build system for Java, so before
 
 Each child module in turn relies by default on the included [`cppbuild.sh` scripts](#the-cppbuildsh-scripts), explained below, to install its corresponding native libraries in the `cppbuild` subdirectory. To use native libraries already installed somewhere else on the system, other installation directories than `cppbuild` can also be specified either in the `pom.xml` files or in the `.java` configuration files. The following versions are supported:
 
- * OpenCV 4.9.x  https://opencv.org/releases/
+ * OpenCV 4.10.x  https://opencv.org/releases/
  * FFmpeg 7.0.x  http://ffmpeg.org/download.html
  * FlyCapture 2.13.x  https://www.flir.com/products/flycapture-sdk
  * Spinnaker 3.0.x https://www.flir.com/products/spinnaker-sdk
@@ -201,9 +201,9 @@ Each child module in turn relies by default on the included [`cppbuild.sh` scrip
  * DNNL 3.4.x  https://github.com/oneapi-src/oneDNN
  * OpenBLAS 0.3.27  http://www.openblas.net/
  * ARPACK-NG 3.9.x  https://github.com/opencollab/arpack-ng
- * CMINPACK 1.3.8  https://github.com/devernay/cminpack
+ * CMINPACK 1.3.9  https://github.com/devernay/cminpack
  * FFTW 3.3.10  http://www.fftw.org/download.html
- * GSL 2.7  http://www.gnu.org/software/gsl/#downloading
+ * GSL 2.8  http://www.gnu.org/software/gsl/#downloading
  * CPython 3.12.x  https://www.python.org/downloads/
  * NumPy 1.26.x  https://github.com/numpy/numpy
  * SciPy 1.13.x  https://github.com/scipy/scipy
@@ -223,7 +223,7 @@ Each child module in turn relies by default on the included [`cppbuild.sh` scrip
  * NVIDIA Video Codec SDK 12.1.x  https://developer.nvidia.com/nvidia-video-codec-sdk
  * OpenCL 3.0.x  https://github.com/KhronosGroup/OpenCL-ICD-Loader
  * MXNet 1.9.x  https://github.com/apache/incubator-mxnet
- * PyTorch 2.2.x  https://github.com/pytorch/pytorch
+ * PyTorch 2.3.x  https://github.com/pytorch/pytorch
  * SentencePiece 0.2.0  https://github.com/google/sentencepiece
  * TensorFlow 1.15.x  https://github.com/tensorflow/tensorflow
  * TensorFlow Lite 2.16.x  https://github.com/tensorflow/tensorflow
@@ -233,7 +233,7 @@ Each child module in turn relies by default on the included [`cppbuild.sh` scrip
  * DepthAI 2.24.x  https://github.com/luxonis/depthai-core
  * ONNX 1.16.x  https://github.com/onnx/onnx
  * nGraph 0.26.0  https://github.com/NervanaSystems/ngraph
- * ONNX Runtime 1.17.x  https://github.com/microsoft/onnxruntime
+ * ONNX Runtime 1.18.x  https://github.com/microsoft/onnxruntime
  * TVM 0.16.x  https://github.com/apache/tvm
  * Bullet Physics SDK 3.25  https://pybullet.org
  * LiquidFun  http://google.github.io/liquidfun/

cminpack/cminpack.patch

@@ -1,6 +1,6 @@
-diff -ruN cminpack-1.3.7/cminpack.h cminpack-1.3.7-patch/cminpack.h
---- cminpack-1.3.7/cminpack.h	2020-12-10 12:46:30.000000000 +0900
-+++ cminpack-1.3.7-patch/cminpack.h	2020-12-14 09:56:21.103983672 +0900
+diff -ruN cminpack-1.3.9/cminpack.h cminpack-1.3.9-patch/cminpack.h
+--- cminpack-1.3.9/cminpack.h	2024-05-29 06:09:16.000000000 +0900
++++ cminpack-1.3.9-patch/cminpack.h	2024-06-16 11:16:11.274115743 +0900
 @@ -36,38 +36,7 @@
  extern "C" {
  #endif /* __cplusplus */
@@ -28,8 +28,8 @@ diff -ruN cminpack-1.3.7/cminpack.h cminpack-1.3.7-patch/cminpack.h
 -#define CMINPACK_DECLSPEC_IMPORT  _Import
 -#endif
 -
--#if !defined(CMINPACK_NO_DLL) && (defined(__WIN32__) || defined(WIN32) || defined (_WIN32))
--#if defined(cminpack_EXPORTS) || defined(CMINPACK_EXPORTS) || defined(CMINPACK_DLL_EXPORTS)
+-#if !defined(CMINPACK_NO_DLL) && defined(_WIN32)
+-  #if defined(CMINPACK_DLL_EXPORTS)
 -    #define  CMINPACK_EXPORT CMINPACK_DECLSPEC_EXPORT
 -  #else
 -    #define  CMINPACK_EXPORT CMINPACK_DECLSPEC_IMPORT
@@ -40,25 +40,10 @@ diff -ruN cminpack-1.3.7/cminpack.h cminpack-1.3.7-patch/cminpack.h
 
  #if defined(__CUDA_ARCH__) || defined(__CUDACC__)
  #define __cminpack_attr__ __device__
-diff -ruN cminpack-1.3.7/cminpackP.h cminpack-1.3.7-patch/cminpackP.h
---- cminpack-1.3.7/cminpackP.h	2020-12-10 12:46:30.000000000 +0900
-+++ cminpack-1.3.7-patch/cminpackP.h	2020-12-14 09:56:01.382967467 +0900
-@@ -11,20 +11,20 @@
- #endif
- 
- #ifdef USE_CBLAS
--#ifdef __APPLE__
--#include <Accelerate/Accelerate.h>
--#else
-+//#ifdef __APPLE__
-+//#include <Accelerate/Accelerate.h>
-+//#else
- #include <cblas.h>
--#endif
-+//#endif
- #define __cminpack_enorm__(n,x) __cminpack_cblas__(nrm2)(n,x,1)
- #else
- #define __cminpack_enorm__(n,x) __cminpack_func__(enorm)(n,x)
+diff -ruN cminpack-1.3.9/cminpackP.h cminpack-1.3.9-patch/cminpackP.h
+--- cminpack-1.3.9/cminpackP.h	2024-05-29 06:09:16.000000000 +0900
++++ cminpack-1.3.9-patch/cminpackP.h	2024-06-16 11:17:44.793475898 +0900
+@@ -33,9 +33,9 @@
  #endif
 
  #ifdef USE_LAPACK
@@ -71,7 +56,7 @@ diff -ruN cminpack-1.3.7/cminpackP.h cminpack-1.3.7-patch/cminpackP.h
  #if defined(__LP64__) /* In LP64 match sizes with the 32 bit ABI */
  typedef int 		__CLPK_integer;
  typedef int 		__CLPK_logical;
-@@ -47,7 +47,7 @@
+@@ -58,7 +58,7 @@
    __CLPK_integer *m, __CLPK_integer *n, __cminpack_real__ *a, __CLPK_integer * lda,
    __cminpack_real__ *tau, __cminpack_real__ *work, __CLPK_integer *lwork, __CLPK_integer *info);
  #endif
@@ -80,13 +65,13 @@ diff -ruN cminpack-1.3.7/cminpackP.h cminpack-1.3.7-patch/cminpackP.h
 
  #include "minpackP.h"
 
-diff -ruN cminpack-1.3.7/Makefile cminpack-1.3.7-patch/Makefile
---- cminpack-1.3.7/Makefile	2020-12-10 12:46:30.000000000 +0900
-+++ cminpack-1.3.7-patch/Makefile	2020-12-14 09:55:58.464965069 +0900
+diff -ruN cminpack-1.3.9/Makefile cminpack-1.3.9-patch/Makefile
+--- cminpack-1.3.9/Makefile	2024-05-29 06:09:16.000000000 +0900
++++ cminpack-1.3.9-patch/Makefile	2024-06-16 11:15:38.626990012 +0900
 @@ -11,7 +11,7 @@
  #LIBSUFFIX=s
- #CFLAGS="-O3 -g -Wall -Wextra -DUSE_CBLAS -DUSE_LAPACK"
- CFLAGS_L=$(CFLAGS) -DUSE_CBLAS -DUSE_LAPACK
+ #CFLAGS="-O3 -g -Wall -Wextra -DUSE_BLAS -DUSE_LAPACK"
+ CFLAGS_L=$(CFLAGS) -DUSE_BLAS -DUSE_LAPACK
 -LDADD_L=-framework Accelerate
 +#LDADD_L=-framework Accelerate
 

cminpack/cppbuild.sh

@@ -7,7 +7,7 @@ if [[ -z "$PLATFORM" ]]; then
     exit
 fi
 
-CMINPACK_VERSION=1.3.8
+CMINPACK_VERSION=1.3.9
 download https://github.com/devernay/cminpack/archive/v$CMINPACK_VERSION.tar.gz cminpack-$CMINPACK_VERSION.tar.gz
 
 mkdir -p $PLATFORM

cminpack/platform/pom.xml

@@ -12,7 +12,7 @@
 
   <groupId>org.bytedeco</groupId>
   <artifactId>cminpack-platform</artifactId>
-  <version>1.3.8-${project.parent.version}</version>
+  <version>1.3.9-${project.parent.version}</version>
   <name>JavaCPP Presets Platform for CMINPACK</name>
 
   <properties>

cminpack/pom.xml

@@ -11,7 +11,7 @@
 
   <groupId>org.bytedeco</groupId>
   <artifactId>cminpack</artifactId>
-  <version>1.3.8-${project.parent.version}</version>
+  <version>1.3.9-${project.parent.version}</version>
   <name>JavaCPP Presets for CMINPACK</name>
 
   <dependencies>

cminpack/samples/pom.xml

@@ -12,7 +12,7 @@
         <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>cminpack-platform</artifactId>
-            <version>1.3.8-1.5.11-SNAPSHOT</version>
+            <version>1.3.9-1.5.11-SNAPSHOT</version>
         </dependency>
     </dependencies>
     <build>

cminpack/src/gen/java/org/bytedeco/cminpack/global/cminpack.java

@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.cminpack.global;
 
@@ -74,7 +74,7 @@ __cminpack_half__ for half from the OpenEXR library (in this case, you must
 
 // #ifdef __cminpack_double__
 // #define __cminpack_func__(func) func
-// #define __cminpack_cblas__(func) cblas_d ## func
+// #define __cminpack_blas__(func) d ## func ## _
 // #define __cminpack_lapack__(func) d ## func
 // #endif
 

cminpack/src/gen/java/org/bytedeco/cminpack/global/cminpackl.java

@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.cminpack.global;
 
@@ -74,7 +74,7 @@ __cminpack_half__ for half from the OpenEXR library (in this case, you must
 
 // #ifdef __cminpack_double__
 // #define __cminpack_func__(func) func
-// #define __cminpack_cblas__(func) cblas_d ## func
+// #define __cminpack_blas__(func) d ## func ## _
 // #define __cminpack_lapack__(func) d ## func
 // #endif
 

cminpack/src/gen/java/org/bytedeco/cminpack/global/cminpacks.java

@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.cminpack.global;
 
@@ -80,7 +80,7 @@ __cminpack_half__ for half from the OpenEXR library (in this case, you must
 
 // #ifdef __cminpack_float__
 // #define __cminpack_func__(func) s ## func
-// #define __cminpack_cblas__(func) cblas_s ## func
+// #define __cminpack_blas__(func) s ## func ## _
 // #define __cminpack_lapack__(func) s ## func
 // #endif
 

cpython/README.md

@@ -14,7 +14,7 @@ Introduction
 ------------
 This directory contains the JavaCPP Presets module for:
 
- * CPython 3.12.3  https://www.python.org/
+ * CPython 3.12.4  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
         <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>cpython-platform</artifactId>
-            <version>3.12.3-1.5.11-SNAPSHOT</version>
+            <version>3.12.4-1.5.11-SNAPSHOT</version>
         </dependency>
     </dependencies>
     <build>

cpython/cppbuild.sh

@@ -8,7 +8,7 @@ if [[ -z "$PLATFORM" ]]; then
 fi
 
 OPENSSL=openssl-3.3.0
-CPYTHON_VERSION=3.12.3
+CPYTHON_VERSION=3.12.4
 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
 

cpython/platform/pom.xml

@@ -12,7 +12,7 @@
 
   <groupId>org.bytedeco</groupId>
   <artifactId>cpython-platform</artifactId>
-  <version>3.12.3-${project.parent.version}</version>
+  <version>3.12.4-${project.parent.version}</version>
   <name>JavaCPP Presets Platform for CPython</name>
 
   <properties>

cpython/pom.xml

@@ -11,7 +11,7 @@
 
   <groupId>org.bytedeco</groupId>
   <artifactId>cpython</artifactId>
-  <version>3.12.3-${project.parent.version}</version>
+  <version>3.12.4-${project.parent.version}</version>
   <name>JavaCPP Presets for CPython</name>
 
   <dependencies>

cpython/samples/pom.xml

@@ -12,7 +12,7 @@
         <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>cpython-platform</artifactId>
-            <version>3.12.3-1.5.11-SNAPSHOT</version>
+            <version>3.12.4-1.5.11-SNAPSHOT</version>
         </dependency>
     </dependencies>
     <build>

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 =        3;
+public static final int PY_MICRO_VERSION =        4;
 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.3";
+public static final String PY_VERSION =              "3.12.4";
 /*--end constants--*/
 
 /* Version as a single 4-byte hex number, e.g. 0x010502B2 == 1.5.2b2.
@@ -2889,6 +2889,9 @@ linkage handling and it uses __declspec().
 // #  if defined(__SANITIZE_ADDRESS__)
 // #    define _Py_ADDRESS_SANITIZER
 // #  endif
+// #  if defined(__SANITIZE_THREAD__)
+// #    define _Py_THREAD_SANITIZER
+// #  endif
 // #endif
 
 
@@ -9234,7 +9237,7 @@ of a key wins, else the first.  The Python dict constructor dict(seq2)
 // #endif
 
 
-// #define COMMON_FIELDS(PREFIX)
+// #define _Py_COMMON_FIELDS(PREFIX)
 //     PyObject *PREFIX ## globals;
 //     PyObject *PREFIX ## builtins;
 //     PyObject *PREFIX ## name;
@@ -9250,6 +9253,8 @@ of a key wins, else the first.  The Python dict constructor dict(seq2)
 
 
 
+// #undef _Py_COMMON_FIELDS
+
 public static native @ByRef PyTypeObject PyFunction_Type(); public static native void PyFunction_Type(PyTypeObject setter);
 
 // #define PyFunction_Check(op) Py_IS_TYPE((op), &PyFunction_Type)
@@ -13707,7 +13712,7 @@ or PyObject_FastCallDict() (both forms are supported),
 */
 // #define PY_PARSER_REQUIRES_FUTURE_KEYWORD
 
-public static final int CO_MAXBLOCKS = 20; /* Max static block nesting within a function */
+public static final int CO_MAXBLOCKS = 21; /* Max static block nesting within a function */
 
 public static native @ByRef PyTypeObject PyCode_Type(); public static native void PyCode_Type(PyTypeObject setter);
 

gsl/README.md

@@ -9,7 +9,7 @@ Introduction
 ------------
 This directory contains the JavaCPP Presets module for:
 
- * GSL 2.7  http://www.gnu.org/software/gsl/
+ * GSL 2.8  http://www.gnu.org/software/gsl/
 
 Please refer to the parent README.md file for more detailed information about the JavaCPP Presets.
 

gsl/cppbuild.sh

@@ -7,7 +7,7 @@ if [[ -z "$PLATFORM" ]]; then
     exit
 fi
 
-GSL_VERSION=2.7
+GSL_VERSION=2.8
 download http://ftp.gnu.org/gnu/gsl/gsl-$GSL_VERSION.tar.gz gsl-$GSL_VERSION.tar.gz
 
 mkdir -p $PLATFORM

gsl/platform/pom.xml

@@ -12,7 +12,7 @@
 
   <groupId>org.bytedeco</groupId>
   <artifactId>gsl-platform</artifactId>
-  <version>2.7-${project.parent.version}</version>
+  <version>2.8-${project.parent.version}</version>
   <name>JavaCPP Presets Platform for GSL</name>
 
   <properties>

gsl/pom.xml

@@ -11,7 +11,7 @@
 
   <groupId>org.bytedeco</groupId>
   <artifactId>gsl</artifactId>
-  <version>2.7-${project.parent.version}</version>
+  <version>2.8-${project.parent.version}</version>
   <name>JavaCPP Presets for GSL</name>
 
   <dependencies>

gsl/samples/pom.xml

@@ -12,7 +12,7 @@
         <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>gsl-platform</artifactId>
-            <version>2.7-1.5.11-SNAPSHOT</version>
+            <version>2.8-1.5.11-SNAPSHOT</version>
         </dependency>
 
         <!-- Additional dependencies to use bundled full version of MKL -->

gsl/src/gen/java/org/bytedeco/gsl/Ainvx_int_gsl_vector_Pointer.java

@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.gsl;
 

gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_char_const_view.java

@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.gsl;
 

gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_char_view.java

@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.gsl;
 

gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_complex_const_view.java

@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.gsl;
 

gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_complex_float_const_view.java

@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.gsl;
 

gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_complex_float_view.java

@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.gsl;