* Upgrade presets for HDF5 1.14.1, DNNL 3.1.1, LLVM 16.0.6, ONNX Run…

…time 1.15.1

.github/actions/deploy-ubuntu/action.yml

@@ -56,6 +56,8 @@ runs:
         echo "ARCH=$ARCH" >> $GITHUB_ENV
         echo "PREFIX=$PREFIX" >> $GITHUB_ENV
 
+        $SUDO dpkg --list
+
         $SUDO apt-get update
         $SUDO apt-get -y install gnupg
         source /etc/os-release
@@ -85,7 +87,7 @@ runs:
         # $SUDO apt-key adv --keyserver keyserver.ubuntu.com --recv-keys EB9B1D8886F44E2A
         # $SUDO apt-key adv --keyserver keyserver.ubuntu.com --recv-keys BA6932366A755776
         $SUDO apt-get update
-        $SUDO apt-get -y install gcc-multilib g++-multilib python3 python2.7 python3-minimal python2.7-minimal rpm libasound2-dev:$ARCH freeglut3-dev:$ARCH libfontconfig-dev:$ARCH libgtk2.0-dev:$ARCH libusb-dev:$ARCH libusb-1.0-0-dev:$ARCH libffi-dev:$ARCH libbz2-dev:$ARCH zlib1g-dev:$ARCH libxcb1-dev:$ARCH
+        $SUDO apt-get -y install gcc-multilib g++-multilib gfortran-multilib python3 python2.7 python3-minimal python2.7-minimal rpm libasound2-dev:$ARCH freeglut3-dev:$ARCH libfontconfig-dev:$ARCH libgtk2.0-dev:$ARCH libusb-dev:$ARCH libusb-1.0-0-dev:$ARCH libffi-dev:$ARCH libbz2-dev:$ARCH zlib1g-dev:$ARCH libxcb1-dev:$ARCH
         $SUDO apt-get -y install pkg-config ccache clang $TOOLCHAIN openjdk-8-jdk ant python2 python3-pip swig git file wget unzip tar bzip2 gzip patch autoconf-archive autogen automake make libtool bison flex perl nasm curl libcurl4-openssl-dev libssl-dev libffi-dev libbz2-dev zlib1g-dev rapidjson-dev
 
         export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64/

CHANGELOG.md

@@ -1,4 +1,6 @@
 
+ * Upgrade presets for DNNL 3.1.1, LLVM 16.0.6, ONNX Runtime 1.15.1, 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))

dnnl/README.md

@@ -9,7 +9,7 @@ Introduction
 ------------
 This directory contains the JavaCPP Presets module for:
 
- * DNNL 3.1  https://01.org/dnnl
+ * DNNL 3.1.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.1/examples/cnn_inference_int8.cpp
+ * https://github.com/oneapi-src/oneDNN/blob/v3.1.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
@@ -38,15 +38,15 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.bytedeco.dnnl</groupId>
     <artifactId>samples</artifactId>
-    <version>1.5.9</version>
+    <version>1.5.10-SNAPSHOT</version>
     <properties>
         <exec.mainClass>CpuCnnInferenceInt8</exec.mainClass>
     </properties>
     <dependencies>
         <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>dnnl-platform</artifactId>
-            <version>3.1-1.5.9</version>
+            <version>3.1.1-1.5.10-SNAPSHOT</version>
         </dependency>
     </dependencies>
     <build>

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.1
+MKLDNN_VERSION=3.1.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
 

dnnl/platform/pom.xml

@@ -12,7 +12,7 @@
 
   <groupId>org.bytedeco</groupId>
   <artifactId>dnnl-platform</artifactId>
-  <version>3.1-${project.parent.version}</version>
+  <version>3.1.1-${project.parent.version}</version>
   <name>JavaCPP Presets Platform for DNNL</name>
 
   <properties>

dnnl/pom.xml

