Skip to content

Commit 25e602f

Browse files
saudetsaudet
committed
* Upgrade presets for DNNL 3.11, ONNX Runtime 1.24.1
1 parent 7bbadd2 commit 25e602f

77 files changed

Lines changed: 4303 additions & 604 deletions

File tree

Some content is hidden

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

‎.github/actions/deploy-ubuntu/action.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ runs:
2424
if [[ -n "$SUDO" ]]; then
2525
# Make sure no busy /swapfile is hanging around
2626
# First disable any existing swapfile with swapoff
27-
$SUDO swapoff /swapfile
28-
$SUDO rm -f /swapfile
27+
$SUDO swapoff /swapfile || true
28+
$SUDO rm -f /swapfile || true
2929
3030
# Allocate a swapfile on Linux as it's not enabled by default. Needed for pytorch and mkl.
3131
$SUDO fallocate -l 16GB /swapfile

‎.github/actions/deploy-windows/action.yml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -86,13 +86,13 @@ runs:
8686
curl -LO http://repo.msys2.org/mingw/i686/mingw-w64-i686-readline-8.2.013-1-any.pkg.tar.zst
8787
curl -LO http://repo.msys2.org/mingw/i686/mingw-w64-i686-tcl-8.6.13-1-any.pkg.tar.zst
8888
curl -LO http://repo.msys2.org/mingw/i686/mingw-w64-i686-tk-8.6.13-1-any.pkg.tar.zst
89-
curl -LO http://repo.msys2.org/mingw/i686/mingw-w64-i686-crt-git-11.0.0.r750.g05598db99-1-any.pkg.tar.zst
90-
curl -LO http://repo.msys2.org/mingw/i686/mingw-w64-i686-headers-git-11.0.0.r750.g05598db99-1-any.pkg.tar.zst
91-
curl -LO http://repo.msys2.org/mingw/i686/mingw-w64-i686-libmangle-git-11.0.0.r750.g05598db99-1-any.pkg.tar.zst
92-
curl -LO http://repo.msys2.org/mingw/i686/mingw-w64-i686-libwinpthread-git-11.0.0.r750.g05598db99-1-any.pkg.tar.zst
93-
curl -LO http://repo.msys2.org/mingw/i686/mingw-w64-i686-tools-git-11.0.0.r750.g05598db99-1-any.pkg.tar.zst
94-
curl -LO http://repo.msys2.org/mingw/i686/mingw-w64-i686-winpthreads-git-11.0.0.r750.g05598db99-1-any.pkg.tar.zst
95-
curl -LO http://repo.msys2.org/mingw/i686/mingw-w64-i686-winstorecompat-git-11.0.0.r750.g05598db99-1-any.pkg.tar.zst
89+
curl -LO http://repo.msys2.org/mingw/i686/mingw-w64-i686-crt-git-12.0.0.r1.gdc42231f0-1-any.pkg.tar.zst
90+
curl -LO http://repo.msys2.org/mingw/i686/mingw-w64-i686-headers-git-12.0.0.r1.gdc42231f0-1-any.pkg.tar.zst
91+
curl -LO http://repo.msys2.org/mingw/i686/mingw-w64-i686-libmangle-git-12.0.0.r1.gdc42231f0-1-any.pkg.tar.zst
92+
curl -LO http://repo.msys2.org/mingw/i686/mingw-w64-i686-libwinpthread-git-12.0.0.r1.gdc42231f0-1-any.pkg.tar.zst
93+
curl -LO http://repo.msys2.org/mingw/i686/mingw-w64-i686-tools-git-12.0.0.r1.gdc42231f0-1-any.pkg.tar.zst
94+
curl -LO http://repo.msys2.org/mingw/i686/mingw-w64-i686-winpthreads-git-12.0.0.r1.gdc42231f0-1-any.pkg.tar.zst
95+
curl -LO http://repo.msys2.org/mingw/i686/mingw-w64-i686-winstorecompat-git-12.0.0.r1.gdc42231f0-1-any.pkg.tar.zst
9696
curl -LO http://repo.msys2.org/mingw/i686/mingw-w64-i686-vulkan-headers-1.3.296.0-1-any.pkg.tar.zst
9797
curl -LO http://repo.msys2.org/mingw/i686/mingw-w64-i686-vulkan-loader-1.3.296.0-1-any.pkg.tar.zst
9898
curl -LO http://repo.msys2.org/mingw/i686/mingw-w64-i686-SDL2-2.30.12-1-any.pkg.tar.zst
@@ -106,13 +106,13 @@ runs:
106106
curl -LO http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-readline-8.2.013-1-any.pkg.tar.zst
107107
curl -LO http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-tcl-8.6.13-1-any.pkg.tar.zst
108108
curl -LO http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-tk-8.6.13-1-any.pkg.tar.zst
109-
curl -LO http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-crt-git-11.0.0.r750.g05598db99-1-any.pkg.tar.zst
110-
curl -LO http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-headers-git-11.0.0.r750.g05598db99-1-any.pkg.tar.zst
111-
curl -LO http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-libmangle-git-11.0.0.r750.g05598db99-1-any.pkg.tar.zst
112-
curl -LO http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-libwinpthread-git-11.0.0.r750.g05598db99-1-any.pkg.tar.zst
113-
curl -LO http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-tools-git-11.0.0.r750.g05598db99-1-any.pkg.tar.zst
114-
curl -LO http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-winpthreads-git-11.0.0.r750.g05598db99-1-any.pkg.tar.zst
115-
curl -LO http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-winstorecompat-git-11.0.0.r750.g05598db99-1-any.pkg.tar.zst
109+
curl -LO http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-crt-git-12.0.0.r1.gdc42231f0-1-any.pkg.tar.zst
110+
curl -LO http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-headers-git-12.0.0.r1.gdc42231f0-1-any.pkg.tar.zst
111+
curl -LO http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-libmangle-git-12.0.0.r1.gdc42231f0-1-any.pkg.tar.zst
112+
curl -LO http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-libwinpthread-git-12.0.0.r1.gdc42231f0-1-any.pkg.tar.zst
113+
curl -LO http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-tools-git-12.0.0.r1.gdc42231f0-1-any.pkg.tar.zst
114+
curl -LO http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-winpthreads-git-12.0.0.r1.gdc42231f0-1-any.pkg.tar.zst
115+
curl -LO http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-winstorecompat-git-12.0.0.r1.gdc42231f0-1-any.pkg.tar.zst
116116
curl -LO http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-vulkan-headers-1.3.296.0-1-any.pkg.tar.zst
117117
curl -LO http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-vulkan-loader-1.3.296.0-1-any.pkg.tar.zst
118118
curl -LO http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-SDL2-2.30.12-1-any.pkg.tar.zst

