Skip to content

Commit

Permalink
* Upgrade presets for DNNL 3.3.2, TensorFlow Lite 2.15.0, DepthAI 2.…
Browse files Browse the repository at this point in the history
…23.0, ONNX Runtime 1.16.3
  • Loading branch information
saudet committed Dec 5, 2023
1 parent ba756f0 commit 6ba63f1
Show file tree
Hide file tree
Showing 286 changed files with 2,774 additions and 753 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* 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.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
* Upgrade presets for OpenCV 4.8.1, FFmpeg 6.1, HDF5 1.14.3, DNNL 3.3.2, 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.15.0, Triton Inference Server 2.38.0, DepthAI 2.23.0, ONNX 1.15.0, ONNX Runtime 1.16.3, 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))
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -226,11 +226,11 @@ Each child module in turn relies by default on the included [`cppbuild.sh` scrip
* PyTorch 2.1.x https://github.com/pytorch/pytorch
* SentencePiece 0.1.99 https://github.com/google/sentencepiece
* TensorFlow 1.15.x https://github.com/tensorflow/tensorflow
* TensorFlow Lite 2.14.x https://github.com/tensorflow/tensorflow
* TensorFlow Lite 2.15.x https://github.com/tensorflow/tensorflow
* TensorRT 8.6.x https://developer.nvidia.com/tensorrt
* Triton Inference Server 2.38.x https://developer.nvidia.com/nvidia-triton-inference-server
* The Arcade Learning Environment 0.8.x https://github.com/mgbellemare/Arcade-Learning-Environment
* DepthAI 2.21.x https://github.com/luxonis/depthai-core
* DepthAI 2.23.x https://github.com/luxonis/depthai-core
* ONNX 1.15.x https://github.com/onnx/onnx
* nGraph 0.26.0 https://github.com/NervanaSystems/ngraph
* ONNX Runtime 1.16.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.21.2 https://luxonis.com/depthai
* DepthAI 2.23.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.21.2-1.5.10-SNAPSHOT</version>
<version>2.23.0-1.5.10-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.21.2
DEPTHAI_VERSION=2.23.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.21.2-${project.parent.version}</version>
<version>2.23.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.21.2-${project.parent.version}</version>
<version>2.23.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.21.2-1.5.10-SNAPSHOT</version>
<version>2.23.0-1.5.10-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.bytedeco</groupId>
Expand Down
2 changes: 1 addition & 1 deletion depthai/src/gen/java/org/bytedeco/depthai/ADatatype.java
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE
// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE

package org.bytedeco.depthai;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE
// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE

package org.bytedeco.depthai;

Expand Down Expand Up @@ -34,6 +34,8 @@ public class ADatatypeVector extends Pointer {
public void clear() { resize(0); }
public native void resize(@Cast("size_t") long n);

public ADatatype front() { return get(0); }
public ADatatype back() { return get(size() - 1); }
@Index(function = "at") public native @SharedPtr ADatatype get(@Cast("size_t") long i);
public native ADatatypeVector put(@Cast("size_t") long i, ADatatype value);

Expand Down
2 changes: 1 addition & 1 deletion depthai/src/gen/java/org/bytedeco/depthai/AprilTag.java
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE
// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE

package org.bytedeco.depthai;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE
// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE

package org.bytedeco.depthai;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE
// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE

package org.bytedeco.depthai;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE
// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE

package org.bytedeco.depthai;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE
// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE

package org.bytedeco.depthai;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE
// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE

package org.bytedeco.depthai;

Expand Down
18 changes: 1 addition & 17 deletions depthai/src/gen/java/org/bytedeco/depthai/AprilTags.java
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE
// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE

package org.bytedeco.depthai;

Expand Down Expand Up @@ -45,22 +45,6 @@ public class AprilTags extends Buffer {

public native @StdVector AprilTag aprilTags(); public native AprilTags aprilTags(AprilTag setter);

/**
* Retrieves image timestamp related to dai::Clock::now()
*/
public native @ByVal @Cast("std::chrono::time_point<std::chrono::steady_clock,std::chrono::steady_clock::duration>*") Pointer getTimestamp();

/**
* Retrieves image timestamp directly captured from device's monotonic clock,
* not synchronized to host time. Used mostly for debugging
*/
public native @ByVal @Cast("std::chrono::time_point<std::chrono::steady_clock,std::chrono::steady_clock::duration>*") Pointer getTimestampDevice();

/**
* Retrieves image sequence number
*/
public native @Cast("int64_t") long getSequenceNum();

/**
* Sets image timestamp related to dai::Clock::now()
*/
Expand Down
2 changes: 1 addition & 1 deletion depthai/src/gen/java/org/bytedeco/depthai/Asset.java
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE
// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE

package org.bytedeco.depthai;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE
// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE

package org.bytedeco.depthai;

Expand Down
4 changes: 3 additions & 1 deletion depthai/src/gen/java/org/bytedeco/depthai/AssetVector.java
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE
// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE

package org.bytedeco.depthai;

Expand Down Expand Up @@ -34,6 +34,8 @@ public class AssetVector extends Pointer {
public void clear() { resize(0); }
public native void resize(@Cast("size_t") long n);

public Asset front() { return get(0); }
public Asset back() { return get(size() - 1); }
@Index(function = "at") public native @SharedPtr Asset get(@Cast("size_t") long i);
public native AssetVector put(@Cast("size_t") long i, Asset value);

Expand Down
2 changes: 1 addition & 1 deletion depthai/src/gen/java/org/bytedeco/depthai/AssetView.java
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE
// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE

package org.bytedeco.depthai;

Expand Down
2 changes: 1 addition & 1 deletion depthai/src/gen/java/org/bytedeco/depthai/Assets.java
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE
// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE

package org.bytedeco.depthai;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE
// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE

package org.bytedeco.depthai;

Expand Down
33 changes: 32 additions & 1 deletion depthai/src/gen/java/org/bytedeco/depthai/BoardConfig.java
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE
// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE

package org.bytedeco.depthai;

Expand Down Expand Up @@ -58,6 +58,8 @@ public static class USB extends Pointer {
public native @Cast("uint16_t") short flashBootedVid(); public native USB flashBootedVid(short setter);
public native @Cast("uint16_t") short flashBootedPid(); public native USB flashBootedPid(short setter);
public native UsbSpeed maxSpeed(); public native USB maxSpeed(UsbSpeed setter);
public native @StdString BytePointer productName(); public native USB productName(BytePointer setter);
public native @StdString BytePointer manufacturer(); public native USB manufacturer(BytePointer setter);
}

public native @ByRef USB usb(); public native BoardConfig usb(USB setter);
Expand Down Expand Up @@ -296,6 +298,35 @@ public static class Camera extends Pointer {
public native byte interrupt(); public native IMU interrupt(byte setter);
public native byte wake(); public native IMU wake(byte setter);
public native byte csGpio(); public native IMU csGpio(byte setter);
public native byte boot(); public native IMU boot(byte setter);
public native byte reset(); public native IMU reset(byte setter);
}
public native @ByRef BoardConfigIMUOptional imu(); public native BoardConfig imu(BoardConfigIMUOptional setter);

/** UVC configuration for USB descriptor */
@NoOffset public static class UVC extends Pointer {
static { Loader.load(); }
/** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */
public UVC(Pointer p) { super(p); }
/** Native array allocator. Access with {@link Pointer#position(long)}. */
public UVC(long size) { super((Pointer)null); allocateArray(size); }
private native void allocateArray(long size);
@Override public UVC position(long position) {
return (UVC)super.position(position);
}
@Override public UVC getPointer(long i) {
return new UVC((Pointer)this).offsetAddress(i);
}

public native @StdString BytePointer cameraName(); public native UVC cameraName(BytePointer setter);
public native @Cast("uint16_t") short width(); public native UVC width(short setter);
public native @Cast("uint16_t") short height(); public native UVC height(short setter);
public native RawImgFrame.Type frameType(); public native UVC frameType(RawImgFrame.Type setter);
public native @Cast("bool") boolean enable(); public native UVC enable(boolean setter);
public UVC(@Cast("uint16_t") short width, @Cast("uint16_t") short height) { super((Pointer)null); allocate(width, height); }
private native void allocate(@Cast("uint16_t") short width, @Cast("uint16_t") short height);
public UVC() { super((Pointer)null); allocate(); }
private native void allocate();
}
public native @ByRef BoardConfigUVCOptional uvc(); public native BoardConfig uvc(BoardConfigUVCOptional setter);
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE
// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE

package org.bytedeco.depthai;

Expand Down Expand Up @@ -27,6 +27,7 @@ public class BoardConfigIMUOptional extends Pointer {
public native @Name("operator =") @ByRef BoardConfigIMUOptional put(@ByRef BoardConfigIMUOptional x);

public native boolean has_value();
public native void reset();
public native @Name("value") @ByRef BoardConfig.IMU get();
@ValueSetter public native BoardConfigIMUOptional put(@ByRef BoardConfig.IMU value);
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
// Targeted by JavaCPP version 1.5.10-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.*;

@NoOffset @Name("tl::optional<dai::BoardConfig::UVC>") @Properties(inherit = org.bytedeco.depthai.presets.depthai.class)
public class BoardConfigUVCOptional extends Pointer {
static { Loader.load(); }
/** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */
public BoardConfigUVCOptional(Pointer p) { super(p); }
public BoardConfigUVCOptional(BoardConfig.UVC value) { this(); put(value); }
public BoardConfigUVCOptional() { allocate(); }
private native void allocate();
public native @Name("operator =") @ByRef BoardConfigUVCOptional put(@ByRef BoardConfigUVCOptional x);

public native boolean has_value();
public native void reset();
public native @Name("value") @ByRef BoardConfig.UVC get();
@ValueSetter public native BoardConfigUVCOptional put(@ByRef BoardConfig.UVC value);
}

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE
// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE

package org.bytedeco.depthai;

Expand Down
3 changes: 2 additions & 1 deletion depthai/src/gen/java/org/bytedeco/depthai/BoolOptional.java
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE
// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE

package org.bytedeco.depthai;

Expand Down Expand Up @@ -27,6 +27,7 @@ public class BoolOptional extends Pointer {
public native @Name("operator =") @ByRef BoolOptional put(@ByRef BoolOptional x);

public native boolean has_value();
public native void reset();
public native @Name("value") @Cast("bool") boolean get();
@ValueSetter public native BoolOptional put(@Cast("bool") boolean value);
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE
// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE

package org.bytedeco.depthai;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE
// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE

package org.bytedeco.depthai;

Expand Down
33 changes: 32 additions & 1 deletion depthai/src/gen/java/org/bytedeco/depthai/Buffer.java
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE
// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE

package org.bytedeco.depthai;

Expand Down Expand Up @@ -56,4 +56,35 @@ public class Buffer extends ADatatype {
/**
* @param data Moves data to internal buffer
*/

/**
* Retrieves timestamp related to dai::Clock::now()
*/
public native @ByVal @Cast("std::chrono::time_point<std::chrono::steady_clock,std::chrono::steady_clock::duration>*") Pointer getTimestamp();

/**
* Retrieves timestamp directly captured from device's monotonic clock,
* not synchronized to host time. Used mostly for debugging
*/
public native @ByVal @Cast("std::chrono::time_point<std::chrono::steady_clock,std::chrono::steady_clock::duration>*") Pointer getTimestampDevice();

/**
* Retrieves sequence number
*/
public native @Cast("int64_t") long getSequenceNum();

/**
* Sets timestamp related to dai::Clock::now()
*/
public native @ByRef Buffer setTimestamp(@ByVal @Cast("std::chrono::time_point<std::chrono::steady_clock,std::chrono::steady_clock::duration>*") Pointer timestamp);

/**
* Sets timestamp related to dai::Clock::now()
*/
public native @ByRef Buffer setTimestampDevice(@ByVal @Cast("std::chrono::time_point<std::chrono::steady_clock,std::chrono::steady_clock::duration>*") Pointer timestamp);

/**
* Retrieves sequence number
*/
public native @ByRef Buffer setSequenceNum(@Cast("int64_t") long sequenceNum);
}
2 changes: 1 addition & 1 deletion depthai/src/gen/java/org/bytedeco/depthai/ByteGPIOMap.java
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE
// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE

package org.bytedeco.depthai;

Expand Down
2 changes: 1 addition & 1 deletion depthai/src/gen/java/org/bytedeco/depthai/ByteUARTMap.java
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE
// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE

package org.bytedeco.depthai;

Expand Down
Loading

0 comments on commit 6ba63f1

Please sign in to comment.