@@ -11,7 +11,7 @@
 
   <groupId>org.bytedeco</groupId>
   <artifactId>dnnl</artifactId>
-  <version>3.1-${project.parent.version}</version>
+  <version>3.1.1-${project.parent.version}</version>
   <name>JavaCPP Presets for DNNL</name>
 
   <dependencies>

dnnl/samples/pom.xml

@@ -12,7 +12,7 @@
         <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>dnnl-platform</artifactId>
-            <version>3.1-1.5.10-SNAPSHOT</version>
+            <version>3.1.1-1.5.10-SNAPSHOT</version>
         </dependency>
     </dependencies>
     <build>

hdf5/README.md

@@ -40,15 +40,15 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.bytedeco.hdf5</groupId>
     <artifactId>H5tutrCmprss</artifactId>
-    <version>1.5.9</version>
+    <version>1.5.10-SNAPSHOT</version>
     <properties>
         <exec.mainClass>H5tutrCmprss</exec.mainClass>
     </properties>
     <dependencies>
         <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>hdf5-platform</artifactId>
-            <version>1.14.1-1.5.9</version>
+            <version>1.14.1-1.5.10-SNAPSHOT</version>
         </dependency>
     </dependencies>
     <build>

hdf5/platform/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.bytedeco</groupId>
     <artifactId>javacpp-presets</artifactId>
-    <version>1.5.9</version>
+    <version>1.5.10-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 

hdf5/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.bytedeco</groupId>
     <artifactId>javacpp-presets</artifactId>
-    <version>1.5.9</version>
+    <version>1.5.10-SNAPSHOT</version>
   </parent>
 
   <groupId>org.bytedeco</groupId>

hdf5/samples/pom.xml

@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.bytedeco.hdf5</groupId>
     <artifactId>H5tutrCmprss</artifactId>
-    <version>1.5.9</version>
+    <version>1.5.10-SNAPSHOT</version>
     <properties>
         <exec.mainClass>H5tutrCmprss</exec.mainClass>
         <maven.compiler.source>1.7</maven.compiler.source>
@@ -12,7 +12,7 @@
         <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>hdf5-platform</artifactId>
-            <version>1.14.1-1.5.9</version>
+            <version>1.14.1-1.5.10-SNAPSHOT</version>
         </dependency>
     </dependencies>
     <build>

llvm/README.md

@@ -9,7 +9,7 @@ Introduction
 ------------
 This directory contains the JavaCPP Presets module for:
 
- * LLVM 16.0.4  http://llvm.org/
+ * LLVM 16.0.6  http://llvm.org/
 
 Please refer to the parent README.md file for more detailed information about the JavaCPP Presets.
 
@@ -42,15 +42,15 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.bytedeco.llvm</groupId>
     <artifactId>Factorial</artifactId>
-    <version>1.5.9</version>
+    <version>1.5.10-SNAPSHOT</version>
     <properties>
         <exec.mainClass>Factorial</exec.mainClass>
     </properties>
     <dependencies>
         <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>llvm-platform</artifactId>
-            <version>16.0.4-1.5.9</version>
+            <version>16.0.6-1.5.10-SNAPSHOT</version>
         </dependency>
     </dependencies>
     <build>

llvm/cppbuild.sh

@@ -7,7 +7,7 @@ if [[ -z "$PLATFORM" ]]; then
     exit
 fi
 
-LLVM_VERSION=16.0.4
+LLVM_VERSION=16.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

llvm/platform/pom.xml

@@ -12,7 +12,7 @@
 
   <groupId>org.bytedeco</groupId>
   <artifactId>llvm-platform</artifactId>
-  <version>16.0.4-${project.parent.version}</version>
+  <version>16.0.6-${project.parent.version}</version>
   <name>JavaCPP Presets Platform for LLVM</name>
 
   <properties>

llvm/pom.xml

