* Upgrade presets for Hyperscan 5.4.2, LLVM 16.0.3, OpenCL 3.0.14, T…

…VM 0.12.0

CHANGELOG.md

@@ -21,7 +21,7 @@
  * Map `c10::impl::GenericDict` as returned by `c10::IValue::toGenericDict()` in presets for PyTorch
  * Introduce `linux-armhf` and `linux-x86` builds to presets for TensorFlow Lite ([pull #1268](https://github.com/bytedeco/javacpp-presets/pull/1268))
  * Add presets for LibRaw 0.20.2 ([pull #1211](https://github.com/bytedeco/javacpp-presets/pull/1211))
- * Upgrade presets for OpenCV 4.7.0, FFmpeg 6.0 ([issue bytedeco/javacv#1693](https://github.com/bytedeco/javacv/issues/1693)), HDF5 1.14.0, Hyperscan 5.4.1 ([issue #1308](https://github.com/bytedeco/javacpp-presets/issues/1308)), Spinnaker 3.0.0.118 ([pull #1313](https://github.com/bytedeco/javacpp-presets/pull/1313)), librealsense2 2.53.1 ([pull #1305](https://github.com/bytedeco/javacpp-presets/pull/1305)), MKL 2023.1, DNNL 3.1, OpenBLAS 0.3.23, ARPACK-NG 3.9.0, CPython 3.11.3, NumPy 1.24.2, SciPy 1.10.1, LLVM 16.0.1, Leptonica 1.83.0, Tesseract 5.3.1, CUDA 12.1.1, cuDNN 8.9.0, NCCL 2.17.1, OpenCL 3.0.13, NVIDIA Video Codec SDK 12.0.16, PyTorch 2.0.0, TensorFlow Lite 2.12.0, TensorRT 8.6.0.12, Triton Inference Server 2.32.0, DepthAI 2.21.2, ONNX 1.14.0, ONNX Runtime 1.15.0, TVM 0.11.1, Bullet Physics SDK 3.25, and their dependencies
+ * Upgrade presets for OpenCV 4.7.0, FFmpeg 6.0 ([issue bytedeco/javacv#1693](https://github.com/bytedeco/javacv/issues/1693)), HDF5 1.14.0, Hyperscan 5.4.2 ([issue #1308](https://github.com/bytedeco/javacpp-presets/issues/1308)), Spinnaker 3.0.0.118 ([pull #1313](https://github.com/bytedeco/javacpp-presets/pull/1313)), librealsense2 2.53.1 ([pull #1305](https://github.com/bytedeco/javacpp-presets/pull/1305)), MKL 2023.1, DNNL 3.1, OpenBLAS 0.3.23, ARPACK-NG 3.9.0, CPython 3.11.3, NumPy 1.24.2, SciPy 1.10.1, LLVM 16.0.3, Leptonica 1.83.0, Tesseract 5.3.1, CUDA 12.1.1, cuDNN 8.9.0, NCCL 2.17.1, OpenCL 3.0.14, NVIDIA Video Codec SDK 12.0.16, PyTorch 2.0.0, TensorFlow Lite 2.12.0, TensorRT 8.6.0.12, Triton Inference Server 2.32.0, DepthAI 2.21.2, ONNX 1.14.0, ONNX Runtime 1.15.0, TVM 0.12.0, Bullet Physics SDK 3.25, and their dependencies
 
 ### November 2, 2022 version 1.5.8
  * Fix mapping of `torch::ExpandingArrayWithOptionalElem` in presets for PyTorch ([issue #1250](https://github.com/bytedeco/javacpp-presets/issues/1250))

README.md

@@ -231,7 +231,7 @@ Each child module in turn relies by default on the included [`cppbuild.sh` scrip
  * ONNX 1.14.x  https://github.com/onnx/onnx
  * nGraph 0.26.0  https://github.com/NervanaSystems/ngraph
  * ONNX Runtime 1.15.x  https://github.com/microsoft/onnxruntime
- * TVM 0.11.x  https://github.com/apache/tvm
+ * TVM 0.12.x  https://github.com/apache/tvm
  * Bullet Physics SDK 3.25  https://pybullet.org
  * LiquidFun  http://google.github.io/liquidfun/
  * Qt 5.15.x  https://download.qt.io/archive/qt/

hyperscan/README.md

@@ -9,7 +9,7 @@ Introduction
 ------------
 This directory contains the JavaCPP Presets module for:
 
- * Hyperscan 5.4.1  https://www.hyperscan.io
+ * Hyperscan 5.4.2  https://www.hyperscan.io
 
 Please refer to the parent README.md file for more detailed information about the JavaCPP Presets.
 
@@ -51,7 +51,7 @@ Be aware that flag `-Djavacpp.platform` can be used to specify the target platfo
         <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>hyperscan-platform</artifactId>
-            <version>5.4.1-1.5.9-SNAPSHOT</version>
+            <version>5.4.2-1.5.9-SNAPSHOT</version>
         </dependency>
     </dependencies>
     <build>

hyperscan/cppbuild.sh

@@ -7,7 +7,7 @@ if [[ -z "$PLATFORM" ]]; then
     exit
 fi
 
-HYPERSCAN_VERSION=5.4.1
+HYPERSCAN_VERSION=5.4.2
 BOOST=1_70_0
 download "https://github.com/intel/hyperscan/archive/v$HYPERSCAN_VERSION.tar.gz" hyperscan-$HYPERSCAN_VERSION.tar.gz
 download http://downloads.sourceforge.net/project/boost/boost/${BOOST//_/.}/boost_$BOOST.tar.gz boost_$BOOST.tar.gz

hyperscan/platform/pom.xml

@@ -11,7 +11,7 @@
   </parent>
 
   <artifactId>hyperscan-platform</artifactId>
-  <version>5.4.1-${project.parent.version}</version>
+  <version>5.4.2-${project.parent.version}</version>
   <name>JavaCPP Presets Platform for hyperscan</name>
 
   <properties>

hyperscan/pom.xml

@@ -10,7 +10,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <artifactId>hyperscan</artifactId>
-  <version>5.4.1-${project.parent.version}</version>
+  <version>5.4.2-${project.parent.version}</version>
   <name>JavaCPP Presets for Hyperscan</name>
 
   <dependencies>

hyperscan/samples/pom.xml

@@ -12,7 +12,7 @@
         <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>hyperscan-platform</artifactId>
-            <version>5.4.1-1.5.9-SNAPSHOT</version>
+            <version>5.4.2-1.5.9-SNAPSHOT</version>
         </dependency>
     </dependencies>
     <build>

hyperscan/src/gen/java/org/bytedeco/hyperscan/global/hyperscan.java

@@ -2382,7 +2382,7 @@ public class hyperscan extends org.bytedeco.hyperscan.presets.hyperscan {
 
 public static final int HS_MAJOR =      5;
 public static final int HS_MINOR =      4;
-public static final int HS_PATCH =      1;
+public static final int HS_PATCH =      2;
 
 // #include "hs_compile.h"
 // #include "hs_runtime.h"

llvm/README.md

@@ -9,7 +9,7 @@ Introduction
 ------------
 This directory contains the JavaCPP Presets module for:
 
- * LLVM 16.0.1  http://llvm.org/
+ * LLVM 16.0.3  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>16.0.1-1.5.9-SNAPSHOT</version>
+            <version>16.0.3-1.5.9-SNAPSHOT</version>
         </dependency>
     </dependencies>
     <build>

llvm/cppbuild.sh

@@ -7,7 +7,7 @@ if [[ -z "$PLATFORM" ]]; then
     exit
 fi
 
-LLVM_VERSION=16.0.1
+LLVM_VERSION=16.0.3
 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.1-${project.parent.version}</version>
+  <version>16.0.3-${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.1-${project.parent.version}</version>
+  <version>16.0.3-${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.1-1.5.9-SNAPSHOT</version>
+            <version>16.0.3-1.5.9-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.1-1.5.9-SNAPSHOT</version>
+            <version>16.0.3-1.5.9-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.1-1.5.9-SNAPSHOT</version>
+            <version>16.0.3-1.5.9-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.bytedeco</groupId>

opencl/README.md

@@ -9,7 +9,7 @@ Introduction
 ------------
 This directory contains the JavaCPP Presets module for:
 
- * OpenCL 3.0.13  https://www.khronos.org/registry/OpenCL/
+ * OpenCL 3.0.14  https://www.khronos.org/registry/OpenCL/
 
 Please refer to the parent README.md file for more detailed information about the JavaCPP Presets.
 

opencl/cppbuild.sh

@@ -7,8 +7,8 @@ if [[ -z "$PLATFORM" ]]; then
     exit
 fi
 
-OPENCL_VERSION=2023.02.06
-CLHPP_VERSION=2023.02.06
+OPENCL_VERSION=2023.04.17
+CLHPP_VERSION=2023.04.17
 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

opencl/src/gen/java/org/bytedeco/opencl/global/OpenCL.java

@@ -1541,6 +1541,13 @@ public class OpenCL extends org.bytedeco.opencl.presets.OpenCL {
 
 /********************************************************************************************************/
 
+/* CL_NO_PROTOTYPES implies CL_NO_CORE_PROTOTYPES: */
+// #if defined(CL_NO_PROTOTYPES) && !defined(CL_NO_CORE_PROTOTYPES)
+// #define CL_NO_CORE_PROTOTYPES
+// #endif
+
+// #if !defined(CL_NO_CORE_PROTOTYPES)
+
 /* Platform API */
 public static native @Cast("cl_int") int clGetPlatformIDs(@Cast("cl_uint") int num_entries,
                  @Cast("cl_platform_id*") PointerPointer platforms,
@@ -3271,6 +3278,8 @@ public static native Pointer clGetExtensionFunctionAddressForPlatform(_cl_platfo
               @Cast("const cl_event*") @ByPtrPtr _cl_event event_wait_list,
               @ByPtrPtr _cl_event event);
 
+// #endif /* !defined(CL_NO_CORE_PROTOTYPES) */
+
 // #ifdef __cplusplus
 // #endif
 

platform/pom.xml

@@ -161,7 +161,7 @@
     <dependency>
       <groupId>org.bytedeco</groupId>
       <artifactId>hyperscan-platform</artifactId>
-      <version>5.4.1-${project.version}</version>
+      <version>5.4.2-${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.bytedeco</groupId>
@@ -231,7 +231,7 @@
     <dependency>
       <groupId>org.bytedeco</groupId>
       <artifactId>llvm-platform</artifactId>
-      <version>16.0.1-${project.version}</version>
+      <version>16.0.3-${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.bytedeco</groupId>
@@ -341,7 +341,7 @@
     <dependency>
       <groupId>org.bytedeco</groupId>
       <artifactId>tvm-platform</artifactId>
-      <version>0.11.1-${project.version}</version>
+      <version>0.12.0-${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.bytedeco</groupId>

tvm/README.md

@@ -9,7 +9,7 @@ Introduction
 ------------
 This directory contains the JavaCPP Presets module for:
 
- * TVM 0.11.1  http://tvm.apache.org/
+ * TVM 0.12.0  http://tvm.apache.org/
 
 Please refer to the parent README.md file for more detailed information about the JavaCPP Presets.
 
@@ -49,14 +49,14 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic
         <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>tvm-platform</artifactId>
-            <version>0.11.1-1.5.9-SNAPSHOT</version>
+            <version>0.12.0-1.5.9-SNAPSHOT</version>
         </dependency>
 
         <!-- Additional dependencies required to use CUDA and cuDNN -->
         <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>tvm-platform-gpu</artifactId>
-            <version>0.11.1-1.5.9-SNAPSHOT</version>
+            <version>0.12.0-1.5.9-SNAPSHOT</version>
         </dependency>
 
         <!-- Additional dependencies to use bundled CUDA and cuDNN -->

tvm/cppbuild.sh

@@ -12,7 +12,7 @@ if [[ "$EXTENSION" == *gpu ]]; then
     GPU_FLAGS="-DUSE_CUDA=ON -DUSE_CUDNN=ON -DUSE_CUBLAS=ON"
 fi
 
-TVM_VERSION=0.11.1
+TVM_VERSION=0.12.0
 
 mkdir -p "$PLATFORM$EXTENSION"
 cd "$PLATFORM$EXTENSION"
@@ -83,7 +83,7 @@ sedinplace '/                "tornado",/a\
 sedinplace 's/uint32_t _type_child_slots_can_overflow/bool _type_child_slots_can_overflow/g' include/tvm/runtime/ndarray.h
 sedinplace 's/bias\[OC\]/bias\[256\]/g' src/runtime/contrib/dnnl/dnnl_json_runtime.cc
 sedinplace 's/llvm::None/std::nullopt/g' src/target/llvm/codegen_llvm.cc
-sedinplace 's/-Werror//g' src/runtime/crt/Makefile
+#sedinplace 's/-Werror//g' src/runtime/crt/Makefile
 sedinplace '/numpy/d' python/setup.py
 sedinplace '/scipy/d' python/setup.py
 sedinplace '/candidate_path/d' python/setup.py

tvm/platform/gpu/pom.xml

@@ -12,7 +12,7 @@
 
   <groupId>org.bytedeco</groupId>
   <artifactId>tvm-platform-gpu</artifactId>
-  <version>0.11.1-${project.parent.version}</version>
+  <version>0.12.0-${project.parent.version}</version>
   <name>JavaCPP Presets Platform GPU for TVM</name>
 
   <properties>
@@ -24,12 +24,12 @@
     <dependency>
       <groupId>org.bytedeco</groupId>
       <artifactId>dnnl-platform</artifactId>
-      <version>2.7.3-${project.parent.version}</version>
+      <version>2.7.1-1.5.8</version>
     </dependency>
     <dependency>
       <groupId>org.bytedeco</groupId>
       <artifactId>llvm-platform</artifactId>
-      <version>16.0.1-${project.parent.version}</version>
+      <version>16.0.3-${project.parent.version}</version>
     </dependency>
     <dependency>
       <groupId>org.bytedeco</groupId>

tvm/platform/pom.xml

@@ -12,7 +12,7 @@
 
   <groupId>org.bytedeco</groupId>
   <artifactId>tvm-platform</artifactId>
-  <version>0.11.1-${project.parent.version}</version>
+  <version>0.12.0-${project.parent.version}</version>
   <name>JavaCPP Presets Platform for TVM</name>
 
   <properties>
@@ -23,12 +23,12 @@
     <dependency>
       <groupId>org.bytedeco</groupId>
       <artifactId>dnnl-platform</artifactId>
-      <version>2.7.3-${project.parent.version}</version>
+      <version>2.7.1-1.5.8</version>
     </dependency>
     <dependency>
       <groupId>org.bytedeco</groupId>
       <artifactId>llvm-platform</artifactId>
-      <version>16.0.1-${project.parent.version}</version>
+      <version>16.0.3-${project.parent.version}</version>
     </dependency>
     <dependency>
       <groupId>org.bytedeco</groupId>

tvm/pom.xml

@@ -11,19 +11,19 @@
 
   <groupId>org.bytedeco</groupId>
   <artifactId>tvm</artifactId>
-  <version>0.11.1-${project.parent.version}</version>
+  <version>0.12.0-${project.parent.version}</version>
   <name>JavaCPP Presets for TVM</name>
 
   <dependencies>
     <dependency>
       <groupId>org.bytedeco</groupId>
       <artifactId>dnnl</artifactId>
-      <version>2.7.3-${project.parent.version}</version>
+      <version>2.7.1-1.5.8</version>
     </dependency>
     <dependency>
       <groupId>org.bytedeco</groupId>
       <artifactId>llvm</artifactId>
-      <version>16.0.1-${project.parent.version}</version>
+      <version>16.0.3-${project.parent.version}</version>
     </dependency>
     <dependency>
       <groupId>org.bytedeco</groupId>
@@ -56,12 +56,12 @@
           <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>dnnl-platform</artifactId>
-            <version>2.7.3-${project.parent.version}</version>
+            <version>2.7.1-1.5.8</version>
           </dependency>
           <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>llvm-platform</artifactId>
-            <version>16.0.1-${project.parent.version}</version>
+            <version>16.0.3-${project.parent.version}</version>
           </dependency>
           <dependency>
             <groupId>org.bytedeco</groupId>

tvm/samples/pom.xml

@@ -12,14 +12,14 @@
         <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>tvm-platform</artifactId>
-            <version>0.11.1-1.5.9-SNAPSHOT</version>
+            <version>0.12.0-1.5.9-SNAPSHOT</version>
         </dependency>
 
         <!-- Additional dependencies required to use CUDA and cuDNN -->
         <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>tvm-platform-gpu</artifactId>
-            <version>0.11.1-1.5.9-SNAPSHOT</version>
+            <version>0.12.0-1.5.9-SNAPSHOT</version>
         </dependency>
 
         <!-- Additional dependencies to use bundled CUDA and cuDNN -->

tvm/src/gen/java/org/bytedeco/tvm/ModuleNode.java

@@ -136,19 +136,13 @@ public class ModuleNode extends TVMObject {
   public native @StdVector Module imports();
 
   /**
-   * \brief Returns true if this module is 'DSO exportable'.
-   *
-   * A DSO exportable module (eg a CSourceModuleNode of type_key 'c') can be incorporated into the
-   * final runtime artifact (ie shared library) by compilation and/or linking using the external
-   * compiler (llvm, nvcc, etc). DSO exportable modules must implement SaveToFile.
-   *
-   * By contrast, non-DSO exportable modules (eg CUDAModuleNode of type_key 'cuda') typically must
-   * be incorporated into the final runtime artifact by being serialized as data into the
-   * artifact, then deserialized at runtime. Non-DSO exportable modules must implement SaveToBinary,
-   * and have a matching deserializer registered as 'runtime.module.loadbinary_<type_key>'.
-   *
-   * The default implementation returns false.
+   * \brief Returns bitmap of property.
+   * By default, none of the property is set. Derived class can override this function and set its
+   * own property.
    */
+  public native int GetPropertyMask();
+
+  /** \brief Returns true if this module is 'DSO exportable'. */
   public native @Cast("bool") boolean IsDSOExportable();
 
   /**