diff --git a/CHANGELOG.md b/CHANGELOG.md index 28b6710b01..1fbb22b856 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,7 +9,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.1, Spinnaker 4.0.0.116 ([pull #1524](https://github.com/bytedeco/javacpp-presets/pull/1524)), MKL 2025.0, DNNL 3.6, OpenBLAS 0.3.28, CMINPACK 1.3.11, GSL 2.8, CPython 3.13.0, NumPy 2.1.2, SciPy 1.14.1, LLVM 19.1.3, LibRaw 0.21.2 ([pull #1520](https://github.com/bytedeco/javacpp-presets/pull/1520)), Leptonica 1.85.0, Tesseract 5.4.1, libffi 3.4.6, CUDA 12.6.2, cuDNN 9.5.1, NCCL 2.23.4, nvCOMP 4.1.0.6, OpenCL 3.0.16, NVIDIA Video Codec SDK 12.2.72, PyTorch 2.5.1 ([pull #1466](https://github.com/bytedeco/javacpp-presets/pull/1466)), SentencePiece 0.2.0, TensorFlow Lite 2.18.0, TensorRT 10.6.0.26, Triton Inference Server 2.51.0, ONNX 1.17.0, ONNX Runtime 1.20.0, TVM 0.18.0, and their dependencies + * Upgrade presets for OpenCV 4.10.0, FFmpeg 7.1, Spinnaker 4.0.0.116 ([pull #1524](https://github.com/bytedeco/javacpp-presets/pull/1524)), MKL 2025.0, DNNL 3.6.1, OpenBLAS 0.3.28, CMINPACK 1.3.11, GSL 2.8, CPython 3.13.0, NumPy 2.1.3, SciPy 1.14.1, LLVM 19.1.3, LibRaw 0.21.2 ([pull #1520](https://github.com/bytedeco/javacpp-presets/pull/1520)), Leptonica 1.85.0, Tesseract 5.4.1, libffi 3.4.6, CUDA 12.6.2, cuDNN 9.5.1, NCCL 2.23.4, nvCOMP 4.1.0.6, OpenCL 3.0.17, NVIDIA Video Codec SDK 12.2.72, PyTorch 2.5.1 ([pull #1466](https://github.com/bytedeco/javacpp-presets/pull/1466)), SentencePiece 0.2.0, TensorFlow Lite 2.18.0, TensorRT 10.6.0.26, Triton Inference Server 2.51.0, ONNX 1.17.0, ONNX Runtime 1.20.0, TVM 0.18.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)) diff --git a/dnnl/README.md b/dnnl/README.md index 29757e0486..107407de4a 100644 --- a/dnnl/README.md +++ b/dnnl/README.md @@ -9,7 +9,7 @@ Introduction ------------ This directory contains the JavaCPP Presets module for: - * DNNL 3.6 https://01.org/dnnl + * DNNL 3.6.1 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.6/examples/cnn_inference_int8.cpp + * https://github.com/oneapi-src/oneDNN/blob/v3.6.1/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.6-1.5.11-SNAPSHOT + 3.6.1-1.5.11-SNAPSHOT diff --git a/dnnl/cppbuild.sh b/dnnl/cppbuild.sh index 879de6c9c1..84e473fbf0 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.6 +MKLDNN_VERSION=3.6.1 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 2c8b94d49f..78bc7c1eb0 100644 --- a/dnnl/platform/pom.xml +++ b/dnnl/platform/pom.xml @@ -12,7 +12,7 @@ org.bytedeco dnnl-platform - 3.6-${project.parent.version} + 3.6.1-${project.parent.version} JavaCPP Presets Platform for DNNL diff --git a/dnnl/pom.xml b/dnnl/pom.xml index 5d974cae28..664a7b0ca6 100644 --- a/dnnl/pom.xml +++ b/dnnl/pom.xml @@ -11,7 +11,7 @@ org.bytedeco dnnl - 3.6-${project.parent.version} + 3.6.1-${project.parent.version} JavaCPP Presets for DNNL diff --git a/dnnl/samples/pom.xml b/dnnl/samples/pom.xml index eb5adc6bcd..8d5c0f8996 100644 --- a/dnnl/samples/pom.xml +++ b/dnnl/samples/pom.xml @@ -12,7 +12,7 @@ org.bytedeco dnnl-platform - 3.6-1.5.11-SNAPSHOT + 3.6.1-1.5.11-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 13fb448eb5..7c7be9e05d 100644 --- a/dnnl/src/gen/java/org/bytedeco/dnnl/global/dnnl.java +++ b/dnnl/src/gen/java/org/bytedeco/dnnl/global/dnnl.java @@ -3704,7 +3704,7 @@ public class dnnl extends org.bytedeco.dnnl.presets.dnnl { public static final int DNNL_VERSION_MINOR = 6; /** Patch version */ -public static final int DNNL_VERSION_PATCH = 0; +public static final int DNNL_VERSION_PATCH = 1; // clang-format on diff --git a/numpy/README.md b/numpy/README.md index ebeb065cfc..e82e381fbd 100644 --- a/numpy/README.md +++ b/numpy/README.md @@ -9,7 +9,7 @@ Introduction ------------ This directory contains the JavaCPP Presets module for: - * NumPy 2.1.2 http://www.numpy.org/ + * NumPy 2.1.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 - 2.1.2-1.5.11-SNAPSHOT + 2.1.3-1.5.11-SNAPSHOT diff --git a/numpy/cppbuild.sh b/numpy/cppbuild.sh index 13b8b56636..796b94f364 100755 --- a/numpy/cppbuild.sh +++ b/numpy/cppbuild.sh @@ -7,7 +7,7 @@ if [[ -z "$PLATFORM" ]]; then exit fi -NUMPY_VERSION=2.1.2 +NUMPY_VERSION=2.1.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 e1079a74ac..eaf0f6ad7f 100644 --- a/numpy/platform/pom.xml +++ b/numpy/platform/pom.xml @@ -12,7 +12,7 @@ org.bytedeco numpy-platform - 2.1.2-${project.parent.version} + 2.1.3-${project.parent.version} JavaCPP Presets Platform for NumPy diff --git a/numpy/pom.xml b/numpy/pom.xml index 25c7719821..a8c8405629 100644 --- a/numpy/pom.xml +++ b/numpy/pom.xml @@ -11,7 +11,7 @@ org.bytedeco numpy - 2.1.2-${project.parent.version} + 2.1.3-${project.parent.version} JavaCPP Presets for NumPy diff --git a/numpy/samples/pom.xml b/numpy/samples/pom.xml index bbc76018ee..4f17c37389 100644 --- a/numpy/samples/pom.xml +++ b/numpy/samples/pom.xml @@ -12,7 +12,7 @@ org.bytedeco numpy-platform - 2.1.2-1.5.11-SNAPSHOT + 2.1.3-1.5.11-SNAPSHOT diff --git a/numpy/src/gen/java/org/bytedeco/numpy/global/numpy.java b/numpy/src/gen/java/org/bytedeco/numpy/global/numpy.java index ddd9e99431..996e904e49 100644 --- a/numpy/src/gen/java/org/bytedeco/numpy/global/numpy.java +++ b/numpy/src/gen/java/org/bytedeco/numpy/global/numpy.java @@ -179,7 +179,14 @@ public class numpy extends org.bytedeco.numpy.presets.numpy { // #error "NPY_TARGET_VERSION higher than NumPy headers!" // #elif NPY_FEATURE_VERSION < NPY_1_15_API_VERSION /* No support for irrelevant old targets, no need for error, but warn. */ -// #warning "Requested NumPy target lower than supported NumPy 1.15." +// #ifndef _MSC_VER +// #warning "Requested NumPy target lower than supported NumPy 1.15." +// #else +// #define _WARN___STR2__(x) #x +// #define _WARN___STR1__(x) _WARN___STR2__(x) +// #define _WARN___LOC__ __FILE__ "(" _WARN___STR1__(__LINE__) ") : Warning Msg: " +// #pragma message(_WARN___LOC__"Requested NumPy target lower than supported NumPy 1.15.") +// #endif // #endif /* diff --git a/numpy/src/main/java/org/bytedeco/numpy/presets/numpy.java b/numpy/src/main/java/org/bytedeco/numpy/presets/numpy.java index ef168caa2f..37efe904a7 100644 --- a/numpy/src/main/java/org/bytedeco/numpy/presets/numpy.java +++ b/numpy/src/main/java/org/bytedeco/numpy/presets/numpy.java @@ -139,7 +139,7 @@ public void map(InfoMap infoMap) { "NPY_FLOAT256", "NPY_COMPLEX512", "NPY_COMPLEX512_FMT", "NPY_SIGJMP_BUF", "_npy_signbit_f", "_npy_signbit_d", "_npy_signbit_ld", "npy_degrees", "npy_degreesf", "npy_degreesl", "npy_radians", "npy_radiansf", "npy_radiansl", - "PyStringScalarObject", /*"PyUnicodeScalarObject",*/ "__COMP_NPY_UNUSED", + "PyStringScalarObject", /*"PyUnicodeScalarObject",*/ "__COMP_NPY_UNUSED", "_WARN___LOC__", "PyArrayScalar_False", "PyArrayScalar_True", "PyArrayScalar_RETURN_FALSE", "PyArrayScalar_RETURN_TRUE", "NPY_NO_EXPORT", "PyArray_malloc", "PyArray_free", "PyArray_realloc", "NPY_BEGIN_THREADS_DEF", "NPY_BEGIN_ALLOW_THREADS", "NPY_END_ALLOW_THREADS", "NPY_BEGIN_THREADS", "NPY_END_THREADS", diff --git a/onnxruntime/cppbuild.sh b/onnxruntime/cppbuild.sh index 778cd4bb91..a68639ca9b 100755 --- a/onnxruntime/cppbuild.sh +++ b/onnxruntime/cppbuild.sh @@ -95,7 +95,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_cuda.cmake cmake/onnxruntime_providers.cmake sedinplace 's/${PROJECT_SOURCE_DIR}\/external\/cub//g' cmake/onnxruntime_providers_cuda.cmake cmake/onnxruntime_providers.cmake sedinplace 's/ONNXRUNTIME_PROVIDERS_SHARED)/ONNXRUNTIME_PROVIDERS_SHARED onnxruntime_providers_shared)/g' cmake/onnxruntime_providers_cpu.cmake cmake/onnxruntime_providers.cmake -sedinplace 's/DNNL_TAG v.*)/DNNL_TAG v3.6)/g' cmake/external/dnnl.cmake +sedinplace 's/DNNL_TAG v.*)/DNNL_TAG v3.6.1)/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 ae582a58d0..93d1826c91 100644 --- a/onnxruntime/platform/gpu/pom.xml +++ b/onnxruntime/platform/gpu/pom.xml @@ -24,7 +24,7 @@ org.bytedeco dnnl-platform - 3.6-${project.parent.version} + 3.6.1-${project.parent.version} ${project.groupId} diff --git a/onnxruntime/platform/pom.xml b/onnxruntime/platform/pom.xml index b5fe2868b4..bef55e5f0c 100644 --- a/onnxruntime/platform/pom.xml +++ b/onnxruntime/platform/pom.xml @@ -23,7 +23,7 @@ org.bytedeco dnnl-platform - 3.6-${project.parent.version} + 3.6.1-${project.parent.version} ${project.groupId} diff --git a/onnxruntime/pom.xml b/onnxruntime/pom.xml index 77e1badcfd..822986076a 100644 --- a/onnxruntime/pom.xml +++ b/onnxruntime/pom.xml @@ -22,7 +22,7 @@ org.bytedeco dnnl - 3.6-${project.parent.version} + 3.6.1.1-${project.parent.version} org.bytedeco @@ -49,7 +49,7 @@ org.bytedeco dnnl-platform - 3.6-${project.parent.version} + 3.6.1.1-${project.parent.version} diff --git a/opencl/README.md b/opencl/README.md index 51251ccc12..a9b352c900 100644 --- a/opencl/README.md +++ b/opencl/README.md @@ -9,7 +9,7 @@ Introduction ------------ This directory contains the JavaCPP Presets module for: - * OpenCL 3.0.16 https://www.khronos.org/registry/OpenCL/ + * OpenCL 3.0.17 https://www.khronos.org/registry/OpenCL/ Please refer to the parent README.md file for more detailed information about the JavaCPP Presets. diff --git a/opencl/cppbuild.sh b/opencl/cppbuild.sh index 1ae079c57b..7639a80ba7 100755 --- a/opencl/cppbuild.sh +++ b/opencl/cppbuild.sh @@ -7,8 +7,8 @@ if [[ -z "$PLATFORM" ]]; then exit fi -OPENCL_VERSION=2024.05.08 -CLHPP_VERSION=2024.05.08 +OPENCL_VERSION=2024.10.24 +CLHPP_VERSION=2024.10.24 download https://github.com/KhronosGroup/OpenCL-Headers/archive/v$OPENCL_VERSION.tar.gz OpenCL-Headers-$OPENCL_VERSION.tar.gz download https://github.com/KhronosGroup/OpenCL-ICD-Loader/archive/v$OPENCL_VERSION.tar.gz OpenCL-ICD-Loader-$OPENCL_VERSION.tar.gz download https://github.com/KhronosGroup/OpenCL-CLHPP/archive/v$CLHPP_VERSION.tar.gz OpenCL-CLHPP-$CLHPP_VERSION.tar.gz diff --git a/opencv/README.md b/opencv/README.md index 6acc688ef5..65db41d315 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 - 2.1.2-1.5.11-SNAPSHOT + 2.1.3-1.5.11-SNAPSHOT diff --git a/opencv/pom.xml b/opencv/pom.xml index 7a3946febc..b7e2f37b49 100644 --- a/opencv/pom.xml +++ b/opencv/pom.xml @@ -23,7 +23,7 @@ org.bytedeco numpy - 2.1.2-${project.parent.version} + 2.1.3-${project.parent.version} true @@ -67,7 +67,7 @@ org.bytedeco numpy-platform - 2.1.2-${project.parent.version} + 2.1.3-${project.parent.version} diff --git a/opencv/samples/pom.xml b/opencv/samples/pom.xml index 66083df6ad..c51421a25c 100644 --- a/opencv/samples/pom.xml +++ b/opencv/samples/pom.xml @@ -40,7 +40,7 @@ org.bytedeco numpy-platform - 2.1.2-1.5.11-SNAPSHOT + 2.1.3-1.5.11-SNAPSHOT diff --git a/platform/pom.xml b/platform/pom.xml index 81cbbf2f0f..fbcebca499 100644 --- a/platform/pom.xml +++ b/platform/pom.xml @@ -182,7 +182,7 @@ org.bytedeco dnnl-platform - 3.6-${project.version} + 3.6.1-${project.version} org.bytedeco @@ -217,7 +217,7 @@ org.bytedeco numpy-platform - 2.1.2-${project.version} + 2.1.3-${project.version} org.bytedeco diff --git a/pytorch/pom.xml b/pytorch/pom.xml index 9a8baf0c92..89bb63b62a 100644 --- a/pytorch/pom.xml +++ b/pytorch/pom.xml @@ -57,7 +57,7 @@ org.bytedeco numpy-platform - 2.1.2-${project.parent.version} + 2.1.3-${project.parent.version} org.bytedeco diff --git a/scipy/cppbuild.sh b/scipy/cppbuild.sh index de81153f9d..fb59d3e53c 100755 --- a/scipy/cppbuild.sh +++ b/scipy/cppbuild.sh @@ -124,7 +124,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.13" export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$CPYTHON_HOST_PATH/lib/:$CPYTHON_HOST_PATH" - "$CPYTHON_HOST_PATH/bin/python3.13" -m pip install --no-deps --target="$CPYTHON_HOST_PATH/lib/python3.13/" crossenv==1.4 numpy==2.1.2 $TOOLS + "$CPYTHON_HOST_PATH/bin/python3.13" -m pip install --no-deps --target="$CPYTHON_HOST_PATH/lib/python3.13/" crossenv==1.4 numpy==2.1.3 $TOOLS "$CPYTHON_HOST_PATH/bin/python3.13" -m crossenv "$PYTHON_BIN_PATH" crossenv cp -a "$NUMPY_PATH/python/numpy" "$CPYTHON_HOST_PATH/lib/python3.13/" # cp -a "$CPYTHON_HOST_PATH/lib/python3.13/include" "$PYTHON_LIB_PATH" diff --git a/scipy/platform/pom.xml b/scipy/platform/pom.xml index 3e3689ba4d..c03fc0f46f 100644 --- a/scipy/platform/pom.xml +++ b/scipy/platform/pom.xml @@ -23,7 +23,7 @@ org.bytedeco numpy-platform - 2.1.2-${project.parent.version} + 2.1.3-${project.parent.version} ${project.groupId} diff --git a/scipy/pom.xml b/scipy/pom.xml index e62252ecea..27f0424376 100644 --- a/scipy/pom.xml +++ b/scipy/pom.xml @@ -18,7 +18,7 @@ org.bytedeco numpy - 2.1.2-${project.parent.version} + 2.1.3-${project.parent.version} org.bytedeco @@ -41,7 +41,7 @@ org.bytedeco numpy - 2.1.2-${project.parent.version} + 2.1.3-${project.parent.version} org.bytedeco @@ -58,7 +58,7 @@ org.bytedeco numpy - 2.1.2-${project.parent.version} + 2.1.3-${project.parent.version} ${javacpp.platform}