@@ -11,7 +11,7 @@
 
   <groupId>org.bytedeco</groupId>
   <artifactId>llvm</artifactId>
-  <version>16.0.4-${project.parent.version}</version>
+  <version>16.0.6-${project.parent.version}</version>
   <name>JavaCPP Presets for LLVM</name>
 
   <dependencies>

llvm/samples/clang/pom.xml

@@ -12,7 +12,7 @@
         <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>llvm-platform</artifactId>
-            <version>16.0.4-1.5.10-SNAPSHOT</version>
+            <version>16.0.6-1.5.10-SNAPSHOT</version>
         </dependency>
     </dependencies>
     <build>

llvm/samples/llvm/pom.xml

@@ -12,7 +12,7 @@
         <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>llvm-platform</artifactId>
-            <version>16.0.4-1.5.10-SNAPSHOT</version>
+            <version>16.0.6-1.5.10-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.bytedeco</groupId>

llvm/samples/polly/pom.xml

@@ -13,7 +13,7 @@
         <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>llvm-platform</artifactId>
-            <version>16.0.4-1.5.10-SNAPSHOT</version>
+            <version>16.0.6-1.5.10-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.bytedeco</groupId>

onnxruntime/README.md

@@ -9,7 +9,7 @@ Introduction
 ------------
 This directory contains the JavaCPP Presets module for:
 
- * ONNX Runtime 1.15.0  https://microsoft.github.io/onnxruntime/
+ * ONNX Runtime 1.15.1  https://microsoft.github.io/onnxruntime/
 
 Please refer to the parent README.md file for more detailed information about the JavaCPP Presets.
 
@@ -38,29 +38,29 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.bytedeco.onnxruntime</groupId>
     <artifactId>cxxapisample</artifactId>
-    <version>1.5.9</version>
+    <version>1.5.10-SNAPSHOT</version>
     <properties>
         <exec.mainClass>CXXApiSample</exec.mainClass>
     </properties>
     <dependencies>
         <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>onnxruntime-platform</artifactId>
-            <version>1.15.0-1.5.9</version>
+            <version>1.15.1-1.5.10-SNAPSHOT</version>
         </dependency>
 
         <!-- Additional dependencies required to use CUDA and cuDNN -->
         <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>onnxruntime-platform-gpu</artifactId>
-            <version>1.15.0-1.5.9</version>
+            <version>1.15.1-1.5.10-SNAPSHOT</version>
         </dependency>
 
         <!-- Additional dependencies to use bundled CUDA and cuDNN -->
         <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>cuda-platform-redist</artifactId>
-            <version>12.1-8.9-1.5.9</version>
+            <version>12.1-8.9-1.5.10-SNAPSHOT</version>
         </dependency>
 
     </dependencies>

onnxruntime/cppbuild.sh

@@ -21,7 +21,7 @@ if [[ "$EXTENSION" == *gpu ]]; then
     GPU_FLAGS="--use_cuda"
 fi
 
-ONNXRUNTIME=1.15.0
+ONNXRUNTIME=1.15.1
 
 mkdir -p "$PLATFORM$EXTENSION"
 cd "$PLATFORM$EXTENSION"
@@ -86,7 +86,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.1)/g' cmake/external/dnnl.cmake
+sedinplace 's/DNNL_TAG v.*)/DNNL_TAG v3.1.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/g' cmake/external/dnnl.cmake

onnxruntime/platform/gpu/pom.xml

@@ -12,7 +12,7 @@
 
   <groupId>org.bytedeco</groupId>
   <artifactId>onnxruntime-platform-gpu</artifactId>
-  <version>1.15.0-${project.parent.version}</version>
+  <version>1.15.1-${project.parent.version}</version>
   <name>JavaCPP Presets Platform GPU for ONNX Runtime</name>
 
   <properties>
@@ -24,7 +24,7 @@
     <dependency>
       <groupId>org.bytedeco</groupId>
       <artifactId>dnnl-platform</artifactId>
