Skip to content

Commit 1b963b2

Browse files
saudetsaudet
committed
* Upgrade presets for CPython 3.12.7, NumPy 2.1.2, SciPy 1.14.1, ONNX 1.17.0, ONNX Runtime 1.19.2
1 parent dc8e6a5 commit 1b963b2

File tree

102 files changed

+1326
-137
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

102 files changed

+1326
-137
lines changed

‎CHANGELOG.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* Build FFmpeg with zimg to enable zscale filter ([pull #1481](https://github.com/bytedeco/javacpp-presets/pull/1481))
1010
* Enable PulseAudio support for FFmpeg on Linux ([pull #1472](https://github.com/bytedeco/javacpp-presets/pull/1472))
1111
* Virtualize `btCollisionWorld`, `btOverlapFilterCallback`, `btOverlapCallback` from Bullet Physics SDK ([pull #1475](https://github.com/bytedeco/javacpp-presets/pull/1475))
12-
* 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
12+
* 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
1313

1414
### January 29, 2024 version 1.5.10
1515
* Introduce `macosx-arm64` builds for PyTorch ([pull #1463](https://github.com/bytedeco/javacpp-presets/pull/1463))

‎README.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ Further, in the case of Android, the JavaCPP Presets also rely on:
134134

135135
Manual Installation
136136
-------------------
137-
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:
137+
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:
138138

139139
NetBeans (Java SE 7 or newer):
140140

@@ -205,7 +205,7 @@ Each child module in turn relies by default on the included [`cppbuild.sh` scrip
205205
* FFTW 3.3.10 http://www.fftw.org/download.html
206206
* GSL 2.8 http://www.gnu.org/software/gsl/#downloading
207207
* CPython 3.12.x https://www.python.org/downloads/
208-
* NumPy 2.0.x https://github.com/numpy/numpy
208+
* NumPy 2.1.x https://github.com/numpy/numpy
209209
* SciPy 1.14.x https://github.com/scipy/scipy
210210
* Gym 0.26.x https://github.com/openai/gym
211211
* 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
231231
* Triton Inference Server 2.48.x https://developer.nvidia.com/nvidia-triton-inference-server
232232
* The Arcade Learning Environment 0.8.x https://github.com/mgbellemare/Arcade-Learning-Environment
233233
* DepthAI 2.24.x https://github.com/luxonis/depthai-core
234-
* ONNX 1.16.x https://github.com/onnx/onnx
234+
* ONNX 1.17.x https://github.com/onnx/onnx
235235
* nGraph 0.26.0 https://github.com/NervanaSystems/ngraph
236-
* ONNX Runtime 1.18.x https://github.com/microsoft/onnxruntime
236+
* ONNX Runtime 1.19.x https://github.com/microsoft/onnxruntime
237237
* TVM 0.17.x https://github.com/apache/tvm
238238
* Bullet Physics SDK 3.25 https://pybullet.org
239239
* LiquidFun http://google.github.io/liquidfun/

‎cpython/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Introduction
1414
------------
1515
This directory contains the JavaCPP Presets module for:
1616

17-
* CPython 3.12.5 https://www.python.org/
17+
* CPython 3.12.7 https://www.python.org/
1818

1919
Please refer to the parent README.md file for more detailed information about the JavaCPP Presets.
2020

@@ -54,7 +54,7 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic
5454
<dependency>
5555
<groupId>org.bytedeco</groupId>
5656
<artifactId>cpython-platform</artifactId>
57-
<version>3.12.5-1.5.11-SNAPSHOT</version>
57+
<version>3.12.7-1.5.11-SNAPSHOT</version>
5858
</dependency>
5959
</dependencies>
6060
<build>

‎cpython/cppbuild.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ if [[ -z "$PLATFORM" ]]; then
77
exit
88
fi
99

10-
OPENSSL=openssl-3.3.1
11-
CPYTHON_VERSION=3.12.5
10+
OPENSSL=openssl-3.3.2
11+
CPYTHON_VERSION=3.12.7
1212
download https://www.openssl.org/source/$OPENSSL.tar.gz $OPENSSL.tar.gz
1313
download https://www.python.org/ftp/python/$CPYTHON_VERSION/Python-$CPYTHON_VERSION.tgz Python-$CPYTHON_VERSION.tgz
1414

‎cpython/platform/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
<groupId>org.bytedeco</groupId>
1414
<artifactId>cpython-platform</artifactId>
15-
<version>3.12.5-${project.parent.version}</version>
15+
<version>3.12.7-${project.parent.version}</version>
1616
<name>JavaCPP Presets Platform for CPython</name>
1717

1818
<properties>

‎cpython/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
<groupId>org.bytedeco</groupId>
1313
<artifactId>cpython</artifactId>
14-
<version>3.12.5-${project.parent.version}</version>
14+
<version>3.12.7-${project.parent.version}</version>
1515
<name>JavaCPP Presets for CPython</name>
1616

1717
<dependencies>

‎cpython/samples/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<dependency>
1313
<groupId>org.bytedeco</groupId>
1414
<artifactId>cpython-platform</artifactId>
15-
<version>3.12.5-1.5.11-SNAPSHOT</version>
15+
<version>3.12.7-1.5.11-SNAPSHOT</version>
1616
</dependency>
1717
</dependencies>
1818
<build>

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -144,12 +144,12 @@ There is also (independent) API version information in modsupport.h.
144144
/*--start constants--*/
145145
public static final int PY_MAJOR_VERSION = 3;
146146
public static final int PY_MINOR_VERSION = 12;
147-
public static final int PY_MICRO_VERSION = 5;
147+
public static final int PY_MICRO_VERSION = 7;
148148
public static final int PY_RELEASE_LEVEL = PY_RELEASE_LEVEL_FINAL;
149149
public static final int PY_RELEASE_SERIAL = 0;
150150

151151
/* Version as a string */
152-
public static final String PY_VERSION = "3.12.5";
152+
public static final String PY_VERSION = "3.12.7";
153153
/*--end constants--*/
154154

155155
/* Version as a single 4-byte hex number, e.g. 0x010502B2 == 1.5.2b2.

‎numpy/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Introduction
99
------------
1010
This directory contains the JavaCPP Presets module for:
1111

12-
* NumPy 2.0.1 http://www.numpy.org/
12+
* NumPy 2.1.2 http://www.numpy.org/
1313

1414
Please refer to the parent README.md file for more detailed information about the JavaCPP Presets.
1515

@@ -48,7 +48,7 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic
4848
<dependency>
4949
<groupId>org.bytedeco</groupId>
5050
<artifactId>numpy-platform</artifactId>
51-
<version>2.0.1-1.5.11-SNAPSHOT</version>
51+
<version>2.1.2-1.5.11-SNAPSHOT</version>
5252
</dependency>
5353

5454
<!-- Additional dependencies to use bundled full version of MKL -->

‎numpy/cppbuild.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ if [[ -z "$PLATFORM" ]]; then
77
exit
88
fi
99

10-
NUMPY_VERSION=2.0.1
10+
NUMPY_VERSION=2.1.2
1111
download https://github.com/numpy/numpy/releases/download/v$NUMPY_VERSION/numpy-$NUMPY_VERSION.tar.gz numpy-$NUMPY_VERSION.tar.gz
1212

1313
mkdir -p $PLATFORM

‎numpy/platform/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
<groupId>org.bytedeco</groupId>
1414
<artifactId>numpy-platform</artifactId>
15-
<version>2.0.1-${project.parent.version}</version>
15+
<version>2.1.2-${project.parent.version}</version>
1616
<name>JavaCPP Presets Platform for NumPy</name>
1717

1818
<properties>
@@ -28,7 +28,7 @@
2828
<dependency>
2929
<groupId>org.bytedeco</groupId>
3030
<artifactId>cpython-platform</artifactId>
31-
<version>3.12.5-${project.parent.version}</version>
31+
<version>3.12.7-${project.parent.version}</version>
3232
</dependency>
3333
<dependency>
3434
<groupId>${project.groupId}</groupId>

‎numpy/pom.xml

+5-5
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
<groupId>org.bytedeco</groupId>
1313
<artifactId>numpy</artifactId>
14-
<version>2.0.1-${project.parent.version}</version>
14+
<version>2.1.2-${project.parent.version}</version>
1515
<name>JavaCPP Presets for NumPy</name>
1616

1717
<dependencies>
@@ -23,7 +23,7 @@
2323
<dependency>
2424
<groupId>org.bytedeco</groupId>
2525
<artifactId>cpython</artifactId>
26-
<version>3.12.5-${project.parent.version}</version>
26+
<version>3.12.7-${project.parent.version}</version>
2727
</dependency>
2828
<dependency>
2929
<groupId>org.bytedeco</groupId>
@@ -51,7 +51,7 @@
5151
<dependency>
5252
<groupId>org.bytedeco</groupId>
5353
<artifactId>cpython</artifactId>
54-
<version>3.12.5-${project.parent.version}</version>
54+
<version>3.12.7-${project.parent.version}</version>
5555
</dependency>
5656
<dependency>
5757
<groupId>org.bytedeco</groupId>
@@ -62,7 +62,7 @@
6262
<dependency>
6363
<groupId>org.bytedeco</groupId>
6464
<artifactId>cpython</artifactId>
65-
<version>3.12.5-${project.parent.version}</version>
65+
<version>3.12.7-${project.parent.version}</version>
6666
<classifier>${javacpp.platform}</classifier>
6767
</dependency>
6868
</dependencies>
@@ -171,7 +171,7 @@
171171
<dependency>
172172
<groupId>org.bytedeco</groupId>
173173
<artifactId>cpython</artifactId>
174-
<version>3.12.5-${project.parent.version}</version>
174+
<version>3.12.7-${project.parent.version}</version>
175175
<classifier>${os.name}-${os.arch}</classifier>
176176
</dependency>
177177
</dependencies>

‎numpy/samples/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<dependency>
1313
<groupId>org.bytedeco</groupId>
1414
<artifactId>numpy-platform</artifactId>
15-
<version>2.0.1-1.5.11-SNAPSHOT</version>
15+
<version>2.1.2-1.5.11-SNAPSHOT</version>
1616
</dependency>
1717

1818
<!-- Additional dependencies to use bundled full version of MKL -->

‎numpy/src/gen/java/org/bytedeco/numpy/PyArrayMultiIterObject.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public class PyArrayMultiIterObject extends Pointer {
5858
@MemberGetter public native @Cast("PyArrayIterObject**") PointerPointer iters();
5959
// #elif defined(__cplusplus)
6060
/*
61-
* C++ doesn't stricly support flexible members and gives compilers
61+
* C++ doesn't strictly support flexible members and gives compilers
6262
* warnings (pedantic only), so we lie. We can't make it 64 because
6363
* then Cython is unhappy (larger struct at runtime is OK smaller not).
6464
*/

‎numpy/src/gen/java/org/bytedeco/numpy/PyUFuncObject.java

+6-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
import static org.bytedeco.numpy.global.numpy.*;
1616

1717

18-
1918
@Properties(inherit = org.bytedeco.numpy.presets.numpy.class)
2019
public class PyUFuncObject extends Pointer {
2120
static { Loader.load(); }
@@ -160,4 +159,10 @@ public class PyUFuncObject extends Pointer {
160159
/* A PyListObject of `(tuple of DTypes, ArrayMethod/Promoter)` */
161160
public native PyObject _loops(); public native PyUFuncObject _loops(PyObject setter);
162161
// #endif
162+
// #if NPY_FEATURE_VERSION >= NPY_2_1_API_VERSION
163+
/*
164+
* Optional function to process core dimensions of a gufunc.
165+
*/
166+
public native PyUFunc_ProcessCoreDimsFunc process_core_dims_func(); public native PyUFuncObject process_core_dims_func(PyUFunc_ProcessCoreDimsFunc setter);
167+
// #endif
163168
}

‎numpy/src/gen/java/org/bytedeco/numpy/PyUFunc_ProcessCoreDimsFunc.java

+58
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE
2+
3+
package org.bytedeco.numpy;
4+
5+
import java.nio.*;
6+
import org.bytedeco.javacpp.*;
7+
import org.bytedeco.javacpp.annotation.*;
8+
9+
import static org.bytedeco.javacpp.presets.javacpp.*;
10+
import static org.bytedeco.openblas.global.openblas_nolapack.*;
11+
import static org.bytedeco.openblas.global.openblas.*;
12+
import org.bytedeco.cpython.*;
13+
import static org.bytedeco.cpython.global.python.*;
14+
15+
import static org.bytedeco.numpy.global.numpy.*;
16+
17+
18+
/*
19+
* This is the signature for the functions that may be assigned to the
20+
* `process_core_dims_func` field of the PyUFuncObject structure.
21+
* Implementation of this function is optional. This function is only used
22+
* by generalized ufuncs (i.e. those with the field `core_enabled` set to 1).
23+
* The function is called by the ufunc during the processing of the arguments
24+
* of a call of the ufunc. The function can check the core dimensions of the
25+
* input and output arrays and return -1 with an exception set if any
26+
* requirements are not satisfied. If the caller of the ufunc didn't provide
27+
* output arrays, the core dimensions associated with the output arrays (i.e.
28+
* those that are not also used in input arrays) will have the value -1 in
29+
* `core_dim_sizes`. This function can replace any output core dimensions
30+
* that are -1 with a value that is appropriate for the ufunc.
31+
*
32+
* Parameter Description
33+
* --------------- ------------------------------------------------------
34+
* ufunc The ufunc object
35+
* core_dim_sizes An array with length `ufunc->core_num_dim_ix`.
36+
* The core dimensions of the arrays passed to the ufunc
37+
* will have been set. If the caller of the ufunc didn't
38+
* provide the output array(s), the output-only core
39+
* dimensions will have the value -1.
40+
*
41+
* The function must not change any element in `core_dim_sizes` that is
42+
* not -1 on input. Doing so will result in incorrect output from the
43+
* ufunc, and could result in a crash of the Python interpreter.
44+
*
45+
* The function must return 0 on success, -1 on failure (with an exception
46+
* set).
47+
*/
48+
@Properties(inherit = org.bytedeco.numpy.presets.numpy.class)
49+
public class PyUFunc_ProcessCoreDimsFunc extends FunctionPointer {
50+
static { Loader.load(); }
51+
/** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */
52+
public PyUFunc_ProcessCoreDimsFunc(Pointer p) { super(p); }
53+
protected PyUFunc_ProcessCoreDimsFunc() { allocate(); }
54+
private native void allocate();
55+
public native int call(
56+
PyUFuncObject ufunc,
57+
@Cast("npy_intp*") SizeTPointer core_dim_sizes);
58+
}

0 commit comments

Comments
 (0)