* Upgrade presets for FFmpeg 7.1.1, DNNL 3.7.1, OpenBLAS 0.3.29, CPython 3.13.2, NumPy 2.2.3, SciPy 1.15.2, LLVM 20.1.0, libffi 3.4.7, TensorFlow Lite 2.19.0, ONNX Runtime 1.21.0

Author: saudet

CHANGELOG.md

@@ -3,7 +3,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, DNNL 3.6.2, CPython 3.13.1, NumPy 2.2.1, SciPy 1.15.1, LLVM 19.1.6, PyTorch 2.6.0, ONNX Runtime 1.20.1
+ * Upgrade presets for OpenCV 4.11.0, FFmpeg 7.1.1, DNNL 3.7.1, OpenBLAS 0.3.29, CPython 3.13.2, NumPy 2.2.3, SciPy 1.15.2, LLVM 20.1.0, libffi 3.4.7, PyTorch 2.6.0, TensorFlow Lite 2.19.0, ONNX Runtime 1.21.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

@@ -198,8 +198,8 @@ Each child module in turn relies by default on the included [`cppbuild.sh` scrip
  * LZ4 1.9.x  https://github.com/lz4/lz4
  * MKL 2025.x  https://software.intel.com/mkl
  * MKL-DNN 0.21.x  https://github.com/oneapi-src/oneDNN
- * DNNL 3.6.x  https://github.com/oneapi-src/oneDNN
- * OpenBLAS 0.3.28  http://www.openblas.net/
+ * DNNL 3.7.x  https://github.com/oneapi-src/oneDNN
+ * OpenBLAS 0.3.29  http://www.openblas.net/
  * ARPACK-NG 3.9.x  https://github.com/opencollab/arpack-ng
  * CMINPACK 1.3.11  https://github.com/devernay/cminpack
  * FFTW 3.3.10  http://www.fftw.org/download.html
@@ -208,7 +208,7 @@ Each child module in turn relies by default on the included [`cppbuild.sh` scrip
  * NumPy 2.2.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 19.1.x  http://llvm.org/releases/download.html
+ * LLVM 20.1.x  http://llvm.org/releases/download.html
  * libffi 3.4.x  https://github.com/libffi/libffi
  * libpostal 1.1  https://github.com/openvenues/libpostal
  * LibRaw 0.21.x  https://www.libraw.org/download
@@ -226,14 +226,14 @@ Each child module in turn relies by default on the included [`cppbuild.sh` scrip
  * PyTorch 2.6.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.18.x  https://github.com/tensorflow/tensorflow
+ * TensorFlow Lite 2.19.x  https://github.com/tensorflow/tensorflow
  * TensorRT 10.6.x  https://developer.nvidia.com/tensorrt
  * Triton Inference Server 2.51.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
  * nGraph 0.26.0  https://github.com/NervanaSystems/ngraph
- * ONNX Runtime 1.20.x  https://github.com/microsoft/onnxruntime
+ * ONNX Runtime 1.21.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/

arpack-ng/platform/pom.xml

@@ -24,7 +24,7 @@
     <dependency>
       <groupId>org.bytedeco</groupId>
       <artifactId>openblas-platform</artifactId>
-      <version>0.3.28-${project.parent.version}</version>
+      <version>0.3.29-${project.parent.version}</version>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>

arpack-ng/pom.xml

@@ -22,7 +22,7 @@
     <dependency>
       <groupId>org.bytedeco</groupId>
       <artifactId>openblas</artifactId>
-      <version>0.3.28-${project.parent.version}</version>
+      <version>0.3.29-${project.parent.version}</version>
     </dependency>
     <dependency>
       <groupId>org.bytedeco</groupId>
@@ -45,12 +45,12 @@
           <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>openblas</artifactId>
-            <version>0.3.28-${project.parent.version}</version>
+            <version>0.3.29-${project.parent.version}</version>
           </dependency>
           <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>openblas</artifactId>
-            <version>0.3.28-${project.parent.version}</version>
+            <version>0.3.29-${project.parent.version}</version>
             <classifier>${javacpp.platform}</classifier>
           </dependency>
         </dependencies>

cminpack/platform/pom.xml

@@ -23,7 +23,7 @@
     <dependency>
       <groupId>org.bytedeco</groupId>
       <artifactId>openblas-platform</artifactId>
-      <version>0.3.28-${project.parent.version}</version>
+      <version>0.3.29-${project.parent.version}</version>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>

cminpack/pom.xml

@@ -18,7 +18,7 @@
     <dependency>
       <groupId>org.bytedeco</groupId>
       <artifactId>openblas</artifactId>
-      <version>0.3.28-${project.parent.version}</version>
+      <version>0.3.29-${project.parent.version}</version>
     </dependency>
     <dependency>
       <groupId>org.bytedeco</groupId>
@@ -41,12 +41,12 @@
           <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>openblas</artifactId>
-            <version>0.3.28-${project.parent.version}</version>
+            <version>0.3.29-${project.parent.version}</version>
           </dependency>
           <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>openblas</artifactId>
-            <version>0.3.28-${project.parent.version}</version>
+            <version>0.3.29-${project.parent.version}</version>
             <classifier>${javacpp.platform}</classifier>
           </dependency>
         </dependencies>

cpython/README.md

@@ -14,7 +14,7 @@ Introduction
 ------------
 This directory contains the JavaCPP Presets module for:
 
- * CPython 3.13.1  https://www.python.org/
+ * CPython 3.13.2  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.1-1.5.12-SNAPSHOT</version>
+            <version>3.13.2-1.5.12-SNAPSHOT</version>
         </dependency>
     </dependencies>
     <build>

cpython/cppbuild.sh

@@ -7,8 +7,8 @@ if [[ -z "$PLATFORM" ]]; then
     exit
 fi
 
-OPENSSL=openssl-3.4.0
-CPYTHON_VERSION=3.13.1
+OPENSSL=openssl-3.4.1
+CPYTHON_VERSION=3.13.2
 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.1-${project.parent.version}</version>
+  <version>3.13.2-${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.1-${project.parent.version}</version>
+  <version>3.13.2-${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.1-1.5.12-SNAPSHOT</version>
+            <version>3.13.2-1.5.12-SNAPSHOT</version>
         </dependency>
     </dependencies>
     <build>

cpython/src/gen/java/org/bytedeco/cpython/PyConfig.java

@@ -79,6 +79,8 @@ public class PyConfig extends Pointer {
     public native int use_frozen_modules(); public native PyConfig use_frozen_modules(int setter);
     public native int safe_path(); public native PyConfig safe_path(int setter);
     public native int int_max_str_digits(); public native PyConfig int_max_str_digits(int setter);
+// #ifdef __APPLE__
+// #endif
 
     public native int cpu_count(); public native PyConfig cpu_count(int setter);
 // #ifdef Py_GIL_DISABLED

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 =        1;
+public static final int PY_MICRO_VERSION =        2;
 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.1";
+public static final String PY_VERSION =              "3.13.2";
 /*--end constants--*/
 
 /* Version as a single 4-byte hex number, e.g. 0x010502B2 == 1.5.2b2.
@@ -1463,7 +1463,7 @@ There is also (independent) API version information in modsupport.h.
 public static final int HAVE_STRING_H = 1;
 
 /* Define to 1 if you have the `strlcpy' function. */
-/* #undef HAVE_STRLCPY */
+public static final int HAVE_STRLCPY = 1;
 
 /* Define to 1 if you have the <stropts.h> header file. */
 /* #undef HAVE_STROPTS_H */
@@ -1581,6 +1581,9 @@ There is also (independent) API version information in modsupport.h.
 /* Define to 1 if you have the <sys/param.h> header file. */
 public static final int HAVE_SYS_PARAM_H = 1;
 
+/* Define to 1 if you have the <sys/pidfd.h> header file. */
+public static final int HAVE_SYS_PIDFD_H = 1;
+
 /* Define to 1 if you have the <sys/poll.h> header file. */
 public static final int HAVE_SYS_POLL_H = 1;
 
@@ -1687,8 +1690,8 @@ There is also (independent) API version information in modsupport.h.
 /* Define to 1 if you have the `truncate' function. */
 public static final int HAVE_TRUNCATE = 1;
 
-/* Define to 1 if you have the `ttyname' function. */
-public static final int HAVE_TTYNAME = 1;
+/* Define to 1 if you have the `ttyname_r' function. */
+public static final int HAVE_TTYNAME_R = 1;
 
 /* Define to 1 if you don't have `tm_zone' but do have the external array
    `tzname'. */
@@ -1808,7 +1811,7 @@ There is also (independent) API version information in modsupport.h.
 public static final int MAJOR_IN_SYSMACROS = 1;
 
 /* Define if mvwdelch in curses.h is an expression. */
-public static final int MVWDELCH_IS_EXPRESSION = 1;
+/* #undef MVWDELCH_IS_EXPRESSION */
 
 /* Define to the address where bug reports for this package should be sent. */
 /* #undef PACKAGE_BUGREPORT */
@@ -2213,62 +2216,6 @@ significant byte first (like Motorola and SPARC, unlike Intel). */
 // #define PY_MACCONFIG_H
 // #ifdef __APPLE__
 
-// #undef ALIGNOF_MAX_ALIGN_T
-// #undef SIZEOF_LONG
-// #undef SIZEOF_LONG_DOUBLE
-// #undef SIZEOF_PTHREAD_T
-// #undef SIZEOF_SIZE_T
-// #undef SIZEOF_TIME_T
-// #undef SIZEOF_VOID_P
-// #undef SIZEOF__BOOL
-// #undef SIZEOF_UINTPTR_T
-// #undef SIZEOF_PTHREAD_T
-// #undef WORDS_BIGENDIAN
-// #undef DOUBLE_IS_ARM_MIXED_ENDIAN_IEEE754
-// #undef DOUBLE_IS_BIG_ENDIAN_IEEE754
-// #undef DOUBLE_IS_LITTLE_ENDIAN_IEEE754
-// #undef HAVE_GCC_ASM_FOR_X87
-// #undef HAVE_GCC_ASM_FOR_X64
-
-// #undef VA_LIST_IS_ARRAY
-// #if defined(__LP64__) && defined(__x86_64__)
-public static final int VA_LIST_IS_ARRAY = 1;
-// #endif
-
-// #undef HAVE_LARGEFILE_SUPPORT
-// #ifndef __LP64__
-public static final int HAVE_LARGEFILE_SUPPORT = 1;
-// #endif
-
-// #undef SIZEOF_LONG
-// #ifdef __LP64__
-// #else
-// #  ifdef __ppc__
-// #  else
-// #  endif
-// #endif
-
-// macOS 10.4 (the first release to support 64-bit code
-// at all) only supports 64-bit in the UNIX layer.
-// Therefore suppress the toolbox-glue in 64-bit mode.
-//
-// In 64-bit mode setpgrp always has no arguments, in 32-bit
-// mode that depends on the compilation environment
-// #if defined(__LP64__)
-// #   undef SETPGRP_HAVE_ARG
-// #endif
-
-// #ifdef __BIG_ENDIAN__
-// #  define DOUBLE_IS_BIG_ENDIAN_IEEE754
-// #else
-// #  define DOUBLE_IS_LITTLE_ENDIAN_IEEE754
-// #endif
-
-// #if defined(__i386__) || defined(__x86_64__)
-// #  define HAVE_GCC_ASM_FOR_X87
-// #else
-// #endif
-
 // #endif   // __APPLE__
 // #endif   // !PY_MACCONFIG_H
 
@@ -2909,7 +2856,7 @@ For example Py_STRINGIFY(__LINE__) is replaced by the line number, not
 // #define Py_CHARMASK(c) ((unsigned char)((c) & 0xff))
 
 // #if (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L
-//      && !defined(__cplusplus))
+//      && !defined(__cplusplus) && !defined(_MSC_VER))
 // #  define Py_BUILD_ASSERT_EXPR(cond)
 //     ((void)sizeof(struct { int dummy; _Static_assert(cond, #cond); }),
 //      0)
@@ -13249,6 +13196,8 @@ macros below. On Windows, for example, PyAPI_FUNC() uses dllexport to
 // #ifndef Py_LIMITED_API
 // #ifndef Py_TRACEMALLOC_H
 // #define Py_TRACEMALLOC_H
+// #ifdef __cplusplus
+// #endif
 
 /* Track an allocated memory block in the tracemalloc module.
    Return 0 on success, return -1 on error (failed to allocate memory to store
@@ -13270,6 +13219,8 @@ macros below. On Windows, for example, PyAPI_FUNC() uses dllexport to
     @Cast("unsigned int") int domain,
     @Cast("uintptr_t") long ptr);
 
+// #ifdef __cplusplus
+// #endif
 // #endif  // !Py_TRACEMALLOC_H
 // #endif  // !Py_LIMITED_API
 

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

@@ -318,6 +318,7 @@ public void map(InfoMap infoMap) {
                              "defined _MSC_VER && _MSC_VER >= 1900",
                              "COUNT_ALLOCS",
                              "HAVE_DLOPEN",
+                             "__APPLE__",
                              "SOLARIS",
                              "MS_WINDOWS",
                              "defined(HAVE_CLOCK_GETTIME) || defined(HAVE_KQUEUE)",

dnnl/README.md

@@ -9,7 +9,7 @@ Introduction
 ------------
 This directory contains the JavaCPP Presets module for:
 
- * DNNL 3.6.2  https://01.org/dnnl
+ * DNNL 3.7.1  https://01.org/dnnl
 
 Please refer to the parent README.md file for more detailed information about the JavaCPP Presets.
 
@@ -25,7 +25,7 @@ Sample Usage
 ------------
 Here is a simple example of DNNL ported to Java from this C++ source file:
 
- * https://github.com/oneapi-src/oneDNN/blob/v3.6.2/examples/cnn_inference_int8.cpp
+ * https://github.com/oneapi-src/oneDNN/blob/v3.7.1/examples/cnn_inference_int8.cpp
 
 We can use [Maven 3](http://maven.apache.org/) to download and install automatically all the class files as well as the native binaries. To run this sample code, after creating the `pom.xml` and `CpuCnnInferenceInt8.java` source files below, simply execute on the command line:
 ```bash
@@ -46,7 +46,7 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic
         <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>dnnl-platform</artifactId>
-            <version>3.6.2-1.5.12-SNAPSHOT</version>
+            <version>3.7.1-1.5.12-SNAPSHOT</version>
         </dependency>
     </dependencies>
     <build>

dnnl/cppbuild.sh

@@ -11,7 +11,7 @@ export DNNL_CPU_RUNTIME="OMP" # or TBB
 export DNNL_GPU_RUNTIME="OCL"
 
 TBB_VERSION=2020.3
-MKLDNN_VERSION=3.6.2
+MKLDNN_VERSION=3.7.1
 download https://github.com/oneapi-src/oneTBB/archive/v$TBB_VERSION.tar.gz oneTBB-$TBB_VERSION.tar.bz2
 download https://github.com/oneapi-src/oneDNN/archive/v$MKLDNN_VERSION.tar.gz oneDNN-$MKLDNN_VERSION.tar.bz2
 

dnnl/platform/pom.xml

@@ -12,7 +12,7 @@
 
   <groupId>org.bytedeco</groupId>
   <artifactId>dnnl-platform</artifactId>
-  <version>3.6.2-${project.parent.version}</version>
+  <version>3.7.1-${project.parent.version}</version>
   <name>JavaCPP Presets Platform for DNNL</name>
 
   <properties>

dnnl/pom.xml

@@ -11,7 +11,7 @@
 
   <groupId>org.bytedeco</groupId>
   <artifactId>dnnl</artifactId>
-  <version>3.6.2-${project.parent.version}</version>
+  <version>3.7.1-${project.parent.version}</version>
   <name>JavaCPP Presets for DNNL</name>
 
   <dependencies>

dnnl/samples/pom.xml

@@ -12,7 +12,7 @@
         <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>dnnl-platform</artifactId>
-            <version>3.6.2-1.5.12-SNAPSHOT</version>
+            <version>3.7.1-1.5.12-SNAPSHOT</version>
         </dependency>
     </dependencies>
     <build>