-      <version>3.1-${project.parent.version}</version>
+      <version>3.1.1-${project.parent.version}</version>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>

onnxruntime/platform/pom.xml

@@ -12,7 +12,7 @@
 
   <groupId>org.bytedeco</groupId>
   <artifactId>onnxruntime-platform</artifactId>
-  <version>1.15.0-${project.parent.version}</version>
+  <version>1.15.1-${project.parent.version}</version>
   <name>JavaCPP Presets Platform for ONNX Runtime</name>
 
   <properties>
@@ -23,7 +23,7 @@
     <dependency>
       <groupId>org.bytedeco</groupId>
       <artifactId>dnnl-platform</artifactId>
-      <version>3.1-${project.parent.version}</version>
+      <version>3.1.1-${project.parent.version}</version>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>

onnxruntime/pom.xml

@@ -11,7 +11,7 @@
 
   <groupId>org.bytedeco</groupId>
   <artifactId>onnxruntime</artifactId>
-  <version>1.15.0-${project.parent.version}</version>
+  <version>1.15.1-${project.parent.version}</version>
   <name>JavaCPP Presets for ONNX Runtime</name>
 
   <properties>
@@ -22,7 +22,7 @@
     <dependency>
       <groupId>org.bytedeco</groupId>
       <artifactId>dnnl</artifactId>
-      <version>3.1-${project.parent.version}</version>
+      <version>3.1.1-${project.parent.version}</version>
     </dependency>
     <dependency>
       <groupId>org.bytedeco</groupId>
@@ -49,7 +49,7 @@
           <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>dnnl-platform</artifactId>
-            <version>3.1-${project.parent.version}</version>
+            <version>3.1.1-${project.parent.version}</version>
           </dependency>
         </dependencies>
         <configuration>

onnxruntime/samples/pom.xml

@@ -12,14 +12,14 @@
         <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>onnxruntime-platform</artifactId>
-            <version>1.15.0-1.5.10-SNAPSHOT</version>
+            <version>1.15.1-1.5.10-SNAPSHOT</version>
         </dependency>
 
         <!-- Additional dependencies required to use CUDA and cuDNN -->
         <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>onnxruntime-platform-gpu</artifactId>
-            <version>1.15.0-1.5.10-SNAPSHOT</version>
+            <version>1.15.1-1.5.10-SNAPSHOT</version>
         </dependency>
 
         <!-- Additional dependencies to use bundled CUDA and cuDNN -->

onnxruntime/src/main/java/org/bytedeco/onnxruntime/presets/onnxruntime.java

@@ -64,16 +64,16 @@
 //                "onnxruntime/core/providers/rocm/rocm_provider_factory.h",
 //                "onnxruntime/core/providers/dml/dml_provider_factory.h",
             },
-            link = {"onnxruntime_providers_shared", "onnxruntime@.1.15.0"}
+            link = {"onnxruntime_providers_shared", "onnxruntime@.1.15.1"}
         ),
         @Platform(
             value = {"linux-x86_64", "macosx-x86_64", "windows-x86_64"},
-            link = {"onnxruntime_providers_shared", "onnxruntime@.1.15.0", "onnxruntime_providers_dnnl"}
+            link = {"onnxruntime_providers_shared", "onnxruntime@.1.15.1", "onnxruntime_providers_dnnl"}
         ),
         @Platform(
             value = {"linux-x86_64", "macosx-x86_64", "windows-x86_64"},
             extension = "-gpu",
-            link = {"onnxruntime_providers_shared", "onnxruntime@.1.15.0", "onnxruntime_providers_dnnl", "onnxruntime_providers_cuda"}
+            link = {"onnxruntime_providers_shared", "onnxruntime@.1.15.1", "onnxruntime_providers_dnnl", "onnxruntime_providers_cuda"}
         ),
     },
     target = "org.bytedeco.onnxruntime",