* Upgrade presets for CPython 3.13.5, NumPy 2.3.0, SciPy 1.15.3, libffi 3.5.1, Tesseract 5.5.1, PyTorch 2.7.1, ONNX 1.18.0, ONNX Runtime 1.22.0

Author: saudet

CHANGELOG.md

@@ -5,7 +5,7 @@
  * Allow setting "org.bytedeco.openblas.load" system property to "none" ([issue #1203](https://github.com/bytedeco/javacpp-presets/issues/1203))
  * Fix presets for the CUPTI module of CUDA on Windows ([pull #1576](https://github.com/bytedeco/javacpp-presets/pull/1576))
  * Introduce `macosx-arm64` builds for ARPACK-NG, CMINPACK, FFTW, GSL, TensorFlow Lite, ONNX, ONNX Runtime ([issue #1069](https://github.com/bytedeco/javacpp-presets/issues/1069))
- * Upgrade presets for OpenCV 4.11.0, FFmpeg 7.1.1, DNNL 3.8.1 ([pull #1633](https://github.com/bytedeco/javacpp-presets/pull/1633)), OpenBLAS 0.3.29, CPython 3.13.3, NumPy 2.2.5, SciPy 1.15.2, LLVM 20.1.6, libffi 3.4.8, CUDA 12.9.1, cuDNN 9.10.2, NCCL 2.27.3, nvCOMP 4.2.0.11, NVIDIA Video Codec SDK 13.0.19, PyTorch 2.7.0, TensorFlow Lite 2.19.0, TensorRT 10.11.0.33, Triton Inference Server 2.58.0, ONNX Runtime 1.21.1, and their dependencies
+ * Upgrade presets for OpenCV 4.11.0, FFmpeg 7.1.1, DNNL 3.8.1 ([pull #1633](https://github.com/bytedeco/javacpp-presets/pull/1633)), OpenBLAS 0.3.29, CPython 3.13.5, NumPy 2.3.0, SciPy 1.15.3, LLVM 20.1.6, libffi 3.5.1, Tesseract 5.5.1, CUDA 12.9.1, cuDNN 9.10.2, NCCL 2.27.3, nvCOMP 4.2.0.11, NVIDIA Video Codec SDK 13.0.19, PyTorch 2.7.1, TensorFlow Lite 2.19.0, TensorRT 10.11.0.33, Triton Inference Server 2.58.0, ONNX 1.18.0, ONNX Runtime 1.22.0, and their dependencies
 
 ### November 16, 2024 version 1.5.11
  * Enable distributed package using Gloo in presets for PyTorch ([pull #1510](https://github.com/bytedeco/javacpp-presets/pull/1510))

README.md

@@ -205,11 +205,11 @@ 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.13.x  https://www.python.org/downloads/
- * NumPy 2.2.x  https://github.com/numpy/numpy
+ * NumPy 2.3.x  https://github.com/numpy/numpy
  * SciPy 1.15.x  https://github.com/scipy/scipy
  * Gym 0.26.x  https://github.com/openai/gym
  * LLVM 20.1.x  http://llvm.org/releases/download.html
- * libffi 3.4.x  https://github.com/libffi/libffi
+ * libffi 3.5.x  https://github.com/libffi/libffi
  * libpostal 1.1  https://github.com/openvenues/libpostal
  * LibRaw 0.21.x  https://www.libraw.org/download
  * Leptonica 1.85.x  http://www.leptonica.org/download.html
@@ -231,9 +231,9 @@ Each child module in turn relies by default on the included [`cppbuild.sh` scrip
  * Triton Inference Server 2.58.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.17.x  https://github.com/onnx/onnx
+ * ONNX 1.18.x  https://github.com/onnx/onnx
  * nGraph 0.26.0  https://github.com/NervanaSystems/ngraph
- * ONNX Runtime 1.21.x  https://github.com/microsoft/onnxruntime
+ * ONNX Runtime 1.22.x  https://github.com/microsoft/onnxruntime
  * TVM 0.18.x  https://github.com/apache/tvm
  * Bullet Physics SDK 3.25  https://pybullet.org
  * LiquidFun  http://google.github.io/liquidfun/

cpython/README.md

@@ -14,7 +14,7 @@ Introduction
 ------------
 This directory contains the JavaCPP Presets module for:
 
- * CPython 3.13.3  https://www.python.org/
+ * CPython 3.13.5  https://www.python.org/
 
 Please refer to the parent README.md file for more detailed information about the JavaCPP Presets.
 
@@ -54,7 +54,7 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic
         <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>cpython-platform</artifactId>
-            <version>3.13.3-1.5.12-SNAPSHOT</version>
+            <version>3.13.5-1.5.12-SNAPSHOT</version>
         </dependency>
     </dependencies>
     <build>

cpython/cppbuild.sh

@@ -8,7 +8,7 @@ if [[ -z "$PLATFORM" ]]; then
 fi
 
 OPENSSL=openssl-3.4.1
-CPYTHON_VERSION=3.13.3
+CPYTHON_VERSION=3.13.5
 download https://www.openssl.org/source/$OPENSSL.tar.gz $OPENSSL.tar.gz
 download https://www.python.org/ftp/python/$CPYTHON_VERSION/Python-$CPYTHON_VERSION.tgz Python-$CPYTHON_VERSION.tgz
 

cpython/platform/pom.xml

@@ -12,7 +12,7 @@
 
   <groupId>org.bytedeco</groupId>
   <artifactId>cpython-platform</artifactId>
-  <version>3.13.3-${project.parent.version}</version>
+  <version>3.13.5-${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.13.3-${project.parent.version}</version>
+  <version>3.13.5-${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.13.3-1.5.12-SNAPSHOT</version>
+            <version>3.13.5-1.5.12-SNAPSHOT</version>
         </dependency>
     </dependencies>
     <build>

cpython/src/gen/java/org/bytedeco/cpython/global/python.java

@@ -174,12 +174,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 =        13;
-public static final int PY_MICRO_VERSION =        3;
+public static final int PY_MICRO_VERSION =        5;
 public static final int PY_RELEASE_LEVEL =        PY_RELEASE_LEVEL_FINAL;
 public static final int PY_RELEASE_SERIAL =       0;
 
 /* Version as a string */
-public static final String PY_VERSION =              "3.13.3";
+public static final String PY_VERSION =              "3.13.5";
 /*--end constants--*/
 
 /* Version as a single 4-byte hex number, e.g. 0x010502B2 == 1.5.2b2.
@@ -454,6 +454,10 @@ There is also (independent) API version information in modsupport.h.
    */
 /* #undef HAVE_DECL_TZNAME */
 
+/* Define to 1 if you have the declaration of `UT_NAMESIZE', and to 0 if you
+   don't. */
+public static final int HAVE_DECL_UT_NAMESIZE = 1;
+
 /* Define to 1 if you have the device macros. */
 public static final int HAVE_DEVICE_MACROS = 1;
 
@@ -717,6 +721,9 @@ There is also (independent) API version information in modsupport.h.
 /* Define to 1 if you have the `getlogin' function. */
 public static final int HAVE_GETLOGIN = 1;
 
+/* Define to 1 if you have the `getlogin_r' function. */
+public static final int HAVE_GETLOGIN_R = 1;
+
 /* Define to 1 if you have the `getnameinfo' function. */
 public static final int HAVE_GETNAMEINFO = 1;
 
@@ -982,6 +989,9 @@ There is also (independent) API version information in modsupport.h.
 /* Define this if you have the makedev macro. */
 public static final int HAVE_MAKEDEV = 1;
 
+/* Define if you have the 'MAXLOGNAME' constant. */
+/* #undef HAVE_MAXLOGNAME */
+
 /* Define to 1 if you have the `mbrtowc' function. */
 public static final int HAVE_MBRTOWC = 1;
 
@@ -1735,6 +1745,9 @@ There is also (independent) API version information in modsupport.h.
 /* Define to 1 if you have the <utmp.h> header file. */
 public static final int HAVE_UTMP_H = 1;
 
+/* Define if you have the 'HAVE_UT_NAMESIZE' constant. */
+public static final int HAVE_UT_NAMESIZE = 1;
+
 /* Define to 1 if you have the `uuid_create' function. */
 /* #undef HAVE_UUID_CREATE */
 
@@ -2738,6 +2751,14 @@ significant byte first (like Motorola and SPARC, unlike Intel). */
 // #  define _Py__has_builtin(x) 0
 // #endif
 
+// Preprocessor check for a compiler __attribute__. Always return 0
+// if __has_attribute() macro is not defined.
+// #ifdef __has_attribute
+// #  define _Py__has_attribute(x) __has_attribute(x)
+// #else
+// #  define _Py__has_attribute(x) 0
+// #endif
+
 // _Py_TYPEOF(expr) gets the type of an expression.
 //
 // Example: _Py_TYPEOF(x) x_copy = (x);
@@ -2802,6 +2823,22 @@ significant byte first (like Motorola and SPARC, unlike Intel). */
 // #  define _SGI_MP_SOURCE
 // #endif
 
+
+// _Py_NONSTRING: The nonstring variable attribute specifies that an object or
+// member declaration with type array of char, signed char, or unsigned char,
+// or pointer to such a type is intended to store character arrays that do not
+// necessarily contain a terminating NUL.
+//
+// Usage:
+//
+//   char name [8] _Py_NONSTRING;
+// #if _Py__has_attribute(nonstring)
+// #  define _Py_NONSTRING __attribute__((nonstring))
+// #else
+// #  define _Py_NONSTRING
+// #endif
+
+
 // #endif /* Py_PYPORT_H */
 
 
@@ -4266,8 +4303,13 @@ where NULL (nil) is not suitable (since NULL often means 'error').
 @NoException public static native int Py_IsNone(PyObject x);
 // #define Py_IsNone(x) Py_Is((x), Py_None)
 
-/* Macro for returning Py_None from a function */
-// #define Py_RETURN_NONE return Py_None
+/* Macro for returning Py_None from a function.
+ * Only treat Py_None as immortal in the limited C API 3.12 and newer. */
+// #if defined(Py_LIMITED_API) && Py_LIMITED_API+0 < 0x030c0000
+// #  define Py_RETURN_NONE return Py_NewRef(Py_None)
+// #else
+// #  define Py_RETURN_NONE return Py_None
+// #endif
 
 /*
 Py_NotImplemented is a singleton used to signal that an operation is
@@ -7394,9 +7436,16 @@ Like PyUnicode_AsUTF8AndSize(), this also caches the UTF-8 representation
 @NoException public static native int Py_IsFalse(PyObject x);
 // #define Py_IsFalse(x) Py_Is((x), Py_False)
 
-/* Macros for returning Py_True or Py_False, respectively */
-// #define Py_RETURN_TRUE return Py_True
-// #define Py_RETURN_FALSE return Py_False
+/* Macros for returning Py_True or Py_False, respectively.
+ * Only treat Py_True and Py_False as immortal in the limited C API 3.12
+ * and newer. */
+// #if defined(Py_LIMITED_API) && Py_LIMITED_API+0 < 0x030c0000
+// #  define Py_RETURN_TRUE return Py_NewRef(Py_True)
+// #  define Py_RETURN_FALSE return Py_NewRef(Py_False)
+// #else
+// #  define Py_RETURN_TRUE return Py_True
+// #  define Py_RETURN_FALSE return Py_False
+// #endif
 
 /* Function to return a bool from a C long */
 @NoException public static native PyObject PyBool_FromLong(long arg0);
@@ -11260,7 +11309,12 @@ Variant of PyObject_GetAttrString() which doesn't raise AttributeError
    Delete attribute named attr_name, for object o. Returns
    -1 on failure.
 
-   This is the equivalent of the Python statement: del o.attr_name. */
+   This is the equivalent of the Python statement: del o.attr_name.
+
+   Implemented as a macro in the limited C API 3.12 and older. */
+// #if defined(Py_LIMITED_API) && Py_LIMITED_API+0 < 0x030d0000
+// #  define PyObject_DelAttrString(O, A) PyObject_SetAttrString((O), (A), NULL)
+// #endif
 
 
 /* Implemented elsewhere:
@@ -11269,7 +11323,12 @@ Variant of PyObject_GetAttrString() which doesn't raise AttributeError
 
    Delete attribute named attr_name, for object o. Returns -1
    on failure.  This is the equivalent of the Python
-   statement: del o.attr_name. */
+   statement: del o.attr_name.
+
+   Implemented as a macro in the limited C API 3.12 and older. */
+// #if defined(Py_LIMITED_API) && Py_LIMITED_API+0 < 0x030d0000
+// #  define PyObject_DelAttr(O, A) PyObject_SetAttr((O), (A), NULL)
+// #endif
 
 
 /* Implemented elsewhere:

cpython/src/main/java/org/bytedeco/cpython/presets/python.java

@@ -291,7 +291,7 @@ public void map(InfoMap infoMap) {
                              "Py_False", "Py_True", "Py_RETURN_TRUE", "Py_RETURN_FALSE", "Py_RETURN_NAN",
                              "PyObject_HEAD", "PyObject_VAR_HEAD", "Py_RETURN_NONE", "Py_RETURN_NOTIMPLEMENTED",
                              "PyModuleDef_HEAD_INIT", "_Py_atomic_address", "__declspec",
-                             "PyException_HEAD", "_Py_NO_RETURN", "Py_Ellipsis",
+                             "PyException_HEAD", "_Py_NONSTRING", "_Py_NO_RETURN", "Py_Ellipsis",
                              "PyObject_Length", "PySequence_Length", "PySequence_In", "PyMapping_Length",
                              "PY_TIMEOUT_T", "_PyCoreConfig_INIT", "_PyMainInterpreterConfig_INIT", "_PyThreadState_Current",
                              "Py_ALLOW_RECURSION", "Py_END_ALLOW_RECURSION", "NATIVE_TSS_KEY_T",

libffi/README.md

@@ -9,7 +9,7 @@ Introduction
 ------------
 This directory contains the JavaCPP Presets module for:
 
- * libffi 3.4.8  https://sourceware.org/libffi/
+ * libffi 3.5.1  https://sourceware.org/libffi/
 
 Please refer to the parent README.md file for more detailed information about the JavaCPP Presets.
 
@@ -46,7 +46,7 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic
         <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>libffi-platform</artifactId>
-            <version>3.4.8-1.5.12-SNAPSHOT</version>
+            <version>3.5.1-1.5.12-SNAPSHOT</version>
         </dependency>
     </dependencies>
     <build>

libffi/cppbuild.sh

@@ -7,7 +7,7 @@ if [[ -z "$PLATFORM" ]]; then
     exit
 fi
 
-LIBFFI_VERSION=3.4.8
+LIBFFI_VERSION=3.5.1
 download https://github.com/libffi/libffi/releases/download/v$LIBFFI_VERSION/libffi-$LIBFFI_VERSION.tar.gz libffi-$LIBFFI_VERSION.tar.gz
 
 mkdir -p $PLATFORM

libffi/platform/pom.xml

@@ -12,7 +12,7 @@
 
   <groupId>org.bytedeco</groupId>
   <artifactId>libffi-platform</artifactId>
-  <version>3.4.8-${project.parent.version}</version>
+  <version>3.5.1-${project.parent.version}</version>
   <name>JavaCPP Presets Platform for libffi</name>
 
   <properties>

libffi/pom.xml

@@ -11,7 +11,7 @@
 
   <groupId>org.bytedeco</groupId>
   <artifactId>libffi</artifactId>
-  <version>3.4.8-${project.parent.version}</version>
+  <version>3.5.1-${project.parent.version}</version>
   <name>JavaCPP Presets for libffi</name>
 
   <dependencies>

libffi/samples/pom.xml

@@ -12,7 +12,7 @@
         <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>libffi-platform</artifactId>
-            <version>3.4.8-1.5.12-SNAPSHOT</version>
+            <version>3.5.1-1.5.12-SNAPSHOT</version>
         </dependency>
     </dependencies>
     <build>

libffi/src/gen/java/org/bytedeco/libffi/global/ffi.java

@@ -127,8 +127,8 @@ a copy of this software and associated documentation files (the
 // Parsed from ffi.h
 
 /* -----------------------------------------------------------------*-C-*-
-   libffi 3.4.8
-     - Copyright (c) 2011, 2014, 2019, 2021, 2022, 2024 Anthony Green
+   libffi 3.5.1
+     - Copyright (c) 2011, 2014, 2019, 2021, 2022, 2024, 2025 Anthony Green
      - Copyright (c) 1996-2003, 2007, 2008 Red Hat, Inc.
 
    Permission is hereby granted, free of charge, to any person
@@ -379,6 +379,24 @@ public static native void ffi_raw_call(ffi_cif cif,
 public static native @Deprecated void ffi_java_raw_to_ptrarray(ffi_cif cif, ffi_java_raw raw, @Cast("void**") @ByPtrPtr Pointer args);
 public static native @Cast("size_t") @Deprecated long ffi_java_raw_size(ffi_cif cif);
 
+/* ---- Version API ------------------------------------------------------ */
+
+public static final String FFI_VERSION_STRING = "3.5.1";
+public static final int FFI_VERSION_NUMBER = 30501;
+
+// #ifndef LIBFFI_ASM
+/* Return a version string. */
+public static native @Cast("const char*") BytePointer ffi_get_version();
+
+/* Return the version as an unsigned long value: (x * 10000 + y * 100 + z) */
+public static native @Cast("unsigned long") long ffi_get_version_number();
+// #endif
+
+/* ---- Internals API ---------------------------------------------------- */
+
+public static native @Cast("unsigned int") int ffi_get_default_abi();
+public static native @Cast("size_t") long ffi_get_closure_size();
+
 /* ---- Definitions for closures ----------------------------------------- */
 
 // #if FFI_CLOSURES

llvm/samples/llvm/pom.xml

@@ -17,7 +17,7 @@
         <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>libffi-platform</artifactId>
-            <version>3.4.8-1.5.12-SNAPSHOT</version>
+            <version>3.5.1-1.5.12-SNAPSHOT</version>
         </dependency>
     </dependencies>
     <repositories>

llvm/samples/polly/pom.xml

@@ -18,7 +18,7 @@
         <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>libffi-platform</artifactId>
-            <version>3.4.8-1.5.12-SNAPSHOT</version>
+            <version>3.5.1-1.5.12-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.bytedeco</groupId>

numpy/README.md

@@ -9,7 +9,7 @@ Introduction
 ------------
 This directory contains the JavaCPP Presets module for:
 
- * NumPy 2.2.5  http://www.numpy.org/
+ * NumPy 2.3.0  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
         <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>numpy-platform</artifactId>
-            <version>2.2.5-1.5.12-SNAPSHOT</version>
+            <version>2.3.0-1.5.12-SNAPSHOT</version>
         </dependency>
 
         <!-- Additional dependencies to use bundled full version of MKL -->

numpy/cppbuild.sh

@@ -7,7 +7,7 @@ if [[ -z "$PLATFORM" ]]; then
     exit
 fi
 
-NUMPY_VERSION=2.2.5
+NUMPY_VERSION=2.3.0
 download https://github.com/numpy/numpy/releases/download/v$NUMPY_VERSION/numpy-$NUMPY_VERSION.tar.gz numpy-$NUMPY_VERSION.tar.gz
 
 mkdir -p $PLATFORM