* Upgrade presets for Arrow 6.0.1, SciPy 1.7.3, Tesseract 5.0.0, Dep…

…thAI 2.13.1, ModSecurity 3.0.6
bytedeco · Nov 25, 2021 · 3176206 · 3176206
1 parent e775221
commit 3176206
Show file tree

Hide file tree

Showing 76 changed files with 214 additions and 135 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,7 +7,7 @@
  * Map C++ JIT classes and functions of TorchScript in presets for PyTorch ([issue #1068](https://github.com/bytedeco/javacpp-presets/issues/1068))
  * Synchronize `cachePackage()` and prevent repeated package caching in all presets ([pull #1071](https://github.com/bytedeco/javacpp-presets/pull/1071))
  * Build FFmpeg with VA-API enabled and bundle its libraries to avoid loading issues ([issue bytedeco/javacv#1188](https://github.com/bytedeco/javacv/issues/1188))
- * Upgrade presets for OpenCV 4.5.4, FFmpeg 4.4.1, Arrow 6.0.0, MKL 2021.4, DNNL 2.5, OpenBLAS 0.3.18, FFTW 3.3.10, CPython 3.10.0, NumPy 1.21.4, SciPy 1.7.2, Gym 0.21.0, LLVM 13.0.0, libpostal 1.1, Leptonica 1.82.0, Tesseract 5.0.0, CUDA 11.4.2, cuDNN 8.2.4, NCCL 2.11.4, PyTorch 1.10.0, TensorFlow Lite 2.7.0, ALE 0.7.3, DepthAI 2.12.1, ONNX 1.10.2, ONNX Runtime 1.9.1, TVM 0.8.0, and their dependencies
+ * Upgrade presets for OpenCV 4.5.4, FFmpeg 4.4.1, Arrow 6.0.1, MKL 2021.4, DNNL 2.5, OpenBLAS 0.3.18, FFTW 3.3.10, CPython 3.10.0, NumPy 1.21.4, SciPy 1.7.3, Gym 0.21.0, LLVM 13.0.0, libpostal 1.1, Leptonica 1.82.0, Tesseract 5.0.0, CUDA 11.4.2, cuDNN 8.2.4, NCCL 2.11.4, PyTorch 1.10.0, TensorFlow Lite 2.7.0, ALE 0.7.3, DepthAI 2.13.1, ONNX 1.10.2, ONNX Runtime 1.9.1, TVM 0.8.0, ModSecurity 3.0.6, and their dependencies
 
 ### August 2, 2021 version 1.5.6
  * Change `opencv_core.Mat` constructors to create column vectors out of arrays for consistency ([issue #1064](https://github.com/bytedeco/javacpp-presets/issues/1064))

diff --git a/README.md b/README.md
@@ -219,7 +219,7 @@ Each child module in turn relies by default on the included [`cppbuild.sh` scrip
  * TensorRT 8.x  https://developer.nvidia.com/tensorrt
  * Triton Inference Server 2.14  https://developer.nvidia.com/nvidia-triton-inference-server
  * The Arcade Learning Environment 0.7.x  https://github.com/mgbellemare/Arcade-Learning-Environment
- * DepthAI 2.12.x  https://github.com/luxonis/depthai-core
+ * DepthAI 2.13.x  https://github.com/luxonis/depthai-core
  * ONNX 1.10.x  https://github.com/onnx/onnx
  * nGraph 0.26.0  https://github.com/NervanaSystems/ngraph
  * ONNX Runtime 1.9.x  https://github.com/microsoft/onnxruntime
@@ -228,7 +228,7 @@ Each child module in turn relies by default on the included [`cppbuild.sh` scrip
  * Qt 5.15.x  https://download.qt.io/archive/qt/
  * Mono/Skia 2.80.x  https://github.com/mono/skia
  * cpu_features 0.6.0  https://github.com/google/cpu_features
- * ModSecurity 3.0.5  https://github.com/SpiderLabs/ModSecurity
+ * ModSecurity 3.0.x  https://github.com/SpiderLabs/ModSecurity
  * System APIs of the build environments:
    * Linux (glibc)  https://www.gnu.org/software/libc/
    * Mac OS X (XNU libc)  https://opensource.apple.com/

diff --git a/arrow/README.md b/arrow/README.md
@@ -9,7 +9,7 @@ Introduction
 ------------
 This directory contains the JavaCPP Presets module for:
 
- * Arrow 6.0.0  https://arrow.apache.org/
+ * Arrow 6.0.1  https://arrow.apache.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
         <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>arrow-platform</artifactId>
-            <version>6.0.0-1.5.7-SNAPSHOT</version>
+            <version>6.0.1-1.5.7-SNAPSHOT</version>
         </dependency>
     </dependencies>
     <build>

diff --git a/arrow/cppbuild.sh b/arrow/cppbuild.sh
@@ -16,7 +16,7 @@ LLVM_VERSION=13.0.0
 OPENSSL_VERSION=1.1.1l
 ZLIB_VERSION=1.2.11
 PROTO_VERSION=3.17.3 # cpp/thirdparty/versions.txt
-ARROW_VERSION=6.0.0
+ARROW_VERSION=6.0.1
 download https://github.com/llvm/llvm-project/releases/download/llvmorg-$LLVM_VERSION/llvm-$LLVM_VERSION.src.tar.xz llvm-$LLVM_VERSION.src.tar.xz
 download https://github.com/llvm/llvm-project/releases/download/llvmorg-$LLVM_VERSION/clang-$LLVM_VERSION.src.tar.xz clang-$LLVM_VERSION.src.tar.xz
 download https://github.com/python/cpython-bin-deps/archive/openssl-bin.zip cpython-bin-deps-openssl-bin.zip

diff --git a/arrow/platform/pom.xml b/arrow/platform/pom.xml
@@ -12,7 +12,7 @@
 
   <groupId>org.bytedeco</groupId>
   <artifactId>arrow-platform</artifactId>
-  <version>6.0.0-${project.parent.version}</version>
+  <version>6.0.1-${project.parent.version}</version>
   <name>JavaCPP Presets Platform for Arrow</name>
 
   <properties>

diff --git a/arrow/pom.xml b/arrow/pom.xml
@@ -11,7 +11,7 @@
 
   <groupId>org.bytedeco</groupId>
   <artifactId>arrow</artifactId>
-  <version>6.0.0-${project.parent.version}</version>
+  <version>6.0.1-${project.parent.version}</version>
   <name>JavaCPP Presets for Arrow</name>
 
   <dependencies>

diff --git a/arrow/samples/pom.xml b/arrow/samples/pom.xml
@@ -12,7 +12,7 @@
         <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>arrow-platform</artifactId>
-            <version>6.0.0-1.5.7-SNAPSHOT</version>
+            <version>6.0.1-1.5.7-SNAPSHOT</version>
         </dependency>
     </dependencies>
     <build>

diff --git a/arrow/src/gen/java/org/bytedeco/arrow/global/arrow.java b/arrow/src/gen/java/org/bytedeco/arrow/global/arrow.java
@@ -179,20 +179,20 @@ public class arrow extends org.bytedeco.arrow.presets.arrow {
 
 public static final int ARROW_VERSION_MAJOR = 6;
 public static final int ARROW_VERSION_MINOR = 0;
-public static final int ARROW_VERSION_PATCH = 0;
+public static final int ARROW_VERSION_PATCH = 1;
 public static final int ARROW_VERSION = ((ARROW_VERSION_MAJOR * 1000) + ARROW_VERSION_MINOR) * 1000 + ARROW_VERSION_PATCH;
 
-public static final String ARROW_VERSION_STRING = "6.0.0";
+public static final String ARROW_VERSION_STRING = "6.0.1";
 
 public static final String ARROW_SO_VERSION = "600";
-public static final String ARROW_FULL_SO_VERSION = "600.0.0";
+public static final String ARROW_FULL_SO_VERSION = "600.1.0";
 
 public static final String ARROW_CXX_COMPILER_ID = "GNU";
 public static final String ARROW_CXX_COMPILER_VERSION = "11.2.1";
 public static final String ARROW_CXX_COMPILER_FLAGS = "-std=c++11 -m64 -fdiagnostics-color=always -O3 -DNDEBUG";
 
-public static final String ARROW_GIT_ID = "fbe1e523beebb316e37d94c422a18d871f3db270";
-public static final String ARROW_GIT_DESCRIPTION = "1.5.6-26-gfbe1e523be-dirty";
+public static final String ARROW_GIT_ID = "e775221fedf1bfde838026a7fee97af18e90775a";
+public static final String ARROW_GIT_DESCRIPTION = "1.5.6-33-ge775221fed-dirty";
 
 public static final String ARROW_PACKAGE_KIND = "";
 
@@ -383,13 +383,16 @@ public class arrow extends org.bytedeco.arrow.presets.arrow {
 // #define ARROW_SUPPRESS_DEPRECATION_WARNING
 //   _Pragma("clang diagnostic push");
 //   _Pragma("clang diagnostic ignored \"-Wdeprecated-declarations\"")
+// #define ARROW_UNSUPPRESS_DEPRECATION_WARNING _Pragma("clang diagnostic pop")
 // #elif defined(__GNUC__)
 // #define ARROW_SUPPRESS_DEPRECATION_WARNING
 //   _Pragma("GCC diagnostic push");
 //   _Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"")
+// #define ARROW_UNSUPPRESS_DEPRECATION_WARNING _Pragma("GCC diagnostic pop")
 // #elif defined(_MSC_VER)
 // #define ARROW_SUPPRESS_DEPRECATION_WARNING
 //   __pragma(warning(push)) __pragma(warning(disable : 4996))
+// #define ARROW_UNSUPPRESS_DEPRECATION_WARNING __pragma(warning(pop))
 // #else
 // #define ARROW_SUPPRESS_DEPRECATION_WARNING
 // #define ARROW_UNSUPPRESS_DEPRECATION_WARNING

diff --git a/arrow/src/gen/java/org/bytedeco/arrow/global/arrow_dataset.java b/arrow/src/gen/java/org/bytedeco/arrow/global/arrow_dataset.java
@@ -737,6 +737,24 @@ public class arrow_dataset extends org.bytedeco.arrow.presets.arrow_dataset {
 // #include "arrow/filesystem/type_fwd.h"  // IWYU pragma: export
 // #include "arrow/type_fwd.h"             // IWYU pragma: export
 
+/** \brief Controls what happens if files exist in an output directory during a dataset
+ *  write */
+@Namespace("arrow::dataset") public enum ExistingDataBehavior {
+  /** Deletes all files in a directory the first time that directory is encountered */
+  kDeleteMatchingPartitions((byte)(0)),
+  /** Ignores existing files, overwriting any that happen to have the same name as an
+   *  output file */
+  kOverwriteOrIgnore((byte)(1)),
+  /** Returns an error if there are any files or subdirectories in the output directory */
+  kError((byte)(2));
+
+    public final byte value;
+    private ExistingDataBehavior(byte v) { this.value = v; }
+    private ExistingDataBehavior(ExistingDataBehavior e) { this.value = e.value; }
+    public ExistingDataBehavior intern() { for (ExistingDataBehavior e : values()) if (e.value == value) return e; return this; }
+    @Override public String toString() { return intern().name(); }
+}
+
   // namespace dataset
   // namespace arrow
 
@@ -1163,24 +1181,6 @@ public class arrow_dataset extends org.bytedeco.arrow.presets.arrow_dataset {
 // Targeting ../../arrow_dataset/FileWriter.java
 
 
-
-/** \brief Controls what happens if files exist in an output directory during a dataset
- *  write */
-@Namespace("arrow::dataset") public enum ExistingDataBehavior {
-  /** Deletes all files in a directory the first time that directory is encountered */
-  kDeleteMatchingPartitions((byte)(0)),
-  /** Ignores existing files, overwriting any that happen to have the same name as an
-   *  output file */
-  kOverwriteOrIgnore((byte)(1)),
-  /** Returns an error if there are any files or subdirectories in the output directory */
-  kError((byte)(2));
-
-    public final byte value;
-    private ExistingDataBehavior(byte v) { this.value = v; }
-    private ExistingDataBehavior(ExistingDataBehavior e) { this.value = e.value; }
-    public ExistingDataBehavior intern() { for (ExistingDataBehavior e : values()) if (e.value == value) return e; return this; }
-    @Override public String toString() { return intern().name(); }
-}
 // Targeting ../../arrow_dataset/FileSystemDatasetWriteOptions.java
 
 

diff --git a/depthai/README.md b/depthai/README.md
@@ -9,7 +9,7 @@ Introduction
 ------------
 This directory contains the JavaCPP Presets module for:
 
- * DepthAI 2.12.1  https://luxonis.com/depthai
+ * DepthAI 2.13.1  https://luxonis.com/depthai
 
 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
         <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>depthai-platform</artifactId>
-            <version>2.12.1-1.5.7-SNAPSHOT</version>
+            <version>2.13.1-1.5.7-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.bytedeco</groupId>

diff --git a/depthai/cppbuild.sh b/depthai/cppbuild.sh
@@ -7,7 +7,7 @@ if [[ -z "$PLATFORM" ]]; then
     exit
 fi
 
-DEPTHAI_VERSION=2.12.1
+DEPTHAI_VERSION=2.13.1
 LIBUSB_VERSION=1.0.22
 download https://github.com/luxonis/depthai-core/releases/download/v$DEPTHAI_VERSION/depthai-core-v$DEPTHAI_VERSION.tar.gz depthai-core-v$DEPTHAI_VERSION.tar.gz
 download http://sourceforge.net/projects/libusb/files/libusb-1.0/libusb-$LIBUSB_VERSION/libusb-$LIBUSB_VERSION.tar.bz2/download libusb-$LIBUSB_VERSION.tar.bz2

diff --git a/depthai/platform/pom.xml b/depthai/platform/pom.xml
@@ -12,7 +12,7 @@
 
   <groupId>org.bytedeco</groupId>
   <artifactId>depthai-platform</artifactId>
-  <version>2.12.1-${project.parent.version}</version>
+  <version>2.13.1-${project.parent.version}</version>
   <name>JavaCPP Presets Platform for DepthAI</name>
 
   <properties>

diff --git a/depthai/pom.xml b/depthai/pom.xml
@@ -11,7 +11,7 @@
 
   <groupId>org.bytedeco</groupId>
   <artifactId>depthai</artifactId>
-  <version>2.12.1-${project.parent.version}</version>
+  <version>2.13.1-${project.parent.version}</version>
   <name>JavaCPP Presets for DepthAI</name>
 
   <dependencies>

diff --git a/depthai/samples/pom.xml b/depthai/samples/pom.xml
@@ -12,7 +12,7 @@
         <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>depthai-platform</artifactId>
-            <version>2.12.1-1.5.7-SNAPSHOT</version>
+            <version>2.13.1-1.5.7-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.bytedeco</groupId>

diff --git a/depthai/src/gen/java/org/bytedeco/depthai/CameraBoardSocketStringMap.java b/depthai/src/gen/java/org/bytedeco/depthai/CameraBoardSocketStringMap.java
@@ -0,0 +1,48 @@
+// Targeted by JavaCPP version 1.5.7-SNAPSHOT: DO NOT EDIT THIS FILE
+
+package org.bytedeco.depthai;
+
+import java.nio.*;
+import org.bytedeco.javacpp.*;
+import org.bytedeco.javacpp.annotation.*;
+
+import static org.bytedeco.javacpp.presets.javacpp.*;
+import static org.bytedeco.openblas.global.openblas_nolapack.*;
+import static org.bytedeco.openblas.global.openblas.*;
+import org.bytedeco.opencv.opencv_core.*;
+import static org.bytedeco.opencv.global.opencv_core.*;
+import org.bytedeco.opencv.opencv_imgproc.*;
+import static org.bytedeco.opencv.global.opencv_imgproc.*;
+
+import static org.bytedeco.depthai.global.depthai.*;
+
+@Name("std::unordered_map<dai::CameraBoardSocket,std::string>") @Properties(inherit = org.bytedeco.depthai.presets.depthai.class)
+public class CameraBoardSocketStringMap extends Pointer {
+    static { Loader.load(); }
+    /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */
+    public CameraBoardSocketStringMap(Pointer p) { super(p); }
+    public CameraBoardSocketStringMap()       { allocate();  }
+    private native void allocate();
+    public native @Name("operator =") @ByRef CameraBoardSocketStringMap put(@ByRef CameraBoardSocketStringMap x);
+
+    public boolean empty() { return size() == 0; }
+    public native long size();
+
+    @Index public native @StdString BytePointer get(@ByRef CameraBoardSocket i);
+    public native CameraBoardSocketStringMap put(@ByRef CameraBoardSocket i, BytePointer value);
+    @ValueSetter @Index public native CameraBoardSocketStringMap put(@ByRef CameraBoardSocket i, @StdString String value);
+
+    public native void erase(@ByVal Iterator pos);
+    public native @ByVal Iterator begin();
+    public native @ByVal Iterator end();
+    @NoOffset @Name("iterator") public static class Iterator extends Pointer {
+        public Iterator(Pointer p) { super(p); }
+        public Iterator() { }
+
+        public native @Name("operator ++") @ByRef Iterator increment();
+        public native @Name("operator ==") boolean equals(@ByRef Iterator it);
+        public native @Name("operator *().first") @MemberGetter @ByRef @Const CameraBoardSocket first();
+        public native @Name("operator *().second") @MemberGetter @StdString BytePointer second();
+    }
+}
+
diff --git a/depthai/src/gen/java/org/bytedeco/depthai/ColorCameraProperties.java b/depthai/src/gen/java/org/bytedeco/depthai/ColorCameraProperties.java
@@ -67,7 +67,7 @@ public static class IspScale extends Pointer {
     /**
      * Select the camera sensor resolution
      */
-    public enum SensorResolution { THE_1080_P(0), THE_4_K(1), THE_12_MP(2);
+    public enum SensorResolution { THE_1080_P(0), THE_4_K(1), THE_12_MP(2), THE_13_MP(3);
 
         public final int value;
         private SensorResolution(int v) { this.value = v; }

diff --git a/depthai/src/gen/java/org/bytedeco/depthai/DeviceBase.java b/depthai/src/gen/java/org/bytedeco/depthai/DeviceBase.java
@@ -437,6 +437,13 @@ public static class Config extends Pointer {
      */
     public native @StdVector @Cast("dai::CameraBoardSocket*") IntPointer getConnectedCameras();
 
+    /**
+     * Get sensor names for cameras that are connected to the device
+     *
+     * @return Map/dictionary with camera sensor names, indexed by socket
+     */
+    public native @ByVal CameraBoardSocketStringMap getCameraSensorNames();
+
     /**
      * Retrieves current DDR memory information from device
      *

diff --git a/depthai/src/gen/java/org/bytedeco/depthai/MonoCameraProperties.java b/depthai/src/gen/java/org/bytedeco/depthai/MonoCameraProperties.java
@@ -39,9 +39,9 @@ public class MonoCameraProperties extends Pointer {
     }
 
     /**
-     * Select the camera sensor resolution: 1280×720, 1280×800, 640×400
+     * Select the camera sensor resolution: 1280×720, 1280×800, 640×400, 640×480
      */
-    public enum SensorResolution { THE_720_P(0), THE_800_P(1), THE_400_P(2);
+    public enum SensorResolution { THE_720_P(0), THE_800_P(1), THE_400_P(2), THE_480_P(3);
 
         public final int value;
         private SensorResolution(int v) { this.value = v; }

diff --git a/depthai/src/gen/java/org/bytedeco/depthai/VideoEncoder.java b/depthai/src/gen/java/org/bytedeco/depthai/VideoEncoder.java
@@ -43,22 +43,34 @@ public class VideoEncoder extends Node {
     @MemberGetter public native @ByRef Output bitstream();
 
     // Sets default options for a specified size and profile
+    /**
+     * Sets a default preset based on specified frame rate and profile
+     * @param fps Frame rate in frames per second
+     * @param profile Encoding profile
+     */
+    public native void setDefaultProfilePreset(float fps, @ByVal VideoEncoderProperties.Profile profile);
+
     /**
      * Sets a default preset based on specified input size, frame rate and profile
      * @param width Input frame width
      * @param height Input frame height
      * @param fps Frame rate in frames per second
      * @param profile Encoding profile
      */
-    public native void setDefaultProfilePreset(int width, int height, float fps, @ByVal VideoEncoderProperties.Profile profile);
+    public native @Deprecated void setDefaultProfilePreset(int width,
+                                                                                                                                      int height,
+                                                                                                                                      float fps,
+                                                                                                                                      @ByVal VideoEncoderProperties.Profile profile);
 
     /**
      * Sets a default preset based on specified input size, frame rate and profile
      * @param size Input frame size
      * @param fps Frame rate in frames per second
      * @param profile Encoding profile
      */
-    public native void setDefaultProfilePreset(@ByVal @Cast("std::tuple<int,int>*") Pointer size, float fps, @ByVal VideoEncoderProperties.Profile profile);
+    public native @Deprecated void setDefaultProfilePreset(@ByVal @Cast("std::tuple<int,int>*") Pointer size,
+                                                                                                                              float fps,
+                                                                                                                              @ByVal VideoEncoderProperties.Profile profile);
 
     // node properties
     /**
@@ -77,12 +89,17 @@ public class VideoEncoder extends Node {
     /** Set rate control mode */
     public native void setRateControlMode(@ByVal VideoEncoderProperties.RateControlMode mode);
     /** Set encoding profile */
-    public native void setProfile(@ByVal @Cast("std::tuple<int,int>*") Pointer size, @ByVal VideoEncoderProperties.Profile profile);
+    public native void setProfile(@ByVal VideoEncoderProperties.Profile profile);
+    /** Set encoding profile */
+    public native @Deprecated void setProfile(@ByVal @Cast("std::tuple<int,int>*") Pointer size,
+                                                                                                                 @ByVal VideoEncoderProperties.Profile profile);
     /** Set encoding profile */
-    public native void setProfile(int width, int height, @ByVal VideoEncoderProperties.Profile profile);
-    /** Set output bitrate in bps. Final bitrate depends on rate control mode */
+    public native @Deprecated void setProfile(int width,
+                                                                                                                         int height,
+                                                                                                                         @ByVal VideoEncoderProperties.Profile profile);
+    /** Set output bitrate in bps, for CBR rate control mode. 0 for auto (based on frame size and FPS) */
     public native void setBitrate(int bitrate);
-    /** Set output bitrate in kbps. Final bitrate depends on rate control mode */
+    /** Set output bitrate in kbps, for CBR rate control mode. 0 for auto (based on frame size and FPS) */
     public native void setBitrateKbps(int bitrateKbps);
 
     /**
@@ -136,11 +153,11 @@ public class VideoEncoder extends Node {
     /** Get quality */
     public native int getQuality();
     /** Get input size */
-    public native @ByVal @Cast("std::tuple<int,int>*") Pointer getSize();
+    public native @Deprecated @ByVal @Cast("std::tuple<int,int>*") Pointer getSize();
     /** Get input width */
-    public native int getWidth();
+    public native @Deprecated int getWidth();
     /** Get input height */
-    public native int getHeight();
+    public native @Deprecated int getHeight();
     /** Get frame rate */
     public native float getFrameRate();
     /** Get lossless mode. Applies only when using [M]JPEG profile. */