* Upgrade presets for DNNL 3.7.3, CPython 3.13.3, NumPy 2.2.5, LLVM 20.1.3, libffi 3.4.8, ONNX Runtime 1.21.1

Author: saudet

CHANGELOG.md

@@ -4,7 +4,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.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
+ * Upgrade presets for OpenCV 4.11.0, FFmpeg 7.1.1, DNNL 3.7.3, OpenBLAS 0.3.29, CPython 3.13.3, NumPy 2.2.5, SciPy 1.15.2, LLVM 20.1.3, libffi 3.4.8, PyTorch 2.6.0, TensorFlow Lite 2.19.0, ONNX Runtime 1.21.1, 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))

cpython/README.md

@@ -14,7 +14,7 @@ Introduction
 ------------
 This directory contains the JavaCPP Presets module for:
 
- * CPython 3.13.2  https://www.python.org/
+ * CPython 3.13.3  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.2-1.5.12-SNAPSHOT</version>
+            <version>3.13.3-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.2
+CPYTHON_VERSION=3.13.3
 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.2-${project.parent.version}</version>
+  <version>3.13.3-${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.2-${project.parent.version}</version>
+  <version>3.13.3-${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.2-1.5.12-SNAPSHOT</version>
+            <version>3.13.3-1.5.12-SNAPSHOT</version>
         </dependency>
     </dependencies>
     <build>

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

@@ -79,8 +79,6 @@ 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/_PyCoLineInstrumentationData.java

@@ -12,8 +12,9 @@
 
 
 /* Ancillary data structure used for instrumentation.
-   Line instrumentation creates an array of
-   these. One entry per code unit.*/
+   Line instrumentation creates this with sufficient
+   space for one entry per code unit. The total size
+   of the data will be `bytes_per_entry * Py_SIZE(code)` */
 @Properties(inherit = org.bytedeco.cpython.presets.python.class)
 public class _PyCoLineInstrumentationData extends Pointer {
     static { Loader.load(); }
@@ -32,6 +33,7 @@ public class _PyCoLineInstrumentationData extends Pointer {
         return new _PyCoLineInstrumentationData((Pointer)this).offsetAddress(i);
     }
 
-    public native @Cast("uint8_t") byte original_opcode(); public native _PyCoLineInstrumentationData original_opcode(byte setter);
-    public native byte line_delta(); public native _PyCoLineInstrumentationData line_delta(byte setter);
+    public native @Cast("uint8_t") byte bytes_per_entry(); public native _PyCoLineInstrumentationData bytes_per_entry(byte setter);
+    public native @Cast("uint8_t") byte data(int i); public native _PyCoLineInstrumentationData data(int i, byte setter);
+    @MemberGetter public native @Cast("uint8_t*") BytePointer data();
 }

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 =        2;
+public static final int PY_MICRO_VERSION =        3;
 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.2";
+public static final String PY_VERSION =              "3.13.3";
 /*--end constants--*/
 
 /* Version as a single 4-byte hex number, e.g. 0x010502B2 == 1.5.2b2.

dnnl/README.md

@@ -9,7 +9,7 @@ Introduction
 ------------
 This directory contains the JavaCPP Presets module for:
 
- * DNNL 3.7.1  https://01.org/dnnl
+ * DNNL 3.7.3  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.7.1/examples/cnn_inference_int8.cpp
+ * https://github.com/oneapi-src/oneDNN/blob/v3.7.3/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.7.1-1.5.12-SNAPSHOT</version>
+            <version>3.7.3-1.5.12-SNAPSHOT</version>
         </dependency>
     </dependencies>
     <build>