Skip to content

Commit f707412

Browse files
saudetsaudet
committed
* 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
1 parent e6f401d commit f707412

File tree

404 files changed

+1441
-869
lines changed

Some content is hidden

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

404 files changed

+1441
-869
lines changed

‎CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Allow setting "org.bytedeco.openblas.load" system property to "none" ([issue #1203](https://github.com/bytedeco/javacpp-presets/issues/1203))
44
* Fix presets for the CUPTI module of CUDA on Windows ([pull #1576](https://github.com/bytedeco/javacpp-presets/pull/1576))
55
* 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))
6-
* 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
6+
* 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
77

88
### November 16, 2024 version 1.5.11
99
* Enable distributed package using Gloo in presets for PyTorch ([pull #1510](https://github.com/bytedeco/javacpp-presets/pull/1510))

‎README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -198,8 +198,8 @@ Each child module in turn relies by default on the included [`cppbuild.sh` scrip
198198
* LZ4 1.9.x https://github.com/lz4/lz4
199199
* MKL 2025.x https://software.intel.com/mkl
200200
* MKL-DNN 0.21.x https://github.com/oneapi-src/oneDNN
201-
* DNNL 3.6.x https://github.com/oneapi-src/oneDNN
202-
* OpenBLAS 0.3.28 http://www.openblas.net/
201+
* DNNL 3.7.x https://github.com/oneapi-src/oneDNN
202+
* OpenBLAS 0.3.29 http://www.openblas.net/
203203
* ARPACK-NG 3.9.x https://github.com/opencollab/arpack-ng
204204
* CMINPACK 1.3.11 https://github.com/devernay/cminpack
205205
* 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
208208
* NumPy 2.2.x https://github.com/numpy/numpy
209209
* SciPy 1.15.x https://github.com/scipy/scipy
210210
* Gym 0.26.x https://github.com/openai/gym
211-
* LLVM 19.1.x http://llvm.org/releases/download.html
211+
* LLVM 20.1.x http://llvm.org/releases/download.html
212212
* libffi 3.4.x https://github.com/libffi/libffi
213213
* libpostal 1.1 https://github.com/openvenues/libpostal
214214
* 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
226226
* PyTorch 2.6.x https://github.com/pytorch/pytorch
227227
* SentencePiece 0.2.0 https://github.com/google/sentencepiece
228228
* TensorFlow 1.15.x https://github.com/tensorflow/tensorflow
229-
* TensorFlow Lite 2.18.x https://github.com/tensorflow/tensorflow
229+
* TensorFlow Lite 2.19.x https://github.com/tensorflow/tensorflow
230230
* TensorRT 10.6.x https://developer.nvidia.com/tensorrt
231231
* Triton Inference Server 2.51.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
234234
* ONNX 1.17.x https://github.com/onnx/onnx
235235
* nGraph 0.26.0 https://github.com/NervanaSystems/ngraph
236-
* ONNX Runtime 1.20.x https://github.com/microsoft/onnxruntime
236+
* ONNX Runtime 1.21.x https://github.com/microsoft/onnxruntime
237237
* TVM 0.18.x https://github.com/apache/tvm
238238
* Bullet Physics SDK 3.25 https://pybullet.org
239239
* LiquidFun http://google.github.io/liquidfun/

‎arpack-ng/platform/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<dependency>
2525
<groupId>org.bytedeco</groupId>
2626
<artifactId>openblas-platform</artifactId>
27-
<version>0.3.28-${project.parent.version}</version>
27+
<version>0.3.29-${project.parent.version}</version>
2828
</dependency>
2929
<dependency>
3030
<groupId>${project.groupId}</groupId>

‎arpack-ng/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<dependency>
2323
<groupId>org.bytedeco</groupId>
2424
<artifactId>openblas</artifactId>
25-
<version>0.3.28-${project.parent.version}</version>
25+
<version>0.3.29-${project.parent.version}</version>
2626
</dependency>
2727
<dependency>
2828
<groupId>org.bytedeco</groupId>
@@ -45,12 +45,12 @@
4545
<dependency>
4646
<groupId>org.bytedeco</groupId>
4747
<artifactId>openblas</artifactId>
48-
<version>0.3.28-${project.parent.version}</version>
48+
<version>0.3.29-${project.parent.version}</version>
4949
</dependency>
5050
<dependency>
5151
<groupId>org.bytedeco</groupId>
5252
<artifactId>openblas</artifactId>
53-
<version>0.3.28-${project.parent.version}</version>
53+
<version>0.3.29-${project.parent.version}</version>
5454
<classifier>${javacpp.platform}</classifier>
5555
</dependency>
5656
</dependencies>

‎cminpack/platform/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<dependency>
2424
<groupId>org.bytedeco</groupId>
2525
<artifactId>openblas-platform</artifactId>
26-
<version>0.3.28-${project.parent.version}</version>
26+
<version>0.3.29-${project.parent.version}</version>
2727
</dependency>
2828
<dependency>
2929
<groupId>${project.groupId}</groupId>

‎cminpack/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<dependency>
1919
<groupId>org.bytedeco</groupId>
2020
<artifactId>openblas</artifactId>
21-
<version>0.3.28-${project.parent.version}</version>
21+
<version>0.3.29-${project.parent.version}</version>
2222
</dependency>
2323
<dependency>
2424
<groupId>org.bytedeco</groupId>
@@ -41,12 +41,12 @@
4141
<dependency>
4242
<groupId>org.bytedeco</groupId>
4343
<artifactId>openblas</artifactId>
44-
<version>0.3.28-${project.parent.version}</version>
44+
<version>0.3.29-${project.parent.version}</version>
4545
</dependency>
4646
<dependency>
4747
<groupId>org.bytedeco</groupId>
4848
<artifactId>openblas</artifactId>
49-
<version>0.3.28-${project.parent.version}</version>
49+
<version>0.3.29-${project.parent.version}</version>
5050
<classifier>${javacpp.platform}</classifier>
5151
</dependency>
5252
</dependencies>

‎cpython/README.md

Lines changed: 2 additions & 2 deletions
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.13.1 https://www.python.org/
17+
* CPython 3.13.2 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.13.1-1.5.12-SNAPSHOT</version>
57+
<version>3.13.2-1.5.12-SNAPSHOT</version>
5858
</dependency>
5959
</dependencies>
6060
<build>

‎cpython/cppbuild.sh

Lines changed: 2 additions & 2 deletions
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.4.0
11-
CPYTHON_VERSION=3.13.1
10+
OPENSSL=openssl-3.4.1
11+
CPYTHON_VERSION=3.13.2
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

Lines changed: 1 addition & 1 deletion
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.13.1-${project.parent.version}</version>
15+
<version>3.13.2-${project.parent.version}</version>
1616
<name>JavaCPP Presets Platform for CPython</name>
1717

1818
<properties>

‎cpython/pom.xml

Lines changed: 1 addition & 1 deletion
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.13.1-${project.parent.version}</version>
14+
<version>3.13.2-${project.parent.version}</version>
1515
<name>JavaCPP Presets for CPython</name>
1616

1717
<dependencies>

‎cpython/samples/pom.xml

Lines changed: 1 addition & 1 deletion
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.13.1-1.5.12-SNAPSHOT</version>
15+
<version>3.13.2-1.5.12-SNAPSHOT</version>
1616
</dependency>
1717
</dependencies>
1818
<build>

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,8 @@ public class PyConfig extends Pointer {
7979
public native int use_frozen_modules(); public native PyConfig use_frozen_modules(int setter);
8080
public native int safe_path(); public native PyConfig safe_path(int setter);
8181
public native int int_max_str_digits(); public native PyConfig int_max_str_digits(int setter);
82+
// #ifdef __APPLE__
83+
// #endif
8284

8385
public native int cpu_count(); public native PyConfig cpu_count(int setter);
8486
// #ifdef Py_GIL_DISABLED

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

Lines changed: 14 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -174,12 +174,12 @@ There is also (independent) API version information in modsupport.h.
174174
/*--start constants--*/
175175
public static final int PY_MAJOR_VERSION = 3;
176176
public static final int PY_MINOR_VERSION = 13;
177-
public static final int PY_MICRO_VERSION = 1;
177+
public static final int PY_MICRO_VERSION = 2;
178178
public static final int PY_RELEASE_LEVEL = PY_RELEASE_LEVEL_FINAL;
179179
public static final int PY_RELEASE_SERIAL = 0;
180180

181181
/* Version as a string */
182-
public static final String PY_VERSION = "3.13.1";
182+
public static final String PY_VERSION = "3.13.2";
183183
/*--end constants--*/
184184

185185
/* 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.
14631463
public static final int HAVE_STRING_H = 1;
14641464

14651465
/* Define to 1 if you have the `strlcpy' function. */
1466-
/* #undef HAVE_STRLCPY */
1466+
public static final int HAVE_STRLCPY = 1;
14671467

14681468
/* Define to 1 if you have the <stropts.h> header file. */
14691469
/* #undef HAVE_STROPTS_H */
@@ -1581,6 +1581,9 @@ There is also (independent) API version information in modsupport.h.
15811581
/* Define to 1 if you have the <sys/param.h> header file. */
15821582
public static final int HAVE_SYS_PARAM_H = 1;
15831583

1584+
/* Define to 1 if you have the <sys/pidfd.h> header file. */
1585+
public static final int HAVE_SYS_PIDFD_H = 1;
1586+
15841587
/* Define to 1 if you have the <sys/poll.h> header file. */
15851588
public static final int HAVE_SYS_POLL_H = 1;
15861589

@@ -1687,8 +1690,8 @@ There is also (independent) API version information in modsupport.h.
16871690
/* Define to 1 if you have the `truncate' function. */
16881691
public static final int HAVE_TRUNCATE = 1;
16891692

1690-
/* Define to 1 if you have the `ttyname' function. */
1691-
public static final int HAVE_TTYNAME = 1;
1693+
/* Define to 1 if you have the `ttyname_r' function. */
1694+
public static final int HAVE_TTYNAME_R = 1;
16921695

16931696
/* Define to 1 if you don't have `tm_zone' but do have the external array
16941697
`tzname'. */
@@ -1808,7 +1811,7 @@ There is also (independent) API version information in modsupport.h.
18081811
public static final int MAJOR_IN_SYSMACROS = 1;
18091812

18101813
/* Define if mvwdelch in curses.h is an expression. */
1811-
public static final int MVWDELCH_IS_EXPRESSION = 1;
1814+
/* #undef MVWDELCH_IS_EXPRESSION */
18121815

18131816
/* Define to the address where bug reports for this package should be sent. */
18141817
/* #undef PACKAGE_BUGREPORT */
@@ -2213,62 +2216,6 @@ significant byte first (like Motorola and SPARC, unlike Intel). */
22132216
// #define PY_MACCONFIG_H
22142217
// #ifdef __APPLE__
22152218

2216-
// #undef ALIGNOF_MAX_ALIGN_T
2217-
// #undef SIZEOF_LONG
2218-
// #undef SIZEOF_LONG_DOUBLE
2219-
// #undef SIZEOF_PTHREAD_T
2220-
// #undef SIZEOF_SIZE_T
2221-
// #undef SIZEOF_TIME_T
2222-
// #undef SIZEOF_VOID_P
2223-
// #undef SIZEOF__BOOL
2224-
// #undef SIZEOF_UINTPTR_T
2225-
// #undef SIZEOF_PTHREAD_T
2226-
// #undef WORDS_BIGENDIAN
2227-
// #undef DOUBLE_IS_ARM_MIXED_ENDIAN_IEEE754
2228-
// #undef DOUBLE_IS_BIG_ENDIAN_IEEE754
2229-
// #undef DOUBLE_IS_LITTLE_ENDIAN_IEEE754
2230-
// #undef HAVE_GCC_ASM_FOR_X87
2231-
// #undef HAVE_GCC_ASM_FOR_X64
2232-
2233-
// #undef VA_LIST_IS_ARRAY
2234-
// #if defined(__LP64__) && defined(__x86_64__)
2235-
public static final int VA_LIST_IS_ARRAY = 1;
2236-
// #endif
2237-
2238-
// #undef HAVE_LARGEFILE_SUPPORT
2239-
// #ifndef __LP64__
2240-
public static final int HAVE_LARGEFILE_SUPPORT = 1;
2241-
// #endif
2242-
2243-
// #undef SIZEOF_LONG
2244-
// #ifdef __LP64__
2245-
// #else
2246-
// # ifdef __ppc__
2247-
// # else
2248-
// # endif
2249-
// #endif
2250-
2251-
// macOS 10.4 (the first release to support 64-bit code
2252-
// at all) only supports 64-bit in the UNIX layer.
2253-
// Therefore suppress the toolbox-glue in 64-bit mode.
2254-
//
2255-
// In 64-bit mode setpgrp always has no arguments, in 32-bit
2256-
// mode that depends on the compilation environment
2257-
// #if defined(__LP64__)
2258-
// # undef SETPGRP_HAVE_ARG
2259-
// #endif
2260-
2261-
// #ifdef __BIG_ENDIAN__
2262-
// # define DOUBLE_IS_BIG_ENDIAN_IEEE754
2263-
// #else
2264-
// # define DOUBLE_IS_LITTLE_ENDIAN_IEEE754
2265-
// #endif
2266-
2267-
// #if defined(__i386__) || defined(__x86_64__)
2268-
// # define HAVE_GCC_ASM_FOR_X87
2269-
// #else
2270-
// #endif
2271-
22722219
// #endif // __APPLE__
22732220
// #endif // !PY_MACCONFIG_H
22742221

@@ -2909,7 +2856,7 @@ For example Py_STRINGIFY(__LINE__) is replaced by the line number, not
29092856
// #define Py_CHARMASK(c) ((unsigned char)((c) & 0xff))
29102857

29112858
// #if (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L
2912-
// && !defined(__cplusplus))
2859+
// && !defined(__cplusplus) && !defined(_MSC_VER))
29132860
// # define Py_BUILD_ASSERT_EXPR(cond)
29142861
// ((void)sizeof(struct { int dummy; _Static_assert(cond, #cond); }),
29152862
// 0)
@@ -13249,6 +13196,8 @@ macros below. On Windows, for example, PyAPI_FUNC() uses dllexport to
1324913196
// #ifndef Py_LIMITED_API
1325013197
// #ifndef Py_TRACEMALLOC_H
1325113198
// #define Py_TRACEMALLOC_H
13199+
// #ifdef __cplusplus
13200+
// #endif
1325213201

1325313202
/* Track an allocated memory block in the tracemalloc module.
1325413203
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
1327013219
@Cast("unsigned int") int domain,
1327113220
@Cast("uintptr_t") long ptr);
1327213221

13222+
// #ifdef __cplusplus
13223+
// #endif
1327313224
// #endif // !Py_TRACEMALLOC_H
1327413225
// #endif // !Py_LIMITED_API
1327513226

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -318,6 +318,7 @@ public void map(InfoMap infoMap) {
318318
"defined _MSC_VER && _MSC_VER >= 1900",
319319
"COUNT_ALLOCS",
320320
"HAVE_DLOPEN",
321+
"__APPLE__",
321322
"SOLARIS",
322323
"MS_WINDOWS",
323324
"defined(HAVE_CLOCK_GETTIME) || defined(HAVE_KQUEUE)",

‎dnnl/README.md

Lines changed: 3 additions & 3 deletions
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-
* DNNL 3.6.2 https://01.org/dnnl
12+
* DNNL 3.7.1 https://01.org/dnnl
1313

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

@@ -25,7 +25,7 @@ Sample Usage
2525
------------
2626
Here is a simple example of DNNL ported to Java from this C++ source file:
2727

28-
* https://github.com/oneapi-src/oneDNN/blob/v3.6.2/examples/cnn_inference_int8.cpp
28+
* https://github.com/oneapi-src/oneDNN/blob/v3.7.1/examples/cnn_inference_int8.cpp
2929

3030
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:
3131
```bash
@@ -46,7 +46,7 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic
4646
<dependency>
4747
<groupId>org.bytedeco</groupId>
4848
<artifactId>dnnl-platform</artifactId>
49-
<version>3.6.2-1.5.12-SNAPSHOT</version>
49+
<version>3.7.1-1.5.12-SNAPSHOT</version>
5050
</dependency>
5151
</dependencies>
5252
<build>

‎dnnl/cppbuild.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ export DNNL_CPU_RUNTIME="OMP" # or TBB
1111
export DNNL_GPU_RUNTIME="OCL"
1212

1313
TBB_VERSION=2020.3
14-
MKLDNN_VERSION=3.6.2
14+
MKLDNN_VERSION=3.7.1
1515
download https://github.com/oneapi-src/oneTBB/archive/v$TBB_VERSION.tar.gz oneTBB-$TBB_VERSION.tar.bz2
1616
download https://github.com/oneapi-src/oneDNN/archive/v$MKLDNN_VERSION.tar.gz oneDNN-$MKLDNN_VERSION.tar.bz2
1717

‎dnnl/platform/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
<groupId>org.bytedeco</groupId>
1414
<artifactId>dnnl-platform</artifactId>
15-
<version>3.6.2-${project.parent.version}</version>
15+
<version>3.7.1-${project.parent.version}</version>
1616
<name>JavaCPP Presets Platform for DNNL</name>
1717

1818
<properties>

‎dnnl/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
<groupId>org.bytedeco</groupId>
1313
<artifactId>dnnl</artifactId>
14-
<version>3.6.2-${project.parent.version}</version>
14+
<version>3.7.1-${project.parent.version}</version>
1515
<name>JavaCPP Presets for DNNL</name>
1616

1717
<dependencies>

‎dnnl/samples/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<dependency>
1313
<groupId>org.bytedeco</groupId>
1414
<artifactId>dnnl-platform</artifactId>
15-
<version>3.6.2-1.5.12-SNAPSHOT</version>
15+
<version>3.7.1-1.5.12-SNAPSHOT</version>
1616
</dependency>
1717
</dependencies>
1818
<build>

0 commit comments

Comments
 (0)