Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Pytorch, OpenCV] Implicit ArrayRef, Updates for JavaCPP 1.5.10 #1455

Merged
merged 14 commits into from
Jan 14, 2024
Prev Previous commit
Next Next commit
Update gen
  • Loading branch information
HGuillemet committed Jan 9, 2024
commit 7ac6e24c6b418784c72d3024e0bada45733a2467
1 change: 1 addition & 0 deletions pytorch/src/gen/java/org/bytedeco/pytorch/ClassType.java
Original file line number Diff line number Diff line change
Expand Up @@ -252,6 +252,7 @@ public native void checkForwardHookSchema(
// that would invalidate the refinement.
// These variants are not registered in the global class table.
public native @SharedPtr("c10::ClassType") @ByVal ClassType refine(@ByVal TypeArrayRef refined_slots);
public native @SharedPtr("c10::ClassType") @ByVal ClassType refine(@ByVal TypeVector refined_slots);

public native @Cast("bool") boolean isSubtypeOfExt(@Const @ByRef Type rhs, @Cast("std::ostream*") Pointer why_not);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ public class DimnameArrayRef extends Pointer {

/** equals - Check for element-wise equality. */
public native @Cast("const bool") boolean equals(@ByVal DimnameArrayRef RHS);
public native @Cast("const bool") boolean equals(@ByVal DimnameVector RHS);

/** slice(n, m) - Take M elements of the array starting at element N */
public native @Const @ByVal DimnameArrayRef slice(@Cast("size_t") long N, @Cast("size_t") long M);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ public class DimnameListOptional extends Pointer {
/** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */
public DimnameListOptional(Pointer p) { super(p); }
public DimnameListOptional(DimnameArrayRef value) { this(); put(value); }
public DimnameListOptional(DimnameVector value) { this(); put(value); }
public DimnameListOptional() { allocate(); }
private native void allocate();
public native @Name("operator =") @ByRef DimnameListOptional put(@ByRef DimnameListOptional x);
Expand All @@ -31,5 +32,6 @@ public class DimnameListOptional extends Pointer {
public native void reset();
public native @Name("value") @ByRef DimnameArrayRef get();
@ValueSetter public native DimnameListOptional put(@ByRef DimnameArrayRef value);
@ValueSetter public native DimnameListOptional put(@ByRef DimnameVector value);
}

21 changes: 21 additions & 0 deletions pytorch/src/gen/java/org/bytedeco/pytorch/Graph.java
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,13 @@ public native JitNode create(
public native JitNode create(
@ByVal @Cast("torch::jit::NodeKind*") Symbol kind,
@ByVal ValueArrayRef inputs);
public native JitNode create(
@ByVal @Cast("torch::jit::NodeKind*") Symbol kind,
@ByVal ValueVector inputs,
@Cast("size_t") long num_outputs/*=1*/);
public native JitNode create(
@ByVal @Cast("torch::jit::NodeKind*") Symbol kind,
@ByVal ValueVector inputs);

public native JitNode createNone();
public native JitNode createAutogradZero();
Expand All @@ -78,6 +85,11 @@ public native JitNode createTuple(
@SharedPtr TupleType optional_named_tuple/*=nullptr*/);
public native JitNode createTuple(
@ByVal ValueArrayRef values);
public native JitNode createTuple(
@ByVal ValueVector values,
@SharedPtr TupleType optional_named_tuple/*=nullptr*/);
public native JitNode createTuple(
@ByVal ValueVector values);
public native JitNode createTupleUnpack(Value v);
public native JitNode createTupleIndex(
Value tup,
Expand All @@ -93,12 +105,20 @@ public native JitNode createTupleSlice(
public native JitNode createList(
@Const @ByRef Type.TypePtr contained_type,
@ByVal ValueArrayRef values);
public native JitNode createList(
@Const @ByRef Type.TypePtr contained_type,
@ByVal ValueVector values);
public native JitNode createListUnpack(Value v, @Cast("size_t") long size);
public native JitNode createDict(
@Const @ByRef Type.TypePtr key_type,
@Const @ByRef Type.TypePtr value_type,
@ByVal ValueArrayRef keys,
@ByVal ValueArrayRef values);
public native JitNode createDict(
@Const @ByRef Type.TypePtr key_type,
@Const @ByRef Type.TypePtr value_type,
@ByVal ValueVector keys,
@ByVal ValueVector values);
public native JitNode createNumToTensor(Value value);
public native JitNode createObject(@Const @SharedPtr("c10::ClassType") @ByRef ClassType type);
public native JitNode createSetAttr(
Expand All @@ -118,6 +138,7 @@ public native JitNode createSetAttr(
public native JitNode createLoad(@StdString BytePointer name, @Const @ByRef Type.TypePtr type);
public native JitNode createLoad(@StdString String name, @Const @ByRef Type.TypePtr type);
public native JitNode createIsInstance(Value v, @ByVal TypeArrayRef types);
public native JitNode createIsInstance(Value v, @ByVal TypeVector types);

public native Value insertUncheckedCast(Value v, @ByVal Type.TypePtr type);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ public class IValueArrayRef extends Pointer {

/** equals - Check for element-wise equality. */
public native @Cast("const bool") boolean equals(@ByVal IValueArrayRef RHS);
public native @Cast("const bool") boolean equals(@ByVal IValueVector RHS);

/** slice(n, m) - Take M elements of the array starting at element N */
public native @Const @ByVal IValueArrayRef slice(@Cast("size_t") long N, @Cast("size_t") long M);
Expand Down
2 changes: 1 addition & 1 deletion pytorch/src/gen/java/org/bytedeco/pytorch/JitNode.java
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@ public class JitNode extends Pointer {
@Cast("const char*") BytePointer signature_literal);
public native @Cast("bool") boolean matches(
String signature_literal,
@ByVal(nullValue = "at::ArrayRef<c10::Symbol>{}") SymbolArrayRef const_inputs);
@ByVal(nullValue = "at::ArrayRef<c10::Symbol>{}") SymbolVector const_inputs);
public native @Cast("bool") boolean matches(
String signature_literal);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,8 @@ public class LongOptionalArrayRef extends Pointer {
// The enable_if stuff here makes sure that this isn't used for
// std::vector<bool>, because ArrayRef can't work on a std::vector<bool>
// bitfield.
public LongOptionalArrayRef(@ByRef LongOptionalVector vec) { super((Pointer)null); allocate(vec); }
private native void allocate(@ByRef LongOptionalVector vec);

/** Construct an ArrayRef from a std::array */

Expand Down Expand Up @@ -95,6 +97,7 @@ public class LongOptionalArrayRef extends Pointer {

/** equals - Check for element-wise equality. */
public native @Cast("const bool") boolean equals(@ByVal LongOptionalArrayRef RHS);
public native @Cast("const bool") boolean equals(@ByVal LongOptionalVector RHS);

/** slice(n, m) - Take M elements of the array starting at element N */
public native @Const @ByVal LongOptionalArrayRef slice(@Cast("size_t") long N, @Cast("size_t") long M);
Expand Down
6 changes: 3 additions & 3 deletions pytorch/src/gen/java/org/bytedeco/pytorch/MetaBase.java
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ public native void set_output_strided(
@ByVal @Cast({"int64_t*", "c10::ArrayRef<int64_t>", "std::vector<int64_t>&"}) @StdVector("int64_t") long[] sizes,
@ByVal @Cast({"int64_t*", "c10::ArrayRef<int64_t>", "std::vector<int64_t>&"}) @StdVector("int64_t") long[] strides,
@ByVal TensorOptions options,
@ByVal(nullValue = "at::DimnameList{}") DimnameArrayRef names);
@ByVal(nullValue = "at::DimnameList{}") DimnameVector names);
public native void set_output_strided(
@Cast("int64_t") long output_idx,
@ByVal @Cast({"int64_t*", "c10::ArrayRef<int64_t>", "std::vector<int64_t>&"}) @StdVector("int64_t") long[] sizes,
Expand All @@ -95,7 +95,7 @@ public native void set_output_raw_strided(
@ByVal @Cast({"int64_t*", "c10::ArrayRef<int64_t>", "std::vector<int64_t>&"}) @StdVector("int64_t") long[] sizes,
@ByVal @Cast({"int64_t*", "c10::ArrayRef<int64_t>", "std::vector<int64_t>&"}) @StdVector("int64_t") long[] strides_hint,
@ByVal TensorOptions options,
@ByVal(nullValue = "at::DimnameList{}") DimnameArrayRef names);
@ByVal(nullValue = "at::DimnameList{}") DimnameVector names);
public native void set_output_raw_strided(
@Cast("int64_t") long output_idx,
@ByVal @Cast({"int64_t*", "c10::ArrayRef<int64_t>", "std::vector<int64_t>&"}) @StdVector("int64_t") long[] sizes,
Expand All @@ -117,7 +117,7 @@ public native void set_output_contiguous(
@Cast("int64_t") long output_idx,
@ByVal @Cast({"int64_t*", "c10::ArrayRef<int64_t>", "std::vector<int64_t>&"}) @StdVector("int64_t") long[] sizes,
@ByVal TensorOptions options,
@ByVal(nullValue = "at::DimnameList{}") DimnameArrayRef names);
@ByVal(nullValue = "at::DimnameList{}") DimnameVector names);
public native void set_output_contiguous(
@Cast("int64_t") long output_idx,
@ByVal @Cast({"int64_t*", "c10::ArrayRef<int64_t>", "std::vector<int64_t>&"}) @StdVector("int64_t") long[] sizes,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,10 @@ public enum HAS_NON_WILDCARD {

public NamedTensorMeta(HAS_NON_WILDCARD arg0, @ByVal DimnameArrayRef names) { super((Pointer)null); allocate(arg0, names); }
private native void allocate(HAS_NON_WILDCARD arg0, @ByVal DimnameArrayRef names);
public NamedTensorMeta(@Cast("at::NamedTensorMeta::HAS_NON_WILDCARD") int arg0, @ByVal DimnameArrayRef names) { super((Pointer)null); allocate(arg0, names); }
private native void allocate(@Cast("at::NamedTensorMeta::HAS_NON_WILDCARD") int arg0, @ByVal DimnameArrayRef names);
public NamedTensorMeta(@Cast("at::NamedTensorMeta::HAS_NON_WILDCARD") int arg0, @ByVal DimnameVector names) { super((Pointer)null); allocate(arg0, names); }
private native void allocate(@Cast("at::NamedTensorMeta::HAS_NON_WILDCARD") int arg0, @ByVal DimnameVector names);
public NamedTensorMeta(HAS_NON_WILDCARD arg0, @StdMove DimnameVector names) { super((Pointer)null); allocate(arg0, names); }
private native void allocate(HAS_NON_WILDCARD arg0, @StdMove DimnameVector names);
public NamedTensorMeta(@Cast("at::NamedTensorMeta::HAS_NON_WILDCARD") int arg0, @StdMove DimnameVector names) { super((Pointer)null); allocate(arg0, names); }
private native void allocate(@Cast("at::NamedTensorMeta::HAS_NON_WILDCARD") int arg0, @StdMove DimnameVector names);

public native @UniquePtr NamedTensorMetaInterface clone();

Expand All @@ -68,10 +66,9 @@ public enum HAS_NON_WILDCARD {
public native void check_invariants();

public native void set_names(HAS_NON_WILDCARD arg0, @ByVal DimnameArrayRef new_names);
public native void set_names(@Cast("at::NamedTensorMeta::HAS_NON_WILDCARD") int arg0, @ByVal DimnameArrayRef new_names);
public native void set_names(@Cast("at::NamedTensorMeta::HAS_NON_WILDCARD") int arg0, @ByVal DimnameVector new_names);

public native void set_names(HAS_NON_WILDCARD arg0, @StdMove DimnameVector new_names);
public native void set_names(@Cast("at::NamedTensorMeta::HAS_NON_WILDCARD") int arg0, @StdMove DimnameVector new_names);

// INVARIANT: at least one Dimname is non-WILDCARD
public native @StdMove DimnameVector names_(); public native NamedTensorMeta names_(DimnameVector setter);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ public class ScalarTypeArrayRef extends Pointer {

/** equals - Check for element-wise equality. */
public native @Cast("const bool") boolean equals(@ByVal ScalarTypeArrayRef RHS);
public native @Cast("const bool") boolean equals(@ByVal ScalarTypeVector RHS);

/** slice(n, m) - Take M elements of the array starting at element N */
public native @Const @ByVal ScalarTypeArrayRef slice(@Cast("size_t") long N, @Cast("size_t") long M);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ public class StrideArrayRef extends Pointer {

/** equals - Check for element-wise equality. */
public native @Cast("const bool") boolean equals(@ByVal StrideArrayRef RHS);
public native @Cast("const bool") boolean equals(@ByVal StrideVector RHS);

/** slice(n, m) - Take M elements of the array starting at element N */
public native @Const @ByVal StrideArrayRef slice(@Cast("size_t") long N, @Cast("size_t") long M);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ public class StringArrayRef extends Pointer {

/** equals - Check for element-wise equality. */
public native @Cast("const bool") boolean equals(@ByVal StringArrayRef RHS);
public native @Cast("const bool") boolean equals(@ByVal StringVector RHS);

/** slice(n, m) - Take M elements of the array starting at element N */
public native @Const @ByVal StringArrayRef slice(@Cast("size_t") long N, @Cast("size_t") long M);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ public class SymbolArrayRef extends Pointer {

/** equals - Check for element-wise equality. */
public native @Cast("const bool") boolean equals(@ByVal SymbolArrayRef RHS);
public native @Cast("const bool") boolean equals(@ByVal SymbolVector RHS);

/** slice(n, m) - Take M elements of the array starting at element N */
public native @Const @ByVal SymbolArrayRef slice(@Cast("size_t") long N, @Cast("size_t") long M);
Expand Down
Loading