From ee1401da0b612ad515f06fa6846937ebb87f2a18 Mon Sep 17 00:00:00 2001 From: Samuel Audet Date: Sun, 14 Jan 2024 20:25:53 +0900 Subject: [PATCH] * Upgrade presets for FFmpeg 6.1.1, DNNL 3.3.4, OpenBLAS 0.3.26, NumPy 1.26.3, Leptonica 1.84.1, CUDA 12.3.2 --- .github/actions/deploy-ubuntu/action.yml | 14 +++++----- .github/actions/deploy-windows/action.yml | 12 +++++---- CHANGELOG.md | 2 +- README.md | 2 +- arpack-ng/platform/pom.xml | 2 +- arpack-ng/pom.xml | 6 ++--- cminpack/platform/pom.xml | 2 +- cminpack/pom.xml | 6 ++--- cpython/cppbuild.sh | 2 +- cuda/README.md | 2 +- depthai/pom.xml | 4 +-- dnnl/README.md | 6 ++--- dnnl/cppbuild.sh | 2 +- dnnl/platform/pom.xml | 2 +- dnnl/pom.xml | 2 +- dnnl/samples/pom.xml | 2 +- .../java/org/bytedeco/dnnl/global/dnnl.java | 2 +- ffmpeg/README.md | 6 ++--- ffmpeg/cppbuild.sh | 14 +++++----- ffmpeg/platform/gpl/pom.xml | 2 +- ffmpeg/platform/pom.xml | 2 +- ffmpeg/pom.xml | 2 +- ffmpeg/samples/pom.xml | 4 +-- .../org/bytedeco/ffmpeg/global/avutil.java | 2 +- gsl/platform/pom.xml | 2 +- gsl/pom.xml | 6 ++--- leptonica/README.md | 4 +-- leptonica/cppbuild.sh | 2 +- leptonica/platform/pom.xml | 2 +- leptonica/pom.xml | 2 +- leptonica/samples/pom.xml | 2 +- .../bytedeco/leptonica/global/leptonica.java | 6 ++--- numpy/README.md | 4 +-- numpy/cppbuild.sh | 2 +- numpy/platform/pom.xml | 4 +-- numpy/pom.xml | 8 +++--- numpy/samples/pom.xml | 2 +- .../java/org/bytedeco/onnx/global/onnx.java | 3 +++ .../java/org/bytedeco/onnx/presets/onnx.java | 1 + onnxruntime/cppbuild.sh | 2 +- onnxruntime/platform/gpu/pom.xml | 2 +- onnxruntime/platform/pom.xml | 2 +- onnxruntime/pom.xml | 4 +-- openblas/README.md | 4 +-- openblas/cppbuild.sh | 2 +- openblas/platform/pom.xml | 2 +- openblas/pom.xml | 2 +- openblas/samples/pom.xml | 2 +- .../bytedeco/openblas/global/openblas.java | 2 +- .../openblas/global/openblas_nolapack.java | 2 +- opencv/README.md | 2 +- opencv/platform/gpu/pom.xml | 2 +- opencv/platform/pom.xml | 2 +- opencv/pom.xml | 8 +++--- opencv/samples/pom.xml | 2 +- .../bytedeco/opencv/presets/opencv_core.java | 1 + platform/pom.xml | 10 +++---- pytorch/platform/gpu/pom.xml | 4 +-- pytorch/platform/pom.xml | 4 +-- pytorch/pom.xml | 8 +++--- .../org/bytedeco/pytorch/presets/torch.java | 1 + scipy/cppbuild.sh | 2 +- scipy/platform/pom.xml | 2 +- scipy/pom.xml | 8 +++--- tesseract/platform/pom.xml | 2 +- tesseract/pom.xml | 6 ++--- tvm/platform/gpu/pom.xml | 2 +- tvm/platform/pom.xml | 2 +- tvm/pom.xml | 4 +-- .../org/bytedeco/tvm/global/tvm_runtime.java | 26 +++++-------------- .../org/bytedeco/tvm/presets/tvm_runtime.java | 3 ++- 71 files changed, 138 insertions(+), 141 deletions(-) diff --git a/.github/actions/deploy-ubuntu/action.yml b/.github/actions/deploy-ubuntu/action.yml index 0faf25c0579..389a2b8eb01 100644 --- a/.github/actions/deploy-ubuntu/action.yml +++ b/.github/actions/deploy-ubuntu/action.yml @@ -31,7 +31,7 @@ runs: export ARCH=arm64 export ARCH_CUDA=sbsa export PREFIX=aarch64-linux-gnu - export CUDA=cuda-repo-rhel8-12-3-local-12.3.1_545.23.08-1.aarch64.rpm + export CUDA=cuda-repo-rhel8-12-3-local-12.3.2_545.23.08-1.aarch64.rpm export CUDNN=8.9.7.29-1.cuda12.2.aarch64 export NCCL=2.19.3-1+cuda12.3.aarch64 export NVCOMP=nvcomp_3.0.5_SBSA_12.x @@ -40,7 +40,7 @@ runs: export ARCH=ppc64el export ARCH_CUDA=ppc64le export PREFIX=powerpc64le-linux-gnu - export CUDA=cuda-repo-rhel8-12-3-local-12.3.1_545.23.08-1.ppc64le.rpm + export CUDA=cuda-repo-rhel8-12-3-local-12.3.2_545.23.08-1.ppc64le.rpm export CUDNN=8.9.7.29-1.cuda12.2.ppc64le export NCCL=2.19.3-1+cuda12.3.ppc64le elif [[ "$CI_DEPLOY_PLATFORM" == "linux-x86" ]]; then @@ -50,7 +50,7 @@ runs: export ARCH=amd64 export ARCH_CUDA=x86_64 export PREFIX=x86_64-linux-gnu - export CUDA=cuda-repo-rhel8-12-3-local-12.3.1_545.23.08-1.x86_64.rpm + export CUDA=cuda-repo-rhel8-12-3-local-12.3.2_545.23.08-1.x86_64.rpm export CUDNN=8.9.7.29-1.cuda12.2.x86_64 export NCCL=2.19.3-1+cuda12.3.x86_64 export NVCOMP=nvcomp_3.0.5_x86_64_12.x @@ -140,7 +140,7 @@ runs: if [[ -n ${ARCH_CUDA:-} ]] && [[ -n ${CI_DEPLOY_NEED_CUDA:-} ]]; then echo Installing CUDA, cuDNN, nvCOMP, etc - curl -LO https://developer.download.nvidia.com/compute/cuda/12.3.1/local_installers/$CUDA + curl -LO https://developer.download.nvidia.com/compute/cuda/12.3.2/local_installers/$CUDA curl -LO https://developer.download.nvidia.com/compute/cuda/repos/rhel8/$ARCH_CUDA/libcudnn8-$CUDNN.rpm curl -LO https://developer.download.nvidia.com/compute/cuda/repos/rhel8/$ARCH_CUDA/libcudnn8-devel-$CUDNN.rpm curl -LO https://developer.download.nvidia.com/compute/cuda/repos/rhel8/$ARCH_CUDA/libnccl-$NCCL.rpm @@ -200,14 +200,16 @@ runs: if [[ "$CI_DEPLOY_PLATFORM" == "linux-arm64" ]] && [[ "$CI_DEPLOY_MODULE" == "tensorrt" ]]; then echo Installing TensorRT - python3 -m gdown.cli https://drive.google.com/uc?id=1LZRCv4ZAGiDQAu4pvADJIGntq4cGl5tU + # python3 -m gdown.cli https://drive.google.com/uc?id=1LZRCv4ZAGiDQAu4pvADJIGntq4cGl5tU + curl -LO https://github.com/bytedeco/binaries/releases/download/1.5.10/TensorRT-8.6.1.6.Ubuntu-20.04.aarch64-gnu.cuda-12.0.tar.gz $SUDO tar -hxvf TensorRT-8.6.1.6.Ubuntu-20.04.aarch64-gnu.cuda-12.0.tar.gz -C /usr/local/ $SUDO ln -sf /usr/local/TensorRT* /usr/local/tensorrt fi if [[ "$CI_DEPLOY_PLATFORM" == "linux-x86_64" ]] && [[ "$CI_DEPLOY_MODULE" == "tensorrt" ]]; then echo Installing TensorRT - python3 -m gdown.cli https://drive.google.com/uc?id=1dVhD-DEYY42QbZe1GXl-vxe3k6KqWGsL + # python3 -m gdown.cli https://drive.google.com/uc?id=1dVhD-DEYY42QbZe1GXl-vxe3k6KqWGsL + curl -LO https://github.com/bytedeco/binaries/releases/download/1.5.10/TensorRT-8.6.1.6.Linux.x86_64-gnu.cuda-12.0.tar.gz $SUDO tar -hxvf TensorRT-8.6.1.6.Linux.x86_64-gnu.cuda-12.0.tar.gz -C /usr/local/ $SUDO ln -sf /usr/local/TensorRT* /usr/local/tensorrt fi diff --git a/.github/actions/deploy-windows/action.yml b/.github/actions/deploy-windows/action.yml index f65ffd561a1..f33eb76cfb2 100644 --- a/.github/actions/deploy-windows/action.yml +++ b/.github/actions/deploy-windows/action.yml @@ -94,15 +94,16 @@ runs: if "%CI_DEPLOY_PLATFORM%"=="windows-x86_64" if not "%CI_DEPLOY_NEED_CUDA%"=="" ( echo Installing CUDA, cuDNN, nvCOMP, etc curl -LO https://developer.download.nvidia.com/compute/cuda/11.8.0/local_installers/cuda_11.8.0_522.06_windows.exe - curl -LO https://developer.download.nvidia.com/compute/cuda/12.3.1/local_installers/cuda_12.3.1_546.12_windows.exe + curl -LO https://developer.download.nvidia.com/compute/cuda/12.3.2/local_installers/cuda_12.3.2_546.12_windows.exe rem curl -LO https://developer.download.nvidia.com/compute/redist/cudnn/v8.8.0/local_installers/12.0/cudnn_8.8.0.121_windows.exe - python -m gdown.cli https://drive.google.com/uc?id=135Z7zfwguQe6vn7p013HtVkHFu9-_rru + rem python -m gdown.cli https://drive.google.com/uc?id=135Z7zfwguQe6vn7p013HtVkHFu9-_rru + curl -LO https://github.com/bytedeco/binaries/releases/download/1.5.10/cudnn-windows-x86_64-8.9.7.29_cuda12-archive.zip curl -LO http://www.winimage.com/zLibDll/zlib123dllx64.zip curl -LO https://developer.download.nvidia.com/compute/nvcomp/3.0.5/local_installers/nvcomp_3.0.5_windows_12.x.zip cuda_11.8.0_522.06_windows.exe -s bash -c "rm -Rf 'C:/Program Files/NVIDIA GPU Computing Toolkit/CUDA/v11.8'" bash -c "mv 'C:/Program Files/NVIDIA Corporation/NvToolsExt' 'C:/Program Files/NVIDIA Corporation/NvToolsExt_old'" - cuda_12.3.1_546.12_windows.exe -s + cuda_12.3.2_546.12_windows.exe -s bash -c "mv 'C:/Program Files/NVIDIA Corporation/NvToolsExt_old' 'C:/Program Files/NVIDIA Corporation/NvToolsExt'" bash -c "ls 'C:/Program Files/NVIDIA Corporation/NvToolsExt'" rem cudnn_8.8.0.121_windows.exe -s @@ -143,7 +144,8 @@ runs: if "%CI_DEPLOY_MODULE%"=="tensorrt" ( echo Installing TensorRT - python -m gdown.cli https://drive.google.com/uc?id=1GfmJ1BKbacLpUU-0i_mGu0sjrAS0Xzzi + rem python -m gdown.cli https://drive.google.com/uc?id=1GfmJ1BKbacLpUU-0i_mGu0sjrAS0Xzzi + curl -LO https://github.com/bytedeco/binaries/releases/download/1.5.10/TensorRT-8.6.1.6.Windows10.x86_64.cuda-12.0.zip unzip TensorRT-8.6.1.6.Windows10.x86_64.cuda-12.0.zip move TensorRT-8.6.1.6 "%ProgramFiles%\NVIDIA GPU Computing Toolkit\TensorRT" ) @@ -229,7 +231,7 @@ runs: set "CUDA_PATH=%ProgramFiles%\NVIDIA GPU Computing Toolkit\CUDA\v12.3" set "CUDA_PATH_V12_3=%ProgramFiles%\NVIDIA GPU Computing Toolkit\CUDA\v12.3" set "PATH=%ProgramFiles%\NVIDIA GPU Computing Toolkit\CUDA\v12.3\bin;%ProgramFiles%\NVIDIA GPU Computing Toolkit\CUDA\v12.3\libnvvp;%PATH%" - echo CUDA Version 12.3.1>"%ProgramFiles%\NVIDIA GPU Computing Toolkit\CUDA\v12.3\version.txt" + echo CUDA Version 12.3.2>"%ProgramFiles%\NVIDIA GPU Computing Toolkit\CUDA\v12.3\version.txt" ) set "CCACHE_DIR=%USERPROFILE%\ccache" set "PATH=C:\hostedtoolcache\windows\Python\3.9.13\x64;C:\msys64\%MSYSTEM%\bin;C:\msys64\usr\bin;%ProgramFiles%\apache-maven-3.6.3\bin;%PATH%" diff --git a/CHANGELOG.md b/CHANGELOG.md index cbd70ca1171..eb2a3cdb8ac 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,7 @@ * 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.9.0, FFmpeg 6.1, HDF5 1.14.3, MKL 2024.0, DNNL 3.3.3, OpenBLAS 0.3.25, ARPACK-NG 3.9.1, CPython 3.12.1, NumPy 1.26.2, SciPy 1.11.4, LLVM 17.0.6, Leptonica 1.84.0, Tesseract 5.3.3, CUDA 12.3.1, cuDNN 8.9.7, NCCL 2.19.3, OpenCL 3.0.15, PyTorch 2.1.2 ([pull #1426](https://github.com/bytedeco/javacpp-presets/pull/1426)), TensorFlow Lite 2.15.0, Triton Inference Server 2.41.0, DepthAI 2.24.0, ONNX 1.15.0, ONNX Runtime 1.16.3, TVM 0.14.0, and their dependencies + * Upgrade presets for OpenCV 4.9.0, FFmpeg 6.1.1, HDF5 1.14.3, MKL 2024.0, DNNL 3.3.4, OpenBLAS 0.3.26, ARPACK-NG 3.9.1, CPython 3.12.1, NumPy 1.26.3, SciPy 1.11.4, LLVM 17.0.6, Leptonica 1.84.1, Tesseract 5.3.3, CUDA 12.3.2, cuDNN 8.9.7, NCCL 2.19.3, OpenCL 3.0.15, PyTorch 2.1.2 ([pull #1426](https://github.com/bytedeco/javacpp-presets/pull/1426)), TensorFlow Lite 2.15.0, Triton Inference Server 2.41.0, DepthAI 2.24.0, ONNX 1.15.0, ONNX Runtime 1.16.3, 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)) diff --git a/README.md b/README.md index 52dce4e806d..20318a61da2 100644 --- a/README.md +++ b/README.md @@ -199,7 +199,7 @@ Each child module in turn relies by default on the included [`cppbuild.sh` scrip * MKL 2024.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.25 http://www.openblas.net/ + * OpenBLAS 0.3.26 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 diff --git a/arpack-ng/platform/pom.xml b/arpack-ng/platform/pom.xml index bd6bf010e2c..e94c9884343 100644 --- a/arpack-ng/platform/pom.xml +++ b/arpack-ng/platform/pom.xml @@ -24,7 +24,7 @@ org.bytedeco openblas-platform - 0.3.25-${project.parent.version} + 0.3.26-${project.parent.version} ${project.groupId} diff --git a/arpack-ng/pom.xml b/arpack-ng/pom.xml index 40b6ec75a0e..6e2cd030db0 100644 --- a/arpack-ng/pom.xml +++ b/arpack-ng/pom.xml @@ -22,7 +22,7 @@ org.bytedeco openblas - 0.3.25-${project.parent.version} + 0.3.26-${project.parent.version} org.bytedeco @@ -45,12 +45,12 @@ org.bytedeco openblas - 0.3.25-${project.parent.version} + 0.3.26-${project.parent.version} org.bytedeco openblas - 0.3.25-${project.parent.version} + 0.3.26-${project.parent.version} ${javacpp.platform} diff --git a/cminpack/platform/pom.xml b/cminpack/platform/pom.xml index 9951bc46201..999a1817fd7 100644 --- a/cminpack/platform/pom.xml +++ b/cminpack/platform/pom.xml @@ -23,7 +23,7 @@ org.bytedeco openblas-platform - 0.3.25-${project.parent.version} + 0.3.26-${project.parent.version} ${project.groupId} diff --git a/cminpack/pom.xml b/cminpack/pom.xml index 4ffa861d0c6..28694b61389 100644 --- a/cminpack/pom.xml +++ b/cminpack/pom.xml @@ -18,7 +18,7 @@ org.bytedeco openblas - 0.3.25-${project.parent.version} + 0.3.26-${project.parent.version} org.bytedeco @@ -41,12 +41,12 @@ org.bytedeco openblas - 0.3.25-${project.parent.version} + 0.3.26-${project.parent.version} org.bytedeco openblas - 0.3.25-${project.parent.version} + 0.3.26-${project.parent.version} ${javacpp.platform} diff --git a/cpython/cppbuild.sh b/cpython/cppbuild.sh index a7817aabcff..02c2ae6f438 100755 --- a/cpython/cppbuild.sh +++ b/cpython/cppbuild.sh @@ -7,7 +7,7 @@ if [[ -z "$PLATFORM" ]]; then exit fi -OPENSSL=openssl-3.1.4 +OPENSSL=openssl-3.2.0 CPYTHON_VERSION=3.12.1 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 diff --git a/cuda/README.md b/cuda/README.md index 0b8665fe9c4..43d5cc033a2 100644 --- a/cuda/README.md +++ b/cuda/README.md @@ -25,7 +25,7 @@ Introduction ------------ This directory contains the JavaCPP Presets module for: - * CUDA 12.3.1 https://developer.nvidia.com/cuda-zone + * CUDA 12.3.2 https://developer.nvidia.com/cuda-zone * cuDNN 8.9.7 https://developer.nvidia.com/cudnn * NCCL 2.19.3 https://developer.nvidia.com/nccl * nvCOMP 3.0.5 https://developer.nvidia.com/nvcomp diff --git a/depthai/pom.xml b/depthai/pom.xml index 63b870c94f2..4e28e090be6 100644 --- a/depthai/pom.xml +++ b/depthai/pom.xml @@ -42,7 +42,7 @@ org.bytedeco openblas - 0.3.25-${project.parent.version} + 0.3.26-${project.parent.version} org.bytedeco @@ -52,7 +52,7 @@ org.bytedeco openblas - 0.3.25-${project.parent.version} + 0.3.26-${project.parent.version} ${javacpp.platform} diff --git a/dnnl/README.md b/dnnl/README.md index 473242aeadd..ae0be59a390 100644 --- a/dnnl/README.md +++ b/dnnl/README.md @@ -9,7 +9,7 @@ Introduction ------------ This directory contains the JavaCPP Presets module for: - * DNNL 3.3.3 https://01.org/dnnl + * DNNL 3.3.4 https://01.org/dnnl Please refer to the parent README.md file for more detailed information about the JavaCPP Presets. @@ -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.3/examples/cnn_inference_int8.cpp + * https://github.com/oneapi-src/oneDNN/blob/v3.3.4/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 @@ -46,7 +46,7 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic org.bytedeco dnnl-platform - 3.3.3-1.5.10-SNAPSHOT + 3.3.4-1.5.10-SNAPSHOT diff --git a/dnnl/cppbuild.sh b/dnnl/cppbuild.sh index 13903fff00a..de99670ba39 100755 --- a/dnnl/cppbuild.sh +++ b/dnnl/cppbuild.sh @@ -11,7 +11,7 @@ export DNNL_CPU_RUNTIME="OMP" # or TBB export DNNL_GPU_RUNTIME="OCL" TBB_VERSION=2020.3 -MKLDNN_VERSION=3.3.3 +MKLDNN_VERSION=3.3.4 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 diff --git a/dnnl/platform/pom.xml b/dnnl/platform/pom.xml index dfd66e3c52f..0f392dcb737 100644 --- a/dnnl/platform/pom.xml +++ b/dnnl/platform/pom.xml @@ -12,7 +12,7 @@ org.bytedeco dnnl-platform - 3.3.3-${project.parent.version} + 3.3.4-${project.parent.version} JavaCPP Presets Platform for DNNL diff --git a/dnnl/pom.xml b/dnnl/pom.xml index bde5fa250f2..68797e023e2 100644 --- a/dnnl/pom.xml +++ b/dnnl/pom.xml @@ -11,7 +11,7 @@ org.bytedeco dnnl - 3.3.3-${project.parent.version} + 3.3.4-${project.parent.version} JavaCPP Presets for DNNL diff --git a/dnnl/samples/pom.xml b/dnnl/samples/pom.xml index 60d13e5d5c1..e7040b8dd25 100644 --- a/dnnl/samples/pom.xml +++ b/dnnl/samples/pom.xml @@ -12,7 +12,7 @@ org.bytedeco dnnl-platform - 3.3.3-1.5.10-SNAPSHOT + 3.3.4-1.5.10-SNAPSHOT diff --git a/dnnl/src/gen/java/org/bytedeco/dnnl/global/dnnl.java b/dnnl/src/gen/java/org/bytedeco/dnnl/global/dnnl.java index 8325b4011c6..de929927fca 100644 --- a/dnnl/src/gen/java/org/bytedeco/dnnl/global/dnnl.java +++ b/dnnl/src/gen/java/org/bytedeco/dnnl/global/dnnl.java @@ -3475,7 +3475,7 @@ public class dnnl extends org.bytedeco.dnnl.presets.dnnl { public static final int DNNL_VERSION_MINOR = 3; /** Patch version */ -public static final int DNNL_VERSION_PATCH = 3; +public static final int DNNL_VERSION_PATCH = 4; /** Git commit hash */ public static native @MemberGetter String DNNL_VERSION_HASH(); diff --git a/ffmpeg/README.md b/ffmpeg/README.md index 6ebd8dae03f..e03df2e535a 100644 --- a/ffmpeg/README.md +++ b/ffmpeg/README.md @@ -9,7 +9,7 @@ Introduction ------------ This directory contains the JavaCPP Presets module for: - * FFmpeg 6.1 http://ffmpeg.org/ + * FFmpeg 6.1.1 http://ffmpeg.org/ Please refer to the parent README.md file for more detailed information about the JavaCPP Presets. @@ -46,14 +46,14 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic org.bytedeco ffmpeg-platform - 6.1-1.5.10-SNAPSHOT + 6.1.1-1.5.10-SNAPSHOT org.bytedeco ffmpeg-platform-gpl - 6.1-1.5.10-SNAPSHOT + 6.1.1-1.5.10-SNAPSHOT diff --git a/ffmpeg/cppbuild.sh b/ffmpeg/cppbuild.sh index 55a9aea67d6..ad87ec2384a 100755 --- a/ffmpeg/cppbuild.sh +++ b/ffmpeg/cppbuild.sh @@ -32,8 +32,8 @@ SPEEX=speex-1.2.1 OPUS=opus-1.3.1 OPENCORE_AMR=opencore-amr-0.1.6 VO_AMRWBENC=vo-amrwbenc-0.1.3 -OPENSSL=openssl-3.1.4 -OPENH264_VERSION=2.3.1 +OPENSSL=openssl-3.2.0 +OPENH264_VERSION=2.4.0 X264=x264-stable X265=3.4 VPX_VERSION=1.13.1 @@ -44,9 +44,9 @@ NVCODEC_VERSION=12.1.14.0 XML2=libxml2-2.9.12 LIBSRT_VERSION=1.5.3 WEBP_VERSION=1.3.2 -AOMAV1_VERSION=3.7.0 -SVTAV1_VERSION=1.7.0 -FFMPEG_VERSION=6.1 +AOMAV1_VERSION=3.8.0 +SVTAV1_VERSION=1.8.0 +FFMPEG_VERSION=6.1.1 download https://download.videolan.org/contrib/nasm/nasm-$NASM_VERSION.tar.gz nasm-$NASM_VERSION.tar.gz download http://zlib.net/$ZLIB.tar.gz $ZLIB.tar.gz download http://downloads.sourceforge.net/project/lame/lame/3.100/$LAME.tar.gz $LAME.tar.gz @@ -396,7 +396,7 @@ EOF cd ../libaom-$AOMAV1_VERSION mkdir -p build_release cd build_release - $CMAKE -DCMAKE_TOOLCHAIN_FILE=${PLATFORM_ROOT}/build/cmake/android.toolchain.cmake -DANDROID_ABI=arm64-v8a -DANDROID_NATIVE_API_LEVEL=24 -DCMAKE_C_FLAGS="-I$INSTALL_PATH/include/" -DCMAKE_CXX_FLAGS="-I$INSTALL_PATH/include/" -DCMAKE_EXE_LINKER_FLAGS="-L$INSTALL_PATH/lib/" -DCMAKE_INSTALL_PREFIX=$INSTALL_PATH $LIBAOM_CONFIG -DCONFIG_RUNTIME_CPU_DETECT:BOOL=OFF .. + $CMAKE -DCMAKE_TOOLCHAIN_FILE=${PLATFORM_ROOT}/build/cmake/android.toolchain.cmake -DANDROID_ABI=arm64-v8a -DANDROID_NATIVE_API_LEVEL=24 -DCMAKE_C_FLAGS="-I$INSTALL_PATH/include/" -DCMAKE_CXX_FLAGS="-I$INSTALL_PATH/include/" -DCMAKE_EXE_LINKER_FLAGS="-L$INSTALL_PATH/lib/" -DCMAKE_INSTALL_PREFIX=$INSTALL_PATH $LIBAOM_CONFIG -DCONFIG_RUNTIME_CPU_DETECT:BOOL=OFF -DENABLE_NEON_I8MM=OFF .. make -j $MAKEJ make install cd .. @@ -1647,7 +1647,7 @@ EOF cd ../libaom-$AOMAV1_VERSION mkdir -p build_release cd build_release - CFLAGS="-I$INSTALL_PATH/include/" CXXFLAGS="-I$INSTALL_PATH/include/" LDFLAGS="-L$INSTALL_PATH/lib/" $CMAKE -DCMAKE_INSTALL_PREFIX=$INSTALL_PATH -DCMAKE_SYSTEM_NAME=Darwin -DCMAKE_SYSTEM_VERSION=1 -DCMAKE_SYSTEM_PROCESSOR=armv8 -DCMAKE_CXX_FLAGS="$CXXFLAGS -fPIC" -DCMAKE_C_FLAGS="$CFLAGS -fPIC" -DCMAKE_C_COMPILER="clang" -DCMAKE_CXX_COMPILER="clang++" $LIBAOM_CONFIG -DAOM_ARCH_AARCH64=1 .. + CFLAGS="-I$INSTALL_PATH/include/" CXXFLAGS="-I$INSTALL_PATH/include/" LDFLAGS="-L$INSTALL_PATH/lib/" $CMAKE -DCMAKE_INSTALL_PREFIX=$INSTALL_PATH -DCMAKE_SYSTEM_NAME=Darwin -DCMAKE_SYSTEM_VERSION=1 -DCMAKE_SYSTEM_PROCESSOR=armv8 -DCMAKE_CXX_FLAGS="$CXXFLAGS -fPIC" -DCMAKE_C_FLAGS="$CFLAGS -fPIC" -DCMAKE_C_COMPILER="clang" -DCMAKE_CXX_COMPILER="clang++" $LIBAOM_CONFIG -DAOM_ARCH_AARCH64=1 -DCONFIG_RUNTIME_CPU_DETECT:BOOL=OFF -DENABLE_NEON_I8MM=OFF .. make -j $MAKEJ make install cd .. diff --git a/ffmpeg/platform/gpl/pom.xml b/ffmpeg/platform/gpl/pom.xml index f8b2d7a9264..f1a287be266 100644 --- a/ffmpeg/platform/gpl/pom.xml +++ b/ffmpeg/platform/gpl/pom.xml @@ -12,7 +12,7 @@ org.bytedeco ffmpeg-platform-gpl - 6.1-${project.parent.version} + 6.1.1-${project.parent.version} JavaCPP Presets Platform for FFmpeg (GPL enabled) diff --git a/ffmpeg/platform/pom.xml b/ffmpeg/platform/pom.xml index 75f50943b37..fc1fa2943b2 100644 --- a/ffmpeg/platform/pom.xml +++ b/ffmpeg/platform/pom.xml @@ -12,7 +12,7 @@ org.bytedeco ffmpeg-platform - 6.1-${project.parent.version} + 6.1.1-${project.parent.version} JavaCPP Presets Platform for FFmpeg diff --git a/ffmpeg/pom.xml b/ffmpeg/pom.xml index 22126330121..fb05b598311 100644 --- a/ffmpeg/pom.xml +++ b/ffmpeg/pom.xml @@ -11,7 +11,7 @@ org.bytedeco ffmpeg - 6.1-${project.parent.version} + 6.1.1-${project.parent.version} JavaCPP Presets for FFmpeg diff --git a/ffmpeg/samples/pom.xml b/ffmpeg/samples/pom.xml index f93d2cbbf9a..fbcd3ccd053 100644 --- a/ffmpeg/samples/pom.xml +++ b/ffmpeg/samples/pom.xml @@ -12,14 +12,14 @@ org.bytedeco ffmpeg-platform - 6.1-1.5.10-SNAPSHOT + 6.1.1-1.5.10-SNAPSHOT org.bytedeco ffmpeg-platform-gpl - 6.1-1.5.10-SNAPSHOT + 6.1.1-1.5.10-SNAPSHOT diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/global/avutil.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/global/avutil.java index 974292ecc35..eb638eec869 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/global/avutil.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/global/avutil.java @@ -7511,7 +7511,7 @@ allocated with av_malloc() or another memory allocation function. */ /* Automatically generated by version.sh, do not manually edit! */ // #ifndef AVUTIL_FFVERSION_H // #define AVUTIL_FFVERSION_H -public static final String FFMPEG_VERSION = "6.1"; +public static final String FFMPEG_VERSION = "6.1.1"; // #endif /* AVUTIL_FFVERSION_H */ diff --git a/gsl/platform/pom.xml b/gsl/platform/pom.xml index 8a44c740de7..ccd1dd2755f 100644 --- a/gsl/platform/pom.xml +++ b/gsl/platform/pom.xml @@ -23,7 +23,7 @@ org.bytedeco openblas-platform - 0.3.25-${project.parent.version} + 0.3.26-${project.parent.version} ${project.groupId} diff --git a/gsl/pom.xml b/gsl/pom.xml index 6ce2c12f16a..4c14267e6a5 100644 --- a/gsl/pom.xml +++ b/gsl/pom.xml @@ -18,7 +18,7 @@ org.bytedeco openblas - 0.3.25-${project.parent.version} + 0.3.26-${project.parent.version} org.bytedeco @@ -44,12 +44,12 @@ org.bytedeco openblas - 0.3.25-${project.parent.version} + 0.3.26-${project.parent.version} org.bytedeco openblas - 0.3.25-${project.parent.version} + 0.3.26-${project.parent.version} ${javacpp.platform} diff --git a/leptonica/README.md b/leptonica/README.md index 2cde511d443..a6f4d03fad8 100644 --- a/leptonica/README.md +++ b/leptonica/README.md @@ -9,7 +9,7 @@ Introduction ------------ This directory contains the JavaCPP Presets module for: - * Leptonica 1.84.0 http://www.leptonica.org/ + * Leptonica 1.84.1 http://www.leptonica.org/ Please refer to the parent README.md file for more detailed information about the JavaCPP Presets. @@ -46,7 +46,7 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic org.bytedeco leptonica-platform - 1.84.0-1.5.10-SNAPSHOT + 1.84.1-1.5.10-SNAPSHOT diff --git a/leptonica/cppbuild.sh b/leptonica/cppbuild.sh index 6405e1e0707..00df507d7a1 100755 --- a/leptonica/cppbuild.sh +++ b/leptonica/cppbuild.sh @@ -15,7 +15,7 @@ LIBPNG=libpng-1.6.40 # warning: libpng16 doesn't work on CentOS 6 for some reaso LIBTIFF=tiff-4.6.0 LIBWEBP=libwebp-1.3.2 OPENJPEG_VERSION=2.5.0 -LEPTONICA_VERSION=1.84.0 +LEPTONICA_VERSION=1.84.1 download https://download.videolan.org/contrib/nasm/nasm-$NASM_VERSION.tar.gz nasm-$NASM_VERSION.tar.gz download http://zlib.net/$ZLIB.tar.gz $ZLIB.tar.gz download http://downloads.sourceforge.net/project/giflib/$GIFLIB.tar.gz $GIFLIB.tar.gz diff --git a/leptonica/platform/pom.xml b/leptonica/platform/pom.xml index 4854a3553c0..7c9ac5c4b62 100644 --- a/leptonica/platform/pom.xml +++ b/leptonica/platform/pom.xml @@ -12,7 +12,7 @@ org.bytedeco leptonica-platform - 1.84.0-${project.parent.version} + 1.84.1-${project.parent.version} JavaCPP Presets Platform for Leptonica diff --git a/leptonica/pom.xml b/leptonica/pom.xml index 39b5f79c10a..3741857a3cb 100644 --- a/leptonica/pom.xml +++ b/leptonica/pom.xml @@ -11,7 +11,7 @@ org.bytedeco leptonica - 1.84.0-${project.parent.version} + 1.84.1-${project.parent.version} JavaCPP Presets for Leptonica diff --git a/leptonica/samples/pom.xml b/leptonica/samples/pom.xml index 809c9e8200c..27043fe690b 100644 --- a/leptonica/samples/pom.xml +++ b/leptonica/samples/pom.xml @@ -12,7 +12,7 @@ org.bytedeco leptonica-platform - 1.84.0-1.5.10-SNAPSHOT + 1.84.1-1.5.10-SNAPSHOT diff --git a/leptonica/src/gen/java/org/bytedeco/leptonica/global/leptonica.java b/leptonica/src/gen/java/org/bytedeco/leptonica/global/leptonica.java index 89e2db9f95c..0e51f394533 100644 --- a/leptonica/src/gen/java/org/bytedeco/leptonica/global/leptonica.java +++ b/leptonica/src/gen/java/org/bytedeco/leptonica/global/leptonica.java @@ -224,8 +224,8 @@ public class leptonica extends org.bytedeco.leptonica.presets.leptonica { /*-----------------------------------------------------------------------* - * Leptonica supports OpenJPEG 2.0+. If you have a version of openjpeg * - * (HAVE_LIBJP2K == 1) that is >= 2.0, set the path to the openjpeg.h * + * Leptonica supports OpenJPEG 2.1+. If you have a version of openjpeg * + * (HAVE_LIBJP2K == 1) that is >= 2.1, set the path to the openjpeg.h * * header in angle brackets here. * *-----------------------------------------------------------------------*/ // #define LIBJP2K_HEADER @@ -4287,7 +4287,7 @@ public class leptonica extends org.bytedeco.leptonica.presets.leptonica { public static final int LIBLEPT_MAJOR_VERSION = 1; public static final int LIBLEPT_MINOR_VERSION = 84; -public static final int LIBLEPT_PATCH_VERSION = 0; +public static final int LIBLEPT_PATCH_VERSION = 1; // #include "alltypes.h" diff --git a/numpy/README.md b/numpy/README.md index f551915c31d..0df220a2240 100644 --- a/numpy/README.md +++ b/numpy/README.md @@ -9,7 +9,7 @@ Introduction ------------ This directory contains the JavaCPP Presets module for: - * NumPy 1.26.2 http://www.numpy.org/ + * NumPy 1.26.3 http://www.numpy.org/ Please refer to the parent README.md file for more detailed information about the JavaCPP Presets. @@ -48,7 +48,7 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic org.bytedeco numpy-platform - 1.26.2-1.5.10-SNAPSHOT + 1.26.3-1.5.10-SNAPSHOT diff --git a/numpy/cppbuild.sh b/numpy/cppbuild.sh index fc97c897eab..cdfb1943309 100755 --- a/numpy/cppbuild.sh +++ b/numpy/cppbuild.sh @@ -7,7 +7,7 @@ if [[ -z "$PLATFORM" ]]; then exit fi -NUMPY_VERSION=1.26.2 +NUMPY_VERSION=1.26.3 download https://github.com/numpy/numpy/releases/download/v$NUMPY_VERSION/numpy-$NUMPY_VERSION.tar.gz numpy-$NUMPY_VERSION.tar.gz mkdir -p $PLATFORM diff --git a/numpy/platform/pom.xml b/numpy/platform/pom.xml index c3cff205f59..3df444464b9 100644 --- a/numpy/platform/pom.xml +++ b/numpy/platform/pom.xml @@ -12,7 +12,7 @@ org.bytedeco numpy-platform - 1.26.2-${project.parent.version} + 1.26.3-${project.parent.version} JavaCPP Presets Platform for NumPy @@ -23,7 +23,7 @@ org.bytedeco openblas-platform - 0.3.25-${project.parent.version} + 0.3.26-${project.parent.version} org.bytedeco diff --git a/numpy/pom.xml b/numpy/pom.xml index f32ad7a3586..44f72da6d60 100644 --- a/numpy/pom.xml +++ b/numpy/pom.xml @@ -11,14 +11,14 @@ org.bytedeco numpy - 1.26.2-${project.parent.version} + 1.26.3-${project.parent.version} JavaCPP Presets for NumPy org.bytedeco openblas - 0.3.25-${project.parent.version} + 0.3.26-${project.parent.version} org.bytedeco @@ -46,7 +46,7 @@ org.bytedeco openblas - 0.3.25-${project.parent.version} + 0.3.26-${project.parent.version} org.bytedeco @@ -56,7 +56,7 @@ org.bytedeco openblas - 0.3.25-${project.parent.version} + 0.3.26-${project.parent.version} ${javacpp.platform} diff --git a/numpy/samples/pom.xml b/numpy/samples/pom.xml index bc447c25664..d907f30df82 100644 --- a/numpy/samples/pom.xml +++ b/numpy/samples/pom.xml @@ -12,7 +12,7 @@ org.bytedeco numpy-platform - 1.26.2-1.5.10-SNAPSHOT + 1.26.3-1.5.10-SNAPSHOT diff --git a/onnx/src/gen/java/org/bytedeco/onnx/global/onnx.java b/onnx/src/gen/java/org/bytedeco/onnx/global/onnx.java index dddff9b39f1..05856af798a 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/global/onnx.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/global/onnx.java @@ -6564,9 +6564,12 @@ public class onnx extends org.bytedeco.onnx.presets.onnx { @Namespace("onnx") public static native @Cast("bool") @Name("ParseProtoFromBytes") boolean ParseProtoFromBytes(MessageLite proto, @Cast("const char*") BytePointer buffer, @Cast("size_t") long length); @Namespace("onnx") public static native @Cast("bool") @Name("ParseProtoFromBytes") boolean ParseProtoFromBytes(MessageLite proto, String buffer, @Cast("size_t") long length); +@Namespace("onnx") public static native @ByVal @Name("RetrieveValues") FloatVector RetrieveValuesFloat(@Const @ByRef AttributeProto attr); + @Namespace("onnx") public static native @ByVal @Name("RetrieveValues") LongVector RetrieveValuesLong(@Const @ByRef AttributeProto attr); @Namespace("onnx") public static native @ByVal @Name("RetrieveValues") StringVector RetrieveValuesString(@Const @ByRef AttributeProto attr); +@Namespace("onnx") public static native @ByVal LongVector RetrieveValues(@Const @ByRef AttributeProto attr); // namespace ONNX_NAMESPACE diff --git a/onnx/src/main/java/org/bytedeco/onnx/presets/onnx.java b/onnx/src/main/java/org/bytedeco/onnx/presets/onnx.java index 6ed7d7e5844..2a5ed30da4d 100644 --- a/onnx/src/main/java/org/bytedeco/onnx/presets/onnx.java +++ b/onnx/src/main/java/org/bytedeco/onnx/presets/onnx.java @@ -188,6 +188,7 @@ public void map(InfoMap infoMap) { "onnx::shape_inference::checkShapesAndTypes(const onnx::TypeProto_Sequence&, const onnx::TypeProto_Sequence&)", "onnx::shape_inference::mergeShapesAndTypes(const onnx::TypeProto_Sequence&, onnx::TypeProto_Tensor*)").skip()) + .put(new Info("onnx::RetrieveValues").javaNames("RetrieveValuesFloat")) .put(new Info("onnx::RetrieveValues").javaNames("RetrieveValuesLong")) .put(new Info("onnx::RetrieveValues").javaNames("RetrieveValuesString")) .put(new Info("onnx::ParseProtoFromBytes").javaNames("ParseProtoFromBytes")) diff --git a/onnxruntime/cppbuild.sh b/onnxruntime/cppbuild.sh index 741322b4d33..3de39f00b9e 100755 --- a/onnxruntime/cppbuild.sh +++ b/onnxruntime/cppbuild.sh @@ -87,7 +87,7 @@ sedinplace 's/-fvisibility=hidden//g' cmake/CMakeLists.txt cmake/adjust_global_c sedinplace 's:/Yucuda_pch.h /FIcuda_pch.h::g' cmake/onnxruntime_providers.cmake sedinplace 's/${PROJECT_SOURCE_DIR}\/external\/cub//g' cmake/onnxruntime_providers.cmake sedinplace 's/ONNXRUNTIME_PROVIDERS_SHARED)/ONNXRUNTIME_PROVIDERS_SHARED onnxruntime_providers_shared)/g' cmake/onnxruntime_providers.cmake -sedinplace 's/DNNL_TAG v.*)/DNNL_TAG v3.3.3)/g' cmake/external/dnnl.cmake +sedinplace 's/DNNL_TAG v.*)/DNNL_TAG v3.3.4)/g' cmake/external/dnnl.cmake sedinplace 's/DNNL_SHARED_LIB libdnnl.1.dylib/DNNL_SHARED_LIB libdnnl.2.dylib/g' cmake/external/dnnl.cmake sedinplace 's/DNNL_SHARED_LIB libdnnl.so.1/DNNL_SHARED_LIB libdnnl.so.2/g' cmake/external/dnnl.cmake sedinplace 's/ CMAKE_ARGS/CMAKE_ARGS -DMKLDNN_BUILD_EXAMPLES=OFF -DMKLDNN_BUILD_TESTS=OFF -DDNNL_CPU_RUNTIME=SEQ/g' cmake/external/dnnl.cmake diff --git a/onnxruntime/platform/gpu/pom.xml b/onnxruntime/platform/gpu/pom.xml index 452e38d77c0..27ccad38303 100644 --- a/onnxruntime/platform/gpu/pom.xml +++ b/onnxruntime/platform/gpu/pom.xml @@ -24,7 +24,7 @@ org.bytedeco dnnl-platform - 3.3.3-${project.parent.version} + 3.3.4-${project.parent.version} ${project.groupId} diff --git a/onnxruntime/platform/pom.xml b/onnxruntime/platform/pom.xml index ebb66ff014c..c23cd9d9822 100644 --- a/onnxruntime/platform/pom.xml +++ b/onnxruntime/platform/pom.xml @@ -23,7 +23,7 @@ org.bytedeco dnnl-platform - 3.3.3-${project.parent.version} + 3.3.4-${project.parent.version} ${project.groupId} diff --git a/onnxruntime/pom.xml b/onnxruntime/pom.xml index bea787ac897..3073004e51c 100644 --- a/onnxruntime/pom.xml +++ b/onnxruntime/pom.xml @@ -22,7 +22,7 @@ org.bytedeco dnnl - 3.3.3-${project.parent.version} + 3.3.4-${project.parent.version} org.bytedeco @@ -49,7 +49,7 @@ org.bytedeco dnnl-platform - 3.3.3-${project.parent.version} + 3.3.4-${project.parent.version} diff --git a/openblas/README.md b/openblas/README.md index 1ee0dd78abd..d03d59d6719 100644 --- a/openblas/README.md +++ b/openblas/README.md @@ -9,7 +9,7 @@ Introduction ------------ This directory contains the JavaCPP Presets module for: - * OpenBLAS 0.3.25 http://www.openblas.net/ + * OpenBLAS 0.3.26 http://www.openblas.net/ Please refer to the parent README.md file for more detailed information about the JavaCPP Presets. @@ -50,7 +50,7 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic org.bytedeco openblas-platform - 0.3.25-1.5.10-SNAPSHOT + 0.3.26-1.5.10-SNAPSHOT diff --git a/openblas/cppbuild.sh b/openblas/cppbuild.sh index 3901762e28e..39329507ca5 100755 --- a/openblas/cppbuild.sh +++ b/openblas/cppbuild.sh @@ -7,7 +7,7 @@ if [[ -z "$PLATFORM" ]]; then exit fi -OPENBLAS_VERSION=0.3.25 +OPENBLAS_VERSION=0.3.26 download https://github.com/xianyi/OpenBLAS/archive/v$OPENBLAS_VERSION.tar.gz OpenBLAS-$OPENBLAS_VERSION.tar.gz diff --git a/openblas/platform/pom.xml b/openblas/platform/pom.xml index 9c67c16e652..46c980cbd06 100644 --- a/openblas/platform/pom.xml +++ b/openblas/platform/pom.xml @@ -12,7 +12,7 @@ org.bytedeco openblas-platform - 0.3.25-${project.parent.version} + 0.3.26-${project.parent.version} JavaCPP Presets Platform for OpenBLAS diff --git a/openblas/pom.xml b/openblas/pom.xml index 24b1e79b9c7..6b474e14503 100644 --- a/openblas/pom.xml +++ b/openblas/pom.xml @@ -11,7 +11,7 @@ org.bytedeco openblas - 0.3.25-${project.parent.version} + 0.3.26-${project.parent.version} JavaCPP Presets for OpenBLAS diff --git a/openblas/samples/pom.xml b/openblas/samples/pom.xml index f1fa2cdc401..5d5fddad2e8 100644 --- a/openblas/samples/pom.xml +++ b/openblas/samples/pom.xml @@ -12,7 +12,7 @@ org.bytedeco openblas-platform - 0.3.25-1.5.10-SNAPSHOT + 0.3.26-1.5.10-SNAPSHOT diff --git a/openblas/src/gen/java/org/bytedeco/openblas/global/openblas.java b/openblas/src/gen/java/org/bytedeco/openblas/global/openblas.java index 24f91cb3bf3..c75f190eccd 100644 --- a/openblas/src/gen/java/org/bytedeco/openblas/global/openblas.java +++ b/openblas/src/gen/java/org/bytedeco/openblas/global/openblas.java @@ -46,7 +46,7 @@ public class openblas extends org.bytedeco.openblas.presets.openblas { public static final int OPENBLAS_CLOCAL_BUFFER_SIZE = 65536; public static final int OPENBLAS_ZLOCAL_BUFFER_SIZE = 32768; public static final int OPENBLAS_GEMM_MULTITHREAD_THRESHOLD = 4; -public static final String OPENBLAS_VERSION = " OpenBLAS 0.3.25 "; +public static final String OPENBLAS_VERSION = " OpenBLAS 0.3.26 "; /*This is only for "make install" target.*/ // #if defined(OPENBLAS_OS_WINNT) || defined(OPENBLAS_OS_CYGWIN_NT) || defined(OPENBLAS_OS_INTERIX) diff --git a/openblas/src/gen/java/org/bytedeco/openblas/global/openblas_nolapack.java b/openblas/src/gen/java/org/bytedeco/openblas/global/openblas_nolapack.java index 97f1222c108..b30e5e4710c 100644 --- a/openblas/src/gen/java/org/bytedeco/openblas/global/openblas_nolapack.java +++ b/openblas/src/gen/java/org/bytedeco/openblas/global/openblas_nolapack.java @@ -45,7 +45,7 @@ public class openblas_nolapack extends org.bytedeco.openblas.presets.openblas_no public static final int OPENBLAS_CLOCAL_BUFFER_SIZE = 65536; public static final int OPENBLAS_ZLOCAL_BUFFER_SIZE = 32768; public static final int OPENBLAS_GEMM_MULTITHREAD_THRESHOLD = 4; -public static final String OPENBLAS_VERSION = " OpenBLAS 0.3.25 "; +public static final String OPENBLAS_VERSION = " OpenBLAS 0.3.26 "; /*This is only for "make install" target.*/ // #if defined(OPENBLAS_OS_WINNT) || defined(OPENBLAS_OS_CYGWIN_NT) || defined(OPENBLAS_OS_INTERIX) diff --git a/opencv/README.md b/opencv/README.md index 18c555f023b..f957a24918c 100644 --- a/opencv/README.md +++ b/opencv/README.md @@ -77,7 +77,7 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic org.bytedeco numpy-platform - 1.26.2-1.5.10-SNAPSHOT + 1.26.3-1.5.10-SNAPSHOT diff --git a/opencv/platform/gpu/pom.xml b/opencv/platform/gpu/pom.xml index 9796930ea25..30228897c0b 100644 --- a/opencv/platform/gpu/pom.xml +++ b/opencv/platform/gpu/pom.xml @@ -24,7 +24,7 @@ org.bytedeco openblas-platform - 0.3.25-${project.parent.version} + 0.3.26-${project.parent.version} ${project.groupId} diff --git a/opencv/platform/pom.xml b/opencv/platform/pom.xml index f74cb9c0f23..5ca0418440a 100644 --- a/opencv/platform/pom.xml +++ b/opencv/platform/pom.xml @@ -23,7 +23,7 @@ org.bytedeco openblas-platform - 0.3.25-${project.parent.version} + 0.3.26-${project.parent.version} ${project.groupId} diff --git a/opencv/pom.xml b/opencv/pom.xml index 5c16539f9bf..cd961df2d66 100644 --- a/opencv/pom.xml +++ b/opencv/pom.xml @@ -18,12 +18,12 @@ org.bytedeco openblas - 0.3.25-${project.parent.version} + 0.3.26-${project.parent.version} org.bytedeco numpy - 1.26.2-${project.parent.version} + 1.26.3-${project.parent.version} true @@ -62,12 +62,12 @@ org.bytedeco openblas-platform - 0.3.25-${project.parent.version} + 0.3.26-${project.parent.version} org.bytedeco numpy-platform - 1.26.2-${project.parent.version} + 1.26.3-${project.parent.version} diff --git a/opencv/samples/pom.xml b/opencv/samples/pom.xml index dd62746c1e7..a537a2d3b5f 100644 --- a/opencv/samples/pom.xml +++ b/opencv/samples/pom.xml @@ -40,7 +40,7 @@ org.bytedeco numpy-platform - 1.26.2-1.5.10-SNAPSHOT + 1.26.3-1.5.10-SNAPSHOT diff --git a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_core.java b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_core.java index 097da5e8215..353525bbf09 100644 --- a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_core.java +++ b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_core.java @@ -58,6 +58,7 @@ "", "", "", "", "", "", "", "", "", "", "", "", "opencv_adapters.h"}, link = {"opencv_core@.409", "opencv_imgproc@.409"}, + exclude = {"openblas_config.h", "cblas.h", "lapacke_config.h", "lapacke_mangling.h", "lapack.h", "lapacke.h", "lapacke_utils.h"}, resource = {"include", "lib", "sdk", "share", "x86", "x64", "OpenCVConfig.cmake", "OpenCVConfig-version.cmake", "python"}, linkresource = "lib", preload = {"opencv_cudev@.409"}, compiler = "cpp11", define = "SHARED_PTR_NAMESPACE std"), @Platform(value = "android", preload = ""), diff --git a/platform/pom.xml b/platform/pom.xml index c05e8673e99..2af61fcd85b 100644 --- a/platform/pom.xml +++ b/platform/pom.xml @@ -92,7 +92,7 @@ org.bytedeco ffmpeg-platform - 6.1-${project.version} + 6.1.1-${project.version} @@ -182,12 +182,12 @@ org.bytedeco dnnl-platform - 3.3.3-${project.version} + 3.3.4-${project.version} org.bytedeco openblas-platform - 0.3.25-${project.version} + 0.3.26-${project.version} org.bytedeco @@ -217,7 +217,7 @@ org.bytedeco numpy-platform - 1.26.2-${project.version} + 1.26.3-${project.version} org.bytedeco @@ -252,7 +252,7 @@ org.bytedeco leptonica-platform - 1.84.0-${project.version} + 1.84.1-${project.version} org.bytedeco diff --git a/pytorch/platform/gpu/pom.xml b/pytorch/platform/gpu/pom.xml index ddbc71f460e..5f386335369 100644 --- a/pytorch/platform/gpu/pom.xml +++ b/pytorch/platform/gpu/pom.xml @@ -29,12 +29,12 @@ org.bytedeco openblas-platform - 0.3.25-${project.parent.version} + 0.3.26-${project.parent.version} org.bytedeco numpy-platform - 1.26.2-${project.parent.version} + 1.26.3-${project.parent.version} true diff --git a/pytorch/platform/pom.xml b/pytorch/platform/pom.xml index f16b282f403..99c6ba297bc 100644 --- a/pytorch/platform/pom.xml +++ b/pytorch/platform/pom.xml @@ -28,12 +28,12 @@ org.bytedeco openblas-platform - 0.3.25-${project.parent.version} + 0.3.26-${project.parent.version} org.bytedeco numpy-platform - 1.26.2-${project.parent.version} + 1.26.3-${project.parent.version} true diff --git a/pytorch/pom.xml b/pytorch/pom.xml index 74fc1813363..f44d50c0497 100644 --- a/pytorch/pom.xml +++ b/pytorch/pom.xml @@ -22,12 +22,12 @@ org.bytedeco openblas - 0.3.25-${project.parent.version} + 0.3.26-${project.parent.version} org.bytedeco numpy - 1.26.2-${project.parent.version} + 1.26.3-${project.parent.version} true @@ -47,12 +47,12 @@ org.bytedeco openblas-platform - 0.3.25-${project.parent.version} + 0.3.26-${project.parent.version} org.bytedeco numpy-platform - 1.26.2-${project.parent.version} + 1.26.3-${project.parent.version} diff --git a/pytorch/src/main/java/org/bytedeco/pytorch/presets/torch.java b/pytorch/src/main/java/org/bytedeco/pytorch/presets/torch.java index ad6b0e72d1e..e609bea0b9a 100644 --- a/pytorch/src/main/java/org/bytedeco/pytorch/presets/torch.java +++ b/pytorch/src/main/java/org/bytedeco/pytorch/presets/torch.java @@ -72,6 +72,7 @@ "datasets.h", "pytorch_adapters.h" }, + exclude = {"openblas_config.h", "cblas.h", "lapacke_config.h", "lapacke_mangling.h", "lapack.h", "lapacke.h", "lapacke_utils.h"}, link = {"c10", "torch_cpu", "torch"}, preload = {"gomp@.1", "iomp5", "omp", "tbb@.2", "asmjit", "fbgemm"} ), diff --git a/scipy/cppbuild.sh b/scipy/cppbuild.sh index 8bada3ce804..57c7202f503 100755 --- a/scipy/cppbuild.sh +++ b/scipy/cppbuild.sh @@ -115,7 +115,7 @@ if ! $PYTHON_BIN_PATH -m pip install --no-deps --target=$PYTHON_LIB_PATH $TOOLS; 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 --no-deps --target="$CPYTHON_HOST_PATH/lib/python3.12/" crossenv==1.4 numpy==1.26.2 $TOOLS + "$CPYTHON_HOST_PATH/bin/python3.12" -m pip install --no-deps --target="$CPYTHON_HOST_PATH/lib/python3.12/" crossenv==1.4 numpy==1.26.3 $TOOLS "$CPYTHON_HOST_PATH/bin/python3.12" -m crossenv "$PYTHON_BIN_PATH" crossenv cp -a "$NUMPY_PATH/python/numpy" "$CPYTHON_HOST_PATH/lib/python3.12/" # cp -a "$CPYTHON_HOST_PATH/lib/python3.12/include" "$PYTHON_LIB_PATH" diff --git a/scipy/platform/pom.xml b/scipy/platform/pom.xml index ef01ad42177..7636893417e 100644 --- a/scipy/platform/pom.xml +++ b/scipy/platform/pom.xml @@ -23,7 +23,7 @@ org.bytedeco numpy-platform - 1.26.2-${project.parent.version} + 1.26.3-${project.parent.version} ${project.groupId} diff --git a/scipy/pom.xml b/scipy/pom.xml index a54b1d72b86..f17fe76eeda 100644 --- a/scipy/pom.xml +++ b/scipy/pom.xml @@ -18,7 +18,7 @@ org.bytedeco numpy - 1.26.2-${project.parent.version} + 1.26.3-${project.parent.version} org.bytedeco @@ -41,12 +41,12 @@ org.bytedeco numpy - 1.26.2-${project.parent.version} + 1.26.3-${project.parent.version} org.bytedeco openblas - 0.3.25-${project.parent.version} + 0.3.26-${project.parent.version} ${javacpp.platform} @@ -58,7 +58,7 @@ org.bytedeco numpy - 1.26.2-${project.parent.version} + 1.26.3-${project.parent.version} ${javacpp.platform} diff --git a/tesseract/platform/pom.xml b/tesseract/platform/pom.xml index 8003efcc48e..5c821f007ef 100644 --- a/tesseract/platform/pom.xml +++ b/tesseract/platform/pom.xml @@ -23,7 +23,7 @@ org.bytedeco leptonica-platform - 1.84.0-${project.parent.version} + 1.84.1-${project.parent.version} ${project.groupId} diff --git a/tesseract/pom.xml b/tesseract/pom.xml index f0cc477107e..905ceafaad7 100644 --- a/tesseract/pom.xml +++ b/tesseract/pom.xml @@ -18,7 +18,7 @@ org.bytedeco leptonica - 1.84.0-${project.parent.version} + 1.84.1-${project.parent.version} org.bytedeco @@ -41,12 +41,12 @@ org.bytedeco leptonica - 1.84.0-${project.parent.version} + 1.84.1-${project.parent.version} org.bytedeco leptonica - 1.84.0-${project.parent.version} + 1.84.1-${project.parent.version} ${javacpp.platform} diff --git a/tvm/platform/gpu/pom.xml b/tvm/platform/gpu/pom.xml index 4ed6bca45f7..3aeb8af77ae 100644 --- a/tvm/platform/gpu/pom.xml +++ b/tvm/platform/gpu/pom.xml @@ -34,7 +34,7 @@ org.bytedeco openblas-platform - 0.3.25-${project.parent.version} + 0.3.26-${project.parent.version} org.bytedeco diff --git a/tvm/platform/pom.xml b/tvm/platform/pom.xml index 1d72b4efa72..9b93a2086a7 100644 --- a/tvm/platform/pom.xml +++ b/tvm/platform/pom.xml @@ -33,7 +33,7 @@ org.bytedeco openblas-platform - 0.3.25-${project.parent.version} + 0.3.26-${project.parent.version} org.bytedeco diff --git a/tvm/pom.xml b/tvm/pom.xml index 0881af858f9..5979da7685c 100644 --- a/tvm/pom.xml +++ b/tvm/pom.xml @@ -28,7 +28,7 @@ org.bytedeco openblas - 0.3.25-${project.parent.version} + 0.3.26-${project.parent.version} org.bytedeco @@ -66,7 +66,7 @@ org.bytedeco openblas-platform - 0.3.25-${project.parent.version} + 0.3.26-${project.parent.version} org.bytedeco diff --git a/tvm/src/gen/java/org/bytedeco/tvm/global/tvm_runtime.java b/tvm/src/gen/java/org/bytedeco/tvm/global/tvm_runtime.java index 0cc6c866a0c..2d538850152 100644 --- a/tvm/src/gen/java/org/bytedeco/tvm/global/tvm_runtime.java +++ b/tvm/src/gen/java/org/bytedeco/tvm/global/tvm_runtime.java @@ -676,18 +676,12 @@ public class tvm_runtime extends org.bytedeco.tvm.presets.tvm_runtime { // return Name; // } // } -// Targeting ../is_pod.java - - -// Targeting ../is_integral.java - - -// Targeting ../is_floating_point.java - - -// Targeting ../type_name_helper.java +/** \cond Doxygen_Suppress */ +// declare special traits when C++11 is not available +// #if DMLC_USE_CXX11 == 0 +// #endif /** \endcond */ // namespace dmlc // #endif // DMLC_TYPE_TRAITS_H_ @@ -2759,9 +2753,6 @@ public static native int TVMObjectDerivedFrom(@Cast("uint32_t") int child_type_i // #include // #include // #include -// Targeting ../Handler.java - - // namespace serializer // namespace dmlc @@ -3170,9 +3161,8 @@ public static native int TVMObjectDerivedFrom(@Cast("uint32_t") int child_type_i */ // handle case of function. -// Targeting ../Type2Str.java - +// handle case of function ptr. /** * \brief Template class to remove const, pointer and reference of original type. @@ -3191,9 +3181,6 @@ public static native int TVMObjectDerivedFrom(@Cast("uint32_t") int child_type_i -// Targeting ../typed_packed_call_dispatcher.java - - // namespace detail @@ -3230,9 +3217,8 @@ public static native int TVMObjectDerivedFrom(@Cast("uint32_t") int child_type_i -// Targeting ../PackedFuncValueConverter.java - +// specializations of PackedFuncValueConverter diff --git a/tvm/src/main/java/org/bytedeco/tvm/presets/tvm_runtime.java b/tvm/src/main/java/org/bytedeco/tvm/presets/tvm_runtime.java index 1058425014d..0952b820c9d 100644 --- a/tvm/src/main/java/org/bytedeco/tvm/presets/tvm_runtime.java +++ b/tvm/src/main/java/org/bytedeco/tvm/presets/tvm_runtime.java @@ -50,7 +50,8 @@ value = {"linux", "macosx", "windows"}, compiler = "cpp17", define = {"GENERIC_EXCEPTION_CLASS std::exception", "GENERIC_EXCEPTION_TOSTRING what()", "DMLC_USE_LOGGING_LIBRARY "}, - exclude = {"", "", ""}, + exclude = {"", "", "", + "openblas_config.h", "cblas.h", "lapacke_config.h", "lapacke_mangling.h", "lapack.h", "lapacke.h", "lapacke_utils.h"}, include = { "dlpack/dlpack.h", "dmlc/base.h",