Skip to content

Commit

Permalink
* Upgrade presets for DNNL 2.6.1, Gym 0.25.0, LLVM 14.0.6, DepthAI 2…
Browse files Browse the repository at this point in the history
….17.0, TVM 0.9.0
  • Loading branch information
saudet committed Jul 16, 2022
1 parent d82e7c6 commit 2db165e
Show file tree
Hide file tree
Showing 146 changed files with 1,512 additions and 258 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
* Bundle correctly OpenMP library for PyTorch builds on Mac as well
* Remove dependency on CUDA from presets for Triton Inference Server ([pull #1151](https://github.com/bytedeco/javacpp-presets/pull/1151))
* Disable signal handlers of DepthAI known to cause issues with the JDK ([issue #1118](https://github.com/bytedeco/javacpp-presets/issues/1118))
* Upgrade presets for OpenCV 4.6.0, FFmpeg 5.0.1, HDF5 1.12.2, DNNL 2.6, OpenBLAS 0.3.20, CPython 3.10.5, NumPy 1.23.1, SciPy 1.9.0, Gym 0.24.1, LLVM 14.0.5, Tesseract 5.2.0, CUDA 11.6.2, NCCL 2.12.7, OpenCL 3.0.11, MXNet 1.9.1, PyTorch 1.12.0, TensorFlow Lite 2.9.1, Triton Inference Server 2.21.0, ALE 0.7.5, DepthAI 2.16.0, ONNX 1.12.0, ONNX Runtime 1.11.1, Skia 2.88.0, cpu_features 0.7.0, ModSecurity 3.0.7, and their dependencies
* Upgrade presets for OpenCV 4.6.0, FFmpeg 5.0.1, HDF5 1.12.2, DNNL 2.6.1, OpenBLAS 0.3.20, CPython 3.10.5, NumPy 1.23.1, SciPy 1.9.0, Gym 0.25.0, LLVM 14.0.6, Tesseract 5.2.0, CUDA 11.6.2, NCCL 2.12.7, OpenCL 3.0.11, MXNet 1.9.1, PyTorch 1.12.0, TensorFlow Lite 2.9.1, Triton Inference Server 2.21.0, ALE 0.7.5, DepthAI 2.17.0, ONNX 1.12.0, ONNX Runtime 1.11.1, TVM 0.9.0, Skia 2.88.0, cpu_features 0.7.0, ModSecurity 3.0.7, and their dependencies

### February 11, 2022 version 1.5.7
* Build FFmpeg with WebP encoding support ([pull #1133](https://github.com/bytedeco/javacpp-presets/pull/1133))
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ Each child module in turn relies by default on the included [`cppbuild.sh` scrip
* CPython 3.10.x https://www.python.org/downloads/
* NumPy 1.23.x https://github.com/numpy/numpy
* SciPy 1.9.x https://github.com/scipy/scipy
* Gym 0.24.x https://github.com/openai/gym
* Gym 0.25.x https://github.com/openai/gym
* LLVM 14.0.x http://llvm.org/releases/download.html
* libffi 3.4.x https://github.com/libffi/libffi
* libpostal 1.1 https://github.com/openvenues/libpostal
Expand All @@ -225,11 +225,11 @@ 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.21.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.16.x https://github.com/luxonis/depthai-core
* DepthAI 2.17.x https://github.com/luxonis/depthai-core
* ONNX 1.12.x https://github.com/onnx/onnx
* nGraph 0.26.0 https://github.com/NervanaSystems/ngraph
* ONNX Runtime 1.11.x https://github.com/microsoft/onnxruntime
* TVM 0.8.x https://github.com/apache/tvm
* TVM 0.9.x https://github.com/apache/tvm
* Bullet Physics SDK 3.24 https://pybullet.org
* LiquidFun http://google.github.io/liquidfun/
* Qt 5.15.x https://download.qt.io/archive/qt/
Expand Down
2 changes: 1 addition & 1 deletion arrow/cppbuild.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ if [[ $PLATFORM == windows* ]]; then
export PYTHON_BIN_PATH=$(which python.exe)
fi

LLVM_VERSION=14.0.5
LLVM_VERSION=14.0.6
OPENSSL_VERSION=3.0.2
ZLIB_VERSION=1.2.12
PROTO_VERSION=3.17.3 # cpp/thirdparty/versions.txt
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.16.0 https://luxonis.com/depthai
* DepthAI 2.17.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.16.0-1.5.8-SNAPSHOT</version>
<version>2.17.0-1.5.8-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.16.0
DEPTHAI_VERSION=2.17.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.16.0-${project.parent.version}</version>
<version>2.17.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.16.0-${project.parent.version}</version>
<version>2.17.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.16.0-1.5.8-SNAPSHOT</version>
<version>2.17.0-1.5.8-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.bytedeco</groupId>
Expand Down
15 changes: 15 additions & 0 deletions depthai/src/gen/java/org/bytedeco/depthai/BoardConfig.java
Original file line number Diff line number Diff line change
Expand Up @@ -215,4 +215,19 @@ public static class UART extends Pointer {

// USB3 phy config
public native @ByRef BoolOptional usb3PhyInternalClock(); public native BoardConfig usb3PhyInternalClock(BoolOptional setter);

// MIPI 4Lane RGB config
public native @ByRef BoolOptional mipi4LaneRgb(); public native BoardConfig mipi4LaneRgb(BoolOptional setter);

// eMMC config
public native @ByRef BoolOptional emmc(); public native BoardConfig emmc(BoolOptional setter);

// log path
public native @ByRef StringOptional logPath(); public native BoardConfig logPath(StringOptional setter);

// Max log size
public native @ByRef SizeTOptional logSizeMax(); public native BoardConfig logSizeMax(SizeTOptional setter);

// log verbosity
public native @ByRef LogLevelOptional logVerbosity(); public native BoardConfig logVerbosity(LogLevelOptional setter);
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
// Targeted by JavaCPP version 1.5.8-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("std::tuple<bool,std::string,std::vector<uint8_t> >") @Properties(inherit = org.bytedeco.depthai.presets.depthai.class)
public class BoolStringByteVectorTuple extends Pointer {
static { Loader.load(); }
/** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */
public BoolStringByteVectorTuple(Pointer p) { super(p); }
public BoolStringByteVectorTuple(@Cast("bool") boolean value0, @StdString BytePointer value1, @ByRef ByteVector value2) { allocate(value0, value1, value2); }
private native void allocate(@Cast("bool") boolean value0, @StdString BytePointer value1, @ByRef ByteVector value2);
public BoolStringByteVectorTuple() { allocate(); }
private native void allocate();
public native @Name("operator =") @ByRef BoolStringByteVectorTuple put(@ByRef BoolStringByteVectorTuple x);

public @Cast("bool") boolean get0() { return get0(this); }
@Namespace @Name("std::get<0>") public static native @Cast("bool") boolean get0(@ByRef BoolStringByteVectorTuple container);
public @StdString BytePointer get1() { return get1(this); }
@Namespace @Name("std::get<1>") public static native @StdString BytePointer get1(@ByRef BoolStringByteVectorTuple container);
public @ByRef ByteVector get2() { return get2(this); }
@Namespace @Name("std::get<2>") public static native @ByRef ByteVector get2(@ByRef BoolStringByteVectorTuple container);
}

87 changes: 87 additions & 0 deletions depthai/src/gen/java/org/bytedeco/depthai/ByteVector.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
// Targeted by JavaCPP version 1.5.8-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::vector<uint8_t>") @Properties(inherit = org.bytedeco.depthai.presets.depthai.class)
public class ByteVector extends Pointer {
static { Loader.load(); }
/** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */
public ByteVector(Pointer p) { super(p); }
public ByteVector(byte value) { this(1); put(0, value); }
public ByteVector(byte ... array) { this(array.length); put(array); }
public ByteVector() { allocate(); }
public ByteVector(long n) { allocate(n); }
private native void allocate();
private native void allocate(@Cast("size_t") long n);
public native @Name("operator =") @ByRef ByteVector put(@ByRef ByteVector x);

public boolean empty() { return size() == 0; }
public native long size();
public void clear() { resize(0); }
public native void resize(@Cast("size_t") long n);

@Index(function = "at") public native @Cast("uint8_t") byte get(@Cast("size_t") long i);
public native ByteVector put(@Cast("size_t") long i, byte value);

public native @ByVal Iterator insert(@ByVal Iterator pos, @Cast("uint8_t") byte value);
public native @ByVal Iterator 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 *") @Cast("uint8_t") byte get();
}

public byte[] get() {
byte[] array = new byte[size() < Integer.MAX_VALUE ? (int)size() : Integer.MAX_VALUE];
for (int i = 0; i < array.length; i++) {
array[i] = get(i);
}
return array;
}
@Override public String toString() {
return java.util.Arrays.toString(get());
}

public byte pop_back() {
long size = size();
byte value = get(size - 1);
resize(size - 1);
return value;
}
public ByteVector push_back(byte value) {
long size = size();
resize(size + 1);
return put(size, value);
}
public ByteVector put(byte value) {
if (size() != 1) { resize(1); }
return put(0, value);
}
public ByteVector put(byte ... array) {
if (size() != array.length) { resize(array.length); }
for (int i = 0; i < array.length; i++) {
put(i, array[i]);
}
return this;
}
}

Original file line number Diff line number Diff line change
Expand Up @@ -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), THE_13_MP(3);
public enum SensorResolution { THE_1080_P(0), THE_4_K(1), THE_12_MP(2), THE_13_MP(3), THE_720_P(4), THE_800_P(5);

public final int value;
private SensorResolution(int v) { this.value = v; }
Expand Down
16 changes: 16 additions & 0 deletions depthai/src/gen/java/org/bytedeco/depthai/DeviceBase.java
Original file line number Diff line number Diff line change
Expand Up @@ -581,6 +581,22 @@ public static class Config extends Pointer {
*/
public native @ByVal CalibrationHandler readFactoryCalibrationOrDefault();

/**
* Fetches the raw EEPROM data from User area
*
* @throws std::runtime_exception if any error occured
* @return Binary dump of User area EEPROM data
*/
public native @Cast("std::uint8_t*") @StdVector BytePointer readCalibrationRaw();

/**
* Fetches the raw EEPROM data from Factory area
*
* @throws std::runtime_exception if any error occured
* @return Binary dump of Factory area EEPROM data
*/
public native @Cast("std::uint8_t*") @StdVector BytePointer readFactoryCalibrationRaw();

/**
* Retrieves USB connection speed
*
Expand Down
Loading

0 comments on commit 2db165e

Please sign in to comment.