Skip to content

Commit

Permalink
* Make nvinfer1::Weights::values settable in presets for TensorRT …
Browse files Browse the repository at this point in the history
…(issue #698)
  • Loading branch information
saudet committed Mar 4, 2019
1 parent b2d7e46 commit 18a01ba
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 9 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@

* Make `nvinfer1::Weights::values` settable in presets for TensorRT ([issue #698](https://github.com/bytedeco/javacpp-presets/issues/698))
* Fix mapping of `HoughLines`, `HoughLinesP`, `HoughCircles`, and `Subdiv2D` from `opencv_imgproc` (issues [bytedeco/javacv#913](https://github.com/bytedeco/javacv/issues/913) and [bytedeco/javacv#1146](https://github.com/bytedeco/javacv/issues/1146))
* Add basic mapping of stdio streams to presets for GSL since it relies on them for serialization
* Fix crash in Leptonica on CentOS 6 by downgrading to libpng 1.5.30 ([issue #680](https://github.com/bytedeco/javacpp-presets/issues/680))
Expand Down
4 changes: 2 additions & 2 deletions tensorrt/src/main/java/org/bytedeco/javacpp/nvinfer.java
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Targeted by JavaCPP version 1.4.4: DO NOT EDIT THIS FILE
// Targeted by JavaCPP version 1.4.5-SNAPSHOT: DO NOT EDIT THIS FILE

package org.bytedeco.javacpp;

Expand Down Expand Up @@ -696,7 +696,7 @@ public class nvinfer extends org.bytedeco.javacpp.presets.nvinfer {
/** The type of the weights. */
public native DataType type(); public native Weights type(DataType type);
/** The weight values, in a contiguous array. */
@MemberGetter public native @Const Pointer values();
public native @Const Pointer values(); public native Weights values(Pointer values);
/** The number of weights in the array. */
public native @Cast("int64_t") long count(); public native Weights count(long count);
}
Expand Down
12 changes: 6 additions & 6 deletions tensorrt/src/main/java/org/bytedeco/javacpp/nvinfer_plugin.java
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Targeted by JavaCPP version 1.4.4: DO NOT EDIT THIS FILE
// Targeted by JavaCPP version 1.4.5-SNAPSHOT: DO NOT EDIT THIS FILE

package org.bytedeco.javacpp;

Expand Down Expand Up @@ -240,7 +240,7 @@ public class nvinfer_plugin extends org.bytedeco.javacpp.presets.nvinfer_plugin
@Namespace("nvinfer1::plugin") public static native INvPlugin createSSDPermutePlugin(@Const Pointer data, @Cast("size_t") long length);

/**
* \brief The PriorBox plugin layer generates the prior boxes of designated sizes and aspect ratios across all dimensions \f$ (H \times W) \f$.
* \brief The PriorBox plugin layer generates the prior boxes of designated sizes and aspect ratios across all dimensions {@code (H \times W) }.
* PriorBoxParameters defines a set of parameters for creating the PriorBox plugin layer.
* It contains:
* @param minSize Minimum box size in pixels. Can not be nullptr.
Expand Down Expand Up @@ -290,7 +290,7 @@ public class nvinfer_plugin extends org.bytedeco.javacpp.presets.nvinfer_plugin
}

/**
* \brief The Anchor Generator plugin layer generates the prior boxes of designated sizes and aspect ratios across all dimensions \f$ (H \times W) \f$.
* \brief The Anchor Generator plugin layer generates the prior boxes of designated sizes and aspect ratios across all dimensions {@code (H \times W) }.
* GridAnchorParameters defines a set of parameters for creating the plugin layer for all feature maps.
* It contains:
* @param minScale Scale of anchors corresponding to finest resolution.
Expand Down Expand Up @@ -338,7 +338,7 @@ public class nvinfer_plugin extends org.bytedeco.javacpp.presets.nvinfer_plugin

/**
* \brief The Grid Anchor Generator plugin layer generates the prior boxes of
* designated sizes and aspect ratios across all dimensions \f$ (H \times W) \f$ for all feature maps.
* designated sizes and aspect ratios across all dimensions {@code (H \times W) } for all feature maps.
* GridAnchorParameters defines a set of parameters for creating the GridAnchorGenerator plugin layer.
* @deprecated . This plugin is superseded by createAnchorGeneratorPlugin()
* */
Expand Down Expand Up @@ -569,7 +569,7 @@ public static native IPluginExt createRPNROIPlugin(int featureStride, int preNms
public static native IPluginExt createNormalizePlugin(@Const Weights scales, @Cast("bool") boolean acrossSpatial, @Cast("bool") boolean channelShared, float eps);

/**
* \brief The PriorBox plugin layer generates the prior boxes of designated sizes and aspect ratios across all dimensions \f$ (H \times W) \f$.
* \brief The PriorBox plugin layer generates the prior boxes of designated sizes and aspect ratios across all dimensions {@code (H \times W) }.
* PriorBoxParameters defines a set of parameters for creating the PriorBox plugin layer.
* Registered plugin type "PriorBox_TRT". Registered plugin version "1".
* */
Expand All @@ -581,7 +581,7 @@ public static native IPluginExt createRPNROIPlugin(int featureStride, int preNms

/**
* \brief The Grid Anchor Generator plugin layer generates the prior boxes of
* designated sizes and aspect ratios across all dimensions \f$ (H \times W) \f$ for all feature maps.
* designated sizes and aspect ratios across all dimensions {@code (H \times W) } for all feature maps.
* GridAnchorParameters defines a set of parameters for creating the GridAnchorGenerator plugin layer.
* Registered plugin type "GridAnchor_TRT". Registered plugin version "1".
* */
Expand Down
2 changes: 1 addition & 1 deletion tensorrt/src/main/java/org/bytedeco/javacpp/nvparsers.java
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Targeted by JavaCPP version 1.4.4: DO NOT EDIT THIS FILE
// Targeted by JavaCPP version 1.4.5-SNAPSHOT: DO NOT EDIT THIS FILE

package org.bytedeco.javacpp;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ public void map(InfoMap infoMap) {
.put(new Info("std::size_t").cast().valueTypes("long").pointerTypes("LongPointer", "LongBuffer", "long[]"))
.put(new Info("const char").pointerTypes("String", "@Cast(\"const char*\") BytePointer"))
.put(new Info("nvinfer1::EnumMax").skip())
.put(new Info("nvinfer1::Weights::values").javaText("public native @Const Pointer values(); public native Weights values(Pointer values);"))
.put(new Info("nvinfer1::IRaggedSoftMaxLayer", "nvinfer1::IIdentityLayer", "nvinfer1::ISoftMaxLayer",
"nvinfer1::IConcatenationLayer", "nvinfer1::IInt8EntropyCalibrator").purify())
.put(new Info("nvinfer1::IGpuAllocator::free").javaNames("_free"))
Expand Down

0 comments on commit 18a01ba

Please sign in to comment.