* Upgrade presets for libdc1394 2.2.6, OpenBLAS 0.3.6, NumPy 1.16.3,…

… ONNX 1.5.0, Qt 5.12.3, and cpu_features 0.3.0
bytedeco · May 8, 2019 · 102ef1d · 102ef1d
1 parent bb51483
commit 102ef1d
Show file tree

Hide file tree

Showing 899 changed files with 3,088 additions and 2,663 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,7 +6,7 @@
  * Load the symbols from the `python` library globally as often required by Python libraries ([issue ContinuumIO/anaconda-issues#6401](https://github.com/ContinuumIO/anaconda-issues/issues/6401))
  * Link OpenCV with OpenBLAS/MKL to accelerate some matrix operations
  * Add presets for the `quality` module of OpenCV
- * Upgrade presets for OpenCV 4.1.0, CPython 3.7.3, nGraph 0.18.1
+ * Upgrade presets for OpenCV 4.1.0, libdc1394 2.2.6, OpenBLAS 0.3.6, CPython 3.7.3, NumPy 1.16.3, ONNX 1.5.0, nGraph 0.18.1, Qt 5.12.3, cpu_features 0.3.0, and their dependencies
 
 ### April 11, 2019 version 1.5
  * Include `setlocale()` in presets for Tesseract to work around issues with locale ([issue #694](https://github.com/bytedeco/javacpp-presets/issues/694))

diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 JavaCPP Presets
 ===============
 
-[![Join the chat at https://gitter.im/bytedeco/javacpp](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/bytedeco/javacpp?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/org.bytedeco/javacpp-presets/badge.svg)](https://maven-badges.herokuapp.com/maven-central/org.bytedeco/javacpp-presets) [![Sonatype Nexus (Snapshots)](https://img.shields.io/nexus/s/https/oss.sonatype.org/org.bytedeco/javacpp-presets.svg)](http://bytedeco.org/builds/) <sup>Android, iOS, Linux, Mac OS X:</sup> [![Travis CI](https://travis-ci.org/bytedeco/javacpp-presets.svg?branch=master)](https://travis-ci.org/bytedeco/javacpp-presets) <sup>Windows:</sup> [![AppVeyor](https://ci.appveyor.com/api/projects/status/github/bytedeco/javacpp-presets?branch=master&svg=true)](https://ci.appveyor.com/project/bytedeco/javacpp-presets)
+[![Gitter](https://badges.gitter.im/bytedeco/javacpp.svg)](https://gitter.im/bytedeco/javacpp) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/org.bytedeco/javacpp-presets/badge.svg)](https://maven-badges.herokuapp.com/maven-central/org.bytedeco/javacpp-presets) [![Sonatype Nexus (Snapshots)](https://img.shields.io/nexus/s/https/oss.sonatype.org/org.bytedeco/javacpp-presets.svg)](http://bytedeco.org/builds/) <sup>Android, iOS, Linux, Mac OS X:</sup> [![Travis CI](https://travis-ci.org/bytedeco/javacpp-presets.svg?branch=master)](https://travis-ci.org/bytedeco/javacpp-presets) <sup>Windows:</sup> [![AppVeyor](https://ci.appveyor.com/api/projects/status/github/bytedeco/javacpp-presets?branch=master&svg=true)](https://ci.appveyor.com/project/bytedeco/javacpp-presets)
 
 
 Introduction
@@ -121,13 +121,13 @@ Each child module in turn relies by default on the included [`cppbuild.sh` scrip
  * HDF5 1.10.5 https://www.hdfgroup.org/downloads/
  * MKL 2019.3 https://software.intel.com/intel-mkl
  * MKL-DNN 0.18.1 https://github.com/intel/mkl-dnn
- * OpenBLAS 0.3.5 http://www.openblas.net/
+ * OpenBLAS 0.3.6 http://www.openblas.net/
  * ARPACK-NG 3.7.0 https://github.com/opencollab/arpack-ng
  * CMINPACK 1.3.6 https://github.com/devernay/cminpack
  * FFTW 3.3.8 http://www.fftw.org/download.html
  * GSL 2.5 http://www.gnu.org/software/gsl/#downloading
  * CPython 3.7.3 https://www.python.org/downloads/
- * NumPy 1.16.2 https://github.com/numpy/numpy
+ * NumPy 1.16.3 https://github.com/numpy/numpy
  * LLVM 8.0.0 http://llvm.org/releases/download.html
  * libpostal 1.1-alpha https://github.com/openvenues/libpostal
  * Leptonica 1.78.0 http://www.leptonica.org/download.html
@@ -140,12 +140,12 @@ Each child module in turn relies by default on the included [`cppbuild.sh` scrip
  * TensorFlow 1.13.1 https://github.com/tensorflow/tensorflow
  * TensorRT 5.1 https://developer.nvidia.com/tensorrt
  * The Arcade Learning Environment 0.6.0 https://github.com/mgbellemare/Arcade-Learning-Environment
- * ONNX 1.4.1 https://github.com/onnx/onnx
+ * ONNX 1.5.0 https://github.com/onnx/onnx
  * nGraph 0.18.1 https://github.com/NervanaSystems/ngraph
  * LiquidFun http://google.github.io/liquidfun/
- * Qt 5.12.2 https://download.qt.io/archive/qt/
+ * Qt 5.12.3 https://download.qt.io/archive/qt/
  * Mono/Skia 1.68.0 https://github.com/mono/skia
- * cpu_features 0.2.0 https://github.com/google/cpu_features
+ * cpu_features 0.3.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/arpack-ng/platform/pom.xml b/arpack-ng/platform/pom.xml
@@ -25,7 +25,7 @@
  <dependency>
  <groupId>org.bytedeco</groupId>
  <artifactId>openblas-platform</artifactId>
- <version>0.3.5-${project.parent.version}</version>
+ <version>0.3.6-${project.parent.version}</version>
  </dependency>
  <dependency>
  <groupId>${project.groupId}</groupId>

diff --git a/arpack-ng/pom.xml b/arpack-ng/pom.xml
@@ -23,7 +23,7 @@
  <dependency>
  <groupId>org.bytedeco</groupId>
  <artifactId>openblas</artifactId>
- <version>0.3.5-${project.parent.version}</version>
+ <version>0.3.6-${project.parent.version}</version>
  </dependency>
  <dependency>
  <groupId>org.bytedeco</groupId>
@@ -46,12 +46,12 @@
  <dependency>
  <groupId>org.bytedeco</groupId>
  <artifactId>openblas</artifactId>
- <version>0.3.5-${project.parent.version}</version>
+ <version>0.3.6-${project.parent.version}</version>
  </dependency>
  <dependency>
  <groupId>org.bytedeco</groupId>
  <artifactId>openblas</artifactId>
- <version>0.3.5-${project.parent.version}</version>
+ <version>0.3.6-${project.parent.version}</version>
  <classifier>${javacpp.platform}</classifier>
  </dependency>
  </dependencies>

diff --git a/arpack-ng/src/gen/java/org/bytedeco/arpackng/global/arpack.java b/arpack-ng/src/gen/java/org/bytedeco/arpackng/global/arpack.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.1-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.arpackng.global;
 

diff --git a/caffe/README.md b/caffe/README.md
@@ -34,42 +34,42 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic
  <modelVersion>4.0.0</modelVersion>
  <groupId>org.bytedeco.caffe</groupId>
  <artifactId>caffe</artifactId>
- <version>1.5</version>
+ <version>1.5.1-SNAPSHOT</version>
  <properties>
  <exec.mainClass>caffe</exec.mainClass>
  </properties>
  <dependencies>
  <dependency>
  <groupId>org.bytedeco</groupId>
  <artifactId>caffe-platform</artifactId>
- <version>1.0-1.5</version>
+ <version>1.0-1.5.1-SNAPSHOT</version>
  </dependency>
 
  <!-- Additional dependencies required to use CUDA and cuDNN -->
  <dependency>
  <groupId>org.bytedeco</groupId>
  <artifactId>caffe</artifactId>
- <version>1.0-1.5</version>
+ <version>1.0-1.5.1-SNAPSHOT</version>
  <classifier>linux-x86_64-gpu</classifier>
  </dependency>
  <dependency>
  <groupId>org.bytedeco</groupId>
  <artifactId>caffe</artifactId>
- <version>1.0-1.5</version>
+ <version>1.0-1.5.1-SNAPSHOT</version>
  <classifier>macosx-x86_64-gpu</classifier>
  </dependency>
 
  <!-- Additional dependencies to use bundled CUDA and cuDNN -->
  <dependency>
  <groupId>org.bytedeco</groupId>
  <artifactId>cuda</artifactId>
- <version>10.1-7.5-1.5</version>
+ <version>10.1-7.5-1.5.1-SNAPSHOT</version>
  <classifier>linux-x86_64-redist</classifier>
  </dependency>
  <dependency>
  <groupId>org.bytedeco</groupId>
  <artifactId>cuda</artifactId>
- <version>10.1-7.5-1.5</version>
+ <version>10.1-7.5-1.5.1-SNAPSHOT</version>
  <classifier>macosx-x86_64-redist</classifier>
  </dependency>
 

diff --git a/caffe/cppbuild.sh b/caffe/cppbuild.sh
@@ -48,19 +48,19 @@ case $PLATFORM in
  ;;
 esac
 
-GLOG=0.3.5
-GFLAGS=2.2.1
-PROTO=3.6.1
-LEVELDB=1.20
+GLOG=0.4.0
+GFLAGS=2.2.2
+PROTO=3.7.1
+LEVELDB=1.22
 SNAPPY=1.1.7
-LMDB=0.9.22
-BOOST=1_68_0
+LMDB=0.9.23
+BOOST=1_70_0
 CAFFE_VERSION=1.0
 
 download https://github.com/google/glog/archive/v$GLOG.tar.gz glog-$GLOG.tar.gz
 download https://github.com/gflags/gflags/archive/v$GFLAGS.tar.gz gflags-$GFLAGS.tar.gz
 download https://github.com/google/protobuf/releases/download/v$PROTO/protobuf-cpp-$PROTO.tar.gz protobuf-$PROTO.tar.gz
-download https://github.com/google/leveldb/archive/v$LEVELDB.tar.gz leveldb-$LEVELDB.tar.gz
+download https://github.com/google/leveldb/archive/$LEVELDB.tar.gz leveldb-$LEVELDB.tar.gz
 download https://github.com/google/snappy/archive/$SNAPPY.tar.gz snappy-$SNAPPY.tar.gz
 download https://github.com/LMDB/lmdb/archive/LMDB_$LMDB.tar.gz lmdb-LMDB_$LMDB.tar.gz
 download http://downloads.sourceforge.net/project/boost/boost/${BOOST//_/.}/boost_$BOOST.tar.gz boost_$BOOST.tar.gz
@@ -106,6 +106,7 @@ export CFLAGS="-fPIC"
 export CXXFLAGS="-fPIC"
 
 cd glog-$GLOG
+./autogen.sh
 ./configure "--prefix=$INSTALL_PATH" --disable-shared
 make -j $MAKEJ
 make install
@@ -124,11 +125,10 @@ make install
 cd ..
 
 cd leveldb-$LEVELDB
-mkdir -p out-static/db out-static/helpers out-static/port out-static/table out-static/util
-mkdir -p out-shared/db out-shared/helpers out-shared/port out-shared/table out-shared/util
+sedinplace 's/cmake_minimum_required.*/cmake_policy(SET CMP0048 NEW)/g' CMakeLists.txt
+"$CMAKE" -DBUILD_SHARED_LIBS=OFF "-DCMAKE_INSTALL_PREFIX=$INSTALL_PATH" -DCMAKE_INSTALL_LIBDIR="lib" .
 make -j $MAKEJ
-cp -a out-static/libleveldb.a "$INSTALL_PATH/lib"
-cp -a include/leveldb "$INSTALL_PATH/include/"
+make install
 cd ..
 
 cd snappy-$SNAPPY

diff --git a/caffe/platform/pom.xml b/caffe/platform/pom.xml
@@ -34,7 +34,7 @@
  <dependency>
  <groupId>org.bytedeco</groupId>
  <artifactId>openblas-platform</artifactId>
- <version>0.3.5-${project.parent.version}</version>
+ <version>0.3.6-${project.parent.version}</version>
  </dependency>
  <dependency>
  <groupId>${project.groupId}</groupId>

diff --git a/caffe/pom.xml b/caffe/pom.xml
@@ -32,7 +32,7 @@
  <dependency>
  <groupId>org.bytedeco</groupId>
  <artifactId>openblas</artifactId>
- <version>0.3.5-${project.parent.version}</version>
+ <version>0.3.6-${project.parent.version}</version>
  </dependency>
  <dependency>
  <groupId>org.bytedeco</groupId>
@@ -65,7 +65,7 @@
  <dependency>
  <groupId>org.bytedeco</groupId>
  <artifactId>openblas</artifactId>
- <version>0.3.5-${project.parent.version}</version>
+ <version>0.3.6-${project.parent.version}</version>
  </dependency>
  <dependency>
  <groupId>org.bytedeco</groupId>
@@ -82,7 +82,7 @@
  <dependency>
  <groupId>org.bytedeco</groupId>
  <artifactId>openblas</artifactId>
- <version>0.3.5-${project.parent.version}</version>
+ <version>0.3.6-${project.parent.version}</version>
  <classifier>${javacpp.platform}</classifier>
  </dependency>
  </dependencies>

diff --git a/caffe/samples/pom.xml b/caffe/samples/pom.xml
@@ -2,42 +2,42 @@
  <modelVersion>4.0.0</modelVersion>
  <groupId>org.bytedeco.caffe</groupId>
  <artifactId>caffe</artifactId>
- <version>1.5</version>
+ <version>1.5.1-SNAPSHOT</version>
  <properties>
  <exec.mainClass>caffe</exec.mainClass>
  </properties>
  <dependencies>
  <dependency>
  <groupId>org.bytedeco</groupId>
  <artifactId>caffe-platform</artifactId>
- <version>1.0-1.5</version>
+ <version>1.0-1.5.1-SNAPSHOT</version>
  </dependency>
 
  <!-- Additional dependencies required to use CUDA and cuDNN -->
  <dependency>
  <groupId>org.bytedeco</groupId>
  <artifactId>caffe</artifactId>
- <version>1.0-1.5</version>
+ <version>1.0-1.5.1-SNAPSHOT</version>
  <classifier>linux-x86_64-gpu</classifier>
  </dependency>
  <dependency>
  <groupId>org.bytedeco</groupId>
  <artifactId>caffe</artifactId>
- <version>1.0-1.5</version>
+ <version>1.0-1.5.1-SNAPSHOT</version>
  <classifier>macosx-x86_64-gpu</classifier>
  </dependency>
 
  <!-- Additional dependencies to use bundled CUDA and cuDNN -->
  <dependency>
  <groupId>org.bytedeco</groupId>
  <artifactId>cuda</artifactId>
- <version>10.1-7.5-1.5</version>
+ <version>10.1-7.5-1.5.1-SNAPSHOT</version>
  <classifier>linux-x86_64-redist</classifier>
  </dependency>
  <dependency>
  <groupId>org.bytedeco</groupId>
  <artifactId>cuda</artifactId>
- <version>10.1-7.5-1.5</version>
+ <version>10.1-7.5-1.5.1-SNAPSHOT</version>
  <classifier>macosx-x86_64-redist</classifier>
  </dependency>
 

diff --git a/caffe/src/gen/java/org/bytedeco/caffe/AccuracyParameter.java b/caffe/src/gen/java/org/bytedeco/caffe/AccuracyParameter.java
@@ -72,16 +72,19 @@ public class AccuracyParameter extends Message {
  public native @Cast("bool") final boolean IsInitialized();
 
  public native @Cast("size_t") final long ByteSizeLong();
+// #if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
+// #else
  public native @Cast("bool") final boolean MergePartialFromCodedStream(
  CodedInputStream input);
+// #endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
  public native final void SerializeWithCachedSizes(
  CodedOutputStream output);
  public native @Cast("google::protobuf::uint8*") final BytePointer InternalSerializeWithCachedSizesToArray(
- @Cast("bool") boolean deterministic, @Cast("google::protobuf::uint8*") BytePointer target);
+ @Cast("google::protobuf::uint8*") BytePointer target);
  public native @Cast("google::protobuf::uint8*") final ByteBuffer InternalSerializeWithCachedSizesToArray(
- @Cast("bool") boolean deterministic, @Cast("google::protobuf::uint8*") ByteBuffer target);
+ @Cast("google::protobuf::uint8*") ByteBuffer target);
  public native @Cast("google::protobuf::uint8*") final byte[] InternalSerializeWithCachedSizesToArray(
- @Cast("bool") boolean deterministic, @Cast("google::protobuf::uint8*") byte[] target);
+ @Cast("google::protobuf::uint8*") byte[] target);
  public native final int GetCachedSize();
 
  public native @ByVal final Metadata GetMetadata();

diff --git a/caffe/src/gen/java/org/bytedeco/caffe/Arena.java b/caffe/src/gen/java/org/bytedeco/caffe/Arena.java
@@ -49,7 +49,7 @@
 //
 // - The type T must have (at least) two constructors: a constructor with no
 // arguments, called when a T is allocated on the heap; and a constructor with
-// a google::protobuf::Arena* argument, called when a T is allocated on an arena. If the
+// a Arena* argument, called when a T is allocated on an arena. If the
 // second constructor is called with a NULL arena pointer, it must be
 // equivalent to invoking the first (no-argument) constructor.
 //
@@ -70,7 +70,9 @@
 // arg1, arg2).
 //
 // This protocol is implemented by all arena-enabled proto2 message classes as
-// well as RepeatedPtrField.
+// well as protobuf container types like RepeatedPtrField and Map. The protocol
+// is internal to protobuf and is not guaranteed to be stable. Non-proto types
+// should not rely on this protocol.
 //
 // Do NOT subclass Arena. This class will be marked as final when C++11 is
 // enabled.

diff --git a/caffe/src/gen/java/org/bytedeco/caffe/ArgMaxParameter.java b/caffe/src/gen/java/org/bytedeco/caffe/ArgMaxParameter.java
@@ -72,16 +72,19 @@ public class ArgMaxParameter extends Message {
  public native @Cast("bool") final boolean IsInitialized();
 
  public native @Cast("size_t") final long ByteSizeLong();
+// #if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
+// #else
  public native @Cast("bool") final boolean MergePartialFromCodedStream(
  CodedInputStream input);
+// #endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
  public native final void SerializeWithCachedSizes(
  CodedOutputStream output);
  public native @Cast("google::protobuf::uint8*") final BytePointer InternalSerializeWithCachedSizesToArray(
- @Cast("bool") boolean deterministic, @Cast("google::protobuf::uint8*") BytePointer target);
+ @Cast("google::protobuf::uint8*") BytePointer target);
  public native @Cast("google::protobuf::uint8*") final ByteBuffer InternalSerializeWithCachedSizesToArray(
- @Cast("bool") boolean deterministic, @Cast("google::protobuf::uint8*") ByteBuffer target);
+ @Cast("google::protobuf::uint8*") ByteBuffer target);
  public native @Cast("google::protobuf::uint8*") final byte[] InternalSerializeWithCachedSizesToArray(
- @Cast("bool") boolean deterministic, @Cast("google::protobuf::uint8*") byte[] target);
+ @Cast("google::protobuf::uint8*") byte[] target);
  public native final int GetCachedSize();
 
  public native @ByVal final Metadata GetMetadata();

diff --git a/caffe/src/gen/java/org/bytedeco/caffe/BatchNormParameter.java b/caffe/src/gen/java/org/bytedeco/caffe/BatchNormParameter.java
@@ -72,16 +72,19 @@ public class BatchNormParameter extends Message {
  public native @Cast("bool") final boolean IsInitialized();
 
  public native @Cast("size_t") final long ByteSizeLong();
+// #if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
+// #else
  public native @Cast("bool") final boolean MergePartialFromCodedStream(
  CodedInputStream input);
+// #endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
  public native final void SerializeWithCachedSizes(
  CodedOutputStream output);
  public native @Cast("google::protobuf::uint8*") final BytePointer InternalSerializeWithCachedSizesToArray(
- @Cast("bool") boolean deterministic, @Cast("google::protobuf::uint8*") BytePointer target);
+ @Cast("google::protobuf::uint8*") BytePointer target);
  public native @Cast("google::protobuf::uint8*") final ByteBuffer InternalSerializeWithCachedSizesToArray(
- @Cast("bool") boolean deterministic, @Cast("google::protobuf::uint8*") ByteBuffer target);
+ @Cast("google::protobuf::uint8*") ByteBuffer target);
  public native @Cast("google::protobuf::uint8*") final byte[] InternalSerializeWithCachedSizesToArray(
- @Cast("bool") boolean deterministic, @Cast("google::protobuf::uint8*") byte[] target);
+ @Cast("google::protobuf::uint8*") byte[] target);
  public native final int GetCachedSize();
 
  public native @ByVal final Metadata GetMetadata();

diff --git a/caffe/src/gen/java/org/bytedeco/caffe/BiasParameter.java b/caffe/src/gen/java/org/bytedeco/caffe/BiasParameter.java
@@ -72,16 +72,19 @@ public class BiasParameter extends Message {
  public native @Cast("bool") final boolean IsInitialized();
 
  public native @Cast("size_t") final long ByteSizeLong();
+// #if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
+// #else
  public native @Cast("bool") final boolean MergePartialFromCodedStream(
  CodedInputStream input);
+// #endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
  public native final void SerializeWithCachedSizes(
  CodedOutputStream output);
  public native @Cast("google::protobuf::uint8*") final BytePointer InternalSerializeWithCachedSizesToArray(
- @Cast("bool") boolean deterministic, @Cast("google::protobuf::uint8*") BytePointer target);
+ @Cast("google::protobuf::uint8*") BytePointer target);
  public native @Cast("google::protobuf::uint8*") final ByteBuffer InternalSerializeWithCachedSizesToArray(
- @Cast("bool") boolean deterministic, @Cast("google::protobuf::uint8*") ByteBuffer target);
+ @Cast("google::protobuf::uint8*") ByteBuffer target);
  public native @Cast("google::protobuf::uint8*") final byte[] InternalSerializeWithCachedSizesToArray(
- @Cast("bool") boolean deterministic, @Cast("google::protobuf::uint8*") byte[] target);
+ @Cast("google::protobuf::uint8*") byte[] target);
  public native final int GetCachedSize();
 
  public native @ByVal final Metadata GetMetadata();