Skip to content

Commit

Permalink
* Upgrade presets for DNNL 3.5.3, OpenBLAS 0.3.28, CPython 3.12.5, N…
Browse files Browse the repository at this point in the history 
…umPy 2.0.1, LLVM 18.1.8, OpenCL 3.0.16, ONNX 1.16.2, ONNX Runtime 1.18.1, TVM 0.17.0
  • Loading branch information
@saudet
saudet committed Aug 11, 2024
1 parent 88c4276 commit ca95556
Show file tree
Hide file tree
Showing 148 changed files with 406 additions and 245 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* Build FFmpeg with zimg to enable zscale filter ([pull #1481](https://github.com/bytedeco/javacpp-presets/pull/1481))
* Enable PulseAudio support for FFmpeg on Linux ([pull #1472](https://github.com/bytedeco/javacpp-presets/pull/1472))
* Virtualize `btCollisionWorld`, `btOverlapFilterCallback`, `btOverlapCallback` from Bullet Physics SDK ([pull #1475](https://github.com/bytedeco/javacpp-presets/pull/1475))
* Upgrade presets for OpenCV 4.10.0, FFmpeg 7.0, Spinnaker 4.0.0.116 ([pull #1524](https://github.com/bytedeco/javacpp-presets/pull/1524)), DNNL 3.4.1, OpenBLAS 0.3.27, CMINPACK 1.3.9, GSL 2.8, CPython 3.12.4, NumPy 2.0.0, SciPy 1.14.0, LLVM 18.1.4, LibRaw 0.21.2 ([pull #1520](https://github.com/bytedeco/javacpp-presets/pull/1520)), Tesseract 5.4.1, libffi 3.4.6, PyTorch 2.3.0 ([pull #1466](https://github.com/bytedeco/javacpp-presets/pull/1466)), SentencePiece 0.2.0, TensorFlow Lite 2.16.1, TensorRT 10.0.1.6, Triton Inference Server 2.44.0, ONNX 1.16.1, ONNX Runtime 1.18.0, TVM 0.16.0, and their dependencies
* Upgrade presets for OpenCV 4.10.0, FFmpeg 7.0, 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, OpenCL 3.0.16, PyTorch 2.3.0 ([pull #1466](https://github.com/bytedeco/javacpp-presets/pull/1466)), SentencePiece 0.2.0, TensorFlow Lite 2.16.1, TensorRT 10.0.1.6, Triton Inference Server 2.44.0, ONNX 1.16.2, ONNX Runtime 1.18.1, TVM 0.17.0, and their dependencies

### January 29, 2024 version 1.5.10
* Introduce `macosx-arm64` builds for PyTorch ([pull #1463](https://github.com/bytedeco/javacpp-presets/pull/1463))
Expand Down
6 changes: 3 additions & 3 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 2024.x https://software.intel.com/mkl
* MKL-DNN 0.21.x https://github.com/oneapi-src/oneDNN
* DNNL 3.4.x https://github.com/oneapi-src/oneDNN
* OpenBLAS 0.3.27 http://www.openblas.net/
* DNNL 3.5.x https://github.com/oneapi-src/oneDNN
* OpenBLAS 0.3.28 http://www.openblas.net/
* ARPACK-NG 3.9.x https://github.com/opencollab/arpack-ng
* CMINPACK 1.3.9 https://github.com/devernay/cminpack
* FFTW 3.3.10 http://www.fftw.org/download.html
Expand Down Expand Up @@ -234,7 +234,7 @@ Each child module in turn relies by default on the included [`cppbuild.sh` scrip
* ONNX 1.16.x https://github.com/onnx/onnx
* nGraph 0.26.0 https://github.com/NervanaSystems/ngraph
* ONNX Runtime 1.18.x https://github.com/microsoft/onnxruntime
* TVM 0.16.x https://github.com/apache/tvm
* TVM 0.17.x https://github.com/apache/tvm
* Bullet Physics SDK 3.25 https://pybullet.org
* LiquidFun http://google.github.io/liquidfun/
* Qt 5.15.x https://download.qt.io/archive/qt/
Expand Down
2 changes: 1 addition & 1 deletion arpack-ng/platform/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<dependency>
<groupId>org.bytedeco</groupId>
<artifactId>openblas-platform</artifactId>
<version>0.3.27-${project.parent.version}</version>
<version>0.3.28-${project.parent.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
Expand Down
6 changes: 3 additions & 3 deletions arpack-ng/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<dependency>
<groupId>org.bytedeco</groupId>
<artifactId>openblas</artifactId>
<version>0.3.27-${project.parent.version}</version>
<version>0.3.28-${project.parent.version}</version>
</dependency>
<dependency>
<groupId>org.bytedeco</groupId>
Expand All @@ -45,12 +45,12 @@
<dependency>
<groupId>org.bytedeco</groupId>
<artifactId>openblas</artifactId>
<version>0.3.27-${project.parent.version}</version>
<version>0.3.28-${project.parent.version}</version>
</dependency>
<dependency>
<groupId>org.bytedeco</groupId>
<artifactId>openblas</artifactId>
<version>0.3.27-${project.parent.version}</version>
<version>0.3.28-${project.parent.version}</version>
<classifier>${javacpp.platform}</classifier>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion cminpack/platform/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<dependency>
<groupId>org.bytedeco</groupId>
<artifactId>openblas-platform</artifactId>
<version>0.3.27-${project.parent.version}</version>
<version>0.3.28-${project.parent.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
Expand Down
6 changes: 3 additions & 3 deletions cminpack/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<dependency>
<groupId>org.bytedeco</groupId>
<artifactId>openblas</artifactId>
<version>0.3.27-${project.parent.version}</version>
<version>0.3.28-${project.parent.version}</version>
</dependency>
<dependency>
<groupId>org.bytedeco</groupId>
Expand All @@ -41,12 +41,12 @@
<dependency>
<groupId>org.bytedeco</groupId>
<artifactId>openblas</artifactId>
<version>0.3.27-${project.parent.version}</version>
<version>0.3.28-${project.parent.version}</version>
</dependency>
<dependency>
<groupId>org.bytedeco</groupId>
<artifactId>openblas</artifactId>
<version>0.3.27-${project.parent.version}</version>
<version>0.3.28-${project.parent.version}</version>
<classifier>${javacpp.platform}</classifier>
</dependency>
</dependencies>
Expand Down
4 changes: 2 additions & 2 deletions cpython/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Introduction
------------
This directory contains the JavaCPP Presets module for:

* CPython 3.12.4 https://www.python.org/
* CPython 3.12.5 https://www.python.org/

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

Expand Down Expand Up @@ -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.12.4-1.5.11-SNAPSHOT</version>
<version>3.12.5-1.5.11-SNAPSHOT</version>
</dependency>
</dependencies>
<build>
Expand Down
4 changes: 2 additions & 2 deletions cpython/cppbuild.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ if [[ -z "$PLATFORM" ]]; then
exit
fi

OPENSSL=openssl-3.3.0
CPYTHON_VERSION=3.12.4
OPENSSL=openssl-3.3.1
CPYTHON_VERSION=3.12.5
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

Expand Down
2 changes: 1 addition & 1 deletion cpython/platform/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

<groupId>org.bytedeco</groupId>
<artifactId>cpython-platform</artifactId>
<version>3.12.4-${project.parent.version}</version>
<version>3.12.5-${project.parent.version}</version>
<name>JavaCPP Presets Platform for CPython</name>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion cpython/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

<groupId>org.bytedeco</groupId>
<artifactId>cpython</artifactId>
<version>3.12.4-${project.parent.version}</version>
<version>3.12.5-${project.parent.version}</version>
<name>JavaCPP Presets for CPython</name>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion cpython/samples/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<dependency>
<groupId>org.bytedeco</groupId>
<artifactId>cpython-platform</artifactId>
<version>3.12.4-1.5.11-SNAPSHOT</version>
<version>3.12.5-1.5.11-SNAPSHOT</version>
</dependency>
</dependencies>
<build>
Expand Down
14 changes: 7 additions & 7 deletions cpython/src/gen/java/org/bytedeco/cpython/global/python.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -144,12 +144,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 = 12;
public static final int PY_MICRO_VERSION = 4;
public static final int PY_MICRO_VERSION = 5;
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.12.4";
public static final String PY_VERSION = "3.12.5";
/*--end constants--*/

/* Version as a single 4-byte hex number, e.g. 0x010502B2 == 1.5.2b2.
Expand Down Expand Up @@ -2932,11 +2932,11 @@ linkage handling and it uses __declspec().
// MSVC makes static_assert a keyword in C11-17, contrary to the standards.
//
// In C++11 and C2x, static_assert is a keyword, redefining is undefined
// behaviour. So only define if building as C (if __STDC_VERSION__ is defined),
// not C++, and only for C11-17.
// behaviour. So only define if building as C, not C++ (if __cplusplus is
// not defined), and only for C11-17.
// #if !defined(static_assert) && (defined(__GNUC__) || defined(__clang__))
// && defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L
// && __STDC_VERSION__ <= 201710L
// && !defined(__cplusplus) && defined(__STDC_VERSION__)
// && __STDC_VERSION__ >= 201112L && __STDC_VERSION__ <= 201710L
// # define static_assert _Static_assert
// #endif

Expand Down Expand Up @@ -8277,7 +8277,7 @@ and where the hash values are equal (i.e. a very probable match) */
/* Float object interface */

/*
PyFloatObject represents a (double precision) floating point number.
PyFloatObject represents a (double precision) floating-point number.
*/

// #ifndef Py_FLOATOBJECT_H
Expand Down
6 changes: 3 additions & 3 deletions dnnl/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Introduction
------------
This directory contains the JavaCPP Presets module for:

* DNNL 3.3.4 https://01.org/dnnl
* DNNL 3.5.3 https://01.org/dnnl

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

Expand All @@ -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.3.4/examples/cnn_inference_int8.cpp
* https://github.com/oneapi-src/oneDNN/blob/v3.5.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
Expand All @@ -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.3.4-1.5.10</version>
<version>3.5.3-1.5.11-SNAPSHOT</version>
</dependency>
</dependencies>
<build>
Expand Down
2 changes: 1 addition & 1 deletion dnnl/cppbuild.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ export DNNL_CPU_RUNTIME="OMP" # or TBB
export DNNL_GPU_RUNTIME="OCL"

TBB_VERSION=2020.3
MKLDNN_VERSION=3.4.1
MKLDNN_VERSION=3.5.3
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

Expand Down
2 changes: 1 addition & 1 deletion dnnl/platform/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

<groupId>org.bytedeco</groupId>
<artifactId>dnnl-platform</artifactId>
<version>3.4.1-${project.parent.version}</version>
<version>3.5.3-${project.parent.version}</version>
<name>JavaCPP Presets Platform for DNNL</name>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion dnnl/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

<groupId>org.bytedeco</groupId>
<artifactId>dnnl</artifactId>
<version>3.4.1-${project.parent.version}</version>
<version>3.5.3-${project.parent.version}</version>
<name>JavaCPP Presets for DNNL</name>

<dependencies>
Expand Down
8 changes: 4 additions & 4 deletions dnnl/samples/CpuCnnInferenceInt8.java
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright 2018-2022 Intel Corporation
* Copyright 2018-2024 Intel Corporation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -87,7 +87,7 @@ static void simple_net_int8(engine.kind engine_kind) throws Exception {

//[Choose scaling factors]

/// The *source, weights, bias* and *destination* datasets use the single-scale
/// The *source, weights* and *destination* datasets use the single-scale
/// format with mask set to '0'.
/// @snippet cnn_inference_int8.cpp Set scaling mask
//[Set scaling mask]
Expand Down Expand Up @@ -122,15 +122,15 @@ static void simple_net_int8(engine.kind engine_kind) throws Exception {
/// descriptors are configured as:
///
/// * 8-bit unsigned (u8) for source and destination.
/// * 8-bit signed (s8) for bias and weights.
/// * 8-bit signed (s8) for weights.
///
/// > **Note**
/// > The destination type is chosen as *unsigned* because the
/// > convolution applies a ReLU operation where data results \f$\geq 0\f$.
/// @snippet cnn_inference_int8.cpp Create convolution memory descriptors
//[Create convolution memory descriptors]
memory.desc conv_src_md = new memory.desc(conv_src_tz, memory.data_type.u8, memory.format_tag.any);
memory.desc conv_bias_md = new memory.desc(conv_bias_tz, memory.data_type.s8, memory.format_tag.any);
memory.desc conv_bias_md = new memory.desc(conv_bias_tz, memory.data_type.f32, memory.format_tag.any);
memory.desc conv_weights_md = new memory.desc(conv_weights_tz, memory.data_type.s8, memory.format_tag.any);
memory.desc conv_dst_md = new memory.desc(conv_dst_tz, memory.data_type.u8, memory.format_tag.any);
//[Create convolution memory descriptors]
Expand Down
2 changes: 1 addition & 1 deletion dnnl/samples/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<dependency>
<groupId>org.bytedeco</groupId>
<artifactId>dnnl-platform</artifactId>
<version>3.3.4-1.5.11-SNAPSHOT</version>
<version>3.5.3-1.5.11-SNAPSHOT</version>
</dependency>
</dependencies>
<build>
Expand Down
Loading

0 comments on commit ca95556

Please sign in to comment.