Skip to content

Commit

Permalink
* Upgrade presets for Tesseract 5.0.1, DepthAI 2.14.0
Browse files Browse the repository at this point in the history
  • Loading branch information
saudet committed Jan 11, 2022
1 parent 7f0122b commit 9dd400b
Show file tree
Hide file tree
Showing 110 changed files with 2,600 additions and 356 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,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.5, FFmpeg 4.4.1, librealsense2 2.50.0, Arrow 6.0.1, MKL 2022.0, DNNL 2.5.1, OpenBLAS 0.3.19, FFTW 3.3.10, CPython 3.10.1, NumPy 1.22.0, SciPy 1.8.0, 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, MXNet 1.9.0, PyTorch 1.10.1, TensorFlow Lite 2.7.0, ALE 0.7.3, DepthAI 2.13.3, ONNX 1.10.2, ONNX Runtime 1.10.0, TVM 0.8.0, ModSecurity 3.0.6, and their dependencies
* Upgrade presets for OpenCV 4.5.5, FFmpeg 4.4.1, librealsense2 2.50.0, Arrow 6.0.1, MKL 2022.0, DNNL 2.5.1, OpenBLAS 0.3.19, FFTW 3.3.10, CPython 3.10.1, NumPy 1.22.0, SciPy 1.8.0, Gym 0.21.0, LLVM 13.0.0, libpostal 1.1, Leptonica 1.82.0, Tesseract 5.0.1, CUDA 11.4.2, cuDNN 8.2.4, NCCL 2.11.4, MXNet 1.9.0, PyTorch 1.10.1, TensorFlow Lite 2.7.0, ALE 0.7.3, DepthAI 2.14.0, ONNX 1.10.2, ONNX Runtime 1.10.0, 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))
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -204,22 +204,22 @@ Each child module in turn relies by default on the included [`cppbuild.sh` scrip
* libffi 3.4.x https://github.com/libffi/libffi
* libpostal 1.1 https://github.com/openvenues/libpostal
* Leptonica 1.82.x http://www.leptonica.org/download.html
* Tesseract 5.0.0 https://github.com/tesseract-ocr/tesseract
* Tesseract 5.0.x https://github.com/tesseract-ocr/tesseract
* Caffe 1.0 https://github.com/BVLC/caffe
* OpenPose 1.7.0 https://github.com/CMU-Perceptual-Computing-Lab/openpose
* CUDA 11.4.x https://developer.nvidia.com/cuda-downloads
* cuDNN 8.2.x https://developer.nvidia.com/cudnn
* NCCL 2.11.x https://developer.nvidia.com/nccl
* NVIDIA Video Codec SDK 11.1.x https://developer.nvidia.com/nvidia-video-codec-sdk
* OpenCL 3.0 https://github.com/KhronosGroup/OpenCL-ICD-Loader
* OpenCL 3.0.x https://github.com/KhronosGroup/OpenCL-ICD-Loader
* MXNet 1.9.0 https://github.com/apache/incubator-mxnet
* PyTorch 1.10.x https://github.com/pytorch/pytorch
* TensorFlow 1.15.x https://github.com/tensorflow/tensorflow
* TensorFlow Lite 2.7.x https://github.com/tensorflow/tensorflow
* TensorRT 8.x https://developer.nvidia.com/tensorrt
* Triton Inference Server 2.17.x https://developer.nvidia.com/nvidia-triton-inference-server
* The Arcade Learning Environment 0.7.x https://github.com/mgbellemare/Arcade-Learning-Environment
* DepthAI 2.13.x https://github.com/luxonis/depthai-core
* DepthAI 2.14.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.10.x https://github.com/microsoft/onnxruntime
Expand Down
4 changes: 2 additions & 2 deletions depthai/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Introduction
------------
This directory contains the JavaCPP Presets module for:

* DepthAI 2.13.3 https://luxonis.com/depthai
* DepthAI 2.14.0 https://luxonis.com/depthai

Please refer to the parent README.md file for more detailed information about the JavaCPP Presets.

Expand Down Expand Up @@ -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.13.3-1.5.7-SNAPSHOT</version>
<version>2.14.0-1.5.7-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.bytedeco</groupId>
Expand Down
2 changes: 1 addition & 1 deletion depthai/cppbuild.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ if [[ -z "$PLATFORM" ]]; then
exit
fi

DEPTHAI_VERSION=2.13.3
DEPTHAI_VERSION=2.14.0
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
Expand Down
2 changes: 1 addition & 1 deletion depthai/platform/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

<groupId>org.bytedeco</groupId>
<artifactId>depthai-platform</artifactId>
<version>2.13.3-${project.parent.version}</version>
<version>2.14.0-${project.parent.version}</version>
<name>JavaCPP Presets Platform for DepthAI</name>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion depthai/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

<groupId>org.bytedeco</groupId>
<artifactId>depthai</artifactId>
<version>2.13.3-${project.parent.version}</version>
<version>2.14.0-${project.parent.version}</version>
<name>JavaCPP Presets for DepthAI</name>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion depthai/samples/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<dependency>
<groupId>org.bytedeco</groupId>
<artifactId>depthai-platform</artifactId>
<version>2.13.3-1.5.7-SNAPSHOT</version>
<version>2.14.0-1.5.7-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.bytedeco</groupId>
Expand Down
20 changes: 12 additions & 8 deletions depthai/src/gen/java/org/bytedeco/depthai/ColorCamera.java
Original file line number Diff line number Diff line change
Expand Up @@ -21,28 +21,32 @@
* \brief ColorCamera node. For use with color sensors.
*/
@Namespace("dai::node") @NoOffset @Properties(inherit = org.bytedeco.depthai.presets.depthai.class)
public class ColorCamera extends Node {
public class ColorCamera extends ColorCameraPropertiesNode {
static { Loader.load(); }
/** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */
public ColorCamera(Pointer p) { super(p); }

public native @StdString @Override BytePointer getName();

public native int getScaledSize(int input, int num, int denom);

@MemberGetter public static native @Cast("const char*") BytePointer NAME();
/**
* Constructs ColorCamera node.
*/
public ColorCamera(@SharedPtr PipelineImpl par, @Cast("int64_t") long nodeId) { super((Pointer)null); allocate(par, nodeId); }
private native void allocate(@SharedPtr PipelineImpl par, @Cast("int64_t") long nodeId);
public ColorCamera(@SharedPtr PipelineImpl par, @Cast("int64_t") long nodeId, @UniquePtr ColorCameraProperties props) { super((Pointer)null); allocate(par, nodeId, props); }
private native void allocate(@SharedPtr PipelineImpl par, @Cast("int64_t") long nodeId, @UniquePtr ColorCameraProperties props);

/**
* Computes the scaled size given numerator and denominator
*/
public native int getScaledSize(int input, int num, int denom);

/**
* Initial control options to apply to sensor
*/
@MemberGetter public native @ByRef CameraControl initialControl();

/**
* Input for ImageManipConfig message, which can modify crop paremeters in runtime
* Input for ImageManipConfig message, which can modify crop parameters in runtime
*
* Default queue is non-blocking with size 8
*/
Expand Down Expand Up @@ -255,13 +259,13 @@ public class ColorCamera extends Node {
* before sending out a frame.
* @param wait True to wait for inputConfig message, false otherwise
*/
public native void setWaitForConfigInput(@Cast("bool") boolean _wait);
public native @Deprecated void setWaitForConfigInput(@Cast("bool") boolean _wait);

/**
* @see setWaitForConfigInput
* @return True if wait for inputConfig message, false otherwise
*/
public native @Cast("bool") boolean getWaitForConfigInput();
public native @Cast("bool") @Deprecated boolean getWaitForConfigInput();

/**
* Specifies whether preview output should preserve aspect ratio,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
/**
* Specify properties for ColorCamera such as camera ID, ...
*/
@Namespace("dai") @Properties(inherit = org.bytedeco.depthai.presets.depthai.class)
public class ColorCameraProperties extends Pointer {
@Namespace("dai") @NoOffset @Properties(inherit = org.bytedeco.depthai.presets.depthai.class)
public class ColorCameraProperties extends ColorCameraPropertiesSerializable {
static { Loader.load(); }
/** Default native constructor. */
public ColorCameraProperties() { super((Pointer)null); allocate(); }
Expand Down Expand Up @@ -160,11 +160,6 @@ public enum ColorOrder { BGR(0), RGB(1);
public native float sensorCropX(); public native ColorCameraProperties sensorCropX(float setter);
public native float sensorCropY(); public native ColorCameraProperties sensorCropY(float setter);

/**
* Whether to wait for config at 'inputConfig' io
*/
public native @Cast("bool") boolean inputConfigSync(); public native ColorCameraProperties inputConfigSync(boolean setter);

/**
* Whether to keep aspect ratio of input (video size) or not
*/
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
// 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("dai::NodeCRTP<dai::Node,dai::node::ColorCamera,dai::ColorCameraProperties>") @NoOffset @Properties(inherit = org.bytedeco.depthai.presets.depthai.class)
public class ColorCameraPropertiesNode extends Node {
static { Loader.load(); }
/** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */
public ColorCameraPropertiesNode(Pointer p) { super(p); }

/** Underlying properties */
public native @Cast("dai::NodeCRTP<dai::Node,dai::node::ColorCamera,dai::ColorCameraProperties>::Properties*") @ByRef ColorCameraProperties properties(); public native ColorCameraPropertiesNode properties(ColorCameraProperties setter);
public native @Override @Cast("const char*") BytePointer getName();
public native @UniquePtr @Override Node clone();
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
// 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("dai::PropertiesSerializable<dai::Properties,dai::ColorCameraProperties>") @Properties(inherit = org.bytedeco.depthai.presets.depthai.class)
public class ColorCameraPropertiesSerializable extends DaiProperties {
static { Loader.load(); }
/** Default native constructor. */
public ColorCameraPropertiesSerializable() { super((Pointer)null); allocate(); }
/** Native array allocator. Access with {@link Pointer#position(long)}. */
public ColorCameraPropertiesSerializable(long size) { super((Pointer)null); allocateArray(size); }
/** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */
public ColorCameraPropertiesSerializable(Pointer p) { super(p); }
private native void allocate();
private native void allocateArray(long size);
@Override public ColorCameraPropertiesSerializable position(long position) {
return (ColorCameraPropertiesSerializable)super.position(position);
}
@Override public ColorCameraPropertiesSerializable getPointer(long i) {
return new ColorCameraPropertiesSerializable((Pointer)this).offsetAddress(i);
}

public native @Override void serialize(@Cast("std::uint8_t*") @StdVector BytePointer data);
public native @Override void serialize(@Cast("std::uint8_t*") @StdVector ByteBuffer data);
public native @Override void serialize(@Cast("std::uint8_t*") @StdVector byte[] data);

public native @UniquePtr @Override DaiProperties clone();
}
31 changes: 31 additions & 0 deletions depthai/src/gen/java/org/bytedeco/depthai/DaiProperties.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
// 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.*;


/** Base Properties structure */
@Name("dai::Properties") @Properties(inherit = org.bytedeco.depthai.presets.depthai.class)
public class DaiProperties extends Pointer {
static { Loader.load(); }
/** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */
public DaiProperties(Pointer p) { super(p); }

public native void serialize(@Cast("std::uint8_t*") @StdVector BytePointer data);
public native void serialize(@Cast("std::uint8_t*") @StdVector ByteBuffer data);
public native void serialize(@Cast("std::uint8_t*") @StdVector byte[] data);
public native @UniquePtr DaiProperties clone();
}
25 changes: 9 additions & 16 deletions depthai/src/gen/java/org/bytedeco/depthai/DetectionNetwork.java
Original file line number Diff line number Diff line change
Expand Up @@ -21,34 +21,27 @@
* \brief DetectionNetwork, base for different network specializations
*/
@Namespace("dai::node") @NoOffset @Properties(inherit = org.bytedeco.depthai.presets.depthai.class)
public class DetectionNetwork extends NeuralNetwork {
public class DetectionNetwork extends DetectionNetworkPropertiesNode {
static { Loader.load(); }
/** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */
public DetectionNetwork(Pointer p) { super(p); }


public native @StdString @Override BytePointer getName();
/**
* Input message with data to be infered upon
* Default queue is blocking with size 5
*/
@MemberGetter public native @ByRef Input input();

@MemberGetter public static native @Cast("const char*") BytePointer NAME();
/**
* Outputs ImgDetections message that carries parsed detection results.
* Overrides NeuralNetwork 'out' with ImgDetections output message type.
*/
@MemberGetter public native @ByRef Output out();

/**
* Passthrough message on which the inference was performed.
*
* Suitable for when input queue is set to non-blocking behavior.
*/
@MemberGetter public native @ByRef Output passthrough();

/**
* Specifies confidence threshold at which to filter the rest of the detections.
* @param thresh Detection confidence must be greater than specified threshold to be added to the list
*/
public native void setConfidenceThreshold(float thresh);

/**
* Retrieves threshold at which to filter the rest of the detections.
* @return Detection confidence
*/
public native float getConfidenceThreshold();
}
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
* Specify properties for DetectionNetwork
*/
@Namespace("dai") @NoOffset @Properties(inherit = org.bytedeco.depthai.presets.depthai.class)
public class DetectionNetworkProperties extends NeuralNetworkProperties {
public class DetectionNetworkProperties extends DetectionNetworkPropertiesSerializable {
static { Loader.load(); }
/** Default native constructor. */
public DetectionNetworkProperties() { super((Pointer)null); allocate(); }
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
// 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("dai::NodeCRTP<dai::node::NeuralNetwork,dai::node::DetectionNetwork,dai::DetectionNetworkProperties>") @NoOffset @Properties(inherit = org.bytedeco.depthai.presets.depthai.class)
public class DetectionNetworkPropertiesNode extends NeuralNetwork {
static { Loader.load(); }
/** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */
public DetectionNetworkPropertiesNode(Pointer p) { super(p); }

/** Underlying properties */
public native @Cast("dai::NodeCRTP<dai::node::NeuralNetwork,dai::node::DetectionNetwork,dai::DetectionNetworkProperties>::Properties*") @ByRef DetectionNetworkProperties properties(); public native DetectionNetworkPropertiesNode properties(DetectionNetworkProperties setter);
public native @Override @Cast("const char*") BytePointer getName();
public native @UniquePtr @Override Node clone();
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
// 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("dai::PropertiesSerializable<dai::NeuralNetworkProperties,dai::DetectionNetworkProperties>") @Properties(inherit = org.bytedeco.depthai.presets.depthai.class)
public class DetectionNetworkPropertiesSerializable extends NeuralNetworkProperties {
static { Loader.load(); }
/** Default native constructor. */
public DetectionNetworkPropertiesSerializable() { super((Pointer)null); allocate(); }
/** Native array allocator. Access with {@link Pointer#position(long)}. */
public DetectionNetworkPropertiesSerializable(long size) { super((Pointer)null); allocateArray(size); }
/** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */
public DetectionNetworkPropertiesSerializable(Pointer p) { super(p); }
private native void allocate();
private native void allocateArray(long size);
@Override public DetectionNetworkPropertiesSerializable position(long position) {
return (DetectionNetworkPropertiesSerializable)super.position(position);
}
@Override public DetectionNetworkPropertiesSerializable getPointer(long i) {
return new DetectionNetworkPropertiesSerializable((Pointer)this).offsetAddress(i);
}

public native @Override void serialize(@Cast("std::uint8_t*") @StdVector BytePointer data);
public native @Override void serialize(@Cast("std::uint8_t*") @StdVector ByteBuffer data);
public native @Override void serialize(@Cast("std::uint8_t*") @StdVector byte[] data);

public native @UniquePtr @Override DaiProperties clone();
}
Loading

0 comments on commit 9dd400b

Please sign in to comment.