‎CHANGELOG.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
* Introduce CUDA-enabled `linux-arm64-gpu` builds to presets for OpenCV ([pull #1651](https://github.com/bytedeco/javacpp-presets/pull/1651))
2020
* Reenable again `linux-arm64` builds for CPython and NumPy ([pull #1652](https://github.com/bytedeco/javacpp-presets/pull/1652))
2121
* Bundle libraries for VA-API 2.x with FFmpeg to avoid loading issues ([issue bytedeco/javacv#2340](https://github.com/bytedeco/javacv/issues/2340))
22-
* Upgrade presets for OpenCV 4.13.0, FFmpeg 8.0.1, MKL 2025.3.1, DNNL 3.10.2, OpenBLAS 0.3.31, CUDA 13.1.1, cuDNN 9.19.0.56, NCCL 2.29.3, nvCOMP 5.1.0.21, NVIDIA Video Codec SDK 13.0.37, CPython 3.14.3, NumPy 2.4.2, SciPy 1.17.0, LLVM 21.1.8, libffi 3.5.2, Leptonica 1.87.0, Tesseract 5.5.2, PyTorch 2.10.0, SentencePiece 0.2.1, TensorFlow Lite 2.20.0, TensorRT 10.15.1.29, Triton Inference Server 2.65.0, ONNX 1.20.1, ONNX Runtime 1.23.2, and their dependencies
22+
* Upgrade presets for OpenCV 4.13.0, FFmpeg 8.0.1, MKL 2025.3.1, DNNL 3.11, OpenBLAS 0.3.31, CUDA 13.1.1, cuDNN 9.19.0.56, NCCL 2.29.3, nvCOMP 5.1.0.21, NVIDIA Video Codec SDK 13.0.37, CPython 3.14.3, NumPy 2.4.2, SciPy 1.17.0, LLVM 21.1.8, libffi 3.5.2, Leptonica 1.87.0, Tesseract 5.5.2, PyTorch 2.10.0, SentencePiece 0.2.1, TensorFlow Lite 2.20.0, TensorRT 10.15.1.29, Triton Inference Server 2.65.0, ONNX 1.20.1, ONNX Runtime 1.24.1, and their dependencies
2323

2424
### June 30, 2025 version 1.5.12
2525
* Add presets for the CUFILE module of CUDA

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ 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.3.x https://software.intel.com/mkl
200200
* MKL-DNN 0.21.x https://github.com/oneapi-src/oneDNN
201-
* DNNL 3.10.x https://github.com/oneapi-src/oneDNN
201+
* DNNL 3.11.x https://github.com/oneapi-src/oneDNN
202202
* OpenBLAS 0.3.31 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
@@ -233,7 +233,7 @@ Each child module in turn relies by default on the included [`cppbuild.sh` scrip
233233
* DepthAI 2.24.x https://github.com/luxonis/depthai-core
234234
* ONNX 1.20.x https://github.com/onnx/onnx
235235
* nGraph 0.26.0 https://github.com/NervanaSystems/ngraph
236-
* ONNX Runtime 1.23.x https://github.com/microsoft/onnxruntime
236+
* ONNX Runtime 1.24.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/

‎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.10.2 https://01.org/dnnl
12+
* DNNL 3.11 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.10.2/examples/cnn_inference_int8.cpp
28+
* https://github.com/oneapi-src/oneDNN/blob/v3.11/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.10.2-1.5.13-SNAPSHOT</version>
49+
<version>3.11-1.5.13-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.10.2
14+
MKLDNN_VERSION=3.11
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.10.2-${project.parent.version}</version>
15+
<version>3.11-${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.10.2-${project.parent.version}</version>
14+
<version>3.11-${project.parent.version}</version>
1515
<name>JavaCPP Presets for DNNL</name>
1616

1717
<dependencies>

‎dnnl/samples/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55
<version>1.5.13-SNAPSHOT</version>
66
<properties>
77
<exec.mainClass>CpuCnnInferenceInt8</exec.mainClass>
8-
<maven.compiler.source>1.7</maven.compiler.source>
9-
<maven.compiler.target>1.7</maven.compiler.target>
8+
<maven.compiler.source>1.8</maven.compiler.source>
9+
<maven.compiler.target>1.8</maven.compiler.target>
1010
</properties>
1111
<dependencies>
1212
<dependency>
1313
<groupId>org.bytedeco</groupId>
1414
<artifactId>dnnl-platform</artifactId>
15-
<version>3.10.2-1.5.13-SNAPSHOT</version>
15+
<version>3.11-1.5.13-SNAPSHOT</version>
1616
</dependency>
1717
</dependencies>
1818
<build>

0 commit comments

Comments
 (0)