Fix builds for ONNX on Windows

bytedeco · Apr 26, 2024 · 5444b5c · 5444b5c
1 parent fc4fac9
commit 5444b5c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 11 deletions.
diff --git a/onnx/src/gen/java/org/bytedeco/onnx/OpSchema.java b/onnx/src/gen/java/org/bytedeco/onnx/OpSchema.java
@@ -433,16 +433,7 @@ private native void allocate(
         @StdString String name, @StdString String description, @Cast("onnx::AttributeProto::AttributeType") int type, @Const @ByRef TypeProto defaultValue);
   /* non-STL wrapper to reduce binary size */
 
-  public native @ByRef OpSchema Attr(
-        @StdString BytePointer name,
-        @StdString BytePointer description,
-        @StdString BytePointer conditionExplanation,
-        @Cast("onnx::AttributeProto::AttributeType") int attr_type);
-  public native @ByRef OpSchema Attr(
-        @StdString String name,
-        @StdString String description,
-        @StdString String conditionExplanation,
-        @Cast("onnx::AttributeProto::AttributeType") int attr_type);
+
 
   // Register "required" attribute without default value.
   public native @ByRef OpSchema Attr(@StdString BytePointer name, @StdString BytePointer description, @Cast("onnx::AttributeProto::AttributeType") int type, @Cast("bool") boolean required/*=true*/);

diff --git 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-2023 Alexander Merritt, Samuel Audet
+ * Copyright (C) 2018-2024 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
@@ -185,6 +185,7 @@ public void map(InfoMap infoMap) {
 
                .put(new Info("onnx::OpSchema::GetTypeAndShapeInferenceFunction", "onnx::OpSchema::SetContextDependentFunctionBodyBuilder",
                              "onnx::OpSchema::GetDataPropagationFunction", "onnx::RegisterSchema", "onnx::ReplaceAll", "onnx::DbgOperatorSetTracker::Instance",
+                             "onnx::OpSchema::Attr(std::string, std::string, std::string, onnx::AttributeProto::AttributeType)",
                              "onnx::shape_inference::checkShapesAndTypes(const onnx::TypeProto_Sequence&, const onnx::TypeProto_Sequence&)",
                              "onnx::shape_inference::mergeShapesAndTypes(const onnx::TypeProto_Sequence&, onnx::TypeProto_Tensor*)").skip())