Skip to content

Commit

Permalink
* Upgrade presets for OpenBLAS 0.3.25, NumPy 1.26.2, SciPy 1.11.4, L…
Browse files Browse the repository at this point in the history 
…LVM 17.0.6
  • Loading branch information
@saudet
saudet committed Dec 2, 2023
1 parent 7629ea4 commit e0a3694
Show file tree
Hide file tree
Showing 131 changed files with 264 additions and 210 deletions.
6 changes: 3 additions & 3 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@

* Add Android and Windows builds to presets for DepthAI ([pull #1441](https://github.com/bytedeco/javacpp-presets/pull/1441))
* Add presets for SentencePiece 0.1.99 ([pull #1384](https://github.com/bytedeco/javacpp-presets/pull/1384))
* Add presets for nvCOMP 3.0.4 ([pull #1434](https://github.com/bytedeco/javacpp-presets/pull/1434)), SentencePiece 0.1.99 ([pull #1384](https://github.com/bytedeco/javacpp-presets/pull/1384))
* Refactor and improve presets for PyTorch ([pull #1360](https://github.com/bytedeco/javacpp-presets/pull/1360))
* Include `mkl_lapack.h` header file in presets for MKL ([issue #1388](https://github.com/bytedeco/javacpp-presets/issues/1388))
* Map new higher-level C++ API of Triton Inference Server ([pull #1361](https://github.com/bytedeco/javacpp-presets/pull/1361))
* Upgrade presets for OpenCV 4.8.1, FFmpeg 6.1, HDF5 1.14.3, DNNL 3.3, OpenBLAS 0.3.24, ARPACK-NG 3.9.1, CPython 3.12.0, NumPy 1.26.1, SciPy 1.11.3, LLVM 17.0.4, Leptonica 1.83.1, Tesseract 5.3.3, CUDA 12.3.0, cuDNN 8.9.5, NCCL 2.18.5, PyTorch 2.1.1 ([pull #1426](https://github.com/bytedeco/javacpp-presets/pull/1426)), TensorFlow Lite 2.14.0, Triton Inference Server 2.38.0, ONNX 1.15.0, ONNX Runtime 1.16.2, TVM 0.14.0, and their dependencies
* Upgrade presets for OpenCV 4.8.1, FFmpeg 6.1, HDF5 1.14.3, DNNL 3.3, OpenBLAS 0.3.25, ARPACK-NG 3.9.1, CPython 3.12.0, NumPy 1.26.2, SciPy 1.11.4, LLVM 17.0.6, Leptonica 1.83.1, Tesseract 5.3.3, CUDA 12.3.0, cuDNN 8.9.5, NCCL 2.18.5, PyTorch 2.1.1 ([pull #1426](https://github.com/bytedeco/javacpp-presets/pull/1426)), TensorFlow Lite 2.14.0, Triton Inference Server 2.38.0, ONNX 1.15.0, ONNX Runtime 1.16.2, TVM 0.14.0, and their dependencies

### June 6, 2023 version 1.5.9
* Virtualize `nvinfer1::IGpuAllocator` from TensorRT to allow customization ([pull #1367](https://github.com/bytedeco/javacpp-presets/pull/1367))
* Add new `SampleJpegEncoder` code for nvJPEG module of CUDA ([pull #1365](https://github.com/bytedeco/javacpp-presets/pull/1365))
* Add new `SampleJpegDecoder` and `SampleJpegEncoder` code for nvJPEG module of CUDA ([pull #1365](https://github.com/bytedeco/javacpp-presets/pull/1365))
* Map `std::vector` of `CameraParams`, `ImageFeatures`, and `MatchesInfo` from `cv::detail` ([issue bytedeco/javacv#2027](https://github.com/bytedeco/javacv/issues/2027))
* Fix H.264 decoder of FFmpeg by increasing MAX_SLICES to 256 ([pull #1349](https://github.com/bytedeco/javacpp-presets/pull/1349))
* Link FFmpeg with latest version of VA-API libraries ([pull #1296](https://github.com/bytedeco/javacpp-presets/pull/1296))
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ Each child module in turn relies by default on the included [`cppbuild.sh` scrip
* MKL 2023.x https://software.intel.com/mkl
* MKL-DNN 0.21.x https://github.com/oneapi-src/oneDNN
* DNNL 3.3.x https://github.com/oneapi-src/oneDNN
* OpenBLAS 0.3.24 http://www.openblas.net/
* OpenBLAS 0.3.25 http://www.openblas.net/
* ARPACK-NG 3.9.x https://github.com/opencollab/arpack-ng
* CMINPACK 1.3.8 https://github.com/devernay/cminpack
* FFTW 3.3.10 http://www.fftw.org/download.html
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.24-${project.parent.version}</version>
<version>0.3.25-${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.24-${project.parent.version}</version>
<version>0.3.25-${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.24-${project.parent.version}</version>
<version>0.3.25-${project.parent.version}</version>
</dependency>
<dependency>
<groupId>org.bytedeco</groupId>
<artifactId>openblas</artifactId>
<version>0.3.24-${project.parent.version}</version>
<version>0.3.25-${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.24-${project.parent.version}</version>
<version>0.3.25-${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.24-${project.parent.version}</version>
<version>0.3.25-${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.24-${project.parent.version}</version>
<version>0.3.25-${project.parent.version}</version>
</dependency>
<dependency>
<groupId>org.bytedeco</groupId>
<artifactId>openblas</artifactId>
<version>0.3.24-${project.parent.version}</version>
<version>0.3.25-${project.parent.version}</version>
<classifier>${javacpp.platform}</classifier>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion cpython/cppbuild.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ if [[ -z "$PLATFORM" ]]; then
exit
fi

OPENSSL=openssl-3.1.3
OPENSSL=openssl-3.1.4
CPYTHON_VERSION=3.12.0
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
6 changes: 1 addition & 5 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 @@ -10913,11 +10913,7 @@ The Py_FatalError() function is replaced with a macro which logs
String func,
String format);

@NoException public static native PyObject _PyErr_SetImportErrorWithNameFrom(
PyObject arg0,
PyObject arg1,
PyObject arg2,
PyObject arg3);



// #define Py_FatalError(message) _Py_FatalErrorFunc(__func__, (message))
Expand Down
2 changes: 1 addition & 1 deletion cpython/src/main/java/org/bytedeco/cpython/presets/python.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@
"cpython/fileutils.h",
},
link = "python3.12@.1.0!",
preload = {"ffi@.6", "ffi@.5", "libcrypto-1_1", "libssl-1_1"/*, "sqlite3", "tcl86t", "tk86t"*/},
preload = {"ffi@.8", "ffi@.7", "ffi@.6", "ffi@.5", "libcrypto-1_1", "libssl-1_1"/*, "sqlite3", "tcl86t", "tk86t"*/},
resource = {"include", "lib", "libs", "bin", "share"}
),
@Platform(value = "linux", preloadpath = {"/usr/lib/", "/usr/lib32/", "/usr/lib64/"}),
Expand Down
4 changes: 2 additions & 2 deletions depthai/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
<dependency>
<groupId>org.bytedeco</groupId>
<artifactId>openblas</artifactId>
<version>0.3.24-${project.parent.version}</version>
<version>0.3.25-${project.parent.version}</version>
</dependency>
<dependency>
<groupId>org.bytedeco</groupId>
Expand All @@ -52,7 +52,7 @@
<dependency>
<groupId>org.bytedeco</groupId>
<artifactId>openblas</artifactId>
<version>0.3.24-${project.parent.version}</version>
<version>0.3.25-${project.parent.version}</version>
<classifier>${javacpp.platform}</classifier>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion gsl/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.24-${project.parent.version}</version>
<version>0.3.25-${project.parent.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
Expand Down
6 changes: 3 additions & 3 deletions gsl/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.24-${project.parent.version}</version>
<version>0.3.25-${project.parent.version}</version>
</dependency>
<dependency>
<groupId>org.bytedeco</groupId>
Expand All @@ -44,12 +44,12 @@
<dependency>
<groupId>org.bytedeco</groupId>
<artifactId>openblas</artifactId>
<version>0.3.24-${project.parent.version}</version>
<version>0.3.25-${project.parent.version}</version>
</dependency>
<dependency>
<groupId>org.bytedeco</groupId>
<artifactId>openblas</artifactId>
<version>0.3.24-${project.parent.version}</version>
<version>0.3.25-${project.parent.version}</version>
<classifier>${javacpp.platform}</classifier>
</dependency>
</dependencies>
Expand Down
4 changes: 2 additions & 2 deletions llvm/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:

* LLVM 17.0.4 http://llvm.org/
* LLVM 17.0.6 http://llvm.org/

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

Expand Down Expand Up @@ -50,7 +50,7 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic
<dependency>
<groupId>org.bytedeco</groupId>
<artifactId>llvm-platform</artifactId>
<version>17.0.4-1.5.10-SNAPSHOT</version>
<version>17.0.6-1.5.10-SNAPSHOT</version>
</dependency>
</dependencies>
<build>
Expand Down
2 changes: 1 addition & 1 deletion llvm/cppbuild.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ if [[ -z "$PLATFORM" ]]; then
exit
fi

LLVM_VERSION=17.0.4
LLVM_VERSION=17.0.6
download https://github.com/llvm/llvm-project/releases/download/llvmorg-$LLVM_VERSION/llvm-project-$LLVM_VERSION.src.tar.xz llvm-project-$LLVM_VERSION.src.tar.xz

mkdir -p $PLATFORM
Expand Down
2 changes: 1 addition & 1 deletion llvm/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>llvm-platform</artifactId>
<version>17.0.4-${project.parent.version}</version>
<version>17.0.6-${project.parent.version}</version>
<name>JavaCPP Presets Platform for LLVM</name>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion llvm/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>llvm</artifactId>
<version>17.0.4-${project.parent.version}</version>
<version>17.0.6-${project.parent.version}</version>
<name>JavaCPP Presets for LLVM</name>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion llvm/samples/clang/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>llvm-platform</artifactId>
<version>17.0.4-1.5.10-SNAPSHOT</version>
<version>17.0.6-1.5.10-SNAPSHOT</version>
</dependency>
</dependencies>
<build>
Expand Down
2 changes: 1 addition & 1 deletion llvm/samples/llvm/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>llvm-platform</artifactId>
<version>17.0.4-1.5.10-SNAPSHOT</version>
<version>17.0.6-1.5.10-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.bytedeco</groupId>
Expand Down
2 changes: 1 addition & 1 deletion llvm/samples/polly/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<dependency>
<groupId>org.bytedeco</groupId>
<artifactId>llvm-platform</artifactId>
<version>17.0.4-1.5.10-SNAPSHOT</version>
<version>17.0.6-1.5.10-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.bytedeco</groupId>
Expand Down
4 changes: 2 additions & 2 deletions numpy/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:

* NumPy 1.26.1 http://www.numpy.org/
* NumPy 1.26.2 http://www.numpy.org/

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

Expand Down Expand Up @@ -48,7 +48,7 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic
<dependency>
<groupId>org.bytedeco</groupId>
<artifactId>numpy-platform</artifactId>
<version>1.26.1-1.5.10-SNAPSHOT</version>
<version>1.26.2-1.5.10-SNAPSHOT</version>
</dependency>

<!-- Additional dependencies to use bundled full version of MKL -->
Expand Down
4 changes: 2 additions & 2 deletions numpy/cppbuild.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ if [[ -z "$PLATFORM" ]]; then
exit
fi

NUMPY_VERSION=1.26.1
NUMPY_VERSION=1.26.2
download https://github.com/numpy/numpy/releases/download/v$NUMPY_VERSION/numpy-$NUMPY_VERSION.tar.gz numpy-$NUMPY_VERSION.tar.gz

mkdir -p $PLATFORM
Expand Down Expand Up @@ -102,7 +102,7 @@ if ! $PYTHON_BIN_PATH -m pip install --target=$PYTHON_LIB_PATH $TOOLS; then
echo "extra_link_args = -lgfortran" >> site.cfg
chmod +x "$CPYTHON_HOST_PATH/bin/python3.12"
export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$CPYTHON_HOST_PATH/lib/:$CPYTHON_HOST_PATH"
"$CPYTHON_HOST_PATH/bin/python3.12" -m pip install --target="$CPYTHON_HOST_PATH/lib/python3.12/" crossenv==1.0 $TOOLS
"$CPYTHON_HOST_PATH/bin/python3.12" -m pip install --target="$CPYTHON_HOST_PATH/lib/python3.12/" crossenv==1.4 $TOOLS
"$CPYTHON_HOST_PATH/bin/python3.12" -m crossenv "$PYTHON_BIN_PATH" crossenv
source crossenv/bin/activate
cross-expose cython
Expand Down
4 changes: 2 additions & 2 deletions numpy/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>numpy-platform</artifactId>
<version>1.26.1-${project.parent.version}</version>
<version>1.26.2-${project.parent.version}</version>
<name>JavaCPP Presets Platform for NumPy</name>

<properties>
Expand All @@ -23,7 +23,7 @@
<dependency>
<groupId>org.bytedeco</groupId>
<artifactId>openblas-platform</artifactId>
<version>0.3.24-${project.parent.version}</version>
<version>0.3.25-${project.parent.version}</version>
</dependency>
<dependency>
<groupId>org.bytedeco</groupId>
Expand Down
8 changes: 4 additions & 4 deletions numpy/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@

<groupId>org.bytedeco</groupId>
<artifactId>numpy</artifactId>
<version>1.26.1-${project.parent.version}</version>
<version>1.26.2-${project.parent.version}</version>
<name>JavaCPP Presets for NumPy</name>

<dependencies>
<dependency>
<groupId>org.bytedeco</groupId>
<artifactId>openblas</artifactId>
<version>0.3.24-${project.parent.version}</version>
<version>0.3.25-${project.parent.version}</version>
</dependency>
<dependency>
<groupId>org.bytedeco</groupId>
Expand Down Expand Up @@ -46,7 +46,7 @@
<dependency>
<groupId>org.bytedeco</groupId>
<artifactId>openblas</artifactId>
<version>0.3.24-${project.parent.version}</version>
<version>0.3.25-${project.parent.version}</version>
</dependency>
<dependency>
<groupId>org.bytedeco</groupId>
Expand All @@ -56,7 +56,7 @@
<dependency>
<groupId>org.bytedeco</groupId>
<artifactId>openblas</artifactId>
<version>0.3.24-${project.parent.version}</version>
<version>0.3.25-${project.parent.version}</version>
<classifier>${javacpp.platform}</classifier>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion numpy/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>numpy-platform</artifactId>
<version>1.26.1-1.5.10-SNAPSHOT</version>
<version>1.26.2-1.5.10-SNAPSHOT</version>
</dependency>

<!-- Additional dependencies to use bundled full version of MKL -->
Expand Down
3 changes: 3 additions & 0 deletions numpy/src/gen/java/org/bytedeco/numpy/global/numpy.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -337,6 +337,9 @@ public class numpy extends org.bytedeco.numpy.presets.numpy {
// #else
// #endif
// #include <sys/types.h>
// #ifndef _WIN32
// #include <unistd.h>
// #endif
// #define npy_lseek lseek
// #define npy_off_t off_t

Expand Down
4 changes: 2 additions & 2 deletions openblas/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:

* OpenBLAS 0.3.24 http://www.openblas.net/
* OpenBLAS 0.3.25 http://www.openblas.net/

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

Expand Down Expand Up @@ -50,7 +50,7 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic
<dependency>
<groupId>org.bytedeco</groupId>
<artifactId>openblas-platform</artifactId>
<version>0.3.24-1.5.10-SNAPSHOT</version>
<version>0.3.25-1.5.10-SNAPSHOT</version>
</dependency>
</dependencies>
<build>
Expand Down
2 changes: 1 addition & 1 deletion openblas/cppbuild.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ if [[ -z "$PLATFORM" ]]; then
exit
fi

OPENBLAS_VERSION=0.3.24
OPENBLAS_VERSION=0.3.25

download https://github.com/xianyi/OpenBLAS/archive/v$OPENBLAS_VERSION.tar.gz OpenBLAS-$OPENBLAS_VERSION.tar.gz

Expand Down
2 changes: 1 addition & 1 deletion openblas/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>openblas-platform</artifactId>
<version>0.3.24-${project.parent.version}</version>
<version>0.3.25-${project.parent.version}</version>
<name>JavaCPP Presets Platform for OpenBLAS</name>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion openblas/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>openblas</artifactId>
<version>0.3.24-${project.parent.version}</version>
<version>0.3.25-${project.parent.version}</version>
<name>JavaCPP Presets for OpenBLAS</name>

<properties>
Expand Down
Loading

0 comments on commit e0a3694

Please sign in to comment.