* Upgrade presets for OpenBLAS 0.3.25, NumPy 1.26.2, SciPy 1.11.4, L…

…LVM 17.0.6
bytedeco · Dec 3, 2023 · ba756f0 · ba756f0
1 parent 7629ea4
commit ba756f0
Show file tree

Hide file tree

Showing 131 changed files with 268 additions and 213 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -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))

diff --git 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 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

diff --git a/arpack-ng/platform/pom.xml b/arpack-ng/platform/pom.xml
@@ -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>

diff --git a/arpack-ng/pom.xml b/arpack-ng/pom.xml
@@ -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>
@@ -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>

diff --git a/cminpack/platform/pom.xml b/cminpack/platform/pom.xml
@@ -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>

diff --git a/cminpack/pom.xml b/cminpack/pom.xml
@@ -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>
@@ -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>

diff --git a/cpython/cppbuild.sh b/cpython/cppbuild.sh
@@ -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

diff --git a/cpython/src/gen/java/org/bytedeco/cpython/global/python.java b/cpython/src/gen/java/org/bytedeco/cpython/global/python.java
@@ -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))

diff --git a/cpython/src/main/java/org/bytedeco/cpython/presets/python.java b/cpython/src/main/java/org/bytedeco/cpython/presets/python.java
@@ -194,7 +194,7 @@
                 "cpython/fileutils.h",
             },
             link = "[email protected]!",
-            preload = {"[email protected]", "[email protected]", "libcrypto-1_1", "libssl-1_1"/*, "sqlite3", "tcl86t", "tk86t"*/},
+            preload = {"ffi@.8", "[email protected]", "ffi@.6", "[email protected]", "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/"}),

diff --git a/depthai/pom.xml b/depthai/pom.xml
@@ -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>
@@ -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>

diff --git a/gsl/platform/pom.xml b/gsl/platform/pom.xml
@@ -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>

diff --git a/gsl/pom.xml b/gsl/pom.xml
@@ -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>
@@ -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>

diff --git a/llvm/README.md b/llvm/README.md
@@ -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.
 
@@ -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>

diff --git a/llvm/cppbuild.sh b/llvm/cppbuild.sh
@@ -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

diff --git a/llvm/platform/pom.xml b/llvm/platform/pom.xml
@@ -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>

diff --git a/llvm/pom.xml b/llvm/pom.xml
@@ -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>

diff --git a/llvm/samples/clang/pom.xml b/llvm/samples/clang/pom.xml
@@ -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>

diff --git a/llvm/samples/llvm/pom.xml b/llvm/samples/llvm/pom.xml
@@ -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>

diff --git a/llvm/samples/polly/pom.xml b/llvm/samples/polly/pom.xml
@@ -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>

diff --git a/numpy/README.md b/numpy/README.md
@@ -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.
 
@@ -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 -->

diff --git a/numpy/cppbuild.sh b/numpy/cppbuild.sh
@@ -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
@@ -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

diff --git a/numpy/platform/pom.xml b/numpy/platform/pom.xml
@@ -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>
@@ -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>

diff --git a/numpy/pom.xml b/numpy/pom.xml
@@ -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>
@@ -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>
@@ -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>

diff --git a/numpy/samples/pom.xml b/numpy/samples/pom.xml
@@ -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 -->

diff --git a/numpy/src/gen/java/org/bytedeco/numpy/global/numpy.java b/numpy/src/gen/java/org/bytedeco/numpy/global/numpy.java
@@ -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
 

diff --git a/openblas/README.md b/openblas/README.md
@@ -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.
 
@@ -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>