* Upgrade presets for OpenCV 4.5.0, DNNL 1.6.4, SciPy 1.5.3, ONNX Ru…

…ntime 1.5.2, cpu_features 0.6.0
bytedeco · Oct 23, 2020 · d3e2a83 · d3e2a83
1 parent 23ff350
commit d3e2a83
Show file tree

Hide file tree

Showing 127 changed files with 2,032 additions and 642 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,7 +4,7 @@
  * Disable assembly optimizations for libx264 with FFmpeg on Mac to work around crashes ([issue bytedeco/javacv#1519](https://github.com/bytedeco/javacv/issues/1519))
  * Add `linux-armhf` and `linux-arm64` builds for librealsense and librealsense2 ([pull #951](https://github.com/bytedeco/javacpp-presets/pull/951))
  * License default builds of FFmpeg under LGPL v3 and move GPL-enabled builds to `-gpl` extension ([pull #950](https://github.com/bytedeco/javacpp-presets/pull/950))
- * Upgrade presets for librealsense2 2.38.1 ([pull #946](https://github.com/bytedeco/javacpp-presets/pull/946)), DNNL 1.6.3, NumPy 1.19.2, Gym 0.17.3, LLVM 11.0.0 ([pull #955](https://github.com/bytedeco/javacpp-presets/pull/955)), TensorFlow 1.15.4, ONNX Runtime 1.5.1, Qt 5.15.1, cpu_features 0.5.0, and their dependencies
+ * Upgrade presets for OpenCV 4.5.0, librealsense2 2.38.1 ([pull #946](https://github.com/bytedeco/javacpp-presets/pull/946)), DNNL 1.6.4, NumPy 1.19.2, SciPy 1.5.3, Gym 0.17.3, LLVM 11.0.0 ([pull #955](https://github.com/bytedeco/javacpp-presets/pull/955)), TensorFlow 1.15.4, ONNX Runtime 1.5.2, Qt 5.15.1, cpu_features 0.6.0, and their dependencies
 
 ### September 9, 2020 version 1.5.4
  * Bundle `libpostal_data` program, executable via `Loader.load()` for convenience ([issue #939](https://github.com/bytedeco/javacpp-presets/issues/939))

diff --git a/README.md b/README.md
@@ -106,7 +106,7 @@ The JavaCPP Presets depend on Maven, a powerful build system for Java, so before
 
 Each child module in turn relies by default on the included [`cppbuild.sh` scripts](#the-cppbuildsh-scripts), explained below, to install its corresponding native libraries in the `cppbuild` subdirectory. To use native libraries already installed somewhere else on the system, other installation directories than `cppbuild` can also be specified either in the `pom.xml` files or in the `.java` configuration files. The following versions are supported:
 
- * OpenCV 4.4.0  https://opencv.org/releases.html
+ * OpenCV 4.5.0  https://opencv.org/releases.html
  * FFmpeg 4.3.x  http://ffmpeg.org/download.html
  * FlyCapture 2.13.x  https://www.flir.com/products/flycapture-sdk
  * Spinnaker 1.27.x https://www.flir.com/products/spinnaker-sdk
@@ -149,11 +149,11 @@ Each child module in turn relies by default on the included [`cppbuild.sh` scrip
  * The Arcade Learning Environment 0.6.x  https://github.com/mgbellemare/Arcade-Learning-Environment
  * ONNX 1.7.0  https://github.com/onnx/onnx
  * nGraph 0.26.0  https://github.com/NervanaSystems/ngraph
- * ONNX Runtime 1.4.x  https://github.com/microsoft/onnxruntime
+ * ONNX Runtime 1.5.x  https://github.com/microsoft/onnxruntime
  * LiquidFun  http://google.github.io/liquidfun/
  * Qt 5.15.x  https://download.qt.io/archive/qt/
  * Mono/Skia 2.80.x  https://github.com/mono/skia
- * cpu_features 0.5.0  https://github.com/google/cpu_features
+ * cpu_features 0.6.0  https://github.com/google/cpu_features
  * 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/caffe/platform/gpu/pom.xml b/caffe/platform/gpu/pom.xml
@@ -24,7 +24,7 @@
     <dependency>
       <groupId>org.bytedeco</groupId>
       <artifactId>opencv-platform</artifactId>
-      <version>4.4.0-${project.parent.version}</version>
+      <version>4.5.0-${project.parent.version}</version>
     </dependency>
     <dependency>
       <groupId>org.bytedeco</groupId>

diff --git a/caffe/platform/pom.xml b/caffe/platform/pom.xml
@@ -23,7 +23,7 @@
     <dependency>
       <groupId>org.bytedeco</groupId>
       <artifactId>opencv-platform</artifactId>
-      <version>4.4.0-${project.parent.version}</version>
+      <version>4.5.0-${project.parent.version}</version>
     </dependency>
     <dependency>
       <groupId>org.bytedeco</groupId>

diff --git a/caffe/pom.xml b/caffe/pom.xml
@@ -26,7 +26,7 @@
     <dependency>
       <groupId>org.bytedeco</groupId>
       <artifactId>opencv</artifactId>
-      <version>4.4.0-${project.parent.version}</version>
+      <version>4.5.0-${project.parent.version}</version>
     </dependency>
     <dependency>
       <groupId>org.bytedeco</groupId>
@@ -59,7 +59,7 @@
           <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>opencv</artifactId>
-            <version>4.4.0-${project.parent.version}</version>
+            <version>4.5.0-${project.parent.version}</version>
           </dependency>
           <dependency>
             <groupId>org.bytedeco</groupId>
@@ -74,7 +74,7 @@
           <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>opencv</artifactId>
-            <version>4.4.0-${project.parent.version}</version>
+            <version>4.5.0-${project.parent.version}</version>
             <classifier>${javacpp.platform}</classifier>
           </dependency>
           <dependency>

diff --git a/chilitags/platform/pom.xml b/chilitags/platform/pom.xml
@@ -23,7 +23,7 @@
     <dependency>
       <groupId>org.bytedeco</groupId>
       <artifactId>opencv-platform</artifactId>
-      <version>4.4.0-${project.parent.version}</version>
+      <version>4.5.0-${project.parent.version}</version>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>

diff --git a/chilitags/pom.xml b/chilitags/pom.xml
@@ -24,7 +24,7 @@
     <dependency>
       <groupId>org.bytedeco</groupId>
       <artifactId>opencv</artifactId>
-      <version>4.4.0-${project.parent.version}</version>
+      <version>4.5.0-${project.parent.version}</version>
     </dependency>
     <dependency>
       <groupId>org.bytedeco</groupId>
@@ -52,7 +52,7 @@
           <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>opencv</artifactId>
-            <version>4.4.0-${project.parent.version}</version>
+            <version>4.5.0-${project.parent.version}</version>
           </dependency>
           <dependency>
             <groupId>org.bytedeco</groupId>
@@ -63,7 +63,7 @@
           <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>opencv</artifactId>
-            <version>4.4.0-${project.parent.version}</version>
+            <version>4.5.0-${project.parent.version}</version>
             <classifier>${javacpp.platform}</classifier>
           </dependency>
         </dependencies>

diff --git a/ci/install-travis.sh b/ci/install-travis.sh
@@ -47,12 +47,10 @@ else
     MAVEN_RELEASE="-Dmaven.javadoc.skip=true"
 fi
 
-if [ "$TRAVIS_OS_NAME" == "osx" ]; then export JAVA_HOME=$(/usr/libexec/java_home); fi
-
 if [[ "$OS" == "linux-x86" ]] || [[ "$OS" == "linux-x86_64" ]] || [[ "$OS" =~ android ]]; then
   CENTOS_VERSION=6
   SCL_ENABLE="devtoolset-7 rh-python36 python27"
-  if [[ "hyperscan tensorflow onnx ngraph onnxruntime qt skia " =~ "$PROJ " ]] || [[ "$OS" =~ android ]]; then
+  if [[ "hyperscan tensorflow ngraph qt skia " =~ "$PROJ " ]] || [[ "$OS" =~ android ]]; then
     CENTOS_VERSION=7
     SCL_ENABLE="devtoolset-7"
   fi
@@ -231,6 +229,7 @@ if [ "$TRAVIS_OS_NAME" == "osx" ]; then
    brew tap AdoptOpenJDK/openjdk
    brew cask install adoptopenjdk8
    export JAVA_HOME=$(/usr/libexec/java_home -v1.8)
+   export _JAVA_OPTIONS=-Xmx2048m
 
    # Try to use ccache to speed up the build and work around issue with Sectigo CA root certificate
    export PATH=/usr/local/opt/ccache/libexec/:/usr/local/opt/curl/bin/:/usr/local/opt/gpg1/libexec/gpgbin/:/usr/local/opt/bison/bin/:/usr/local/opt/flex/bin/:$PATH

diff --git a/cpu_features/README.md b/cpu_features/README.md
@@ -5,7 +5,7 @@ Introduction
 ------------
 This directory contains the JavaCPP Presets module for:
 
- * cpu_features 0.5.0  https://github.com/google/cpu_features
+ * cpu_features 0.6.0  https://github.com/google/cpu_features
 
 Please refer to the parent README.md file for more detailed information about the JavaCPP Presets.
 
@@ -42,7 +42,7 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic
         <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>cpu_features-platform</artifactId>
-            <version>0.5.0-1.5.5-SNAPSHOT</version>
+            <version>0.6.0-1.5.5-SNAPSHOT</version>
         </dependency>
     </dependencies>
     <build>

diff --git a/cpu_features/cppbuild.sh b/cpu_features/cppbuild.sh
@@ -7,7 +7,7 @@ if [[ -z "$PLATFORM" ]]; then
     exit
 fi
 
-CPU_FEATURES_VERSION=0.5.0
+CPU_FEATURES_VERSION=0.6.0
 download https://github.com/google/cpu_features/archive/v$CPU_FEATURES_VERSION.tar.gz cpu_features-$CPU_FEATURES_VERSION.tar.gz
 
 mkdir -p $PLATFORM
@@ -63,6 +63,7 @@ case $PLATFORM in
         sedinplace 's/GetXCR0Eax(void);/GetXCR0Eax(void) { }/g' include/internal/cpuid_x86.h
         sedinplace 's/set(PROCESSOR_IS_ARM FALSE)/set(PROCESSOR_IS_ARM TRUE)/g' CMakeLists.txt
         sedinplace 's/set(PROCESSOR_IS_X86 TRUE)/set(PROCESSOR_IS_X86 FALSE)/g' CMakeLists.txt
+        sedinplace 's/(HardwareCapabilities)//g' src/define_tables.h
         CC="arm-linux-gnueabihf-gcc -fPIC" $CMAKE -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=.. -DCMAKE_INSTALL_LIBDIR="lib" .
         make -j4
         make install

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

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

diff --git a/cpu_features/samples/pom.xml b/cpu_features/samples/pom.xml
@@ -10,7 +10,7 @@
         <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>cpu_features-platform</artifactId>
-            <version>0.5.0-1.5.5-SNAPSHOT</version>
+            <version>0.6.0-1.5.5-SNAPSHOT</version>
         </dependency>
     </dependencies>
     <build>