diff --git a/CHANGELOG.md b/CHANGELOG.md index 9f3edf33411..4fecead896f 100644 --- 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 index c2906f72ebe..583f8618b99 100644 --- 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/) Android, iOS, Linux, Mac OS X: [![Travis CI](https://travis-ci.org/bytedeco/javacpp-presets.svg?branch=master)](https://travis-ci.org/bytedeco/javacpp-presets) Windows: [![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/) Android, iOS, Linux, Mac OS X: [![Travis CI](https://travis-ci.org/bytedeco/javacpp-presets.svg?branch=master)](https://travis-ci.org/bytedeco/javacpp-presets) Windows: [![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 index 6184b0c2a5c..eef86812301 100644 --- a/arpack-ng/platform/pom.xml +++ b/arpack-ng/platform/pom.xml @@ -25,7 +25,7 @@ org.bytedeco openblas-platform - 0.3.5-${project.parent.version} + 0.3.6-${project.parent.version} ${project.groupId} diff --git a/arpack-ng/pom.xml b/arpack-ng/pom.xml index e404ad0f1bd..dfacc31e168 100644 --- a/arpack-ng/pom.xml +++ b/arpack-ng/pom.xml @@ -23,7 +23,7 @@ org.bytedeco openblas - 0.3.5-${project.parent.version} + 0.3.6-${project.parent.version} org.bytedeco @@ -46,12 +46,12 @@ org.bytedeco openblas - 0.3.5-${project.parent.version} + 0.3.6-${project.parent.version} org.bytedeco openblas - 0.3.5-${project.parent.version} + 0.3.6-${project.parent.version} ${javacpp.platform} 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 index 1e76d9a6722..3f28c321a71 100644 --- 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 index d1ea320a14c..944afc7d83f 100644 --- a/caffe/README.md +++ b/caffe/README.md @@ -34,7 +34,7 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic 4.0.0 org.bytedeco.caffe caffe - 1.5 + 1.5.1-SNAPSHOT caffe @@ -42,20 +42,20 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic org.bytedeco caffe-platform - 1.0-1.5 + 1.0-1.5.1-SNAPSHOT org.bytedeco caffe - 1.0-1.5 + 1.0-1.5.1-SNAPSHOT linux-x86_64-gpu org.bytedeco caffe - 1.0-1.5 + 1.0-1.5.1-SNAPSHOT macosx-x86_64-gpu @@ -63,13 +63,13 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic org.bytedeco cuda - 10.1-7.5-1.5 + 10.1-7.5-1.5.1-SNAPSHOT linux-x86_64-redist org.bytedeco cuda - 10.1-7.5-1.5 + 10.1-7.5-1.5.1-SNAPSHOT macosx-x86_64-redist diff --git a/caffe/cppbuild.sh b/caffe/cppbuild.sh index 57cb2032a0f..95cac5196b5 100755 --- 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 index 44be886fdf1..ce2dda5f6c7 100644 --- a/caffe/platform/pom.xml +++ b/caffe/platform/pom.xml @@ -34,7 +34,7 @@ org.bytedeco openblas-platform - 0.3.5-${project.parent.version} + 0.3.6-${project.parent.version} ${project.groupId} diff --git a/caffe/pom.xml b/caffe/pom.xml index dc613435e77..79ad8a05e84 100644 --- a/caffe/pom.xml +++ b/caffe/pom.xml @@ -32,7 +32,7 @@ org.bytedeco openblas - 0.3.5-${project.parent.version} + 0.3.6-${project.parent.version} org.bytedeco @@ -65,7 +65,7 @@ org.bytedeco openblas - 0.3.5-${project.parent.version} + 0.3.6-${project.parent.version} org.bytedeco @@ -82,7 +82,7 @@ org.bytedeco openblas - 0.3.5-${project.parent.version} + 0.3.6-${project.parent.version} ${javacpp.platform} diff --git a/caffe/samples/pom.xml b/caffe/samples/pom.xml index 794c6c7b720..c114e28e987 100644 --- a/caffe/samples/pom.xml +++ b/caffe/samples/pom.xml @@ -2,7 +2,7 @@ 4.0.0 org.bytedeco.caffe caffe - 1.5 + 1.5.1-SNAPSHOT caffe @@ -10,20 +10,20 @@ org.bytedeco caffe-platform - 1.0-1.5 + 1.0-1.5.1-SNAPSHOT org.bytedeco caffe - 1.0-1.5 + 1.0-1.5.1-SNAPSHOT linux-x86_64-gpu org.bytedeco caffe - 1.0-1.5 + 1.0-1.5.1-SNAPSHOT macosx-x86_64-gpu @@ -31,13 +31,13 @@ org.bytedeco cuda - 10.1-7.5-1.5 + 10.1-7.5-1.5.1-SNAPSHOT linux-x86_64-redist org.bytedeco cuda - 10.1-7.5-1.5 + 10.1-7.5-1.5.1-SNAPSHOT macosx-x86_64-redist diff --git a/caffe/src/gen/java/org/bytedeco/caffe/AccuracyParameter.java b/caffe/src/gen/java/org/bytedeco/caffe/AccuracyParameter.java index f9b67385814..b2f1e2f3113 100644 --- 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 index f332603508d..0ee1d19aece 100644 --- 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 index ee1696a9972..a0b12167ca5 100644 --- 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 index 0cadd7f8138..06c0053b94d 100644 --- 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 index d205e5597e5..907c2ea9eca 100644 --- 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(); diff --git a/caffe/src/gen/java/org/bytedeco/caffe/BlobProto.java b/caffe/src/gen/java/org/bytedeco/caffe/BlobProto.java index 743652bc985..cbe3285dc29 100644 --- a/caffe/src/gen/java/org/bytedeco/caffe/BlobProto.java +++ b/caffe/src/gen/java/org/bytedeco/caffe/BlobProto.java @@ -72,16 +72,19 @@ public class BlobProto 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/BlobProtoVector.java b/caffe/src/gen/java/org/bytedeco/caffe/BlobProtoVector.java index 7b479dfc729..0ff6488d724 100644 --- a/caffe/src/gen/java/org/bytedeco/caffe/BlobProtoVector.java +++ b/caffe/src/gen/java/org/bytedeco/caffe/BlobProtoVector.java @@ -72,16 +72,19 @@ public class BlobProtoVector 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/BlobShape.java b/caffe/src/gen/java/org/bytedeco/caffe/BlobShape.java index 58c3f008daf..8cac66be8c0 100644 --- a/caffe/src/gen/java/org/bytedeco/caffe/BlobShape.java +++ b/caffe/src/gen/java/org/bytedeco/caffe/BlobShape.java @@ -72,16 +72,19 @@ public class BlobShape 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/BoundedZCIS.java b/caffe/src/gen/java/org/bytedeco/caffe/BoundedZCIS.java new file mode 100644 index 00000000000..f11c1a09a7f --- /dev/null +++ b/caffe/src/gen/java/org/bytedeco/caffe/BoundedZCIS.java @@ -0,0 +1,43 @@ +// Targeted by JavaCPP version 1.5.1-SNAPSHOT: DO NOT EDIT THIS FILE + +package org.bytedeco.caffe; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +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.opencv.global.opencv_imgcodecs.*; +import org.bytedeco.opencv.opencv_videoio.*; +import static org.bytedeco.opencv.global.opencv_videoio.*; +import org.bytedeco.opencv.opencv_highgui.*; +import static org.bytedeco.opencv.global.opencv_highgui.*; +import org.bytedeco.hdf5.*; +import static org.bytedeco.hdf5.global.hdf5.*; + +import static org.bytedeco.caffe.global.caffe.*; + + +@Namespace("google::protobuf::internal") @Properties(inherit = org.bytedeco.caffe.presets.caffe.class) +public class BoundedZCIS extends Pointer { + static { Loader.load(); } + /** Default native constructor. */ + public BoundedZCIS() { super((Pointer)null); allocate(); } + /** Native array allocator. Access with {@link Pointer#position(long)}. */ + public BoundedZCIS(long size) { super((Pointer)null); allocateArray(size); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public BoundedZCIS(Pointer p) { super(p); } + private native void allocate(); + private native void allocateArray(long size); + @Override public BoundedZCIS position(long position) { + return (BoundedZCIS)super.position(position); + } + + public native ZeroCopyInputStream zcis(); public native BoundedZCIS zcis(ZeroCopyInputStream setter); + public native @Name("limit") int _limit(); public native BoundedZCIS _limit(int setter); +} diff --git a/caffe/src/gen/java/org/bytedeco/caffe/CodedInputStream.java b/caffe/src/gen/java/org/bytedeco/caffe/CodedInputStream.java index 12d45a66ac2..96647acce9b 100644 --- a/caffe/src/gen/java/org/bytedeco/caffe/CodedInputStream.java +++ b/caffe/src/gen/java/org/bytedeco/caffe/CodedInputStream.java @@ -22,6 +22,7 @@ import static org.bytedeco.caffe.global.caffe.*; + @Namespace("google::protobuf::io") @Opaque @Properties(inherit = org.bytedeco.caffe.presets.caffe.class) public class CodedInputStream extends Pointer { /** Empty constructor. Calls {@code super((Pointer)null)}. */ diff --git a/caffe/src/gen/java/org/bytedeco/caffe/CompareHelper.java b/caffe/src/gen/java/org/bytedeco/caffe/CompareHelper.java new file mode 100644 index 00000000000..7643d9f1ce0 --- /dev/null +++ b/caffe/src/gen/java/org/bytedeco/caffe/CompareHelper.java @@ -0,0 +1,42 @@ +// Targeted by JavaCPP version 1.5.1-SNAPSHOT: DO NOT EDIT THIS FILE + +package org.bytedeco.caffe; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +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.opencv.global.opencv_imgcodecs.*; +import org.bytedeco.opencv.opencv_videoio.*; +import static org.bytedeco.opencv.global.opencv_videoio.*; +import org.bytedeco.opencv.opencv_highgui.*; +import static org.bytedeco.opencv.global.opencv_highgui.*; +import org.bytedeco.hdf5.*; +import static org.bytedeco.hdf5.global.hdf5.*; + +import static org.bytedeco.caffe.global.caffe.*; + + +@Name("google::protobuf::internal::CompareHelper") @Properties(inherit = org.bytedeco.caffe.presets.caffe.class) +public class CompareHelper extends Pointer { + static { Loader.load(); } + /** Default native constructor. */ + public CompareHelper() { super((Pointer)null); allocate(); } + /** Native array allocator. Access with {@link Pointer#position(long)}. */ + public CompareHelper(long size) { super((Pointer)null); allocateArray(size); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public CompareHelper(Pointer p) { super(p); } + private native void allocate(); + private native void allocateArray(long size); + @Override public CompareHelper position(long position) { + return (CompareHelper)super.position(position); + } + + public native @Cast("bool") @Name("operator ()") boolean apply(@Const @ByRef ArenaStringPtr a, @Const @ByRef ArenaStringPtr b); +} diff --git a/caffe/src/gen/java/org/bytedeco/caffe/CompareMapKey.java b/caffe/src/gen/java/org/bytedeco/caffe/CompareMapKey.java new file mode 100644 index 00000000000..f32fd818096 --- /dev/null +++ b/caffe/src/gen/java/org/bytedeco/caffe/CompareMapKey.java @@ -0,0 +1,41 @@ +// Targeted by JavaCPP version 1.5.1-SNAPSHOT: DO NOT EDIT THIS FILE + +package org.bytedeco.caffe; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +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.opencv.global.opencv_imgcodecs.*; +import org.bytedeco.opencv.opencv_videoio.*; +import static org.bytedeco.opencv.global.opencv_videoio.*; +import org.bytedeco.opencv.opencv_highgui.*; +import static org.bytedeco.opencv.global.opencv_highgui.*; +import org.bytedeco.hdf5.*; +import static org.bytedeco.hdf5.global.hdf5.*; + +import static org.bytedeco.caffe.global.caffe.*; + + +@Namespace("google::protobuf::internal") @Properties(inherit = org.bytedeco.caffe.presets.caffe.class) +public class CompareMapKey extends Pointer { + static { Loader.load(); } + /** Default native constructor. */ + public CompareMapKey() { super((Pointer)null); allocate(); } + /** Native array allocator. Access with {@link Pointer#position(long)}. */ + public CompareMapKey(long size) { super((Pointer)null); allocateArray(size); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public CompareMapKey(Pointer p) { super(p); } + private native void allocate(); + private native void allocateArray(long size); + @Override public CompareMapKey position(long position) { + return (CompareMapKey)super.position(position); + } + +} diff --git a/caffe/src/gen/java/org/bytedeco/caffe/ConcatParameter.java b/caffe/src/gen/java/org/bytedeco/caffe/ConcatParameter.java index 1ae6502fcce..ba3a066b0d9 100644 --- a/caffe/src/gen/java/org/bytedeco/caffe/ConcatParameter.java +++ b/caffe/src/gen/java/org/bytedeco/caffe/ConcatParameter.java @@ -72,16 +72,19 @@ public class ConcatParameter 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/ContrastiveLossParameter.java b/caffe/src/gen/java/org/bytedeco/caffe/ContrastiveLossParameter.java index e13cbfab39a..ef97dd0ad16 100644 --- a/caffe/src/gen/java/org/bytedeco/caffe/ContrastiveLossParameter.java +++ b/caffe/src/gen/java/org/bytedeco/caffe/ContrastiveLossParameter.java @@ -72,16 +72,19 @@ public class ContrastiveLossParameter 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/ConvolutionParameter.java b/caffe/src/gen/java/org/bytedeco/caffe/ConvolutionParameter.java index 008ee443d52..a99d31d24fe 100644 --- a/caffe/src/gen/java/org/bytedeco/caffe/ConvolutionParameter.java +++ b/caffe/src/gen/java/org/bytedeco/caffe/ConvolutionParameter.java @@ -72,16 +72,19 @@ public class ConvolutionParameter 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/CropParameter.java b/caffe/src/gen/java/org/bytedeco/caffe/CropParameter.java index f9cba03d72a..224d89f9e1f 100644 --- a/caffe/src/gen/java/org/bytedeco/caffe/CropParameter.java +++ b/caffe/src/gen/java/org/bytedeco/caffe/CropParameter.java @@ -72,16 +72,19 @@ public class CropParameter 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/DataParameter.java b/caffe/src/gen/java/org/bytedeco/caffe/DataParameter.java index 6ec07593ded..8c71af03a5e 100644 --- a/caffe/src/gen/java/org/bytedeco/caffe/DataParameter.java +++ b/caffe/src/gen/java/org/bytedeco/caffe/DataParameter.java @@ -72,16 +72,19 @@ public class DataParameter 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/Datum.java b/caffe/src/gen/java/org/bytedeco/caffe/Datum.java index dc8de3b3066..69e37983a56 100644 --- a/caffe/src/gen/java/org/bytedeco/caffe/Datum.java +++ b/caffe/src/gen/java/org/bytedeco/caffe/Datum.java @@ -72,16 +72,19 @@ public class Datum 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/Descriptor.java b/caffe/src/gen/java/org/bytedeco/caffe/Descriptor.java index dda127ed5ce..23c3fd9f736 100644 --- a/caffe/src/gen/java/org/bytedeco/caffe/Descriptor.java +++ b/caffe/src/gen/java/org/bytedeco/caffe/Descriptor.java @@ -34,6 +34,7 @@ public class Descriptor extends Pointer { /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public Descriptor(Pointer p) { super(p); } + // The name of the message type, not including its scope. public native @StdString BytePointer name(); @@ -57,9 +58,8 @@ public class Descriptor extends Pointer { // Get options for this message type. These are specified in the .proto file // by placing lines like "option foo = 1234;" in the message definition. - // Allowed options are defined by MessageOptions in - // google/protobuf/descriptor.proto, and any available extensions of that - // message. + // Allowed options are defined by MessageOptions in descriptor.proto, and any + // available extensions of that message. public native @Const @ByRef MessageOptions options(); // Write the contents of this Descriptor into the given DescriptorProto. diff --git a/caffe/src/gen/java/org/bytedeco/caffe/DropoutParameter.java b/caffe/src/gen/java/org/bytedeco/caffe/DropoutParameter.java index 7f6d7a2862b..d39de3a8048 100644 --- a/caffe/src/gen/java/org/bytedeco/caffe/DropoutParameter.java +++ b/caffe/src/gen/java/org/bytedeco/caffe/DropoutParameter.java @@ -72,16 +72,19 @@ public class DropoutParameter 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/DummyDataParameter.java b/caffe/src/gen/java/org/bytedeco/caffe/DummyDataParameter.java index a88aa904843..d89bc0fd6e4 100644 --- a/caffe/src/gen/java/org/bytedeco/caffe/DummyDataParameter.java +++ b/caffe/src/gen/java/org/bytedeco/caffe/DummyDataParameter.java @@ -72,16 +72,19 @@ public class DummyDataParameter 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/ELUParameter.java b/caffe/src/gen/java/org/bytedeco/caffe/ELUParameter.java index 633d1096c24..e89332ef17c 100644 --- a/caffe/src/gen/java/org/bytedeco/caffe/ELUParameter.java +++ b/caffe/src/gen/java/org/bytedeco/caffe/ELUParameter.java @@ -72,16 +72,19 @@ public class ELUParameter 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/EltwiseParameter.java b/caffe/src/gen/java/org/bytedeco/caffe/EltwiseParameter.java index 5335220dcae..2d9c276c0d1 100644 --- a/caffe/src/gen/java/org/bytedeco/caffe/EltwiseParameter.java +++ b/caffe/src/gen/java/org/bytedeco/caffe/EltwiseParameter.java @@ -72,16 +72,19 @@ public class EltwiseParameter 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/EmbedParameter.java b/caffe/src/gen/java/org/bytedeco/caffe/EmbedParameter.java index 580d9e804b8..8ae2f4309b7 100644 --- a/caffe/src/gen/java/org/bytedeco/caffe/EmbedParameter.java +++ b/caffe/src/gen/java/org/bytedeco/caffe/EmbedParameter.java @@ -72,16 +72,19 @@ public class EmbedParameter 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/EnumDescriptor.java b/caffe/src/gen/java/org/bytedeco/caffe/EnumDescriptor.java index 5856a771632..2a2ff46561f 100644 --- a/caffe/src/gen/java/org/bytedeco/caffe/EnumDescriptor.java +++ b/caffe/src/gen/java/org/bytedeco/caffe/EnumDescriptor.java @@ -32,6 +32,7 @@ public class EnumDescriptor extends Pointer { /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public EnumDescriptor(Pointer p) { super(p); } + // The name of this enum type in the containing scope. public native @StdString BytePointer name(); @@ -64,8 +65,8 @@ public class EnumDescriptor extends Pointer { // Get options for this enum type. These are specified in the .proto file by // placing lines like "option foo = 1234;" in the enum definition. Allowed - // options are defined by EnumOptions in google/protobuf/descriptor.proto, - // and any available extensions of that message. + // options are defined by EnumOptions in descriptor.proto, and any available + // extensions of that message. public native @Const @ByRef EnumOptions options(); // See Descriptor::CopyTo(). diff --git a/caffe/src/gen/java/org/bytedeco/caffe/EnumValueDescriptor.java b/caffe/src/gen/java/org/bytedeco/caffe/EnumValueDescriptor.java index c60b01be2b9..c447c424199 100644 --- a/caffe/src/gen/java/org/bytedeco/caffe/EnumValueDescriptor.java +++ b/caffe/src/gen/java/org/bytedeco/caffe/EnumValueDescriptor.java @@ -34,6 +34,7 @@ public class EnumValueDescriptor extends Pointer { /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public EnumValueDescriptor(Pointer p) { super(p); } + public native @StdString BytePointer name(); // Name of this enum constant. public native int index(); // Index within the enums's Descriptor. public native int number(); // Numeric value of this enum constant. @@ -50,11 +51,10 @@ public class EnumValueDescriptor extends Pointer { // The type of this value. Never NULL. public native @Const EnumDescriptor type(); - // Get options for this enum value. These are specified in the .proto file - // by adding text like "[foo = 1234]" after an enum value definition. - // Allowed options are defined by EnumValueOptions in - // google/protobuf/descriptor.proto, and any available extensions of that - // message. + // Get options for this enum value. These are specified in the .proto file by + // adding text like "[foo = 1234]" after an enum value definition. Allowed + // options are defined by EnumValueOptions in descriptor.proto, and any + // available extensions of that message. public native @Const @ByRef EnumValueOptions options(); // See Descriptor::CopyTo(). diff --git a/caffe/src/gen/java/org/bytedeco/caffe/ExpParameter.java b/caffe/src/gen/java/org/bytedeco/caffe/ExpParameter.java index 5b46460ce55..24a899d4f2a 100644 --- a/caffe/src/gen/java/org/bytedeco/caffe/ExpParameter.java +++ b/caffe/src/gen/java/org/bytedeco/caffe/ExpParameter.java @@ -72,16 +72,19 @@ public class ExpParameter 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/FieldDescriptor.java b/caffe/src/gen/java/org/bytedeco/caffe/FieldDescriptor.java index 405a4c44edf..a13c7aa685e 100644 --- a/caffe/src/gen/java/org/bytedeco/caffe/FieldDescriptor.java +++ b/caffe/src/gen/java/org/bytedeco/caffe/FieldDescriptor.java @@ -42,6 +42,7 @@ public class FieldDescriptor extends Pointer { /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public FieldDescriptor(Pointer p) { super(p); } + // Identifies a field type. 0 is reserved for errors. The order is weird // for historical reasons. Types 12 and up are new in proto2. /** enum google::protobuf::FieldDescriptor::Type */ @@ -227,9 +228,8 @@ public class FieldDescriptor extends Pointer { // Get the FieldOptions for this field. This includes things listed in // square brackets after the field definition. E.g., the field: // optional string text = 1 [ctype=CORD]; - // has the "ctype" option set. Allowed options are defined by FieldOptions - // in google/protobuf/descriptor.proto, and any available extensions of that - // message. + // has the "ctype" option set. Allowed options are defined by FieldOptions in + // descriptor.proto, and any available extensions of that message. public native @Const @ByRef FieldOptions options(); // See Descriptor::CopyTo(). diff --git a/caffe/src/gen/java/org/bytedeco/caffe/FileDescriptor.java b/caffe/src/gen/java/org/bytedeco/caffe/FileDescriptor.java index dc109a4fbf8..78e6d2f4806 100644 --- a/caffe/src/gen/java/org/bytedeco/caffe/FileDescriptor.java +++ b/caffe/src/gen/java/org/bytedeco/caffe/FileDescriptor.java @@ -33,8 +33,9 @@ public class FileDescriptor extends Pointer { /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public FileDescriptor(Pointer p) { super(p); } + // The filename, relative to the source tree. - // e.g. "google/protobuf/descriptor.proto" + // e.g. "foo/bar/baz.proto" public native @StdString BytePointer name(); // The package, e.g. "google.protobuf.compiler". @@ -96,8 +97,7 @@ public class FileDescriptor extends Pointer { // Get options for this file. These are specified in the .proto file by // placing lines like "option foo = 1234;" at the top level, outside of any // other definitions. Allowed options are defined by FileOptions in - // google/protobuf/descriptor.proto, and any available extensions of that - // message. + // descriptor.proto, and any available extensions of that message. public native @Const @ByRef FileOptions options(); // Syntax of this file. diff --git a/caffe/src/gen/java/org/bytedeco/caffe/FillerParameter.java b/caffe/src/gen/java/org/bytedeco/caffe/FillerParameter.java index 833831b2427..e478b664347 100644 --- a/caffe/src/gen/java/org/bytedeco/caffe/FillerParameter.java +++ b/caffe/src/gen/java/org/bytedeco/caffe/FillerParameter.java @@ -72,16 +72,19 @@ public class FillerParameter 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/FlattenParameter.java b/caffe/src/gen/java/org/bytedeco/caffe/FlattenParameter.java index d074129ac5d..12f4ce4574d 100644 --- a/caffe/src/gen/java/org/bytedeco/caffe/FlattenParameter.java +++ b/caffe/src/gen/java/org/bytedeco/caffe/FlattenParameter.java @@ -72,16 +72,19 @@ public class FlattenParameter 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/HDF5DataParameter.java b/caffe/src/gen/java/org/bytedeco/caffe/HDF5DataParameter.java index 825bdf8683f..1addea53aad 100644 --- a/caffe/src/gen/java/org/bytedeco/caffe/HDF5DataParameter.java +++ b/caffe/src/gen/java/org/bytedeco/caffe/HDF5DataParameter.java @@ -72,16 +72,19 @@ public class HDF5DataParameter 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/HDF5OutputParameter.java b/caffe/src/gen/java/org/bytedeco/caffe/HDF5OutputParameter.java index c2ba093c1e1..695494f4024 100644 --- a/caffe/src/gen/java/org/bytedeco/caffe/HDF5OutputParameter.java +++ b/caffe/src/gen/java/org/bytedeco/caffe/HDF5OutputParameter.java @@ -72,16 +72,19 @@ public class HDF5OutputParameter 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/HingeLossParameter.java b/caffe/src/gen/java/org/bytedeco/caffe/HingeLossParameter.java index 46d01b3376b..07be8824a90 100644 --- a/caffe/src/gen/java/org/bytedeco/caffe/HingeLossParameter.java +++ b/caffe/src/gen/java/org/bytedeco/caffe/HingeLossParameter.java @@ -72,16 +72,19 @@ public class HingeLossParameter 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/ImageDataParameter.java b/caffe/src/gen/java/org/bytedeco/caffe/ImageDataParameter.java index a5991c049a4..a0c78296988 100644 --- a/caffe/src/gen/java/org/bytedeco/caffe/ImageDataParameter.java +++ b/caffe/src/gen/java/org/bytedeco/caffe/ImageDataParameter.java @@ -72,16 +72,19 @@ public class ImageDataParameter 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/InfogainLossParameter.java b/caffe/src/gen/java/org/bytedeco/caffe/InfogainLossParameter.java index 72011a57558..7e9593abb1a 100644 --- a/caffe/src/gen/java/org/bytedeco/caffe/InfogainLossParameter.java +++ b/caffe/src/gen/java/org/bytedeco/caffe/InfogainLossParameter.java @@ -72,16 +72,19 @@ public class InfogainLossParameter 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/InnerProductParameter.java b/caffe/src/gen/java/org/bytedeco/caffe/InnerProductParameter.java index ef0c85966fc..38fa8df31d3 100644 --- a/caffe/src/gen/java/org/bytedeco/caffe/InnerProductParameter.java +++ b/caffe/src/gen/java/org/bytedeco/caffe/InnerProductParameter.java @@ -72,16 +72,19 @@ public class InnerProductParameter 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/InputParameter.java b/caffe/src/gen/java/org/bytedeco/caffe/InputParameter.java index 1e94e725c8c..880d1a4369e 100644 --- a/caffe/src/gen/java/org/bytedeco/caffe/InputParameter.java +++ b/caffe/src/gen/java/org/bytedeco/caffe/InputParameter.java @@ -72,16 +72,19 @@ public class InputParameter 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/LRNParameter.java b/caffe/src/gen/java/org/bytedeco/caffe/LRNParameter.java index 264f823cdde..a92025a2bf7 100644 --- a/caffe/src/gen/java/org/bytedeco/caffe/LRNParameter.java +++ b/caffe/src/gen/java/org/bytedeco/caffe/LRNParameter.java @@ -72,16 +72,19 @@ public class LRNParameter 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/LayerParameter.java b/caffe/src/gen/java/org/bytedeco/caffe/LayerParameter.java index ff9aaac9ab1..8a43fb2c7d5 100644 --- a/caffe/src/gen/java/org/bytedeco/caffe/LayerParameter.java +++ b/caffe/src/gen/java/org/bytedeco/caffe/LayerParameter.java @@ -72,16 +72,19 @@ public class LayerParameter 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/LogParameter.java b/caffe/src/gen/java/org/bytedeco/caffe/LogParameter.java index 87064f70c10..47857bc2645 100644 --- a/caffe/src/gen/java/org/bytedeco/caffe/LogParameter.java +++ b/caffe/src/gen/java/org/bytedeco/caffe/LogParameter.java @@ -72,16 +72,19 @@ public class LogParameter 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/LossParameter.java b/caffe/src/gen/java/org/bytedeco/caffe/LossParameter.java index 645a9a52d05..9228df8d7ad 100644 --- a/caffe/src/gen/java/org/bytedeco/caffe/LossParameter.java +++ b/caffe/src/gen/java/org/bytedeco/caffe/LossParameter.java @@ -72,16 +72,19 @@ public class LossParameter 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/MVNParameter.java b/caffe/src/gen/java/org/bytedeco/caffe/MVNParameter.java index 05ddf5abe87..4fcb30a18dd 100644 --- a/caffe/src/gen/java/org/bytedeco/caffe/MVNParameter.java +++ b/caffe/src/gen/java/org/bytedeco/caffe/MVNParameter.java @@ -72,16 +72,19 @@ public class MVNParameter 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/MapFieldPrinterHelper.java b/caffe/src/gen/java/org/bytedeco/caffe/MapFieldPrinterHelper.java new file mode 100644 index 00000000000..5cea46aae31 --- /dev/null +++ b/caffe/src/gen/java/org/bytedeco/caffe/MapFieldPrinterHelper.java @@ -0,0 +1,31 @@ +// Targeted by JavaCPP version 1.5.1-SNAPSHOT: DO NOT EDIT THIS FILE + +package org.bytedeco.caffe; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +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.opencv.global.opencv_imgcodecs.*; +import org.bytedeco.opencv.opencv_videoio.*; +import static org.bytedeco.opencv.global.opencv_videoio.*; +import org.bytedeco.opencv.opencv_highgui.*; +import static org.bytedeco.opencv.global.opencv_highgui.*; +import org.bytedeco.hdf5.*; +import static org.bytedeco.hdf5.global.hdf5.*; + +import static org.bytedeco.caffe.global.caffe.*; + +@Namespace("google::protobuf::internal") @Opaque @Properties(inherit = org.bytedeco.caffe.presets.caffe.class) +public class MapFieldPrinterHelper extends Pointer { + /** Empty constructor. Calls {@code super((Pointer)null)}. */ + public MapFieldPrinterHelper() { super((Pointer)null); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public MapFieldPrinterHelper(Pointer p) { super(p); } +} diff --git a/caffe/src/gen/java/org/bytedeco/caffe/MemoryDataParameter.java b/caffe/src/gen/java/org/bytedeco/caffe/MemoryDataParameter.java index 17362a46810..7def0a6bac5 100644 --- a/caffe/src/gen/java/org/bytedeco/caffe/MemoryDataParameter.java +++ b/caffe/src/gen/java/org/bytedeco/caffe/MemoryDataParameter.java @@ -72,16 +72,19 @@ public class MemoryDataParameter 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/Message.java b/caffe/src/gen/java/org/bytedeco/caffe/Message.java index a9e15eba05e..a72a3af5619 100644 --- a/caffe/src/gen/java/org/bytedeco/caffe/Message.java +++ b/caffe/src/gen/java/org/bytedeco/caffe/Message.java @@ -45,12 +45,12 @@ public class Message extends MessageLite { // Construct a new instance of the same type. Ownership is passed to the // caller. (This is also defined in MessageLite, but is defined again here // for return-type covariance.) - public native Message New(); + public native @Override Message New(); // Construct a new instance on the arena. Ownership is passed to the caller // if arena is a NULL. Default implementation allows for API compatibility // during the Arena transition. - public native Message New(Arena arena); + public native @Override Message New(Arena arena); // Make this message into a copy of the given message. The given message // must have the same descriptor, but need not necessarily be the same class. @@ -76,7 +76,7 @@ public class Message extends MessageLite { // Like FindInitializationErrors, but joins all the strings, delimited by // commas, and returns them. - public native @StdString BytePointer InitializationErrorString(); + public native @StdString @Override BytePointer InitializationErrorString(); // Clears all unknown fields from this message and all embedded messages. // Normally, if unknown tag numbers are encountered when parsing a message, @@ -147,17 +147,18 @@ public class Message extends MessageLite { // These methods are pure-virtual in MessageLite, but Message provides // reflection-based default implementations. - public native @StdString BytePointer GetTypeName(); - public native void Clear(); - public native @Cast("bool") boolean IsInitialized(); - public native void CheckTypeAndMergeFrom(@Const @ByRef MessageLite other); - public native @Cast("bool") boolean MergePartialFromCodedStream(CodedInputStream input); - public native @Cast("size_t") long ByteSizeLong(); - public native void SerializeWithCachedSizes(CodedOutputStream output); + public native @StdString @Override BytePointer GetTypeName(); + public native @Override void Clear(); + public native @Cast("bool") @Override boolean IsInitialized(); + public native @Override void CheckTypeAndMergeFrom(@Const @ByRef MessageLite other); +// #if !GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER + public native @Cast("bool") @Override boolean MergePartialFromCodedStream(CodedInputStream input); +// #endif + public native @Cast("size_t") @Override long ByteSizeLong(); + public native @Override void SerializeWithCachedSizes(CodedOutputStream output); // Introspection --------------------------------------------------- - // Typedef for backwards-compatibility. // Get a non-owning pointer to a Descriptor for this message's type. This // describes what fields the message contains, the types of those fields, etc. diff --git a/caffe/src/gen/java/org/bytedeco/caffe/MessageLite.java b/caffe/src/gen/java/org/bytedeco/caffe/MessageLite.java index 9257c4f2db8..3087496b87e 100644 --- a/caffe/src/gen/java/org/bytedeco/caffe/MessageLite.java +++ b/caffe/src/gen/java/org/bytedeco/caffe/MessageLite.java @@ -126,6 +126,11 @@ public class MessageLite extends Pointer { // Read a protocol buffer from the given zero-copy input stream, expecting // the message to be exactly "size" bytes long. If successful, exactly // this many bytes will have been consumed from the input. + public native @Cast("bool") boolean MergePartialFromBoundedZeroCopyStream(ZeroCopyInputStream input, int size); + // Like ParseFromBoundedZeroCopyStream(), but accepts messages that are + // missing required fields. + public native @Cast("bool") boolean MergeFromBoundedZeroCopyStream(ZeroCopyInputStream input, + int size); public native @Cast("bool") boolean ParseFromBoundedZeroCopyStream(ZeroCopyInputStream input, int size); // Like ParseFromBoundedZeroCopyStream(), but accepts messages that are // missing required fields. @@ -167,7 +172,14 @@ public class MessageLite extends Pointer { // // MergeFromCodedStream() is just implemented as MergePartialFromCodedStream() // followed by IsInitialized(). +// #if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER +// #else public native @Cast("bool") boolean MergePartialFromCodedStream(CodedInputStream input); +// #endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER + + // Merge a protocol buffer contained in a string. + public native @Cast("bool") boolean MergeFromString(@StdString BytePointer data); + public native @Cast("bool") boolean MergeFromString(@StdString String data); // Serialization --------------------------------------------------- @@ -254,11 +266,18 @@ public native void SerializeWithCachedSizes( // invalidated, which is too much work for an otherwise inlined setter // method.) public native int GetCachedSize(); - - public native @Cast("google::protobuf::uint8*") BytePointer InternalSerializeWithCachedSizesToArray(@Cast("bool") boolean deterministic, - @Cast("google::protobuf::uint8*") BytePointer target); - public native @Cast("google::protobuf::uint8*") ByteBuffer InternalSerializeWithCachedSizesToArray(@Cast("bool") boolean deterministic, - @Cast("google::protobuf::uint8*") ByteBuffer target); - public native @Cast("google::protobuf::uint8*") byte[] InternalSerializeWithCachedSizesToArray(@Cast("bool") boolean deterministic, - @Cast("google::protobuf::uint8*") byte[] target); + /** enum google::protobuf::MessageLite::ParseFlags */ + public static final int + kMerge = 0, + kParse = 1, + kMergePartial = 2, + kParsePartial = 3, + kMergeWithAliasing = 4, + kParseWithAliasing = 5, + kMergePartialWithAliasing = 6, + kParsePartialWithAliasing = 7; + // TODO(gerbens) make this a pure abstract function + public native @Cast("google::protobuf::uint8*") BytePointer InternalSerializeWithCachedSizesToArray(@Cast("google::protobuf::uint8*") BytePointer target); + public native @Cast("google::protobuf::uint8*") ByteBuffer InternalSerializeWithCachedSizesToArray(@Cast("google::protobuf::uint8*") ByteBuffer target); + public native @Cast("google::protobuf::uint8*") byte[] InternalSerializeWithCachedSizesToArray(@Cast("google::protobuf::uint8*") byte[] target); } diff --git a/caffe/src/gen/java/org/bytedeco/caffe/MethodDescriptor.java b/caffe/src/gen/java/org/bytedeco/caffe/MethodDescriptor.java index cd52bbebb44..e2a29126d9b 100644 --- a/caffe/src/gen/java/org/bytedeco/caffe/MethodDescriptor.java +++ b/caffe/src/gen/java/org/bytedeco/caffe/MethodDescriptor.java @@ -34,6 +34,7 @@ public class MethodDescriptor extends Pointer { /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public MethodDescriptor(Pointer p) { super(p); } + // Name of this method, not including containing scope. public native @StdString BytePointer name(); // The fully-qualified name of the method, scope delimited by periods. @@ -59,8 +60,7 @@ public class MethodDescriptor extends Pointer { // Get options for this method. These are specified in the .proto file by // placing lines like "option foo = 1234;" in curly-braces after a method // declaration. Allowed options are defined by MethodOptions in - // google/protobuf/descriptor.proto, and any available extensions of that - // message. + // descriptor.proto, and any available extensions of that message. public native @Const @ByRef MethodOptions options(); // See Descriptor::CopyTo(). diff --git a/caffe/src/gen/java/org/bytedeco/caffe/NetParameter.java b/caffe/src/gen/java/org/bytedeco/caffe/NetParameter.java index 8981023b588..b7f034dc6aa 100644 --- a/caffe/src/gen/java/org/bytedeco/caffe/NetParameter.java +++ b/caffe/src/gen/java/org/bytedeco/caffe/NetParameter.java @@ -72,16 +72,19 @@ public class NetParameter 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/NetState.java b/caffe/src/gen/java/org/bytedeco/caffe/NetState.java index c682d29fec4..b2a5ed7f585 100644 --- a/caffe/src/gen/java/org/bytedeco/caffe/NetState.java +++ b/caffe/src/gen/java/org/bytedeco/caffe/NetState.java @@ -72,16 +72,19 @@ public class NetState 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/NetStateRule.java b/caffe/src/gen/java/org/bytedeco/caffe/NetStateRule.java index bb922f9a012..390026929a3 100644 --- a/caffe/src/gen/java/org/bytedeco/caffe/NetStateRule.java +++ b/caffe/src/gen/java/org/bytedeco/caffe/NetStateRule.java @@ -72,16 +72,19 @@ public class NetStateRule 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/OneofDescriptor.java b/caffe/src/gen/java/org/bytedeco/caffe/OneofDescriptor.java index fc7a2a4e097..e13689c2d72 100644 --- a/caffe/src/gen/java/org/bytedeco/caffe/OneofDescriptor.java +++ b/caffe/src/gen/java/org/bytedeco/caffe/OneofDescriptor.java @@ -31,6 +31,7 @@ public class OneofDescriptor extends Pointer { /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public OneofDescriptor(Pointer p) { super(p); } + public native @StdString BytePointer name(); // Name of this oneof. public native @StdString BytePointer full_name(); // Fully-qualified name of the oneof. diff --git a/caffe/src/gen/java/org/bytedeco/caffe/PReLUParameter.java b/caffe/src/gen/java/org/bytedeco/caffe/PReLUParameter.java index 7b955a97ad4..7a32e604017 100644 --- a/caffe/src/gen/java/org/bytedeco/caffe/PReLUParameter.java +++ b/caffe/src/gen/java/org/bytedeco/caffe/PReLUParameter.java @@ -72,16 +72,19 @@ public class PReLUParameter 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/ParamSpec.java b/caffe/src/gen/java/org/bytedeco/caffe/ParamSpec.java index 4ce4fda574f..67ff65a1440 100644 --- a/caffe/src/gen/java/org/bytedeco/caffe/ParamSpec.java +++ b/caffe/src/gen/java/org/bytedeco/caffe/ParamSpec.java @@ -72,16 +72,19 @@ public class ParamSpec 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/ParameterParameter.java b/caffe/src/gen/java/org/bytedeco/caffe/ParameterParameter.java index 5feb3c08a9b..20230a46a21 100644 --- a/caffe/src/gen/java/org/bytedeco/caffe/ParameterParameter.java +++ b/caffe/src/gen/java/org/bytedeco/caffe/ParameterParameter.java @@ -72,16 +72,19 @@ public class ParameterParameter 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/ParseTableField.java b/caffe/src/gen/java/org/bytedeco/caffe/ParseTableField.java index 5f30087fd06..9cce98dec39 100644 --- a/caffe/src/gen/java/org/bytedeco/caffe/ParseTableField.java +++ b/caffe/src/gen/java/org/bytedeco/caffe/ParseTableField.java @@ -23,6 +23,7 @@ import static org.bytedeco.caffe.global.caffe.*; + // TODO(ckennelly): Add a static assertion to ensure that these masks do not // conflict with wiretypes. diff --git a/caffe/src/gen/java/org/bytedeco/caffe/PoolingParameter.java b/caffe/src/gen/java/org/bytedeco/caffe/PoolingParameter.java index 8b38bf56858..c4e5df4880f 100644 --- a/caffe/src/gen/java/org/bytedeco/caffe/PoolingParameter.java +++ b/caffe/src/gen/java/org/bytedeco/caffe/PoolingParameter.java @@ -72,16 +72,19 @@ public class PoolingParameter 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/PowerParameter.java b/caffe/src/gen/java/org/bytedeco/caffe/PowerParameter.java index 53440401f46..3420c2d674f 100644 --- a/caffe/src/gen/java/org/bytedeco/caffe/PowerParameter.java +++ b/caffe/src/gen/java/org/bytedeco/caffe/PowerParameter.java @@ -72,16 +72,19 @@ public class PowerParameter 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/PythonParameter.java b/caffe/src/gen/java/org/bytedeco/caffe/PythonParameter.java index deb97d430ea..3a1d1f628cf 100644 --- a/caffe/src/gen/java/org/bytedeco/caffe/PythonParameter.java +++ b/caffe/src/gen/java/org/bytedeco/caffe/PythonParameter.java @@ -72,16 +72,19 @@ public class PythonParameter 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/ReLUParameter.java b/caffe/src/gen/java/org/bytedeco/caffe/ReLUParameter.java index 1dfa90ab814..c8f38636edb 100644 --- a/caffe/src/gen/java/org/bytedeco/caffe/ReLUParameter.java +++ b/caffe/src/gen/java/org/bytedeco/caffe/ReLUParameter.java @@ -72,16 +72,19 @@ public class ReLUParameter 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/RecurrentParameter.java b/caffe/src/gen/java/org/bytedeco/caffe/RecurrentParameter.java index d3396dfb3d5..80456f01759 100644 --- a/caffe/src/gen/java/org/bytedeco/caffe/RecurrentParameter.java +++ b/caffe/src/gen/java/org/bytedeco/caffe/RecurrentParameter.java @@ -72,16 +72,19 @@ public class RecurrentParameter 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/ReductionParameter.java b/caffe/src/gen/java/org/bytedeco/caffe/ReductionParameter.java index 32bec69fb27..4716e9a793c 100644 --- a/caffe/src/gen/java/org/bytedeco/caffe/ReductionParameter.java +++ b/caffe/src/gen/java/org/bytedeco/caffe/ReductionParameter.java @@ -72,16 +72,19 @@ public class ReductionParameter 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/Reflection.java b/caffe/src/gen/java/org/bytedeco/caffe/Reflection.java index d2c784be1ae..267829dc087 100644 --- a/caffe/src/gen/java/org/bytedeco/caffe/Reflection.java +++ b/caffe/src/gen/java/org/bytedeco/caffe/Reflection.java @@ -70,15 +70,12 @@ public class Reflection extends Pointer { // Get the UnknownFieldSet for the message. This contains fields which // were seen when the Message was parsed but were not recognized according - // to the Message's definition. For proto3 protos, this method will always - // return an empty UnknownFieldSet. + // to the Message's definition. public native @Const @ByRef UnknownFieldSet GetUnknownFields( @Const @ByRef Message message); // Get a mutable pointer to the UnknownFieldSet for the message. This // contains fields which were seen when the Message was parsed but were not - // recognized according to the Message's definition. For proto3 protos, this - // method will return a valid mutable UnknownFieldSet pointer but modifying - // it won't affect the serialized bytes of the message. + // recognized according to the Message's definition. public native UnknownFieldSet MutableUnknownFields(Message message); // Estimate the amount of memory used by the message object. @@ -202,7 +199,7 @@ public native int GetEnumValue( // *scratch and return that. // // Note: It is perfectly reasonable and useful to write code like: - // str = reflection->GetStringReference(field, &str); + // str = reflection->GetStringReference(message, field, &str); // This line would ensure that only one copy of the string is made // regardless of the field's underlying representation. When initializing // a newly-constructed string, though, it's just as fast and more readable @@ -240,9 +237,12 @@ public native void SetEnum(Message message, @Const FieldDescriptor field, @Const EnumValueDescriptor value); // Set an enum field's value with an integer rather than EnumValueDescriptor. - // If the value does not correspond to a known enum value, either behavior is - // undefined (for proto2 messages), or the value is accepted silently for - // messages with new unknown-enum-value semantics. + // For proto3 this is just setting the enum field to the value specified, for + // proto2 it's more complicated. If value is a known enum value the field is + // set as usual. If the value is unknown then it is added to the unknown field + // set. Note this matches the behavior of parsing unknown enum values. + // If multiple calls with unknown values happen than they are all added to the + // unknown field set in order of the calls. public native void SetEnumValue(Message message, @Const FieldDescriptor field, int value); @@ -365,9 +365,12 @@ public native void SetRepeatedEnum(Message message, @Const FieldDescriptor field, int index, @Const EnumValueDescriptor value); // Set an enum field's value with an integer rather than EnumValueDescriptor. - // If the value does not correspond to a known enum value, either behavior is - // undefined (for proto2 messages), or the value is accepted silently for - // messages with new unknown-enum-value semantics. + // For proto3 this is just setting the enum field to the value specified, for + // proto2 it's more complicated. If value is a known enum value the field is + // set as usual. If the value is unknown then it is added to the unknown field + // set. Note this matches the behavior of parsing unknown enum values. + // If multiple calls with unknown values happen than they are all added to the + // unknown field set in order of the calls. public native void SetRepeatedEnumValue(Message message, @Const FieldDescriptor field, int index, int value); @@ -403,10 +406,13 @@ public native void AddString(Message message, public native void AddEnum(Message message, @Const FieldDescriptor field, @Const EnumValueDescriptor value); - // Set an enum field's value with an integer rather than EnumValueDescriptor. - // If the value does not correspond to a known enum value, either behavior is - // undefined (for proto2 messages), or the value is accepted silently for - // messages with new unknown-enum-value semantics. + // Add an integer value to a repeated enum field rather than + // EnumValueDescriptor. For proto3 this is just setting the enum field to the + // value specified, for proto2 it's more complicated. If value is a known enum + // value the field is set as usual. If the value is unknown then it is added + // to the unknown field set. Note this matches the behavior of parsing unknown + // enum values. If multiple calls with unknown values happen than they are all + // added to the unknown field set in order of the calls. public native void AddEnumValue(Message message, @Const FieldDescriptor field, int value); @@ -418,7 +424,7 @@ public native Message AddMessage(Message message, @Const FieldDescriptor field); // Appends an already-allocated object 'new_entry' to the repeated field - // specifyed by 'field' passing ownership to the message. + // specified by 'field' passing ownership to the message. // TODO(tmarek): Make virtual after all subclasses have been // updated. public native void AddAllocatedMessage(Message message, @@ -448,7 +454,7 @@ public native void AddAllocatedMessage(Message message, // long as the message is not destroyed. // // Note that to use this method users need to include the header file - // "google/protobuf/reflection.h" (which defines the RepeatedFieldRef + // "net/proto2/public/reflection.h" (which defines the RepeatedFieldRef // class templates). // Like GetRepeatedFieldRef() but return an object that can also be used diff --git a/caffe/src/gen/java/org/bytedeco/caffe/ReflectionAccessor.java b/caffe/src/gen/java/org/bytedeco/caffe/ReflectionAccessor.java new file mode 100644 index 00000000000..c66892e3354 --- /dev/null +++ b/caffe/src/gen/java/org/bytedeco/caffe/ReflectionAccessor.java @@ -0,0 +1,31 @@ +// Targeted by JavaCPP version 1.5.1-SNAPSHOT: DO NOT EDIT THIS FILE + +package org.bytedeco.caffe; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +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.opencv.global.opencv_imgcodecs.*; +import org.bytedeco.opencv.opencv_videoio.*; +import static org.bytedeco.opencv.global.opencv_videoio.*; +import org.bytedeco.opencv.opencv_highgui.*; +import static org.bytedeco.opencv.global.opencv_highgui.*; +import org.bytedeco.hdf5.*; +import static org.bytedeco.hdf5.global.hdf5.*; + +import static org.bytedeco.caffe.global.caffe.*; + +@Namespace("google::protobuf::internal") @Opaque @Properties(inherit = org.bytedeco.caffe.presets.caffe.class) +public class ReflectionAccessor extends Pointer { + /** Empty constructor. Calls {@code super((Pointer)null)}. */ + public ReflectionAccessor() { super((Pointer)null); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public ReflectionAccessor(Pointer p) { super(p); } +} diff --git a/caffe/src/gen/java/org/bytedeco/caffe/ReflectionOps.java b/caffe/src/gen/java/org/bytedeco/caffe/ReflectionOps.java index 5cb80e51be4..f028ae7b812 100644 --- a/caffe/src/gen/java/org/bytedeco/caffe/ReflectionOps.java +++ b/caffe/src/gen/java/org/bytedeco/caffe/ReflectionOps.java @@ -21,7 +21,7 @@ import static org.bytedeco.hdf5.global.hdf5.*; import static org.bytedeco.caffe.global.caffe.*; - + // message.cc @Namespace("google::protobuf::internal") @Opaque @Properties(inherit = org.bytedeco.caffe.presets.caffe.class) public class ReflectionOps extends Pointer { /** Empty constructor. Calls {@code super((Pointer)null)}. */ diff --git a/caffe/src/gen/java/org/bytedeco/caffe/RepeatedPtrFieldBase.java b/caffe/src/gen/java/org/bytedeco/caffe/RepeatedPtrFieldBase.java index 17c08a644b8..3fff78d009a 100644 --- a/caffe/src/gen/java/org/bytedeco/caffe/RepeatedPtrFieldBase.java +++ b/caffe/src/gen/java/org/bytedeco/caffe/RepeatedPtrFieldBase.java @@ -23,6 +23,9 @@ import static org.bytedeco.caffe.global.caffe.*; +// #if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER +// #endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER + @Namespace("google::protobuf::internal") @Opaque @Properties(inherit = org.bytedeco.caffe.presets.caffe.class) public class RepeatedPtrFieldBase extends Pointer { /** Empty constructor. Calls {@code super((Pointer)null)}. */ diff --git a/caffe/src/gen/java/org/bytedeco/caffe/ReshapeParameter.java b/caffe/src/gen/java/org/bytedeco/caffe/ReshapeParameter.java index 95974924ef4..a501a41b80a 100644 --- a/caffe/src/gen/java/org/bytedeco/caffe/ReshapeParameter.java +++ b/caffe/src/gen/java/org/bytedeco/caffe/ReshapeParameter.java @@ -72,16 +72,19 @@ public class ReshapeParameter 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/SPPParameter.java b/caffe/src/gen/java/org/bytedeco/caffe/SPPParameter.java index eba25e19b55..711db8f4f60 100644 --- a/caffe/src/gen/java/org/bytedeco/caffe/SPPParameter.java +++ b/caffe/src/gen/java/org/bytedeco/caffe/SPPParameter.java @@ -72,16 +72,19 @@ public class SPPParameter 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/ScaleParameter.java b/caffe/src/gen/java/org/bytedeco/caffe/ScaleParameter.java index 5c65366528e..4f47824defb 100644 --- a/caffe/src/gen/java/org/bytedeco/caffe/ScaleParameter.java +++ b/caffe/src/gen/java/org/bytedeco/caffe/ScaleParameter.java @@ -72,16 +72,19 @@ public class ScaleParameter 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/ServiceDescriptor.java b/caffe/src/gen/java/org/bytedeco/caffe/ServiceDescriptor.java index 0e21c8b740d..bd45c7a8f42 100644 --- a/caffe/src/gen/java/org/bytedeco/caffe/ServiceDescriptor.java +++ b/caffe/src/gen/java/org/bytedeco/caffe/ServiceDescriptor.java @@ -23,16 +23,15 @@ import static org.bytedeco.caffe.global.caffe.*; -// Describes an RPC service. To get the ServiceDescriptor for a service, -// call Service::GetDescriptor(). Generated service classes also have a -// static method called descriptor() which returns the type's -// ServiceDescriptor. Use DescriptorPool to construct your own descriptors. +// Describes an RPC service. Use DescriptorPool to construct your own +// descriptors. @Namespace("google::protobuf") @NoOffset @Properties(inherit = org.bytedeco.caffe.presets.caffe.class) public class ServiceDescriptor extends Pointer { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public ServiceDescriptor(Pointer p) { super(p); } + // The name of the service, not including its containing scope. public native @StdString BytePointer name(); // The fully-qualified name of the service, scope delimited by periods. @@ -45,9 +44,8 @@ public class ServiceDescriptor extends Pointer { // Get options for this service type. These are specified in the .proto file // by placing lines like "option foo = 1234;" in the service definition. - // Allowed options are defined by ServiceOptions in - // google/protobuf/descriptor.proto, and any available extensions of that - // message. + // Allowed options are defined by ServiceOptions in descriptor.proto, and any + // available extensions of that message. public native @Const @ByRef ServiceOptions options(); // The number of methods this service defines. diff --git a/caffe/src/gen/java/org/bytedeco/caffe/SigmoidParameter.java b/caffe/src/gen/java/org/bytedeco/caffe/SigmoidParameter.java index d02942bfabd..b923b8bf90f 100644 --- a/caffe/src/gen/java/org/bytedeco/caffe/SigmoidParameter.java +++ b/caffe/src/gen/java/org/bytedeco/caffe/SigmoidParameter.java @@ -72,16 +72,19 @@ public class SigmoidParameter 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/SliceParameter.java b/caffe/src/gen/java/org/bytedeco/caffe/SliceParameter.java index 9a534bf786b..e7072ba1978 100644 --- a/caffe/src/gen/java/org/bytedeco/caffe/SliceParameter.java +++ b/caffe/src/gen/java/org/bytedeco/caffe/SliceParameter.java @@ -72,16 +72,19 @@ public class SliceParameter 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/SoftmaxParameter.java b/caffe/src/gen/java/org/bytedeco/caffe/SoftmaxParameter.java index 3b37e5e350f..ddda9fc107f 100644 --- a/caffe/src/gen/java/org/bytedeco/caffe/SoftmaxParameter.java +++ b/caffe/src/gen/java/org/bytedeco/caffe/SoftmaxParameter.java @@ -72,16 +72,19 @@ public class SoftmaxParameter 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/SolverParameter.java b/caffe/src/gen/java/org/bytedeco/caffe/SolverParameter.java index 3eefdc6b36e..8da6e107738 100644 --- a/caffe/src/gen/java/org/bytedeco/caffe/SolverParameter.java +++ b/caffe/src/gen/java/org/bytedeco/caffe/SolverParameter.java @@ -72,16 +72,19 @@ public class SolverParameter 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/SolverState.java b/caffe/src/gen/java/org/bytedeco/caffe/SolverState.java index bb18151e81d..112050cd17d 100644 --- a/caffe/src/gen/java/org/bytedeco/caffe/SolverState.java +++ b/caffe/src/gen/java/org/bytedeco/caffe/SolverState.java @@ -72,16 +72,19 @@ public class SolverState 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/TanHParameter.java b/caffe/src/gen/java/org/bytedeco/caffe/TanHParameter.java index 658a5ebac00..9d1c20124ff 100644 --- a/caffe/src/gen/java/org/bytedeco/caffe/TanHParameter.java +++ b/caffe/src/gen/java/org/bytedeco/caffe/TanHParameter.java @@ -72,16 +72,19 @@ public class TanHParameter 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/ThresholdParameter.java b/caffe/src/gen/java/org/bytedeco/caffe/ThresholdParameter.java index 721cc1d617f..3592226de45 100644 --- a/caffe/src/gen/java/org/bytedeco/caffe/ThresholdParameter.java +++ b/caffe/src/gen/java/org/bytedeco/caffe/ThresholdParameter.java @@ -72,16 +72,19 @@ public class ThresholdParameter 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/TileParameter.java b/caffe/src/gen/java/org/bytedeco/caffe/TileParameter.java index a4399f6f81a..f494735df1b 100644 --- a/caffe/src/gen/java/org/bytedeco/caffe/TileParameter.java +++ b/caffe/src/gen/java/org/bytedeco/caffe/TileParameter.java @@ -72,16 +72,19 @@ public class TileParameter 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/TransformationParameter.java b/caffe/src/gen/java/org/bytedeco/caffe/TransformationParameter.java index 94403a04f19..af112695198 100644 --- a/caffe/src/gen/java/org/bytedeco/caffe/TransformationParameter.java +++ b/caffe/src/gen/java/org/bytedeco/caffe/TransformationParameter.java @@ -72,16 +72,19 @@ public class TransformationParameter 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/V0LayerParameter.java b/caffe/src/gen/java/org/bytedeco/caffe/V0LayerParameter.java index e0d07040918..375373eabcc 100644 --- a/caffe/src/gen/java/org/bytedeco/caffe/V0LayerParameter.java +++ b/caffe/src/gen/java/org/bytedeco/caffe/V0LayerParameter.java @@ -72,16 +72,19 @@ public class V0LayerParameter 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/V1LayerParameter.java b/caffe/src/gen/java/org/bytedeco/caffe/V1LayerParameter.java index 5de9a6c0210..0a86a8ef828 100644 --- a/caffe/src/gen/java/org/bytedeco/caffe/V1LayerParameter.java +++ b/caffe/src/gen/java/org/bytedeco/caffe/V1LayerParameter.java @@ -72,16 +72,19 @@ public class V1LayerParameter 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/WindowDataParameter.java b/caffe/src/gen/java/org/bytedeco/caffe/WindowDataParameter.java index 2cd2930d2e4..c11ff45478d 100644 --- a/caffe/src/gen/java/org/bytedeco/caffe/WindowDataParameter.java +++ b/caffe/src/gen/java/org/bytedeco/caffe/WindowDataParameter.java @@ -72,16 +72,19 @@ public class WindowDataParameter 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/global/caffe.java b/caffe/src/gen/java/org/bytedeco/caffe/global/caffe.java index de129d5688b..6421813d205 100644 --- a/caffe/src/gen/java/org/bytedeco/caffe/global/caffe.java +++ b/caffe/src/gen/java/org/bytedeco/caffe/global/caffe.java @@ -204,11 +204,6 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { // #include // #include -// TODO(liujisi): Remove the following includes after the include clean-up. -// #include -// #include -// #include - // #ifndef PROTOBUF_USE_EXCEPTIONS // #if defined(_MSC_VER) && defined(_CPPUNWIND) public static final int PROTOBUF_USE_EXCEPTIONS = 1; @@ -228,8 +223,7 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { // #include // #endif -// #if defined(_WIN32) && defined(GetMessage) -// #endif +// #include @@ -238,15 +232,11 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { // The current version, represented as a single integer to make comparison // easier: major * 10^6 + minor * 10^3 + micro -public static final int GOOGLE_PROTOBUF_VERSION = 3006001; +public static final int GOOGLE_PROTOBUF_VERSION = 3007001; // A suffix string for alpha, beta or rc releases. Empty for stable releases. public static final String GOOGLE_PROTOBUF_VERSION_SUFFIX = ""; -// The minimum library version which works with the current version of the -// headers. -public static final int GOOGLE_PROTOBUF_MIN_LIBRARY_VERSION = 3006001; - // The minimum header version which works with the current version of // the library. This constant should only be used by protoc's C++ code // generator. @@ -255,7 +245,7 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { // The minimum protoc version which works with the current version of the // headers. -public static final int GOOGLE_PROTOBUF_MIN_PROTOC_VERSION = 3006001; +public static final int GOOGLE_PROTOBUF_MIN_PROTOC_VERSION = 3007000; // The minimum header version which works with the current version of // protoc. This constant should only be used in VerifyVersion(). @@ -265,9 +255,9 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { // Verifies that the headers and libraries are compatible. Use the macro // below to call this. @Namespace("google::protobuf::internal") public static native void VerifyVersion(int headerVersion, int minLibraryVersion, - @Cast("const char*") BytePointer filename); + @Cast("const char*") BytePointer filename); @Namespace("google::protobuf::internal") public static native void VerifyVersion(int headerVersion, int minLibraryVersion, - String filename); + String filename); // Converts a numeric version number to a string. @Namespace("google::protobuf::internal") public static native @StdString BytePointer VersionString(int version); @@ -309,12 +299,15 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { // // Optimized for: all structurally valid and no byte copying is done. // -@Namespace("google::protobuf::internal") public static native @Cast("char*") BytePointer UTF8CoerceToStructurallyValid( - @Const @ByRef StringPiece str, @Cast("char*") BytePointer dst, @Cast("char") byte replace_char); -@Namespace("google::protobuf::internal") public static native @Cast("char*") ByteBuffer UTF8CoerceToStructurallyValid( - @Const @ByRef StringPiece str, @Cast("char*") ByteBuffer dst, @Cast("char") byte replace_char); -@Namespace("google::protobuf::internal") public static native @Cast("char*") byte[] UTF8CoerceToStructurallyValid( - @Const @ByRef StringPiece str, @Cast("char*") byte[] dst, @Cast("char") byte replace_char); +@Namespace("google::protobuf::internal") public static native @Cast("char*") BytePointer UTF8CoerceToStructurallyValid(@Const @ByRef StringPiece str, + @Cast("char*") BytePointer dst, + @Cast("char") byte replace_char); +@Namespace("google::protobuf::internal") public static native @Cast("char*") ByteBuffer UTF8CoerceToStructurallyValid(@Const @ByRef StringPiece str, + @Cast("char*") ByteBuffer dst, + @Cast("char") byte replace_char); +@Namespace("google::protobuf::internal") public static native @Cast("char*") byte[] UTF8CoerceToStructurallyValid(@Const @ByRef StringPiece str, + @Cast("char*") byte[] dst, + @Cast("char") byte replace_char); // namespace internal @@ -358,6 +351,8 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { // namespace protobuf // namespace google +// #include + // #endif // GOOGLE_PROTOBUF_COMMON_H__ @@ -412,14 +407,17 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { // #endif // #include -// #include -// #include // defined below +// #include +// #include - // namespace protobuf +// #include -@Namespace("google::quality_webanswers") public static native void TempPrivateWorkAround(ArenaOptions arena_options); +// #ifdef SWIG +// #error "You cannot SWIG proto headers" +// #endif // defined below - // namespace quality_webanswers // defined below // defined in message.h + // namespace protobuf + // namespace google // defined below // defined in message.h @Namespace("google::protobuf::arena_metrics") public static native void EnableArenaMetrics(ArenaOptions options); @@ -441,7 +439,7 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { // Support for non-RTTI environments. (The metrics hooks API uses type // information.) -// #ifndef GOOGLE_PROTOBUF_NO_RTTI +// #if PROTOBUF_RTTI // #define RTTI_TYPE_ID(type) (&typeid(type)) // #else // #define RTTI_TYPE_ID(type) (NULL) @@ -453,8 +451,10 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { // #undef RTTI_TYPE_ID // namespace protobuf - // namespace google + +// #include + // #endif // GOOGLE_PROTOBUF_ARENA_H__ @@ -524,10 +524,16 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { // #include // #include +// #include + // TYPE_BOOL is defined in the MacOS's ConditionalMacros.h. // #ifdef TYPE_BOOL // #undef TYPE_BOOL // #endif // TYPE_BOOL + +// #ifdef SWIG +// #define PROTOBUF_EXPORT +// #endif // Targeting ../DescriptorDatabase.java @@ -612,6 +618,8 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { // Targeting ../CommandLineInterface.java +// Defined in helpers.h + // namespace cpp // Targeting ../DescriptorTest.java @@ -668,7 +676,7 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { // Strings fields are stored as pointers but returned as const references. // #define PROTOBUF_DEFINE_STRING_ACCESSOR(CLASS, FIELD) -// inline const string& CLASS::FIELD() const { return *FIELD##_; } +// inline const std::string& CLASS::FIELD() const { return *FIELD##_; } // Arrays take an index parameter, obviously. // #define PROTOBUF_DEFINE_ARRAY_ACCESSOR(CLASS, FIELD, TYPE) @@ -868,8 +876,10 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { // namespace protobuf - // namespace google + +// #include + // #endif // GOOGLE_PROTOBUF_DESCRIPTOR_H__ @@ -917,11 +927,20 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { // #define GOOGLE_PROTOBUF_MESSAGE_LITE_H__ // #include +// #include // #include // #include -// #include // #include -// #include +// #include +// #include +// #include + + +// #include + +// #ifdef SWIG +// #error "You cannot SWIG proto headers" +// #endif // Targeting ../CodedInputStream.java @@ -935,6 +954,7 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { + // namespace io // Targeting ../RepeatedPtrFieldBase.java @@ -945,8 +965,50 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { -// #ifndef SWIG -// #endif // SWIG +// We compute sizes as size_t but cache them as int. This function converts a +// computed size to a cached size. Since we don't proceed with serialization +// if the total size was > INT_MAX, it is not important what this function +// returns for inputs > INT_MAX. However this case should not error or +// GOOGLE_CHECK-fail, because the full size_t resolution is still returned from +// ByteSizeLong() and checked against INT_MAX; we can catch the overflow +// there. +@Namespace("google::protobuf::internal") public static native int ToCachedSize(@Cast("size_t") long size); + +// We mainly calculate sizes in terms of size_t, but some functions that +// compute sizes return "int". These int sizes are expected to always be +// positive. This function is more efficient than casting an int to size_t +// directly on 64-bit platforms because it avoids making the compiler emit a +// sign extending instruction, which we don't want and don't want to pay for. +@Namespace("google::protobuf::internal") public static native @Cast("size_t") long FromIntSize(int size); + +// For cases where a legacy function returns an integer size. We GOOGLE_DCHECK() +// that the conversion will fit within an integer; if this is false then we +// are losing information. +@Namespace("google::protobuf::internal") public static native int ToIntSize(@Cast("size_t") long size); + +// This type wraps a variable whose constructor and destructor are explicitly +// called. It is particularly useful for a global variable, without its +// constructor and destructor run on start and end of the program lifetime. +// This circumvents the initial construction order fiasco, while keeping +// the address of the empty string a compile time constant. +// +// Pay special attention to the initialization state of the object. +// 1. The object is "uninitialized" to begin with. +// 2. Call DefaultConstruct() only if the object is uninitialized. +// After the call, the object becomes "initialized". +// 3. Call get() and get_mutable() only if the object is initialized. +// 4. Call Destruct() only if the object is initialized. +// After the call, the object becomes uninitialized. + +// Default empty string object. Don't use this directly. Instead, call +// GetEmptyString() to get the reference. + + +@Namespace("google::protobuf::internal") public static native @StdString BytePointer GetEmptyStringAlreadyInited(); + +@Namespace("google::protobuf::internal") public static native @Cast("size_t") long StringSpaceUsedExcludingSelfLong(@StdString BytePointer str); +@Namespace("google::protobuf::internal") public static native @Cast("size_t") long StringSpaceUsedExcludingSelfLong(@StdString String str); + // Targeting ../MessageLite.java @@ -954,19 +1016,30 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { -// DO NOT USE: For migration only. Will be removed when Proto3 defaults to -// preserve unknowns. -@Namespace("google::protobuf::internal") public static native @Cast("bool") boolean GetProto3PreserveUnknownsDefault(); -// DO NOT USE: For migration only. Will be removed when Proto3 defaults to -// preserve unknowns. -@Namespace("google::protobuf::internal") public static native void SetProto3PreserveUnknownsDefault(@Cast("bool") boolean preserve); + + + + +// Targeting ../BoundedZCIS.java + + + + + + + + + // namespace internal - // namespace protobuf + // namespace protobuf // namespace google + +// #include + // #endif // GOOGLE_PROTOBUF_MESSAGE_LITE_H__ @@ -1089,16 +1162,23 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { // #include // #include -// #include -// #include - +// #include // #include +// #include // #include +// #include +// #include // #define GOOGLE_PROTOBUF_HAS_ONEOF // #define GOOGLE_PROTOBUF_HAS_ARENAS +// #include + +// #ifdef SWIG +// #error "You cannot SWIG proto headers" +// #endif + // Defined in this file. // Targeting ../MapKey.java @@ -1128,6 +1208,13 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { // field_backed_map_impl.cc +// Targeting ../MapFieldPrinterHelper.java + + // text_format.cc + +// Targeting ../ReflectionAccessor.java + + // Targeting ../ReflectionOps.java @@ -1162,39 +1249,51 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { // #define DECLARE_GET_REPEATED_FIELD(TYPE) -// template<> -// LIBPROTOBUF_EXPORT -// const RepeatedField& Reflection::GetRepeatedField( -// const Message& message, const FieldDescriptor* field) const; +// template <> +// PROTOBUF_EXPORT const RepeatedField& +// Reflection::GetRepeatedField(const Message& message, +// const FieldDescriptor* field) const; // -// template<> -// LIBPROTOBUF_EXPORT -// RepeatedField* Reflection::MutableRepeatedField( -// Message* message, const FieldDescriptor* field) const; - - - - +// template <> +// PROTOBUF_EXPORT RepeatedField* Reflection::MutableRepeatedField( +// Message * message, const FieldDescriptor* field) const; + + + + + + + +// #undef DECLARE_GET_REPEATED_FIELD +// Tries to downcast this message to a generated message type. Returns NULL if +// this class is not an instance of T. This works even if RTTI is disabled. +// +// This also has the effect of creating a strong reference to T that will +// prevent the linker from stripping it out at link time. This can be important +// if you are using a DynamicMessageFactory that delegates to the generated +// factory. +// Legacy functions, to preserve compatibility with existing callers. +// These had a slightly different signature, so we have to adjust "T". -// #undef DECLARE_GET_REPEATED_FIELD + // namespace internal // ============================================================================= // Implementation details for {Get,Mutable}RawRepeatedPtrField. We provide @@ -1218,8 +1317,10 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { // namespace protobuf - // namespace google + +// #include + // #endif // GOOGLE_PROTOBUF_MESSAGE_H__ @@ -1368,6 +1469,12 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { // #define PROTOBUF_CONSTEXPR_VAR // #endif // !_clang +// #ifdef SWIG +// #error "You cannot SWIG proto headers" +// #endif + +// #include + // Processing-type masks. @Namespace("google::protobuf::internal") @MemberGetter public static native @Cast("const unsigned char") byte kOneofMask(); public static final byte kOneofMask = kOneofMask(); @@ -1386,6 +1493,10 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { /** enum google::protobuf::internal::ProcessingTypes */ public static final int + TYPE_STRING_CORD = 19, + TYPE_STRING_STRING_PIECE = 20, + TYPE_BYTES_CORD = 21, + TYPE_BYTES_STRING_PIECE = 22, TYPE_STRING_INLINED = 23, TYPE_BYTES_INLINED = 24, TYPE_MAP = 25; @@ -1410,11 +1521,19 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { CodedInputStream input); @Namespace("google::protobuf::internal") public static native @Cast("bool") boolean MergePartialFromCodedStreamLite(MessageLite msg, @Const @ByRef ParseTable table, CodedInputStream input); +// Targeting ../CompareHelper.java + + +// Targeting ../CompareMapKey.java + + // namespace internal // namespace protobuf - // namespace google + +// #include + // #endif // GOOGLE_PROTOBUF_GENERATED_MESSAGE_TABLE_DRIVEN_H__ @@ -1426,21 +1545,22 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { // #ifndef PROTOBUF_INCLUDED_caffe_2eproto // #define PROTOBUF_INCLUDED_caffe_2eproto +// #include // #include -// #include - -// #if GOOGLE_PROTOBUF_VERSION < 3006001 +// #include +// #if PROTOBUF_VERSION < 3007000 // #error This file was generated by a newer version of protoc which is -// #error incompatible with your Protocol Buffer headers. Please update +// #error incompatible with your Protocol Buffer headers. Please update // #error your headers. // #endif -// #if 3006001 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION +// #if 3007001 < PROTOBUF_MIN_PROTOC_VERSION // #error This file was generated by an older version of protoc which is -// #error incompatible with your Protocol Buffer headers. Please +// #error incompatible with your Protocol Buffer headers. Please // #error regenerate this file with a newer version of protoc. // #endif +// #include // #include // #include // #include @@ -1454,10 +1574,11 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { // #include // #include // @@protoc_insertion_point(includes) -// #define PROTOBUF_INTERNAL_EXPORT_protobuf_caffe_2eproto +// #include +// #define PROTOBUF_INTERNAL_EXPORT_caffe_2eproto + // Internal implementation detail -- do not use these members. -@Namespace("protobuf_caffe_2eproto") public static native void AddDescriptors(); - // namespace protobuf_caffe_2eproto +public static native void AddDescriptors_caffe_2eproto(); // namespace caffe @@ -2372,9 +2493,6 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - - // repeated float data = 5 [packed = true]; @@ -2417,32 +2535,24 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - // optional int32 channels = 2 [default = 0]; - - // optional int32 height = 3 [default = 0]; - - // optional int32 width = 4 [default = 0]; - - // ------------------------------------------------------------------- // BlobProtoVector @@ -2466,31 +2576,23 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - // optional int32 height = 2; - - // optional int32 width = 3; - - // optional bytes data = 4; - - // #if LANG_CXX11 // #endif @@ -2505,8 +2607,6 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - // repeated float float_data = 6; @@ -2522,8 +2622,6 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - // ------------------------------------------------------------------- // FillerParameter @@ -2533,8 +2631,6 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - // #if LANG_CXX11 // #endif @@ -2549,56 +2645,42 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - // optional float min = 3 [default = 0]; - - // optional float max = 4 [default = 1]; - - // optional float mean = 5 [default = 0]; - - // optional float std = 6 [default = 1]; - - // optional int32 sparse = 7 [default = -1]; - - // optional .caffe.FillerParameter.VarianceNorm variance_norm = 8 [default = FAN_IN]; - - // ------------------------------------------------------------------- // NetParameter @@ -2608,8 +2690,6 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - // #if LANG_CXX11 // #endif @@ -2661,8 +2741,6 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - // optional .caffe.NetState state = 6; @@ -2671,17 +2749,12 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - - // optional bool debug_info = 7 [default = false]; - - // repeated .caffe.LayerParameter layer = 100; @@ -2709,8 +2782,6 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - // #if LANG_CXX11 // #endif @@ -2727,16 +2798,11 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - - // optional string train_net = 1; - - // #if LANG_CXX11 // #endif @@ -2772,9 +2838,6 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - - // repeated .caffe.NetParameter test_net_param = 22; @@ -2792,9 +2855,6 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - - // repeated .caffe.NetState test_state = 27; @@ -2819,71 +2879,53 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - // optional bool test_compute_loss = 19 [default = false]; - - // optional bool test_initialization = 32 [default = true]; - - // optional float base_lr = 5; - - // optional int32 display = 6; - - // optional int32 average_loss = 33 [default = 1]; - - // optional int32 max_iter = 7; - - // optional int32 iter_size = 36 [default = 1]; - - // optional string lr_policy = 8; - - // #if LANG_CXX11 // #endif @@ -2898,39 +2940,29 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - // optional float power = 10; - - // optional float momentum = 11; - - // optional float weight_decay = 12; - - // optional string regularization_type = 29 [default = "L2"]; - - // #if LANG_CXX11 // #endif @@ -2945,8 +2977,6 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - // repeated int32 stepvalue = 34; @@ -2962,23 +2992,17 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - // optional int32 snapshot = 14 [default = 0]; - - // optional string snapshot_prefix = 15; - - // #if LANG_CXX11 // #endif @@ -2993,47 +3017,35 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - // optional .caffe.SolverParameter.SnapshotFormat snapshot_format = 37 [default = BINARYPROTO]; - - // optional .caffe.SolverParameter.SolverMode solver_mode = 17 [default = GPU]; - - // optional int32 device_id = 18 [default = 0]; - - // optional int64 random_seed = 20 [default = -1]; - - // optional string type = 40 [default = "SGD"]; - - // #if LANG_CXX11 // #endif @@ -3048,56 +3060,42 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - // optional float momentum2 = 39 [default = 0.999]; - - // optional float rms_decay = 38 [default = 0.99]; - - // optional bool debug_info = 23 [default = false]; - - // optional bool snapshot_after_train = 28 [default = true]; - - // optional .caffe.SolverParameter.SolverType solver_type = 30 [default = SGD]; - - // optional bool layer_wise_reduce = 41 [default = true]; - - // ------------------------------------------------------------------- // SolverState @@ -3108,15 +3106,11 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - // optional string learned_net = 2; - - // #if LANG_CXX11 // #endif @@ -3140,8 +3134,6 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - // ------------------------------------------------------------------- // NetState @@ -3152,16 +3144,12 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - // optional int32 level = 2 [default = 0]; - - // repeated string stage = 3; @@ -3191,24 +3179,18 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - // optional int32 min_level = 2; - - // optional int32 max_level = 3; - - // repeated string stage = 4; @@ -3256,8 +3238,6 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - // #if LANG_CXX11 // #endif @@ -3272,24 +3252,18 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - // optional float lr_mult = 3 [default = 1]; - - // optional float decay_mult = 4 [default = 1]; - - // ------------------------------------------------------------------- // LayerParameter @@ -3299,8 +3273,6 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - // #if LANG_CXX11 // #endif @@ -3314,8 +3286,6 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - // #if LANG_CXX11 // #endif @@ -3368,8 +3338,6 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - // repeated float loss_weight = 5; @@ -3432,22 +3400,23 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { +// optional .caffe.LossParameter loss_param = 101; -// optional .caffe.LossParameter loss_param = 101; +// optional .caffe.AccuracyParameter accuracy_param = 102; -// optional .caffe.AccuracyParameter accuracy_param = 102; +// optional .caffe.ArgMaxParameter argmax_param = 103; @@ -3455,34 +3424,15 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { +// optional .caffe.BatchNormParameter batch_norm_param = 139; -// optional .caffe.ArgMaxParameter argmax_param = 103; - - - - - -// optional .caffe.BatchNormParameter batch_norm_param = 139; - - - - - - - - - - -// optional .caffe.BiasParameter bias_param = 141; - - - +// optional .caffe.BiasParameter bias_param = 141; @@ -3498,9 +3448,6 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - - // optional .caffe.ContrastiveLossParameter contrastive_loss_param = 105; @@ -3509,9 +3456,6 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - - // optional .caffe.ConvolutionParameter convolution_param = 106; @@ -3520,9 +3464,6 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - - // optional .caffe.CropParameter crop_param = 144; @@ -3531,9 +3472,6 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - - // optional .caffe.DataParameter data_param = 107; @@ -3542,9 +3480,6 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - - // optional .caffe.DropoutParameter dropout_param = 108; @@ -3553,9 +3488,6 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - - // optional .caffe.DummyDataParameter dummy_data_param = 109; @@ -3564,9 +3496,6 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - - // optional .caffe.EltwiseParameter eltwise_param = 110; @@ -3575,9 +3504,6 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - - // optional .caffe.ELUParameter elu_param = 140; @@ -3586,9 +3512,6 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - - // optional .caffe.EmbedParameter embed_param = 137; @@ -3597,9 +3520,6 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - - // optional .caffe.ExpParameter exp_param = 111; @@ -3608,9 +3528,6 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - - // optional .caffe.FlattenParameter flatten_param = 135; @@ -3619,9 +3536,6 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - - // optional .caffe.HDF5DataParameter hdf5_data_param = 112; @@ -3630,9 +3544,6 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - - // optional .caffe.HDF5OutputParameter hdf5_output_param = 113; @@ -3641,9 +3552,6 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - - // optional .caffe.HingeLossParameter hinge_loss_param = 114; @@ -3652,9 +3560,6 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - - // optional .caffe.ImageDataParameter image_data_param = 115; @@ -3663,9 +3568,6 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - - // optional .caffe.InfogainLossParameter infogain_loss_param = 116; @@ -3674,9 +3576,6 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - - // optional .caffe.InnerProductParameter inner_product_param = 117; @@ -3685,9 +3584,6 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - - // optional .caffe.InputParameter input_param = 143; @@ -3696,9 +3592,6 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - - // optional .caffe.LogParameter log_param = 134; @@ -3707,9 +3600,6 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - - // optional .caffe.LRNParameter lrn_param = 118; @@ -3718,9 +3608,6 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - - // optional .caffe.MemoryDataParameter memory_data_param = 119; @@ -3729,9 +3616,6 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - - // optional .caffe.MVNParameter mvn_param = 120; @@ -3740,9 +3624,6 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - - // optional .caffe.ParameterParameter parameter_param = 145; @@ -3751,9 +3632,6 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - - // optional .caffe.PoolingParameter pooling_param = 121; @@ -3762,9 +3640,6 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - - // optional .caffe.PowerParameter power_param = 122; @@ -3773,9 +3648,6 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - - // optional .caffe.PReLUParameter prelu_param = 131; @@ -3784,9 +3656,6 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - - // optional .caffe.PythonParameter python_param = 130; @@ -3795,9 +3664,6 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - - // optional .caffe.RecurrentParameter recurrent_param = 146; @@ -3806,9 +3672,6 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - - // optional .caffe.ReductionParameter reduction_param = 136; @@ -3817,9 +3680,6 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - - // optional .caffe.ReLUParameter relu_param = 123; @@ -3828,9 +3688,6 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - - // optional .caffe.ReshapeParameter reshape_param = 133; @@ -3839,9 +3696,6 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - - // optional .caffe.ScaleParameter scale_param = 142; @@ -3850,9 +3704,6 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - - // optional .caffe.SigmoidParameter sigmoid_param = 124; @@ -3861,9 +3712,6 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - - // optional .caffe.SoftmaxParameter softmax_param = 125; @@ -3872,9 +3720,6 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - - // optional .caffe.SPPParameter spp_param = 132; @@ -3883,9 +3728,6 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - - // optional .caffe.SliceParameter slice_param = 126; @@ -3894,9 +3736,6 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - - // optional .caffe.TanHParameter tanh_param = 127; @@ -3905,9 +3744,6 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - - // optional .caffe.ThresholdParameter threshold_param = 128; @@ -3916,9 +3752,6 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - - // optional .caffe.TileParameter tile_param = 138; @@ -3927,9 +3760,6 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - - // optional .caffe.WindowDataParameter window_data_param = 129; @@ -3938,9 +3768,6 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - - // ------------------------------------------------------------------- // TransformationParameter @@ -3951,31 +3778,23 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - // optional bool mirror = 2 [default = false]; - - // optional uint32 crop_size = 3 [default = 0]; - - // optional string mean_file = 4; - - // #if LANG_CXX11 // #endif @@ -3999,16 +3818,12 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - // optional bool force_gray = 7 [default = false]; - - // ------------------------------------------------------------------- // LossParameter @@ -4019,24 +3834,18 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - // optional .caffe.LossParameter.NormalizationMode normalization = 3 [default = VALID]; - - // optional bool normalize = 2; - - // ------------------------------------------------------------------- // AccuracyParameter @@ -4047,24 +3856,18 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - // optional int32 axis = 2 [default = 1]; - - // optional int32 ignore_label = 3; - - // ------------------------------------------------------------------- // ArgMaxParameter @@ -4075,24 +3878,18 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - // optional uint32 top_k = 2 [default = 1]; - - // optional int32 axis = 3; - - // ------------------------------------------------------------------- // ConcatParameter @@ -4103,16 +3900,12 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - // optional uint32 concat_dim = 1 [default = 1]; - - // ------------------------------------------------------------------- // BatchNormParameter @@ -4123,24 +3916,18 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - // optional float moving_average_fraction = 2 [default = 0.999]; - - // optional float eps = 3 [default = 1e-05]; - - // ------------------------------------------------------------------- // BiasParameter @@ -4151,16 +3938,12 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - // optional int32 num_axes = 2 [default = 1]; - - // optional .caffe.FillerParameter filler = 3; @@ -4169,9 +3952,6 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - - // ------------------------------------------------------------------- // ContrastiveLossParameter @@ -4182,16 +3962,12 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - // optional bool legacy_version = 2 [default = false]; - - // ------------------------------------------------------------------- // ConvolutionParameter @@ -4202,16 +3978,12 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - // optional bool bias_term = 2 [default = true]; - - // repeated uint32 pad = 3; @@ -4254,56 +4026,42 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - // optional uint32 pad_w = 10 [default = 0]; - - // optional uint32 kernel_h = 11; - - // optional uint32 kernel_w = 12; - - // optional uint32 stride_h = 13; - - // optional uint32 stride_w = 14; - - // optional uint32 group = 5 [default = 1]; - - // optional .caffe.FillerParameter weight_filler = 7; @@ -4312,9 +4070,6 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - - // optional .caffe.FillerParameter bias_filler = 8; @@ -4323,33 +4078,24 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - - // optional .caffe.ConvolutionParameter.Engine engine = 15 [default = DEFAULT]; - - // optional int32 axis = 16 [default = 1]; - - // optional bool force_nd_im2col = 17 [default = false]; - - // ------------------------------------------------------------------- // CropParameter @@ -4360,8 +4106,6 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - // repeated uint32 offset = 2; @@ -4380,8 +4124,6 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - // #if LANG_CXX11 // #endif @@ -4396,39 +4138,29 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - // optional uint32 rand_skip = 7 [default = 0]; - - // optional .caffe.DataParameter.DB backend = 8 [default = LEVELDB]; - - // optional float scale = 2 [default = 1]; - - // optional string mean_file = 3; - - // #if LANG_CXX11 // #endif @@ -4443,32 +4175,24 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - // optional bool mirror = 6 [default = false]; - - // optional bool force_encoded_color = 9 [default = false]; - - // optional uint32 prefetch = 10 [default = 4]; - - // ------------------------------------------------------------------- // DropoutParameter @@ -4479,8 +4203,6 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - // ------------------------------------------------------------------- // DummyDataParameter @@ -4549,8 +4271,6 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - // repeated float coeff = 2; @@ -4566,8 +4286,6 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - // ------------------------------------------------------------------- // ELUParameter @@ -4578,8 +4296,6 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - // ------------------------------------------------------------------- // EmbedParameter @@ -4590,24 +4306,18 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - // optional uint32 input_dim = 2; - - // optional bool bias_term = 3 [default = true]; - - // optional .caffe.FillerParameter weight_filler = 4; @@ -4616,9 +4326,6 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - - // optional .caffe.FillerParameter bias_filler = 5; @@ -4627,9 +4334,6 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - - // ------------------------------------------------------------------- // ExpParameter @@ -4640,24 +4344,18 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - // optional float scale = 2 [default = 1]; - - // optional float shift = 3 [default = 0]; - - // ------------------------------------------------------------------- // FlattenParameter @@ -4668,16 +4366,12 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - // optional int32 end_axis = 2 [default = -1]; - - // ------------------------------------------------------------------- // HDF5DataParameter @@ -4687,8 +4381,6 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - // #if LANG_CXX11 // #endif @@ -4703,16 +4395,12 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - // optional bool shuffle = 3 [default = false]; - - // ------------------------------------------------------------------- // HDF5OutputParameter @@ -4722,8 +4410,6 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - // #if LANG_CXX11 // #endif @@ -4742,8 +4428,6 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - // ------------------------------------------------------------------- // ImageDataParameter @@ -4753,8 +4437,6 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - // #if LANG_CXX11 // #endif @@ -4769,63 +4451,47 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - // optional uint32 rand_skip = 7 [default = 0]; - - // optional bool shuffle = 8 [default = false]; - - // optional uint32 new_height = 9 [default = 0]; - - // optional uint32 new_width = 10 [default = 0]; - - // optional bool is_color = 11 [default = true]; - - // optional float scale = 2 [default = 1]; - - // optional string mean_file = 3; - - // #if LANG_CXX11 // #endif @@ -4840,23 +4506,17 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - // optional bool mirror = 6 [default = false]; - - // optional string root_folder = 12 [default = ""]; - - // #if LANG_CXX11 // #endif @@ -4874,8 +4534,6 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - // #if LANG_CXX11 // #endif @@ -4890,8 +4548,6 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - // ------------------------------------------------------------------- // InnerProductParameter @@ -4902,16 +4558,12 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - // optional bool bias_term = 2 [default = true]; - - // optional .caffe.FillerParameter weight_filler = 3; @@ -4920,9 +4572,6 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - - // optional .caffe.FillerParameter bias_filler = 4; @@ -4931,25 +4580,18 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - - // optional int32 axis = 5 [default = 1]; - - // optional bool transpose = 6 [default = false]; - - // ------------------------------------------------------------------- // InputParameter @@ -4973,24 +4615,18 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - // optional float scale = 2 [default = 1]; - - // optional float shift = 3 [default = 0]; - - // ------------------------------------------------------------------- // LRNParameter @@ -5001,48 +4637,36 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - // optional float alpha = 2 [default = 1]; - - // optional float beta = 3 [default = 0.75]; - - // optional .caffe.LRNParameter.NormRegion norm_region = 4 [default = ACROSS_CHANNELS]; - - // optional float k = 5 [default = 1]; - - // optional .caffe.LRNParameter.Engine engine = 6 [default = DEFAULT]; - - // ------------------------------------------------------------------- // MemoryDataParameter @@ -5053,32 +4677,24 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - // optional uint32 channels = 2; - - // optional uint32 height = 3; - - // optional uint32 width = 4; - - // ------------------------------------------------------------------- // MVNParameter @@ -5089,24 +4705,18 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - // optional bool across_channels = 2 [default = false]; - - // optional float eps = 3 [default = 1e-09]; - - // ------------------------------------------------------------------- // ParameterParameter @@ -5119,9 +4729,6 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - - // ------------------------------------------------------------------- // PoolingParameter @@ -5132,96 +4739,72 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - // optional uint32 pad = 4 [default = 0]; - - // optional uint32 pad_h = 9 [default = 0]; - - // optional uint32 pad_w = 10 [default = 0]; - - // optional uint32 kernel_size = 2; - - // optional uint32 kernel_h = 5; - - // optional uint32 kernel_w = 6; - - // optional uint32 stride = 3 [default = 1]; - - // optional uint32 stride_h = 7; - - // optional uint32 stride_w = 8; - - // optional .caffe.PoolingParameter.Engine engine = 11 [default = DEFAULT]; - - // optional bool global_pooling = 12 [default = false]; - - // ------------------------------------------------------------------- // PowerParameter @@ -5232,24 +4815,18 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - // optional float scale = 2 [default = 1]; - - // optional float shift = 3 [default = 0]; - - // ------------------------------------------------------------------- // PythonParameter @@ -5259,8 +4836,6 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - // #if LANG_CXX11 // #endif @@ -5274,8 +4849,6 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - // #if LANG_CXX11 // #endif @@ -5289,8 +4862,6 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - // #if LANG_CXX11 // #endif @@ -5305,8 +4876,6 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - // ------------------------------------------------------------------- // RecurrentParameter @@ -5317,8 +4886,6 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - // optional .caffe.FillerParameter weight_filler = 2; @@ -5327,9 +4894,6 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - - // optional .caffe.FillerParameter bias_filler = 3; @@ -5338,25 +4902,18 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - - // optional bool debug_info = 4 [default = false]; - - // optional bool expose_hidden = 5 [default = false]; - - // ------------------------------------------------------------------- // ReductionParameter @@ -5367,24 +4924,18 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - // optional int32 axis = 2 [default = 0]; - - // optional float coeff = 3 [default = 1]; - - // ------------------------------------------------------------------- // ReLUParameter @@ -5395,16 +4946,12 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - // optional .caffe.ReLUParameter.Engine engine = 2 [default = DEFAULT]; - - // ------------------------------------------------------------------- // ReshapeParameter @@ -5417,25 +4964,18 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - - // optional int32 axis = 2 [default = 0]; - - // optional int32 num_axes = 3 [default = -1]; - - // ------------------------------------------------------------------- // ScaleParameter @@ -5446,16 +4986,12 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - // optional int32 num_axes = 2 [default = 1]; - - // optional .caffe.FillerParameter filler = 3; @@ -5464,17 +5000,12 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - - // optional bool bias_term = 4 [default = false]; - - // optional .caffe.FillerParameter bias_filler = 5; @@ -5483,9 +5014,6 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - - // ------------------------------------------------------------------- // SigmoidParameter @@ -5496,8 +5024,6 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - // ------------------------------------------------------------------- // SliceParameter @@ -5508,8 +5034,6 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - // repeated uint32 slice_point = 2; @@ -5525,8 +5049,6 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - // ------------------------------------------------------------------- // SoftmaxParameter @@ -5537,16 +5059,12 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - // optional int32 axis = 2 [default = 1]; - - // ------------------------------------------------------------------- // TanHParameter @@ -5557,8 +5075,6 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - // ------------------------------------------------------------------- // TileParameter @@ -5569,16 +5085,12 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - // optional int32 tiles = 2; - - // ------------------------------------------------------------------- // ThresholdParameter @@ -5589,8 +5101,6 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - // ------------------------------------------------------------------- // WindowDataParameter @@ -5600,8 +5110,6 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - // #if LANG_CXX11 // #endif @@ -5616,15 +5124,11 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - // optional string mean_file = 3; - - // #if LANG_CXX11 // #endif @@ -5639,63 +5143,47 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - // optional uint32 crop_size = 5 [default = 0]; - - // optional bool mirror = 6 [default = false]; - - // optional float fg_threshold = 7 [default = 0.5]; - - // optional float bg_threshold = 8 [default = 0.5]; - - // optional float fg_fraction = 9 [default = 0.25]; - - // optional uint32 context_pad = 10 [default = 0]; - - // optional string crop_mode = 11 [default = "warp"]; - - // #if LANG_CXX11 // #endif @@ -5710,15 +5198,11 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - // optional string root_folder = 13 [default = ""]; - - // #if LANG_CXX11 // #endif @@ -5737,24 +5221,18 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - // optional .caffe.SPPParameter.PoolMethod pool = 2 [default = MAX]; - - // optional .caffe.SPPParameter.Engine engine = 6 [default = DEFAULT]; - - // ------------------------------------------------------------------- // V1LayerParameter @@ -5802,8 +5280,6 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - // #if LANG_CXX11 // #endif @@ -5836,8 +5312,6 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - // repeated .caffe.BlobProto blobs = 6; @@ -5910,9 +5384,6 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - - // optional .caffe.ArgMaxParameter argmax_param = 23; @@ -5921,9 +5392,6 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - - // optional .caffe.ConcatParameter concat_param = 9; @@ -5932,9 +5400,6 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - - // optional .caffe.ContrastiveLossParameter contrastive_loss_param = 40; @@ -5943,9 +5408,6 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - - // optional .caffe.ConvolutionParameter convolution_param = 10; @@ -5954,9 +5416,6 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - - // optional .caffe.DataParameter data_param = 11; @@ -5965,9 +5424,6 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - - // optional .caffe.DropoutParameter dropout_param = 12; @@ -5976,9 +5432,6 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - - // optional .caffe.DummyDataParameter dummy_data_param = 26; @@ -5987,9 +5440,6 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - - // optional .caffe.EltwiseParameter eltwise_param = 24; @@ -5998,9 +5448,6 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - - // optional .caffe.ExpParameter exp_param = 41; @@ -6009,9 +5456,6 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - - // optional .caffe.HDF5DataParameter hdf5_data_param = 13; @@ -6020,9 +5464,6 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - - // optional .caffe.HDF5OutputParameter hdf5_output_param = 14; @@ -6031,9 +5472,6 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - - // optional .caffe.HingeLossParameter hinge_loss_param = 29; @@ -6042,9 +5480,6 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - - // optional .caffe.ImageDataParameter image_data_param = 15; @@ -6053,9 +5488,6 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - - // optional .caffe.InfogainLossParameter infogain_loss_param = 16; @@ -6064,9 +5496,6 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - - // optional .caffe.InnerProductParameter inner_product_param = 17; @@ -6075,9 +5504,6 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - - // optional .caffe.LRNParameter lrn_param = 18; @@ -6086,9 +5512,6 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - - // optional .caffe.MemoryDataParameter memory_data_param = 22; @@ -6097,9 +5520,6 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - - // optional .caffe.MVNParameter mvn_param = 34; @@ -6108,9 +5528,6 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - - // optional .caffe.PoolingParameter pooling_param = 19; @@ -6119,9 +5536,6 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - - // optional .caffe.PowerParameter power_param = 21; @@ -6130,9 +5544,6 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - - // optional .caffe.ReLUParameter relu_param = 30; @@ -6141,9 +5552,6 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - - // optional .caffe.SigmoidParameter sigmoid_param = 38; @@ -6152,9 +5560,6 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - - // optional .caffe.SoftmaxParameter softmax_param = 39; @@ -6163,9 +5568,6 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - - // optional .caffe.SliceParameter slice_param = 31; @@ -6174,9 +5576,6 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - - // optional .caffe.TanHParameter tanh_param = 37; @@ -6185,9 +5584,6 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - - // optional .caffe.ThresholdParameter threshold_param = 25; @@ -6196,9 +5592,6 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - - // optional .caffe.WindowDataParameter window_data_param = 20; @@ -6207,9 +5600,6 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - - // optional .caffe.TransformationParameter transform_param = 36; @@ -6218,9 +5608,6 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - - // optional .caffe.LossParameter loss_param = 42; @@ -6229,9 +5616,6 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - - // optional .caffe.V0LayerParameter layer = 1; @@ -6240,9 +5624,6 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - - // ------------------------------------------------------------------- // V0LayerParameter @@ -6252,8 +5633,6 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - // #if LANG_CXX11 // #endif @@ -6267,8 +5646,6 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - // #if LANG_CXX11 // #endif @@ -6283,16 +5660,12 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - // optional bool biasterm = 4 [default = true]; - - // optional .caffe.FillerParameter weight_filler = 5; @@ -6301,9 +5674,6 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - - // optional .caffe.FillerParameter bias_filler = 6; @@ -6312,96 +5682,71 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - - // optional uint32 pad = 7 [default = 0]; - - // optional uint32 kernelsize = 8; - - // optional uint32 group = 9 [default = 1]; - - // optional uint32 stride = 10 [default = 1]; - - // optional .caffe.V0LayerParameter.PoolMethod pool = 11 [default = MAX]; - - // optional float dropout_ratio = 12 [default = 0.5]; - - // optional uint32 local_size = 13 [default = 5]; - - // optional float alpha = 14 [default = 1]; - - // optional float beta = 15 [default = 0.75]; - - // optional float k = 22 [default = 1]; - - // optional string source = 16; - - // #if LANG_CXX11 // #endif @@ -6416,15 +5761,11 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - // optional string meanfile = 18; - - // #if LANG_CXX11 // #endif @@ -6439,24 +5780,18 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - // optional uint32 cropsize = 20 [default = 0]; - - // optional bool mirror = 21 [default = false]; - - // repeated .caffe.BlobProto blobs = 50; @@ -6490,47 +5825,35 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - // optional float det_fg_threshold = 54 [default = 0.5]; - - // optional float det_bg_threshold = 55 [default = 0.5]; - - // optional float det_fg_fraction = 56 [default = 0.25]; - - // optional uint32 det_context_pad = 58 [default = 0]; - - // optional string det_crop_mode = 59 [default = "warp"]; - - // #if LANG_CXX11 // #endif @@ -6545,48 +5868,36 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - // optional int32 new_channels = 61 [default = 0]; - - // optional int32 new_height = 62 [default = 0]; - - // optional int32 new_width = 63 [default = 0]; - - // optional bool shuffle_images = 64 [default = false]; - - // optional uint32 concat_dim = 65 [default = 1]; - - // optional .caffe.HDF5OutputParameter hdf5_output_param = 1001; @@ -6595,9 +5906,6 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - - // ------------------------------------------------------------------- // PReLUParameter @@ -6610,17 +5918,12 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { - - - // optional bool channel_shared = 2 [default = false]; - - // #ifdef __GNUC__ // #pragma GCC diagnostic pop // #endif // __GNUC__ @@ -6779,6 +6082,7 @@ public class caffe extends org.bytedeco.caffe.presets.caffe { // @@protoc_insertion_point(global_scope) +// #include // #endif // PROTOBUF_INCLUDED_caffe_2eproto diff --git a/caffe/src/main/java/org/bytedeco/caffe/presets/caffe.java b/caffe/src/main/java/org/bytedeco/caffe/presets/caffe.java index 6da73d8ffbd..e31de4b2c06 100644 --- a/caffe/src/main/java/org/bytedeco/caffe/presets/caffe.java +++ b/caffe/src/main/java/org/bytedeco/caffe/presets/caffe.java @@ -103,9 +103,10 @@ public class caffe implements LoadEnabled, InfoMapper { public void map(InfoMap infoMap) { infoMap.put(new Info("LIBPROTOBUF_EXPORT", "LIBPROTOC_EXPORT", "GOOGLE_PROTOBUF_ATTRIBUTE_NOINLINE", "GOOGLE_PROTOBUF_VERIFY_VERSION", "GOOGLE_ATTRIBUTE_ALWAYS_INLINE", - "GOOGLE_ATTRIBUTE_DEPRECATED", "GOOGLE_DLOG", "NOT_IMPLEMENTED", "NO_GPU", "CUDA_POST_KERNEL_CHECK", "PROTOBUF_CONSTEXPR", "PROTOBUF_CONSTEXPR_VAR").cppTypes().annotations()) + "GOOGLE_ATTRIBUTE_DEPRECATED", "GOOGLE_DLOG", "NOT_IMPLEMENTED", "NO_GPU", "CUDA_POST_KERNEL_CHECK", "PROTOBUF_CONSTEXPR", "PROTOBUF_CONSTEXPR_VAR", + "PROTOBUF_EXPORT", "PROTOBUF_ATTRIBUTE_REINITIALIZES", "PROTOBUF_NOINLINE").cppTypes().annotations()) .put(new Info("NDEBUG", "CPU_ONLY", "GFLAGS_GFLAGS_H_", "SWIG", "USE_CUDNN").define()) - .put(new Info("defined(_WIN32) && defined(GetMessage)", "LANG_CXX11").define(false)) + .put(new Info("defined(_WIN32) && defined(GetMessage)", "LANG_CXX11", "GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER").define(false)) .put(new Info("cublasHandle_t", "curandGenerator_t").cast().valueTypes("Pointer")) .put(new Info("CBLAS_TRANSPOSE", "cublasStatus_t", "curandStatus_t", "hid_t", "cudnnStatus_t", "cudnnDataType_t").cast().valueTypes("int")) .put(new Info("std::string").annotations("@StdString").valueTypes("BytePointer", "String").pointerTypes("@Cast({\"char*\", \"std::string*\"}) BytePointer")) @@ -123,7 +124,8 @@ public void map(InfoMap infoMap) { .put(new Info("google::protobuf::internal::CompileAssert", "google::protobuf::internal::ExplicitlyConstructed", "google::protobuf::MessageFactory::InternalRegisterGeneratedFile", "google::protobuf::internal::LogMessage", "google::protobuf::internal::LogFinisher", "google::protobuf::LogHandler", "google::protobuf::internal::FieldMetadata", "google::protobuf::internal::SerializationTable", "google::protobuf::internal::proto3_preserve_unknown_", - "google::protobuf::is_proto_enum", "google::protobuf::GetEnumDescriptor", "protobuf_caffe_2eproto::TableStruct", + "google::protobuf::internal::MergePartialFromImpl", "google::protobuf::internal::UnknownFieldParse", "google::protobuf::internal::WriteLengthDelimited", + "google::protobuf::is_proto_enum", "google::protobuf::GetEnumDescriptor", "protobuf_caffe_2eproto::TableStruct", "TableStruct_caffe_2eproto", "google::protobuf::RepeatedField", "google::protobuf::RepeatedPtrField", "boost::mutex").skip()) .put(new Info("caffe::AccuracyParameterDefaultTypeInternal", "caffe::ArgMaxParameterDefaultTypeInternal", "caffe::BatchNormParameterDefaultTypeInternal", diff --git a/chilitags/pom.xml b/chilitags/pom.xml index 78cedd043b8..0a05878e7af 100644 --- a/chilitags/pom.xml +++ b/chilitags/pom.xml @@ -45,7 +45,7 @@ org.bytedeco openblas - 0.3.5-${project.parent.version} + 0.3.6-${project.parent.version} org.bytedeco @@ -55,7 +55,7 @@ org.bytedeco openblas - 0.3.5-${project.parent.version} + 0.3.6-${project.parent.version} ${javacpp.platform} diff --git a/cminpack/platform/pom.xml b/cminpack/platform/pom.xml index ddbafc95dd8..cb289f57003 100644 --- a/cminpack/platform/pom.xml +++ b/cminpack/platform/pom.xml @@ -24,7 +24,7 @@ org.bytedeco openblas-platform - 0.3.5-${project.parent.version} + 0.3.6-${project.parent.version} ${project.groupId} diff --git a/cminpack/pom.xml b/cminpack/pom.xml index da9dfd62e39..eefe1a08e5f 100644 --- a/cminpack/pom.xml +++ b/cminpack/pom.xml @@ -22,7 +22,7 @@ org.bytedeco openblas - 0.3.5-${project.parent.version} + 0.3.6-${project.parent.version} org.bytedeco @@ -45,12 +45,12 @@ org.bytedeco openblas - 0.3.5-${project.parent.version} + 0.3.6-${project.parent.version} org.bytedeco openblas - 0.3.5-${project.parent.version} + 0.3.6-${project.parent.version} ${javacpp.platform} diff --git a/cminpack/src/gen/java/org/bytedeco/cminpack/global/cminpack.java b/cminpack/src/gen/java/org/bytedeco/cminpack/global/cminpack.java index 1b4b7087dc5..a32e612e00e 100644 --- a/cminpack/src/gen/java/org/bytedeco/cminpack/global/cminpack.java +++ b/cminpack/src/gen/java/org/bytedeco/cminpack/global/cminpack.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.cminpack.global; diff --git a/cminpack/src/gen/java/org/bytedeco/cminpack/global/cminpackl.java b/cminpack/src/gen/java/org/bytedeco/cminpack/global/cminpackl.java index 3ed836454ce..ff479ac1370 100644 --- a/cminpack/src/gen/java/org/bytedeco/cminpack/global/cminpackl.java +++ b/cminpack/src/gen/java/org/bytedeco/cminpack/global/cminpackl.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.cminpack.global; diff --git a/cminpack/src/gen/java/org/bytedeco/cminpack/global/cminpacks.java b/cminpack/src/gen/java/org/bytedeco/cminpack/global/cminpacks.java index 1d94ef5dde5..8e6275cd935 100644 --- a/cminpack/src/gen/java/org/bytedeco/cminpack/global/cminpacks.java +++ b/cminpack/src/gen/java/org/bytedeco/cminpack/global/cminpacks.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.cminpack.global; diff --git a/cpu_features/README.md b/cpu_features/README.md index 6de2a28ab88..887882aebd5 100644 --- 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.2.0 https://github.com/google/cpu_features + * cpu_features 0.3.0 https://github.com/google/cpu_features Please refer to the parent README.md file for more detailed information about the JavaCPP Presets. @@ -34,7 +34,7 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic 4.0.0 org.bytedeco.cpu_features simpleexample - 1.5 + 1.5.1-SNAPSHOT SimpleExample @@ -42,7 +42,7 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic org.bytedeco cpu_features-platform - 0.2.0-1.5 + 0.3.0-1.5.1-SNAPSHOT diff --git a/cpu_features/cppbuild.sh b/cpu_features/cppbuild.sh index b44a50f718e..88b2b9d7e3d 100755 --- a/cpu_features/cppbuild.sh +++ b/cpu_features/cppbuild.sh @@ -7,7 +7,7 @@ if [[ -z "$PLATFORM" ]]; then exit fi -CPU_FEATURES_VERSION=0.2.0 +CPU_FEATURES_VERSION=0.3.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 @@ -16,12 +16,14 @@ INSTALL_PATH=`pwd` echo "Decompressing archives..." tar --totals -xzf ../cpu_features-$CPU_FEATURES_VERSION.tar.gz cd cpu_features-$CPU_FEATURES_VERSION +patch -Np1 < ../../../cpu_features.patch patch -Np1 < ../../../cpu_features-android.patch || true case $PLATFORM in android-arm) sedinplace 's/CpuId(uint32_t leaf_id);/CpuId(uint32_t leaf_id) { }/g' include/internal/cpuid_x86.h sedinplace 's/GetXCR0Eax(void);/GetXCR0Eax(void) { }/g' include/internal/cpuid_x86.h + sedinplace '/ANDROID_CPU_ARM_FEATURE_VFPv2/d' ndk_compat/cpu-features.c $CMAKE -DCMAKE_TOOLCHAIN_FILE=android-arm.cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=.. -DCMAKE_INSTALL_LIBDIR="lib" . make -j4 make install @@ -29,6 +31,7 @@ case $PLATFORM in android-arm64) sedinplace 's/CpuId(uint32_t leaf_id);/CpuId(uint32_t leaf_id) { }/g' include/internal/cpuid_x86.h sedinplace 's/GetXCR0Eax(void);/GetXCR0Eax(void) { }/g' include/internal/cpuid_x86.h + sedinplace '/ANDROID_CPU_ARM_FEATURE_VFPv2/d' ndk_compat/cpu-features.c $CMAKE -DCMAKE_TOOLCHAIN_FILE=android-arm64.cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=.. -DCMAKE_INSTALL_LIBDIR="lib" . make -j4 make install @@ -45,14 +48,12 @@ case $PLATFORM in ;; linux-x86) sedinplace 's/sys\/auxv.h/linux\/auxvec.h/g' src/hwcaps.c - sedinplace 's/AT_HWCAP2/26/g' src/hwcaps.c CC="gcc -m32 -fPIC" $CMAKE -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=.. -DCMAKE_INSTALL_LIBDIR="lib" . make -j4 make install ;; linux-x86_64) sedinplace 's/sys\/auxv.h/linux\/auxvec.h/g' src/hwcaps.c - sedinplace 's/AT_HWCAP2/26/g' src/hwcaps.c CC="gcc -m64 -fPIC" $CMAKE -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=.. -DCMAKE_INSTALL_LIBDIR="lib" . make -j4 make install @@ -60,6 +61,8 @@ case $PLATFORM in linux-armhf) sedinplace 's/CpuId(uint32_t leaf_id);/CpuId(uint32_t leaf_id) { }/g' include/internal/cpuid_x86.h 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 CC="arm-linux-gnueabihf-gcc -fPIC" $CMAKE -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=.. -DCMAKE_INSTALL_LIBDIR="lib" . make -j4 make install @@ -67,6 +70,8 @@ case $PLATFORM in linux-arm64) sedinplace 's/CpuId(uint32_t leaf_id);/CpuId(uint32_t leaf_id) { }/g' include/internal/cpuid_x86.h sedinplace 's/GetXCR0Eax(void);/GetXCR0Eax(void) { }/g' include/internal/cpuid_x86.h + sedinplace 's/set(PROCESSOR_IS_AARCH64 FALSE)/set(PROCESSOR_IS_AARCH64 TRUE)/g' CMakeLists.txt + sedinplace 's/set(PROCESSOR_IS_X86 TRUE)/set(PROCESSOR_IS_X86 FALSE)/g' CMakeLists.txt CC="aarch64-linux-gnu-gcc -fPIC" $CMAKE -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=.. -DCMAKE_INSTALL_LIBDIR="lib" . make -j4 make install @@ -74,6 +79,8 @@ case $PLATFORM in linux-ppc64le) sedinplace 's/CpuId(uint32_t leaf_id);/CpuId(uint32_t leaf_id) { }/g' include/internal/cpuid_x86.h sedinplace 's/GetXCR0Eax(void);/GetXCR0Eax(void) { }/g' include/internal/cpuid_x86.h + sedinplace 's/set(PROCESSOR_IS_POWER FALSE)/set(PROCESSOR_IS_POWER TRUE)/g' CMakeLists.txt + sedinplace 's/set(PROCESSOR_IS_X86 TRUE)/set(PROCESSOR_IS_X86 FALSE)/g' CMakeLists.txt MACHINE_TYPE=$( uname -m ) if [[ "$MACHINE_TYPE" =~ ppc64 ]]; then CC="gcc -m64 -fPIC" $CMAKE -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=.. -DCMAKE_INSTALL_LIBDIR="lib" . @@ -86,6 +93,8 @@ case $PLATFORM in linux-mips64el) sedinplace 's/CpuId(uint32_t leaf_id);/CpuId(uint32_t leaf_id) { }/g' include/internal/cpuid_x86.h sedinplace 's/GetXCR0Eax(void);/GetXCR0Eax(void) { }/g' include/internal/cpuid_x86.h + sedinplace 's/set(PROCESSOR_IS_MIPS FALSE)/set(PROCESSOR_IS_MIPS TRUE)/g' CMakeLists.txt + sedinplace 's/set(PROCESSOR_IS_X86 TRUE)/set(PROCESSOR_IS_X86 FALSE)/g' CMakeLists.txt CC="gcc -mabi=64 -fPIC" $CMAKE -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=.. -DCMAKE_INSTALL_LIBDIR="lib" . make -j4 make install @@ -96,13 +105,11 @@ case $PLATFORM in make install ;; windows-x86) - sedinplace 's/PlatformType CpuFeatures_GetPlatformType(void);/static PlatformType CpuFeatures_GetPlatformType(void) { PlatformType t; return t; }/g' include/internal/hwcaps.h "$CMAKE" -G "NMake Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS_RELEASE=" /MT /O2 /Ob2 /DNDEBUG" -DCMAKE_INSTALL_PREFIX=.. -DCMAKE_INSTALL_LIBDIR="lib" . nmake nmake install ;; windows-x86_64) - sedinplace 's/PlatformType CpuFeatures_GetPlatformType(void);/static PlatformType CpuFeatures_GetPlatformType(void) { PlatformType t; return t; }/g' include/internal/hwcaps.h "$CMAKE" -G "NMake Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS_RELEASE=" /MT /O2 /Ob2 /DNDEBUG" -DCMAKE_INSTALL_PREFIX=.. -DCMAKE_INSTALL_LIBDIR="lib" . nmake nmake install @@ -112,7 +119,7 @@ case $PLATFORM in ;; esac -cp -a include/internal ../include/cpu_features/ +cp -a include/* ../include/cpu_features/ sedinplace 's/cpu_features_macros.h/cpu_features\/cpu_features_macros.h/g' ../include/cpu_features/internal/hwcaps.h cd ../.. diff --git a/cpu_features/cpu_features-android.patch b/cpu_features/cpu_features-android.patch index 1d604e9f282..8798bc29099 100644 --- a/cpu_features/cpu_features-android.patch +++ b/cpu_features/cpu_features-android.patch @@ -11,7 +11,7 @@ diff -ruN cpu_features-0.2.0/android-arm64.cmake cpu_features-0.2.0-android/andr +# cmake -DCMAKE_TOOLCHAIN_FILE=android-arm64.cmake -DCMAKE_INSTALL_PREFIX=.. + +set(CMAKE_SYSTEM_NAME UnixPaths) -+set(CMAKE_SYSTEM_PROCESSOR arm64) ++set(CMAKE_SYSTEM_PROCESSOR aarch64) +set(ANDROID TRUE) + +set(CMAKE_C_COMPILER "$ENV{ANDROID_CC}") @@ -71,7 +71,7 @@ diff -ruN cpu_features-0.2.0/android-x86_64.cmake cpu_features-0.2.0-android/and +# cmake -DCMAKE_TOOLCHAIN_FILE=android-x86_64.cmake -DCMAKE_INSTALL_PREFIX=.. + +set(CMAKE_SYSTEM_NAME UnixPaths) -+set(CMAKE_SYSTEM_PROCESSOR atom64) ++set(CMAKE_SYSTEM_PROCESSOR x86_64) +set(ANDROID TRUE) + +set(CMAKE_C_COMPILER "$ENV{ANDROID_CC}") @@ -99,7 +99,7 @@ diff -ruN cpu_features-0.2.0/android-x86.cmake cpu_features-0.2.0-android/androi +# cmake -DCMAKE_TOOLCHAIN_FILE=android-x86.cmake -DCMAKE_INSTALL_PREFIX=.. + +set(CMAKE_SYSTEM_NAME UnixPaths) -+set(CMAKE_SYSTEM_PROCESSOR atom) ++set(CMAKE_SYSTEM_PROCESSOR i686) +set(ANDROID TRUE) + +set(CMAKE_C_COMPILER "$ENV{ANDROID_CC}") diff --git a/cpu_features/cpu_features.patch b/cpu_features/cpu_features.patch new file mode 100644 index 00000000000..86332e96130 --- /dev/null +++ b/cpu_features/cpu_features.patch @@ -0,0 +1,117 @@ +diff -ruN cpu_features-0.3.0/include/cpuinfo_aarch64.h cpu_features-0.3.0-patch/include/cpuinfo_aarch64.h +--- cpu_features-0.3.0/include/cpuinfo_aarch64.h 2019-03-20 18:04:24.000000000 +0900 ++++ cpu_features-0.3.0-patch/include/cpuinfo_aarch64.h 2019-05-06 19:20:24.468436297 +0900 +@@ -60,10 +60,13 @@ + + const char* GetAarch64FeaturesEnumName(Aarch64FeaturesEnum); + +-CPU_FEATURES_END_CPP_NAMESPACE +- + #if !defined(CPU_FEATURES_ARCH_AARCH64) +-#error "Including cpuinfo_aarch64.h from a non-aarch64 target." ++Aarch64Info GetAarch64Info(void) { return Aarch64Info(); } ++int GetAarch64FeaturesEnumValue(const Aarch64Features* features, ++ Aarch64FeaturesEnum value) { return 0; } ++const char* GetAarch64FeaturesEnumName(Aarch64FeaturesEnum) { return NULL; } + #endif + ++CPU_FEATURES_END_CPP_NAMESPACE ++ + #endif // CPU_FEATURES_INCLUDE_CPUINFO_AARCH64_H_ +diff -ruN cpu_features-0.3.0/include/cpuinfo_arm.h cpu_features-0.3.0-patch/include/cpuinfo_arm.h +--- cpu_features-0.3.0/include/cpuinfo_arm.h 2019-03-20 18:04:24.000000000 +0900 ++++ cpu_features-0.3.0-patch/include/cpuinfo_arm.h 2019-05-06 19:30:37.910951204 +0900 +@@ -79,10 +79,13 @@ + + const char* GetArmFeaturesEnumName(ArmFeaturesEnum); + +-CPU_FEATURES_END_CPP_NAMESPACE +- + #if !defined(CPU_FEATURES_ARCH_ARM) +-#error "Including cpuinfo_arm.h from a non-arm target." ++ArmInfo GetArmInfo(void) { return ArmInfo(); } ++uint32_t GetArmCpuId(const ArmInfo* const info) { return 0; } ++int GetArmFeaturesEnumValue(const ArmFeatures* features, ArmFeaturesEnum value) { return 0; } ++const char* GetArmFeaturesEnumName(ArmFeaturesEnum) { return NULL; } + #endif + ++CPU_FEATURES_END_CPP_NAMESPACE ++ + #endif // CPU_FEATURES_INCLUDE_CPUINFO_ARM_H_ +diff -ruN cpu_features-0.3.0/include/cpuinfo_mips.h cpu_features-0.3.0-patch/include/cpuinfo_mips.h +--- cpu_features-0.3.0/include/cpuinfo_mips.h 2019-03-20 18:04:24.000000000 +0900 ++++ cpu_features-0.3.0-patch/include/cpuinfo_mips.h 2019-05-06 19:22:30.544131088 +0900 +@@ -50,10 +50,13 @@ + + const char* GetMipsFeaturesEnumName(MipsFeaturesEnum); + +-CPU_FEATURES_END_CPP_NAMESPACE +- + #if !defined(CPU_FEATURES_ARCH_MIPS) +-#error "Including cpuinfo_mips.h from a non-mips target." ++MipsInfo GetMipsInfo(void) { return MipsInfo(); } ++int GetMipsFeaturesEnumValue(const MipsFeatures* features, ++ MipsFeaturesEnum value) { return 0; } ++const char* GetMipsFeaturesEnumName(MipsFeaturesEnum) { return NULL; } + #endif + ++CPU_FEATURES_END_CPP_NAMESPACE ++ + #endif // CPU_FEATURES_INCLUDE_CPUINFO_MIPS_H_ +diff -ruN cpu_features-0.3.0/include/cpuinfo_ppc.h cpu_features-0.3.0-patch/include/cpuinfo_ppc.h +--- cpu_features-0.3.0/include/cpuinfo_ppc.h 2019-03-20 18:04:24.000000000 +0900 ++++ cpu_features-0.3.0-patch/include/cpuinfo_ppc.h 2019-05-06 19:24:49.545794572 +0900 +@@ -136,10 +136,13 @@ + + const char* GetPPCFeaturesEnumName(PPCFeaturesEnum); + +-CPU_FEATURES_END_CPP_NAMESPACE +- + #if !defined(CPU_FEATURES_ARCH_PPC) +-#error "Including cpuinfo_ppc.h from a non-ppc target." ++PPCInfo GetPPCInfo(void) { return PPCInfo(); } ++PPCPlatformStrings GetPPCPlatformStrings(void) { return PPCPlatformStrings(); } ++int GetPPCFeaturesEnumValue(const PPCFeatures* features, PPCFeaturesEnum value) { return 0; } ++const char* GetPPCFeaturesEnumName(PPCFeaturesEnum) { return NULL; } + #endif + ++CPU_FEATURES_END_CPP_NAMESPACE ++ + #endif // CPU_FEATURES_INCLUDE_CPUINFO_PPC_H_ +diff -ruN cpu_features-0.3.0/include/cpuinfo_x86.h cpu_features-0.3.0-patch/include/cpuinfo_x86.h +--- cpu_features-0.3.0/include/cpuinfo_x86.h 2019-03-20 18:04:24.000000000 +0900 ++++ cpu_features-0.3.0-patch/include/cpuinfo_x86.h 2019-05-06 19:36:14.757135724 +0900 +@@ -158,10 +158,15 @@ + + const char* GetX86MicroarchitectureName(X86Microarchitecture); + +-CPU_FEATURES_END_CPP_NAMESPACE +- + #if !defined(CPU_FEATURES_ARCH_X86) +-#error "Including cpuinfo_x86.h from a non-x86 target." ++X86Info GetX86Info(void) { return X86Info(); } ++X86Microarchitecture GetX86Microarchitecture(const X86Info* info) { return X86Microarchitecture(); } ++void FillX86BrandString(char brand_string[49]) { } ++int GetX86FeaturesEnumValue(const X86Features* features, X86FeaturesEnum value) { return 0; } ++const char* GetX86FeaturesEnumName(X86FeaturesEnum) { return NULL; } ++const char* GetX86MicroarchitectureName(X86Microarchitecture) { return NULL; } + #endif + ++CPU_FEATURES_END_CPP_NAMESPACE ++ + #endif // CPU_FEATURES_INCLUDE_CPUINFO_X86_H_ +diff -ruN cpu_features-0.3.0/include/internal/hwcaps.h cpu_features-0.3.0-patch/include/internal/hwcaps.h +--- cpu_features-0.3.0/include/internal/hwcaps.h 2019-05-06 19:37:20.455976673 +0900 ++++ cpu_features-0.3.0-patch/include/internal/hwcaps.h 2019-05-06 19:38:42.707777542 +0900 +@@ -119,6 +119,11 @@ + + PlatformType CpuFeatures_GetPlatformType(void); + ++#if defined(__cplusplus) && defined(CPU_FEATURES_ARCH_X86) ++HardwareCapabilities CpuFeatures_GetHardwareCapabilities(void) { return HardwareCapabilities(); } ++PlatformType CpuFeatures_GetPlatformType(void) { return PlatformType(); } ++#endif ++ + CPU_FEATURES_END_CPP_NAMESPACE + + #endif // CPU_FEATURES_INCLUDE_INTERNAL_HWCAPS_H_ diff --git a/cpu_features/platform/pom.xml b/cpu_features/platform/pom.xml index 336a65766af..57920cc261b 100644 --- a/cpu_features/platform/pom.xml +++ b/cpu_features/platform/pom.xml @@ -17,7 +17,7 @@ cpu_features - 0.2.0-${project.parent.version} + 0.3.0-${project.parent.version} diff --git a/cpu_features/pom.xml b/cpu_features/pom.xml index 3e538366d7e..576d969f7dd 100644 --- a/cpu_features/pom.xml +++ b/cpu_features/pom.xml @@ -15,7 +15,7 @@ JavaCPP Presets for cpu_features - 0.2.0-${project.parent.version} + 0.3.0-${project.parent.version} diff --git a/cpu_features/samples/pom.xml b/cpu_features/samples/pom.xml index ad154909dee..d244b078bf6 100644 --- a/cpu_features/samples/pom.xml +++ b/cpu_features/samples/pom.xml @@ -2,7 +2,7 @@ 4.0.0 org.bytedeco.cpu_features simpleexample - 1.5 + 1.5.1-SNAPSHOT SimpleExample @@ -10,7 +10,7 @@ org.bytedeco cpu_features-platform - 0.2.0-1.5 + 0.3.0-1.5.1-SNAPSHOT diff --git a/cpu_features/src/gen/java/org/bytedeco/cpu_features/Aarch64Features.java b/cpu_features/src/gen/java/org/bytedeco/cpu_features/Aarch64Features.java index 9a57ce72a54..1e961e304e1 100644 --- a/cpu_features/src/gen/java/org/bytedeco/cpu_features/Aarch64Features.java +++ b/cpu_features/src/gen/java/org/bytedeco/cpu_features/Aarch64Features.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.cpu_features; diff --git a/cpu_features/src/gen/java/org/bytedeco/cpu_features/Aarch64Info.java b/cpu_features/src/gen/java/org/bytedeco/cpu_features/Aarch64Info.java index c6a268a5a0a..519499ae40c 100644 --- a/cpu_features/src/gen/java/org/bytedeco/cpu_features/Aarch64Info.java +++ b/cpu_features/src/gen/java/org/bytedeco/cpu_features/Aarch64Info.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.cpu_features; diff --git a/cpu_features/src/gen/java/org/bytedeco/cpu_features/ArmFeatures.java b/cpu_features/src/gen/java/org/bytedeco/cpu_features/ArmFeatures.java index c1a49f99ae5..0d5a081bb53 100644 --- a/cpu_features/src/gen/java/org/bytedeco/cpu_features/ArmFeatures.java +++ b/cpu_features/src/gen/java/org/bytedeco/cpu_features/ArmFeatures.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.cpu_features; diff --git a/cpu_features/src/gen/java/org/bytedeco/cpu_features/ArmInfo.java b/cpu_features/src/gen/java/org/bytedeco/cpu_features/ArmInfo.java index 48bb8a982d8..e732505417c 100644 --- a/cpu_features/src/gen/java/org/bytedeco/cpu_features/ArmInfo.java +++ b/cpu_features/src/gen/java/org/bytedeco/cpu_features/ArmInfo.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.cpu_features; diff --git a/cpu_features/src/gen/java/org/bytedeco/cpu_features/HardwareCapabilities.java b/cpu_features/src/gen/java/org/bytedeco/cpu_features/HardwareCapabilities.java index 8bd79ab7699..d841dcf64bd 100644 --- a/cpu_features/src/gen/java/org/bytedeco/cpu_features/HardwareCapabilities.java +++ b/cpu_features/src/gen/java/org/bytedeco/cpu_features/HardwareCapabilities.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.cpu_features; diff --git a/cpu_features/src/gen/java/org/bytedeco/cpu_features/MipsFeatures.java b/cpu_features/src/gen/java/org/bytedeco/cpu_features/MipsFeatures.java index bc0e2eae8fd..52045d5e347 100644 --- a/cpu_features/src/gen/java/org/bytedeco/cpu_features/MipsFeatures.java +++ b/cpu_features/src/gen/java/org/bytedeco/cpu_features/MipsFeatures.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.cpu_features; @@ -28,6 +28,7 @@ public class MipsFeatures extends Pointer { // https://www.mips.com/products/architectures/ase/simd/ public native @NoOffset int eva(); public native MipsFeatures eva(int setter); // Enhanced Virtual Addressing // https://www.mips.com/products/architectures/mips64/ + public native @NoOffset int r6(); public native MipsFeatures r6(int setter); // True if is release 6 of the processor. // Make sure to update MipsFeaturesEnum below if you add a field here. } diff --git a/cpu_features/src/gen/java/org/bytedeco/cpu_features/MipsInfo.java b/cpu_features/src/gen/java/org/bytedeco/cpu_features/MipsInfo.java index 9c8ac1b2ef3..c21c29d79de 100644 --- a/cpu_features/src/gen/java/org/bytedeco/cpu_features/MipsInfo.java +++ b/cpu_features/src/gen/java/org/bytedeco/cpu_features/MipsInfo.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.cpu_features; diff --git a/cpu_features/src/gen/java/org/bytedeco/cpu_features/PPCFeatures.java b/cpu_features/src/gen/java/org/bytedeco/cpu_features/PPCFeatures.java index 7a893d2d5e4..cf443264d8b 100644 --- a/cpu_features/src/gen/java/org/bytedeco/cpu_features/PPCFeatures.java +++ b/cpu_features/src/gen/java/org/bytedeco/cpu_features/PPCFeatures.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.cpu_features; diff --git a/cpu_features/src/gen/java/org/bytedeco/cpu_features/PPCInfo.java b/cpu_features/src/gen/java/org/bytedeco/cpu_features/PPCInfo.java index dade6c4bdcd..06ad96b6341 100644 --- a/cpu_features/src/gen/java/org/bytedeco/cpu_features/PPCInfo.java +++ b/cpu_features/src/gen/java/org/bytedeco/cpu_features/PPCInfo.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.cpu_features; diff --git a/cpu_features/src/gen/java/org/bytedeco/cpu_features/PPCPlatformStrings.java b/cpu_features/src/gen/java/org/bytedeco/cpu_features/PPCPlatformStrings.java index de660994e93..6bbd23dc78e 100644 --- a/cpu_features/src/gen/java/org/bytedeco/cpu_features/PPCPlatformStrings.java +++ b/cpu_features/src/gen/java/org/bytedeco/cpu_features/PPCPlatformStrings.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.cpu_features; diff --git a/cpu_features/src/gen/java/org/bytedeco/cpu_features/PlatformType.java b/cpu_features/src/gen/java/org/bytedeco/cpu_features/PlatformType.java index 846e183cd48..c388b050431 100644 --- a/cpu_features/src/gen/java/org/bytedeco/cpu_features/PlatformType.java +++ b/cpu_features/src/gen/java/org/bytedeco/cpu_features/PlatformType.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.cpu_features; diff --git a/cpu_features/src/gen/java/org/bytedeco/cpu_features/X86Features.java b/cpu_features/src/gen/java/org/bytedeco/cpu_features/X86Features.java index 3792e2d4d2f..f025bc2346e 100644 --- a/cpu_features/src/gen/java/org/bytedeco/cpu_features/X86Features.java +++ b/cpu_features/src/gen/java/org/bytedeco/cpu_features/X86Features.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.cpu_features; @@ -10,6 +10,7 @@ // See https://en.wikipedia.org/wiki/CPUID for a list of x86 cpu features. +// The field names are based on the short name provided in the wikipedia tables. @Namespace("cpu_features") @Properties(inherit = org.bytedeco.cpu_features.presets.cpu_features.class) public class X86Features extends Pointer { static { Loader.load(); } @@ -59,6 +60,10 @@ public class X86Features extends Pointer { public native @NoOffset int smx(); public native X86Features smx(int setter); public native @NoOffset int sgx(); public native X86Features sgx(int setter); public native @NoOffset int cx16(); public native X86Features cx16(int setter); // aka. CMPXCHG16B + public native @NoOffset int sha(); public native X86Features sha(int setter); + public native @NoOffset int popcnt(); public native X86Features popcnt(int setter); + public native @NoOffset int movbe(); public native X86Features movbe(int setter); + public native @NoOffset int rdrnd(); public native X86Features rdrnd(int setter); // Make sure to update X86FeaturesEnum below if you add a field here. } diff --git a/cpu_features/src/gen/java/org/bytedeco/cpu_features/X86Info.java b/cpu_features/src/gen/java/org/bytedeco/cpu_features/X86Info.java index 7a011c16dbd..3cf67c7fb67 100644 --- a/cpu_features/src/gen/java/org/bytedeco/cpu_features/X86Info.java +++ b/cpu_features/src/gen/java/org/bytedeco/cpu_features/X86Info.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.cpu_features; diff --git a/cpu_features/src/gen/java/org/bytedeco/cpu_features/global/cpu_features.java b/cpu_features/src/gen/java/org/bytedeco/cpu_features/global/cpu_features.java index 476c8aad7be..41a1ffd4c7a 100644 --- a/cpu_features/src/gen/java/org/bytedeco/cpu_features/global/cpu_features.java +++ b/cpu_features/src/gen/java/org/bytedeco/cpu_features/global/cpu_features.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.cpu_features.global; @@ -34,9 +34,19 @@ public class cpu_features extends org.bytedeco.cpu_features.presets.cpu_features // Architectures //////////////////////////////////////////////////////////////////////////////// -// #if ((defined(_M_IX86) || defined(_M_X64) || defined(__i386__) || -// defined(__x86_64__)) && -// !defined(__pnacl__) && !defined(__CLR_VER)) +// #if defined(__pnacl__) || defined(__CLR_VER) +// #define CPU_FEATURES_ARCH_VM +// #endif + +// #if (defined(_M_IX86) || defined(__i386__)) && !defined(CPU_FEATURES_ARCH_VM) +// #define CPU_FEATURES_ARCH_X86_32 +// #endif + +// #if (defined(_M_X64) || defined(__x86_64__)) && !defined(CPU_FEATURES_ARCH_VM) +// #define CPU_FEATURES_ARCH_X86_64 +// #endif + +// #if defined(CPU_FEATURES_ARCH_X86_32) || defined(CPU_FEATURES_ARCH_X86_64) // #define CPU_FEATURES_ARCH_X86 // #endif @@ -52,7 +62,15 @@ public class cpu_features extends org.bytedeco.cpu_features.presets.cpu_features // #define CPU_FEATURES_ARCH_ANY_ARM // #endif -// #if defined(__mips__) +// #if defined(__mips64) +// #define CPU_FEATURES_ARCH_MIPS64 +// #endif + +// #if defined(__mips__) && !defined(__mips64) // mips64 also declares __mips__ +// #define CPU_FEATURES_ARCH_MIPS32 +// #endif + +// #if defined(CPU_FEATURES_ARCH_MIPS32) || defined(CPU_FEATURES_ARCH_MIPS64) // #define CPU_FEATURES_ARCH_MIPS // #endif @@ -110,8 +128,8 @@ public class cpu_features extends org.bytedeco.cpu_features.presets.cpu_features // Compiler flags //////////////////////////////////////////////////////////////////////////////// -// Use the following to check if a feature is known to be available at compile -// time. See README.md for an example. +// Use the following to check if a feature is known to be available at +// compile time. See README.md for an example. // #if defined(CPU_FEATURES_ARCH_X86) // #define CPU_FEATURES_COMPILED_X86_AES defined(__AES__) // #define CPU_FEATURES_COMPILED_X86_F16C defined(__F16C__) @@ -190,16 +208,9 @@ public class cpu_features extends org.bytedeco.cpu_features.presets.cpu_features public static final long ARM_HWCAP2_CRC32 = (1L << 4); // http://elixir.free-electrons.com/linux/latest/source/arch/mips/include/uapi/asm/hwcap.h -public static final long MIPS_HWCAP_VZ = (1L << 0); -public static final long MIPS_HWCAP_EVA = (1L << 1); -public static final long MIPS_HWCAP_HTW = (1L << 2); -public static final long MIPS_HWCAP_FPU = (1L << 3); -public static final long MIPS_HWCAP_MIPS32R2 = (1L << 4); -public static final long MIPS_HWCAP_MIPS32R5 = (1L << 5); -public static final long MIPS_HWCAP_MIPS64R6 = (1L << 6); -public static final long MIPS_HWCAP_DSPR1 = (1L << 7); -public static final long MIPS_HWCAP_DSPR2 = (1L << 8); -public static final long MIPS_HWCAP_MSA = (1L << 9); +public static final long MIPS_HWCAP_R6 = (1L << 0); +public static final long MIPS_HWCAP_MSA = (1L << 1); +public static final long MIPS_HWCAP_CRC32 = (1L << 2); // http://elixir.free-electrons.com/linux/latest/source/arch/powerpc/include/uapi/asm/cputable.h // #ifndef _UAPI__ASM_POWERPC_CPUTABLE_H @@ -260,6 +271,9 @@ public class cpu_features extends org.bytedeco.cpu_features.presets.cpu_features @Namespace("cpu_features") public static native @ByVal PlatformType CpuFeatures_GetPlatformType(); + +// #if defined(__cplusplus) && defined(CPU_FEATURES_ARCH_X86) +// #endif // #endif // CPU_FEATURES_INCLUDE_INTERNAL_HWCAPS_H_ @@ -312,6 +326,9 @@ public class cpu_features extends org.bytedeco.cpu_features.presets.cpu_features @Cast("cpu_features::Aarch64FeaturesEnum") int value); @Namespace("cpu_features") public static native @Cast("const char*") BytePointer GetAarch64FeaturesEnumName(@Cast("cpu_features::Aarch64FeaturesEnum") int arg0); + +// #if !defined(CPU_FEATURES_ARCH_AARCH64) +// #endif // #endif // CPU_FEATURES_INCLUDE_CPUINFO_AARCH64_H_ @@ -336,6 +353,7 @@ public class cpu_features extends org.bytedeco.cpu_features.presets.cpu_features // #ifndef CPU_FEATURES_INCLUDE_CPUINFO_ARM_H_ // #define CPU_FEATURES_INCLUDE_CPUINFO_ARM_H_ +// #include // uint32_t // #include "cpu_features_macros.h" // Targeting ../ArmFeatures.java @@ -349,6 +367,9 @@ public class cpu_features extends org.bytedeco.cpu_features.presets.cpu_features @Namespace("cpu_features") public static native @ByVal ArmInfo GetArmInfo(); +// Compute CpuId from ArmInfo. +@Namespace("cpu_features") public static native @Cast("uint32_t") int GetArmCpuId(@Const ArmInfo info); + //////////////////////////////////////////////////////////////////////////////// // Introspection functions @@ -372,6 +393,9 @@ public class cpu_features extends org.bytedeco.cpu_features.presets.cpu_features @Namespace("cpu_features") public static native int GetArmFeaturesEnumValue(@Const ArmFeatures features, @Cast("cpu_features::ArmFeaturesEnum") int value); @Namespace("cpu_features") public static native @Cast("const char*") BytePointer GetArmFeaturesEnumName(@Cast("cpu_features::ArmFeaturesEnum") int arg0); + +// #if !defined(CPU_FEATURES_ARCH_ARM) +// #endif // #endif // CPU_FEATURES_INCLUDE_CPUINFO_ARM_H_ @@ -413,12 +437,16 @@ public class cpu_features extends org.bytedeco.cpu_features.presets.cpu_features public static final int MIPS_MSA = 0, MIPS_EVA = 1, - MIPS_LAST_ = 2; + MIPS_R6 = 2, + MIPS_LAST_ = 3; @Namespace("cpu_features") public static native int GetMipsFeaturesEnumValue(@Const MipsFeatures features, @Cast("cpu_features::MipsFeaturesEnum") int value); @Namespace("cpu_features") public static native @Cast("const char*") BytePointer GetMipsFeaturesEnumName(@Cast("cpu_features::MipsFeaturesEnum") int arg0); + +// #if !defined(CPU_FEATURES_ARCH_MIPS) +// #endif // #endif // CPU_FEATURES_INCLUDE_CPUINFO_MIPS_H_ @@ -512,6 +540,9 @@ public class cpu_features extends org.bytedeco.cpu_features.presets.cpu_features @Namespace("cpu_features") public static native int GetPPCFeaturesEnumValue(@Const PPCFeatures features, @Cast("cpu_features::PPCFeaturesEnum") int value); @Namespace("cpu_features") public static native @Cast("const char*") BytePointer GetPPCFeaturesEnumName(@Cast("cpu_features::PPCFeaturesEnum") int arg0); + +// #if !defined(CPU_FEATURES_ARCH_PPC) +// #endif // #endif // CPU_FEATURES_INCLUDE_CPUINFO_PPC_H_ @@ -620,13 +651,20 @@ public class cpu_features extends org.bytedeco.cpu_features.presets.cpu_features X86_SMX = 27, X86_SGX = 28, X86_CX16 = 29, - X86_LAST_ = 30; + X86_SHA = 30, + X86_POPCNT = 31, + X86_MOVBE = 32, + X86_RDRND = 33, + X86_LAST_ = 34; @Namespace("cpu_features") public static native int GetX86FeaturesEnumValue(@Const X86Features features, @Cast("cpu_features::X86FeaturesEnum") int value); @Namespace("cpu_features") public static native @Cast("const char*") BytePointer GetX86FeaturesEnumName(@Cast("cpu_features::X86FeaturesEnum") int arg0); @Namespace("cpu_features") public static native @Cast("const char*") BytePointer GetX86MicroarchitectureName(@Cast("cpu_features::X86Microarchitecture") int arg0); + +// #if !defined(CPU_FEATURES_ARCH_X86) +// #endif // #endif // CPU_FEATURES_INCLUDE_CPUINFO_X86_H_ diff --git a/flandmark/pom.xml b/flandmark/pom.xml index 2a0b86a8417..696ab32ec1e 100644 --- a/flandmark/pom.xml +++ b/flandmark/pom.xml @@ -45,7 +45,7 @@ org.bytedeco openblas - 0.3.5-${project.parent.version} + 0.3.6-${project.parent.version} org.bytedeco @@ -55,7 +55,7 @@ org.bytedeco openblas - 0.3.5-${project.parent.version} + 0.3.6-${project.parent.version} ${javacpp.platform} diff --git a/gsl/platform/pom.xml b/gsl/platform/pom.xml index 68578002d61..cb32dabfe20 100644 --- a/gsl/platform/pom.xml +++ b/gsl/platform/pom.xml @@ -24,7 +24,7 @@ org.bytedeco openblas-platform - 0.3.5-${project.parent.version} + 0.3.6-${project.parent.version} ${project.groupId} diff --git a/gsl/pom.xml b/gsl/pom.xml index 8b41c297b6a..516104dbdbb 100644 --- a/gsl/pom.xml +++ b/gsl/pom.xml @@ -22,7 +22,7 @@ org.bytedeco openblas - 0.3.5-${project.parent.version} + 0.3.6-${project.parent.version} org.bytedeco @@ -48,12 +48,12 @@ org.bytedeco openblas - 0.3.5-${project.parent.version} + 0.3.6-${project.parent.version} org.bytedeco openblas - 0.3.5-${project.parent.version} + 0.3.6-${project.parent.version} ${javacpp.platform} diff --git a/gsl/src/gen/java/org/bytedeco/gsl/Ainvx_int_gsl_vector_Pointer.java b/gsl/src/gen/java/org/bytedeco/gsl/Ainvx_int_gsl_vector_Pointer.java index d784d47b482..0252778f858 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/Ainvx_int_gsl_vector_Pointer.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/Ainvx_int_gsl_vector_Pointer.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_char_const_view.java b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_char_const_view.java index eb3c5152d6c..442718ae8a6 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_char_const_view.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_char_const_view.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_char_view.java b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_char_view.java index c74b76fabe8..75928967cf6 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_char_view.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_char_view.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_complex_const_view.java b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_complex_const_view.java index 3d95c551a6b..f2db8587588 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_complex_const_view.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_complex_const_view.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_complex_float_const_view.java b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_complex_float_const_view.java index 66fe2782a8e..283637a477f 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_complex_float_const_view.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_complex_float_const_view.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_complex_float_view.java b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_complex_float_view.java index db525f0b71c..dca20be9924 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_complex_float_view.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_complex_float_view.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_complex_view.java b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_complex_view.java index e3d93b5a441..362e7185cac 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_complex_view.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_complex_view.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_const_view.java b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_const_view.java index d51c75f116a..dc18cfe7946 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_const_view.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_const_view.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_float_const_view.java b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_float_const_view.java index 31cb6f6f981..e0bf378d8ae 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_float_const_view.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_float_const_view.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_float_view.java b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_float_view.java index b12defdef7e..92c76e6ed3d 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_float_view.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_float_view.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_int_const_view.java b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_int_const_view.java index 516416aaa8e..6f7d6b6a015 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_int_const_view.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_int_const_view.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_int_view.java b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_int_view.java index 842daf77b9c..1622b32d62c 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_int_view.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_int_view.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_long_const_view.java b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_long_const_view.java index eb3ca4e35a2..f5ff56ab0b6 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_long_const_view.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_long_const_view.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_long_view.java b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_long_view.java index 6f035befc72..c60ddb2b0a6 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_long_view.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_long_view.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_short_const_view.java b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_short_const_view.java index 62fb2526b03..c38e1980776 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_short_const_view.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_short_const_view.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_short_view.java b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_short_view.java index 85d8f80e29b..70f52ae55c0 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_short_view.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_short_view.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_uchar_const_view.java b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_uchar_const_view.java index 7ae1940dbb6..05ee5fb005d 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_uchar_const_view.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_uchar_const_view.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_uchar_view.java b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_uchar_view.java index 1663499a043..022a3c744e5 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_uchar_view.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_uchar_view.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_uint_const_view.java b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_uint_const_view.java index 8343f76d6c4..68cef41f262 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_uint_const_view.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_uint_const_view.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_uint_view.java b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_uint_view.java index 70f4047522f..1326b0065d5 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_uint_view.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_uint_view.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_ulong_const_view.java b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_ulong_const_view.java index fc1f9d69a5f..c075122bb5f 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_ulong_const_view.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_ulong_const_view.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_ulong_view.java b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_ulong_view.java index 41dda831d31..bdcc3a9121c 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_ulong_view.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_ulong_view.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_ushort_const_view.java b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_ushort_const_view.java index dc9f755cd8f..2db915ed4c6 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_ushort_const_view.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_ushort_const_view.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_ushort_view.java b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_ushort_view.java index 0b9106e99d3..2b5fa859389 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_ushort_view.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_ushort_view.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_view.java b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_view.java index 3767ee7f11e..9974b7e7e06 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_view.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_matrix_view.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_char_const_view.java b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_char_const_view.java index dac711072e7..31d95b910ea 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_char_const_view.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_char_const_view.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_char_view.java b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_char_view.java index e359b0126ed..b536864032b 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_char_view.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_char_view.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_complex_const_view.java b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_complex_const_view.java index ae33f6e9105..daf2d549f71 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_complex_const_view.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_complex_const_view.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_complex_float_const_view.java b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_complex_float_const_view.java index 669473d2aa0..83d8d9b89a8 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_complex_float_const_view.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_complex_float_const_view.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_complex_float_view.java b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_complex_float_view.java index 14c465b4ecd..0a40959c36c 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_complex_float_view.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_complex_float_view.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_complex_view.java b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_complex_view.java index 8477251776e..ce4f83d02d6 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_complex_view.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_complex_view.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_const_view.java b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_const_view.java index 6efffe8a76f..302c6aa6fa4 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_const_view.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_const_view.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_float_const_view.java b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_float_const_view.java index 779337ca15d..4623e8a1974 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_float_const_view.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_float_const_view.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_float_view.java b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_float_view.java index 80f48fd58d3..6d2be919943 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_float_view.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_float_view.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_int_const_view.java b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_int_const_view.java index 0e8382dae3d..bca0fe61200 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_int_const_view.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_int_const_view.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_int_view.java b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_int_view.java index 4faa5e062c7..424e2cce0c2 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_int_view.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_int_view.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_long_const_view.java b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_long_const_view.java index 229991063f2..9b955a8f99f 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_long_const_view.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_long_const_view.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_long_view.java b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_long_view.java index 93804210aca..9ef1961f7c0 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_long_view.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_long_view.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_short_const_view.java b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_short_const_view.java index 01c629e2f0c..fbe459b0953 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_short_const_view.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_short_const_view.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_short_view.java b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_short_view.java index df39212ec8a..55c845dc8d6 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_short_view.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_short_view.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_uchar_const_view.java b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_uchar_const_view.java index ad67f6109db..70ae97eb7f2 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_uchar_const_view.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_uchar_const_view.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_uchar_view.java b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_uchar_view.java index 339c025dd1b..9fd388a5385 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_uchar_view.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_uchar_view.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_uint_const_view.java b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_uint_const_view.java index 27c79b1ce02..af24f412711 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_uint_const_view.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_uint_const_view.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_uint_view.java b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_uint_view.java index cdacbceaf2d..c73e3212d49 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_uint_view.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_uint_view.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_ulong_const_view.java b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_ulong_const_view.java index 052059ca7a0..631f3e25b42 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_ulong_const_view.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_ulong_const_view.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_ulong_view.java b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_ulong_view.java index 7ef6bfc4d23..cda8992df01 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_ulong_view.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_ulong_view.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_ushort_const_view.java b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_ushort_const_view.java index 4eb9dd15218..c006786e166 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_ushort_const_view.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_ushort_const_view.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_ushort_view.java b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_ushort_view.java index d95fb77403c..068de059f33 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_ushort_view.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_ushort_view.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_view.java b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_view.java index d70e691b46d..2735a924f97 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_view.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/_gsl_vector_view.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/global/gsl.java b/gsl/src/gen/java/org/bytedeco/gsl/global/gsl.java index 2d866d7cade..bc873ab355a 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/global/gsl.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/global/gsl.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.gsl.global; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_block.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_block.java index 8a821ee3a7e..37e01a671e6 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_block.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_block.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_block_char.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_block_char.java index c5f5bae3a49..4e8b13272cf 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_block_char.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_block_char.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_block_complex.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_block_complex.java index a0eb0d65c62..09dae6e4ae4 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_block_complex.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_block_complex.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_block_complex_float.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_block_complex_float.java index 5b57e69d1e2..1e0a71d4d07 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_block_complex_float.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_block_complex_float.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_block_float.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_block_float.java index 36a5b64a2da..377dc291de3 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_block_float.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_block_float.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_block_int.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_block_int.java index fc428c94c1a..5bc7d6b5f64 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_block_int.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_block_int.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_block_long.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_block_long.java index a02fa141c8b..39604f28e56 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_block_long.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_block_long.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_block_short.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_block_short.java index 944ef005b3d..a9bafeaaa4b 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_block_short.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_block_short.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_block_uchar.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_block_uchar.java index c9465ed74a6..8dfea4771ae 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_block_uchar.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_block_uchar.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_block_uint.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_block_uint.java index e884238c7fa..ccdb558c6a5 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_block_uint.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_block_uint.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_block_ulong.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_block_ulong.java index 524cfd3b216..b35fd6d9756 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_block_ulong.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_block_ulong.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_block_ushort.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_block_ushort.java index 8ddef77f3a8..4512d3befbf 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_block_ushort.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_block_ushort.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_bspline_workspace.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_bspline_workspace.java index 0a2622f7c28..ff902972120 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_bspline_workspace.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_bspline_workspace.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_cheb_series.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_cheb_series.java index 865f8d21245..76c4853a527 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_cheb_series.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_cheb_series.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_combination.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_combination.java index 2031c1106b9..d9be6f42ee7 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_combination.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_combination.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_comparison_fn_t.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_comparison_fn_t.java index 9fff1d0e320..d3ce18845e1 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_comparison_fn_t.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_comparison_fn_t.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_complex.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_complex.java index 9655861312f..59f3b953228 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_complex.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_complex.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_complex_float.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_complex_float.java index fc8112bd9a1..f2f79458e6a 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_complex_float.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_complex_float.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_complex_long_double.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_complex_long_double.java index deb19a4ec5c..16b4a426df2 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_complex_long_double.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_complex_long_double.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_dht.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_dht.java index fbbcff7d1e8..efa0f647468 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_dht.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_dht.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_eigen_francis_workspace.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_eigen_francis_workspace.java index 3c689def40b..aae65a9f720 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_eigen_francis_workspace.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_eigen_francis_workspace.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_eigen_gen_workspace.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_eigen_gen_workspace.java index 3e0af96ad11..682786a9c0a 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_eigen_gen_workspace.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_eigen_gen_workspace.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_eigen_genherm_workspace.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_eigen_genherm_workspace.java index 3eeb2f84eab..8878f107bef 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_eigen_genherm_workspace.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_eigen_genherm_workspace.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_eigen_genhermv_workspace.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_eigen_genhermv_workspace.java index dae43556d83..586bcbdbb04 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_eigen_genhermv_workspace.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_eigen_genhermv_workspace.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_eigen_gensymm_workspace.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_eigen_gensymm_workspace.java index 6cb5ca222d9..4631753cad9 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_eigen_gensymm_workspace.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_eigen_gensymm_workspace.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_eigen_gensymmv_workspace.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_eigen_gensymmv_workspace.java index 318a6135207..e02268445c0 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_eigen_gensymmv_workspace.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_eigen_gensymmv_workspace.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_eigen_genv_workspace.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_eigen_genv_workspace.java index fdeecd77d51..ed5936fb2da 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_eigen_genv_workspace.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_eigen_genv_workspace.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_eigen_herm_workspace.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_eigen_herm_workspace.java index ed6f508e581..dfdaf47181a 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_eigen_herm_workspace.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_eigen_herm_workspace.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_eigen_hermv_workspace.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_eigen_hermv_workspace.java index 65eb0211fa6..9d1212ddac1 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_eigen_hermv_workspace.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_eigen_hermv_workspace.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_eigen_nonsymm_workspace.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_eigen_nonsymm_workspace.java index 74244133183..e309f45ec1b 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_eigen_nonsymm_workspace.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_eigen_nonsymm_workspace.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_eigen_nonsymmv_workspace.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_eigen_nonsymmv_workspace.java index cfb15fedd39..bec16165554 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_eigen_nonsymmv_workspace.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_eigen_nonsymmv_workspace.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_eigen_symm_workspace.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_eigen_symm_workspace.java index 49559f6f255..77d5f932573 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_eigen_symm_workspace.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_eigen_symm_workspace.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_eigen_symmv_workspace.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_eigen_symmv_workspace.java index 7b34302bf78..38c747af0c2 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_eigen_symmv_workspace.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_eigen_symmv_workspace.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_error_handler_t.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_error_handler_t.java index cfc89da36ff..352ca3f9947 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_error_handler_t.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_error_handler_t.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_fft_complex_wavetable.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_fft_complex_wavetable.java index 1656c67eca6..22df49e1b73 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_fft_complex_wavetable.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_fft_complex_wavetable.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_fft_complex_wavetable_float.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_fft_complex_wavetable_float.java index d723cf4f610..908cc7ff95b 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_fft_complex_wavetable_float.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_fft_complex_wavetable_float.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_fft_complex_workspace.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_fft_complex_workspace.java index 8af17a069f2..d369d11b120 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_fft_complex_workspace.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_fft_complex_workspace.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_fft_complex_workspace_float.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_fft_complex_workspace_float.java index 5a1514c235a..732de200f2b 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_fft_complex_workspace_float.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_fft_complex_workspace_float.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_fft_halfcomplex_wavetable.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_fft_halfcomplex_wavetable.java index c2308772e56..97262456e93 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_fft_halfcomplex_wavetable.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_fft_halfcomplex_wavetable.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_fft_halfcomplex_wavetable_float.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_fft_halfcomplex_wavetable_float.java index 8b627946064..f90667902d1 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_fft_halfcomplex_wavetable_float.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_fft_halfcomplex_wavetable_float.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_fft_real_wavetable.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_fft_real_wavetable.java index 3fa46f31031..70531e22545 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_fft_real_wavetable.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_fft_real_wavetable.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_fft_real_wavetable_float.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_fft_real_wavetable_float.java index 6aa31a628c8..b133d150b05 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_fft_real_wavetable_float.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_fft_real_wavetable_float.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_fft_real_workspace.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_fft_real_workspace.java index ee50e35d3b2..bfa77ba557a 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_fft_real_workspace.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_fft_real_workspace.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_fft_real_workspace_float.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_fft_real_workspace_float.java index fa5468505f9..324a6258841 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_fft_real_workspace_float.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_fft_real_workspace_float.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_function.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_function.java index daade7a45bf..4e13a93dfff 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_function.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_function.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_function_fdf.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_function_fdf.java index 3e0a7a43aa7..aeabedc7322 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_function_fdf.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_function_fdf.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_function_vec.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_function_vec.java index cbc9d10f13b..a79a29ff694 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_function_vec.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_function_vec.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_histogram.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_histogram.java index 7a69f28036f..ee33d3bd9a9 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_histogram.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_histogram.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_histogram2d.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_histogram2d.java index da16aa2158c..33803ebf486 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_histogram2d.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_histogram2d.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_histogram2d_pdf.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_histogram2d_pdf.java index 9c73a2e266a..09a4019c980 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_histogram2d_pdf.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_histogram2d_pdf.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_histogram_pdf.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_histogram_pdf.java index 00f7f91c714..035386a0fa2 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_histogram_pdf.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_histogram_pdf.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_ieee_double_rep.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_ieee_double_rep.java index b19a1d5d373..00abe314ef9 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_ieee_double_rep.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_ieee_double_rep.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_ieee_float_rep.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_ieee_float_rep.java index 2ea4f2d7148..744a494b88a 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_ieee_float_rep.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_ieee_float_rep.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_integration_cquad_ival.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_integration_cquad_ival.java index 59e91ebea56..411207e3cce 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_integration_cquad_ival.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_integration_cquad_ival.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_integration_cquad_workspace.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_integration_cquad_workspace.java index 142d00068ac..55c5b881fe4 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_integration_cquad_workspace.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_integration_cquad_workspace.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_integration_fixed_params.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_integration_fixed_params.java index 9037cb5bab3..a1e0f03c0d3 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_integration_fixed_params.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_integration_fixed_params.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_integration_fixed_type.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_integration_fixed_type.java index 026a5ff2b63..5a7089553b5 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_integration_fixed_type.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_integration_fixed_type.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_integration_fixed_workspace.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_integration_fixed_workspace.java index dee9b388e9f..aca1a4bb628 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_integration_fixed_workspace.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_integration_fixed_workspace.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_integration_glfixed_table.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_integration_glfixed_table.java index c8dced4c252..4d6542abd21 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_integration_glfixed_table.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_integration_glfixed_table.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_integration_qawo_table.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_integration_qawo_table.java index fc8bcebe4cf..c8ffd981c34 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_integration_qawo_table.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_integration_qawo_table.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_integration_qaws_table.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_integration_qaws_table.java index 3b2cbd9cce3..bdb5ff31247 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_integration_qaws_table.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_integration_qaws_table.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_integration_romberg_workspace.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_integration_romberg_workspace.java index 92e11917f3e..6d5a1e0d8bb 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_integration_romberg_workspace.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_integration_romberg_workspace.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_integration_rule.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_integration_rule.java index a3935493808..1e018230431 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_integration_rule.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_integration_rule.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_integration_workspace.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_integration_workspace.java index a96504dd9fa..e5bbab408ea 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_integration_workspace.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_integration_workspace.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_interp.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_interp.java index e82718e7fba..f14b54bae9e 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_interp.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_interp.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_interp2d.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_interp2d.java index 6d5cd32589f..b0cd0b116ca 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_interp2d.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_interp2d.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_interp2d_type.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_interp2d_type.java index 5d7da17523e..ff3ec738491 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_interp2d_type.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_interp2d_type.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_interp_accel.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_interp_accel.java index 5e1f0eeeac0..71a172ac5bf 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_interp_accel.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_interp_accel.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_interp_type.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_interp_type.java index 41da5830707..61f111c1db0 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_interp_type.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_interp_type.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_matrix.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_matrix.java index acaa1c20579..a65fea27a33 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_matrix.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_matrix.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_matrix_char.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_matrix_char.java index 751b2bfac9e..127863ac8ae 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_matrix_char.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_matrix_char.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_matrix_complex.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_matrix_complex.java index 25c01af5d88..f4a52ce56f7 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_matrix_complex.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_matrix_complex.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_matrix_complex_float.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_matrix_complex_float.java index b6d3c7d9eff..66d685a94e9 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_matrix_complex_float.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_matrix_complex_float.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_matrix_float.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_matrix_float.java index 3b1daa214d3..b68448c6457 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_matrix_float.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_matrix_float.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_matrix_int.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_matrix_int.java index 6630a1590e3..0da0d0bd223 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_matrix_int.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_matrix_int.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_matrix_long.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_matrix_long.java index 9217b7ee656..ca8ed51a42c 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_matrix_long.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_matrix_long.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_matrix_short.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_matrix_short.java index 2ffda20aaab..5ab6c654733 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_matrix_short.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_matrix_short.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_matrix_uchar.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_matrix_uchar.java index 64ab19e35b9..0d864895880 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_matrix_uchar.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_matrix_uchar.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_matrix_uint.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_matrix_uint.java index 71961cf2374..57fb32eac8f 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_matrix_uint.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_matrix_uint.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_matrix_ulong.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_matrix_ulong.java index ba16f6c449c..c6ae902d30b 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_matrix_ulong.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_matrix_ulong.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_matrix_ushort.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_matrix_ushort.java index 10f3a222712..ac4400d28f6 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_matrix_ushort.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_matrix_ushort.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_min_bracketing_function.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_min_bracketing_function.java index 563b61fcafe..112005f8b9a 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_min_bracketing_function.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_min_bracketing_function.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_min_fminimizer.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_min_fminimizer.java index 2cd0b8da68b..ec03fd5ea87 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_min_fminimizer.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_min_fminimizer.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_min_fminimizer_type.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_min_fminimizer_type.java index 9b7216012db..2f1e1192f3b 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_min_fminimizer_type.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_min_fminimizer_type.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_monte_function.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_monte_function.java index 7648ab1571b..bae677e4877 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_monte_function.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_monte_function.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_monte_miser_params.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_monte_miser_params.java index 9b90385bd07..2343cc77cb1 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_monte_miser_params.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_monte_miser_params.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_monte_miser_state.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_monte_miser_state.java index d259d2866e7..302b4de2504 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_monte_miser_state.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_monte_miser_state.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_monte_plain_state.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_monte_plain_state.java index 8715d6991cc..845f59b72bc 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_monte_plain_state.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_monte_plain_state.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_monte_vegas_params.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_monte_vegas_params.java index e493471514d..f57e2afc0d7 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_monte_vegas_params.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_monte_vegas_params.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_monte_vegas_state.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_monte_vegas_state.java index 1961d43df59..d0c7d1336cc 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_monte_vegas_state.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_monte_vegas_state.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_multifit_fdfridge.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_multifit_fdfridge.java index 824aff5e4ca..fd7f6e8656d 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_multifit_fdfridge.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_multifit_fdfridge.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_multifit_fdfsolver.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_multifit_fdfsolver.java index 108fdacaebb..fde573cfeb1 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_multifit_fdfsolver.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_multifit_fdfsolver.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_multifit_fdfsolver_type.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_multifit_fdfsolver_type.java index aad3b88fadb..899dd198fdb 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_multifit_fdfsolver_type.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_multifit_fdfsolver_type.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_multifit_fsolver.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_multifit_fsolver.java index 8a2c90393a7..741a087969d 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_multifit_fsolver.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_multifit_fsolver.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_multifit_fsolver_type.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_multifit_fsolver_type.java index 3c27f6e944d..01635e9b282 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_multifit_fsolver_type.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_multifit_fsolver_type.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_multifit_function.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_multifit_function.java index bb01647667c..3bffcf6cf44 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_multifit_function.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_multifit_function.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_multifit_function_fdf.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_multifit_function_fdf.java index 5d75a333576..0796db3d03a 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_multifit_function_fdf.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_multifit_function_fdf.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_multifit_linear_workspace.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_multifit_linear_workspace.java index cb107d79dbc..350494494c1 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_multifit_linear_workspace.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_multifit_linear_workspace.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_multifit_robust_stats.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_multifit_robust_stats.java index 766678a7604..0e94cd44b80 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_multifit_robust_stats.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_multifit_robust_stats.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_multifit_robust_type.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_multifit_robust_type.java index 631a535acf8..7d383b38914 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_multifit_robust_type.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_multifit_robust_type.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_multifit_robust_workspace.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_multifit_robust_workspace.java index 480a4a3757b..488d69a371a 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_multifit_robust_workspace.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_multifit_robust_workspace.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_multilarge_linear_type.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_multilarge_linear_type.java index c10dc59b024..352081a9e9f 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_multilarge_linear_type.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_multilarge_linear_type.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_multilarge_linear_workspace.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_multilarge_linear_workspace.java index a1fdf565f24..5015626254b 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_multilarge_linear_workspace.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_multilarge_linear_workspace.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_multimin_fdfminimizer.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_multimin_fdfminimizer.java index 6b59a97e33a..b3dcf1e2775 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_multimin_fdfminimizer.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_multimin_fdfminimizer.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_multimin_fdfminimizer_type.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_multimin_fdfminimizer_type.java index dc60ae1f595..36a6caf7f50 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_multimin_fdfminimizer_type.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_multimin_fdfminimizer_type.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_multimin_fminimizer.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_multimin_fminimizer.java index 15cb574735e..4a041aa9802 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_multimin_fminimizer.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_multimin_fminimizer.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_multimin_fminimizer_type.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_multimin_fminimizer_type.java index 9320d180eb9..58a55e0737a 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_multimin_fminimizer_type.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_multimin_fminimizer_type.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_multimin_function.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_multimin_function.java index 96d8f6dd9b1..bb7cf156899 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_multimin_function.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_multimin_function.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_multimin_function_fdf.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_multimin_function_fdf.java index 246ec269eca..5cc3429bcff 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_multimin_function_fdf.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_multimin_function_fdf.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_multiroot_fdfsolver.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_multiroot_fdfsolver.java index f7cc864d983..b5769d511cf 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_multiroot_fdfsolver.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_multiroot_fdfsolver.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_multiroot_fdfsolver_type.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_multiroot_fdfsolver_type.java index 6dba5c2f517..6762bfe4867 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_multiroot_fdfsolver_type.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_multiroot_fdfsolver_type.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_multiroot_fsolver.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_multiroot_fsolver.java index 9b886b7236d..1e798996d3b 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_multiroot_fsolver.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_multiroot_fsolver.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_multiroot_fsolver_type.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_multiroot_fsolver_type.java index 527e8233db9..f51d2e0868e 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_multiroot_fsolver_type.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_multiroot_fsolver_type.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_multiroot_function.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_multiroot_function.java index 7dbce7bb734..d921ace1fdf 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_multiroot_function.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_multiroot_function.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_multiroot_function_fdf.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_multiroot_function_fdf.java index b7484fa717a..00b0bda095b 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_multiroot_function_fdf.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_multiroot_function_fdf.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_multiset.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_multiset.java index f36e23c9382..b7db66d2985 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_multiset.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_multiset.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_ntuple.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_ntuple.java index cb72bbfb6c9..2ac7a8bf849 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_ntuple.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_ntuple.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_ntuple_select_fn.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_ntuple_select_fn.java index f10f8ba49ee..1fa27ff264f 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_ntuple_select_fn.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_ntuple_select_fn.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_ntuple_value_fn.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_ntuple_value_fn.java index a6464ea6741..62fb6a40df1 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_ntuple_value_fn.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_ntuple_value_fn.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_odeiv2_control.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_odeiv2_control.java index b888a8303b6..4339ed6ec5a 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_odeiv2_control.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_odeiv2_control.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_odeiv2_control_type.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_odeiv2_control_type.java index 8837aefafa6..adf0dc3e873 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_odeiv2_control_type.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_odeiv2_control_type.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_odeiv2_driver.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_odeiv2_driver.java index 1700e1ffc81..5ecba86f83d 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_odeiv2_driver.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_odeiv2_driver.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_odeiv2_evolve.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_odeiv2_evolve.java index c498653052f..391602a14be 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_odeiv2_evolve.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_odeiv2_evolve.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_odeiv2_step.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_odeiv2_step.java index 9d3ff12c2c6..f549c218570 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_odeiv2_step.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_odeiv2_step.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_odeiv2_step_type.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_odeiv2_step_type.java index 6a623f1b455..ad8b1664d38 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_odeiv2_step_type.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_odeiv2_step_type.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_odeiv2_system.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_odeiv2_system.java index 6d9b48a2d53..48d363b55e9 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_odeiv2_system.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_odeiv2_system.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_odeiv_control.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_odeiv_control.java index e979df17c9c..a493c796745 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_odeiv_control.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_odeiv_control.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_odeiv_control_type.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_odeiv_control_type.java index 4073ca58b3c..db5131ac71b 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_odeiv_control_type.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_odeiv_control_type.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_odeiv_evolve.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_odeiv_evolve.java index d8675976463..bda8e0ceff9 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_odeiv_evolve.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_odeiv_evolve.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_odeiv_step.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_odeiv_step.java index 75f111c3c2e..22f02ce86d5 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_odeiv_step.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_odeiv_step.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_odeiv_step_type.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_odeiv_step_type.java index e9174748d56..72e72f6e43f 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_odeiv_step_type.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_odeiv_step_type.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_odeiv_system.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_odeiv_system.java index aca5b4c3775..f89c9f4a748 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_odeiv_system.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_odeiv_system.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_permutation.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_permutation.java index ea8a279924c..1feefef4384 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_permutation.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_permutation.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_poly_complex_workspace.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_poly_complex_workspace.java index e8a167b410c..deb61f62239 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_poly_complex_workspace.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_poly_complex_workspace.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_qrng.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_qrng.java index d535dc3ccaf..8bd66509b0a 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_qrng.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_qrng.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_qrng_type.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_qrng_type.java index 99eddfefc70..bed2269e359 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_qrng_type.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_qrng_type.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_ran_discrete_t.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_ran_discrete_t.java index 2297e4c6d8c..9e0f99b6a82 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_ran_discrete_t.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_ran_discrete_t.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_rng.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_rng.java index 827c682041f..86f7823ac5f 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_rng.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_rng.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_rng_type.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_rng_type.java index 150f6e4d7d3..e87f8012b4a 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_rng_type.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_rng_type.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_root_fdfsolver.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_root_fdfsolver.java index d15be13040e..ddea50c331f 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_root_fdfsolver.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_root_fdfsolver.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_root_fdfsolver_type.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_root_fdfsolver_type.java index 05befdac5f7..9c0e8769854 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_root_fdfsolver_type.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_root_fdfsolver_type.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_root_fsolver.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_root_fsolver.java index 9e532d345ca..ef60c4ed0b1 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_root_fsolver.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_root_fsolver.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_root_fsolver_type.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_root_fsolver_type.java index f8c973056b6..ea6291035e4 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_root_fsolver_type.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_root_fsolver_type.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_rstat_quantile_workspace.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_rstat_quantile_workspace.java index 4146454129e..a07139465aa 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_rstat_quantile_workspace.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_rstat_quantile_workspace.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_rstat_workspace.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_rstat_workspace.java index 7f7c23f4136..72992b5ecb4 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_rstat_workspace.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_rstat_workspace.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_sf_mathieu_workspace.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_sf_mathieu_workspace.java index 68d8de082c9..e8e652816fd 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_sf_mathieu_workspace.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_sf_mathieu_workspace.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_sf_result.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_sf_result.java index 6b101b91050..e4919c776d9 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_sf_result.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_sf_result.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_sf_result_e10.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_sf_result_e10.java index da174d6c811..78dca45f277 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_sf_result_e10.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_sf_result_e10.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_siman_Efunc_t.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_siman_Efunc_t.java index ec2e08efd02..4fa9364eab0 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_siman_Efunc_t.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_siman_Efunc_t.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_siman_copy_construct_t.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_siman_copy_construct_t.java index 4d7eba4303c..3ab09d23728 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_siman_copy_construct_t.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_siman_copy_construct_t.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_siman_copy_t.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_siman_copy_t.java index 114fadc8b2e..b02472cb9c6 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_siman_copy_t.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_siman_copy_t.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_siman_destroy_t.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_siman_destroy_t.java index 8a0b1c9933f..ed7a88015bd 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_siman_destroy_t.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_siman_destroy_t.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_siman_metric_t.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_siman_metric_t.java index b7925670c2b..7f772898841 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_siman_metric_t.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_siman_metric_t.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_siman_params_t.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_siman_params_t.java index d6f763f5755..38af82c902a 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_siman_params_t.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_siman_params_t.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_siman_print_t.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_siman_print_t.java index e140f001293..ea41bee0e53 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_siman_print_t.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_siman_print_t.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_siman_step_t.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_siman_step_t.java index 33abf31829c..38600ad7a35 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_siman_step_t.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_siman_step_t.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_splinalg_itersolve.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_splinalg_itersolve.java index 38b51a0002a..cff3a5627ca 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_splinalg_itersolve.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_splinalg_itersolve.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_splinalg_itersolve_type.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_splinalg_itersolve_type.java index 8d28cb1c5c5..8196e1ad8cb 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_splinalg_itersolve_type.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_splinalg_itersolve_type.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_spline.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_spline.java index bcff69bd44f..2fdc40b7a0c 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_spline.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_spline.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_spline2d.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_spline2d.java index 3c36a008f1a..cde97fe0371 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_spline2d.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_spline2d.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_spmatrix.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_spmatrix.java index 504a33fef68..9189605438a 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_spmatrix.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_spmatrix.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_spmatrix_tree.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_spmatrix_tree.java index 7aa29810d51..5ac860d40f0 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_spmatrix_tree.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_spmatrix_tree.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_stream_handler_t.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_stream_handler_t.java index b16cbc2701d..2fbb6b2873c 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_stream_handler_t.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_stream_handler_t.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_sum_levin_u_workspace.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_sum_levin_u_workspace.java index 1aaa86e4625..5195db462fa 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_sum_levin_u_workspace.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_sum_levin_u_workspace.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_sum_levin_utrunc_workspace.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_sum_levin_utrunc_workspace.java index f1a3a84a1f4..cde72b6b6e8 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_sum_levin_utrunc_workspace.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_sum_levin_utrunc_workspace.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_vector.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_vector.java index 91dd80d7db3..a2373a666e0 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_vector.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_vector.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_vector_char.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_vector_char.java index 109a4854dfc..8307f1d4eef 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_vector_char.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_vector_char.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_vector_complex.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_vector_complex.java index 703b330883d..114180fbe4c 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_vector_complex.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_vector_complex.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_vector_complex_float.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_vector_complex_float.java index a4c3a42880b..21bdc461f04 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_vector_complex_float.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_vector_complex_float.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_vector_float.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_vector_float.java index 7fa879e23c5..bae5576c89e 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_vector_float.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_vector_float.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_vector_int.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_vector_int.java index 931bab9ebd5..d77b0392fc0 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_vector_int.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_vector_int.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_vector_long.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_vector_long.java index ea684a0101a..b2c05890acc 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_vector_long.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_vector_long.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_vector_short.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_vector_short.java index 620645e056f..e81d45fb298 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_vector_short.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_vector_short.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_vector_uchar.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_vector_uchar.java index a3bef562798..1354fdfbb00 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_vector_uchar.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_vector_uchar.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_vector_uint.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_vector_uint.java index cd7cce53690..200461e1e2f 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_vector_uint.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_vector_uint.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_vector_ulong.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_vector_ulong.java index 614a27d0a5e..5ec35334445 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_vector_ulong.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_vector_ulong.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_vector_ushort.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_vector_ushort.java index d9d4d89dd3d..4f94b112698 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_vector_ushort.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_vector_ushort.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_wavelet.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_wavelet.java index 8b7388cfbcb..aa31e769dfd 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_wavelet.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_wavelet.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_wavelet_type.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_wavelet_type.java index 2044c0592a2..96109c79bdd 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_wavelet_type.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_wavelet_type.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.gsl; diff --git a/gsl/src/gen/java/org/bytedeco/gsl/gsl_wavelet_workspace.java b/gsl/src/gen/java/org/bytedeco/gsl/gsl_wavelet_workspace.java index f9bd3d036e9..a9743188721 100644 --- a/gsl/src/gen/java/org/bytedeco/gsl/gsl_wavelet_workspace.java +++ b/gsl/src/gen/java/org/bytedeco/gsl/gsl_wavelet_workspace.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.gsl; diff --git a/libdc1394/README.md b/libdc1394/README.md index 8b307416545..9717c438012 100644 --- a/libdc1394/README.md +++ b/libdc1394/README.md @@ -5,7 +5,7 @@ Introduction ------------ This directory contains the JavaCPP Presets module for: - * libdc1394 2.2.5 http://damien.douxchamps.net/ieee1394/libdc1394/ + * libdc1394 2.2.6 http://damien.douxchamps.net/ieee1394/libdc1394/ Please refer to the parent README.md file for more detailed information about the JavaCPP Presets. @@ -34,7 +34,7 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic 4.0.0 org.bytedeco.libdc1394 grabcolorimage - 1.5 + 1.5.1-SNAPSHOT GrabColorImage @@ -42,7 +42,7 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic org.bytedeco libdc1394-platform - 2.2.5-1.5 + 2.2.6-1.5.1-SNAPSHOT diff --git a/libdc1394/cppbuild.sh b/libdc1394/cppbuild.sh index 389a26e7399..aa66376b524 100755 --- a/libdc1394/cppbuild.sh +++ b/libdc1394/cppbuild.sh @@ -7,7 +7,7 @@ if [[ -z "$PLATFORM" ]]; then exit fi -LIBDC1394_VERSION=2.2.5 +LIBDC1394_VERSION=2.2.6 download http://downloads.sourceforge.net/project/libdc1394/libdc1394-2/$LIBDC1394_VERSION/libdc1394-$LIBDC1394_VERSION.tar.gz libdc1394-$LIBDC1394_VERSION.tar.gz if [[ "$PLATFORM" == windows* ]]; then download http://www.cs.cmu.edu/~iwan/1394/downloads/1394camera646.exe 1394camera646.exe @@ -54,7 +54,7 @@ case $PLATFORM in make install-strip ;; macosx-*) - patch -Np1 < ../../../libdc1394-$LIBDC1394_VERSION-macosx.patch + patch -Np1 < ../../../libdc1394-macosx.patch LIBUSB_CFLAGS=-I/usr/local/include/libusb-1.0/ LIBUSB_LIBS="-L/usr/local/lib/ -lusb-1.0" ./configure --prefix=$INSTALL_PATH --disable-sdltest make -j4 make install-strip diff --git a/libdc1394/libdc1394-2.2.5-macosx.patch b/libdc1394/libdc1394-macosx.patch similarity index 57% rename from libdc1394/libdc1394-2.2.5-macosx.patch rename to libdc1394/libdc1394-macosx.patch index 6ac43568926..d81754a0047 100644 --- a/libdc1394/libdc1394-2.2.5-macosx.patch +++ b/libdc1394/libdc1394-macosx.patch @@ -1,6 +1,6 @@ -diff -ruN libdc1394-2.2.5/configure libdc1394-2.2.5-macosx/configure ---- libdc1394-2.2.5/configure 2016-12-22 17:26:26.000000000 +0900 -+++ libdc1394-2.2.5-macosx/configure 2017-01-03 21:36:57.000000000 +0900 +diff -ruN libdc1394-2.2.6/configure libdc1394-2.2.6-macosx/configure +--- libdc1394-2.2.6/configure 2019-04-28 09:36:21.000000000 +0900 ++++ libdc1394-2.2.6-macosx/configure 2019-05-06 20:50:46.741440930 +0900 @@ -12502,9 +12502,9 @@ esac if test "$_lt_dar_can_shared" = "yes"; then @@ -13,27 +13,3 @@ diff -ruN libdc1394-2.2.5/configure libdc1394-2.2.5-macosx/configure module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" else -diff -ruN libdc1394-2.2.5/dc1394/bayer.c libdc1394-2.2.5-macosx/dc1394/bayer.c ---- libdc1394-2.2.5/dc1394/bayer.c 2016-10-11 15:19:10.000000000 +0900 -+++ libdc1394-2.2.5-macosx/dc1394/bayer.c 2017-01-03 21:44:31.000000000 +0900 -@@ -775,7 +775,7 @@ - { - uint8_t *outR, *outG, *outB; - register int i, j; -- uint tmp; -+ int tmp; - int st=sx*sy; - int p; - int sx2=sx<<1; -diff -ruN libdc1394-2.2.5/dc1394/macosx/capture.c libdc1394-2.2.5-macosx/dc1394/macosx/capture.c ---- libdc1394-2.2.5/dc1394/macosx/capture.c 2016-12-20 22:10:34.000000000 +0900 -+++ libdc1394-2.2.5-macosx/dc1394/macosx/capture.c 2017-01-03 21:42:02.000000000 +0900 -@@ -614,7 +614,7 @@ - dc1394video_frame_t * frame_tmp = capture->frames + next; - char ch; - -- if(craw->frames==NULL || craw->capture_is_set==0) { -+ if(craw->capture_is_set==0) { - *frame=NULL; - return DC1394_CAPTURE_IS_NOT_SET; - } diff --git a/libdc1394/platform/pom.xml b/libdc1394/platform/pom.xml index 99450a13ded..828fa6c757e 100644 --- a/libdc1394/platform/pom.xml +++ b/libdc1394/platform/pom.xml @@ -17,7 +17,7 @@ libdc1394 - 2.2.5-${project.parent.version} + 2.2.6-${project.parent.version} diff --git a/libdc1394/pom.xml b/libdc1394/pom.xml index a0dbf698ae4..44a55540ac7 100644 --- a/libdc1394/pom.xml +++ b/libdc1394/pom.xml @@ -15,7 +15,7 @@ JavaCPP Presets for libdc1394 - 2.2.5-${project.parent.version} + 2.2.6-${project.parent.version} diff --git a/libdc1394/samples/pom.xml b/libdc1394/samples/pom.xml index 13c9678e5a8..47ac865046b 100644 --- a/libdc1394/samples/pom.xml +++ b/libdc1394/samples/pom.xml @@ -2,7 +2,7 @@ 4.0.0 org.bytedeco.libdc1394 grabcolorimage - 1.5 + 1.5.1-SNAPSHOT GrabColorImage @@ -10,7 +10,7 @@ org.bytedeco libdc1394-platform - 2.2.5-1.5 + 2.2.6-1.5.1-SNAPSHOT diff --git a/libdc1394/src/gen/java/org/bytedeco/libdc1394/Log_handler_int_BytePointer_Pointer.java b/libdc1394/src/gen/java/org/bytedeco/libdc1394/Log_handler_int_BytePointer_Pointer.java index b6d64c2ffb9..28e9a6a9615 100644 --- a/libdc1394/src/gen/java/org/bytedeco/libdc1394/Log_handler_int_BytePointer_Pointer.java +++ b/libdc1394/src/gen/java/org/bytedeco/libdc1394/Log_handler_int_BytePointer_Pointer.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.libdc1394; diff --git a/libdc1394/src/gen/java/org/bytedeco/libdc1394/Log_handler_int_String_Pointer.java b/libdc1394/src/gen/java/org/bytedeco/libdc1394/Log_handler_int_String_Pointer.java index 2903b55b017..569527ff3e5 100644 --- a/libdc1394/src/gen/java/org/bytedeco/libdc1394/Log_handler_int_String_Pointer.java +++ b/libdc1394/src/gen/java/org/bytedeco/libdc1394/Log_handler_int_String_Pointer.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.libdc1394; diff --git a/libdc1394/src/gen/java/org/bytedeco/libdc1394/dc1394_t.java b/libdc1394/src/gen/java/org/bytedeco/libdc1394/dc1394_t.java index 375ed69c904..102500e55f2 100644 --- a/libdc1394/src/gen/java/org/bytedeco/libdc1394/dc1394_t.java +++ b/libdc1394/src/gen/java/org/bytedeco/libdc1394/dc1394_t.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.libdc1394; diff --git a/libdc1394/src/gen/java/org/bytedeco/libdc1394/dc1394camera_id_t.java b/libdc1394/src/gen/java/org/bytedeco/libdc1394/dc1394camera_id_t.java index adca383f89f..aa97f999907 100644 --- a/libdc1394/src/gen/java/org/bytedeco/libdc1394/dc1394camera_id_t.java +++ b/libdc1394/src/gen/java/org/bytedeco/libdc1394/dc1394camera_id_t.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.libdc1394; diff --git a/libdc1394/src/gen/java/org/bytedeco/libdc1394/dc1394camera_list_t.java b/libdc1394/src/gen/java/org/bytedeco/libdc1394/dc1394camera_list_t.java index 862161ccd56..bba26895e00 100644 --- a/libdc1394/src/gen/java/org/bytedeco/libdc1394/dc1394camera_list_t.java +++ b/libdc1394/src/gen/java/org/bytedeco/libdc1394/dc1394camera_list_t.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.libdc1394; diff --git a/libdc1394/src/gen/java/org/bytedeco/libdc1394/dc1394camera_t.java b/libdc1394/src/gen/java/org/bytedeco/libdc1394/dc1394camera_t.java index 3c6aa7b9d4b..87e5aba597f 100644 --- a/libdc1394/src/gen/java/org/bytedeco/libdc1394/dc1394camera_t.java +++ b/libdc1394/src/gen/java/org/bytedeco/libdc1394/dc1394camera_t.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.libdc1394; diff --git a/libdc1394/src/gen/java/org/bytedeco/libdc1394/dc1394capture_callback_t.java b/libdc1394/src/gen/java/org/bytedeco/libdc1394/dc1394capture_callback_t.java index 7cffb301a53..cfe07380d3a 100644 --- a/libdc1394/src/gen/java/org/bytedeco/libdc1394/dc1394capture_callback_t.java +++ b/libdc1394/src/gen/java/org/bytedeco/libdc1394/dc1394capture_callback_t.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.libdc1394; diff --git a/libdc1394/src/gen/java/org/bytedeco/libdc1394/dc1394color_codings_t.java b/libdc1394/src/gen/java/org/bytedeco/libdc1394/dc1394color_codings_t.java index 7dceab186b2..7c91ec0a612 100644 --- a/libdc1394/src/gen/java/org/bytedeco/libdc1394/dc1394color_codings_t.java +++ b/libdc1394/src/gen/java/org/bytedeco/libdc1394/dc1394color_codings_t.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.libdc1394; diff --git a/libdc1394/src/gen/java/org/bytedeco/libdc1394/dc1394feature_info_t.java b/libdc1394/src/gen/java/org/bytedeco/libdc1394/dc1394feature_info_t.java index e2f0bda956d..5c7e8d06e54 100644 --- a/libdc1394/src/gen/java/org/bytedeco/libdc1394/dc1394feature_info_t.java +++ b/libdc1394/src/gen/java/org/bytedeco/libdc1394/dc1394feature_info_t.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.libdc1394; diff --git a/libdc1394/src/gen/java/org/bytedeco/libdc1394/dc1394feature_modes_t.java b/libdc1394/src/gen/java/org/bytedeco/libdc1394/dc1394feature_modes_t.java index 1ee018fb085..7150a9c5705 100644 --- a/libdc1394/src/gen/java/org/bytedeco/libdc1394/dc1394feature_modes_t.java +++ b/libdc1394/src/gen/java/org/bytedeco/libdc1394/dc1394feature_modes_t.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.libdc1394; diff --git a/libdc1394/src/gen/java/org/bytedeco/libdc1394/dc1394featureset_t.java b/libdc1394/src/gen/java/org/bytedeco/libdc1394/dc1394featureset_t.java index 1bc80051267..d3a90675e08 100644 --- a/libdc1394/src/gen/java/org/bytedeco/libdc1394/dc1394featureset_t.java +++ b/libdc1394/src/gen/java/org/bytedeco/libdc1394/dc1394featureset_t.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.libdc1394; diff --git a/libdc1394/src/gen/java/org/bytedeco/libdc1394/dc1394format7mode_t.java b/libdc1394/src/gen/java/org/bytedeco/libdc1394/dc1394format7mode_t.java index b7c4832bc67..854513b00ce 100644 --- a/libdc1394/src/gen/java/org/bytedeco/libdc1394/dc1394format7mode_t.java +++ b/libdc1394/src/gen/java/org/bytedeco/libdc1394/dc1394format7mode_t.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.libdc1394; diff --git a/libdc1394/src/gen/java/org/bytedeco/libdc1394/dc1394format7modeset_t.java b/libdc1394/src/gen/java/org/bytedeco/libdc1394/dc1394format7modeset_t.java index 8f08712923d..279fb39bf3f 100644 --- a/libdc1394/src/gen/java/org/bytedeco/libdc1394/dc1394format7modeset_t.java +++ b/libdc1394/src/gen/java/org/bytedeco/libdc1394/dc1394format7modeset_t.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.libdc1394; diff --git a/libdc1394/src/gen/java/org/bytedeco/libdc1394/dc1394framerates_t.java b/libdc1394/src/gen/java/org/bytedeco/libdc1394/dc1394framerates_t.java index 39766ca2415..7496925fe3a 100644 --- a/libdc1394/src/gen/java/org/bytedeco/libdc1394/dc1394framerates_t.java +++ b/libdc1394/src/gen/java/org/bytedeco/libdc1394/dc1394framerates_t.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.libdc1394; diff --git a/libdc1394/src/gen/java/org/bytedeco/libdc1394/dc1394trigger_modes_t.java b/libdc1394/src/gen/java/org/bytedeco/libdc1394/dc1394trigger_modes_t.java index dcbbb13834a..83916b3e01b 100644 --- a/libdc1394/src/gen/java/org/bytedeco/libdc1394/dc1394trigger_modes_t.java +++ b/libdc1394/src/gen/java/org/bytedeco/libdc1394/dc1394trigger_modes_t.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.libdc1394; diff --git a/libdc1394/src/gen/java/org/bytedeco/libdc1394/dc1394trigger_sources_t.java b/libdc1394/src/gen/java/org/bytedeco/libdc1394/dc1394trigger_sources_t.java index 892b0b483bb..760964ec82e 100644 --- a/libdc1394/src/gen/java/org/bytedeco/libdc1394/dc1394trigger_sources_t.java +++ b/libdc1394/src/gen/java/org/bytedeco/libdc1394/dc1394trigger_sources_t.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.libdc1394; diff --git a/libdc1394/src/gen/java/org/bytedeco/libdc1394/dc1394video_frame_t.java b/libdc1394/src/gen/java/org/bytedeco/libdc1394/dc1394video_frame_t.java index 3a6b6117c0e..97efb31f0dd 100644 --- a/libdc1394/src/gen/java/org/bytedeco/libdc1394/dc1394video_frame_t.java +++ b/libdc1394/src/gen/java/org/bytedeco/libdc1394/dc1394video_frame_t.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.libdc1394; diff --git a/libdc1394/src/gen/java/org/bytedeco/libdc1394/dc1394video_modes_t.java b/libdc1394/src/gen/java/org/bytedeco/libdc1394/dc1394video_modes_t.java index 36e5d6610f9..62b4213d85e 100644 --- a/libdc1394/src/gen/java/org/bytedeco/libdc1394/dc1394video_modes_t.java +++ b/libdc1394/src/gen/java/org/bytedeco/libdc1394/dc1394video_modes_t.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.libdc1394; diff --git a/libdc1394/src/gen/java/org/bytedeco/libdc1394/global/dc1394.java b/libdc1394/src/gen/java/org/bytedeco/libdc1394/global/dc1394.java index 9ce8e88f919..d8dcb10052b 100644 --- a/libdc1394/src/gen/java/org/bytedeco/libdc1394/global/dc1394.java +++ b/libdc1394/src/gen/java/org/bytedeco/libdc1394/global/dc1394.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.libdc1394.global; @@ -2251,14 +2251,14 @@ public static native void dc1394_capture_set_callback(dc1394camera_t camera, public static native @Cast("dc1394error_t") int dc1394_video_set_framerate(dc1394camera_t camera, @Cast("dc1394framerate_t") int framerate); /** - * Gets the current vide mode. + * Gets the current video mode. */ public static native @Cast("dc1394error_t") int dc1394_video_get_mode(dc1394camera_t camera, @Cast("dc1394video_mode_t*") IntPointer video_mode); public static native @Cast("dc1394error_t") int dc1394_video_get_mode(dc1394camera_t camera, @Cast("dc1394video_mode_t*") IntBuffer video_mode); public static native @Cast("dc1394error_t") int dc1394_video_get_mode(dc1394camera_t camera, @Cast("dc1394video_mode_t*") int[] video_mode); /** - * Sets the current vide mode. + * Sets the current video mode. */ public static native @Cast("dc1394error_t") int dc1394_video_set_mode(dc1394camera_t camera, @Cast("dc1394video_mode_t") int video_mode); @@ -2401,9 +2401,9 @@ public static native void dc1394_capture_set_callback(dc1394camera_t camera, /** * Returns the image width and height (in pixels) corresponding to a video mode. Works for scalable and non-scalable video modes. */ -public static native @Cast("dc1394error_t") int dc1394_get_image_size_from_video_mode(dc1394camera_t camera, @Cast("uint32_t") int video_mode, @Cast("uint32_t*") IntPointer width, @Cast("uint32_t*") IntPointer height); -public static native @Cast("dc1394error_t") int dc1394_get_image_size_from_video_mode(dc1394camera_t camera, @Cast("uint32_t") int video_mode, @Cast("uint32_t*") IntBuffer width, @Cast("uint32_t*") IntBuffer height); -public static native @Cast("dc1394error_t") int dc1394_get_image_size_from_video_mode(dc1394camera_t camera, @Cast("uint32_t") int video_mode, @Cast("uint32_t*") int[] width, @Cast("uint32_t*") int[] height); +public static native @Cast("dc1394error_t") int dc1394_get_image_size_from_video_mode(dc1394camera_t camera, @Cast("dc1394video_mode_t") int video_mode, @Cast("uint32_t*") IntPointer width, @Cast("uint32_t*") IntPointer height); +public static native @Cast("dc1394error_t") int dc1394_get_image_size_from_video_mode(dc1394camera_t camera, @Cast("dc1394video_mode_t") int video_mode, @Cast("uint32_t*") IntBuffer width, @Cast("uint32_t*") IntBuffer height); +public static native @Cast("dc1394error_t") int dc1394_get_image_size_from_video_mode(dc1394camera_t camera, @Cast("dc1394video_mode_t") int video_mode, @Cast("uint32_t*") int[] width, @Cast("uint32_t*") int[] height); /** * Returns the given framerate as a float. diff --git a/mxnet/platform/pom.xml b/mxnet/platform/pom.xml index 7b00b1434f5..51b13f7dc86 100644 --- a/mxnet/platform/pom.xml +++ b/mxnet/platform/pom.xml @@ -29,7 +29,7 @@ org.bytedeco openblas-platform - 0.3.5-${project.parent.version} + 0.3.6-${project.parent.version} org.bytedeco diff --git a/mxnet/pom.xml b/mxnet/pom.xml index 9380a4584c3..6821b165757 100644 --- a/mxnet/pom.xml +++ b/mxnet/pom.xml @@ -28,7 +28,7 @@ org.bytedeco openblas - 0.3.5-${project.parent.version} + 0.3.6-${project.parent.version} org.bytedeco @@ -89,7 +89,7 @@ org.bytedeco openblas - 0.3.5-${project.parent.version} + 0.3.6-${project.parent.version} org.bytedeco @@ -105,7 +105,7 @@ org.bytedeco openblas - 0.3.5-${project.parent.version} + 0.3.6-${project.parent.version} ${javacpp.platform} @@ -328,7 +328,7 @@ org.bytedeco openblas - 0.3.5-${project.parent.version} + 0.3.6-${project.parent.version} linux-x86_64 diff --git a/numpy/README.md b/numpy/README.md index 47a8a7bc16c..7717158f1b9 100644 --- a/numpy/README.md +++ b/numpy/README.md @@ -5,7 +5,7 @@ Introduction ------------ This directory contains the JavaCPP Presets module for: - * NumPy 1.16.2 http://www.numpy.org/ + * NumPy 1.16.3 http://www.numpy.org/ Please refer to the parent README.md file for more detailed information about the JavaCPP Presets. @@ -36,7 +36,7 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic 4.0.0 org.bytedeco.numpy matmul - 1.5 + 1.5.1-SNAPSHOT MatMul @@ -44,26 +44,26 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic org.bytedeco numpy-platform - 1.16.2-1.5 + 1.16.3-1.5.1-SNAPSHOT org.bytedeco mkl - 2019.3-1.5 + 2019.3-1.5.1-SNAPSHOT linux-x86_64-redist org.bytedeco mkl - 2019.3-1.5 + 2019.3-1.5.1-SNAPSHOT macosx-x86_64-redist org.bytedeco mkl - 2019.3-1.5 + 2019.3-1.5.1-SNAPSHOT windows-x86_64-redist diff --git a/numpy/cppbuild.sh b/numpy/cppbuild.sh index fddd2ba7bfd..5f0c8f380e4 100755 --- a/numpy/cppbuild.sh +++ b/numpy/cppbuild.sh @@ -7,7 +7,7 @@ if [[ -z "$PLATFORM" ]]; then exit fi -NUMPY_VERSION=1.16.2 +NUMPY_VERSION=1.16.3 download https://github.com/numpy/numpy/releases/download/v$NUMPY_VERSION/numpy-$NUMPY_VERSION.tar.gz numpy-$NUMPY_VERSION.tar.gz mkdir -p $PLATFORM diff --git a/numpy/platform/pom.xml b/numpy/platform/pom.xml index 17b5c75a786..0266767a7c5 100644 --- a/numpy/platform/pom.xml +++ b/numpy/platform/pom.xml @@ -17,14 +17,14 @@ numpy - 1.16.2-${project.parent.version} + 1.16.3-${project.parent.version} org.bytedeco openblas-platform - 0.3.5-${project.parent.version} + 0.3.6-${project.parent.version} org.bytedeco diff --git a/numpy/pom.xml b/numpy/pom.xml index fc266a675ee..3b133d2d608 100644 --- a/numpy/pom.xml +++ b/numpy/pom.xml @@ -15,14 +15,14 @@ JavaCPP Presets for NumPy - 1.16.2-${project.parent.version} + 1.16.3-${project.parent.version} org.bytedeco openblas - 0.3.5-${project.parent.version} + 0.3.6-${project.parent.version} org.bytedeco @@ -50,7 +50,7 @@ org.bytedeco openblas - 0.3.5-${project.parent.version} + 0.3.6-${project.parent.version} org.bytedeco @@ -60,7 +60,7 @@ org.bytedeco openblas - 0.3.5-${project.parent.version} + 0.3.6-${project.parent.version} ${javacpp.platform} diff --git a/numpy/samples/pom.xml b/numpy/samples/pom.xml index 4f7de045af9..298cdb57d7c 100644 --- a/numpy/samples/pom.xml +++ b/numpy/samples/pom.xml @@ -10,7 +10,7 @@ org.bytedeco numpy-platform - 1.16.2-1.5.1-SNAPSHOT + 1.16.3-1.5.1-SNAPSHOT diff --git a/onnx/README.md b/onnx/README.md index 234cfc9e25c..bcdb7887b4a 100644 --- a/onnx/README.md +++ b/onnx/README.md @@ -5,7 +5,7 @@ Introduction ------------ This directory contains the JavaCPP Presets module for: - * ONNX 1.4.1 https://onnx.ai/ + * ONNX 1.5.0 https://onnx.ai/ Please refer to the parent README.md file for more detailed information about the JavaCPP Presets. @@ -35,7 +35,7 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic 4.0.0 org.bytedeco.onnx loadmodel - 1.5 + 1.5.1-SNAPSHOT LoadModel @@ -43,7 +43,7 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic org.bytedeco onnx-platform - 1.4.1-1.5 + 1.5.0-1.5.1-SNAPSHOT diff --git a/onnx/cppbuild.sh b/onnx/cppbuild.sh index 8dca2ca0430..ed32e6ec358 100755 --- a/onnx/cppbuild.sh +++ b/onnx/cppbuild.sh @@ -13,8 +13,8 @@ if [[ $PLATFORM == windows* ]]; then exit 1 fi -export ONNX=1.4.1 -export PROTO=3.6.1 +export ONNX=1.5.0 +export PROTO=3.7.1 export PYBIND=2.2.4 download https://github.com/onnx/onnx/archive/v$ONNX.tar.gz onnx-$ONNX.tar.gz diff --git a/onnx/platform/pom.xml b/onnx/platform/pom.xml index 5cc8b0529be..3ec87eeb34e 100644 --- a/onnx/platform/pom.xml +++ b/onnx/platform/pom.xml @@ -17,7 +17,7 @@ onnx - 1.4.1-${project.parent.version} + 1.5.0-${project.parent.version} diff --git a/onnx/pom.xml b/onnx/pom.xml index c62a4f4749f..fd6fc314756 100644 --- a/onnx/pom.xml +++ b/onnx/pom.xml @@ -15,7 +15,7 @@ JavaCPP Presets for ONNX - 1.4.1-${project.parent.version} + 1.5.0-${project.parent.version} diff --git a/onnx/samples/pom.xml b/onnx/samples/pom.xml index 4f7077934af..b85b5d555d0 100644 --- a/onnx/samples/pom.xml +++ b/onnx/samples/pom.xml @@ -2,7 +2,7 @@ 4.0.0 org.bytedeco.onnx loadmodel - 1.5 + 1.5.1-SNAPSHOT LoadModel @@ -10,7 +10,7 @@ org.bytedeco onnx-platform - 1.4.1-1.5 + 1.5.0-1.5.1-SNAPSHOT diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Abs_Onnx_ver1.java b/onnx/src/gen/java/org/bytedeco/onnx/Abs_Onnx_ver1.java index d911b258779..34d1f9fd4e1 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Abs_Onnx_ver1.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Abs_Onnx_ver1.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.onnx; @@ -8,6 +8,8 @@ import static org.bytedeco.onnx.global.onnx.*; + +// Forward declarations for ai.onnx version 1 @Namespace("onnx") @Opaque @Properties(inherit = org.bytedeco.onnx.presets.onnx.class) public class Abs_Onnx_ver1 extends Pointer { /** Empty constructor. Calls {@code super((Pointer)null)}. */ diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Abs_Onnx_ver6.java b/onnx/src/gen/java/org/bytedeco/onnx/Abs_Onnx_ver6.java index 6fe24b1c300..57dd0e97e29 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Abs_Onnx_ver6.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Abs_Onnx_ver6.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Acos_Onnx_ver7.java b/onnx/src/gen/java/org/bytedeco/onnx/Acos_Onnx_ver7.java index 906cb2605af..9b0ce09fa58 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Acos_Onnx_ver7.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Acos_Onnx_ver7.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Acosh_Onnx_ver9.java b/onnx/src/gen/java/org/bytedeco/onnx/Acosh_Onnx_ver9.java index 4d12579d70b..8337d116681 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Acosh_Onnx_ver9.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Acosh_Onnx_ver9.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Adapter.java b/onnx/src/gen/java/org/bytedeco/onnx/Adapter.java index 13db3639d07..3e5642ac24c 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Adapter.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Adapter.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Add_Onnx_ver1.java b/onnx/src/gen/java/org/bytedeco/onnx/Add_Onnx_ver1.java index 2fcf949d024..a0a819f3eb7 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Add_Onnx_ver1.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Add_Onnx_ver1.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Add_Onnx_ver6.java b/onnx/src/gen/java/org/bytedeco/onnx/Add_Onnx_ver6.java index cd79e36e1aa..717bef2a1b0 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Add_Onnx_ver6.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Add_Onnx_ver6.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Add_Onnx_ver7.java b/onnx/src/gen/java/org/bytedeco/onnx/Add_Onnx_ver7.java index 4efb864bfec..d869fa9e3d4 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Add_Onnx_ver7.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Add_Onnx_ver7.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/And_Onnx_ver1.java b/onnx/src/gen/java/org/bytedeco/onnx/And_Onnx_ver1.java index c05465d0292..a62d4c66cfc 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/And_Onnx_ver1.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/And_Onnx_ver1.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/And_Onnx_ver7.java b/onnx/src/gen/java/org/bytedeco/onnx/And_Onnx_ver7.java index 4a71649583c..194f89fe65f 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/And_Onnx_ver7.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/And_Onnx_ver7.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Arena.java b/onnx/src/gen/java/org/bytedeco/onnx/Arena.java index d4a486afd4e..7e9806be20d 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Arena.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Arena.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.onnx; @@ -35,7 +35,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. // @@ -56,7 +56,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/onnx/src/gen/java/org/bytedeco/onnx/ArenaOptions.java b/onnx/src/gen/java/org/bytedeco/onnx/ArenaOptions.java index 776517bfee2..fcedc650fa7 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/ArenaOptions.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/ArenaOptions.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/ArenaStringPtr.java b/onnx/src/gen/java/org/bytedeco/onnx/ArenaStringPtr.java index baae27852e5..7c7710d96ba 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/ArenaStringPtr.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/ArenaStringPtr.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/ArgMax_Onnx_ver1.java b/onnx/src/gen/java/org/bytedeco/onnx/ArgMax_Onnx_ver1.java index 8123af5de9c..135afb4eda0 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/ArgMax_Onnx_ver1.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/ArgMax_Onnx_ver1.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/ArgMin_Onnx_ver1.java b/onnx/src/gen/java/org/bytedeco/onnx/ArgMin_Onnx_ver1.java index 294f6ec38cb..ea7046bb8e5 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/ArgMin_Onnx_ver1.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/ArgMin_Onnx_ver1.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/ArrayFeatureExtractor_OnnxML_ver1.java b/onnx/src/gen/java/org/bytedeco/onnx/ArrayFeatureExtractor_OnnxML_ver1.java index dbe470a3a96..445542a7339 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/ArrayFeatureExtractor_OnnxML_ver1.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/ArrayFeatureExtractor_OnnxML_ver1.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Asin_Onnx_ver7.java b/onnx/src/gen/java/org/bytedeco/onnx/Asin_Onnx_ver7.java index 2d4a659f548..f5ccbc8f927 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Asin_Onnx_ver7.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Asin_Onnx_ver7.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Asinh_Onnx_ver9.java b/onnx/src/gen/java/org/bytedeco/onnx/Asinh_Onnx_ver9.java index 4de24d9ab53..2915555c4bd 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Asinh_Onnx_ver9.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Asinh_Onnx_ver9.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Atan_Onnx_ver7.java b/onnx/src/gen/java/org/bytedeco/onnx/Atan_Onnx_ver7.java index 9e848ac1ed0..0f239170e3a 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Atan_Onnx_ver7.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Atan_Onnx_ver7.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Atanh_Onnx_ver9.java b/onnx/src/gen/java/org/bytedeco/onnx/Atanh_Onnx_ver9.java index 4a577962ea8..d894769411a 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Atanh_Onnx_ver9.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Atanh_Onnx_ver9.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/AttributeProto.java b/onnx/src/gen/java/org/bytedeco/onnx/AttributeProto.java index 65e642eff9b..0174778e4eb 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/AttributeProto.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/AttributeProto.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.onnx; @@ -58,16 +58,19 @@ public class AttributeProto extends MessageLite { public native @Cast("bool") boolean IsInitialized(); public native @Cast("size_t") long ByteSizeLong(); +// #if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER +// #else public native @Cast("bool") boolean MergePartialFromCodedStream( CodedInputStream input); +// #endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER public native void SerializeWithCachedSizes( CodedOutputStream output); public native @Cast("google::protobuf::uint8*") BytePointer InternalSerializeWithCachedSizesToArray( - @Cast("bool") boolean deterministic, @Cast("google::protobuf::uint8*") BytePointer target); + @Cast("google::protobuf::uint8*") BytePointer target); public native @Cast("google::protobuf::uint8*") ByteBuffer InternalSerializeWithCachedSizesToArray( - @Cast("bool") boolean deterministic, @Cast("google::protobuf::uint8*") ByteBuffer target); + @Cast("google::protobuf::uint8*") ByteBuffer target); public native @Cast("google::protobuf::uint8*") byte[] InternalSerializeWithCachedSizesToArray( - @Cast("bool") boolean deterministic, @Cast("google::protobuf::uint8*") byte[] target); + @Cast("google::protobuf::uint8*") byte[] target); public native int GetCachedSize(); public native @ByVal @Cast("google::protobuf::Metadata*") Pointer GetMetadata(); diff --git a/onnx/src/gen/java/org/bytedeco/onnx/AttributeProtoDefaultTypeInternal.java b/onnx/src/gen/java/org/bytedeco/onnx/AttributeProtoDefaultTypeInternal.java index 7e8376936a8..76afaadd0f1 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/AttributeProtoDefaultTypeInternal.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/AttributeProtoDefaultTypeInternal.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.onnx; @@ -7,7 +7,7 @@ import org.bytedeco.javacpp.annotation.*; import static org.bytedeco.onnx.global.onnx.*; - // namespace protobuf_onnx_2fonnx_2dml_2eproto + @Namespace("onnx") @Opaque @Properties(inherit = org.bytedeco.onnx.presets.onnx.class) public class AttributeProtoDefaultTypeInternal extends Pointer { /** Empty constructor. Calls {@code super((Pointer)null)}. */ diff --git a/onnx/src/gen/java/org/bytedeco/onnx/AttributeValue.java b/onnx/src/gen/java/org/bytedeco/onnx/AttributeValue.java index 15991657b1d..e2b9085e807 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/AttributeValue.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/AttributeValue.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/AveragePool_Onnx_ver1.java b/onnx/src/gen/java/org/bytedeco/onnx/AveragePool_Onnx_ver1.java index aeac54ef96a..9f6bdaf3905 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/AveragePool_Onnx_ver1.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/AveragePool_Onnx_ver1.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/AveragePool_Onnx_ver10.java b/onnx/src/gen/java/org/bytedeco/onnx/AveragePool_Onnx_ver10.java new file mode 100644 index 00000000000..e12c83e455a --- /dev/null +++ b/onnx/src/gen/java/org/bytedeco/onnx/AveragePool_Onnx_ver10.java @@ -0,0 +1,17 @@ +// Targeted by JavaCPP version 1.5.1-SNAPSHOT: DO NOT EDIT THIS FILE + +package org.bytedeco.onnx; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +import static org.bytedeco.onnx.global.onnx.*; + +@Namespace("onnx") @Opaque @Properties(inherit = org.bytedeco.onnx.presets.onnx.class) +public class AveragePool_Onnx_ver10 extends Pointer { + /** Empty constructor. Calls {@code super((Pointer)null)}. */ + public AveragePool_Onnx_ver10() { super((Pointer)null); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public AveragePool_Onnx_ver10(Pointer p) { super(p); } +} diff --git a/onnx/src/gen/java/org/bytedeco/onnx/AveragePool_Onnx_ver7.java b/onnx/src/gen/java/org/bytedeco/onnx/AveragePool_Onnx_ver7.java index a4fc9cdec42..d0709f98ab6 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/AveragePool_Onnx_ver7.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/AveragePool_Onnx_ver7.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/BaseVersionConverter.java b/onnx/src/gen/java/org/bytedeco/onnx/BaseVersionConverter.java index 6bcde03c5a1..b3c07dbaef5 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/BaseVersionConverter.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/BaseVersionConverter.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/BatchNormalization_Onnx_ver1.java b/onnx/src/gen/java/org/bytedeco/onnx/BatchNormalization_Onnx_ver1.java index 5746491e0fb..d9092df179a 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/BatchNormalization_Onnx_ver1.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/BatchNormalization_Onnx_ver1.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/BatchNormalization_Onnx_ver6.java b/onnx/src/gen/java/org/bytedeco/onnx/BatchNormalization_Onnx_ver6.java index 66e75acf839..a98a0bb3349 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/BatchNormalization_Onnx_ver6.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/BatchNormalization_Onnx_ver6.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/BatchNormalization_Onnx_ver7.java b/onnx/src/gen/java/org/bytedeco/onnx/BatchNormalization_Onnx_ver7.java index 774e44838b5..64bcd023e45 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/BatchNormalization_Onnx_ver7.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/BatchNormalization_Onnx_ver7.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/BatchNormalization_Onnx_ver9.java b/onnx/src/gen/java/org/bytedeco/onnx/BatchNormalization_Onnx_ver9.java index a53e982a085..aac810f38bb 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/BatchNormalization_Onnx_ver9.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/BatchNormalization_Onnx_ver9.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Binarizer_OnnxML_ver1.java b/onnx/src/gen/java/org/bytedeco/onnx/Binarizer_OnnxML_ver1.java index e3c6267a8ed..f264e841ef4 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Binarizer_OnnxML_ver1.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Binarizer_OnnxML_ver1.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/BoundedZCIS.java b/onnx/src/gen/java/org/bytedeco/onnx/BoundedZCIS.java new file mode 100644 index 00000000000..261a23e4db0 --- /dev/null +++ b/onnx/src/gen/java/org/bytedeco/onnx/BoundedZCIS.java @@ -0,0 +1,29 @@ +// Targeted by JavaCPP version 1.5.1-SNAPSHOT: DO NOT EDIT THIS FILE + +package org.bytedeco.onnx; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +import static org.bytedeco.onnx.global.onnx.*; + + +@Namespace("google::protobuf::internal") @Properties(inherit = org.bytedeco.onnx.presets.onnx.class) +public class BoundedZCIS extends Pointer { + static { Loader.load(); } + /** Default native constructor. */ + public BoundedZCIS() { super((Pointer)null); allocate(); } + /** Native array allocator. Access with {@link Pointer#position(long)}. */ + public BoundedZCIS(long size) { super((Pointer)null); allocateArray(size); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public BoundedZCIS(Pointer p) { super(p); } + private native void allocate(); + private native void allocateArray(long size); + @Override public BoundedZCIS position(long position) { + return (BoundedZCIS)super.position(position); + } + + public native ZeroCopyInputStream zcis(); public native BoundedZCIS zcis(ZeroCopyInputStream setter); + public native @Name("limit") int _limit(); public native BoundedZCIS _limit(int setter); +} diff --git a/onnx/src/gen/java/org/bytedeco/onnx/CastMap_OnnxML_ver1.java b/onnx/src/gen/java/org/bytedeco/onnx/CastMap_OnnxML_ver1.java index 79615d00176..459f993550e 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/CastMap_OnnxML_ver1.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/CastMap_OnnxML_ver1.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Cast_Onnx_ver1.java b/onnx/src/gen/java/org/bytedeco/onnx/Cast_Onnx_ver1.java index fc70724aaaf..9e025e836ee 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Cast_Onnx_ver1.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Cast_Onnx_ver1.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Cast_Onnx_ver6.java b/onnx/src/gen/java/org/bytedeco/onnx/Cast_Onnx_ver6.java index 39b03be9258..e88dfa8408c 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Cast_Onnx_ver6.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Cast_Onnx_ver6.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Cast_Onnx_ver9.java b/onnx/src/gen/java/org/bytedeco/onnx/Cast_Onnx_ver9.java index 695fabc0410..ef2616673aa 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Cast_Onnx_ver9.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Cast_Onnx_ver9.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/CategoryMapper_OnnxML_ver1.java b/onnx/src/gen/java/org/bytedeco/onnx/CategoryMapper_OnnxML_ver1.java index 801ae5bafaa..65f0da52b77 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/CategoryMapper_OnnxML_ver1.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/CategoryMapper_OnnxML_ver1.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Ceil_Onnx_ver1.java b/onnx/src/gen/java/org/bytedeco/onnx/Ceil_Onnx_ver1.java index 8200e4a3a78..234627e9fec 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Ceil_Onnx_ver1.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Ceil_Onnx_ver1.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Ceil_Onnx_ver6.java b/onnx/src/gen/java/org/bytedeco/onnx/Ceil_Onnx_ver6.java index cda49da574b..74b61ece3ea 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Ceil_Onnx_ver6.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Ceil_Onnx_ver6.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/CheckerContext.java b/onnx/src/gen/java/org/bytedeco/onnx/CheckerContext.java index 16881717f0b..abd190c4389 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/CheckerContext.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/CheckerContext.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.onnx; @@ -32,10 +32,6 @@ public class CheckerContext extends Pointer { public native @Const ISchemaRegistry get_schema_registry(); - public native void set_func_registry(@Const IFunctionBuilderRegistry func_registry); - - public native @Const IFunctionBuilderRegistry get_func_registry(); - public native void set_model_dir(@StdString BytePointer model_dir); public native void set_model_dir(@StdString String model_dir); diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Clip_Onnx_ver1.java b/onnx/src/gen/java/org/bytedeco/onnx/Clip_Onnx_ver1.java index 485615c658a..11b1608aa71 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Clip_Onnx_ver1.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Clip_Onnx_ver1.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Clip_Onnx_ver6.java b/onnx/src/gen/java/org/bytedeco/onnx/Clip_Onnx_ver6.java index b3d20cbc57b..9568cf2b172 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Clip_Onnx_ver6.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Clip_Onnx_ver6.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/CodedInputStream.java b/onnx/src/gen/java/org/bytedeco/onnx/CodedInputStream.java index 9ac69e447c8..2368faf26c6 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/CodedInputStream.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/CodedInputStream.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.onnx; @@ -8,6 +8,7 @@ import static org.bytedeco.onnx.global.onnx.*; + @Namespace("google::protobuf::io") @Opaque @Properties(inherit = org.bytedeco.onnx.presets.onnx.class) public class CodedInputStream extends Pointer { /** Empty constructor. Calls {@code super((Pointer)null)}. */ diff --git a/onnx/src/gen/java/org/bytedeco/onnx/CodedOutputStream.java b/onnx/src/gen/java/org/bytedeco/onnx/CodedOutputStream.java index 741e6b1c02b..31dc4bcfa90 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/CodedOutputStream.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/CodedOutputStream.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/CommandLineInterface.java b/onnx/src/gen/java/org/bytedeco/onnx/CommandLineInterface.java index ae04f638eea..b1e1433ae8d 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/CommandLineInterface.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/CommandLineInterface.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Compress_Onnx_ver9.java b/onnx/src/gen/java/org/bytedeco/onnx/Compress_Onnx_ver9.java index 93f6b526e71..f7ebb80e51e 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Compress_Onnx_ver9.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Compress_Onnx_ver9.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Concat_Onnx_ver1.java b/onnx/src/gen/java/org/bytedeco/onnx/Concat_Onnx_ver1.java index a300cbe8f1e..8a920628a34 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Concat_Onnx_ver1.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Concat_Onnx_ver1.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Concat_Onnx_ver4.java b/onnx/src/gen/java/org/bytedeco/onnx/Concat_Onnx_ver4.java index 8c3b0fab4e0..20996afa1a1 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Concat_Onnx_ver4.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Concat_Onnx_ver4.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/ConstantOfShape_Onnx_ver9.java b/onnx/src/gen/java/org/bytedeco/onnx/ConstantOfShape_Onnx_ver9.java index 5cbd348c220..a622a3b4e20 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/ConstantOfShape_Onnx_ver9.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/ConstantOfShape_Onnx_ver9.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Constant_Onnx_ver1.java b/onnx/src/gen/java/org/bytedeco/onnx/Constant_Onnx_ver1.java index b59c1ea01c1..351036db81d 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Constant_Onnx_ver1.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Constant_Onnx_ver1.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Constant_Onnx_ver9.java b/onnx/src/gen/java/org/bytedeco/onnx/Constant_Onnx_ver9.java index 1cf53f2e2e3..3e6395b3f89 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Constant_Onnx_ver9.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Constant_Onnx_ver9.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/ConvInteger_Onnx_ver10.java b/onnx/src/gen/java/org/bytedeco/onnx/ConvInteger_Onnx_ver10.java new file mode 100644 index 00000000000..6e820860754 --- /dev/null +++ b/onnx/src/gen/java/org/bytedeco/onnx/ConvInteger_Onnx_ver10.java @@ -0,0 +1,17 @@ +// Targeted by JavaCPP version 1.5.1-SNAPSHOT: DO NOT EDIT THIS FILE + +package org.bytedeco.onnx; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +import static org.bytedeco.onnx.global.onnx.*; + +@Namespace("onnx") @Opaque @Properties(inherit = org.bytedeco.onnx.presets.onnx.class) +public class ConvInteger_Onnx_ver10 extends Pointer { + /** Empty constructor. Calls {@code super((Pointer)null)}. */ + public ConvInteger_Onnx_ver10() { super((Pointer)null); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public ConvInteger_Onnx_ver10(Pointer p) { super(p); } +} diff --git a/onnx/src/gen/java/org/bytedeco/onnx/ConvTranspose_Onnx_ver1.java b/onnx/src/gen/java/org/bytedeco/onnx/ConvTranspose_Onnx_ver1.java index b74643060ba..ca4bd26ca24 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/ConvTranspose_Onnx_ver1.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/ConvTranspose_Onnx_ver1.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Conv_Onnx_ver1.java b/onnx/src/gen/java/org/bytedeco/onnx/Conv_Onnx_ver1.java index 8d443bf7d3b..4a894b973b6 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Conv_Onnx_ver1.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Conv_Onnx_ver1.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/ConvertError.java b/onnx/src/gen/java/org/bytedeco/onnx/ConvertError.java index d91a9f7ca0e..bf784cb7625 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/ConvertError.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/ConvertError.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Cos_Onnx_ver7.java b/onnx/src/gen/java/org/bytedeco/onnx/Cos_Onnx_ver7.java index d835c818e5b..6b3d7b48e1f 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Cos_Onnx_ver7.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Cos_Onnx_ver7.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Cosh_Onnx_ver9.java b/onnx/src/gen/java/org/bytedeco/onnx/Cosh_Onnx_ver9.java index f869cdb2e72..27f1731fb7b 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Cosh_Onnx_ver9.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Cosh_Onnx_ver9.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/CountBasedPassAnalysis.java b/onnx/src/gen/java/org/bytedeco/onnx/CountBasedPassAnalysis.java index 4fab5056582..7e158ca077c 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/CountBasedPassAnalysis.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/CountBasedPassAnalysis.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/DataTypeSet.java b/onnx/src/gen/java/org/bytedeco/onnx/DataTypeSet.java index 048bea8a226..d850b712a4f 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/DataTypeSet.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/DataTypeSet.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/DataTypeUtils.java b/onnx/src/gen/java/org/bytedeco/onnx/DataTypeUtils.java index 09882ba799e..83d76ebadc5 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/DataTypeUtils.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/DataTypeUtils.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/DbgOperatorSetTracker.java b/onnx/src/gen/java/org/bytedeco/onnx/DbgOperatorSetTracker.java index bea19c11b24..132371df193 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/DbgOperatorSetTracker.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/DbgOperatorSetTracker.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/DebugStringOptions.java b/onnx/src/gen/java/org/bytedeco/onnx/DebugStringOptions.java index a102c6bde5d..e880d3547f6 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/DebugStringOptions.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/DebugStringOptions.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/DefaultVersionConverter.java b/onnx/src/gen/java/org/bytedeco/onnx/DefaultVersionConverter.java index 9dc07173ae0..3c8ee6ac9fd 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/DefaultVersionConverter.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/DefaultVersionConverter.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/DepthToSpace_Onnx_ver1.java b/onnx/src/gen/java/org/bytedeco/onnx/DepthToSpace_Onnx_ver1.java index 96b7eb848dc..c304f386c73 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/DepthToSpace_Onnx_ver1.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/DepthToSpace_Onnx_ver1.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/DequantizeLinear_Onnx_ver10.java b/onnx/src/gen/java/org/bytedeco/onnx/DequantizeLinear_Onnx_ver10.java new file mode 100644 index 00000000000..183b4b886b9 --- /dev/null +++ b/onnx/src/gen/java/org/bytedeco/onnx/DequantizeLinear_Onnx_ver10.java @@ -0,0 +1,17 @@ +// Targeted by JavaCPP version 1.5.1-SNAPSHOT: DO NOT EDIT THIS FILE + +package org.bytedeco.onnx; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +import static org.bytedeco.onnx.global.onnx.*; + +@Namespace("onnx") @Opaque @Properties(inherit = org.bytedeco.onnx.presets.onnx.class) +public class DequantizeLinear_Onnx_ver10 extends Pointer { + /** Empty constructor. Calls {@code super((Pointer)null)}. */ + public DequantizeLinear_Onnx_ver10() { super((Pointer)null); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public DequantizeLinear_Onnx_ver10(Pointer p) { super(p); } +} diff --git a/onnx/src/gen/java/org/bytedeco/onnx/DescriptorBuilder.java b/onnx/src/gen/java/org/bytedeco/onnx/DescriptorBuilder.java index bab47c523ac..b625ef8267c 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/DescriptorBuilder.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/DescriptorBuilder.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/DescriptorDatabase.java b/onnx/src/gen/java/org/bytedeco/onnx/DescriptorDatabase.java index 68bfbb8c947..8c4f1b8f255 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/DescriptorDatabase.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/DescriptorDatabase.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/DescriptorPool.java b/onnx/src/gen/java/org/bytedeco/onnx/DescriptorPool.java index 6a4dddc6da8..181392887dd 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/DescriptorPool.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/DescriptorPool.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/DescriptorProto.java b/onnx/src/gen/java/org/bytedeco/onnx/DescriptorProto.java index 10a8a8215a3..f5a144dd7f8 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/DescriptorProto.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/DescriptorProto.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/DescriptorProto_ExtensionRange.java b/onnx/src/gen/java/org/bytedeco/onnx/DescriptorProto_ExtensionRange.java index ba21316fb6c..f2f94801da0 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/DescriptorProto_ExtensionRange.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/DescriptorProto_ExtensionRange.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/DescriptorTest.java b/onnx/src/gen/java/org/bytedeco/onnx/DescriptorTest.java index 9059ef433b4..6e84fb8a06f 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/DescriptorTest.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/DescriptorTest.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/DictVectorizer_OnnxML_ver1.java b/onnx/src/gen/java/org/bytedeco/onnx/DictVectorizer_OnnxML_ver1.java index 08b946e58c6..531eaa3f126 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/DictVectorizer_OnnxML_ver1.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/DictVectorizer_OnnxML_ver1.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Dimension.java b/onnx/src/gen/java/org/bytedeco/onnx/Dimension.java index fe12f5fd9f7..f12aa90e288 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Dimension.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Dimension.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.onnx; @@ -64,16 +64,19 @@ public class Dimension extends MessageLite { public native @Cast("bool") boolean IsInitialized(); public native @Cast("size_t") long ByteSizeLong(); +// #if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER +// #else public native @Cast("bool") boolean MergePartialFromCodedStream( CodedInputStream input); +// #endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER public native void SerializeWithCachedSizes( CodedOutputStream output); public native @Cast("google::protobuf::uint8*") BytePointer InternalSerializeWithCachedSizesToArray( - @Cast("bool") boolean deterministic, @Cast("google::protobuf::uint8*") BytePointer target); + @Cast("google::protobuf::uint8*") BytePointer target); public native @Cast("google::protobuf::uint8*") ByteBuffer InternalSerializeWithCachedSizesToArray( - @Cast("bool") boolean deterministic, @Cast("google::protobuf::uint8*") ByteBuffer target); + @Cast("google::protobuf::uint8*") ByteBuffer target); public native @Cast("google::protobuf::uint8*") byte[] InternalSerializeWithCachedSizesToArray( - @Cast("bool") boolean deterministic, @Cast("google::protobuf::uint8*") byte[] target); + @Cast("google::protobuf::uint8*") byte[] target); public native int GetCachedSize(); public native @ByVal @Cast("google::protobuf::Metadata*") Pointer GetMetadata(); diff --git a/onnx/src/gen/java/org/bytedeco/onnx/DimensionIR.java b/onnx/src/gen/java/org/bytedeco/onnx/DimensionIR.java index 9270af8a7af..aed8b28d9c4 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/DimensionIR.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/DimensionIR.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Div_Onnx_ver1.java b/onnx/src/gen/java/org/bytedeco/onnx/Div_Onnx_ver1.java index d3802ce8385..7ee0f9820e6 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Div_Onnx_ver1.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Div_Onnx_ver1.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Div_Onnx_ver6.java b/onnx/src/gen/java/org/bytedeco/onnx/Div_Onnx_ver6.java index 21eeae6e6ef..d93915ca827 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Div_Onnx_ver6.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Div_Onnx_ver6.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Div_Onnx_ver7.java b/onnx/src/gen/java/org/bytedeco/onnx/Div_Onnx_ver7.java index 66d7f60925a..0a4802d9b1b 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Div_Onnx_ver7.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Div_Onnx_ver7.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Dropout_Onnx_ver1.java b/onnx/src/gen/java/org/bytedeco/onnx/Dropout_Onnx_ver1.java index 29f39b09580..339e4fc64a0 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Dropout_Onnx_ver1.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Dropout_Onnx_ver1.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Dropout_Onnx_ver10.java b/onnx/src/gen/java/org/bytedeco/onnx/Dropout_Onnx_ver10.java new file mode 100644 index 00000000000..3f65946678c --- /dev/null +++ b/onnx/src/gen/java/org/bytedeco/onnx/Dropout_Onnx_ver10.java @@ -0,0 +1,17 @@ +// Targeted by JavaCPP version 1.5.1-SNAPSHOT: DO NOT EDIT THIS FILE + +package org.bytedeco.onnx; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +import static org.bytedeco.onnx.global.onnx.*; + +@Namespace("onnx") @Opaque @Properties(inherit = org.bytedeco.onnx.presets.onnx.class) +public class Dropout_Onnx_ver10 extends Pointer { + /** Empty constructor. Calls {@code super((Pointer)null)}. */ + public Dropout_Onnx_ver10() { super((Pointer)null); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public Dropout_Onnx_ver10(Pointer p) { super(p); } +} diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Dropout_Onnx_ver6.java b/onnx/src/gen/java/org/bytedeco/onnx/Dropout_Onnx_ver6.java index b98708fbf64..2fceb8a07dd 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Dropout_Onnx_ver6.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Dropout_Onnx_ver6.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Dropout_Onnx_ver7.java b/onnx/src/gen/java/org/bytedeco/onnx/Dropout_Onnx_ver7.java index 3262fe499ab..7c3e5e625d7 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Dropout_Onnx_ver7.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Dropout_Onnx_ver7.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Elu_Onnx_ver1.java b/onnx/src/gen/java/org/bytedeco/onnx/Elu_Onnx_ver1.java index dc1c166086e..6d03914f163 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Elu_Onnx_ver1.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Elu_Onnx_ver1.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Elu_Onnx_ver6.java b/onnx/src/gen/java/org/bytedeco/onnx/Elu_Onnx_ver6.java index 6383945affd..6726f0936fb 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Elu_Onnx_ver6.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Elu_Onnx_ver6.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/EnumDescriptor.java b/onnx/src/gen/java/org/bytedeco/onnx/EnumDescriptor.java index b108df1ca06..9bb3aaf4782 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/EnumDescriptor.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/EnumDescriptor.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.onnx; @@ -18,6 +18,7 @@ public class EnumDescriptor extends Pointer { /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public EnumDescriptor(Pointer p) { super(p); } + // The name of this enum type in the containing scope. public native @StdString BytePointer name(); @@ -50,8 +51,8 @@ public class EnumDescriptor extends Pointer { // Get options for this enum type. These are specified in the .proto file by // placing lines like "option foo = 1234;" in the enum definition. Allowed - // options are defined by EnumOptions in google/protobuf/descriptor.proto, - // and any available extensions of that message. + // options are defined by EnumOptions in descriptor.proto, and any available + // extensions of that message. public native @Const @ByRef EnumOptions options(); // See Descriptor::CopyTo(). diff --git a/onnx/src/gen/java/org/bytedeco/onnx/EnumDescriptorProto.java b/onnx/src/gen/java/org/bytedeco/onnx/EnumDescriptorProto.java index 5b2a06300c9..42b46f461c3 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/EnumDescriptorProto.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/EnumDescriptorProto.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/EnumOptions.java b/onnx/src/gen/java/org/bytedeco/onnx/EnumOptions.java index f6818dd21e3..8e657ec5bfa 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/EnumOptions.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/EnumOptions.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/EnumValueDescriptor.java b/onnx/src/gen/java/org/bytedeco/onnx/EnumValueDescriptor.java index 10bc8fab28e..742efb14978 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/EnumValueDescriptor.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/EnumValueDescriptor.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.onnx; @@ -20,6 +20,7 @@ public class EnumValueDescriptor extends Pointer { /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public EnumValueDescriptor(Pointer p) { super(p); } + public native @StdString BytePointer name(); // Name of this enum constant. public native int index(); // Index within the enums's Descriptor. public native int number(); // Numeric value of this enum constant. @@ -36,11 +37,10 @@ public class EnumValueDescriptor extends Pointer { // The type of this value. Never NULL. public native @Const EnumDescriptor type(); - // Get options for this enum value. These are specified in the .proto file - // by adding text like "[foo = 1234]" after an enum value definition. - // Allowed options are defined by EnumValueOptions in - // google/protobuf/descriptor.proto, and any available extensions of that - // message. + // Get options for this enum value. These are specified in the .proto file by + // adding text like "[foo = 1234]" after an enum value definition. Allowed + // options are defined by EnumValueOptions in descriptor.proto, and any + // available extensions of that message. public native @Const @ByRef EnumValueOptions options(); // See Descriptor::CopyTo(). diff --git a/onnx/src/gen/java/org/bytedeco/onnx/EnumValueDescriptorProto.java b/onnx/src/gen/java/org/bytedeco/onnx/EnumValueDescriptorProto.java index dacd495b847..07d61f0787c 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/EnumValueDescriptorProto.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/EnumValueDescriptorProto.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/EnumValueOptions.java b/onnx/src/gen/java/org/bytedeco/onnx/EnumValueOptions.java index 374a1f790c9..273a1b85ff6 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/EnumValueOptions.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/EnumValueOptions.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Equal_Onnx_ver1.java b/onnx/src/gen/java/org/bytedeco/onnx/Equal_Onnx_ver1.java index 33833ecb84e..3edc72a6c81 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Equal_Onnx_ver1.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Equal_Onnx_ver1.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Equal_Onnx_ver7.java b/onnx/src/gen/java/org/bytedeco/onnx/Equal_Onnx_ver7.java index 0f702f3b5f9..7e34b559d7f 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Equal_Onnx_ver7.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Equal_Onnx_ver7.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Erf_Onnx_ver9.java b/onnx/src/gen/java/org/bytedeco/onnx/Erf_Onnx_ver9.java index abebd609373..8d46a447fda 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Erf_Onnx_ver9.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Erf_Onnx_ver9.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Exp_Onnx_ver1.java b/onnx/src/gen/java/org/bytedeco/onnx/Exp_Onnx_ver1.java index 39f5db9bc82..018726a30cb 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Exp_Onnx_ver1.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Exp_Onnx_ver1.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Exp_Onnx_ver6.java b/onnx/src/gen/java/org/bytedeco/onnx/Exp_Onnx_ver6.java index 6024a75f6fa..421aba43764 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Exp_Onnx_ver6.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Exp_Onnx_ver6.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Expand_Onnx_ver8.java b/onnx/src/gen/java/org/bytedeco/onnx/Expand_Onnx_ver8.java index 7b312a8c911..283458bb8ea 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Expand_Onnx_ver8.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Expand_Onnx_ver8.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/ExtensionRangeOptions.java b/onnx/src/gen/java/org/bytedeco/onnx/ExtensionRangeOptions.java index ce4da46ca0a..f817d9cfb99 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/ExtensionRangeOptions.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/ExtensionRangeOptions.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/EyeLike_Onnx_ver9.java b/onnx/src/gen/java/org/bytedeco/onnx/EyeLike_Onnx_ver9.java index 141778eb068..0837e64cfcb 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/EyeLike_Onnx_ver9.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/EyeLike_Onnx_ver9.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/FeatureVectorizer_OnnxML_ver1.java b/onnx/src/gen/java/org/bytedeco/onnx/FeatureVectorizer_OnnxML_ver1.java index 8f581b3aa7b..a230f6030eb 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/FeatureVectorizer_OnnxML_ver1.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/FeatureVectorizer_OnnxML_ver1.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/FieldDescriptor.java b/onnx/src/gen/java/org/bytedeco/onnx/FieldDescriptor.java index 13876fdc271..26b5325d458 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/FieldDescriptor.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/FieldDescriptor.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.onnx; @@ -28,6 +28,7 @@ public class FieldDescriptor extends Pointer { /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public FieldDescriptor(Pointer p) { super(p); } + // Identifies a field type. 0 is reserved for errors. The order is weird // for historical reasons. Types 12 and up are new in proto2. /** enum google::protobuf::FieldDescriptor::Type */ @@ -213,9 +214,8 @@ public class FieldDescriptor extends Pointer { // Get the FieldOptions for this field. This includes things listed in // square brackets after the field definition. E.g., the field: // optional string text = 1 [ctype=CORD]; - // has the "ctype" option set. Allowed options are defined by FieldOptions - // in google/protobuf/descriptor.proto, and any available extensions of that - // message. + // has the "ctype" option set. Allowed options are defined by FieldOptions in + // descriptor.proto, and any available extensions of that message. public native @Const @ByRef FieldOptions options(); // See Descriptor::CopyTo(). diff --git a/onnx/src/gen/java/org/bytedeco/onnx/FieldDescriptorProto.java b/onnx/src/gen/java/org/bytedeco/onnx/FieldDescriptorProto.java index 6bb57ac4377..373ffa09b32 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/FieldDescriptorProto.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/FieldDescriptorProto.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/FieldOptions.java b/onnx/src/gen/java/org/bytedeco/onnx/FieldOptions.java index 6ed4ba5d7c1..5e27ce02ebe 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/FieldOptions.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/FieldOptions.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/FileDescriptor.java b/onnx/src/gen/java/org/bytedeco/onnx/FileDescriptor.java index 869bff58cb1..e10c732be20 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/FileDescriptor.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/FileDescriptor.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.onnx; @@ -19,8 +19,9 @@ public class FileDescriptor extends Pointer { /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public FileDescriptor(Pointer p) { super(p); } + // The filename, relative to the source tree. - // e.g. "google/protobuf/descriptor.proto" + // e.g. "foo/bar/baz.proto" public native @StdString BytePointer name(); // The package, e.g. "google.protobuf.compiler". @@ -82,8 +83,7 @@ public class FileDescriptor extends Pointer { // Get options for this file. These are specified in the .proto file by // placing lines like "option foo = 1234;" at the top level, outside of any // other definitions. Allowed options are defined by FileOptions in - // google/protobuf/descriptor.proto, and any available extensions of that - // message. + // descriptor.proto, and any available extensions of that message. public native @Const @ByRef FileOptions options(); // Syntax of this file. diff --git a/onnx/src/gen/java/org/bytedeco/onnx/FileDescriptorProto.java b/onnx/src/gen/java/org/bytedeco/onnx/FileDescriptorProto.java index ee899e59db6..58bb5c212ab 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/FileDescriptorProto.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/FileDescriptorProto.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/FileDescriptorTables.java b/onnx/src/gen/java/org/bytedeco/onnx/FileDescriptorTables.java index c6ef8f14ec7..9c36a560152 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/FileDescriptorTables.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/FileDescriptorTables.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/FileOptions.java b/onnx/src/gen/java/org/bytedeco/onnx/FileOptions.java index e77a95debac..2caae2bdf99 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/FileOptions.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/FileOptions.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Flatten_Onnx_ver1.java b/onnx/src/gen/java/org/bytedeco/onnx/Flatten_Onnx_ver1.java index a66d4e94ea6..318d5e13461 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Flatten_Onnx_ver1.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Flatten_Onnx_ver1.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Flatten_Onnx_ver9.java b/onnx/src/gen/java/org/bytedeco/onnx/Flatten_Onnx_ver9.java index 3bab9af5e5d..8308641bccb 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Flatten_Onnx_ver9.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Flatten_Onnx_ver9.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/FloatVector.java b/onnx/src/gen/java/org/bytedeco/onnx/FloatVector.java index cd1f2f168b6..0d560dd358b 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/FloatVector.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/FloatVector.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Floor_Onnx_ver1.java b/onnx/src/gen/java/org/bytedeco/onnx/Floor_Onnx_ver1.java index 6905d8cf65f..d586a53cab6 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Floor_Onnx_ver1.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Floor_Onnx_ver1.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Floor_Onnx_ver6.java b/onnx/src/gen/java/org/bytedeco/onnx/Floor_Onnx_ver6.java index 222437417ef..83572ec8791 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Floor_Onnx_ver6.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Floor_Onnx_ver6.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/FormalParameterVector.java b/onnx/src/gen/java/org/bytedeco/onnx/FormalParameterVector.java index e33d85bb551..c75e22dd79e 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/FormalParameterVector.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/FormalParameterVector.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Formatter.java b/onnx/src/gen/java/org/bytedeco/onnx/Formatter.java new file mode 100644 index 00000000000..52c619fbae9 --- /dev/null +++ b/onnx/src/gen/java/org/bytedeco/onnx/Formatter.java @@ -0,0 +1,18 @@ +// Targeted by JavaCPP version 1.5.1-SNAPSHOT: DO NOT EDIT THIS FILE + +package org.bytedeco.onnx; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +import static org.bytedeco.onnx.global.onnx.*; + +// Defined in helpers.h +@Namespace("google::protobuf::compiler::cpp") @Opaque @Properties(inherit = org.bytedeco.onnx.presets.onnx.class) +public class Formatter extends Pointer { + /** Empty constructor. Calls {@code super((Pointer)null)}. */ + public Formatter() { super((Pointer)null); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public Formatter(Pointer p) { super(p); } +} diff --git a/onnx/src/gen/java/org/bytedeco/onnx/FunctionBodyHelper.java b/onnx/src/gen/java/org/bytedeco/onnx/FunctionBodyHelper.java new file mode 100644 index 00000000000..e525145665f --- /dev/null +++ b/onnx/src/gen/java/org/bytedeco/onnx/FunctionBodyHelper.java @@ -0,0 +1,117 @@ +// Targeted by JavaCPP version 1.5.1-SNAPSHOT: DO NOT EDIT THIS FILE + +package org.bytedeco.onnx; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +import static org.bytedeco.onnx.global.onnx.*; + + +@Namespace("onnx") @Properties(inherit = org.bytedeco.onnx.presets.onnx.class) +public class FunctionBodyHelper extends Pointer { + static { Loader.load(); } + /** Default native constructor. */ + public FunctionBodyHelper() { super((Pointer)null); allocate(); } + /** Native array allocator. Access with {@link Pointer#position(long)}. */ + public FunctionBodyHelper(long size) { super((Pointer)null); allocateArray(size); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public FunctionBodyHelper(Pointer p) { super(p); } + private native void allocate(); + private native void allocateArray(long size); + @Override public FunctionBodyHelper position(long position) { + return (FunctionBodyHelper)super.position(position); + } + + @NoOffset public static class AttributeProtoWrapper extends Pointer { + static { Loader.load(); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public AttributeProtoWrapper(Pointer p) { super(p); } + /** Native array allocator. Access with {@link Pointer#position(long)}. */ + public AttributeProtoWrapper(long size) { super((Pointer)null); allocateArray(size); } + private native void allocateArray(long size); + @Override public AttributeProtoWrapper position(long position) { + return (AttributeProtoWrapper)super.position(position); + } + + public native @ByRef AttributeProto proto(); public native AttributeProtoWrapper proto(AttributeProto setter); + + public AttributeProtoWrapper() { super((Pointer)null); allocate(); } + private native void allocate(); + + public AttributeProtoWrapper(@Const @ByRef AttributeProto attr_prot) { super((Pointer)null); allocate(attr_prot); } + private native void allocate(@Const @ByRef AttributeProto attr_prot); + } + + @NoOffset public static class NodeDef extends Pointer { + static { Loader.load(); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public NodeDef(Pointer p) { super(p); } + + public NodeDef( + @Const @ByRef StringVector outputs, + @StdString BytePointer op_type, + @Const @ByRef StringVector inputs) { super((Pointer)null); allocate(outputs, op_type, inputs); } + private native void allocate( + @Const @ByRef StringVector outputs, + @StdString BytePointer op_type, + @Const @ByRef StringVector inputs); + public NodeDef( + @Const @ByRef StringVector outputs, + @StdString String op_type, + @Const @ByRef StringVector inputs) { super((Pointer)null); allocate(outputs, op_type, inputs); } + private native void allocate( + @Const @ByRef StringVector outputs, + @StdString String op_type, + @Const @ByRef StringVector inputs); + + public NodeDef( + @Const @ByRef StringVector outputs, + @StdString BytePointer op_type, + @Const @ByRef StringVector inputs, + @StdVector AttributeProtoWrapper attributes) { super((Pointer)null); allocate(outputs, op_type, inputs, attributes); } + private native void allocate( + @Const @ByRef StringVector outputs, + @StdString BytePointer op_type, + @Const @ByRef StringVector inputs, + @StdVector AttributeProtoWrapper attributes); + public NodeDef( + @Const @ByRef StringVector outputs, + @StdString String op_type, + @Const @ByRef StringVector inputs, + @StdVector AttributeProtoWrapper attributes) { super((Pointer)null); allocate(outputs, op_type, inputs, attributes); } + private native void allocate( + @Const @ByRef StringVector outputs, + @StdString String op_type, + @Const @ByRef StringVector inputs, + @StdVector AttributeProtoWrapper attributes); + + public native @ByRef StringVector outputs(); public native NodeDef outputs(StringVector setter); + public native @StdString BytePointer op_type(); public native NodeDef op_type(BytePointer setter); + public native @ByRef StringVector inputs(); public native NodeDef inputs(StringVector setter); + public native @StdVector AttributeProtoWrapper attributes(); public native NodeDef attributes(AttributeProtoWrapper setter); + } + + /* + BuildNodes() is an utility function for easily define a Function Body. + + To build a simple node: + {{"Z"}, "Add", {"X", "Y"}} represents Z = Add(X,Y) + + To build a node with attribute: + {{"Y"}, "Concat", {"X1", "X2", "X3"}, {{"axis", 1}}} + represents Y = Concat(X1,X2,X3) with axis = 1 + The attribute type are infered from the attribute value's c++ type + Supported value types are + int64_t -> int, vector -> ints + float -> float, vector -> floats + string -> string, vector ->strings + For refering an attribute from parent, use: + {MakeRefAttribute("axes", AttributeProto::INTS)}} + + For more examples, please find the references of this function + */ + public static native @StdVector NodeProto BuildNodes( + @StdVector NodeDef node_defs); +} diff --git a/onnx/src/gen/java/org/bytedeco/onnx/FunctionBuilder.java b/onnx/src/gen/java/org/bytedeco/onnx/FunctionBuilder.java deleted file mode 100644 index 2d78208b71b..00000000000 --- a/onnx/src/gen/java/org/bytedeco/onnx/FunctionBuilder.java +++ /dev/null @@ -1,32 +0,0 @@ -// Targeted by JavaCPP version 1.5: DO NOT EDIT THIS FILE - -package org.bytedeco.onnx; - -import java.nio.*; -import org.bytedeco.javacpp.*; -import org.bytedeco.javacpp.annotation.*; - -import static org.bytedeco.onnx.global.onnx.*; - - -@Namespace("onnx") @Properties(inherit = org.bytedeco.onnx.presets.onnx.class) -public class FunctionBuilder extends Pointer { - static { Loader.load(); } - /** Default native constructor. */ - public FunctionBuilder() { super((Pointer)null); allocate(); } - /** Native array allocator. Access with {@link Pointer#position(long)}. */ - public FunctionBuilder(long size) { super((Pointer)null); allocateArray(size); } - /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ - public FunctionBuilder(Pointer p) { super(p); } - private native void allocate(); - private native void allocateArray(long size); - @Override public FunctionBuilder position(long position) { - return (FunctionBuilder)super.position(position); - } - - public native @ByRef FunctionBuilder SetDomain(@StdString BytePointer domain); - public native @ByRef FunctionBuilder SetDomain(@StdString String domain); - public native @StdString BytePointer GetDomain(); - public native @ByRef FunctionBuilder SetBuildFunction(@Cast("onnx::BuildFunction") Status build_func); - public native @Cast("onnx::BuildFunction") Status GetBuildFunction(); -} diff --git a/onnx/src/gen/java/org/bytedeco/onnx/FunctionBuilderRegistry.java b/onnx/src/gen/java/org/bytedeco/onnx/FunctionBuilderRegistry.java deleted file mode 100644 index 19d8bf97aa3..00000000000 --- a/onnx/src/gen/java/org/bytedeco/onnx/FunctionBuilderRegistry.java +++ /dev/null @@ -1,47 +0,0 @@ -// Targeted by JavaCPP version 1.5: DO NOT EDIT THIS FILE - -package org.bytedeco.onnx; - -import java.nio.*; -import org.bytedeco.javacpp.*; -import org.bytedeco.javacpp.annotation.*; - -import static org.bytedeco.onnx.global.onnx.*; - - -@Namespace("onnx") @NoOffset @Properties(inherit = org.bytedeco.onnx.presets.onnx.class) -public class FunctionBuilderRegistry extends IFunctionBuilderRegistry { - static { Loader.load(); } - /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ - public FunctionBuilderRegistry(Pointer p) { super(p); } - /** Native array allocator. Access with {@link Pointer#position(long)}. */ - public FunctionBuilderRegistry(long size) { super((Pointer)null); allocateArray(size); } - private native void allocateArray(long size); - @Override public FunctionBuilderRegistry position(long position) { - return (FunctionBuilderRegistry)super.position(position); - } - - public FunctionBuilderRegistry() { super((Pointer)null); allocate(); } - private native void allocate(); - - public native @ByVal Status Register(@Const @ByRef FunctionBuilder function_builder); - - // Get functions for specific domain. - - public native @Const FunctionProto GetFunction( - @StdString BytePointer func_name, - int maxInclusiveVersion, - @StdString BytePointer domain/*=ONNX_DOMAIN*/); - public native @Const FunctionProto GetFunction( - @StdString BytePointer func_name, - int maxInclusiveVersion); - public native @Const FunctionProto GetFunction( - @StdString String func_name, - int maxInclusiveVersion, - @StdString String domain/*=ONNX_DOMAIN*/); - public native @Const FunctionProto GetFunction( - @StdString String func_name, - int maxInclusiveVersion); - - public static native @ByRef FunctionBuilderRegistry OnnxInstance(); -} diff --git a/onnx/src/gen/java/org/bytedeco/onnx/FunctionProto.java b/onnx/src/gen/java/org/bytedeco/onnx/FunctionProto.java index ba364f5b1fc..a2e86b5d793 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/FunctionProto.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/FunctionProto.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.onnx; @@ -58,16 +58,19 @@ public class FunctionProto extends MessageLite { public native @Cast("bool") boolean IsInitialized(); public native @Cast("size_t") long ByteSizeLong(); +// #if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER +// #else public native @Cast("bool") boolean MergePartialFromCodedStream( CodedInputStream input); +// #endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER public native void SerializeWithCachedSizes( CodedOutputStream output); public native @Cast("google::protobuf::uint8*") BytePointer InternalSerializeWithCachedSizesToArray( - @Cast("bool") boolean deterministic, @Cast("google::protobuf::uint8*") BytePointer target); + @Cast("google::protobuf::uint8*") BytePointer target); public native @Cast("google::protobuf::uint8*") ByteBuffer InternalSerializeWithCachedSizesToArray( - @Cast("bool") boolean deterministic, @Cast("google::protobuf::uint8*") ByteBuffer target); + @Cast("google::protobuf::uint8*") ByteBuffer target); public native @Cast("google::protobuf::uint8*") byte[] InternalSerializeWithCachedSizesToArray( - @Cast("bool") boolean deterministic, @Cast("google::protobuf::uint8*") byte[] target); + @Cast("google::protobuf::uint8*") byte[] target); public native int GetCachedSize(); public native @ByVal @Cast("google::protobuf::Metadata*") Pointer GetMetadata(); diff --git a/onnx/src/gen/java/org/bytedeco/onnx/FunctionProtoDefaultTypeInternal.java b/onnx/src/gen/java/org/bytedeco/onnx/FunctionProtoDefaultTypeInternal.java index 5cd5704077d..44b315df315 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/FunctionProtoDefaultTypeInternal.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/FunctionProtoDefaultTypeInternal.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.onnx; @@ -7,7 +7,7 @@ import org.bytedeco.javacpp.annotation.*; import static org.bytedeco.onnx.global.onnx.*; - // namespace protobuf_onnx_2fonnx_2doperators_2dml_2eproto + @Namespace("onnx") @Opaque @Properties(inherit = org.bytedeco.onnx.presets.onnx.class) public class FunctionProtoDefaultTypeInternal extends Pointer { /** Empty constructor. Calls {@code super((Pointer)null)}. */ diff --git a/onnx/src/gen/java/org/bytedeco/onnx/GRU_Onnx_ver1.java b/onnx/src/gen/java/org/bytedeco/onnx/GRU_Onnx_ver1.java index edc6ea15fb4..d80dd1cf993 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/GRU_Onnx_ver1.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/GRU_Onnx_ver1.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/GRU_Onnx_ver3.java b/onnx/src/gen/java/org/bytedeco/onnx/GRU_Onnx_ver3.java index 6b7e6f92b94..d1df74cd4a9 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/GRU_Onnx_ver3.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/GRU_Onnx_ver3.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/GRU_Onnx_ver7.java b/onnx/src/gen/java/org/bytedeco/onnx/GRU_Onnx_ver7.java index 383e0acd509..7db939023fc 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/GRU_Onnx_ver7.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/GRU_Onnx_ver7.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Gather_Onnx_ver1.java b/onnx/src/gen/java/org/bytedeco/onnx/Gather_Onnx_ver1.java index 4fb7647d403..9572ace5e79 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Gather_Onnx_ver1.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Gather_Onnx_ver1.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Gemm_Onnx_ver1.java b/onnx/src/gen/java/org/bytedeco/onnx/Gemm_Onnx_ver1.java index 5c894f31c9e..232d8d3f648 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Gemm_Onnx_ver1.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Gemm_Onnx_ver1.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Gemm_Onnx_ver6.java b/onnx/src/gen/java/org/bytedeco/onnx/Gemm_Onnx_ver6.java index 7295aefcc2b..3fb915e880c 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Gemm_Onnx_ver6.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Gemm_Onnx_ver6.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Gemm_Onnx_ver7.java b/onnx/src/gen/java/org/bytedeco/onnx/Gemm_Onnx_ver7.java index 4d37030f809..b280c4b09fa 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Gemm_Onnx_ver7.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Gemm_Onnx_ver7.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Gemm_Onnx_ver9.java b/onnx/src/gen/java/org/bytedeco/onnx/Gemm_Onnx_ver9.java index 0dc18626e43..65708e55b20 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Gemm_Onnx_ver9.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Gemm_Onnx_ver9.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/GeneratedMessageReflection.java b/onnx/src/gen/java/org/bytedeco/onnx/GeneratedMessageReflection.java index f974a9f1f91..94bc9f2b0e6 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/GeneratedMessageReflection.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/GeneratedMessageReflection.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/GlobalAveragePool_Onnx_ver1.java b/onnx/src/gen/java/org/bytedeco/onnx/GlobalAveragePool_Onnx_ver1.java index 6545f0921e3..b5f723f4861 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/GlobalAveragePool_Onnx_ver1.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/GlobalAveragePool_Onnx_ver1.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/GlobalLpPool_Onnx_ver1.java b/onnx/src/gen/java/org/bytedeco/onnx/GlobalLpPool_Onnx_ver1.java index 1d8394482e6..af861c461c9 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/GlobalLpPool_Onnx_ver1.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/GlobalLpPool_Onnx_ver1.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/GlobalLpPool_Onnx_ver2.java b/onnx/src/gen/java/org/bytedeco/onnx/GlobalLpPool_Onnx_ver2.java index fb3e9d46c2a..ae9b805abef 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/GlobalLpPool_Onnx_ver2.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/GlobalLpPool_Onnx_ver2.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/GlobalMaxPool_Onnx_ver1.java b/onnx/src/gen/java/org/bytedeco/onnx/GlobalMaxPool_Onnx_ver1.java index 5d1a5c5b16f..fa685b85741 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/GlobalMaxPool_Onnx_ver1.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/GlobalMaxPool_Onnx_ver1.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/GlobalPassRegistry.java b/onnx/src/gen/java/org/bytedeco/onnx/GlobalPassRegistry.java index c8759c4ccd2..e6f669b42b2 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/GlobalPassRegistry.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/GlobalPassRegistry.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Graph.java b/onnx/src/gen/java/org/bytedeco/onnx/Graph.java index 140ea457a91..74c15f9cf9b 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Graph.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Graph.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/GraphProto.java b/onnx/src/gen/java/org/bytedeco/onnx/GraphProto.java index 16821922b40..c09fa8faeb5 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/GraphProto.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/GraphProto.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.onnx; @@ -58,16 +58,19 @@ public class GraphProto extends MessageLite { public native @Cast("bool") boolean IsInitialized(); public native @Cast("size_t") long ByteSizeLong(); +// #if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER +// #else public native @Cast("bool") boolean MergePartialFromCodedStream( CodedInputStream input); +// #endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER public native void SerializeWithCachedSizes( CodedOutputStream output); public native @Cast("google::protobuf::uint8*") BytePointer InternalSerializeWithCachedSizesToArray( - @Cast("bool") boolean deterministic, @Cast("google::protobuf::uint8*") BytePointer target); + @Cast("google::protobuf::uint8*") BytePointer target); public native @Cast("google::protobuf::uint8*") ByteBuffer InternalSerializeWithCachedSizesToArray( - @Cast("bool") boolean deterministic, @Cast("google::protobuf::uint8*") ByteBuffer target); + @Cast("google::protobuf::uint8*") ByteBuffer target); public native @Cast("google::protobuf::uint8*") byte[] InternalSerializeWithCachedSizesToArray( - @Cast("bool") boolean deterministic, @Cast("google::protobuf::uint8*") byte[] target); + @Cast("google::protobuf::uint8*") byte[] target); public native int GetCachedSize(); public native @ByVal @Cast("google::protobuf::Metadata*") Pointer GetMetadata(); @@ -121,6 +124,15 @@ public native void SerializeWithCachedSizes( public native @Const @ByRef ValueInfoProto value_info(int index); public native ValueInfoProto add_value_info(); + // repeated .onnx.TensorAnnotation quantization_annotation = 14; + public native int quantization_annotation_size(); + public native void clear_quantization_annotation(); + @MemberGetter public static native int kQuantizationAnnotationFieldNumber(); + public static final int kQuantizationAnnotationFieldNumber = kQuantizationAnnotationFieldNumber(); + public native TensorAnnotation mutable_quantization_annotation(int index); + public native @Const @ByRef TensorAnnotation quantization_annotation(int index); + public native TensorAnnotation add_quantization_annotation(); + // optional string name = 2; public native @Cast("bool") boolean has_name(); public native void clear_name(); diff --git a/onnx/src/gen/java/org/bytedeco/onnx/GraphProtoDefaultTypeInternal.java b/onnx/src/gen/java/org/bytedeco/onnx/GraphProtoDefaultTypeInternal.java index 9063e2fee73..81155ecfb6a 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/GraphProtoDefaultTypeInternal.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/GraphProtoDefaultTypeInternal.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Greater_Onnx_ver1.java b/onnx/src/gen/java/org/bytedeco/onnx/Greater_Onnx_ver1.java index a04c8f811d4..57e7bb76caa 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Greater_Onnx_ver1.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Greater_Onnx_ver1.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Greater_Onnx_ver7.java b/onnx/src/gen/java/org/bytedeco/onnx/Greater_Onnx_ver7.java index c329d49561f..cb9ce7f3f3f 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Greater_Onnx_ver7.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Greater_Onnx_ver7.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Greater_Onnx_ver9.java b/onnx/src/gen/java/org/bytedeco/onnx/Greater_Onnx_ver9.java index d90ea6970be..76d1ce065b6 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Greater_Onnx_ver9.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Greater_Onnx_ver9.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/HardSigmoid_Onnx_ver1.java b/onnx/src/gen/java/org/bytedeco/onnx/HardSigmoid_Onnx_ver1.java index 8f3a426cec6..74b5b53b905 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/HardSigmoid_Onnx_ver1.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/HardSigmoid_Onnx_ver1.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/HardSigmoid_Onnx_ver6.java b/onnx/src/gen/java/org/bytedeco/onnx/HardSigmoid_Onnx_ver6.java index 744e5425593..e4cefd9f280 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/HardSigmoid_Onnx_ver6.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/HardSigmoid_Onnx_ver6.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Hardmax_Onnx_ver1.java b/onnx/src/gen/java/org/bytedeco/onnx/Hardmax_Onnx_ver1.java index 9c793d37be0..be6af30898e 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Hardmax_Onnx_ver1.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Hardmax_Onnx_ver1.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/IFunctionBuilderRegistry.java b/onnx/src/gen/java/org/bytedeco/onnx/IFunctionBuilderRegistry.java deleted file mode 100644 index 42b733e37cb..00000000000 --- a/onnx/src/gen/java/org/bytedeco/onnx/IFunctionBuilderRegistry.java +++ /dev/null @@ -1,33 +0,0 @@ -// Targeted by JavaCPP version 1.5: DO NOT EDIT THIS FILE - -package org.bytedeco.onnx; - -import java.nio.*; -import org.bytedeco.javacpp.*; -import org.bytedeco.javacpp.annotation.*; - -import static org.bytedeco.onnx.global.onnx.*; - - -@Namespace("onnx") @Properties(inherit = org.bytedeco.onnx.presets.onnx.class) -public class IFunctionBuilderRegistry extends Pointer { - static { Loader.load(); } - /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ - public IFunctionBuilderRegistry(Pointer p) { super(p); } - - - public native @Const FunctionProto GetFunction( - @StdString BytePointer func_name, - int maxInclusiveVersion, - @StdString BytePointer domain/*=ONNX_DOMAIN*/); - public native @Const FunctionProto GetFunction( - @StdString BytePointer func_name, - int maxInclusiveVersion); - public native @Const FunctionProto GetFunction( - @StdString String func_name, - int maxInclusiveVersion, - @StdString String domain/*=ONNX_DOMAIN*/); - public native @Const FunctionProto GetFunction( - @StdString String func_name, - int maxInclusiveVersion); -} diff --git a/onnx/src/gen/java/org/bytedeco/onnx/ISchemaRegistry.java b/onnx/src/gen/java/org/bytedeco/onnx/ISchemaRegistry.java index 209d91df403..cd226a7b28a 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/ISchemaRegistry.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/ISchemaRegistry.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Identity_Onnx_ver1.java b/onnx/src/gen/java/org/bytedeco/onnx/Identity_Onnx_ver1.java index 0c299b76788..8665c1d565f 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Identity_Onnx_ver1.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Identity_Onnx_ver1.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/If_Onnx_ver1.java b/onnx/src/gen/java/org/bytedeco/onnx/If_Onnx_ver1.java index 4dabcdbf981..f6c97e89c5f 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/If_Onnx_ver1.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/If_Onnx_ver1.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/ImageScaler_Onnx_ver1.java b/onnx/src/gen/java/org/bytedeco/onnx/ImageScaler_Onnx_ver1.java deleted file mode 100644 index 19c5c0626db..00000000000 --- a/onnx/src/gen/java/org/bytedeco/onnx/ImageScaler_Onnx_ver1.java +++ /dev/null @@ -1,17 +0,0 @@ -// Targeted by JavaCPP version 1.5: DO NOT EDIT THIS FILE - -package org.bytedeco.onnx; - -import java.nio.*; -import org.bytedeco.javacpp.*; -import org.bytedeco.javacpp.annotation.*; - -import static org.bytedeco.onnx.global.onnx.*; - -@Namespace("onnx") @Opaque @Properties(inherit = org.bytedeco.onnx.presets.onnx.class) -public class ImageScaler_Onnx_ver1 extends Pointer { - /** Empty constructor. Calls {@code super((Pointer)null)}. */ - public ImageScaler_Onnx_ver1() { super((Pointer)null); } - /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ - public ImageScaler_Onnx_ver1(Pointer p) { super(p); } -} diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Imputer_OnnxML_ver1.java b/onnx/src/gen/java/org/bytedeco/onnx/Imputer_OnnxML_ver1.java index 683420d6e0a..57bfc9b2e42 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Imputer_OnnxML_ver1.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Imputer_OnnxML_ver1.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/InferenceContext.java b/onnx/src/gen/java/org/bytedeco/onnx/InferenceContext.java index 8f7a59a4344..a47c0885b70 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/InferenceContext.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/InferenceContext.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/InferenceError.java b/onnx/src/gen/java/org/bytedeco/onnx/InferenceError.java index 1107c3eccc2..1a6ea4db7a3 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/InferenceError.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/InferenceError.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/InstanceNormalization_Onnx_ver1.java b/onnx/src/gen/java/org/bytedeco/onnx/InstanceNormalization_Onnx_ver1.java index cd2c4d38fbe..8b362a61e14 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/InstanceNormalization_Onnx_ver1.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/InstanceNormalization_Onnx_ver1.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/InstanceNormalization_Onnx_ver6.java b/onnx/src/gen/java/org/bytedeco/onnx/InstanceNormalization_Onnx_ver6.java index 699663b9821..88623689e1f 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/InstanceNormalization_Onnx_ver6.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/InstanceNormalization_Onnx_ver6.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/IntIntMap.java b/onnx/src/gen/java/org/bytedeco/onnx/IntIntMap.java index bebcfb50849..3f81239fc4d 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/IntIntMap.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/IntIntMap.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/IntSet.java b/onnx/src/gen/java/org/bytedeco/onnx/IntSet.java index d611acddf09..42f6f801112 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/IntSet.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/IntSet.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/InternalMetadataWithArena.java b/onnx/src/gen/java/org/bytedeco/onnx/InternalMetadataWithArena.java index c05f53ef44b..312f7ce727c 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/InternalMetadataWithArena.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/InternalMetadataWithArena.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Affine_Onnx_ver1.java b/onnx/src/gen/java/org/bytedeco/onnx/IsInf_Onnx_ver10.java similarity index 64% rename from onnx/src/gen/java/org/bytedeco/onnx/Affine_Onnx_ver1.java rename to onnx/src/gen/java/org/bytedeco/onnx/IsInf_Onnx_ver10.java index 4f563a8b6aa..7d4d7f7a66d 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Affine_Onnx_ver1.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/IsInf_Onnx_ver10.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.onnx; @@ -9,9 +9,9 @@ import static org.bytedeco.onnx.global.onnx.*; @Namespace("onnx") @Opaque @Properties(inherit = org.bytedeco.onnx.presets.onnx.class) -public class Affine_Onnx_ver1 extends Pointer { +public class IsInf_Onnx_ver10 extends Pointer { /** Empty constructor. Calls {@code super((Pointer)null)}. */ - public Affine_Onnx_ver1() { super((Pointer)null); } + public IsInf_Onnx_ver10() { super((Pointer)null); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ - public Affine_Onnx_ver1(Pointer p) { super(p); } + public IsInf_Onnx_ver10(Pointer p) { super(p); } } diff --git a/onnx/src/gen/java/org/bytedeco/onnx/IsNaN_Onnx_ver9.java b/onnx/src/gen/java/org/bytedeco/onnx/IsNaN_Onnx_ver9.java index 90f77f3187f..5af6dffd982 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/IsNaN_Onnx_ver9.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/IsNaN_Onnx_ver9.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/LRN_Onnx_ver1.java b/onnx/src/gen/java/org/bytedeco/onnx/LRN_Onnx_ver1.java index 91a48d53c6e..b65866401e9 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/LRN_Onnx_ver1.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/LRN_Onnx_ver1.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/LSTM_Onnx_ver1.java b/onnx/src/gen/java/org/bytedeco/onnx/LSTM_Onnx_ver1.java index 470232eb201..28229adb45f 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/LSTM_Onnx_ver1.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/LSTM_Onnx_ver1.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/LSTM_Onnx_ver7.java b/onnx/src/gen/java/org/bytedeco/onnx/LSTM_Onnx_ver7.java index a15d965b2dc..d53d8d07fd7 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/LSTM_Onnx_ver7.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/LSTM_Onnx_ver7.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/LabelEncoder_OnnxML_ver1.java b/onnx/src/gen/java/org/bytedeco/onnx/LabelEncoder_OnnxML_ver1.java index 5c34e6d6638..64c822c05f0 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/LabelEncoder_OnnxML_ver1.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/LabelEncoder_OnnxML_ver1.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/LabelEncoder_OnnxML_ver2.java b/onnx/src/gen/java/org/bytedeco/onnx/LabelEncoder_OnnxML_ver2.java index 6c0a35f42dc..c4977320b47 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/LabelEncoder_OnnxML_ver2.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/LabelEncoder_OnnxML_ver2.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/LazyDescriptor.java b/onnx/src/gen/java/org/bytedeco/onnx/LazyDescriptor.java index 65ef2939e9d..6401bba4add 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/LazyDescriptor.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/LazyDescriptor.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/LazyField.java b/onnx/src/gen/java/org/bytedeco/onnx/LazyField.java index 03a4460c154..a60679af3d6 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/LazyField.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/LazyField.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/LeakyRelu_Onnx_ver1.java b/onnx/src/gen/java/org/bytedeco/onnx/LeakyRelu_Onnx_ver1.java index aea2c093625..300ae7bea27 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/LeakyRelu_Onnx_ver1.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/LeakyRelu_Onnx_ver1.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/LeakyRelu_Onnx_ver6.java b/onnx/src/gen/java/org/bytedeco/onnx/LeakyRelu_Onnx_ver6.java index 5533cf9399a..6874d8ff6ef 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/LeakyRelu_Onnx_ver6.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/LeakyRelu_Onnx_ver6.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Less_Onnx_ver1.java b/onnx/src/gen/java/org/bytedeco/onnx/Less_Onnx_ver1.java index 5ed72a851d6..9159e8b8c98 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Less_Onnx_ver1.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Less_Onnx_ver1.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Less_Onnx_ver7.java b/onnx/src/gen/java/org/bytedeco/onnx/Less_Onnx_ver7.java index 2593a0db1f3..0920d5113a4 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Less_Onnx_ver7.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Less_Onnx_ver7.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Less_Onnx_ver9.java b/onnx/src/gen/java/org/bytedeco/onnx/Less_Onnx_ver9.java index 4b386c32308..417e305213f 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Less_Onnx_ver9.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Less_Onnx_ver9.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/LexicalScopeContext.java b/onnx/src/gen/java/org/bytedeco/onnx/LexicalScopeContext.java index 68954e3e7f4..63b2597d0e1 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/LexicalScopeContext.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/LexicalScopeContext.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/LinearClassifier_OnnxML_ver1.java b/onnx/src/gen/java/org/bytedeco/onnx/LinearClassifier_OnnxML_ver1.java index 86fc429a822..a1118dc90b6 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/LinearClassifier_OnnxML_ver1.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/LinearClassifier_OnnxML_ver1.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/LinearRegressor_OnnxML_ver1.java b/onnx/src/gen/java/org/bytedeco/onnx/LinearRegressor_OnnxML_ver1.java index f072b60307b..3cb2d033f28 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/LinearRegressor_OnnxML_ver1.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/LinearRegressor_OnnxML_ver1.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/LogSoftmax_Onnx_ver1.java b/onnx/src/gen/java/org/bytedeco/onnx/LogSoftmax_Onnx_ver1.java index 7154f389b34..191c43d237d 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/LogSoftmax_Onnx_ver1.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/LogSoftmax_Onnx_ver1.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Log_Onnx_ver1.java b/onnx/src/gen/java/org/bytedeco/onnx/Log_Onnx_ver1.java index 6b486d50f2b..cde073d4dad 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Log_Onnx_ver1.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Log_Onnx_ver1.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Log_Onnx_ver6.java b/onnx/src/gen/java/org/bytedeco/onnx/Log_Onnx_ver6.java index 75cc1462d19..dcb71e7d537 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Log_Onnx_ver6.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Log_Onnx_ver6.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/LongLongPair.java b/onnx/src/gen/java/org/bytedeco/onnx/LongLongPair.java index b0f6f1786ec..31e15f40e2f 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/LongLongPair.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/LongLongPair.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/LongVector.java b/onnx/src/gen/java/org/bytedeco/onnx/LongVector.java index 5fbc3f417f4..41a604a4a85 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/LongVector.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/LongVector.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Loop_Onnx_ver1.java b/onnx/src/gen/java/org/bytedeco/onnx/Loop_Onnx_ver1.java index 35a1d54722f..0222e8e70ef 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Loop_Onnx_ver1.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Loop_Onnx_ver1.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/LpNormalization_Onnx_ver1.java b/onnx/src/gen/java/org/bytedeco/onnx/LpNormalization_Onnx_ver1.java index 705b1532177..341777e9b78 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/LpNormalization_Onnx_ver1.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/LpNormalization_Onnx_ver1.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/LpPool_Onnx_ver1.java b/onnx/src/gen/java/org/bytedeco/onnx/LpPool_Onnx_ver1.java index 43a9e65cb56..bc06af23bf7 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/LpPool_Onnx_ver1.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/LpPool_Onnx_ver1.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/LpPool_Onnx_ver2.java b/onnx/src/gen/java/org/bytedeco/onnx/LpPool_Onnx_ver2.java index 3c63cd78d1f..fe0090bfe60 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/LpPool_Onnx_ver2.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/LpPool_Onnx_ver2.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/MatMulInteger_Onnx_ver10.java b/onnx/src/gen/java/org/bytedeco/onnx/MatMulInteger_Onnx_ver10.java new file mode 100644 index 00000000000..30d817fb063 --- /dev/null +++ b/onnx/src/gen/java/org/bytedeco/onnx/MatMulInteger_Onnx_ver10.java @@ -0,0 +1,17 @@ +// Targeted by JavaCPP version 1.5.1-SNAPSHOT: DO NOT EDIT THIS FILE + +package org.bytedeco.onnx; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +import static org.bytedeco.onnx.global.onnx.*; + +@Namespace("onnx") @Opaque @Properties(inherit = org.bytedeco.onnx.presets.onnx.class) +public class MatMulInteger_Onnx_ver10 extends Pointer { + /** Empty constructor. Calls {@code super((Pointer)null)}. */ + public MatMulInteger_Onnx_ver10() { super((Pointer)null); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public MatMulInteger_Onnx_ver10(Pointer p) { super(p); } +} diff --git a/onnx/src/gen/java/org/bytedeco/onnx/MatMul_Onnx_ver1.java b/onnx/src/gen/java/org/bytedeco/onnx/MatMul_Onnx_ver1.java index 9d26972d9e7..d7afcd23d21 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/MatMul_Onnx_ver1.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/MatMul_Onnx_ver1.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/MatMul_Onnx_ver9.java b/onnx/src/gen/java/org/bytedeco/onnx/MatMul_Onnx_ver9.java index e88a994a5a7..7453ed7468f 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/MatMul_Onnx_ver9.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/MatMul_Onnx_ver9.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/MaxPool_Onnx_ver1.java b/onnx/src/gen/java/org/bytedeco/onnx/MaxPool_Onnx_ver1.java index 238244cbd15..8126b247b9e 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/MaxPool_Onnx_ver1.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/MaxPool_Onnx_ver1.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/MaxPool_Onnx_ver10.java b/onnx/src/gen/java/org/bytedeco/onnx/MaxPool_Onnx_ver10.java new file mode 100644 index 00000000000..ded791a83f4 --- /dev/null +++ b/onnx/src/gen/java/org/bytedeco/onnx/MaxPool_Onnx_ver10.java @@ -0,0 +1,17 @@ +// Targeted by JavaCPP version 1.5.1-SNAPSHOT: DO NOT EDIT THIS FILE + +package org.bytedeco.onnx; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +import static org.bytedeco.onnx.global.onnx.*; + +@Namespace("onnx") @Opaque @Properties(inherit = org.bytedeco.onnx.presets.onnx.class) +public class MaxPool_Onnx_ver10 extends Pointer { + /** Empty constructor. Calls {@code super((Pointer)null)}. */ + public MaxPool_Onnx_ver10() { super((Pointer)null); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public MaxPool_Onnx_ver10(Pointer p) { super(p); } +} diff --git a/onnx/src/gen/java/org/bytedeco/onnx/MaxPool_Onnx_ver8.java b/onnx/src/gen/java/org/bytedeco/onnx/MaxPool_Onnx_ver8.java index 09c8cfbc200..56a888e01c9 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/MaxPool_Onnx_ver8.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/MaxPool_Onnx_ver8.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/MaxRoiPool_Onnx_ver1.java b/onnx/src/gen/java/org/bytedeco/onnx/MaxRoiPool_Onnx_ver1.java index a9f8003ac19..61a9fc8486e 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/MaxRoiPool_Onnx_ver1.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/MaxRoiPool_Onnx_ver1.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/MaxUnpool_Onnx_ver9.java b/onnx/src/gen/java/org/bytedeco/onnx/MaxUnpool_Onnx_ver9.java index 1f36d6e64d7..a18e2ca1031 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/MaxUnpool_Onnx_ver9.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/MaxUnpool_Onnx_ver9.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Max_Onnx_ver1.java b/onnx/src/gen/java/org/bytedeco/onnx/Max_Onnx_ver1.java index 395234b8e74..e0114db27b8 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Max_Onnx_ver1.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Max_Onnx_ver1.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Max_Onnx_ver6.java b/onnx/src/gen/java/org/bytedeco/onnx/Max_Onnx_ver6.java index 66f3668ff89..2dfcbeedd74 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Max_Onnx_ver6.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Max_Onnx_ver6.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Max_Onnx_ver8.java b/onnx/src/gen/java/org/bytedeco/onnx/Max_Onnx_ver8.java index d09436e629d..8d196c81e7c 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Max_Onnx_ver8.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Max_Onnx_ver8.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/DynamicSlice_Onnx_ver1.java b/onnx/src/gen/java/org/bytedeco/onnx/MeanVarianceNormalization_Onnx_ver9.java similarity index 58% rename from onnx/src/gen/java/org/bytedeco/onnx/DynamicSlice_Onnx_ver1.java rename to onnx/src/gen/java/org/bytedeco/onnx/MeanVarianceNormalization_Onnx_ver9.java index 612e5f2c8ca..23c113f3991 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/DynamicSlice_Onnx_ver1.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/MeanVarianceNormalization_Onnx_ver9.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.onnx; @@ -8,12 +8,10 @@ import static org.bytedeco.onnx.global.onnx.*; - -// Forward declarations for ai.onnx version 1 @Namespace("onnx") @Opaque @Properties(inherit = org.bytedeco.onnx.presets.onnx.class) -public class DynamicSlice_Onnx_ver1 extends Pointer { +public class MeanVarianceNormalization_Onnx_ver9 extends Pointer { /** Empty constructor. Calls {@code super((Pointer)null)}. */ - public DynamicSlice_Onnx_ver1() { super((Pointer)null); } + public MeanVarianceNormalization_Onnx_ver9() { super((Pointer)null); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ - public DynamicSlice_Onnx_ver1(Pointer p) { super(p); } + public MeanVarianceNormalization_Onnx_ver9(Pointer p) { super(p); } } diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Mean_Onnx_ver1.java b/onnx/src/gen/java/org/bytedeco/onnx/Mean_Onnx_ver1.java index a9168df1783..e8d69eadcbf 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Mean_Onnx_ver1.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Mean_Onnx_ver1.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Mean_Onnx_ver6.java b/onnx/src/gen/java/org/bytedeco/onnx/Mean_Onnx_ver6.java index 090d8b6ac8b..344ad2c6b32 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Mean_Onnx_ver6.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Mean_Onnx_ver6.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Mean_Onnx_ver8.java b/onnx/src/gen/java/org/bytedeco/onnx/Mean_Onnx_ver8.java index f568051a89d..e0d01b241a1 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Mean_Onnx_ver8.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Mean_Onnx_ver8.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/MessageLite.java b/onnx/src/gen/java/org/bytedeco/onnx/MessageLite.java index 8dfd6c70487..e5e2b9cb27a 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/MessageLite.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/MessageLite.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.onnx; @@ -112,6 +112,11 @@ public class MessageLite extends Pointer { // Read a protocol buffer from the given zero-copy input stream, expecting // the message to be exactly "size" bytes long. If successful, exactly // this many bytes will have been consumed from the input. + public native @Cast("bool") boolean MergePartialFromBoundedZeroCopyStream(ZeroCopyInputStream input, int size); + // Like ParseFromBoundedZeroCopyStream(), but accepts messages that are + // missing required fields. + public native @Cast("bool") boolean MergeFromBoundedZeroCopyStream(ZeroCopyInputStream input, + int size); public native @Cast("bool") boolean ParseFromBoundedZeroCopyStream(ZeroCopyInputStream input, int size); // Like ParseFromBoundedZeroCopyStream(), but accepts messages that are // missing required fields. @@ -153,7 +158,14 @@ public class MessageLite extends Pointer { // // MergeFromCodedStream() is just implemented as MergePartialFromCodedStream() // followed by IsInitialized(). +// #if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER +// #else public native @Cast("bool") boolean MergePartialFromCodedStream(CodedInputStream input); +// #endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER + + // Merge a protocol buffer contained in a string. + public native @Cast("bool") boolean MergeFromString(@StdString BytePointer data); + public native @Cast("bool") boolean MergeFromString(@StdString String data); // Serialization --------------------------------------------------- @@ -240,11 +252,18 @@ public native void SerializeWithCachedSizes( // invalidated, which is too much work for an otherwise inlined setter // method.) public native int GetCachedSize(); - - public native @Cast("google::protobuf::uint8*") BytePointer InternalSerializeWithCachedSizesToArray(@Cast("bool") boolean deterministic, - @Cast("google::protobuf::uint8*") BytePointer target); - public native @Cast("google::protobuf::uint8*") ByteBuffer InternalSerializeWithCachedSizesToArray(@Cast("bool") boolean deterministic, - @Cast("google::protobuf::uint8*") ByteBuffer target); - public native @Cast("google::protobuf::uint8*") byte[] InternalSerializeWithCachedSizesToArray(@Cast("bool") boolean deterministic, - @Cast("google::protobuf::uint8*") byte[] target); + /** enum google::protobuf::MessageLite::ParseFlags */ + public static final int + kMerge = 0, + kParse = 1, + kMergePartial = 2, + kParsePartial = 3, + kMergeWithAliasing = 4, + kParseWithAliasing = 5, + kMergePartialWithAliasing = 6, + kParsePartialWithAliasing = 7; + // TODO(gerbens) make this a pure abstract function + public native @Cast("google::protobuf::uint8*") BytePointer InternalSerializeWithCachedSizesToArray(@Cast("google::protobuf::uint8*") BytePointer target); + public native @Cast("google::protobuf::uint8*") ByteBuffer InternalSerializeWithCachedSizesToArray(@Cast("google::protobuf::uint8*") ByteBuffer target); + public native @Cast("google::protobuf::uint8*") byte[] InternalSerializeWithCachedSizesToArray(@Cast("google::protobuf::uint8*") byte[] target); } diff --git a/onnx/src/gen/java/org/bytedeco/onnx/MessageOptions.java b/onnx/src/gen/java/org/bytedeco/onnx/MessageOptions.java index 8d7033254d7..9b2296a5bce 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/MessageOptions.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/MessageOptions.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/MessageSetFieldSkipperUsingCord.java b/onnx/src/gen/java/org/bytedeco/onnx/MessageSetFieldSkipperUsingCord.java index 08ec54ffc07..21716b17c97 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/MessageSetFieldSkipperUsingCord.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/MessageSetFieldSkipperUsingCord.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/MethodDescriptor.java b/onnx/src/gen/java/org/bytedeco/onnx/MethodDescriptor.java index 2a915739c8e..4e188a81ee5 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/MethodDescriptor.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/MethodDescriptor.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.onnx; @@ -20,6 +20,7 @@ public class MethodDescriptor extends Pointer { /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public MethodDescriptor(Pointer p) { super(p); } + // Name of this method, not including containing scope. public native @StdString BytePointer name(); // The fully-qualified name of the method, scope delimited by periods. @@ -45,8 +46,7 @@ public class MethodDescriptor extends Pointer { // Get options for this method. These are specified in the .proto file by // placing lines like "option foo = 1234;" in curly-braces after a method // declaration. Allowed options are defined by MethodOptions in - // google/protobuf/descriptor.proto, and any available extensions of that - // message. + // descriptor.proto, and any available extensions of that message. public native @Const @ByRef MethodOptions options(); // See Descriptor::CopyTo(). diff --git a/onnx/src/gen/java/org/bytedeco/onnx/MethodDescriptorProto.java b/onnx/src/gen/java/org/bytedeco/onnx/MethodDescriptorProto.java index ffdac668a84..ab8f54be755 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/MethodDescriptorProto.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/MethodDescriptorProto.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/MethodOptions.java b/onnx/src/gen/java/org/bytedeco/onnx/MethodOptions.java index fa06482280e..ade69e63769 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/MethodOptions.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/MethodOptions.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Min_Onnx_ver1.java b/onnx/src/gen/java/org/bytedeco/onnx/Min_Onnx_ver1.java index 8172c96a625..69bf57511af 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Min_Onnx_ver1.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Min_Onnx_ver1.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Min_Onnx_ver6.java b/onnx/src/gen/java/org/bytedeco/onnx/Min_Onnx_ver6.java index d90968aae7b..123dbdb6f86 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Min_Onnx_ver6.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Min_Onnx_ver6.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Min_Onnx_ver8.java b/onnx/src/gen/java/org/bytedeco/onnx/Min_Onnx_ver8.java index 849b657b82b..03ffc0a7899 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Min_Onnx_ver8.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Min_Onnx_ver8.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/GRUUnit_Onnx_ver1.java b/onnx/src/gen/java/org/bytedeco/onnx/Mod_Onnx_ver10.java similarity index 64% rename from onnx/src/gen/java/org/bytedeco/onnx/GRUUnit_Onnx_ver1.java rename to onnx/src/gen/java/org/bytedeco/onnx/Mod_Onnx_ver10.java index 5cbe9e72ab7..11aaec23991 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/GRUUnit_Onnx_ver1.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Mod_Onnx_ver10.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.onnx; @@ -9,9 +9,9 @@ import static org.bytedeco.onnx.global.onnx.*; @Namespace("onnx") @Opaque @Properties(inherit = org.bytedeco.onnx.presets.onnx.class) -public class GRUUnit_Onnx_ver1 extends Pointer { +public class Mod_Onnx_ver10 extends Pointer { /** Empty constructor. Calls {@code super((Pointer)null)}. */ - public GRUUnit_Onnx_ver1() { super((Pointer)null); } + public Mod_Onnx_ver10() { super((Pointer)null); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ - public GRUUnit_Onnx_ver1(Pointer p) { super(p); } + public Mod_Onnx_ver10(Pointer p) { super(p); } } diff --git a/onnx/src/gen/java/org/bytedeco/onnx/ModelProto.java b/onnx/src/gen/java/org/bytedeco/onnx/ModelProto.java index 12ced90aa44..0ef0ea50500 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/ModelProto.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/ModelProto.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.onnx; @@ -58,16 +58,19 @@ public class ModelProto extends MessageLite { public native @Cast("bool") boolean IsInitialized(); public native @Cast("size_t") long ByteSizeLong(); +// #if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER +// #else public native @Cast("bool") boolean MergePartialFromCodedStream( CodedInputStream input); +// #endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER public native void SerializeWithCachedSizes( CodedOutputStream output); public native @Cast("google::protobuf::uint8*") BytePointer InternalSerializeWithCachedSizesToArray( - @Cast("bool") boolean deterministic, @Cast("google::protobuf::uint8*") BytePointer target); + @Cast("google::protobuf::uint8*") BytePointer target); public native @Cast("google::protobuf::uint8*") ByteBuffer InternalSerializeWithCachedSizesToArray( - @Cast("bool") boolean deterministic, @Cast("google::protobuf::uint8*") ByteBuffer target); + @Cast("google::protobuf::uint8*") ByteBuffer target); public native @Cast("google::protobuf::uint8*") byte[] InternalSerializeWithCachedSizesToArray( - @Cast("bool") boolean deterministic, @Cast("google::protobuf::uint8*") byte[] target); + @Cast("google::protobuf::uint8*") byte[] target); public native int GetCachedSize(); public native @ByVal @Cast("google::protobuf::Metadata*") Pointer GetMetadata(); diff --git a/onnx/src/gen/java/org/bytedeco/onnx/ModelProtoDefaultTypeInternal.java b/onnx/src/gen/java/org/bytedeco/onnx/ModelProtoDefaultTypeInternal.java index dc83e3cdaed..fee582c88ba 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/ModelProtoDefaultTypeInternal.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/ModelProtoDefaultTypeInternal.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Mul_Onnx_ver1.java b/onnx/src/gen/java/org/bytedeco/onnx/Mul_Onnx_ver1.java index 095d6c7934c..b35dccb9272 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Mul_Onnx_ver1.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Mul_Onnx_ver1.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Mul_Onnx_ver6.java b/onnx/src/gen/java/org/bytedeco/onnx/Mul_Onnx_ver6.java index e58fffb9691..ffe44afb3dc 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Mul_Onnx_ver6.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Mul_Onnx_ver6.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Mul_Onnx_ver7.java b/onnx/src/gen/java/org/bytedeco/onnx/Mul_Onnx_ver7.java index cb6ff974fb9..ccd3148430a 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Mul_Onnx_ver7.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Mul_Onnx_ver7.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Multinomial_Onnx_ver7.java b/onnx/src/gen/java/org/bytedeco/onnx/Multinomial_Onnx_ver7.java index b5c96460f3a..8afc34d5689 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Multinomial_Onnx_ver7.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Multinomial_Onnx_ver7.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Neg_Onnx_ver1.java b/onnx/src/gen/java/org/bytedeco/onnx/Neg_Onnx_ver1.java index 9fa7e1a5795..e65041cae4b 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Neg_Onnx_ver1.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Neg_Onnx_ver1.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Neg_Onnx_ver6.java b/onnx/src/gen/java/org/bytedeco/onnx/Neg_Onnx_ver6.java index 9de5927d9d2..0b83b8d31b2 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Neg_Onnx_ver6.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Neg_Onnx_ver6.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Node.java b/onnx/src/gen/java/org/bytedeco/onnx/Node.java index 9e00c3f2485..114f8ac25d8 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Node.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Node.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/NodeProto.java b/onnx/src/gen/java/org/bytedeco/onnx/NodeProto.java index 70c6d79fd7a..57a655f2f4d 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/NodeProto.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/NodeProto.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.onnx; @@ -58,16 +58,19 @@ public class NodeProto extends MessageLite { public native @Cast("bool") boolean IsInitialized(); public native @Cast("size_t") long ByteSizeLong(); +// #if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER +// #else public native @Cast("bool") boolean MergePartialFromCodedStream( CodedInputStream input); +// #endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER public native void SerializeWithCachedSizes( CodedOutputStream output); public native @Cast("google::protobuf::uint8*") BytePointer InternalSerializeWithCachedSizesToArray( - @Cast("bool") boolean deterministic, @Cast("google::protobuf::uint8*") BytePointer target); + @Cast("google::protobuf::uint8*") BytePointer target); public native @Cast("google::protobuf::uint8*") ByteBuffer InternalSerializeWithCachedSizesToArray( - @Cast("bool") boolean deterministic, @Cast("google::protobuf::uint8*") ByteBuffer target); + @Cast("google::protobuf::uint8*") ByteBuffer target); public native @Cast("google::protobuf::uint8*") byte[] InternalSerializeWithCachedSizesToArray( - @Cast("bool") boolean deterministic, @Cast("google::protobuf::uint8*") byte[] target); + @Cast("google::protobuf::uint8*") byte[] target); public native int GetCachedSize(); public native @ByVal @Cast("google::protobuf::Metadata*") Pointer GetMetadata(); diff --git a/onnx/src/gen/java/org/bytedeco/onnx/NodeProtoDefaultTypeInternal.java b/onnx/src/gen/java/org/bytedeco/onnx/NodeProtoDefaultTypeInternal.java index cf47cc274a7..855d4df0f42 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/NodeProtoDefaultTypeInternal.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/NodeProtoDefaultTypeInternal.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/ParametricSoftplus_Onnx_ver1.java b/onnx/src/gen/java/org/bytedeco/onnx/NonMaxSuppression_Onnx_ver10.java similarity index 61% rename from onnx/src/gen/java/org/bytedeco/onnx/ParametricSoftplus_Onnx_ver1.java rename to onnx/src/gen/java/org/bytedeco/onnx/NonMaxSuppression_Onnx_ver10.java index d9bfebda471..34e9a154aa4 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/ParametricSoftplus_Onnx_ver1.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/NonMaxSuppression_Onnx_ver10.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.onnx; @@ -9,9 +9,9 @@ import static org.bytedeco.onnx.global.onnx.*; @Namespace("onnx") @Opaque @Properties(inherit = org.bytedeco.onnx.presets.onnx.class) -public class ParametricSoftplus_Onnx_ver1 extends Pointer { +public class NonMaxSuppression_Onnx_ver10 extends Pointer { /** Empty constructor. Calls {@code super((Pointer)null)}. */ - public ParametricSoftplus_Onnx_ver1() { super((Pointer)null); } + public NonMaxSuppression_Onnx_ver10() { super((Pointer)null); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ - public ParametricSoftplus_Onnx_ver1(Pointer p) { super(p); } + public NonMaxSuppression_Onnx_ver10(Pointer p) { super(p); } } diff --git a/onnx/src/gen/java/org/bytedeco/onnx/NonZero_Onnx_ver9.java b/onnx/src/gen/java/org/bytedeco/onnx/NonZero_Onnx_ver9.java index ce77640d91e..e7a3128bda2 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/NonZero_Onnx_ver9.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/NonZero_Onnx_ver9.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Normalizer_OnnxML_ver1.java b/onnx/src/gen/java/org/bytedeco/onnx/Normalizer_OnnxML_ver1.java index e6c5059a878..2f131d033ff 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Normalizer_OnnxML_ver1.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Normalizer_OnnxML_ver1.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Not_Onnx_ver1.java b/onnx/src/gen/java/org/bytedeco/onnx/Not_Onnx_ver1.java index ed11142002a..364e60117dd 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Not_Onnx_ver1.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Not_Onnx_ver1.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/OneHotEncoder_OnnxML_ver1.java b/onnx/src/gen/java/org/bytedeco/onnx/OneHotEncoder_OnnxML_ver1.java index 00aeff4a9dd..d0ade1c7f1e 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/OneHotEncoder_OnnxML_ver1.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/OneHotEncoder_OnnxML_ver1.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/OneHot_Onnx_ver9.java b/onnx/src/gen/java/org/bytedeco/onnx/OneHot_Onnx_ver9.java index 8c57676c261..f4f6faa2110 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/OneHot_Onnx_ver9.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/OneHot_Onnx_ver9.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/OneofDescriptor.java b/onnx/src/gen/java/org/bytedeco/onnx/OneofDescriptor.java index 0386ee3f420..c6aab0e0ef0 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/OneofDescriptor.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/OneofDescriptor.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.onnx; @@ -17,6 +17,7 @@ public class OneofDescriptor extends Pointer { /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public OneofDescriptor(Pointer p) { super(p); } + public native @StdString BytePointer name(); // Name of this oneof. public native @StdString BytePointer full_name(); // Fully-qualified name of the oneof. diff --git a/onnx/src/gen/java/org/bytedeco/onnx/OneofDescriptorProto.java b/onnx/src/gen/java/org/bytedeco/onnx/OneofDescriptorProto.java index ed86f9f836f..d4317eac033 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/OneofDescriptorProto.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/OneofDescriptorProto.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/OneofOptions.java b/onnx/src/gen/java/org/bytedeco/onnx/OneofOptions.java index e5b248a8533..7ae63ae2cc3 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/OneofOptions.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/OneofOptions.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/OpSchema.java b/onnx/src/gen/java/org/bytedeco/onnx/OpSchema.java index fd75ba287c7..edf2a7704bc 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/OpSchema.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/OpSchema.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.onnx; @@ -629,6 +629,12 @@ private native void allocate( public native @Cast("bool") boolean has_type_and_shape_inference_function(); + public native @Cast("bool") boolean HasFunction(); + + public native @ByRef OpSchema FunctionBody(@StdVector NodeProto func_nodes); + + public native @Const FunctionProto GetFunction(); + // Verifies that the schema is valid and all specifications are compatible. // It will also parse all type strings specified for inputs/outputs into valid // TypeProto and create global unique string pointer as the DataType for diff --git a/onnx/src/gen/java/org/bytedeco/onnx/OpSchemaRegistry.java b/onnx/src/gen/java/org/bytedeco/onnx/OpSchemaRegistry.java index 8f8ba511f61..3d0004c67f5 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/OpSchemaRegistry.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/OpSchemaRegistry.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/OpSchemaVector.java b/onnx/src/gen/java/org/bytedeco/onnx/OpSchemaVector.java index 866e6734ae2..a3bf38fb083 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/OpSchemaVector.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/OpSchemaVector.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/OpSetID.java b/onnx/src/gen/java/org/bytedeco/onnx/OpSetID.java index 6732f0b548e..b48d05d0f2f 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/OpSetID.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/OpSetID.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/OpSet_OnnxML_ver1.java b/onnx/src/gen/java/org/bytedeco/onnx/OpSet_OnnxML_ver1.java index 1f163b560ce..e8158cfa365 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/OpSet_OnnxML_ver1.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/OpSet_OnnxML_ver1.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/OpSet_OnnxML_ver2.java b/onnx/src/gen/java/org/bytedeco/onnx/OpSet_OnnxML_ver2.java index aef35a9d232..01c5d67d154 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/OpSet_OnnxML_ver2.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/OpSet_OnnxML_ver2.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/OpSet_Onnx_ver1.java b/onnx/src/gen/java/org/bytedeco/onnx/OpSet_Onnx_ver1.java index 647531dffb5..c794155b083 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/OpSet_Onnx_ver1.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/OpSet_Onnx_ver1.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/OpSet_Onnx_ver10.java b/onnx/src/gen/java/org/bytedeco/onnx/OpSet_Onnx_ver10.java new file mode 100644 index 00000000000..d13885c2397 --- /dev/null +++ b/onnx/src/gen/java/org/bytedeco/onnx/OpSet_Onnx_ver10.java @@ -0,0 +1,28 @@ +// Targeted by JavaCPP version 1.5.1-SNAPSHOT: DO NOT EDIT THIS FILE + +package org.bytedeco.onnx; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +import static org.bytedeco.onnx.global.onnx.*; + + +// Iterate over schema from ai.onnx version 10 +@Namespace("onnx") @Properties(inherit = org.bytedeco.onnx.presets.onnx.class) +public class OpSet_Onnx_ver10 extends Pointer { + static { Loader.load(); } + /** Default native constructor. */ + public OpSet_Onnx_ver10() { super((Pointer)null); allocate(); } + /** Native array allocator. Access with {@link Pointer#position(long)}. */ + public OpSet_Onnx_ver10(long size) { super((Pointer)null); allocateArray(size); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public OpSet_Onnx_ver10(Pointer p) { super(p); } + private native void allocate(); + private native void allocateArray(long size); + @Override public OpSet_Onnx_ver10 position(long position) { + return (OpSet_Onnx_ver10)super.position(position); + } + +} diff --git a/onnx/src/gen/java/org/bytedeco/onnx/OpSet_Onnx_ver2.java b/onnx/src/gen/java/org/bytedeco/onnx/OpSet_Onnx_ver2.java index 41717c4c8be..40ea023672f 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/OpSet_Onnx_ver2.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/OpSet_Onnx_ver2.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/OpSet_Onnx_ver3.java b/onnx/src/gen/java/org/bytedeco/onnx/OpSet_Onnx_ver3.java index aa9d7e50df6..32474e3dbdb 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/OpSet_Onnx_ver3.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/OpSet_Onnx_ver3.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/OpSet_Onnx_ver4.java b/onnx/src/gen/java/org/bytedeco/onnx/OpSet_Onnx_ver4.java index db3a35efe52..8d391aa44d2 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/OpSet_Onnx_ver4.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/OpSet_Onnx_ver4.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/OpSet_Onnx_ver5.java b/onnx/src/gen/java/org/bytedeco/onnx/OpSet_Onnx_ver5.java index 06fe89a67e1..94f28d53acf 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/OpSet_Onnx_ver5.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/OpSet_Onnx_ver5.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/OpSet_Onnx_ver6.java b/onnx/src/gen/java/org/bytedeco/onnx/OpSet_Onnx_ver6.java index e7e13e77983..91f7aa0c48b 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/OpSet_Onnx_ver6.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/OpSet_Onnx_ver6.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/OpSet_Onnx_ver7.java b/onnx/src/gen/java/org/bytedeco/onnx/OpSet_Onnx_ver7.java index d3331e7c618..0b51a2e7ec8 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/OpSet_Onnx_ver7.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/OpSet_Onnx_ver7.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/OpSet_Onnx_ver8.java b/onnx/src/gen/java/org/bytedeco/onnx/OpSet_Onnx_ver8.java index 320a49a3385..0b44f0c223f 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/OpSet_Onnx_ver8.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/OpSet_Onnx_ver8.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/OpSet_Onnx_ver9.java b/onnx/src/gen/java/org/bytedeco/onnx/OpSet_Onnx_ver9.java index 496330246ca..221992389f2 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/OpSet_Onnx_ver9.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/OpSet_Onnx_ver9.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/OperatorProto.java b/onnx/src/gen/java/org/bytedeco/onnx/OperatorProto.java index ad1c51f452f..19e3a9471be 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/OperatorProto.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/OperatorProto.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.onnx; @@ -58,16 +58,19 @@ public class OperatorProto extends MessageLite { public native @Cast("bool") boolean IsInitialized(); public native @Cast("size_t") long ByteSizeLong(); +// #if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER +// #else public native @Cast("bool") boolean MergePartialFromCodedStream( CodedInputStream input); +// #endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER public native void SerializeWithCachedSizes( CodedOutputStream output); public native @Cast("google::protobuf::uint8*") BytePointer InternalSerializeWithCachedSizesToArray( - @Cast("bool") boolean deterministic, @Cast("google::protobuf::uint8*") BytePointer target); + @Cast("google::protobuf::uint8*") BytePointer target); public native @Cast("google::protobuf::uint8*") ByteBuffer InternalSerializeWithCachedSizesToArray( - @Cast("bool") boolean deterministic, @Cast("google::protobuf::uint8*") ByteBuffer target); + @Cast("google::protobuf::uint8*") ByteBuffer target); public native @Cast("google::protobuf::uint8*") byte[] InternalSerializeWithCachedSizesToArray( - @Cast("bool") boolean deterministic, @Cast("google::protobuf::uint8*") byte[] target); + @Cast("google::protobuf::uint8*") byte[] target); public native int GetCachedSize(); public native @ByVal @Cast("google::protobuf::Metadata*") Pointer GetMetadata(); diff --git a/onnx/src/gen/java/org/bytedeco/onnx/OperatorProtoDefaultTypeInternal.java b/onnx/src/gen/java/org/bytedeco/onnx/OperatorProtoDefaultTypeInternal.java index ce40dd36372..87e777bbeb9 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/OperatorProtoDefaultTypeInternal.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/OperatorProtoDefaultTypeInternal.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/OperatorSetIdProto.java b/onnx/src/gen/java/org/bytedeco/onnx/OperatorSetIdProto.java index 96eccb77e3b..8398717db5a 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/OperatorSetIdProto.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/OperatorSetIdProto.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.onnx; @@ -58,16 +58,19 @@ public class OperatorSetIdProto extends MessageLite { public native @Cast("bool") boolean IsInitialized(); public native @Cast("size_t") long ByteSizeLong(); +// #if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER +// #else public native @Cast("bool") boolean MergePartialFromCodedStream( CodedInputStream input); +// #endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER public native void SerializeWithCachedSizes( CodedOutputStream output); public native @Cast("google::protobuf::uint8*") BytePointer InternalSerializeWithCachedSizesToArray( - @Cast("bool") boolean deterministic, @Cast("google::protobuf::uint8*") BytePointer target); + @Cast("google::protobuf::uint8*") BytePointer target); public native @Cast("google::protobuf::uint8*") ByteBuffer InternalSerializeWithCachedSizesToArray( - @Cast("bool") boolean deterministic, @Cast("google::protobuf::uint8*") ByteBuffer target); + @Cast("google::protobuf::uint8*") ByteBuffer target); public native @Cast("google::protobuf::uint8*") byte[] InternalSerializeWithCachedSizesToArray( - @Cast("bool") boolean deterministic, @Cast("google::protobuf::uint8*") byte[] target); + @Cast("google::protobuf::uint8*") byte[] target); public native int GetCachedSize(); public native @ByVal @Cast("google::protobuf::Metadata*") Pointer GetMetadata(); diff --git a/onnx/src/gen/java/org/bytedeco/onnx/OperatorSetIdProtoDefaultTypeInternal.java b/onnx/src/gen/java/org/bytedeco/onnx/OperatorSetIdProtoDefaultTypeInternal.java index 2019e25506e..8dd714067ae 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/OperatorSetIdProtoDefaultTypeInternal.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/OperatorSetIdProtoDefaultTypeInternal.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/OperatorSetProto.java b/onnx/src/gen/java/org/bytedeco/onnx/OperatorSetProto.java index 69dc8ce45bc..1dd642e7d2b 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/OperatorSetProto.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/OperatorSetProto.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.onnx; @@ -58,16 +58,19 @@ public class OperatorSetProto extends MessageLite { public native @Cast("bool") boolean IsInitialized(); public native @Cast("size_t") long ByteSizeLong(); +// #if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER +// #else public native @Cast("bool") boolean MergePartialFromCodedStream( CodedInputStream input); +// #endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER public native void SerializeWithCachedSizes( CodedOutputStream output); public native @Cast("google::protobuf::uint8*") BytePointer InternalSerializeWithCachedSizesToArray( - @Cast("bool") boolean deterministic, @Cast("google::protobuf::uint8*") BytePointer target); + @Cast("google::protobuf::uint8*") BytePointer target); public native @Cast("google::protobuf::uint8*") ByteBuffer InternalSerializeWithCachedSizesToArray( - @Cast("bool") boolean deterministic, @Cast("google::protobuf::uint8*") ByteBuffer target); + @Cast("google::protobuf::uint8*") ByteBuffer target); public native @Cast("google::protobuf::uint8*") byte[] InternalSerializeWithCachedSizesToArray( - @Cast("bool") boolean deterministic, @Cast("google::protobuf::uint8*") byte[] target); + @Cast("google::protobuf::uint8*") byte[] target); public native int GetCachedSize(); public native @ByVal @Cast("google::protobuf::Metadata*") Pointer GetMetadata(); @@ -174,6 +177,14 @@ public native void SerializeWithCachedSizes( public native @StdString @Cast({"char*", "std::string*"}) BytePointer release_ir_build_metadata(); public native void set_allocated_ir_build_metadata(@StdString @Cast({"char*", "std::string*"}) BytePointer ir_build_metadata); + // optional int64 ir_version = 2; + public native @Cast("bool") boolean has_ir_version(); + public native void clear_ir_version(); + @MemberGetter public static native int kIrVersionFieldNumber(); + public static final int kIrVersionFieldNumber = kIrVersionFieldNumber(); + public native @Cast("google::protobuf::int64") long ir_version(); + public native void set_ir_version(@Cast("google::protobuf::int64") long value); + // optional int64 opset_version = 5; public native @Cast("bool") boolean has_opset_version(); public native void clear_opset_version(); @@ -181,12 +192,4 @@ public native void SerializeWithCachedSizes( public static final int kOpsetVersionFieldNumber = kOpsetVersionFieldNumber(); public native @Cast("google::protobuf::int64") long opset_version(); public native void set_opset_version(@Cast("google::protobuf::int64") long value); - - // optional int32 ir_version = 2; - public native @Cast("bool") boolean has_ir_version(); - public native void clear_ir_version(); - @MemberGetter public static native int kIrVersionFieldNumber(); - public static final int kIrVersionFieldNumber = kIrVersionFieldNumber(); - public native @Cast("google::protobuf::int32") int ir_version(); - public native void set_ir_version(@Cast("google::protobuf::int32") int value); } diff --git a/onnx/src/gen/java/org/bytedeco/onnx/OperatorSetProtoDefaultTypeInternal.java b/onnx/src/gen/java/org/bytedeco/onnx/OperatorSetProtoDefaultTypeInternal.java index 14fa5fdfb9b..3b342ad2157 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/OperatorSetProtoDefaultTypeInternal.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/OperatorSetProtoDefaultTypeInternal.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Optimizer.java b/onnx/src/gen/java/org/bytedeco/onnx/Optimizer.java index c3e5653d139..3e1646032b5 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Optimizer.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Optimizer.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Or_Onnx_ver1.java b/onnx/src/gen/java/org/bytedeco/onnx/Or_Onnx_ver1.java index 068b183b10f..0658f792baa 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Or_Onnx_ver1.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Or_Onnx_ver1.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Or_Onnx_ver7.java b/onnx/src/gen/java/org/bytedeco/onnx/Or_Onnx_ver7.java index b11957085c8..1df6755e69b 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Or_Onnx_ver7.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Or_Onnx_ver7.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/PRelu_Onnx_ver1.java b/onnx/src/gen/java/org/bytedeco/onnx/PRelu_Onnx_ver1.java index f9ad5e264e7..3ae8a67c238 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/PRelu_Onnx_ver1.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/PRelu_Onnx_ver1.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/PRelu_Onnx_ver6.java b/onnx/src/gen/java/org/bytedeco/onnx/PRelu_Onnx_ver6.java index 562b7beb7dc..8b832cb4a5d 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/PRelu_Onnx_ver6.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/PRelu_Onnx_ver6.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/PRelu_Onnx_ver7.java b/onnx/src/gen/java/org/bytedeco/onnx/PRelu_Onnx_ver7.java index 172d31d44ba..bd9add272c4 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/PRelu_Onnx_ver7.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/PRelu_Onnx_ver7.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/PRelu_Onnx_ver9.java b/onnx/src/gen/java/org/bytedeco/onnx/PRelu_Onnx_ver9.java index d23e506582a..d82dc701a01 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/PRelu_Onnx_ver9.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/PRelu_Onnx_ver9.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Pad_Onnx_ver1.java b/onnx/src/gen/java/org/bytedeco/onnx/Pad_Onnx_ver1.java index 5ffca2057b4..e36e3f1d964 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Pad_Onnx_ver1.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Pad_Onnx_ver1.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Pad_Onnx_ver2.java b/onnx/src/gen/java/org/bytedeco/onnx/Pad_Onnx_ver2.java index 5d1b4ce02af..ec6c9cd6a89 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Pad_Onnx_ver2.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Pad_Onnx_ver2.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/ParseContext.java b/onnx/src/gen/java/org/bytedeco/onnx/ParseContext.java new file mode 100644 index 00000000000..d8ac480d43c --- /dev/null +++ b/onnx/src/gen/java/org/bytedeco/onnx/ParseContext.java @@ -0,0 +1,20 @@ +// Targeted by JavaCPP version 1.5.1-SNAPSHOT: DO NOT EDIT THIS FILE + +package org.bytedeco.onnx; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +import static org.bytedeco.onnx.global.onnx.*; + + +// #if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER +// See parse_context.h for explanation +@Namespace("google::protobuf::internal") @Opaque @Properties(inherit = org.bytedeco.onnx.presets.onnx.class) +public class ParseContext extends Pointer { + /** Empty constructor. Calls {@code super((Pointer)null)}. */ + public ParseContext() { super((Pointer)null); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public ParseContext(Pointer p) { super(p); } +} diff --git a/onnx/src/gen/java/org/bytedeco/onnx/ParseFunc.java b/onnx/src/gen/java/org/bytedeco/onnx/ParseFunc.java new file mode 100644 index 00000000000..5cce720ce73 --- /dev/null +++ b/onnx/src/gen/java/org/bytedeco/onnx/ParseFunc.java @@ -0,0 +1,20 @@ +// Targeted by JavaCPP version 1.5.1-SNAPSHOT: DO NOT EDIT THIS FILE + +package org.bytedeco.onnx; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +import static org.bytedeco.onnx.global.onnx.*; + +@Properties(inherit = org.bytedeco.onnx.presets.onnx.class) +public class ParseFunc extends FunctionPointer { + static { Loader.load(); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public ParseFunc(Pointer p) { super(p); } + protected ParseFunc() { allocate(); } + private native void allocate(); + public native @Cast("const char*") BytePointer call(@Cast("const char*") BytePointer ptr, @Cast("const char*") BytePointer end, Pointer object, + ParseContext ctx); +} diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Pass.java b/onnx/src/gen/java/org/bytedeco/onnx/Pass.java index 25a0364f353..6f031d866b0 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Pass.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Pass.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/PostPassAnalysis.java b/onnx/src/gen/java/org/bytedeco/onnx/PostPassAnalysis.java index 7cccc7f1230..eaf1b9dad76 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/PostPassAnalysis.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/PostPassAnalysis.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Pow_Onnx_ver1.java b/onnx/src/gen/java/org/bytedeco/onnx/Pow_Onnx_ver1.java index 9ff98f9be80..f708b022366 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Pow_Onnx_ver1.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Pow_Onnx_ver1.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Pow_Onnx_ver7.java b/onnx/src/gen/java/org/bytedeco/onnx/Pow_Onnx_ver7.java index 00a6c2a6f50..2a95fb10350 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Pow_Onnx_ver7.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Pow_Onnx_ver7.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/PredicateBasedPass.java b/onnx/src/gen/java/org/bytedeco/onnx/PredicateBasedPass.java index b9e683f8f5b..78d0a43bc17 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/PredicateBasedPass.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/PredicateBasedPass.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Printer.java b/onnx/src/gen/java/org/bytedeco/onnx/Printer.java index 5552744c2dd..1cb48f856de 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Printer.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Printer.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/QLinearConv_Onnx_ver10.java b/onnx/src/gen/java/org/bytedeco/onnx/QLinearConv_Onnx_ver10.java new file mode 100644 index 00000000000..0491f4d1d6b --- /dev/null +++ b/onnx/src/gen/java/org/bytedeco/onnx/QLinearConv_Onnx_ver10.java @@ -0,0 +1,17 @@ +// Targeted by JavaCPP version 1.5.1-SNAPSHOT: DO NOT EDIT THIS FILE + +package org.bytedeco.onnx; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +import static org.bytedeco.onnx.global.onnx.*; + +@Namespace("onnx") @Opaque @Properties(inherit = org.bytedeco.onnx.presets.onnx.class) +public class QLinearConv_Onnx_ver10 extends Pointer { + /** Empty constructor. Calls {@code super((Pointer)null)}. */ + public QLinearConv_Onnx_ver10() { super((Pointer)null); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public QLinearConv_Onnx_ver10(Pointer p) { super(p); } +} diff --git a/onnx/src/gen/java/org/bytedeco/onnx/QLinearMatMul_Onnx_ver10.java b/onnx/src/gen/java/org/bytedeco/onnx/QLinearMatMul_Onnx_ver10.java new file mode 100644 index 00000000000..8b964032b81 --- /dev/null +++ b/onnx/src/gen/java/org/bytedeco/onnx/QLinearMatMul_Onnx_ver10.java @@ -0,0 +1,17 @@ +// Targeted by JavaCPP version 1.5.1-SNAPSHOT: DO NOT EDIT THIS FILE + +package org.bytedeco.onnx; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +import static org.bytedeco.onnx.global.onnx.*; + +@Namespace("onnx") @Opaque @Properties(inherit = org.bytedeco.onnx.presets.onnx.class) +public class QLinearMatMul_Onnx_ver10 extends Pointer { + /** Empty constructor. Calls {@code super((Pointer)null)}. */ + public QLinearMatMul_Onnx_ver10() { super((Pointer)null); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public QLinearMatMul_Onnx_ver10(Pointer p) { super(p); } +} diff --git a/onnx/src/gen/java/org/bytedeco/onnx/GivenTensorFill_Onnx_ver1.java b/onnx/src/gen/java/org/bytedeco/onnx/QuantizeLinear_Onnx_ver10.java similarity index 61% rename from onnx/src/gen/java/org/bytedeco/onnx/GivenTensorFill_Onnx_ver1.java rename to onnx/src/gen/java/org/bytedeco/onnx/QuantizeLinear_Onnx_ver10.java index f9d20ca3593..afc470912f3 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/GivenTensorFill_Onnx_ver1.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/QuantizeLinear_Onnx_ver10.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.onnx; @@ -9,9 +9,9 @@ import static org.bytedeco.onnx.global.onnx.*; @Namespace("onnx") @Opaque @Properties(inherit = org.bytedeco.onnx.presets.onnx.class) -public class GivenTensorFill_Onnx_ver1 extends Pointer { +public class QuantizeLinear_Onnx_ver10 extends Pointer { /** Empty constructor. Calls {@code super((Pointer)null)}. */ - public GivenTensorFill_Onnx_ver1() { super((Pointer)null); } + public QuantizeLinear_Onnx_ver10() { super((Pointer)null); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ - public GivenTensorFill_Onnx_ver1(Pointer p) { super(p); } + public QuantizeLinear_Onnx_ver10(Pointer p) { super(p); } } diff --git a/onnx/src/gen/java/org/bytedeco/onnx/RNN_Onnx_ver1.java b/onnx/src/gen/java/org/bytedeco/onnx/RNN_Onnx_ver1.java index 1b9ff637ec1..aa9563770d1 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/RNN_Onnx_ver1.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/RNN_Onnx_ver1.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/RNN_Onnx_ver7.java b/onnx/src/gen/java/org/bytedeco/onnx/RNN_Onnx_ver7.java index 3db9502c373..3be2fa59d9b 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/RNN_Onnx_ver7.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/RNN_Onnx_ver7.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/RandomNormalLike_Onnx_ver1.java b/onnx/src/gen/java/org/bytedeco/onnx/RandomNormalLike_Onnx_ver1.java index e97f065accf..1313c539dc0 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/RandomNormalLike_Onnx_ver1.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/RandomNormalLike_Onnx_ver1.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/RandomNormal_Onnx_ver1.java b/onnx/src/gen/java/org/bytedeco/onnx/RandomNormal_Onnx_ver1.java index 2c98d46ac74..d91bd63c82a 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/RandomNormal_Onnx_ver1.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/RandomNormal_Onnx_ver1.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/RandomUniformLike_Onnx_ver1.java b/onnx/src/gen/java/org/bytedeco/onnx/RandomUniformLike_Onnx_ver1.java index cd8253d0109..c1f788fc39b 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/RandomUniformLike_Onnx_ver1.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/RandomUniformLike_Onnx_ver1.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/RandomUniform_Onnx_ver1.java b/onnx/src/gen/java/org/bytedeco/onnx/RandomUniform_Onnx_ver1.java index 511fc60cd14..dfe6977c85d 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/RandomUniform_Onnx_ver1.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/RandomUniform_Onnx_ver1.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Reciprocal_Onnx_ver1.java b/onnx/src/gen/java/org/bytedeco/onnx/Reciprocal_Onnx_ver1.java index 35b358a543f..adf457c3b98 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Reciprocal_Onnx_ver1.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Reciprocal_Onnx_ver1.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Reciprocal_Onnx_ver6.java b/onnx/src/gen/java/org/bytedeco/onnx/Reciprocal_Onnx_ver6.java index 1c1fc06a5d5..ce6d88f0e22 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Reciprocal_Onnx_ver6.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Reciprocal_Onnx_ver6.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/ReduceL1_Onnx_ver1.java b/onnx/src/gen/java/org/bytedeco/onnx/ReduceL1_Onnx_ver1.java index 008b48b6564..87f06833524 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/ReduceL1_Onnx_ver1.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/ReduceL1_Onnx_ver1.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/ReduceL2_Onnx_ver1.java b/onnx/src/gen/java/org/bytedeco/onnx/ReduceL2_Onnx_ver1.java index b27f561c50b..60e3b63252c 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/ReduceL2_Onnx_ver1.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/ReduceL2_Onnx_ver1.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/ReduceLogSumExp_Onnx_ver1.java b/onnx/src/gen/java/org/bytedeco/onnx/ReduceLogSumExp_Onnx_ver1.java index feae17aa530..772609d9309 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/ReduceLogSumExp_Onnx_ver1.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/ReduceLogSumExp_Onnx_ver1.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/ReduceLogSum_Onnx_ver1.java b/onnx/src/gen/java/org/bytedeco/onnx/ReduceLogSum_Onnx_ver1.java index 430655efc21..41f6a646571 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/ReduceLogSum_Onnx_ver1.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/ReduceLogSum_Onnx_ver1.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/ReduceMax_Onnx_ver1.java b/onnx/src/gen/java/org/bytedeco/onnx/ReduceMax_Onnx_ver1.java index fd51bb72496..1d7770db556 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/ReduceMax_Onnx_ver1.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/ReduceMax_Onnx_ver1.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/ReduceMean_Onnx_ver1.java b/onnx/src/gen/java/org/bytedeco/onnx/ReduceMean_Onnx_ver1.java index 519189cbee8..1a4d8a492fb 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/ReduceMean_Onnx_ver1.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/ReduceMean_Onnx_ver1.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/ReduceMin_Onnx_ver1.java b/onnx/src/gen/java/org/bytedeco/onnx/ReduceMin_Onnx_ver1.java index 7e60a9232ca..4041a342c90 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/ReduceMin_Onnx_ver1.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/ReduceMin_Onnx_ver1.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/ReduceProd_Onnx_ver1.java b/onnx/src/gen/java/org/bytedeco/onnx/ReduceProd_Onnx_ver1.java index 5f37ba75528..fdb768168d7 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/ReduceProd_Onnx_ver1.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/ReduceProd_Onnx_ver1.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/ReduceSumSquare_Onnx_ver1.java b/onnx/src/gen/java/org/bytedeco/onnx/ReduceSumSquare_Onnx_ver1.java index 481cf155eef..18d02b537f8 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/ReduceSumSquare_Onnx_ver1.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/ReduceSumSquare_Onnx_ver1.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/ReduceSum_Onnx_ver1.java b/onnx/src/gen/java/org/bytedeco/onnx/ReduceSum_Onnx_ver1.java index b598d640d42..9a3b3375366 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/ReduceSum_Onnx_ver1.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/ReduceSum_Onnx_ver1.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Relu_Onnx_ver1.java b/onnx/src/gen/java/org/bytedeco/onnx/Relu_Onnx_ver1.java index 6e2b40e6cd6..52c4ab7ea1c 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Relu_Onnx_ver1.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Relu_Onnx_ver1.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Relu_Onnx_ver6.java b/onnx/src/gen/java/org/bytedeco/onnx/Relu_Onnx_ver6.java index 6c2e030fdea..2fbaaca3f3a 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Relu_Onnx_ver6.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Relu_Onnx_ver6.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/RepeatedPtrFieldBase.java b/onnx/src/gen/java/org/bytedeco/onnx/RepeatedPtrFieldBase.java index 3d8c0147b85..640c167506f 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/RepeatedPtrFieldBase.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/RepeatedPtrFieldBase.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.onnx; @@ -9,6 +9,9 @@ import static org.bytedeco.onnx.global.onnx.*; +// #if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER +// #endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER + @Namespace("google::protobuf::internal") @Opaque @Properties(inherit = org.bytedeco.onnx.presets.onnx.class) public class RepeatedPtrFieldBase extends Pointer { /** Empty constructor. Calls {@code super((Pointer)null)}. */ diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Reshape_Onnx_ver1.java b/onnx/src/gen/java/org/bytedeco/onnx/Reshape_Onnx_ver1.java index 16de8d7972f..eaa71438db8 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Reshape_Onnx_ver1.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Reshape_Onnx_ver1.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Reshape_Onnx_ver5.java b/onnx/src/gen/java/org/bytedeco/onnx/Reshape_Onnx_ver5.java index d970909d68b..2c3c92d0fee 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Reshape_Onnx_ver5.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Reshape_Onnx_ver5.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Resize_Onnx_ver10.java b/onnx/src/gen/java/org/bytedeco/onnx/Resize_Onnx_ver10.java new file mode 100644 index 00000000000..76a7264b566 --- /dev/null +++ b/onnx/src/gen/java/org/bytedeco/onnx/Resize_Onnx_ver10.java @@ -0,0 +1,17 @@ +// Targeted by JavaCPP version 1.5.1-SNAPSHOT: DO NOT EDIT THIS FILE + +package org.bytedeco.onnx; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +import static org.bytedeco.onnx.global.onnx.*; + +@Namespace("onnx") @Opaque @Properties(inherit = org.bytedeco.onnx.presets.onnx.class) +public class Resize_Onnx_ver10 extends Pointer { + /** Empty constructor. Calls {@code super((Pointer)null)}. */ + public Resize_Onnx_ver10() { super((Pointer)null); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public Resize_Onnx_ver10(Pointer p) { super(p); } +} diff --git a/onnx/src/gen/java/org/bytedeco/onnx/ReverseSequence_Onnx_ver10.java b/onnx/src/gen/java/org/bytedeco/onnx/ReverseSequence_Onnx_ver10.java new file mode 100644 index 00000000000..620329fb327 --- /dev/null +++ b/onnx/src/gen/java/org/bytedeco/onnx/ReverseSequence_Onnx_ver10.java @@ -0,0 +1,17 @@ +// Targeted by JavaCPP version 1.5.1-SNAPSHOT: DO NOT EDIT THIS FILE + +package org.bytedeco.onnx; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +import static org.bytedeco.onnx.global.onnx.*; + +@Namespace("onnx") @Opaque @Properties(inherit = org.bytedeco.onnx.presets.onnx.class) +public class ReverseSequence_Onnx_ver10 extends Pointer { + /** Empty constructor. Calls {@code super((Pointer)null)}. */ + public ReverseSequence_Onnx_ver10() { super((Pointer)null); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public ReverseSequence_Onnx_ver10(Pointer p) { super(p); } +} diff --git a/onnx/src/gen/java/org/bytedeco/onnx/RoiAlign_Onnx_ver10.java b/onnx/src/gen/java/org/bytedeco/onnx/RoiAlign_Onnx_ver10.java new file mode 100644 index 00000000000..3f3ecdcef67 --- /dev/null +++ b/onnx/src/gen/java/org/bytedeco/onnx/RoiAlign_Onnx_ver10.java @@ -0,0 +1,17 @@ +// Targeted by JavaCPP version 1.5.1-SNAPSHOT: DO NOT EDIT THIS FILE + +package org.bytedeco.onnx; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +import static org.bytedeco.onnx.global.onnx.*; + +@Namespace("onnx") @Opaque @Properties(inherit = org.bytedeco.onnx.presets.onnx.class) +public class RoiAlign_Onnx_ver10 extends Pointer { + /** Empty constructor. Calls {@code super((Pointer)null)}. */ + public RoiAlign_Onnx_ver10() { super((Pointer)null); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public RoiAlign_Onnx_ver10(Pointer p) { super(p); } +} diff --git a/onnx/src/gen/java/org/bytedeco/onnx/SVMClassifier_OnnxML_ver1.java b/onnx/src/gen/java/org/bytedeco/onnx/SVMClassifier_OnnxML_ver1.java index 1aa88e2dfef..bfb54203c0b 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/SVMClassifier_OnnxML_ver1.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/SVMClassifier_OnnxML_ver1.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/SVMRegressor_OnnxML_ver1.java b/onnx/src/gen/java/org/bytedeco/onnx/SVMRegressor_OnnxML_ver1.java index ff01357e501..fdf37e6a483 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/SVMRegressor_OnnxML_ver1.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/SVMRegressor_OnnxML_ver1.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Scale_Onnx_ver1.java b/onnx/src/gen/java/org/bytedeco/onnx/Scale_Onnx_ver1.java deleted file mode 100644 index 9ec5d7be09d..00000000000 --- a/onnx/src/gen/java/org/bytedeco/onnx/Scale_Onnx_ver1.java +++ /dev/null @@ -1,17 +0,0 @@ -// Targeted by JavaCPP version 1.5: DO NOT EDIT THIS FILE - -package org.bytedeco.onnx; - -import java.nio.*; -import org.bytedeco.javacpp.*; -import org.bytedeco.javacpp.annotation.*; - -import static org.bytedeco.onnx.global.onnx.*; - -@Namespace("onnx") @Opaque @Properties(inherit = org.bytedeco.onnx.presets.onnx.class) -public class Scale_Onnx_ver1 extends Pointer { - /** Empty constructor. Calls {@code super((Pointer)null)}. */ - public Scale_Onnx_ver1() { super((Pointer)null); } - /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ - public Scale_Onnx_ver1(Pointer p) { super(p); } -} diff --git a/onnx/src/gen/java/org/bytedeco/onnx/ScaledTanh_Onnx_ver1.java b/onnx/src/gen/java/org/bytedeco/onnx/ScaledTanh_Onnx_ver1.java deleted file mode 100644 index 5d9d166c197..00000000000 --- a/onnx/src/gen/java/org/bytedeco/onnx/ScaledTanh_Onnx_ver1.java +++ /dev/null @@ -1,17 +0,0 @@ -// Targeted by JavaCPP version 1.5: DO NOT EDIT THIS FILE - -package org.bytedeco.onnx; - -import java.nio.*; -import org.bytedeco.javacpp.*; -import org.bytedeco.javacpp.annotation.*; - -import static org.bytedeco.onnx.global.onnx.*; - -@Namespace("onnx") @Opaque @Properties(inherit = org.bytedeco.onnx.presets.onnx.class) -public class ScaledTanh_Onnx_ver1 extends Pointer { - /** Empty constructor. Calls {@code super((Pointer)null)}. */ - public ScaledTanh_Onnx_ver1() { super((Pointer)null); } - /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ - public ScaledTanh_Onnx_ver1(Pointer p) { super(p); } -} diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Scaler_OnnxML_ver1.java b/onnx/src/gen/java/org/bytedeco/onnx/Scaler_OnnxML_ver1.java index d93b79ef13b..1c7c54dcec3 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Scaler_OnnxML_ver1.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Scaler_OnnxML_ver1.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Scan_Onnx_ver8.java b/onnx/src/gen/java/org/bytedeco/onnx/Scan_Onnx_ver8.java index 6584871f35b..d7c391fedb6 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Scan_Onnx_ver8.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Scan_Onnx_ver8.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Scan_Onnx_ver9.java b/onnx/src/gen/java/org/bytedeco/onnx/Scan_Onnx_ver9.java index c7a66cc60dd..bb7a97b4f24 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Scan_Onnx_ver9.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Scan_Onnx_ver9.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Scatter_Onnx_ver9.java b/onnx/src/gen/java/org/bytedeco/onnx/Scatter_Onnx_ver9.java index f0e368903f9..97124168e2e 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Scatter_Onnx_ver9.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Scatter_Onnx_ver9.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/SchemaError.java b/onnx/src/gen/java/org/bytedeco/onnx/SchemaError.java index 2972f8f2459..51ea4b31c95 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/SchemaError.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/SchemaError.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Selu_Onnx_ver1.java b/onnx/src/gen/java/org/bytedeco/onnx/Selu_Onnx_ver1.java index a8514bf13e3..78d431ddde6 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Selu_Onnx_ver1.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Selu_Onnx_ver1.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Selu_Onnx_ver6.java b/onnx/src/gen/java/org/bytedeco/onnx/Selu_Onnx_ver6.java index bd03ae364d4..b1f30820dba 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Selu_Onnx_ver6.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Selu_Onnx_ver6.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/ServiceDescriptor.java b/onnx/src/gen/java/org/bytedeco/onnx/ServiceDescriptor.java index 7415185b8bb..7090105f00b 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/ServiceDescriptor.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/ServiceDescriptor.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.onnx; @@ -9,16 +9,15 @@ import static org.bytedeco.onnx.global.onnx.*; -// Describes an RPC service. To get the ServiceDescriptor for a service, -// call Service::GetDescriptor(). Generated service classes also have a -// static method called descriptor() which returns the type's -// ServiceDescriptor. Use DescriptorPool to construct your own descriptors. +// Describes an RPC service. Use DescriptorPool to construct your own +// descriptors. @Namespace("google::protobuf") @NoOffset @Properties(inherit = org.bytedeco.onnx.presets.onnx.class) public class ServiceDescriptor extends Pointer { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public ServiceDescriptor(Pointer p) { super(p); } + // The name of the service, not including its containing scope. public native @StdString BytePointer name(); // The fully-qualified name of the service, scope delimited by periods. @@ -31,9 +30,8 @@ public class ServiceDescriptor extends Pointer { // Get options for this service type. These are specified in the .proto file // by placing lines like "option foo = 1234;" in the service definition. - // Allowed options are defined by ServiceOptions in - // google/protobuf/descriptor.proto, and any available extensions of that - // message. + // Allowed options are defined by ServiceOptions in descriptor.proto, and any + // available extensions of that message. public native @Const @ByRef ServiceOptions options(); // The number of methods this service defines. diff --git a/onnx/src/gen/java/org/bytedeco/onnx/ServiceDescriptorProto.java b/onnx/src/gen/java/org/bytedeco/onnx/ServiceDescriptorProto.java index 79935a94fc1..807897917fb 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/ServiceDescriptorProto.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/ServiceDescriptorProto.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/ServiceOptions.java b/onnx/src/gen/java/org/bytedeco/onnx/ServiceOptions.java index 39fb75d792b..622658008a7 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/ServiceOptions.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/ServiceOptions.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Shape_Onnx_ver1.java b/onnx/src/gen/java/org/bytedeco/onnx/Shape_Onnx_ver1.java index a63bd6495f6..bf9a1adb893 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Shape_Onnx_ver1.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Shape_Onnx_ver1.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Shrink_Onnx_ver9.java b/onnx/src/gen/java/org/bytedeco/onnx/Shrink_Onnx_ver9.java index ffa283c0d36..7e916b0c014 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Shrink_Onnx_ver9.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Shrink_Onnx_ver9.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Sigmoid_Onnx_ver1.java b/onnx/src/gen/java/org/bytedeco/onnx/Sigmoid_Onnx_ver1.java index a11ef98d990..fbd513a23b5 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Sigmoid_Onnx_ver1.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Sigmoid_Onnx_ver1.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Sigmoid_Onnx_ver6.java b/onnx/src/gen/java/org/bytedeco/onnx/Sigmoid_Onnx_ver6.java index 58f1c27e653..0d860d3c5ed 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Sigmoid_Onnx_ver6.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Sigmoid_Onnx_ver6.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Sign_Onnx_ver9.java b/onnx/src/gen/java/org/bytedeco/onnx/Sign_Onnx_ver9.java index f1482502462..e2e9a65086f 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Sign_Onnx_ver9.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Sign_Onnx_ver9.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Sin_Onnx_ver7.java b/onnx/src/gen/java/org/bytedeco/onnx/Sin_Onnx_ver7.java index d26e9afa7f9..14781230640 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Sin_Onnx_ver7.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Sin_Onnx_ver7.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Sinh_Onnx_ver9.java b/onnx/src/gen/java/org/bytedeco/onnx/Sinh_Onnx_ver9.java index bc2098fbd2f..6fd27fdfc16 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Sinh_Onnx_ver9.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Sinh_Onnx_ver9.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Size_Onnx_ver1.java b/onnx/src/gen/java/org/bytedeco/onnx/Size_Onnx_ver1.java index b8f9fccbe3b..a2f09a85199 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Size_Onnx_ver1.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Size_Onnx_ver1.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Slice_Onnx_ver1.java b/onnx/src/gen/java/org/bytedeco/onnx/Slice_Onnx_ver1.java index e8590efc362..0f78f433552 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Slice_Onnx_ver1.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Slice_Onnx_ver1.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Crop_Onnx_ver1.java b/onnx/src/gen/java/org/bytedeco/onnx/Slice_Onnx_ver10.java similarity index 64% rename from onnx/src/gen/java/org/bytedeco/onnx/Crop_Onnx_ver1.java rename to onnx/src/gen/java/org/bytedeco/onnx/Slice_Onnx_ver10.java index a6fe5cceac1..80ca0cd37eb 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Crop_Onnx_ver1.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Slice_Onnx_ver10.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.onnx; @@ -9,9 +9,9 @@ import static org.bytedeco.onnx.global.onnx.*; @Namespace("onnx") @Opaque @Properties(inherit = org.bytedeco.onnx.presets.onnx.class) -public class Crop_Onnx_ver1 extends Pointer { +public class Slice_Onnx_ver10 extends Pointer { /** Empty constructor. Calls {@code super((Pointer)null)}. */ - public Crop_Onnx_ver1() { super((Pointer)null); } + public Slice_Onnx_ver10() { super((Pointer)null); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ - public Crop_Onnx_ver1(Pointer p) { super(p); } + public Slice_Onnx_ver10(Pointer p) { super(p); } } diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Softmax_Onnx_ver1.java b/onnx/src/gen/java/org/bytedeco/onnx/Softmax_Onnx_ver1.java index 6019951912b..66c4d5bb39c 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Softmax_Onnx_ver1.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Softmax_Onnx_ver1.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Softplus_Onnx_ver1.java b/onnx/src/gen/java/org/bytedeco/onnx/Softplus_Onnx_ver1.java index 36336564b01..bfb86780a84 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Softplus_Onnx_ver1.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Softplus_Onnx_ver1.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Softsign_Onnx_ver1.java b/onnx/src/gen/java/org/bytedeco/onnx/Softsign_Onnx_ver1.java index 8e4ab2eb5da..50bc9da89e6 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Softsign_Onnx_ver1.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Softsign_Onnx_ver1.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/SourceCodeInfo.java b/onnx/src/gen/java/org/bytedeco/onnx/SourceCodeInfo.java index 7a9ecd8bec6..f4959441567 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/SourceCodeInfo.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/SourceCodeInfo.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/SourceLocation.java b/onnx/src/gen/java/org/bytedeco/onnx/SourceLocation.java index bd3b6ed2df2..1f4f9fd19b1 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/SourceLocation.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/SourceLocation.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/SpaceToDepth_Onnx_ver1.java b/onnx/src/gen/java/org/bytedeco/onnx/SpaceToDepth_Onnx_ver1.java index e89d6c45f1f..63bb1b7fc9f 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/SpaceToDepth_Onnx_ver1.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/SpaceToDepth_Onnx_ver1.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Split_Onnx_ver1.java b/onnx/src/gen/java/org/bytedeco/onnx/Split_Onnx_ver1.java index 2e618714c1f..a3d75f3a692 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Split_Onnx_ver1.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Split_Onnx_ver1.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Split_Onnx_ver2.java b/onnx/src/gen/java/org/bytedeco/onnx/Split_Onnx_ver2.java index 9ab94063ace..954d2b9dc39 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Split_Onnx_ver2.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Split_Onnx_ver2.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Sqrt_Onnx_ver1.java b/onnx/src/gen/java/org/bytedeco/onnx/Sqrt_Onnx_ver1.java index f421de7ab89..414b5716d7f 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Sqrt_Onnx_ver1.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Sqrt_Onnx_ver1.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Sqrt_Onnx_ver6.java b/onnx/src/gen/java/org/bytedeco/onnx/Sqrt_Onnx_ver6.java index 460999e6db6..4a6fdec2606 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Sqrt_Onnx_ver6.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Sqrt_Onnx_ver6.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Squeeze_Onnx_ver1.java b/onnx/src/gen/java/org/bytedeco/onnx/Squeeze_Onnx_ver1.java index 7b9e1881392..73803d55fd1 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Squeeze_Onnx_ver1.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Squeeze_Onnx_ver1.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Status.java b/onnx/src/gen/java/org/bytedeco/onnx/Status.java index 370e7ad789d..3eef0a062b0 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Status.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Status.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/StringAttributeMap.java b/onnx/src/gen/java/org/bytedeco/onnx/StringAttributeMap.java index 11fd87ff273..04b4bbf41db 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/StringAttributeMap.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/StringAttributeMap.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/StringAttributeProtoMap.java b/onnx/src/gen/java/org/bytedeco/onnx/StringAttributeProtoMap.java index d91567d984f..8a24922004d 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/StringAttributeProtoMap.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/StringAttributeProtoMap.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/StringIntIntPairMap.java b/onnx/src/gen/java/org/bytedeco/onnx/StringIntIntPairMap.java index d47ae7496e9..9c0eee5df62 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/StringIntIntPairMap.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/StringIntIntPairMap.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/StringIntMap.java b/onnx/src/gen/java/org/bytedeco/onnx/StringIntMap.java index a3c6bbd80ef..38e2ad78127 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/StringIntMap.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/StringIntMap.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/ThresholdedRelu_Onnx_ver1.java b/onnx/src/gen/java/org/bytedeco/onnx/StringNormalizer_Onnx_ver10.java similarity index 56% rename from onnx/src/gen/java/org/bytedeco/onnx/ThresholdedRelu_Onnx_ver1.java rename to onnx/src/gen/java/org/bytedeco/onnx/StringNormalizer_Onnx_ver10.java index 975949a64df..655de6faa44 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/ThresholdedRelu_Onnx_ver1.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/StringNormalizer_Onnx_ver10.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.onnx; @@ -8,10 +8,12 @@ import static org.bytedeco.onnx.global.onnx.*; + +// Forward declarations for ai.onnx version 10 @Namespace("onnx") @Opaque @Properties(inherit = org.bytedeco.onnx.presets.onnx.class) -public class ThresholdedRelu_Onnx_ver1 extends Pointer { +public class StringNormalizer_Onnx_ver10 extends Pointer { /** Empty constructor. Calls {@code super((Pointer)null)}. */ - public ThresholdedRelu_Onnx_ver1() { super((Pointer)null); } + public StringNormalizer_Onnx_ver10() { super((Pointer)null); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ - public ThresholdedRelu_Onnx_ver1(Pointer p) { super(p); } + public StringNormalizer_Onnx_ver10(Pointer p) { super(p); } } diff --git a/onnx/src/gen/java/org/bytedeco/onnx/StringPassMap.java b/onnx/src/gen/java/org/bytedeco/onnx/StringPassMap.java index 0526bf19cff..ad8a5372f08 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/StringPassMap.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/StringPassMap.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/StringSet.java b/onnx/src/gen/java/org/bytedeco/onnx/StringSet.java index 72d091e74cd..37943b7a5f5 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/StringSet.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/StringSet.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/StringStringEntryProto.java b/onnx/src/gen/java/org/bytedeco/onnx/StringStringEntryProto.java index 4533b3e2bcf..571ce7ef0ce 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/StringStringEntryProto.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/StringStringEntryProto.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.onnx; @@ -58,16 +58,19 @@ public class StringStringEntryProto extends MessageLite { public native @Cast("bool") boolean IsInitialized(); public native @Cast("size_t") long ByteSizeLong(); +// #if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER +// #else public native @Cast("bool") boolean MergePartialFromCodedStream( CodedInputStream input); +// #endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER public native void SerializeWithCachedSizes( CodedOutputStream output); public native @Cast("google::protobuf::uint8*") BytePointer InternalSerializeWithCachedSizesToArray( - @Cast("bool") boolean deterministic, @Cast("google::protobuf::uint8*") BytePointer target); + @Cast("google::protobuf::uint8*") BytePointer target); public native @Cast("google::protobuf::uint8*") ByteBuffer InternalSerializeWithCachedSizesToArray( - @Cast("bool") boolean deterministic, @Cast("google::protobuf::uint8*") ByteBuffer target); + @Cast("google::protobuf::uint8*") ByteBuffer target); public native @Cast("google::protobuf::uint8*") byte[] InternalSerializeWithCachedSizesToArray( - @Cast("bool") boolean deterministic, @Cast("google::protobuf::uint8*") byte[] target); + @Cast("google::protobuf::uint8*") byte[] target); public native int GetCachedSize(); public native @ByVal @Cast("google::protobuf::Metadata*") Pointer GetMetadata(); diff --git a/onnx/src/gen/java/org/bytedeco/onnx/StringStringEntryProtoDefaultTypeInternal.java b/onnx/src/gen/java/org/bytedeco/onnx/StringStringEntryProtoDefaultTypeInternal.java index 62f2e49e6bd..0623471353e 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/StringStringEntryProtoDefaultTypeInternal.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/StringStringEntryProtoDefaultTypeInternal.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/StringTensorProtoMap.java b/onnx/src/gen/java/org/bytedeco/onnx/StringTensorProtoMap.java index 3ec5c55a915..e93e2d0b071 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/StringTensorProtoMap.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/StringTensorProtoMap.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/StringTypeProtoMap.java b/onnx/src/gen/java/org/bytedeco/onnx/StringTypeProtoMap.java index 540bf3106b0..636e8318c7c 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/StringTypeProtoMap.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/StringTypeProtoMap.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/StringVector.java b/onnx/src/gen/java/org/bytedeco/onnx/StringVector.java index 9234281690c..fa89fca7e5e 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/StringVector.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/StringVector.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Sub_Onnx_ver1.java b/onnx/src/gen/java/org/bytedeco/onnx/Sub_Onnx_ver1.java index bffbf8fcd5f..e80002c6833 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Sub_Onnx_ver1.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Sub_Onnx_ver1.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Sub_Onnx_ver6.java b/onnx/src/gen/java/org/bytedeco/onnx/Sub_Onnx_ver6.java index 0de7877a50b..3b1e34bd23e 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Sub_Onnx_ver6.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Sub_Onnx_ver6.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Sub_Onnx_ver7.java b/onnx/src/gen/java/org/bytedeco/onnx/Sub_Onnx_ver7.java index b0164a9ca0a..57cf6c5cd57 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Sub_Onnx_ver7.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Sub_Onnx_ver7.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Sum_Onnx_ver1.java b/onnx/src/gen/java/org/bytedeco/onnx/Sum_Onnx_ver1.java index b15400ce66a..259db598c77 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Sum_Onnx_ver1.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Sum_Onnx_ver1.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Sum_Onnx_ver6.java b/onnx/src/gen/java/org/bytedeco/onnx/Sum_Onnx_ver6.java index f5a9a024021..cc239f3e15d 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Sum_Onnx_ver6.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Sum_Onnx_ver6.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Sum_Onnx_ver8.java b/onnx/src/gen/java/org/bytedeco/onnx/Sum_Onnx_ver8.java index 4693d8058f8..5b991467b6f 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Sum_Onnx_ver8.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Sum_Onnx_ver8.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Symbol.java b/onnx/src/gen/java/org/bytedeco/onnx/Symbol.java index ce31d9d3102..a103b50f7b1 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Symbol.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Symbol.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/TableStruct.java b/onnx/src/gen/java/org/bytedeco/onnx/TableStruct_onnx_2fonnx_2dml_2eproto.java similarity index 54% rename from onnx/src/gen/java/org/bytedeco/onnx/TableStruct.java rename to onnx/src/gen/java/org/bytedeco/onnx/TableStruct_onnx_2fonnx_2dml_2eproto.java index 364dae18e97..edf299bcfe4 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/TableStruct.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/TableStruct_onnx_2fonnx_2dml_2eproto.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.onnx; @@ -8,20 +8,21 @@ import static org.bytedeco.onnx.global.onnx.*; + // Internal implementation detail -- do not use these members. -@Namespace("protobuf_onnx_2fonnx_2doperators_2dml_2eproto") @Properties(inherit = org.bytedeco.onnx.presets.onnx.class) -public class TableStruct extends Pointer { +@Properties(inherit = org.bytedeco.onnx.presets.onnx.class) +public class TableStruct_onnx_2fonnx_2dml_2eproto extends Pointer { static { Loader.load(); } /** Default native constructor. */ - public TableStruct() { super((Pointer)null); allocate(); } + public TableStruct_onnx_2fonnx_2dml_2eproto() { super((Pointer)null); allocate(); } /** Native array allocator. Access with {@link Pointer#position(long)}. */ - public TableStruct(long size) { super((Pointer)null); allocateArray(size); } + public TableStruct_onnx_2fonnx_2dml_2eproto(long size) { super((Pointer)null); allocateArray(size); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ - public TableStruct(Pointer p) { super(p); } + public TableStruct_onnx_2fonnx_2dml_2eproto(Pointer p) { super(p); } private native void allocate(); private native void allocateArray(long size); - @Override public TableStruct position(long position) { - return (TableStruct)super.position(position); + @Override public TableStruct_onnx_2fonnx_2dml_2eproto position(long position) { + return (TableStruct_onnx_2fonnx_2dml_2eproto)super.position(position); } @MemberGetter public static native @Cast("const google::protobuf::uint32") int offsets(int i); diff --git a/onnx/src/gen/java/org/bytedeco/onnx/TableStruct_onnx_2fonnx_2doperators_2dml_2eproto.java b/onnx/src/gen/java/org/bytedeco/onnx/TableStruct_onnx_2fonnx_2doperators_2dml_2eproto.java new file mode 100644 index 00000000000..88fdaccd2c5 --- /dev/null +++ b/onnx/src/gen/java/org/bytedeco/onnx/TableStruct_onnx_2fonnx_2doperators_2dml_2eproto.java @@ -0,0 +1,30 @@ +// Targeted by JavaCPP version 1.5.1-SNAPSHOT: DO NOT EDIT THIS FILE + +package org.bytedeco.onnx; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +import static org.bytedeco.onnx.global.onnx.*; + + +// Internal implementation detail -- do not use these members. +@Properties(inherit = org.bytedeco.onnx.presets.onnx.class) +public class TableStruct_onnx_2fonnx_2doperators_2dml_2eproto extends Pointer { + static { Loader.load(); } + /** Default native constructor. */ + public TableStruct_onnx_2fonnx_2doperators_2dml_2eproto() { super((Pointer)null); allocate(); } + /** Native array allocator. Access with {@link Pointer#position(long)}. */ + public TableStruct_onnx_2fonnx_2doperators_2dml_2eproto(long size) { super((Pointer)null); allocateArray(size); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public TableStruct_onnx_2fonnx_2doperators_2dml_2eproto(Pointer p) { super(p); } + private native void allocate(); + private native void allocateArray(long size); + @Override public TableStruct_onnx_2fonnx_2doperators_2dml_2eproto position(long position) { + return (TableStruct_onnx_2fonnx_2doperators_2dml_2eproto)super.position(position); + } + + @MemberGetter public static native @Cast("const google::protobuf::uint32") int offsets(int i); + @MemberGetter public static native @Cast("const google::protobuf::uint32*") IntPointer offsets(); +} diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Tan_Onnx_ver7.java b/onnx/src/gen/java/org/bytedeco/onnx/Tan_Onnx_ver7.java index 8e86eed2744..556dae10a0b 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Tan_Onnx_ver7.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Tan_Onnx_ver7.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Tanh_Onnx_ver1.java b/onnx/src/gen/java/org/bytedeco/onnx/Tanh_Onnx_ver1.java index 2b372a73da4..269ba079a77 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Tanh_Onnx_ver1.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Tanh_Onnx_ver1.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Tanh_Onnx_ver6.java b/onnx/src/gen/java/org/bytedeco/onnx/Tanh_Onnx_ver6.java index 4755b40d754..4ca0cccb940 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Tanh_Onnx_ver6.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Tanh_Onnx_ver6.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Tensor.java b/onnx/src/gen/java/org/bytedeco/onnx/Tensor.java index 7ed66395e21..234e4652d79 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Tensor.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Tensor.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/TensorAnnotation.java b/onnx/src/gen/java/org/bytedeco/onnx/TensorAnnotation.java new file mode 100644 index 00000000000..93a5f1fedad --- /dev/null +++ b/onnx/src/gen/java/org/bytedeco/onnx/TensorAnnotation.java @@ -0,0 +1,106 @@ +// Targeted by JavaCPP version 1.5.1-SNAPSHOT: DO NOT EDIT THIS FILE + +package org.bytedeco.onnx; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +import static org.bytedeco.onnx.global.onnx.*; + +// ------------------------------------------------------------------- + +@Namespace("onnx") @NoOffset @Properties(inherit = org.bytedeco.onnx.presets.onnx.class) +public class TensorAnnotation extends MessageLite { + static { Loader.load(); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public TensorAnnotation(Pointer p) { super(p); } + /** Native array allocator. Access with {@link Pointer#position(long)}. */ + public TensorAnnotation(long size) { super((Pointer)null); allocateArray(size); } + private native void allocateArray(long size); + @Override public TensorAnnotation position(long position) { + return (TensorAnnotation)super.position(position); + } + + public TensorAnnotation() { super((Pointer)null); allocate(); } + private native void allocate(); + + public TensorAnnotation(@Const @ByRef TensorAnnotation from) { super((Pointer)null); allocate(from); } + private native void allocate(@Const @ByRef TensorAnnotation from); + + public native @ByRef @Name("operator =") TensorAnnotation put(@Const @ByRef TensorAnnotation from); +// #if LANG_CXX11 +// #endif + public native @Const @ByRef UnknownFieldSet unknown_fields(); + public native UnknownFieldSet mutable_unknown_fields(); + + public static native @Cast("const google::protobuf::Descriptor*") Pointer descriptor(); + public static native @Const @ByRef TensorAnnotation default_instance(); + + public static native void InitAsDefaultInstance(); // FOR INTERNAL USE ONLY + public static native @Const TensorAnnotation internal_default_instance(); + @MemberGetter public static native int kIndexInFileMessages(); + public static final int kIndexInFileMessages = kIndexInFileMessages(); + + public native void Swap(TensorAnnotation other); + + + // implements Message ---------------------------------------------- + + public native TensorAnnotation New(); + + public native TensorAnnotation New(Arena arena); + public native void CopyFrom(@Cast("const google::protobuf::Message*") @ByRef MessageLite from); + public native void MergeFrom(@Cast("const google::protobuf::Message*") @ByRef MessageLite from); + public native void CopyFrom(@Const @ByRef TensorAnnotation from); + public native void MergeFrom(@Const @ByRef TensorAnnotation from); + public native void Clear(); + public native @Cast("bool") boolean IsInitialized(); + + public native @Cast("size_t") long ByteSizeLong(); +// #if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER +// #else + public native @Cast("bool") boolean MergePartialFromCodedStream( + CodedInputStream input); +// #endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER + public native void SerializeWithCachedSizes( + CodedOutputStream output); + public native @Cast("google::protobuf::uint8*") BytePointer InternalSerializeWithCachedSizesToArray( + @Cast("google::protobuf::uint8*") BytePointer target); + public native @Cast("google::protobuf::uint8*") ByteBuffer InternalSerializeWithCachedSizesToArray( + @Cast("google::protobuf::uint8*") ByteBuffer target); + public native @Cast("google::protobuf::uint8*") byte[] InternalSerializeWithCachedSizesToArray( + @Cast("google::protobuf::uint8*") byte[] target); + public native int GetCachedSize(); + + public native @ByVal @Cast("google::protobuf::Metadata*") Pointer GetMetadata(); + + // nested types ---------------------------------------------------- + + // accessors ------------------------------------------------------- + + // repeated .onnx.StringStringEntryProto quant_parameter_tensor_names = 2; + public native int quant_parameter_tensor_names_size(); + public native void clear_quant_parameter_tensor_names(); + @MemberGetter public static native int kQuantParameterTensorNamesFieldNumber(); + public static final int kQuantParameterTensorNamesFieldNumber = kQuantParameterTensorNamesFieldNumber(); + public native StringStringEntryProto mutable_quant_parameter_tensor_names(int index); + public native @Const @ByRef StringStringEntryProto quant_parameter_tensor_names(int index); + public native StringStringEntryProto add_quant_parameter_tensor_names(); + + // optional string tensor_name = 1; + public native @Cast("bool") boolean has_tensor_name(); + public native void clear_tensor_name(); + @MemberGetter public static native int kTensorNameFieldNumber(); + public static final int kTensorNameFieldNumber = kTensorNameFieldNumber(); + public native @StdString BytePointer tensor_name(); + public native void set_tensor_name(@StdString BytePointer value); + public native void set_tensor_name(@StdString String value); +// #if LANG_CXX11 +// #endif + public native void set_tensor_name(@Cast("const char*") BytePointer value, @Cast("size_t") long size); + public native void set_tensor_name(String value, @Cast("size_t") long size); + public native @StdString @Cast({"char*", "std::string*"}) BytePointer mutable_tensor_name(); + public native @StdString @Cast({"char*", "std::string*"}) BytePointer release_tensor_name(); + public native void set_allocated_tensor_name(@StdString @Cast({"char*", "std::string*"}) BytePointer tensor_name); +} diff --git a/onnx/src/gen/java/org/bytedeco/onnx/TensorAnnotationDefaultTypeInternal.java b/onnx/src/gen/java/org/bytedeco/onnx/TensorAnnotationDefaultTypeInternal.java new file mode 100644 index 00000000000..7a62fad8461 --- /dev/null +++ b/onnx/src/gen/java/org/bytedeco/onnx/TensorAnnotationDefaultTypeInternal.java @@ -0,0 +1,17 @@ +// Targeted by JavaCPP version 1.5.1-SNAPSHOT: DO NOT EDIT THIS FILE + +package org.bytedeco.onnx; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +import static org.bytedeco.onnx.global.onnx.*; + +@Namespace("onnx") @Opaque @Properties(inherit = org.bytedeco.onnx.presets.onnx.class) +public class TensorAnnotationDefaultTypeInternal extends Pointer { + /** Empty constructor. Calls {@code super((Pointer)null)}. */ + public TensorAnnotationDefaultTypeInternal() { super((Pointer)null); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public TensorAnnotationDefaultTypeInternal(Pointer p) { super(p); } +} diff --git a/onnx/src/gen/java/org/bytedeco/onnx/TensorProto.java b/onnx/src/gen/java/org/bytedeco/onnx/TensorProto.java index b4014439846..387ce3f38e4 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/TensorProto.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/TensorProto.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.onnx; @@ -58,16 +58,19 @@ public class TensorProto extends MessageLite { public native @Cast("bool") boolean IsInitialized(); public native @Cast("size_t") long ByteSizeLong(); +// #if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER +// #else public native @Cast("bool") boolean MergePartialFromCodedStream( CodedInputStream input); +// #endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER public native void SerializeWithCachedSizes( CodedOutputStream output); public native @Cast("google::protobuf::uint8*") BytePointer InternalSerializeWithCachedSizesToArray( - @Cast("bool") boolean deterministic, @Cast("google::protobuf::uint8*") BytePointer target); + @Cast("google::protobuf::uint8*") BytePointer target); public native @Cast("google::protobuf::uint8*") ByteBuffer InternalSerializeWithCachedSizesToArray( - @Cast("bool") boolean deterministic, @Cast("google::protobuf::uint8*") ByteBuffer target); + @Cast("google::protobuf::uint8*") ByteBuffer target); public native @Cast("google::protobuf::uint8*") byte[] InternalSerializeWithCachedSizesToArray( - @Cast("bool") boolean deterministic, @Cast("google::protobuf::uint8*") byte[] target); + @Cast("google::protobuf::uint8*") byte[] target); public native int GetCachedSize(); public native @ByVal @Cast("google::protobuf::Metadata*") Pointer GetMetadata(); diff --git a/onnx/src/gen/java/org/bytedeco/onnx/TensorProtoDefaultTypeInternal.java b/onnx/src/gen/java/org/bytedeco/onnx/TensorProtoDefaultTypeInternal.java index c23888444fc..6840dba88f7 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/TensorProtoDefaultTypeInternal.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/TensorProtoDefaultTypeInternal.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/TensorProto_Segment.java b/onnx/src/gen/java/org/bytedeco/onnx/TensorProto_Segment.java index 3e0aab89cb2..bd6ec7528e3 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/TensorProto_Segment.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/TensorProto_Segment.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.onnx; @@ -58,16 +58,19 @@ public class TensorProto_Segment extends MessageLite { public native @Cast("bool") boolean IsInitialized(); public native @Cast("size_t") long ByteSizeLong(); +// #if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER +// #else public native @Cast("bool") boolean MergePartialFromCodedStream( CodedInputStream input); +// #endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER public native void SerializeWithCachedSizes( CodedOutputStream output); public native @Cast("google::protobuf::uint8*") BytePointer InternalSerializeWithCachedSizesToArray( - @Cast("bool") boolean deterministic, @Cast("google::protobuf::uint8*") BytePointer target); + @Cast("google::protobuf::uint8*") BytePointer target); public native @Cast("google::protobuf::uint8*") ByteBuffer InternalSerializeWithCachedSizesToArray( - @Cast("bool") boolean deterministic, @Cast("google::protobuf::uint8*") ByteBuffer target); + @Cast("google::protobuf::uint8*") ByteBuffer target); public native @Cast("google::protobuf::uint8*") byte[] InternalSerializeWithCachedSizesToArray( - @Cast("bool") boolean deterministic, @Cast("google::protobuf::uint8*") byte[] target); + @Cast("google::protobuf::uint8*") byte[] target); public native int GetCachedSize(); public native @ByVal @Cast("google::protobuf::Metadata*") Pointer GetMetadata(); diff --git a/onnx/src/gen/java/org/bytedeco/onnx/TensorProto_SegmentDefaultTypeInternal.java b/onnx/src/gen/java/org/bytedeco/onnx/TensorProto_SegmentDefaultTypeInternal.java index 37ed3bdf24e..78809814656 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/TensorProto_SegmentDefaultTypeInternal.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/TensorProto_SegmentDefaultTypeInternal.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/TensorShapeProto.java b/onnx/src/gen/java/org/bytedeco/onnx/TensorShapeProto.java index 613e6780e1a..9ba40f0c54c 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/TensorShapeProto.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/TensorShapeProto.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.onnx; @@ -58,16 +58,19 @@ public class TensorShapeProto extends MessageLite { public native @Cast("bool") boolean IsInitialized(); public native @Cast("size_t") long ByteSizeLong(); +// #if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER +// #else public native @Cast("bool") boolean MergePartialFromCodedStream( CodedInputStream input); +// #endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER public native void SerializeWithCachedSizes( CodedOutputStream output); public native @Cast("google::protobuf::uint8*") BytePointer InternalSerializeWithCachedSizesToArray( - @Cast("bool") boolean deterministic, @Cast("google::protobuf::uint8*") BytePointer target); + @Cast("google::protobuf::uint8*") BytePointer target); public native @Cast("google::protobuf::uint8*") ByteBuffer InternalSerializeWithCachedSizesToArray( - @Cast("bool") boolean deterministic, @Cast("google::protobuf::uint8*") ByteBuffer target); + @Cast("google::protobuf::uint8*") ByteBuffer target); public native @Cast("google::protobuf::uint8*") byte[] InternalSerializeWithCachedSizesToArray( - @Cast("bool") boolean deterministic, @Cast("google::protobuf::uint8*") byte[] target); + @Cast("google::protobuf::uint8*") byte[] target); public native int GetCachedSize(); public native @ByVal @Cast("google::protobuf::Metadata*") Pointer GetMetadata(); diff --git a/onnx/src/gen/java/org/bytedeco/onnx/TensorShapeProtoDefaultTypeInternal.java b/onnx/src/gen/java/org/bytedeco/onnx/TensorShapeProtoDefaultTypeInternal.java index e4a143eca0b..1984e4e3604 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/TensorShapeProtoDefaultTypeInternal.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/TensorShapeProtoDefaultTypeInternal.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/TensorShapeProtoVector.java b/onnx/src/gen/java/org/bytedeco/onnx/TensorShapeProtoVector.java index f6c48a3d1a7..90dbf7f87c3 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/TensorShapeProtoVector.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/TensorShapeProtoVector.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/TensorShapeProto_DimensionDefaultTypeInternal.java b/onnx/src/gen/java/org/bytedeco/onnx/TensorShapeProto_DimensionDefaultTypeInternal.java index e35cd5d9af2..1df5ca28ef3 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/TensorShapeProto_DimensionDefaultTypeInternal.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/TensorShapeProto_DimensionDefaultTypeInternal.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/TfIdfVectorizer_Onnx_ver9.java b/onnx/src/gen/java/org/bytedeco/onnx/TfIdfVectorizer_Onnx_ver9.java index ec3d3534792..5ed04aaf39b 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/TfIdfVectorizer_Onnx_ver9.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/TfIdfVectorizer_Onnx_ver9.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/ThresholdedRelu_Onnx_ver10.java b/onnx/src/gen/java/org/bytedeco/onnx/ThresholdedRelu_Onnx_ver10.java new file mode 100644 index 00000000000..3ae4b0089b4 --- /dev/null +++ b/onnx/src/gen/java/org/bytedeco/onnx/ThresholdedRelu_Onnx_ver10.java @@ -0,0 +1,17 @@ +// Targeted by JavaCPP version 1.5.1-SNAPSHOT: DO NOT EDIT THIS FILE + +package org.bytedeco.onnx; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +import static org.bytedeco.onnx.global.onnx.*; + +@Namespace("onnx") @Opaque @Properties(inherit = org.bytedeco.onnx.presets.onnx.class) +public class ThresholdedRelu_Onnx_ver10 extends Pointer { + /** Empty constructor. Calls {@code super((Pointer)null)}. */ + public ThresholdedRelu_Onnx_ver10() { super((Pointer)null); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public ThresholdedRelu_Onnx_ver10(Pointer p) { super(p); } +} diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Tile_Onnx_ver1.java b/onnx/src/gen/java/org/bytedeco/onnx/Tile_Onnx_ver1.java index 4ba1620f4c4..5cb0fba4241 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Tile_Onnx_ver1.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Tile_Onnx_ver1.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Tile_Onnx_ver6.java b/onnx/src/gen/java/org/bytedeco/onnx/Tile_Onnx_ver6.java index b25b6847664..e55cc22176d 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Tile_Onnx_ver6.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Tile_Onnx_ver6.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/TopK_Onnx_ver1.java b/onnx/src/gen/java/org/bytedeco/onnx/TopK_Onnx_ver1.java index 721d2c1897a..5ef5c955dff 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/TopK_Onnx_ver1.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/TopK_Onnx_ver1.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/ATen_Onnx_ver1.java b/onnx/src/gen/java/org/bytedeco/onnx/TopK_Onnx_ver10.java similarity index 64% rename from onnx/src/gen/java/org/bytedeco/onnx/ATen_Onnx_ver1.java rename to onnx/src/gen/java/org/bytedeco/onnx/TopK_Onnx_ver10.java index 0b470b8b204..c8a3a3e3cde 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/ATen_Onnx_ver1.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/TopK_Onnx_ver10.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.onnx; @@ -9,9 +9,9 @@ import static org.bytedeco.onnx.global.onnx.*; @Namespace("onnx") @Opaque @Properties(inherit = org.bytedeco.onnx.presets.onnx.class) -public class ATen_Onnx_ver1 extends Pointer { +public class TopK_Onnx_ver10 extends Pointer { /** Empty constructor. Calls {@code super((Pointer)null)}. */ - public ATen_Onnx_ver1() { super((Pointer)null); } + public TopK_Onnx_ver10() { super((Pointer)null); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ - public ATen_Onnx_ver1(Pointer p) { super(p); } + public TopK_Onnx_ver10(Pointer p) { super(p); } } diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Transpose_Onnx_ver1.java b/onnx/src/gen/java/org/bytedeco/onnx/Transpose_Onnx_ver1.java index 1853faea387..f3ce539c7f0 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Transpose_Onnx_ver1.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Transpose_Onnx_ver1.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/TreeEnsembleClassifier_OnnxML_ver1.java b/onnx/src/gen/java/org/bytedeco/onnx/TreeEnsembleClassifier_OnnxML_ver1.java index 3f530bcc8a3..34b332783d2 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/TreeEnsembleClassifier_OnnxML_ver1.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/TreeEnsembleClassifier_OnnxML_ver1.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/TreeEnsembleRegressor_OnnxML_ver1.java b/onnx/src/gen/java/org/bytedeco/onnx/TreeEnsembleRegressor_OnnxML_ver1.java index 058c8dfc1df..4f69047274a 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/TreeEnsembleRegressor_OnnxML_ver1.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/TreeEnsembleRegressor_OnnxML_ver1.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/TypeConstraintParamVector.java b/onnx/src/gen/java/org/bytedeco/onnx/TypeConstraintParamVector.java index 836e5305fac..163e810cec5 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/TypeConstraintParamVector.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/TypeConstraintParamVector.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/TypeProto.java b/onnx/src/gen/java/org/bytedeco/onnx/TypeProto.java index a40c6c1cdcd..d6960e62eb2 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/TypeProto.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/TypeProto.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.onnx; @@ -67,16 +67,19 @@ public class TypeProto extends MessageLite { public native @Cast("bool") boolean IsInitialized(); public native @Cast("size_t") long ByteSizeLong(); +// #if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER +// #else public native @Cast("bool") boolean MergePartialFromCodedStream( CodedInputStream input); +// #endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER public native void SerializeWithCachedSizes( CodedOutputStream output); public native @Cast("google::protobuf::uint8*") BytePointer InternalSerializeWithCachedSizesToArray( - @Cast("bool") boolean deterministic, @Cast("google::protobuf::uint8*") BytePointer target); + @Cast("google::protobuf::uint8*") BytePointer target); public native @Cast("google::protobuf::uint8*") ByteBuffer InternalSerializeWithCachedSizesToArray( - @Cast("bool") boolean deterministic, @Cast("google::protobuf::uint8*") ByteBuffer target); + @Cast("google::protobuf::uint8*") ByteBuffer target); public native @Cast("google::protobuf::uint8*") byte[] InternalSerializeWithCachedSizesToArray( - @Cast("bool") boolean deterministic, @Cast("google::protobuf::uint8*") byte[] target); + @Cast("google::protobuf::uint8*") byte[] target); public native int GetCachedSize(); public native @ByVal @Cast("google::protobuf::Metadata*") Pointer GetMetadata(); diff --git a/onnx/src/gen/java/org/bytedeco/onnx/TypeProtoDefaultTypeInternal.java b/onnx/src/gen/java/org/bytedeco/onnx/TypeProtoDefaultTypeInternal.java index 5d399f2ff87..a969c68a192 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/TypeProtoDefaultTypeInternal.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/TypeProtoDefaultTypeInternal.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/TypeProto_Map.java b/onnx/src/gen/java/org/bytedeco/onnx/TypeProto_Map.java index e0109c49b97..777dbc53c5e 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/TypeProto_Map.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/TypeProto_Map.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.onnx; @@ -58,16 +58,19 @@ public class TypeProto_Map extends MessageLite { public native @Cast("bool") boolean IsInitialized(); public native @Cast("size_t") long ByteSizeLong(); +// #if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER +// #else public native @Cast("bool") boolean MergePartialFromCodedStream( CodedInputStream input); +// #endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER public native void SerializeWithCachedSizes( CodedOutputStream output); public native @Cast("google::protobuf::uint8*") BytePointer InternalSerializeWithCachedSizesToArray( - @Cast("bool") boolean deterministic, @Cast("google::protobuf::uint8*") BytePointer target); + @Cast("google::protobuf::uint8*") BytePointer target); public native @Cast("google::protobuf::uint8*") ByteBuffer InternalSerializeWithCachedSizesToArray( - @Cast("bool") boolean deterministic, @Cast("google::protobuf::uint8*") ByteBuffer target); + @Cast("google::protobuf::uint8*") ByteBuffer target); public native @Cast("google::protobuf::uint8*") byte[] InternalSerializeWithCachedSizesToArray( - @Cast("bool") boolean deterministic, @Cast("google::protobuf::uint8*") byte[] target); + @Cast("google::protobuf::uint8*") byte[] target); public native int GetCachedSize(); public native @ByVal @Cast("google::protobuf::Metadata*") Pointer GetMetadata(); diff --git a/onnx/src/gen/java/org/bytedeco/onnx/TypeProto_MapDefaultTypeInternal.java b/onnx/src/gen/java/org/bytedeco/onnx/TypeProto_MapDefaultTypeInternal.java index 9727483c039..95dbff73015 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/TypeProto_MapDefaultTypeInternal.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/TypeProto_MapDefaultTypeInternal.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/TypeProto_Opaque.java b/onnx/src/gen/java/org/bytedeco/onnx/TypeProto_Opaque.java index fd89abf4133..1b301c6a87f 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/TypeProto_Opaque.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/TypeProto_Opaque.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.onnx; @@ -58,16 +58,19 @@ public class TypeProto_Opaque extends MessageLite { public native @Cast("bool") boolean IsInitialized(); public native @Cast("size_t") long ByteSizeLong(); +// #if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER +// #else public native @Cast("bool") boolean MergePartialFromCodedStream( CodedInputStream input); +// #endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER public native void SerializeWithCachedSizes( CodedOutputStream output); public native @Cast("google::protobuf::uint8*") BytePointer InternalSerializeWithCachedSizesToArray( - @Cast("bool") boolean deterministic, @Cast("google::protobuf::uint8*") BytePointer target); + @Cast("google::protobuf::uint8*") BytePointer target); public native @Cast("google::protobuf::uint8*") ByteBuffer InternalSerializeWithCachedSizesToArray( - @Cast("bool") boolean deterministic, @Cast("google::protobuf::uint8*") ByteBuffer target); + @Cast("google::protobuf::uint8*") ByteBuffer target); public native @Cast("google::protobuf::uint8*") byte[] InternalSerializeWithCachedSizesToArray( - @Cast("bool") boolean deterministic, @Cast("google::protobuf::uint8*") byte[] target); + @Cast("google::protobuf::uint8*") byte[] target); public native int GetCachedSize(); public native @ByVal @Cast("google::protobuf::Metadata*") Pointer GetMetadata(); diff --git a/onnx/src/gen/java/org/bytedeco/onnx/TypeProto_OpaqueDefaultTypeInternal.java b/onnx/src/gen/java/org/bytedeco/onnx/TypeProto_OpaqueDefaultTypeInternal.java index 23288f306f8..5b2c915d7d8 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/TypeProto_OpaqueDefaultTypeInternal.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/TypeProto_OpaqueDefaultTypeInternal.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/TypeProto_Sequence.java b/onnx/src/gen/java/org/bytedeco/onnx/TypeProto_Sequence.java index 5096bec1e52..b3192ced54e 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/TypeProto_Sequence.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/TypeProto_Sequence.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.onnx; @@ -58,16 +58,19 @@ public class TypeProto_Sequence extends MessageLite { public native @Cast("bool") boolean IsInitialized(); public native @Cast("size_t") long ByteSizeLong(); +// #if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER +// #else public native @Cast("bool") boolean MergePartialFromCodedStream( CodedInputStream input); +// #endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER public native void SerializeWithCachedSizes( CodedOutputStream output); public native @Cast("google::protobuf::uint8*") BytePointer InternalSerializeWithCachedSizesToArray( - @Cast("bool") boolean deterministic, @Cast("google::protobuf::uint8*") BytePointer target); + @Cast("google::protobuf::uint8*") BytePointer target); public native @Cast("google::protobuf::uint8*") ByteBuffer InternalSerializeWithCachedSizesToArray( - @Cast("bool") boolean deterministic, @Cast("google::protobuf::uint8*") ByteBuffer target); + @Cast("google::protobuf::uint8*") ByteBuffer target); public native @Cast("google::protobuf::uint8*") byte[] InternalSerializeWithCachedSizesToArray( - @Cast("bool") boolean deterministic, @Cast("google::protobuf::uint8*") byte[] target); + @Cast("google::protobuf::uint8*") byte[] target); public native int GetCachedSize(); public native @ByVal @Cast("google::protobuf::Metadata*") Pointer GetMetadata(); diff --git a/onnx/src/gen/java/org/bytedeco/onnx/TypeProto_SequenceDefaultTypeInternal.java b/onnx/src/gen/java/org/bytedeco/onnx/TypeProto_SequenceDefaultTypeInternal.java index 203a9fbdfa9..6ce1e0ba127 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/TypeProto_SequenceDefaultTypeInternal.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/TypeProto_SequenceDefaultTypeInternal.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/TypeProto_SparseTensor.java b/onnx/src/gen/java/org/bytedeco/onnx/TypeProto_SparseTensor.java index 07f5bbd8f7a..d7b1ba1d935 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/TypeProto_SparseTensor.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/TypeProto_SparseTensor.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.onnx; @@ -58,16 +58,19 @@ public class TypeProto_SparseTensor extends MessageLite { public native @Cast("bool") boolean IsInitialized(); public native @Cast("size_t") long ByteSizeLong(); +// #if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER +// #else public native @Cast("bool") boolean MergePartialFromCodedStream( CodedInputStream input); +// #endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER public native void SerializeWithCachedSizes( CodedOutputStream output); public native @Cast("google::protobuf::uint8*") BytePointer InternalSerializeWithCachedSizesToArray( - @Cast("bool") boolean deterministic, @Cast("google::protobuf::uint8*") BytePointer target); + @Cast("google::protobuf::uint8*") BytePointer target); public native @Cast("google::protobuf::uint8*") ByteBuffer InternalSerializeWithCachedSizesToArray( - @Cast("bool") boolean deterministic, @Cast("google::protobuf::uint8*") ByteBuffer target); + @Cast("google::protobuf::uint8*") ByteBuffer target); public native @Cast("google::protobuf::uint8*") byte[] InternalSerializeWithCachedSizesToArray( - @Cast("bool") boolean deterministic, @Cast("google::protobuf::uint8*") byte[] target); + @Cast("google::protobuf::uint8*") byte[] target); public native int GetCachedSize(); public native @ByVal @Cast("google::protobuf::Metadata*") Pointer GetMetadata(); diff --git a/onnx/src/gen/java/org/bytedeco/onnx/TypeProto_SparseTensorDefaultTypeInternal.java b/onnx/src/gen/java/org/bytedeco/onnx/TypeProto_SparseTensorDefaultTypeInternal.java index 7432d32e8ac..f024f2a5109 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/TypeProto_SparseTensorDefaultTypeInternal.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/TypeProto_SparseTensorDefaultTypeInternal.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/TypeProto_Tensor.java b/onnx/src/gen/java/org/bytedeco/onnx/TypeProto_Tensor.java index 86e1382c78d..4882b3802ac 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/TypeProto_Tensor.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/TypeProto_Tensor.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.onnx; @@ -58,16 +58,19 @@ public class TypeProto_Tensor extends MessageLite { public native @Cast("bool") boolean IsInitialized(); public native @Cast("size_t") long ByteSizeLong(); +// #if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER +// #else public native @Cast("bool") boolean MergePartialFromCodedStream( CodedInputStream input); +// #endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER public native void SerializeWithCachedSizes( CodedOutputStream output); public native @Cast("google::protobuf::uint8*") BytePointer InternalSerializeWithCachedSizesToArray( - @Cast("bool") boolean deterministic, @Cast("google::protobuf::uint8*") BytePointer target); + @Cast("google::protobuf::uint8*") BytePointer target); public native @Cast("google::protobuf::uint8*") ByteBuffer InternalSerializeWithCachedSizesToArray( - @Cast("bool") boolean deterministic, @Cast("google::protobuf::uint8*") ByteBuffer target); + @Cast("google::protobuf::uint8*") ByteBuffer target); public native @Cast("google::protobuf::uint8*") byte[] InternalSerializeWithCachedSizesToArray( - @Cast("bool") boolean deterministic, @Cast("google::protobuf::uint8*") byte[] target); + @Cast("google::protobuf::uint8*") byte[] target); public native int GetCachedSize(); public native @ByVal @Cast("google::protobuf::Metadata*") Pointer GetMetadata(); diff --git a/onnx/src/gen/java/org/bytedeco/onnx/TypeProto_TensorDefaultTypeInternal.java b/onnx/src/gen/java/org/bytedeco/onnx/TypeProto_TensorDefaultTypeInternal.java index 17711558b66..f045c7b62aa 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/TypeProto_TensorDefaultTypeInternal.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/TypeProto_TensorDefaultTypeInternal.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/UninterpretedOption.java b/onnx/src/gen/java/org/bytedeco/onnx/UninterpretedOption.java index 76c7bf2bc4d..b0d885beb8c 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/UninterpretedOption.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/UninterpretedOption.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/UnknownField.java b/onnx/src/gen/java/org/bytedeco/onnx/UnknownField.java index 49627645cee..8a143bc29e8 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/UnknownField.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/UnknownField.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.onnx; @@ -9,6 +9,9 @@ import static org.bytedeco.onnx.global.onnx.*; +// #if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER +// #endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER + // Represents one field in an UnknownFieldSet. @Namespace("google::protobuf") @Properties(inherit = org.bytedeco.onnx.presets.onnx.class) public class UnknownField extends Pointer { @@ -71,10 +74,6 @@ public class UnknownField extends Pointer { // If this UnknownField contains a pointer, delete it. public native void Delete(); - // Reset all the underlying pointers to NULL. A special function to be only - // used while merging from a temporary UFS. - public native void Reset(); - // Make a deep copy of any pointers in this UnknownField. public native void DeepCopy(@Const @ByRef UnknownField other); diff --git a/onnx/src/gen/java/org/bytedeco/onnx/UnknownFieldSet.java b/onnx/src/gen/java/org/bytedeco/onnx/UnknownFieldSet.java index f2a587e5cbf..5bc64b7ab99 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/UnknownFieldSet.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/UnknownFieldSet.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/UnorderedStringSet.java b/onnx/src/gen/java/org/bytedeco/onnx/UnorderedStringSet.java index 4c16c895fbc..af8f1eba9c3 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/UnorderedStringSet.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/UnorderedStringSet.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Unsqueeze_Onnx_ver1.java b/onnx/src/gen/java/org/bytedeco/onnx/Unsqueeze_Onnx_ver1.java index f921f42f3a4..d3639920e7f 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Unsqueeze_Onnx_ver1.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Unsqueeze_Onnx_ver1.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Upsample_Onnx_ver1.java b/onnx/src/gen/java/org/bytedeco/onnx/Upsample_Onnx_ver1.java index b7aae7270a3..93e62cc7972 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Upsample_Onnx_ver1.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Upsample_Onnx_ver1.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Upsample_Onnx_ver10.java b/onnx/src/gen/java/org/bytedeco/onnx/Upsample_Onnx_ver10.java new file mode 100644 index 00000000000..19d3c4ccc66 --- /dev/null +++ b/onnx/src/gen/java/org/bytedeco/onnx/Upsample_Onnx_ver10.java @@ -0,0 +1,17 @@ +// Targeted by JavaCPP version 1.5.1-SNAPSHOT: DO NOT EDIT THIS FILE + +package org.bytedeco.onnx; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +import static org.bytedeco.onnx.global.onnx.*; + +@Namespace("onnx") @Opaque @Properties(inherit = org.bytedeco.onnx.presets.onnx.class) +public class Upsample_Onnx_ver10 extends Pointer { + /** Empty constructor. Calls {@code super((Pointer)null)}. */ + public Upsample_Onnx_ver10() { super((Pointer)null); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public Upsample_Onnx_ver10(Pointer p) { super(p); } +} diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Upsample_Onnx_ver7.java b/onnx/src/gen/java/org/bytedeco/onnx/Upsample_Onnx_ver7.java index 862fda6e8d1..8766e8eff02 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Upsample_Onnx_ver7.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Upsample_Onnx_ver7.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Upsample_Onnx_ver9.java b/onnx/src/gen/java/org/bytedeco/onnx/Upsample_Onnx_ver9.java index d73b23c9369..85059f60501 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Upsample_Onnx_ver9.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Upsample_Onnx_ver9.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Use.java b/onnx/src/gen/java/org/bytedeco/onnx/Use.java index 46962e43395..66343df9988 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Use.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Use.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/UseTypeIntPair.java b/onnx/src/gen/java/org/bytedeco/onnx/UseTypeIntPair.java index eb060df2e2c..ec250978c59 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/UseTypeIntPair.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/UseTypeIntPair.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/ValidationError.java b/onnx/src/gen/java/org/bytedeco/onnx/ValidationError.java index 01cdd2f6648..ebb489a254d 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/ValidationError.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/ValidationError.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Value.java b/onnx/src/gen/java/org/bytedeco/onnx/Value.java index fd02d618d70..56324a5b1c9 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Value.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Value.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/ValueInfoProto.java b/onnx/src/gen/java/org/bytedeco/onnx/ValueInfoProto.java index 5d9146187cf..7219571b20f 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/ValueInfoProto.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/ValueInfoProto.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.onnx; @@ -58,16 +58,19 @@ public class ValueInfoProto extends MessageLite { public native @Cast("bool") boolean IsInitialized(); public native @Cast("size_t") long ByteSizeLong(); +// #if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER +// #else public native @Cast("bool") boolean MergePartialFromCodedStream( CodedInputStream input); +// #endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER public native void SerializeWithCachedSizes( CodedOutputStream output); public native @Cast("google::protobuf::uint8*") BytePointer InternalSerializeWithCachedSizesToArray( - @Cast("bool") boolean deterministic, @Cast("google::protobuf::uint8*") BytePointer target); + @Cast("google::protobuf::uint8*") BytePointer target); public native @Cast("google::protobuf::uint8*") ByteBuffer InternalSerializeWithCachedSizesToArray( - @Cast("bool") boolean deterministic, @Cast("google::protobuf::uint8*") ByteBuffer target); + @Cast("google::protobuf::uint8*") ByteBuffer target); public native @Cast("google::protobuf::uint8*") byte[] InternalSerializeWithCachedSizesToArray( - @Cast("bool") boolean deterministic, @Cast("google::protobuf::uint8*") byte[] target); + @Cast("google::protobuf::uint8*") byte[] target); public native int GetCachedSize(); public native @ByVal @Cast("google::protobuf::Metadata*") Pointer GetMetadata(); diff --git a/onnx/src/gen/java/org/bytedeco/onnx/ValueInfoProtoDefaultTypeInternal.java b/onnx/src/gen/java/org/bytedeco/onnx/ValueInfoProtoDefaultTypeInternal.java index 5ec7df118b4..efa8710cabf 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/ValueInfoProtoDefaultTypeInternal.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/ValueInfoProtoDefaultTypeInternal.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/WeakFieldMap.java b/onnx/src/gen/java/org/bytedeco/onnx/WeakFieldMap.java index 9905a9f1f41..91a9fe18eaf 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/WeakFieldMap.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/WeakFieldMap.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Where_Onnx_ver9.java b/onnx/src/gen/java/org/bytedeco/onnx/Where_Onnx_ver9.java index 8e0d303c504..988100dd8d3 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Where_Onnx_ver9.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Where_Onnx_ver9.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/WireFormat.java b/onnx/src/gen/java/org/bytedeco/onnx/WireFormat.java index 213d700107d..ff03129e206 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/WireFormat.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/WireFormat.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/WireFormatLite.java b/onnx/src/gen/java/org/bytedeco/onnx/WireFormatLite.java index 40d47d64f35..f4410c12ed6 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/WireFormatLite.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/WireFormatLite.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Xor_Onnx_ver1.java b/onnx/src/gen/java/org/bytedeco/onnx/Xor_Onnx_ver1.java index d5cbc317a31..0d9367c7799 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Xor_Onnx_ver1.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Xor_Onnx_ver1.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/Xor_Onnx_ver7.java b/onnx/src/gen/java/org/bytedeco/onnx/Xor_Onnx_ver7.java index a56e40ba76f..ab0cebfc676 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/Xor_Onnx_ver7.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/Xor_Onnx_ver7.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/ZeroCopyInputStream.java b/onnx/src/gen/java/org/bytedeco/onnx/ZeroCopyInputStream.java index 9cb699782db..bbe309af3a0 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/ZeroCopyInputStream.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/ZeroCopyInputStream.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/ZeroCopyOutputStream.java b/onnx/src/gen/java/org/bytedeco/onnx/ZeroCopyOutputStream.java index 5b37ef347f2..238a0147266 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/ZeroCopyOutputStream.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/ZeroCopyOutputStream.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/ZipMap_OnnxML_ver1.java b/onnx/src/gen/java/org/bytedeco/onnx/ZipMap_OnnxML_ver1.java index a92fcbe3657..fec359f56d7 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/ZipMap_OnnxML_ver1.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/ZipMap_OnnxML_ver1.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/global/onnx.java b/onnx/src/gen/java/org/bytedeco/onnx/global/onnx.java index b266d00a721..976c97402d8 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/global/onnx.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/global/onnx.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.onnx.global; @@ -76,7 +76,7 @@ public class onnx extends org.bytedeco.onnx.presets.onnx { // Parsed from onnx/defs/schema.h -// Copyright (c) Facebook Inc. and Microsoft Corporation. +// Copyright (c) ONNX Project Contributors. // Licensed under the MIT license. // #pragma once @@ -87,6 +87,7 @@ public class onnx extends org.bytedeco.onnx.presets.onnx { // #include // #include // #include +// #include // #include // #include // #include @@ -97,7 +98,9 @@ public class onnx extends org.bytedeco.onnx.presets.onnx { // #include "data_type_utils.h" // #include "onnx/common/constants.h" +// #include "onnx/common/common.h" // #include "onnx/defs/shape_inference.h" +// #include "onnx/onnx-operators_pb.h" // Targeting ../SchemaError.java @@ -209,28 +212,18 @@ public class onnx extends org.bytedeco.onnx.presets.onnx { // Parsed from onnx/defs/operator_sets.h -// Copyright (c) Facebook Inc. and Microsoft Corporation. +// Copyright (c) ONNX Project Contributors. // Licensed under the MIT license. // #pragma once -// #include "onnx/defs/function.h" // #include "onnx/defs/schema.h" -// Targeting ../DynamicSlice_Onnx_ver1.java - - -// Targeting ../ATen_Onnx_ver1.java - - // Targeting ../Abs_Onnx_ver1.java // Targeting ../Add_Onnx_ver1.java -// Targeting ../Affine_Onnx_ver1.java - - // Targeting ../And_Onnx_ver1.java @@ -267,9 +260,6 @@ public class onnx extends org.bytedeco.onnx.presets.onnx { // Targeting ../ConvTranspose_Onnx_ver1.java -// Targeting ../Crop_Onnx_ver1.java - - // Targeting ../DepthToSpace_Onnx_ver1.java @@ -297,18 +287,12 @@ public class onnx extends org.bytedeco.onnx.presets.onnx { // Targeting ../GRU_Onnx_ver1.java -// Targeting ../GRUUnit_Onnx_ver1.java - - // Targeting ../Gather_Onnx_ver1.java // Targeting ../Gemm_Onnx_ver1.java -// Targeting ../GivenTensorFill_Onnx_ver1.java - - // Targeting ../GlobalAveragePool_Onnx_ver1.java @@ -333,9 +317,6 @@ public class onnx extends org.bytedeco.onnx.presets.onnx { // Targeting ../If_Onnx_ver1.java -// Targeting ../ImageScaler_Onnx_ver1.java - - // Targeting ../InstanceNormalization_Onnx_ver1.java @@ -402,9 +383,6 @@ public class onnx extends org.bytedeco.onnx.presets.onnx { // Targeting ../Pad_Onnx_ver1.java -// Targeting ../ParametricSoftplus_Onnx_ver1.java - - // Targeting ../Pow_Onnx_ver1.java @@ -462,12 +440,6 @@ public class onnx extends org.bytedeco.onnx.presets.onnx { // Targeting ../Reshape_Onnx_ver1.java -// Targeting ../Scale_Onnx_ver1.java - - -// Targeting ../ScaledTanh_Onnx_ver1.java - - // Targeting ../Selu_Onnx_ver1.java @@ -513,9 +485,6 @@ public class onnx extends org.bytedeco.onnx.presets.onnx { // Targeting ../Tanh_Onnx_ver1.java -// Targeting ../ThresholdedRelu_Onnx_ver1.java - - // Targeting ../Tile_Onnx_ver1.java @@ -798,7 +767,6 @@ public class onnx extends org.bytedeco.onnx.presets.onnx { // Targeting ../MaxUnpool_Onnx_ver9.java - // Targeting ../Constant_Onnx_ver9.java @@ -862,19 +830,84 @@ public class onnx extends org.bytedeco.onnx.presets.onnx { // Targeting ../TfIdfVectorizer_Onnx_ver9.java +// Targeting ../MeanVarianceNormalization_Onnx_ver9.java + + // Targeting ../OpSet_Onnx_ver9.java +// Targeting ../StringNormalizer_Onnx_ver10.java + + +// Targeting ../Upsample_Onnx_ver10.java + + +// Targeting ../Resize_Onnx_ver10.java + + +// Targeting ../TopK_Onnx_ver10.java + + +// Targeting ../MaxPool_Onnx_ver10.java + + +// Targeting ../Mod_Onnx_ver10.java + + +// Targeting ../AveragePool_Onnx_ver10.java + + +// Targeting ../Slice_Onnx_ver10.java + + +// Targeting ../ThresholdedRelu_Onnx_ver10.java + + +// Targeting ../Dropout_Onnx_ver10.java + + +// Targeting ../MatMulInteger_Onnx_ver10.java + + +// Targeting ../QLinearMatMul_Onnx_ver10.java + + +// Targeting ../ConvInteger_Onnx_ver10.java + + +// Targeting ../QLinearConv_Onnx_ver10.java + + +// Targeting ../QuantizeLinear_Onnx_ver10.java + + +// Targeting ../DequantizeLinear_Onnx_ver10.java + + +// Targeting ../IsInf_Onnx_ver10.java + + +// Targeting ../NonMaxSuppression_Onnx_ver10.java + + +// Targeting ../ReverseSequence_Onnx_ver10.java + + +// Targeting ../RoiAlign_Onnx_ver10.java + + +// Targeting ../OpSet_Onnx_ver10.java + + @Namespace("onnx") public static native void RegisterOnnxOperatorSetSchema(); -@Namespace("onnx") public static native void RegisterOnnxFunctionBuilder(); // namespace ONNX_NAMESPACE // Parsed from onnx/defs/operator_sets-ml.h -// Copyright (c) Facebook Inc. and Microsoft Corporation. +// Copyright (c) ONNX Project Contributors. // Licensed under the MIT license. // #pragma once @@ -954,7 +987,7 @@ public class onnx extends org.bytedeco.onnx.presets.onnx { // Parsed from onnx/defs/data_type_utils.h -// Copyright (c) Facebook Inc. and Microsoft Corporation. +// Copyright (c) ONNX Project Contributors. // Licensed under the MIT license. // #ifndef ONNX_DATA_TYPE_UTILS_H @@ -1210,21 +1243,22 @@ public class onnx extends org.bytedeco.onnx.presets.onnx { // #ifndef PROTOBUF_INCLUDED_onnx_2fonnx_2doperators_2dml_2eproto // #define PROTOBUF_INCLUDED_onnx_2fonnx_2doperators_2dml_2eproto +// #include // #include -// #include - -// #if GOOGLE_PROTOBUF_VERSION < 3006001 +// #include +// #if PROTOBUF_VERSION < 3007000 // #error This file was generated by a newer version of protoc which is -// #error incompatible with your Protocol Buffer headers. Please update +// #error incompatible with your Protocol Buffer headers. Please update // #error your headers. // #endif -// #if 3006001 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION +// #if 3007001 < PROTOBUF_MIN_PROTOC_VERSION // #error This file was generated by an older version of protoc which is -// #error incompatible with your Protocol Buffer headers. Please +// #error incompatible with your Protocol Buffer headers. Please // #error regenerate this file with a newer version of protoc. // #endif +// #include // #include // #include // #include @@ -1239,12 +1273,12 @@ public class onnx extends org.bytedeco.onnx.presets.onnx { // #include // #include "onnx/onnx-ml.pb.h" // @@protoc_insertion_point(includes) -// #define PROTOBUF_INTERNAL_EXPORT_protobuf_onnx_2fonnx_2doperators_2dml_2eproto ONNX_API -// Targeting ../TableStruct.java - +// #include +// #define PROTOBUF_INTERNAL_EXPORT_onnx_2fonnx_2doperators_2dml_2eproto ONNX_API +// Targeting ../TableStruct_onnx_2fonnx_2doperators_2dml_2eproto.java -@Namespace("protobuf_onnx_2fonnx_2doperators_2dml_2eproto") public static native void AddDescriptors(); +public static native void AddDescriptors_onnx_2fonnx_2doperators_2dml_2eproto(); // Targeting ../FunctionProtoDefaultTypeInternal.java @@ -1312,8 +1346,6 @@ public class onnx extends org.bytedeco.onnx.presets.onnx { - - // #if LANG_CXX11 // #endif @@ -1329,16 +1361,12 @@ public class onnx extends org.bytedeco.onnx.presets.onnx { - - // optional .onnx.OperatorStatus status = 3; - - // repeated string input = 4; @@ -1415,8 +1443,6 @@ public class onnx extends org.bytedeco.onnx.presets.onnx { - - // #if LANG_CXX11 // #endif @@ -1435,8 +1461,6 @@ public class onnx extends org.bytedeco.onnx.presets.onnx { - - // #if LANG_CXX11 // #endif @@ -1452,23 +1476,17 @@ public class onnx extends org.bytedeco.onnx.presets.onnx { - - // optional .onnx.OperatorStatus status = 3; - - // optional string doc_string = 10; - - // #if LANG_CXX11 // #endif @@ -1487,8 +1505,6 @@ public class onnx extends org.bytedeco.onnx.presets.onnx { - - // #if LANG_CXX11 // #endif @@ -1498,9 +1514,7 @@ public class onnx extends org.bytedeco.onnx.presets.onnx { -// optional int32 ir_version = 2; - - +// optional int64 ir_version = 2; @@ -1511,8 +1525,6 @@ public class onnx extends org.bytedeco.onnx.presets.onnx { - - // #if LANG_CXX11 // #endif @@ -1527,8 +1539,6 @@ public class onnx extends org.bytedeco.onnx.presets.onnx { - - // #if LANG_CXX11 // #endif @@ -1543,8 +1553,6 @@ public class onnx extends org.bytedeco.onnx.presets.onnx { - - // #if LANG_CXX11 // #endif @@ -1560,15 +1568,11 @@ public class onnx extends org.bytedeco.onnx.presets.onnx { - - // optional string doc_string = 6; - - // #if LANG_CXX11 // #endif @@ -1614,6 +1618,7 @@ public class onnx extends org.bytedeco.onnx.presets.onnx { // @@protoc_insertion_point(global_scope) +// #include // #endif // PROTOBUF_INCLUDED_onnx_2fonnx_2doperators_2dml_2eproto @@ -1625,21 +1630,22 @@ public class onnx extends org.bytedeco.onnx.presets.onnx { // #ifndef PROTOBUF_INCLUDED_onnx_2fonnx_2dml_2eproto // #define PROTOBUF_INCLUDED_onnx_2fonnx_2dml_2eproto +// #include // #include -// #include - -// #if GOOGLE_PROTOBUF_VERSION < 3006001 +// #include +// #if PROTOBUF_VERSION < 3007000 // #error This file was generated by a newer version of protoc which is -// #error incompatible with your Protocol Buffer headers. Please update +// #error incompatible with your Protocol Buffer headers. Please update // #error your headers. // #endif -// #if 3006001 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION +// #if 3007001 < PROTOBUF_MIN_PROTOC_VERSION // #error This file was generated by an older version of protoc which is -// #error incompatible with your Protocol Buffer headers. Please +// #error incompatible with your Protocol Buffer headers. Please // #error regenerate this file with a newer version of protoc. // #endif +// #include // #include // #include // #include @@ -1653,9 +1659,12 @@ public class onnx extends org.bytedeco.onnx.presets.onnx { // #include // #include // @@protoc_insertion_point(includes) -// #define PROTOBUF_INTERNAL_EXPORT_protobuf_onnx_2fonnx_2dml_2eproto ONNX_API -// Internal implementation detail -- do not use these members. +// #include +// #define PROTOBUF_INTERNAL_EXPORT_onnx_2fonnx_2dml_2eproto ONNX_API +// Targeting ../TableStruct_onnx_2fonnx_2dml_2eproto.java + +public static native void AddDescriptors_onnx_2fonnx_2dml_2eproto(); // Targeting ../AttributeProtoDefaultTypeInternal.java @@ -1680,6 +1689,10 @@ public class onnx extends org.bytedeco.onnx.presets.onnx { +// Targeting ../TensorAnnotationDefaultTypeInternal.java + + + // Targeting ../TensorProtoDefaultTypeInternal.java @@ -1742,6 +1755,7 @@ public class onnx extends org.bytedeco.onnx.presets.onnx { + // namespace protobuf // namespace google @@ -1844,7 +1858,8 @@ public class onnx extends org.bytedeco.onnx.presets.onnx { IR_VERSION_2017_10_10 = 1, IR_VERSION_2017_10_30 = 2, IR_VERSION_2017_11_3 = 3, - IR_VERSION = 4; + IR_VERSION_2019_1_22 = 4, + IR_VERSION = 5; @Namespace("onnx") public static native @Cast("bool") boolean Version_IsValid(int value); @Namespace("onnx") @MemberGetter public static native @Cast("const onnx::Version") int Version_MIN(); @Namespace("onnx") @MemberGetter public static native @Cast("const onnx::Version") int Version_MAX(); @@ -1879,6 +1894,9 @@ public class onnx extends org.bytedeco.onnx.presets.onnx { // Targeting ../StringStringEntryProto.java +// Targeting ../TensorAnnotation.java + + // Targeting ../GraphProto.java @@ -1931,8 +1949,6 @@ public class onnx extends org.bytedeco.onnx.presets.onnx { - - // #if LANG_CXX11 // #endif @@ -1947,8 +1963,6 @@ public class onnx extends org.bytedeco.onnx.presets.onnx { - - // #if LANG_CXX11 // #endif @@ -1963,8 +1977,6 @@ public class onnx extends org.bytedeco.onnx.presets.onnx { - - // #if LANG_CXX11 // #endif @@ -1980,31 +1992,23 @@ public class onnx extends org.bytedeco.onnx.presets.onnx { - - // optional float f = 2; - - // optional int64 i = 3; - - // optional bytes s = 4; - - // #if LANG_CXX11 // #endif @@ -2022,9 +2026,6 @@ public class onnx extends org.bytedeco.onnx.presets.onnx { - - - // optional .onnx.GraphProto g = 6; @@ -2033,9 +2034,6 @@ public class onnx extends org.bytedeco.onnx.presets.onnx { - - - // repeated float floats = 7; @@ -2102,8 +2100,6 @@ public class onnx extends org.bytedeco.onnx.presets.onnx { - - // #if LANG_CXX11 // #endif @@ -2121,16 +2117,11 @@ public class onnx extends org.bytedeco.onnx.presets.onnx { - - - // optional string doc_string = 3; - - // #if LANG_CXX11 // #endif @@ -2191,8 +2182,6 @@ public class onnx extends org.bytedeco.onnx.presets.onnx { - - // #if LANG_CXX11 // #endif @@ -2207,8 +2196,6 @@ public class onnx extends org.bytedeco.onnx.presets.onnx { - - // #if LANG_CXX11 // #endif @@ -2223,8 +2210,6 @@ public class onnx extends org.bytedeco.onnx.presets.onnx { - - // #if LANG_CXX11 // #endif @@ -2248,8 +2233,6 @@ public class onnx extends org.bytedeco.onnx.presets.onnx { - - // #if LANG_CXX11 // #endif @@ -2269,8 +2252,6 @@ public class onnx extends org.bytedeco.onnx.presets.onnx { - - // repeated .onnx.OperatorSetIdProto opset_import = 8; @@ -2285,8 +2266,6 @@ public class onnx extends org.bytedeco.onnx.presets.onnx { - - // #if LANG_CXX11 // #endif @@ -2301,8 +2280,6 @@ public class onnx extends org.bytedeco.onnx.presets.onnx { - - // #if LANG_CXX11 // #endif @@ -2317,8 +2294,6 @@ public class onnx extends org.bytedeco.onnx.presets.onnx { - - // #if LANG_CXX11 // #endif @@ -2334,15 +2309,11 @@ public class onnx extends org.bytedeco.onnx.presets.onnx { - - // optional string doc_string = 6; - - // #if LANG_CXX11 // #endif @@ -2360,9 +2331,6 @@ public class onnx extends org.bytedeco.onnx.presets.onnx { - - - // repeated .onnx.StringStringEntryProto metadata_props = 14; @@ -2381,6 +2349,18 @@ public class onnx extends org.bytedeco.onnx.presets.onnx { +// #if LANG_CXX11 + +// #endif + + + + + + +// optional string value = 2; + + // #if LANG_CXX11 @@ -2392,9 +2372,11 @@ public class onnx extends org.bytedeco.onnx.presets.onnx { -// optional string value = 2; +// ------------------------------------------------------------------- +// TensorAnnotation +// optional string tensor_name = 1; @@ -2408,6 +2390,15 @@ public class onnx extends org.bytedeco.onnx.presets.onnx { +// repeated .onnx.StringStringEntryProto quant_parameter_tensor_names = 2; + + + + + + + + // ------------------------------------------------------------------- // GraphProto @@ -2426,8 +2417,6 @@ public class onnx extends org.bytedeco.onnx.presets.onnx { - - // #if LANG_CXX11 // #endif @@ -2451,8 +2440,6 @@ public class onnx extends org.bytedeco.onnx.presets.onnx { - - // #if LANG_CXX11 // #endif @@ -2489,24 +2476,29 @@ public class onnx extends org.bytedeco.onnx.presets.onnx { -// ------------------------------------------------------------------- +// repeated .onnx.TensorAnnotation quantization_annotation = 14; -// TensorProto_Segment -// optional int64 begin = 1; +// ------------------------------------------------------------------- -// optional int64 end = 2; +// TensorProto_Segment + +// optional int64 begin = 1; +// optional int64 end = 2; + + + // ------------------------------------------------------------------- @@ -2528,8 +2520,6 @@ public class onnx extends org.bytedeco.onnx.presets.onnx { - - // optional .onnx.TensorProto.Segment segment = 3; @@ -2538,9 +2528,6 @@ public class onnx extends org.bytedeco.onnx.presets.onnx { - - - // repeated float float_data = 4 [packed = true]; @@ -2594,8 +2581,6 @@ public class onnx extends org.bytedeco.onnx.presets.onnx { - - // #if LANG_CXX11 // #endif @@ -2610,8 +2595,6 @@ public class onnx extends org.bytedeco.onnx.presets.onnx { - - // #if LANG_CXX11 // #endif @@ -2626,8 +2609,6 @@ public class onnx extends org.bytedeco.onnx.presets.onnx { - - // #if LANG_CXX11 // #endif @@ -2652,8 +2633,6 @@ public class onnx extends org.bytedeco.onnx.presets.onnx { - - // repeated double double_data = 10 [packed = true]; @@ -2703,8 +2682,6 @@ public class onnx extends org.bytedeco.onnx.presets.onnx { - - // #if LANG_CXX11 // #endif @@ -2740,8 +2717,6 @@ public class onnx extends org.bytedeco.onnx.presets.onnx { - - // optional .onnx.TensorShapeProto shape = 2; @@ -2750,9 +2725,6 @@ public class onnx extends org.bytedeco.onnx.presets.onnx { - - - // ------------------------------------------------------------------- // TypeProto_Sequence @@ -2765,9 +2737,6 @@ public class onnx extends org.bytedeco.onnx.presets.onnx { - - - // ------------------------------------------------------------------- // TypeProto_Map @@ -2778,8 +2747,6 @@ public class onnx extends org.bytedeco.onnx.presets.onnx { - - // optional .onnx.TypeProto value_type = 2; @@ -2788,9 +2755,6 @@ public class onnx extends org.bytedeco.onnx.presets.onnx { - - - // ------------------------------------------------------------------- // TypeProto_Opaque @@ -2800,8 +2764,6 @@ public class onnx extends org.bytedeco.onnx.presets.onnx { - - // #if LANG_CXX11 // #endif @@ -2816,8 +2778,6 @@ public class onnx extends org.bytedeco.onnx.presets.onnx { - - // #if LANG_CXX11 // #endif @@ -2837,8 +2797,6 @@ public class onnx extends org.bytedeco.onnx.presets.onnx { - - // optional .onnx.TensorShapeProto shape = 2; @@ -2847,9 +2805,6 @@ public class onnx extends org.bytedeco.onnx.presets.onnx { - - - // ------------------------------------------------------------------- // TypeProto @@ -2862,7 +2817,6 @@ public class onnx extends org.bytedeco.onnx.presets.onnx { - // optional .onnx.TypeProto.Sequence sequence_type = 4; @@ -2871,7 +2825,6 @@ public class onnx extends org.bytedeco.onnx.presets.onnx { - // optional .onnx.TypeProto.Map map_type = 5; @@ -2880,7 +2833,6 @@ public class onnx extends org.bytedeco.onnx.presets.onnx { - // optional .onnx.TypeProto.Opaque opaque_type = 7; @@ -2889,7 +2841,6 @@ public class onnx extends org.bytedeco.onnx.presets.onnx { - // optional .onnx.TypeProto.SparseTensor sparse_tensor_type = 8; @@ -2898,14 +2849,11 @@ public class onnx extends org.bytedeco.onnx.presets.onnx { - // optional string denotation = 6; - - // #if LANG_CXX11 // #endif @@ -2927,8 +2875,6 @@ public class onnx extends org.bytedeco.onnx.presets.onnx { - - // #if LANG_CXX11 // #endif @@ -2944,8 +2890,6 @@ public class onnx extends org.bytedeco.onnx.presets.onnx { - - // #ifdef __GNUC__ // #pragma GCC diagnostic pop // #endif // __GNUC__ @@ -2981,6 +2925,8 @@ public class onnx extends org.bytedeco.onnx.presets.onnx { // ------------------------------------------------------------------- +// ------------------------------------------------------------------- + // @@protoc_insertion_point(namespace_scope) @@ -2995,6 +2941,7 @@ public class onnx extends org.bytedeco.onnx.presets.onnx { // @@protoc_insertion_point(global_scope) +// #include // #endif // PROTOBUF_INCLUDED_onnx_2fonnx_2dml_2eproto @@ -3049,14 +2996,17 @@ public class onnx extends org.bytedeco.onnx.presets.onnx { // #endif // #include -// #include -// #include // defined below +// #include +// #include - // namespace protobuf +// #include -@Namespace("google::quality_webanswers") public static native void TempPrivateWorkAround(ArenaOptions arena_options); +// #ifdef SWIG +// #error "You cannot SWIG proto headers" +// #endif // defined below - // namespace quality_webanswers // defined below // defined in message.h + // namespace protobuf + // namespace google // defined below // defined in message.h @Namespace("google::protobuf::arena_metrics") public static native void EnableArenaMetrics(ArenaOptions options); @@ -3078,7 +3028,7 @@ public class onnx extends org.bytedeco.onnx.presets.onnx { // Support for non-RTTI environments. (The metrics hooks API uses type // information.) -// #ifndef GOOGLE_PROTOBUF_NO_RTTI +// #if PROTOBUF_RTTI // #define RTTI_TYPE_ID(type) (&typeid(type)) // #else // #define RTTI_TYPE_ID(type) (NULL) @@ -3090,8 +3040,10 @@ public class onnx extends org.bytedeco.onnx.presets.onnx { // #undef RTTI_TYPE_ID // namespace protobuf - // namespace google + +// #include + // #endif // GOOGLE_PROTOBUF_ARENA_H__ @@ -3139,11 +3091,20 @@ public class onnx extends org.bytedeco.onnx.presets.onnx { // #define GOOGLE_PROTOBUF_MESSAGE_LITE_H__ // #include +// #include // #include // #include -// #include // #include -// #include +// #include +// #include +// #include + + +// #include + +// #ifdef SWIG +// #error "You cannot SWIG proto headers" +// #endif // Targeting ../CodedInputStream.java @@ -3157,6 +3118,7 @@ public class onnx extends org.bytedeco.onnx.presets.onnx { + // namespace io // Targeting ../RepeatedPtrFieldBase.java @@ -3167,7 +3129,6 @@ public class onnx extends org.bytedeco.onnx.presets.onnx { -// #ifndef SWIG // We compute sizes as size_t but cache them as int. This function converts a // computed size to a cached size. Since we don't proceed with serialization // if the total size was > INT_MAX, it is not important what this function @@ -3206,11 +3167,12 @@ public class onnx extends org.bytedeco.onnx.presets.onnx { // Default empty string object. Don't use this directly. Instead, call // GetEmptyString() to get the reference. + @Namespace("google::protobuf::internal") public static native @StdString BytePointer GetEmptyStringAlreadyInited(); @Namespace("google::protobuf::internal") public static native @Cast("size_t") long StringSpaceUsedExcludingSelfLong(@StdString BytePointer str); @Namespace("google::protobuf::internal") public static native @Cast("size_t") long StringSpaceUsedExcludingSelfLong(@StdString String str); -// #endif // SWIG + // Targeting ../MessageLite.java @@ -3218,19 +3180,30 @@ public class onnx extends org.bytedeco.onnx.presets.onnx { -// DO NOT USE: For migration only. Will be removed when Proto3 defaults to -// preserve unknowns. -@Namespace("google::protobuf::internal") public static native @Cast("bool") boolean GetProto3PreserveUnknownsDefault(); -// DO NOT USE: For migration only. Will be removed when Proto3 defaults to -// preserve unknowns. -@Namespace("google::protobuf::internal") public static native void SetProto3PreserveUnknownsDefault(@Cast("bool") boolean preserve); + + + + +// Targeting ../BoundedZCIS.java + + + + + + + + + // namespace internal - // namespace protobuf + // namespace protobuf // namespace google + +// #include + // #endif // GOOGLE_PROTOBUF_MESSAGE_LITE_H__ @@ -3281,7 +3254,16 @@ public class onnx extends org.bytedeco.onnx.presets.onnx { // #include // #include // #include -// #include // coded_stream.h // coded_stream.h // zero_copy_stream.h +// #include +// #include +// #include +// #include + +// #include + +// #ifdef SWIG +// #error "You cannot SWIG proto headers" +// #endif // coded_stream.h // coded_stream.h // zero_copy_stream.h // Targeting ../InternalMetadataWithArena.java @@ -3347,8 +3329,9 @@ public class onnx extends org.bytedeco.onnx.presets.onnx { // namespace protobuf - // namespace google + +// #include // #endif // GOOGLE_PROTOBUF_UNKNOWN_FIELD_SET_H__ @@ -3418,10 +3401,16 @@ public class onnx extends org.bytedeco.onnx.presets.onnx { // #include // #include +// #include + // TYPE_BOOL is defined in the MacOS's ConditionalMacros.h. // #ifdef TYPE_BOOL // #undef TYPE_BOOL // #endif // TYPE_BOOL + +// #ifdef SWIG +// #define PROTOBUF_EXPORT +// #endif // Targeting ../DescriptorDatabase.java @@ -3505,6 +3494,10 @@ public class onnx extends org.bytedeco.onnx.presets.onnx { // Targeting ../CommandLineInterface.java +// Targeting ../Formatter.java + + + // namespace cpp // Targeting ../DescriptorTest.java @@ -3564,7 +3557,7 @@ public class onnx extends org.bytedeco.onnx.presets.onnx { // Strings fields are stored as pointers but returned as const references. // #define PROTOBUF_DEFINE_STRING_ACCESSOR(CLASS, FIELD) -// inline const string& CLASS::FIELD() const { return *FIELD##_; } +// inline const std::string& CLASS::FIELD() const { return *FIELD##_; } // Arrays take an index parameter, obviously. // #define PROTOBUF_DEFINE_ARRAY_ACCESSOR(CLASS, FIELD, TYPE) @@ -3764,8 +3757,10 @@ public class onnx extends org.bytedeco.onnx.presets.onnx { // namespace protobuf - // namespace google + +// #include + // #endif // GOOGLE_PROTOBUF_DESCRIPTOR_H__ @@ -3847,12 +3842,6 @@ public class onnx extends org.bytedeco.onnx.presets.onnx { @Namespace("onnx::checker") public static native void check_model(@StdString BytePointer model_path); @Namespace("onnx::checker") public static native void check_model(@StdString String model_path); -@Namespace("onnx::checker") public static native void VerifyFunctionNode( - @Const @ByRef NodeProto arg0, - @Const @ByRef FunctionProto arg1, - @Const @ByRef CheckerContext arg2, - @Const @ByRef LexicalScopeContext arg3); - // namespace checker // namespace ONNX_NAMESPACE @@ -3876,22 +3865,24 @@ public class onnx extends org.bytedeco.onnx.presets.onnx { @Namespace("onnx::shape_inference") public static native void InferShapes( @ByRef ModelProto m, - @Const ISchemaRegistry schema_registry/*=onnx::OpSchemaRegistry::Instance()*/, - @Const IFunctionBuilderRegistry func_registry/*=&FunctionBuilderRegistry::OnnxInstance()*/); + @Const ISchemaRegistry schema_registry/*=onnx::OpSchemaRegistry::Instance()*/ + ); @Namespace("onnx::shape_inference") public static native void InferShapes( - @ByRef ModelProto m); + @ByRef ModelProto m + ); @Namespace("onnx::shape_inference") public static native void InferShapes( GraphProto g, @Const @ByRef StringIntMap opset_imports, - @Const ISchemaRegistry schema_registry/*=onnx::OpSchemaRegistry::Instance()*/, - @Const IFunctionBuilderRegistry func_registry/*=&FunctionBuilderRegistry::OnnxInstance()*/); + @Const ISchemaRegistry schema_registry/*=onnx::OpSchemaRegistry::Instance()*/ + ); @Namespace("onnx::shape_inference") public static native void InferShapes( GraphProto g, - @Const @ByRef StringIntMap opset_imports); + @Const @ByRef StringIntMap opset_imports + ); @Namespace("onnx::shape_inference") public static native void InferShapeForFunctionNode( - @Const @ByRef FunctionProto func, + @Const FunctionProto func, @Const ISchemaRegistry schema_registry, @ByRef InferenceContext ctx); @@ -5919,7 +5910,7 @@ public class onnx extends org.bytedeco.onnx.presets.onnx { // Parsed from onnx/common/status.h -// Copyright (c) Facebook Inc. and Microsoft Corporation. +// Copyright (c) ONNX Project Contributors. // Licensed under the MIT license. // #pragma once @@ -6216,6 +6207,10 @@ public class onnx extends org.bytedeco.onnx.presets.onnx { // #include "onnx/version_converter/adapters/averagepool_7_6.h" // #include "onnx/version_converter/adapters/dropout_6_7.h" // #include "onnx/version_converter/adapters/maxpool_8_7.h" +// #include "onnx/version_converter/adapters/extend_supported_types.h" +// #include "onnx/version_converter/adapters/upsample_9_8.h" +// #include "onnx/version_converter/adapters/scan_9_8.h" +// #include "onnx/version_converter/adapters/cast_9_8.h" // Targeting ../DefaultVersionConverter.java @@ -6356,7 +6351,7 @@ public class onnx extends org.bytedeco.onnx.presets.onnx { // Parsed from onnx/defs/function.h -// Copyright (c) Facebook Inc. and Microsoft Corporation. +// Copyright (c) ONNX Project Contributors. // Licensed under the MIT license. // #pragma once @@ -6366,47 +6361,11 @@ public class onnx extends org.bytedeco.onnx.presets.onnx { // #include // #include +// #include "attr_proto_util.h" // #include "onnx/common/constants.h" // #include "onnx/common/status.h" // #include "onnx/onnx-operators_pb.h" -// Targeting ../FunctionBuilder.java - - -// Targeting ../IFunctionBuilderRegistry.java - - -// Targeting ../FunctionBuilderRegistry.java - - - -// #define ONNX_FUNCTION_BUILDER_CLASS_NAME(domain, ver, name) -// name##_##domain##_ver##ver - -// #define ONNX_FUNCTION_BUILD(name, ver, build_func) -// ONNX_FUNCTION_BUILD_HELPER(name, Onnx, ONNX_DOMAIN, ver, build_func) - -// #define ONNX_FUNCTION_BUILD_HELPER(name, domain, domain_str, ver, build_func) -// class ONNX_FUNCTION_BUILDER_CLASS_NAME(domain, ver, name); -// template <> -// FunctionBuilder -// GetFunctionBuilder() { -// return build_func; -// } - -// #define ONNX_FUNCTION(function_builder) -// ONNX_FUNCTION_UNIQ_HELPER(__COUNTER__, function_builder) - -// #define ONNX_FUNCTION_UNIQ_HELPER(counter, function_builder) -// ONNX_FUNCTION_UNIQ(counter, function_builder) - -// #define ONNX_FUNCTION_UNIQ(counter, function_builder) -// static Common::Status function_builder_##counter##_status = -// FunctionBuilderRegistry::OnnxInstance().Register(function_builder); - - - -// Registers all function builder of a given operator set - +// #include "tensor_proto_util.h" // Helper function to expand a function node given the function proto @Namespace("onnx") public static native void FunctionExpandHelper( @Const @ByRef NodeProto node, @@ -6422,30 +6381,9 @@ public class onnx extends org.bytedeco.onnx.presets.onnx { @Const @ByRef FunctionProto func, @ByRef GraphProto g, @StdString String node_prefix/*=""*/); +// Targeting ../FunctionBodyHelper.java + -// Example to register a function. -// Common::Status BuildFc(std::unique_ptr* func_proto) { -// if (nullptr == func_proto) { -// return Status( -// Common::CHECKER, -// Common::INVALID_ARGUMENT, -// "func_proto should not be nullptr."); -// } -// -// func_proto->reset(new FunctionProto); -// auto& func = **func_proto; -// func.set_name("FC"); -// set function inputs. -// set function outputs. -// set function attributes. -// set function description. -// set function body (nodes). -// -// return Status::OK(); -//} -// -// ONNX_FUNCTION_BUILD(Name, Ver, -// FunctionBuilder().SetDomain("").SetBuildFunction(BuildFc)); // namespace ONNX_NAMESPACE diff --git a/onnx/src/gen/java/org/bytedeco/onnx/onnxBackend.java b/onnx/src/gen/java/org/bytedeco/onnx/onnxBackend.java index b32fda9c322..6d4c9e8e7ca 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/onnxBackend.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/onnxBackend.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/onnxBackendID.java b/onnx/src/gen/java/org/bytedeco/onnx/onnxBackendID.java index cada23d97da..26f5c0c1f91 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/onnxBackendID.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/onnxBackendID.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/onnxEvent.java b/onnx/src/gen/java/org/bytedeco/onnx/onnxEvent.java index 17109f4d5c5..c3a323303b2 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/onnxEvent.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/onnxEvent.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/onnxGetBackendCompatibilityFunction.java b/onnx/src/gen/java/org/bytedeco/onnx/onnxGetBackendCompatibilityFunction.java index 0a89f34c5de..70c06eef744 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/onnxGetBackendCompatibilityFunction.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/onnxGetBackendCompatibilityFunction.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/onnxGetBackendIDsFunction.java b/onnx/src/gen/java/org/bytedeco/onnx/onnxGetBackendIDsFunction.java index 285158a1c9e..d0c73b3cbca 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/onnxGetBackendIDsFunction.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/onnxGetBackendIDsFunction.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/onnxGetBackendInfoFunction.java b/onnx/src/gen/java/org/bytedeco/onnx/onnxGetBackendInfoFunction.java index aaa4c874b31..3c585d8ac41 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/onnxGetBackendInfoFunction.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/onnxGetBackendInfoFunction.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/onnxGetEventStateFunction.java b/onnx/src/gen/java/org/bytedeco/onnx/onnxGetEventStateFunction.java index 1f6e5105b19..0452938ab83 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/onnxGetEventStateFunction.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/onnxGetEventStateFunction.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/onnxGraph.java b/onnx/src/gen/java/org/bytedeco/onnx/onnxGraph.java index dc73574961e..5280ac2b5d1 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/onnxGraph.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/onnxGraph.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/onnxInitBackendFunction.java b/onnx/src/gen/java/org/bytedeco/onnx/onnxInitBackendFunction.java index 4a1ad566ada..a2fc482073c 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/onnxInitBackendFunction.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/onnxInitBackendFunction.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/onnxInitEventFunction.java b/onnx/src/gen/java/org/bytedeco/onnx/onnxInitEventFunction.java index 7360dc4ae0e..961d7e7d4dd 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/onnxInitEventFunction.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/onnxInitEventFunction.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/onnxInitGraphFunction.java b/onnx/src/gen/java/org/bytedeco/onnx/onnxInitGraphFunction.java index 9a5b55856a4..7fa24941820 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/onnxInitGraphFunction.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/onnxInitGraphFunction.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/onnxMemoryFenceV1.java b/onnx/src/gen/java/org/bytedeco/onnx/onnxMemoryFenceV1.java index 68188d22bf6..296c9901889 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/onnxMemoryFenceV1.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/onnxMemoryFenceV1.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/onnxReleaseBackendFunction.java b/onnx/src/gen/java/org/bytedeco/onnx/onnxReleaseBackendFunction.java index 85263fc1d94..a0bed392296 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/onnxReleaseBackendFunction.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/onnxReleaseBackendFunction.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/onnxReleaseBackendIDFunction.java b/onnx/src/gen/java/org/bytedeco/onnx/onnxReleaseBackendIDFunction.java index a417366266a..eed543cbe0d 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/onnxReleaseBackendIDFunction.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/onnxReleaseBackendIDFunction.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/onnxReleaseEventFunction.java b/onnx/src/gen/java/org/bytedeco/onnx/onnxReleaseEventFunction.java index 78328786d64..99c26d48899 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/onnxReleaseEventFunction.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/onnxReleaseEventFunction.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/onnxReleaseGraphFunction.java b/onnx/src/gen/java/org/bytedeco/onnx/onnxReleaseGraphFunction.java index f37125f48c4..843f9920e5c 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/onnxReleaseGraphFunction.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/onnxReleaseGraphFunction.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/onnxRunGraphFunction.java b/onnx/src/gen/java/org/bytedeco/onnx/onnxRunGraphFunction.java index ae984750b8a..07587aa89ac 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/onnxRunGraphFunction.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/onnxRunGraphFunction.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/onnxSetGraphIOFunction.java b/onnx/src/gen/java/org/bytedeco/onnx/onnxSetGraphIOFunction.java index c675b3f24f3..a896f1340ec 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/onnxSetGraphIOFunction.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/onnxSetGraphIOFunction.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/onnxSignalEventFunction.java b/onnx/src/gen/java/org/bytedeco/onnx/onnxSignalEventFunction.java index a876049fa72..3c2c9787f3a 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/onnxSignalEventFunction.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/onnxSignalEventFunction.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/onnxTensorDescriptorV1.java b/onnx/src/gen/java/org/bytedeco/onnx/onnxTensorDescriptorV1.java index 624db1648e2..0f05c366fd7 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/onnxTensorDescriptorV1.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/onnxTensorDescriptorV1.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.onnx; diff --git a/onnx/src/gen/java/org/bytedeco/onnx/onnxWaitEventFunction.java b/onnx/src/gen/java/org/bytedeco/onnx/onnxWaitEventFunction.java index d4953c8c5ec..fa7f5831333 100644 --- a/onnx/src/gen/java/org/bytedeco/onnx/onnxWaitEventFunction.java +++ b/onnx/src/gen/java/org/bytedeco/onnx/onnxWaitEventFunction.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.onnx; diff --git a/onnx/src/main/java/org/bytedeco/onnx/presets/onnx.java b/onnx/src/main/java/org/bytedeco/onnx/presets/onnx.java index 71dc307b623..804a098e0d7 100644 --- a/onnx/src/main/java/org/bytedeco/onnx/presets/onnx.java +++ b/onnx/src/main/java/org/bytedeco/onnx/presets/onnx.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Alexander Merritt, Samuel Audet + * Copyright (C) 2018-2019 Alexander Merritt, Samuel Audet * * Licensed either under the Apache License, Version 2.0, or (at your option) * under the terms of the GNU General Public License as published by @@ -76,8 +76,10 @@ public class onnx implements InfoMapper { public void map(InfoMap infoMap) { infoMap.put(new Info("ONNX_NAMESPACE").cppText("#define ONNX_NAMESPACE onnx")) - .put(new Info("LIBPROTOBUF_EXPORT","PROTOBUF_CONSTEXPR", "PROTOBUF_FINAL", "GOOGLE_PROTOBUF_ATTRIBUTE_NOINLINE", + .put(new Info("LIBPROTOBUF_EXPORT", "PROTOBUF_EXPORT", "PROTOBUF_CONSTEXPR", "PROTOBUF_FINAL", + "PROTOBUF_ATTRIBUTE_REINITIALIZES", "PROTOBUF_NOINLINE", "GOOGLE_PROTOBUF_ATTRIBUTE_NOINLINE", "ONNX_UNUSED", "ONNX_API", "ONNXIFI_ABI", "ONNXIFI_CHECK_RESULT", "ONNXIFI_PUBLIC", "ONNX_IMPORT", "ONNX_EXPORT").cppTypes().annotations()) + .put(new Info("GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER").define(false)) .put(new Info("onnx::AttributeProto::AttributeType", "onnx::TensorProto::DataType", "onnx::TensorProto_DataType", "onnx::OpSchema::UseType").cast().valueTypes("int").pointerTypes("IntPointer", "IntBuffer", "int...")) .put(new Info("onnx::OpSchema::SinceVersion").annotations("@Function")) @@ -91,9 +93,9 @@ public void map(InfoMap infoMap) { "graph_node_list_iterator", "std::vector::const_iterator", "onnx::Attributes", "Symbol", "std::reverse_iterator::iterator>", "const_graph_node_list_iterator", "const_graph_node_list", "onnx::toString", "onnx::ResourceGuard", "onnx::GraphInferencer", - "onnx::shape_inference::GraphInferenceContext", "onnx::optimization::FullGraphBasedPass", - "onnx::optimization::ImmutablePass", "PROTOBUF_INTERNAL_EXPORT_protobuf_onnx_2fonnx_2dml_2eproto", - "PROTOBUF_INTERNAL_EXPORT_protobuf_onnx_2fonnx_2doperators_2dml_2eproto", "google::protobuf::FindAllExtensions").skip()) + "onnx::shape_inference::GraphInferenceContext", "onnx::optimization::FullGraphBasedPass", "onnx::optimization::ImmutablePass", + "PROTOBUF_INTERNAL_EXPORT_protobuf_onnx_2fonnx_2doperators_2dml_2eproto", "PROTOBUF_INTERNAL_EXPORT_onnx_2fonnx_2doperators_2dml_2eproto", + "PROTOBUF_INTERNAL_EXPORT_protobuf_onnx_2fonnx_2dml_2eproto", "PROTOBUF_INTERNAL_EXPORT_onnx_2fonnx_2dml_2eproto").skip()) .put(new Info("onnx::shape_inference::InferenceContextImpl").skip()) .put(new Info("std::set").pointerTypes("IntSet").define()) .put(new Info("onnx::optimization::Pass").purify(true)) @@ -115,10 +117,11 @@ public void map(InfoMap infoMap) { .put(new Info("google::protobuf::Message").cast().pointerTypes("MessageLite")) .put(new Info("google::protobuf::Any", "google::protobuf::Descriptor", "google::protobuf::Metadata").cast().pointerTypes("Pointer")) - .put(new Info("google::protobuf::Map", "google::protobuf::RepeatedField", "google::protobuf::RepeatedPtrField", "protobuf::RepeatedPtrField", + .put(new Info("google::protobuf::FindAllExtensions", "google::protobuf::Map", "google::protobuf::RepeatedField", "google::protobuf::RepeatedPtrField", "google::protobuf::internal::ExplicitlyConstructed", "google::protobuf::internal::MapEntry", "google::protobuf::internal::MapField", "google::protobuf::internal::AuxillaryParseTableField", "google::protobuf::internal::ParseTableField", "google::protobuf::internal::ParseTable", "google::protobuf::internal::FieldMetadata", "google::protobuf::internal::SerializationTable", "google::protobuf::internal::proto3_preserve_unknown_", + "google::protobuf::internal::MergePartialFromImpl", "google::protobuf::internal::UnknownFieldParse", "google::protobuf::internal::WriteLengthDelimited", "google::protobuf::is_proto_enum", "google::protobuf::GetEnumDescriptor", "google::protobuf::RepeatedField", "onnx::_TypeProto_default_instance_", "onnx::_TypeProto_Map_default_instance_", "onnx::_TypeProto_Sequence_default_instance_", "onnx::_TypeProto_Opaque_default_instance_", "onnx::_TypeProto_SparseTensor_default_instance_", @@ -127,8 +130,8 @@ public void map(InfoMap infoMap) { "onnx::_NodeProto_default_instance_", "onnx::_GraphProto_default_instance_", "onnx::_FunctionProto_default_instance_", "onnx::_ModelProto_default_instance_", "onnx::_OperatorSetProto_default_instance_", "onnx::RegisterOneFunctionBuilder", "BuildFunction", "onnx::_OperatorSetIdProto_default_instance_", "onnx::_StringStringEntryProto_default_instance_", "onnx::_OperatorProto_default_instance_", - "onnx::_AttributeProto_default_instance_", "google::protobuf::UnknownField::LengthDelimited", "google::protobuf::internal::empty_string_once_init_", - "google::protobuf::SourceLocation::leading_detached_comments").skip()) + "onnx::_AttributeProto_default_instance_", "onnx::_TensorAnnotation_default_instance_", "google::protobuf::UnknownField::LengthDelimited", + "google::protobuf::internal::empty_string_once_init_", "google::protobuf::SourceLocation::leading_detached_comments").skip()) .put(new Info("onnx::DataType").annotations("@StdString").pointerTypes("@Cast({\"char*\", \"std::string*\"}) BytePointer")) .put(new Info("onnx::OpSchema::Attribute").pointerTypes("OpSchema.Attribute")) diff --git a/openblas/README.md b/openblas/README.md index 4ccb15b440a..1ddba43a0f9 100644 --- a/openblas/README.md +++ b/openblas/README.md @@ -5,7 +5,7 @@ Introduction ------------ This directory contains the JavaCPP Presets module for: - * OpenBLAS 0.3.5 http://www.openblas.net/ + * OpenBLAS 0.3.6 http://www.openblas.net/ Please refer to the parent README.md file for more detailed information about the JavaCPP Presets. @@ -38,7 +38,7 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic 4.0.0 org.bytedeco.openblas openblas - 1.5 + 1.5.1-SNAPSHOT ExampleDGELSrowmajor @@ -46,7 +46,7 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic org.bytedeco openblas-platform - 0.3.5-1.5 + 0.3.6-1.5.1-SNAPSHOT diff --git a/openblas/cppbuild.sh b/openblas/cppbuild.sh index 4209fc7a132..425e9f47bcd 100755 --- a/openblas/cppbuild.sh +++ b/openblas/cppbuild.sh @@ -7,7 +7,7 @@ if [[ -z "$PLATFORM" ]]; then exit fi -OPENBLAS_VERSION=0.3.5 +OPENBLAS_VERSION=0.3.6 download https://github.com/xianyi/OpenBLAS/archive/v$OPENBLAS_VERSION.tar.gz OpenBLAS-$OPENBLAS_VERSION.tar.gz diff --git a/openblas/platform/pom.xml b/openblas/platform/pom.xml index 79785606e55..a00f2ca321c 100644 --- a/openblas/platform/pom.xml +++ b/openblas/platform/pom.xml @@ -17,7 +17,7 @@ openblas - 0.3.5-${project.parent.version} + 0.3.6-${project.parent.version} diff --git a/openblas/pom.xml b/openblas/pom.xml index 34baf5cac69..95209f33e36 100644 --- a/openblas/pom.xml +++ b/openblas/pom.xml @@ -16,7 +16,7 @@ -O3 - 0.3.5-${project.parent.version} + 0.3.6-${project.parent.version} diff --git a/openblas/samples/pom.xml b/openblas/samples/pom.xml index 07e0eb039c3..fa56d742dc4 100644 --- a/openblas/samples/pom.xml +++ b/openblas/samples/pom.xml @@ -2,7 +2,7 @@ 4.0.0 org.bytedeco.openblas openblas - 1.5 + 1.5.1-SNAPSHOT ExampleDGELSrowmajor @@ -10,7 +10,7 @@ org.bytedeco openblas-platform - 0.3.5-1.5 + 0.3.6-1.5.1-SNAPSHOT diff --git a/openblas/src/gen/java/org/bytedeco/openblas/global/openblas.java b/openblas/src/gen/java/org/bytedeco/openblas/global/openblas.java index 8fbf312f932..93bc52bca12 100644 --- a/openblas/src/gen/java/org/bytedeco/openblas/global/openblas.java +++ b/openblas/src/gen/java/org/bytedeco/openblas/global/openblas.java @@ -37,7 +37,7 @@ public class openblas extends org.bytedeco.openblas.presets.openblas { public static final int OPENBLAS_CLOCAL_BUFFER_SIZE = 8192; public static final int OPENBLAS_ZLOCAL_BUFFER_SIZE = 8192; public static final int OPENBLAS_GEMM_MULTITHREAD_THRESHOLD = 4; -public static final String OPENBLAS_VERSION = " OpenBLAS 0.3.5 "; +public static final String OPENBLAS_VERSION = " OpenBLAS 0.3.6 "; /*This is only for "make install" target.*/ // #if defined(OPENBLAS_OS_WINNT) || defined(OPENBLAS_OS_CYGWIN_NT) || defined(OPENBLAS_OS_INTERIX) @@ -199,6 +199,11 @@ structure as fallback (see Clause 6.2.5.13 of the C99 standard). */ public static native float cblas_scasum(@Cast("const blasint") int n, @Const Pointer x, @Cast("const blasint") int incx); public static native double cblas_dzasum(@Cast("const blasint") int n, @Const Pointer x, @Cast("const blasint") int incx); + + + + + public static native float cblas_snrm2(@Cast("const blasint") int N, @Const FloatPointer X, @Cast("const blasint") int incX); public static native float cblas_snrm2(@Cast("const blasint") int N, @Const FloatBuffer X, @Cast("const blasint") int incX); public static native float cblas_snrm2(@Cast("const blasint") int N, @Const float[] X, @Cast("const blasint") int incX); @@ -222,6 +227,16 @@ structure as fallback (see Clause 6.2.5.13 of the C99 standard). */ + + + + + + + + + + public static native void cblas_saxpy(@Cast("const blasint") int n, float alpha, @Const FloatPointer x, @Cast("const blasint") int incx, FloatPointer y, @Cast("const blasint") int incy); public static native void cblas_saxpy(@Cast("const blasint") int n, float alpha, @Const FloatBuffer x, @Cast("const blasint") int incx, FloatBuffer y, @Cast("const blasint") int incy); public static native void cblas_saxpy(@Cast("const blasint") int n, float alpha, @Const float[] x, @Cast("const blasint") int incx, float[] y, @Cast("const blasint") int incy); diff --git a/openblas/src/gen/java/org/bytedeco/openblas/global/openblas_nolapack.java b/openblas/src/gen/java/org/bytedeco/openblas/global/openblas_nolapack.java index e5fe284467f..a393660060c 100644 --- a/openblas/src/gen/java/org/bytedeco/openblas/global/openblas_nolapack.java +++ b/openblas/src/gen/java/org/bytedeco/openblas/global/openblas_nolapack.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.openblas.global; @@ -35,7 +35,7 @@ public class openblas_nolapack extends org.bytedeco.openblas.presets.openblas_no public static final int OPENBLAS_CLOCAL_BUFFER_SIZE = 8192; public static final int OPENBLAS_ZLOCAL_BUFFER_SIZE = 8192; public static final int OPENBLAS_GEMM_MULTITHREAD_THRESHOLD = 4; -public static final String OPENBLAS_VERSION = " OpenBLAS 0.3.5 "; +public static final String OPENBLAS_VERSION = " OpenBLAS 0.3.6 "; /*This is only for "make install" target.*/ // #if defined(OPENBLAS_OS_WINNT) || defined(OPENBLAS_OS_CYGWIN_NT) || defined(OPENBLAS_OS_INTERIX) @@ -197,6 +197,11 @@ structure as fallback (see Clause 6.2.5.13 of the C99 standard). */ public static native float cblas_scasum(@Cast("const blasint") int n, @Const Pointer x, @Cast("const blasint") int incx); public static native double cblas_dzasum(@Cast("const blasint") int n, @Const Pointer x, @Cast("const blasint") int incx); + + + + + public static native float cblas_snrm2(@Cast("const blasint") int N, @Const FloatPointer X, @Cast("const blasint") int incX); public static native float cblas_snrm2(@Cast("const blasint") int N, @Const FloatBuffer X, @Cast("const blasint") int incX); public static native float cblas_snrm2(@Cast("const blasint") int N, @Const float[] X, @Cast("const blasint") int incX); @@ -220,6 +225,16 @@ structure as fallback (see Clause 6.2.5.13 of the C99 standard). */ + + + + + + + + + + public static native void cblas_saxpy(@Cast("const blasint") int n, float alpha, @Const FloatPointer x, @Cast("const blasint") int incx, FloatPointer y, @Cast("const blasint") int incy); public static native void cblas_saxpy(@Cast("const blasint") int n, float alpha, @Const FloatBuffer x, @Cast("const blasint") int incx, FloatBuffer y, @Cast("const blasint") int incy); public static native void cblas_saxpy(@Cast("const blasint") int n, float alpha, @Const float[] x, @Cast("const blasint") int incx, float[] y, @Cast("const blasint") int incy); diff --git a/openblas/src/main/java/org/bytedeco/openblas/presets/openblas_nolapack.java b/openblas/src/main/java/org/bytedeco/openblas/presets/openblas_nolapack.java index f64c9f928c6..1448ea2a933 100644 --- a/openblas/src/main/java/org/bytedeco/openblas/presets/openblas_nolapack.java +++ b/openblas/src/main/java/org/bytedeco/openblas/presets/openblas_nolapack.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016-2018 Samuel Audet + * Copyright (C) 2016-2019 Samuel Audet * * Licensed either under the Apache License, Version 2.0, or (at your option) * under the terms of the GNU General Public License as published by @@ -132,6 +132,9 @@ public class openblas_nolapack implements LoadEnabled, InfoMapper { "cblas_caxpby", "cblas_daxpby", "cblas_saxpby", "cblas_zaxpby", // not exported by OpenBLAS "cblas_cgemm3m", "cblas_zgemm3m", "cblas_xerbla", "cblas_icamin", "cblas_idamin", "cblas_isamin", "cblas_izamin", + "cblas_ssum", "cblas_dsum", "cblas_scsum", "cblas_dzsum", + "cblas_ismax", "cblas_idmax", "cblas_icmax", "cblas_izmax", + "cblas_ismin", "cblas_idmin", "cblas_icmin", "cblas_izmin", // not implemented by MKL "openblas_set_num_threads", "goto_set_num_threads", "openblas_get_num_threads", "openblas_get_num_procs", "openblas_get_config", "openblas_get_corename", "openblas_get_parallel", "cblas_cdotc", "cblas_cdotu", "cblas_cgeadd", diff --git a/opencv/platform/pom.xml b/opencv/platform/pom.xml index 78eb907008f..c653d0167cb 100644 --- a/opencv/platform/pom.xml +++ b/opencv/platform/pom.xml @@ -24,7 +24,7 @@ org.bytedeco openblas-platform - 0.3.5-${project.parent.version} + 0.3.6-${project.parent.version} ${project.groupId} diff --git a/opencv/pom.xml b/opencv/pom.xml index 1a8ebec55a9..3c14725bd35 100644 --- a/opencv/pom.xml +++ b/opencv/pom.xml @@ -22,7 +22,7 @@ org.bytedeco openblas - 0.3.5-${project.parent.version} + 0.3.6-${project.parent.version} org.bytedeco @@ -60,12 +60,12 @@ org.bytedeco openblas - 0.3.5-${project.parent.version} + 0.3.6-${project.parent.version} org.bytedeco openblas - 0.3.5-${project.parent.version} + 0.3.6-${project.parent.version} ${javacpp.platform} diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Scalar4f.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Scalar4f.java new file mode 100644 index 00000000000..959beeec784 --- /dev/null +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Scalar4f.java @@ -0,0 +1,55 @@ +// Targeted by JavaCPP version 1.5.1-SNAPSHOT: DO NOT EDIT THIS FILE + +package org.bytedeco.opencv.opencv_core; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +import static org.bytedeco.openblas.global.openblas_nolapack.*; +import static org.bytedeco.openblas.global.openblas.*; + +import static org.bytedeco.opencv.global.opencv_core.*; + +@Name("cv::Scalar_") @Properties(inherit = org.bytedeco.opencv.presets.opencv_core.class) +public class Scalar4f extends FloatPointer { + static { Loader.load(); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public Scalar4f(Pointer p) { super(p); } + /** Native array allocator. Access with {@link Pointer#position(long)}. */ + public Scalar4f(long size) { super((Pointer)null); allocateArray(size); } + private native void allocateArray(long size); + @Override public Scalar4f position(long position) { + return (Scalar4f)super.position(position); + } + + /** default constructor */ + public Scalar4f() { super((Pointer)null); allocate(); } + private native void allocate(); + public Scalar4f(float v0, float v1, float v2/*=0*/, float v3/*=0*/) { super((Pointer)null); allocate(v0, v1, v2, v3); } + private native void allocate(float v0, float v1, float v2/*=0*/, float v3/*=0*/); + public Scalar4f(float v0, float v1) { super((Pointer)null); allocate(v0, v1); } + private native void allocate(float v0, float v1); + public Scalar4f(float v0) { super((Pointer)null); allocate(v0); } + private native void allocate(float v0); + + public Scalar4f(@Const @ByRef Scalar4f s) { super((Pointer)null); allocate(s); } + private native void allocate(@Const @ByRef Scalar4f s); + + public native @ByRef @Name("operator =") Scalar4f put(@Const @ByRef Scalar4f s); + + /** returns a scalar with all elements set to v0 */ + public static native @ByVal Scalar4f all(float v0); + + /** conversion to another data type */ + + /** per-element product */ + public native @ByVal Scalar4f mul(@Const @ByRef Scalar4f a, double scale/*=1*/ ); + public native @ByVal Scalar4f mul(@Const @ByRef Scalar4f a ); + + /** returns (v0, -v1, -v2, -v3) */ + public native @ByVal Scalar4f conj(); + + /** returns true iff v1 == v2 == v3 == 0 */ + public native @Cast("bool") boolean isReal(); +} diff --git a/platform/pom.xml b/platform/pom.xml index 40f28e54625..d031e1ed4d2 100644 --- a/platform/pom.xml +++ b/platform/pom.xml @@ -86,7 +86,7 @@ org.bytedeco libdc1394-platform - 2.2.5-${project.version} + 2.2.6-${project.version} org.bytedeco @@ -141,7 +141,7 @@ org.bytedeco openblas-platform - 0.3.5-${project.version} + 0.3.6-${project.version} org.bytedeco @@ -166,12 +166,12 @@ org.bytedeco cpython-platform - 3.6-${project.version} + 3.7.3-${project.version} org.bytedeco numpy-platform - 1.16.2-${project.version} + 1.16.3-${project.version} org.bytedeco @@ -226,7 +226,7 @@ org.bytedeco onnx-platform - 1.4.1-${project.version} + 1.5.0-${project.version} org.bytedeco @@ -241,7 +241,7 @@ org.bytedeco qt-platform - 5.12.2-${project.version} + 5.12.3-${project.version} org.bytedeco @@ -251,7 +251,7 @@ org.bytedeco cpu_features-platform - 0.2.0-${project.version} + 0.3.0-${project.version} org.bytedeco diff --git a/qt/README.md b/qt/README.md index 3d6091b3390..b2f614718dc 100644 --- a/qt/README.md +++ b/qt/README.md @@ -5,7 +5,7 @@ Introduction ------------ This directory contains the JavaCPP Presets module for: - * Qt 5.12.2 https://www.qt.io/ + * Qt 5.12.3 https://www.qt.io/ Please refer to the parent README.md file for more detailed information about the JavaCPP Presets. @@ -38,7 +38,7 @@ Please see the samples directory for more Qt examples ported to Java from C++. 4.0.0 org.bytedeco.qt gettingstarted - 1.5 + 1.5.1-SNAPSHOT GettingStarted @@ -46,7 +46,7 @@ Please see the samples directory for more Qt examples ported to Java from C++. org.bytedeco qt-platform - 5.12.2-1.5 + 5.12.3-1.5.1-SNAPSHOT diff --git a/qt/cppbuild.sh b/qt/cppbuild.sh index 9c809171655..e33f5e78bac 100755 --- a/qt/cppbuild.sh +++ b/qt/cppbuild.sh @@ -7,7 +7,7 @@ if [[ -z "$PLATFORM" ]]; then exit fi -QT_VERSION=5.12.2 +QT_VERSION=5.12.3 download https://download.qt.io/archive/qt/${QT_VERSION%.*}/$QT_VERSION/single/qt-everywhere-src-$QT_VERSION.tar.xz qt-$QT_VERSION.tar.xz mkdir -p "$PLATFORM$EXTENSION" @@ -20,6 +20,7 @@ cd qt-everywhere-src-$QT_VERSION # remove stuff not actually available on Mac sedinplace '/kTLSProtocol13/d' qtbase/src/network/ssl/qsslsocket_mac.cpp +sedinplace 's/kIOSurfaceSuccess/KERN_SUCCESS/g' qtbase/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.mm QT_OPTIONS="-prefix .. -qt-zlib -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -opensource -confirm-license -nomake examples -nomake tests -nomake tools -skip qt3d -skip qtactiveqt -skip qtandroidextras -skip qtcanvas3d -skip qtcharts -skip qtconnectivity -skip qtdatavis3d -skip qtdeclarative -skip qtdoc -skip qtgamepad -skip qtgraphicaleffects -skip qtimageformats -skip qtlocation -skip qtmacextras -skip qtmultimedia -skip qtnetworkauth -skip qtpurchasing -skip qtquickcontrols -skip qtquickcontrols2 -skip qtremoteobjects -skip qtscript -skip qtscxml -skip qtsensors -skip qtserialbus -skip qtserialport -skip qtspeech -skip qtsvg -skip qttools -skip qttranslations -skip qtvirtualkeyboard -skip qtwayland -skip qtwebchannel -skip qtwebengine -skip qtwebglplugin -skip websockets -skip qtwebview -skip qtwinextras -skip qtx11extras -skip qtxmlpatterns -no-icu -no-framework -release -silent" diff --git a/qt/platform/pom.xml b/qt/platform/pom.xml index 88b0244af3c..77b606c987d 100644 --- a/qt/platform/pom.xml +++ b/qt/platform/pom.xml @@ -17,7 +17,7 @@ qt - 5.12.2-${project.parent.version} + 5.12.3-${project.parent.version} diff --git a/qt/pom.xml b/qt/pom.xml index 09f4fa40fe7..b7be2ffe144 100644 --- a/qt/pom.xml +++ b/qt/pom.xml @@ -15,7 +15,7 @@ JavaCPP Presets for Qt - 5.12.2-${project.parent.version} + 5.12.3-${project.parent.version} diff --git a/qt/samples/pom.xml b/qt/samples/pom.xml index 024ce112c6e..5c906bfd85b 100644 --- a/qt/samples/pom.xml +++ b/qt/samples/pom.xml @@ -2,7 +2,7 @@ 4.0.0 org.bytedeco.qt gettingstarted - 1.5 + 1.5.1-SNAPSHOT GettingStarted @@ -10,7 +10,7 @@ org.bytedeco qt-platform - 5.12.2-1.5 + 5.12.3-1.5.1-SNAPSHOT diff --git a/qt/src/gen/java/org/bytedeco/qt/Qt5Core/HANDLE.java b/qt/src/gen/java/org/bytedeco/qt/Qt5Core/HANDLE.java index ebcfda970c1..7540f3339f6 100644 --- a/qt/src/gen/java/org/bytedeco/qt/Qt5Core/HANDLE.java +++ b/qt/src/gen/java/org/bytedeco/qt/Qt5Core/HANDLE.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.qt.Qt5Core; diff --git a/qt/src/gen/java/org/bytedeco/qt/Qt5Core/QAbstractEventDispatcher.java b/qt/src/gen/java/org/bytedeco/qt/Qt5Core/QAbstractEventDispatcher.java index 16dc6ebb2da..b8304b06add 100644 --- a/qt/src/gen/java/org/bytedeco/qt/Qt5Core/QAbstractEventDispatcher.java +++ b/qt/src/gen/java/org/bytedeco/qt/Qt5Core/QAbstractEventDispatcher.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.qt.Qt5Core; diff --git a/qt/src/gen/java/org/bytedeco/qt/Qt5Core/QByteArray.java b/qt/src/gen/java/org/bytedeco/qt/Qt5Core/QByteArray.java index 10cba8766b4..57b7ed50562 100644 --- a/qt/src/gen/java/org/bytedeco/qt/Qt5Core/QByteArray.java +++ b/qt/src/gen/java/org/bytedeco/qt/Qt5Core/QByteArray.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.qt.Qt5Core; diff --git a/qt/src/gen/java/org/bytedeco/qt/Qt5Core/QChildEvent.java b/qt/src/gen/java/org/bytedeco/qt/Qt5Core/QChildEvent.java index 0d6f93a1e09..8e2cb6c8987 100644 --- a/qt/src/gen/java/org/bytedeco/qt/Qt5Core/QChildEvent.java +++ b/qt/src/gen/java/org/bytedeco/qt/Qt5Core/QChildEvent.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.qt.Qt5Core; diff --git a/qt/src/gen/java/org/bytedeco/qt/Qt5Core/QCoreApplication.java b/qt/src/gen/java/org/bytedeco/qt/Qt5Core/QCoreApplication.java index 937db1532ef..18518ba97cb 100644 --- a/qt/src/gen/java/org/bytedeco/qt/Qt5Core/QCoreApplication.java +++ b/qt/src/gen/java/org/bytedeco/qt/Qt5Core/QCoreApplication.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.qt.Qt5Core; diff --git a/qt/src/gen/java/org/bytedeco/qt/Qt5Core/QDeferredDeleteEvent.java b/qt/src/gen/java/org/bytedeco/qt/Qt5Core/QDeferredDeleteEvent.java index 5015704498f..3e9e9f235ac 100644 --- a/qt/src/gen/java/org/bytedeco/qt/Qt5Core/QDeferredDeleteEvent.java +++ b/qt/src/gen/java/org/bytedeco/qt/Qt5Core/QDeferredDeleteEvent.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.qt.Qt5Core; diff --git a/qt/src/gen/java/org/bytedeco/qt/Qt5Core/QDynamicPropertyChangeEvent.java b/qt/src/gen/java/org/bytedeco/qt/Qt5Core/QDynamicPropertyChangeEvent.java index c0d518bc7a6..2f520105efe 100644 --- a/qt/src/gen/java/org/bytedeco/qt/Qt5Core/QDynamicPropertyChangeEvent.java +++ b/qt/src/gen/java/org/bytedeco/qt/Qt5Core/QDynamicPropertyChangeEvent.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.qt.Qt5Core; diff --git a/qt/src/gen/java/org/bytedeco/qt/Qt5Core/QEvent.java b/qt/src/gen/java/org/bytedeco/qt/Qt5Core/QEvent.java index bcc39fdf3f3..532adeb5f9b 100644 --- a/qt/src/gen/java/org/bytedeco/qt/Qt5Core/QEvent.java +++ b/qt/src/gen/java/org/bytedeco/qt/Qt5Core/QEvent.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.qt.Qt5Core; diff --git a/qt/src/gen/java/org/bytedeco/qt/Qt5Core/QEventLoop.java b/qt/src/gen/java/org/bytedeco/qt/Qt5Core/QEventLoop.java index 3931e13c239..8191d953904 100644 --- a/qt/src/gen/java/org/bytedeco/qt/Qt5Core/QEventLoop.java +++ b/qt/src/gen/java/org/bytedeco/qt/Qt5Core/QEventLoop.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.qt.Qt5Core; diff --git a/qt/src/gen/java/org/bytedeco/qt/Qt5Core/QMessageLogContext.java b/qt/src/gen/java/org/bytedeco/qt/Qt5Core/QMessageLogContext.java index 4a5cf6d2cb4..0a44ec80def 100644 --- a/qt/src/gen/java/org/bytedeco/qt/Qt5Core/QMessageLogContext.java +++ b/qt/src/gen/java/org/bytedeco/qt/Qt5Core/QMessageLogContext.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.qt.Qt5Core; diff --git a/qt/src/gen/java/org/bytedeco/qt/Qt5Core/QMessageLogger.java b/qt/src/gen/java/org/bytedeco/qt/Qt5Core/QMessageLogger.java index d17173ba5f7..2a87548e42a 100644 --- a/qt/src/gen/java/org/bytedeco/qt/Qt5Core/QMessageLogger.java +++ b/qt/src/gen/java/org/bytedeco/qt/Qt5Core/QMessageLogger.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.qt.Qt5Core; diff --git a/qt/src/gen/java/org/bytedeco/qt/Qt5Core/QObject.java b/qt/src/gen/java/org/bytedeco/qt/Qt5Core/QObject.java index 075c742c33a..bc3dc9dd2f7 100644 --- a/qt/src/gen/java/org/bytedeco/qt/Qt5Core/QObject.java +++ b/qt/src/gen/java/org/bytedeco/qt/Qt5Core/QObject.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.qt.Qt5Core; diff --git a/qt/src/gen/java/org/bytedeco/qt/Qt5Core/QSize.java b/qt/src/gen/java/org/bytedeco/qt/Qt5Core/QSize.java index d6afbf4e5b9..2b61cc63502 100644 --- a/qt/src/gen/java/org/bytedeco/qt/Qt5Core/QSize.java +++ b/qt/src/gen/java/org/bytedeco/qt/Qt5Core/QSize.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.qt.Qt5Core; diff --git a/qt/src/gen/java/org/bytedeco/qt/Qt5Core/QString.java b/qt/src/gen/java/org/bytedeco/qt/Qt5Core/QString.java index af62dba5fd4..5963d8600cc 100644 --- a/qt/src/gen/java/org/bytedeco/qt/Qt5Core/QString.java +++ b/qt/src/gen/java/org/bytedeco/qt/Qt5Core/QString.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.qt.Qt5Core; diff --git a/qt/src/gen/java/org/bytedeco/qt/Qt5Core/QTimerEvent.java b/qt/src/gen/java/org/bytedeco/qt/Qt5Core/QTimerEvent.java index d67f900d34f..1eeda6603aa 100644 --- a/qt/src/gen/java/org/bytedeco/qt/Qt5Core/QTimerEvent.java +++ b/qt/src/gen/java/org/bytedeco/qt/Qt5Core/QTimerEvent.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.qt.Qt5Core; diff --git a/qt/src/gen/java/org/bytedeco/qt/Qt5Core/QVariant.java b/qt/src/gen/java/org/bytedeco/qt/Qt5Core/QVariant.java index a96b87ded7d..2ae2d027f2a 100644 --- a/qt/src/gen/java/org/bytedeco/qt/Qt5Core/QVariant.java +++ b/qt/src/gen/java/org/bytedeco/qt/Qt5Core/QVariant.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.qt.Qt5Core; diff --git a/qt/src/gen/java/org/bytedeco/qt/Qt5Core/QtMessageHandler.java b/qt/src/gen/java/org/bytedeco/qt/Qt5Core/QtMessageHandler.java index 7ac5d7bd1ce..c2d5ce59e91 100644 --- a/qt/src/gen/java/org/bytedeco/qt/Qt5Core/QtMessageHandler.java +++ b/qt/src/gen/java/org/bytedeco/qt/Qt5Core/QtMessageHandler.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.qt.Qt5Core; diff --git a/qt/src/gen/java/org/bytedeco/qt/Qt5Gui/QCloseEvent.java b/qt/src/gen/java/org/bytedeco/qt/Qt5Gui/QCloseEvent.java index f264e23bafe..255148a3490 100644 --- a/qt/src/gen/java/org/bytedeco/qt/Qt5Gui/QCloseEvent.java +++ b/qt/src/gen/java/org/bytedeco/qt/Qt5Gui/QCloseEvent.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.qt.Qt5Gui; diff --git a/qt/src/gen/java/org/bytedeco/qt/Qt5Gui/QFont.java b/qt/src/gen/java/org/bytedeco/qt/Qt5Gui/QFont.java index 4edab2d4db0..c8f932e5764 100644 --- a/qt/src/gen/java/org/bytedeco/qt/Qt5Gui/QFont.java +++ b/qt/src/gen/java/org/bytedeco/qt/Qt5Gui/QFont.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.qt.Qt5Gui; diff --git a/qt/src/gen/java/org/bytedeco/qt/Qt5Gui/QGuiApplication.java b/qt/src/gen/java/org/bytedeco/qt/Qt5Gui/QGuiApplication.java index 5c64a831bcd..0083107a8f4 100644 --- a/qt/src/gen/java/org/bytedeco/qt/Qt5Gui/QGuiApplication.java +++ b/qt/src/gen/java/org/bytedeco/qt/Qt5Gui/QGuiApplication.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.qt.Qt5Gui; diff --git a/qt/src/gen/java/org/bytedeco/qt/Qt5Gui/QIcon.java b/qt/src/gen/java/org/bytedeco/qt/Qt5Gui/QIcon.java index 0aff23b9d05..7e2102436cb 100644 --- a/qt/src/gen/java/org/bytedeco/qt/Qt5Gui/QIcon.java +++ b/qt/src/gen/java/org/bytedeco/qt/Qt5Gui/QIcon.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.qt.Qt5Gui; diff --git a/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QAbstractButton.java b/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QAbstractButton.java index 28434b23ca5..452507344c4 100644 --- a/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QAbstractButton.java +++ b/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QAbstractButton.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.qt.Qt5Widgets; diff --git a/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QAbstractScrollArea.java b/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QAbstractScrollArea.java index 534e2f0d023..490bd37202b 100644 --- a/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QAbstractScrollArea.java +++ b/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QAbstractScrollArea.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.qt.Qt5Widgets; diff --git a/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QAbstractSpinBox.java b/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QAbstractSpinBox.java index 246037a45bc..b10c28a8175 100644 --- a/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QAbstractSpinBox.java +++ b/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QAbstractSpinBox.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.qt.Qt5Widgets; diff --git a/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QAction.java b/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QAction.java index 2e10a2768b8..5a1f11c08a5 100644 --- a/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QAction.java +++ b/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QAction.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.qt.Qt5Widgets; diff --git a/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QApplication.java b/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QApplication.java index 15abb75691b..653d90245af 100644 --- a/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QApplication.java +++ b/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QApplication.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.qt.Qt5Widgets; diff --git a/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QBoxLayout.java b/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QBoxLayout.java index 9432263e2ea..190d0ecf2fa 100644 --- a/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QBoxLayout.java +++ b/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QBoxLayout.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.qt.Qt5Widgets; diff --git a/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QCheckBox.java b/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QCheckBox.java index 14c1f9f0212..ee2532d2d57 100644 --- a/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QCheckBox.java +++ b/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QCheckBox.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.qt.Qt5Widgets; diff --git a/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QComboBox.java b/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QComboBox.java index 0bf089b4f4f..a311e9fe042 100644 --- a/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QComboBox.java +++ b/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QComboBox.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.qt.Qt5Widgets; diff --git a/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QDialog.java b/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QDialog.java index 7148af252e1..e64c91ccd82 100644 --- a/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QDialog.java +++ b/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QDialog.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.qt.Qt5Widgets; diff --git a/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QFrame.java b/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QFrame.java index 44a5d13a16b..27c2f12e506 100644 --- a/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QFrame.java +++ b/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QFrame.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.qt.Qt5Widgets; diff --git a/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QGridLayout.java b/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QGridLayout.java index d9c3f6ed934..e21a9cfacdc 100644 --- a/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QGridLayout.java +++ b/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QGridLayout.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.qt.Qt5Widgets; diff --git a/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QGroupBox.java b/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QGroupBox.java index ebb45538497..00a9a7f008f 100644 --- a/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QGroupBox.java +++ b/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QGroupBox.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.qt.Qt5Widgets; diff --git a/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QHBoxLayout.java b/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QHBoxLayout.java index 39e827f5bdc..5a12d411162 100644 --- a/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QHBoxLayout.java +++ b/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QHBoxLayout.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.qt.Qt5Widgets; diff --git a/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QLabel.java b/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QLabel.java index 2be804cf64b..a6ad6c4ea8c 100644 --- a/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QLabel.java +++ b/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QLabel.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.qt.Qt5Widgets; diff --git a/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QLayout.java b/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QLayout.java index 8add7e1e09f..52e432754ec 100644 --- a/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QLayout.java +++ b/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QLayout.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.qt.Qt5Widgets; diff --git a/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QLineEdit.java b/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QLineEdit.java index 809e0b74d8d..54ba4c05a9b 100644 --- a/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QLineEdit.java +++ b/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QLineEdit.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.qt.Qt5Widgets; diff --git a/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QMenu.java b/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QMenu.java index 58da5e571a7..78472c2cb1b 100644 --- a/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QMenu.java +++ b/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QMenu.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.qt.Qt5Widgets; diff --git a/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QMessageBox.java b/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QMessageBox.java index e23ab16e410..2ebf4d736d4 100644 --- a/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QMessageBox.java +++ b/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QMessageBox.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.qt.Qt5Widgets; diff --git a/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QPushButton.java b/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QPushButton.java index d3c1e5b9939..deefa735ea1 100644 --- a/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QPushButton.java +++ b/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QPushButton.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.qt.Qt5Widgets; diff --git a/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QSizePolicy.java b/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QSizePolicy.java index ec4730c5352..e4899b57928 100644 --- a/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QSizePolicy.java +++ b/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QSizePolicy.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.qt.Qt5Widgets; diff --git a/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QSpinBox.java b/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QSpinBox.java index cf953464fcc..e89a7a7ea9a 100644 --- a/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QSpinBox.java +++ b/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QSpinBox.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.qt.Qt5Widgets; diff --git a/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QStyle.java b/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QStyle.java index 9c29ddc9670..eb927bc3454 100644 --- a/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QStyle.java +++ b/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QStyle.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.qt.Qt5Widgets; diff --git a/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QSystemTrayIcon.java b/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QSystemTrayIcon.java index e4665a070f5..3a19c2b13ff 100644 --- a/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QSystemTrayIcon.java +++ b/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QSystemTrayIcon.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.qt.Qt5Widgets; diff --git a/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QTextEdit.java b/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QTextEdit.java index 00d64f64d05..40e2feacbb6 100644 --- a/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QTextEdit.java +++ b/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QTextEdit.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.qt.Qt5Widgets; diff --git a/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QToolButton.java b/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QToolButton.java index 8622b54b7bc..3d888987b80 100644 --- a/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QToolButton.java +++ b/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QToolButton.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.qt.Qt5Widgets; diff --git a/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QVBoxLayout.java b/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QVBoxLayout.java index 838ed8271ec..8e7c0f75d4e 100644 --- a/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QVBoxLayout.java +++ b/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QVBoxLayout.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.qt.Qt5Widgets; diff --git a/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QWidget.java b/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QWidget.java index 5c6387a9af4..5455b1cafd5 100644 --- a/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QWidget.java +++ b/qt/src/gen/java/org/bytedeco/qt/Qt5Widgets/QWidget.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.qt.Qt5Widgets; diff --git a/qt/src/gen/java/org/bytedeco/qt/global/Qt5Core.java b/qt/src/gen/java/org/bytedeco/qt/global/Qt5Core.java index 8bd3cbeaddb..968d6bbb92c 100644 --- a/qt/src/gen/java/org/bytedeco/qt/global/Qt5Core.java +++ b/qt/src/gen/java/org/bytedeco/qt/global/Qt5Core.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.qt.global; diff --git a/qt/src/gen/java/org/bytedeco/qt/global/Qt5Gui.java b/qt/src/gen/java/org/bytedeco/qt/global/Qt5Gui.java index d578ab938aa..ae955945d60 100644 --- a/qt/src/gen/java/org/bytedeco/qt/global/Qt5Gui.java +++ b/qt/src/gen/java/org/bytedeco/qt/global/Qt5Gui.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.qt.global; diff --git a/qt/src/gen/java/org/bytedeco/qt/global/Qt5Widgets.java b/qt/src/gen/java/org/bytedeco/qt/global/Qt5Widgets.java index 5c0df916860..5c75dd4cd00 100644 --- a/qt/src/gen/java/org/bytedeco/qt/global/Qt5Widgets.java +++ b/qt/src/gen/java/org/bytedeco/qt/global/Qt5Widgets.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.qt.global; diff --git a/qt/src/main/java/org/bytedeco/qt/helper/Qt5Core.java b/qt/src/main/java/org/bytedeco/qt/helper/Qt5Core.java index cd91c1e0736..e68e4ba2f6f 100644 --- a/qt/src/main/java/org/bytedeco/qt/helper/Qt5Core.java +++ b/qt/src/main/java/org/bytedeco/qt/helper/Qt5Core.java @@ -31,7 +31,7 @@ public class Qt5Core extends org.bytedeco.qt.presets.Qt5Core { static { // // Load macOS framework -// File framework = new File("/usr/local/Cellar/qt/5.12.2/lib/QtCore.framework/QtCore"); +// File framework = new File("/usr/local/Cellar/qt/5.12.3/lib/QtCore.framework/QtCore"); // if (framework.exists()) { // System.load(framework.getAbsolutePath()); // } diff --git a/qt/src/main/java/org/bytedeco/qt/helper/Qt5Gui.java b/qt/src/main/java/org/bytedeco/qt/helper/Qt5Gui.java index 9ab56853b96..cc2dc3ccf10 100644 --- a/qt/src/main/java/org/bytedeco/qt/helper/Qt5Gui.java +++ b/qt/src/main/java/org/bytedeco/qt/helper/Qt5Gui.java @@ -29,7 +29,7 @@ public class Qt5Gui extends org.bytedeco.qt.presets.Qt5Gui { // static { -// File framework = new File("/usr/local/Cellar/qt/5.12.2/lib/QtGui.framework/QtGui"); +// File framework = new File("/usr/local/Cellar/qt/5.12.3/lib/QtGui.framework/QtGui"); // if (framework.exists()) { // System.load(framework.getAbsolutePath()); // } diff --git a/qt/src/main/java/org/bytedeco/qt/helper/Qt5Widgets.java b/qt/src/main/java/org/bytedeco/qt/helper/Qt5Widgets.java index 00d34a336f5..f53b52768be 100644 --- a/qt/src/main/java/org/bytedeco/qt/helper/Qt5Widgets.java +++ b/qt/src/main/java/org/bytedeco/qt/helper/Qt5Widgets.java @@ -40,7 +40,7 @@ public class Qt5Widgets extends org.bytedeco.qt.presets.Qt5Widgets { // static { -// File framework = new File("/usr/local/Cellar/qt/5.12.2/lib/QtWidgets.framework/QtWidgets"); +// File framework = new File("/usr/local/Cellar/qt/5.12.3/lib/QtWidgets.framework/QtWidgets"); // if (framework.exists()) { // System.load(framework.getAbsolutePath()); // } diff --git a/tensorflow/README.md b/tensorflow/README.md index 27d6b402076..999634f12cf 100644 --- a/tensorflow/README.md +++ b/tensorflow/README.md @@ -92,7 +92,7 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic org.bytedeco numpy-platform - 1.16.2-1.5.1-SNAPSHOT + 1.16.3-1.5.1-SNAPSHOT org.bytedeco diff --git a/tensorflow/platform/pom.xml b/tensorflow/platform/pom.xml index 57ae94b440b..95ea0a2c6ee 100644 --- a/tensorflow/platform/pom.xml +++ b/tensorflow/platform/pom.xml @@ -24,7 +24,7 @@ org.bytedeco numpy-platform - 1.16.2-${project.parent.version} + 1.16.3-${project.parent.version} true diff --git a/tensorflow/pom.xml b/tensorflow/pom.xml index 976814e9ea8..1e72220b0cb 100644 --- a/tensorflow/pom.xml +++ b/tensorflow/pom.xml @@ -24,7 +24,7 @@ org.bytedeco numpy - 1.16.2-${project.parent.version} + 1.16.3-${project.parent.version} true @@ -89,7 +89,7 @@ org.bytedeco numpy-platform - 1.16.2-${project.parent.version} + 1.16.3-${project.parent.version} diff --git a/tensorflow/samples/pom.xml b/tensorflow/samples/pom.xml index deff8a9a9d5..37b4788f0a1 100644 --- a/tensorflow/samples/pom.xml +++ b/tensorflow/samples/pom.xml @@ -59,7 +59,7 @@ org.bytedeco numpy-platform - 1.16.2-1.5.1-SNAPSHOT + 1.16.3-1.5.1-SNAPSHOT org.bytedeco