* Upgrade presets for ONNX 1.4.0 (pull #676)

bytedeco · Jan 25, 2019 · 3df8633 · 3df8633
1 parent 6eafedd
commit 3df8633
Show file tree

Hide file tree

Showing 9 changed files with 3,028 additions and 273 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,7 @@
 
  * Add `GetComponentImagesExample` for Tesseract ([pull #673](https://github.com/bytedeco/javacpp-presets/pull/673))
  * Add presets for nGraph 0.11.1 ([pull #642](https://github.com/bytedeco/javacpp-presets/pull/642)), Qt 5.12 ([pull #674](https://github.com/bytedeco/javacpp-presets/pull/674))
- * Upgrade presets for ARPACK-NG 3.7.0
+ * Upgrade presets for ARPACK-NG 3.7.0, ONNX 1.4.0 ([pull #676](https://github.com/bytedeco/javacpp-presets/pull/676))
  * Build OpenCV without UI when environment variable `HEADLESS=yes` ([pull #667](https://github.com/bytedeco/javacpp-presets/pull/667))
 
 ### January 11, 2019 version 1.4.4

diff --git a/README.md b/README.md
@@ -138,7 +138,7 @@ Each child module in turn relies by default on the included [`cppbuild.sh` scrip
  * TensorFlow 1.12.0  https://github.com/tensorflow/tensorflow
  * TensorRT 5.0  https://developer.nvidia.com/tensorrt
  * The Arcade Learning Environment 0.6.0  https://github.com/mgbellemare/Arcade-Learning-Environment
- * ONNX 1.3.0  https://github.com/onnx/onnx
+ * ONNX 1.4.0  https://github.com/onnx/onnx
  * nGraph 0.11.1  https://github.com/NervanaSystems/ngraph
  * LiquidFun  http://google.github.io/liquidfun/
  * Qt 5.12  https://www.qt.io/download

diff --git a/onnx/README.md b/onnx/README.md
@@ -5,7 +5,7 @@ Introduction
 ------------
 This directory contains the JavaCPP Presets module for:
 
- * ONNX 1.3.0  https://onnx.ai/
+ * ONNX 1.4.0  https://onnx.ai/
 
 Please refer to the parent README.md file for more detailed information about the JavaCPP Presets.
 
@@ -35,15 +35,15 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.bytedeco.javacpp-presets.onnx</groupId>
     <artifactId>loadmodel</artifactId>
-    <version>1.4.4</version>
+    <version>1.4.5-SNAPSHOT</version>
     <properties>
         <exec.mainClass>LoadModel</exec.mainClass>
     </properties>
     <dependencies>
         <dependency>
             <groupId>org.bytedeco.javacpp-presets</groupId>
             <artifactId>onnx-platform</artifactId>
-            <version>1.3.0-1.4.4</version>
+            <version>1.4.0-1.4.5-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>

diff --git a/onnx/cppbuild.sh b/onnx/cppbuild.sh
@@ -13,7 +13,7 @@ if [[ $PLATFORM == windows* ]]; then
     exit 1
 fi
 
-export ONNX=1.3.0
+export ONNX=1.4.0
 export PROTO=3.6.1
 export PYBIND=2.2.4
 

diff --git a/onnx/platform/pom.xml b/onnx/platform/pom.xml
@@ -12,7 +12,7 @@
 
   <groupId>org.bytedeco.javacpp-presets</groupId>
   <artifactId>onnx-platform</artifactId>
-  <version>1.3.0-${project.parent.version}</version>
+  <version>1.4.0-${project.parent.version}</version>
   <name>JavaCPP Presets Platform for ONNX</name>
 
   <properties>

diff --git a/onnx/pom.xml b/onnx/pom.xml
@@ -11,7 +11,7 @@
 
   <groupId>org.bytedeco.javacpp-presets</groupId>
   <artifactId>onnx</artifactId>
-  <version>1.3.0-${project.parent.version}</version>
+  <version>1.4.0-${project.parent.version}</version>
   <name>JavaCPP Presets for ONNX</name>
 
   <dependencies>

diff --git a/onnx/src/main/java/org/bytedeco/javacpp/onnx.java b/onnx/src/main/java/org/bytedeco/javacpp/onnx.java
diff --git a/onnx/src/main/java/org/bytedeco/javacpp/presets/onnx.java b/onnx/src/main/java/org/bytedeco/javacpp/presets/onnx.java
@@ -49,13 +49,15 @@
         "google/protobuf/arena.h",
         "google/protobuf/message_lite.h",
         "google/protobuf/unknown_field_set.h",
+        "google/protobuf/descriptor.h",
         "onnx/proto_utils.h",
 //        "onnx/string_utils.h",
         "onnx/checker.h",
         "onnx/shape_inference/implementation.h",
         "onnx/onnxifi.h",
         "onnx/common/tensor.h",
         "onnx/common/array_ref.h",
+        "onnx/common/status.h",
 //        "onnx/common/graph_node_list.h",
         "onnx/common/stl_backports.h",
         "onnx/common/ir.h",
@@ -64,7 +66,9 @@
         "onnx/version_converter/helper.h",
         "onnx/version_converter/BaseConverter.h",
         "onnx/version_converter/convert.h",
-        "onnx/optimizer/passes/optimize_pass.h",
+        "onnx/optimizer/pass_registry.h",
+        "onnx/optimizer/pass.h",
+        "onnx/defs/function.h",
         "onnx/optimizer/optimize.h",
     },
     link = {"onnx_proto", "onnx", "onnxifi"}),
@@ -73,7 +77,7 @@ 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",
-                             "ONNX_UNUSED", "ONNXIFI_ABI", "ONNXIFI_CHECK_RESULT", "ONNXIFI_PUBLIC").cppTypes().annotations())
+                             "ONNX_UNUSED", "ONNX_API", "ONNXIFI_ABI", "ONNXIFI_CHECK_RESULT", "ONNXIFI_PUBLIC", "ONNX_IMPORT", "ONNX_EXPORT").cppTypes().annotations())
                .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"))
@@ -87,11 +91,15 @@ public void map(InfoMap infoMap) {
                              "generic_graph_node_list_iterator", "NodeKind", "graph_node_list",
                              "graph_node_list_iterator", "reverse_iterator", "std::vector<onnx::Tensor>::const_iterator",
                              "onnx::Attributes<onnx::Node>", "Symbol", "std::reverse_iterator<onnx::ArrayRef<onnx::Node::Value*>::iterator>",
-                             "const_graph_node_list_iterator", "const_graph_node_list", "onnx::toString", "onnx::ResourceGuard").skip())
+                             "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())
                .put(new Info("onnx::shape_inference::InferenceContextImpl").skip())
                .put(new Info("std::set<int>").pointerTypes("IntSet").define())
                .put(new Info("std::map<std::string,std::unique_ptr<onnx::optimization::OptimizePass> >", "std::unique_ptr<onnx::optimization::OptimizePass>").skip())
                .put(new Info("std::unordered_set<std::string>").pointerTypes("UnorderedStringSet").define())
+               .put(new Info("std::multimap<std::string,const onnx::FunctionProto*>").skip())
                .put(new Info("std::runtime_error").cast().pointerTypes("Pointer"))
                .put(new Info("onnx::optimization::OptimizePass").purify())
                .put(new Info("onnx::version_conversion::BaseVersionConverter::registerAdapter").skip())
@@ -106,18 +114,21 @@ public void map(InfoMap infoMap) {
                .put(new Info("std::pair<google::protobuf::uint64,google::protobuf::uint64>").pointerTypes("LongLongPair").define())
                .put(new Info("google::protobuf::Message").cast().pointerTypes("MessageLite"))
 
-               .put(new Info("google::protobuf::Any", "google::protobuf::Descriptor", "google::protobuf::EnumDescriptor", "google::protobuf::Metadata").cast().pointerTypes("Pointer"))
+               .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",
                              "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::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_",
                              "onnx::_TypeProto_Tensor_default_instance_",  "onnx::_ValueInfoProto_default_instance_", "onnx::_TensorShapeProto_Dimension_default_instance_",
                              "onnx::_TensorShapeProto_default_instance_", "onnx::_TensorProto_Segment_default_instance_","onnx::_TensorProto_default_instance_",
-                             "onnx::_NodeProto_default_instance_", "onnx::_GraphProto_default_instance_", "onnx::_FunctionProto_default_instance_", "onnx::_ModelProto_default_instance_", "onnx::_OperatorSetProto_default_instance_",
+                             "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_").skip())
+                             "onnx::_AttributeProto_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/platform/pom.xml b/platform/pom.xml
@@ -219,7 +219,7 @@
     <dependency>
       <groupId>org.bytedeco.javacpp-presets</groupId>
       <artifactId>onnx-platform</artifactId>
-      <version>1.3.0-${project.version}</version>
+      <version>1.4.0-${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.bytedeco.javacpp-presets</groupId>