Skip to content

Commit

Permalink
* Upgrade presets for OpenBLAS 0.3.21 (issue #1171), CPython 3.10.6,…
Browse files Browse the repository at this point in the history
… PyTorch 1.12.1, DepthAI 2.17.2, ONNX Runtime 1.12.1, OpenSSL 3.0.5
  • Loading branch information
saudet committed Aug 10, 2022
1 parent e24c53d commit 7d9084f
Show file tree
Hide file tree
Showing 74 changed files with 22,211 additions and 11,814 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,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.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.1, 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.12.0, TVM 0.9.0, 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.1, HDF5 1.12.2, DNNL 2.6.1, OpenBLAS 0.3.21 ([issue #1171](https://github.com/bytedeco/javacpp-presets/issues/1171)), CPython 3.10.6, NumPy 1.23.1, SciPy 1.9.0, Gym 0.25.1, 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.1, TensorFlow Lite 2.9.1, Triton Inference Server 2.21.0, ALE 0.7.5, DepthAI 2.17.2, ONNX 1.12.0, ONNX Runtime 1.12.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
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ Each child module in turn relies by default on the included [`cppbuild.sh` scrip
* MKL 2022.x https://software.intel.com/mkl
* MKL-DNN 0.21.x https://github.com/oneapi-src/oneDNN
* DNNL 2.6.x https://github.com/oneapi-src/oneDNN
* OpenBLAS 0.3.20 http://www.openblas.net/
* OpenBLAS 0.3.21 http://www.openblas.net/
* ARPACK-NG 3.8.0 https://github.com/opencollab/arpack-ng
* CMINPACK 1.3.8 https://github.com/devernay/cminpack
* FFTW 3.3.10 http://www.fftw.org/download.html
Expand Down
2 changes: 1 addition & 1 deletion arpack-ng/platform/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<dependency>
<groupId>org.bytedeco</groupId>
<artifactId>openblas-platform</artifactId>
<version>0.3.20-${project.parent.version}</version>
<version>0.3.21-${project.parent.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
Expand Down
6 changes: 3 additions & 3 deletions arpack-ng/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<dependency>
<groupId>org.bytedeco</groupId>
<artifactId>openblas</artifactId>
<version>0.3.20-${project.parent.version}</version>
<version>0.3.21-${project.parent.version}</version>
</dependency>
<dependency>
<groupId>org.bytedeco</groupId>
Expand All @@ -45,12 +45,12 @@
<dependency>
<groupId>org.bytedeco</groupId>
<artifactId>openblas</artifactId>
<version>0.3.20-${project.parent.version}</version>
<version>0.3.21-${project.parent.version}</version>
</dependency>
<dependency>
<groupId>org.bytedeco</groupId>
<artifactId>openblas</artifactId>
<version>0.3.20-${project.parent.version}</version>
<version>0.3.21-${project.parent.version}</version>
<classifier>${javacpp.platform}</classifier>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion arrow/cppbuild.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ if [[ $PLATFORM == windows* ]]; then
fi

LLVM_VERSION=14.0.6
OPENSSL_VERSION=3.0.2
OPENSSL_VERSION=3.0.5
ZLIB_VERSION=1.2.12
PROTO_VERSION=3.17.3 # cpp/thirdparty/versions.txt
ARROW_VERSION=6.0.1
Expand Down
2 changes: 1 addition & 1 deletion caffe/platform/gpu/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
<dependency>
<groupId>org.bytedeco</groupId>
<artifactId>openblas-platform</artifactId>
<version>0.3.20-${project.parent.version}</version>
<version>0.3.21-${project.parent.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
Expand Down
2 changes: 1 addition & 1 deletion caffe/platform/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<dependency>
<groupId>org.bytedeco</groupId>
<artifactId>openblas-platform</artifactId>
<version>0.3.20-${project.parent.version}</version>
<version>0.3.21-${project.parent.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
Expand Down
6 changes: 3 additions & 3 deletions caffe/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<dependency>
<groupId>org.bytedeco</groupId>
<artifactId>openblas</artifactId>
<version>0.3.20-${project.parent.version}</version>
<version>0.3.21-${project.parent.version}</version>
</dependency>
<dependency>
<groupId>org.bytedeco</groupId>
Expand Down Expand Up @@ -61,7 +61,7 @@
<dependency>
<groupId>org.bytedeco</groupId>
<artifactId>openblas</artifactId>
<version>0.3.20-${project.parent.version}</version>
<version>0.3.21-${project.parent.version}</version>
</dependency>
<dependency>
<groupId>org.bytedeco</groupId>
Expand All @@ -78,7 +78,7 @@
<dependency>
<groupId>org.bytedeco</groupId>
<artifactId>openblas</artifactId>
<version>0.3.20-${project.parent.version}</version>
<version>0.3.21-${project.parent.version}</version>
<classifier>${javacpp.platform}</classifier>
</dependency>
</dependencies>
Expand Down
4 changes: 2 additions & 2 deletions chilitags/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
<dependency>
<groupId>org.bytedeco</groupId>
<artifactId>openblas</artifactId>
<version>0.3.20-${project.parent.version}</version>
<version>0.3.21-${project.parent.version}</version>
</dependency>
<dependency>
<groupId>org.bytedeco</groupId>
Expand All @@ -51,7 +51,7 @@
<dependency>
<groupId>org.bytedeco</groupId>
<artifactId>openblas</artifactId>
<version>0.3.20-${project.parent.version}</version>
<version>0.3.21-${project.parent.version}</version>
<classifier>${javacpp.platform}</classifier>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion cminpack/platform/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<dependency>
<groupId>org.bytedeco</groupId>
<artifactId>openblas-platform</artifactId>
<version>0.3.20-${project.parent.version}</version>
<version>0.3.21-${project.parent.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
Expand Down
6 changes: 3 additions & 3 deletions cminpack/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<dependency>
<groupId>org.bytedeco</groupId>
<artifactId>openblas</artifactId>
<version>0.3.20-${project.parent.version}</version>
<version>0.3.21-${project.parent.version}</version>
</dependency>
<dependency>
<groupId>org.bytedeco</groupId>
Expand All @@ -41,12 +41,12 @@
<dependency>
<groupId>org.bytedeco</groupId>
<artifactId>openblas</artifactId>
<version>0.3.20-${project.parent.version}</version>
<version>0.3.21-${project.parent.version}</version>
</dependency>
<dependency>
<groupId>org.bytedeco</groupId>
<artifactId>openblas</artifactId>
<version>0.3.20-${project.parent.version}</version>
<version>0.3.21-${project.parent.version}</version>
<classifier>${javacpp.platform}</classifier>
</dependency>
</dependencies>
Expand Down
4 changes: 2 additions & 2 deletions cpython/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Introduction
------------
This directory contains the JavaCPP Presets module for:

* CPython 3.10.5 https://www.python.org/
* CPython 3.10.6 https://www.python.org/

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

Expand Down Expand Up @@ -54,7 +54,7 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic
<dependency>
<groupId>org.bytedeco</groupId>
<artifactId>cpython-platform</artifactId>
<version>3.10.5-1.5.8-SNAPSHOT</version>
<version>3.10.6-1.5.8-SNAPSHOT</version>
</dependency>
</dependencies>
<build>
Expand Down
4 changes: 2 additions & 2 deletions cpython/cppbuild.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ if [[ -z "$PLATFORM" ]]; then
exit
fi

OPENSSL=openssl-3.0.2
CPYTHON_VERSION=3.10.5
OPENSSL=openssl-3.0.5
CPYTHON_VERSION=3.10.6
download https://www.openssl.org/source/$OPENSSL.tar.gz $OPENSSL.tar.gz
download https://www.python.org/ftp/python/$CPYTHON_VERSION/Python-$CPYTHON_VERSION.tgz Python-$CPYTHON_VERSION.tgz

Expand Down
2 changes: 1 addition & 1 deletion cpython/platform/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

<groupId>org.bytedeco</groupId>
<artifactId>cpython-platform</artifactId>
<version>3.10.5-${project.parent.version}</version>
<version>3.10.6-${project.parent.version}</version>
<name>JavaCPP Presets Platform for CPython</name>

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

<groupId>org.bytedeco</groupId>
<artifactId>cpython</artifactId>
<version>3.10.5-${project.parent.version}</version>
<version>3.10.6-${project.parent.version}</version>
<name>JavaCPP Presets for CPython</name>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion cpython/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>cpython-platform</artifactId>
<version>3.10.5-1.5.8-SNAPSHOT</version>
<version>3.10.6-1.5.8-SNAPSHOT</version>
</dependency>
</dependencies>
<build>
Expand Down
14 changes: 9 additions & 5 deletions cpython/src/gen/java/org/bytedeco/cpython/global/python.java
Original file line number Diff line number Diff line change
Expand Up @@ -187,12 +187,12 @@ There is also (independent) API version information in modsupport.h.
/*--start constants--*/
public static final int PY_MAJOR_VERSION = 3;
public static final int PY_MINOR_VERSION = 10;
public static final int PY_MICRO_VERSION = 5;
public static final int PY_MICRO_VERSION = 6;
public static final int PY_RELEASE_LEVEL = PY_RELEASE_LEVEL_FINAL;
public static final int PY_RELEASE_SERIAL = 0;

/* Version as a string */
public static final String PY_VERSION = "3.10.5";
public static final String PY_VERSION = "3.10.6";
/*--end constants--*/

/* Version as a single 4-byte hex number, e.g. 0x010502B2 == 1.5.2b2.
Expand Down Expand Up @@ -355,7 +355,7 @@ There is also (independent) API version information in modsupport.h.
public static final int HAVE_CLOCK_SETTIME = 1;

/* Define to 1 if you have the `close_range' function. */
/* #undef HAVE_CLOSE_RANGE */
public static final int HAVE_CLOSE_RANGE = 1;

/* Define if the C compiler supports computed gotos. */
public static final int HAVE_COMPUTED_GOTOS = 1;
Expand Down Expand Up @@ -1664,7 +1664,7 @@ There is also (independent) API version information in modsupport.h.
/* #undef SETPGRP_HAVE_ARG */

/* Define to 1 if you must link with -lrt for shm_open(). */
public static final int SHM_NEEDS_LIBRT = 1;
/* #undef SHM_NEEDS_LIBRT */

/* Define if i>>j for signed int i does not extend the sign bit when i < 0 */
/* #undef SIGNED_RIGHT_SHIFT_ZERO_FILLS */
Expand Down Expand Up @@ -1858,7 +1858,7 @@ significant byte first (like Motorola and SPARC, unlike Intel). */
public static final String _PYTHONFRAMEWORK = "";

/* Define to force use of thread-safe errno, h_errno, and other functions */
/* #undef _REENTRANT */
public static final int _REENTRANT = 1;

/* Define to the level of X/Open that your system supports */
public static final int _XOPEN_SOURCE = 700;
Expand Down Expand Up @@ -12763,6 +12763,10 @@ To leave the block in the middle (e.g., with return), you must insert

public static native @Const _frozen PyImport_FrozenModules(); public static native void PyImport_FrozenModules(_frozen setter);

@NoException public static native PyObject _PyImport_GetModuleAttr(PyObject arg0, PyObject arg1);
@NoException public static native PyObject _PyImport_GetModuleAttrString(@Cast("const char*") BytePointer arg0, @Cast("const char*") BytePointer arg1);
@NoException public static native PyObject _PyImport_GetModuleAttrString(String arg0, String arg1);


// Parsed from abstract.h

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.17.0 https://luxonis.com/depthai
* DepthAI 2.17.2 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.17.0-1.5.8-SNAPSHOT</version>
<version>2.17.2-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.17.0
DEPTHAI_VERSION=2.17.2
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.17.0-${project.parent.version}</version>
<version>2.17.2-${project.parent.version}</version>
<name>JavaCPP Presets Platform for DepthAI</name>

<properties>
Expand Down
6 changes: 3 additions & 3 deletions 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.17.0-${project.parent.version}</version>
<version>2.17.2-${project.parent.version}</version>
<name>JavaCPP Presets for DepthAI</name>

<dependencies>
Expand Down Expand Up @@ -42,7 +42,7 @@
<dependency>
<groupId>org.bytedeco</groupId>
<artifactId>openblas</artifactId>
<version>0.3.20-${project.parent.version}</version>
<version>0.3.21-${project.parent.version}</version>
</dependency>
<dependency>
<groupId>org.bytedeco</groupId>
Expand All @@ -52,7 +52,7 @@
<dependency>
<groupId>org.bytedeco</groupId>
<artifactId>openblas</artifactId>
<version>0.3.20-${project.parent.version}</version>
<version>0.3.21-${project.parent.version}</version>
<classifier>${javacpp.platform}</classifier>
</dependency>
<dependency>
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.17.0-1.5.8-SNAPSHOT</version>
<version>2.17.2-1.5.8-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.bytedeco</groupId>
Expand Down
29 changes: 29 additions & 0 deletions depthai/src/gen/java/org/bytedeco/depthai/ColorCamera.java
Original file line number Diff line number Diff line change
Expand Up @@ -145,24 +145,42 @@ public class ColorCamera extends ColorCameraPropertiesNode {
/** Set preview output size, as a tuple <width, height> */
public native void setPreviewSize(@ByVal @Cast("std::tuple<int,int>*") Pointer size);

/** Set number of frames in preview pool */
public native void setPreviewNumFramesPool(int num);

/** Set video output size */
public native void setVideoSize(int width, int height);

/** Set video output size, as a tuple <width, height> */
public native void setVideoSize(@ByVal @Cast("std::tuple<int,int>*") Pointer size);

/** Set number of frames in preview pool */
public native void setVideoNumFramesPool(int num);

/** Set still output size */
public native void setStillSize(int width, int height);

/** Set still output size, as a tuple <width, height> */
public native void setStillSize(@ByVal @Cast("std::tuple<int,int>*") Pointer size);

/** Set number of frames in preview pool */
public native void setStillNumFramesPool(int num);

/** Set sensor resolution */
public native void setResolution(@ByVal ColorCameraProperties.SensorResolution resolution);

/** Get sensor resolution */
public native @ByVal ColorCameraProperties.SensorResolution getResolution();

/** Set number of frames in raw pool */
public native void setRawNumFramesPool(int num);

/** Set number of frames in isp pool */
public native void setIspNumFramesPool(int num);

/** Set number of frames in all pools */
public native void setNumFramesPool(int raw, int isp, int preview, int video, int still);

/**
* Set 'isp' output scaling (numerator/denominator), preserving the aspect ratio.
* The fraction numerator/denominator is simplified first to a irreducible form,
Expand Down Expand Up @@ -281,4 +299,15 @@ public class ColorCamera extends ColorCameraPropertiesNode {
* @return Preview keep aspect ratio option
*/
public native @Cast("bool") boolean getPreviewKeepAspectRatio();

/** Get number of frames in preview pool */
public native int getPreviewNumFramesPool();
/** Get number of frames in video pool */
public native int getVideoNumFramesPool();
/** Get number of frames in still pool */
public native int getStillNumFramesPool();
/** Get number of frames in raw pool */
public native int getRawNumFramesPool();
/** Get number of frames in isp pool */
public native int getIspNumFramesPool();
}
Loading

0 comments on commit 7d9084f

Please sign in to comment.