diff --git a/depthai/src/gen/java/org/bytedeco/depthai/ConnectionHash.java b/depthai/src/gen/java/org/bytedeco/depthai/ConnectionHash.java deleted file mode 100644 index 38ab0263a62..00000000000 --- a/depthai/src/gen/java/org/bytedeco/depthai/ConnectionHash.java +++ /dev/null @@ -1,40 +0,0 @@ -// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE - -package org.bytedeco.depthai; - -import java.nio.*; -import org.bytedeco.javacpp.*; -import org.bytedeco.javacpp.annotation.*; - -import static org.bytedeco.javacpp.presets.javacpp.*; -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.depthai.global.depthai.*; - // namespace dai - -// Specialization of std::hash for Node::Connection -@Name("std::hash") @Properties(inherit = org.bytedeco.depthai.presets.depthai.class) -public class ConnectionHash extends Pointer { - static { Loader.load(); } - /** Default native constructor. */ - public ConnectionHash() { super((Pointer)null); allocate(); } - /** Native array allocator. Access with {@link Pointer#position(long)}. */ - public ConnectionHash(long size) { super((Pointer)null); allocateArray(size); } - /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ - public ConnectionHash(Pointer p) { super(p); } - private native void allocate(); - private native void allocateArray(long size); - @Override public ConnectionHash position(long position) { - return (ConnectionHash)super.position(position); - } - @Override public ConnectionHash getPointer(long i) { - return new ConnectionHash((Pointer)this).offsetAddress(i); - } - - public native @Cast("std::size_t") @Name("operator ()") long apply(@Const @ByRef Node.Connection obj); -} diff --git a/depthai/src/main/java/org/bytedeco/depthai/presets/depthai.java b/depthai/src/main/java/org/bytedeco/depthai/presets/depthai.java index 47e2bfa0569..05eec713a63 100644 --- a/depthai/src/main/java/org/bytedeco/depthai/presets/depthai.java +++ b/depthai/src/main/java/org/bytedeco/depthai/presets/depthai.java @@ -258,7 +258,6 @@ public void map(InfoMap infoMap) { "std::unordered_map >::iterator", "std::unordered_map,dai::NodeIoInfo,dai::NodeObjInfo::IoInfoKey>", "dai::copyable_unique_ptr", "nop::Status").cast().pointerTypes("Pointer")) - .put(new Info("std::hash").pointerTypes("ConnectionHash")) .put(new Info("std::shared_ptr").annotations("@SharedPtr").pointerTypes("Asset")) .put(new Info("std::shared_ptr").annotations("@SharedPtr").pointerTypes("ADatatype")) .put(new Info("std::shared_ptr").annotations("@SharedPtr").pointerTypes("Node")) diff --git a/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_core.java b/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_core.java index e43f27d8669..b3c2d8c3227 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_core.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_core.java @@ -6849,10 +6849,11 @@ CV_CALL macro calls CV (or IPL) function, checks error status and @Namespace("cv") public static native void insertImageCOI(@ByVal UMat coiimg, CvArr arr); @Namespace("cv") public static native void insertImageCOI(@ByVal GpuMat coiimg, CvArr arr, int coi/*=-1*/); @Namespace("cv") public static native void insertImageCOI(@ByVal GpuMat coiimg, CvArr arr); -// Targeting ../opencv_core/CvMatDefaultDeleter.java +////// specialized implementations of DefaultDeleter::operator() for classic OpenCV types ////// + ////////////// convenient wrappers for operating old-style dynamic structures ////////////// /** @@ -12192,6 +12193,18 @@ storage is built in memory as a hierarchy of file nodes (see FileNode) @Namespace("cv") public static native void read(@Const @ByRef FileNode node, @ByRef KeyPoint value, @Const @ByRef KeyPoint default_value); @Namespace("cv") public static native void read(@Const @ByRef FileNode node, @ByRef DMatch value, @Const @ByRef DMatch default_value); +@Namespace("cv") public static native @Name("read") void read(@Const @ByRef FileNode node, @ByRef Point value, @Const @ByRef Point default_value); + +@Namespace("cv") public static native @Name("read") void read(@Const @ByRef FileNode node, @ByRef Point3i value, @Const @ByRef Point3i default_value); + +@Namespace("cv") public static native @Name("read") void read(@Const @ByRef FileNode node, @ByRef Size value, @Const @ByRef Size default_value); + + + +@Namespace("cv") public static native @Name("read") void read(@Const @ByRef FileNode node, @ByRef Rect value, @Const @ByRef Rect default_value); + +@Namespace("cv") public static native @Name("read") void read(@Const @ByRef FileNode node, @ByRef Scalar4i value, @Const @ByRef Scalar4i default_value); + @Namespace("cv") public static native void read(@Const @ByRef FileNode node, @ByRef Range value, @Const @ByRef Range default_value); /** \} @@ -12212,14 +12225,48 @@ storage is built in memory as a hierarchy of file nodes (see FileNode) * \relates cv::FileStorage * \{ */ -@Namespace("cv") public static native void write( @ByRef FileStorage fs, int value ); +@Namespace("cv") public static native void write(@ByRef FileStorage fs, int value); + +@Namespace("cv") public static native void write(@ByRef FileStorage fs, float value); + +@Namespace("cv") public static native void write(@ByRef FileStorage fs, double value); + +@Namespace("cv") public static native void write(@ByRef FileStorage fs, @Str BytePointer value); +@Namespace("cv") public static native void write(@ByRef FileStorage fs, @Str String value); + +@Namespace("cv") public static native void write(@ByRef FileStorage fs, @Const @ByRef Point value); + +@Namespace("cv") public static native void write(@ByRef FileStorage fs, @Const @ByRef Point2f value); + +@Namespace("cv") public static native void write(@ByRef FileStorage fs, @Const @ByRef Point2d value); + +@Namespace("cv") public static native void write(@ByRef FileStorage fs, @Const @ByRef Point3i value); + +@Namespace("cv") public static native void write(@ByRef FileStorage fs, @Const @ByRef Point3f value); + +@Namespace("cv") public static native void write(@ByRef FileStorage fs, @Const @ByRef Point3d value); + +@Namespace("cv") public static native void write(@ByRef FileStorage fs, @Const @ByRef Size value); + +@Namespace("cv") public static native void write(@ByRef FileStorage fs, @Const @ByRef Size2f value); + +@Namespace("cv") public static native void write(@ByRef FileStorage fs, @Const @ByRef Size2d value); + +@Namespace("cv") public static native void write(@ByRef FileStorage fs, @Const @ByRef Complexf value); + +@Namespace("cv") public static native void write(@ByRef FileStorage fs, @Const @ByRef Complexd value); + +@Namespace("cv") public static native void write(@ByRef FileStorage fs, @Const @ByRef Rect value); -@Namespace("cv") public static native void write( @ByRef FileStorage fs, float value ); +@Namespace("cv") public static native void write(@ByRef FileStorage fs, @Const @ByRef Rect2f value); -@Namespace("cv") public static native void write( @ByRef FileStorage fs, double value ); +@Namespace("cv") public static native void write(@ByRef FileStorage fs, @Const @ByRef Rect2d value); -@Namespace("cv") public static native void write( @ByRef FileStorage fs, @Str BytePointer value ); -@Namespace("cv") public static native void write( @ByRef FileStorage fs, @Str String value ); +@Namespace("cv") public static native void write(@ByRef FileStorage fs, @Const @ByRef Scalar4i value); + +@Namespace("cv") public static native void write(@ByRef FileStorage fs, @Const @ByRef Scalar4f value); + +@Namespace("cv") public static native void write(@ByRef FileStorage fs, @Const @ByRef Scalar value); @Namespace("cv") public static native void write(@ByRef FileStorage fs, @Const @ByRef Range r ); @@ -12232,6 +12279,57 @@ storage is built in memory as a hierarchy of file nodes (see FileNode) @Namespace("cv") public static native void write(@ByRef FileStorage fs, @Str BytePointer name, @Const @ByRef DMatch m); @Namespace("cv") public static native void write(@ByRef FileStorage fs, @Str String name, @Const @ByRef DMatch m); +@Namespace("cv") public static native void write( @ByRef FileStorage fs, @Str BytePointer name, @Const @ByRef Point val ); +@Namespace("cv") public static native void write( @ByRef FileStorage fs, @Str String name, @Const @ByRef Point val ); + +@Namespace("cv") public static native void write( @ByRef FileStorage fs, @Str BytePointer name, @Const @ByRef Point2f val ); +@Namespace("cv") public static native void write( @ByRef FileStorage fs, @Str String name, @Const @ByRef Point2f val ); + +@Namespace("cv") public static native void write( @ByRef FileStorage fs, @Str BytePointer name, @Const @ByRef Point2d val ); +@Namespace("cv") public static native void write( @ByRef FileStorage fs, @Str String name, @Const @ByRef Point2d val ); + +@Namespace("cv") public static native void write( @ByRef FileStorage fs, @Str BytePointer name, @Const @ByRef Point3i val ); +@Namespace("cv") public static native void write( @ByRef FileStorage fs, @Str String name, @Const @ByRef Point3i val ); + +@Namespace("cv") public static native void write( @ByRef FileStorage fs, @Str BytePointer name, @Const @ByRef Point3f val ); +@Namespace("cv") public static native void write( @ByRef FileStorage fs, @Str String name, @Const @ByRef Point3f val ); + +@Namespace("cv") public static native void write( @ByRef FileStorage fs, @Str BytePointer name, @Const @ByRef Point3d val ); +@Namespace("cv") public static native void write( @ByRef FileStorage fs, @Str String name, @Const @ByRef Point3d val ); + +@Namespace("cv") public static native void write( @ByRef FileStorage fs, @Str BytePointer name, @Const @ByRef Size val ); +@Namespace("cv") public static native void write( @ByRef FileStorage fs, @Str String name, @Const @ByRef Size val ); + +@Namespace("cv") public static native void write( @ByRef FileStorage fs, @Str BytePointer name, @Const @ByRef Size2f val ); +@Namespace("cv") public static native void write( @ByRef FileStorage fs, @Str String name, @Const @ByRef Size2f val ); + +@Namespace("cv") public static native void write( @ByRef FileStorage fs, @Str BytePointer name, @Const @ByRef Size2d val ); +@Namespace("cv") public static native void write( @ByRef FileStorage fs, @Str String name, @Const @ByRef Size2d val ); + +@Namespace("cv") public static native void write( @ByRef FileStorage fs, @Str BytePointer name, @Const @ByRef Complexf val ); +@Namespace("cv") public static native void write( @ByRef FileStorage fs, @Str String name, @Const @ByRef Complexf val ); + +@Namespace("cv") public static native void write( @ByRef FileStorage fs, @Str BytePointer name, @Const @ByRef Complexd val ); +@Namespace("cv") public static native void write( @ByRef FileStorage fs, @Str String name, @Const @ByRef Complexd val ); + +@Namespace("cv") public static native void write( @ByRef FileStorage fs, @Str BytePointer name, @Const @ByRef Rect val ); +@Namespace("cv") public static native void write( @ByRef FileStorage fs, @Str String name, @Const @ByRef Rect val ); + +@Namespace("cv") public static native void write( @ByRef FileStorage fs, @Str BytePointer name, @Const @ByRef Rect2f val ); +@Namespace("cv") public static native void write( @ByRef FileStorage fs, @Str String name, @Const @ByRef Rect2f val ); + +@Namespace("cv") public static native void write( @ByRef FileStorage fs, @Str BytePointer name, @Const @ByRef Rect2d val ); +@Namespace("cv") public static native void write( @ByRef FileStorage fs, @Str String name, @Const @ByRef Rect2d val ); + +@Namespace("cv") public static native void write( @ByRef FileStorage fs, @Str BytePointer name, @Const @ByRef Scalar4i val ); +@Namespace("cv") public static native void write( @ByRef FileStorage fs, @Str String name, @Const @ByRef Scalar4i val ); + +@Namespace("cv") public static native void write( @ByRef FileStorage fs, @Str BytePointer name, @Const @ByRef Scalar4f val ); +@Namespace("cv") public static native void write( @ByRef FileStorage fs, @Str String name, @Const @ByRef Scalar4f val ); + +@Namespace("cv") public static native void write( @ByRef FileStorage fs, @Str BytePointer name, @Const @ByRef Scalar val ); +@Namespace("cv") public static native void write( @ByRef FileStorage fs, @Str String name, @Const @ByRef Scalar val ); + // #ifdef CV__LEGACY_PERSISTENCE // This code is not needed anymore, but it is preserved here to keep source compatibility // Implementation is similar to templates instantiations @@ -12257,6 +12355,22 @@ storage is built in memory as a hierarchy of file nodes (see FileNode) @Namespace("cv") public static native void read(@Const @ByRef FileNode node, @Cast("ushort*") @ByRef ShortBuffer value, @Cast("ushort") short default_value); @Namespace("cv") public static native void read(@Const @ByRef FileNode node, @Cast("ushort*") @ByRef short[] value, @Cast("ushort") short default_value); +@Namespace("cv") public static native @Name("read") void read( @ByRef FileNodeIterator it, @StdVector IntPointer vec, @Cast("size_t") long maxCount/*=(size_t)INT_MAX*/ ); +@Namespace("cv") public static native @Name("read") void read( @ByRef FileNodeIterator it, @StdVector IntPointer vec ); +@Namespace("cv") public static native @Name("read") void read( @ByRef FileNodeIterator it, @StdVector IntBuffer vec, @Cast("size_t") long maxCount/*=(size_t)INT_MAX*/ ); +@Namespace("cv") public static native @Name("read") void read( @ByRef FileNodeIterator it, @StdVector IntBuffer vec ); +@Namespace("cv") public static native @Name("read") void read( @ByRef FileNodeIterator it, @StdVector int[] vec, @Cast("size_t") long maxCount/*=(size_t)INT_MAX*/ ); +@Namespace("cv") public static native @Name("read") void read( @ByRef FileNodeIterator it, @StdVector int[] vec ); + + + +@Namespace("cv") public static native @Name("read") void read( @Const @ByRef FileNode node, @StdVector IntPointer vec, @StdVector IntPointer default_value/*=std::vector()*/ ); +@Namespace("cv") public static native @Name("read") void read( @Const @ByRef FileNode node, @StdVector IntPointer vec ); +@Namespace("cv") public static native @Name("read") void read( @Const @ByRef FileNode node, @StdVector IntBuffer vec, @StdVector IntBuffer default_value/*=std::vector()*/ ); +@Namespace("cv") public static native @Name("read") void read( @Const @ByRef FileNode node, @StdVector IntBuffer vec ); +@Namespace("cv") public static native @Name("read") void read( @Const @ByRef FileNode node, @StdVector int[] vec, @StdVector int[] default_value/*=std::vector()*/ ); +@Namespace("cv") public static native @Name("read") void read( @Const @ByRef FileNode node, @StdVector int[] vec ); + @Namespace("cv") public static native void read( @Const @ByRef FileNode node, @ByRef KeyPointVector vec, @Const @ByRef KeyPointVector default_value ); @Namespace("cv") public static native void read( @Const @ByRef FileNode node, @ByRef DMatchVector vec, @Const @ByRef DMatchVector default_value ); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_cudacodec.java b/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_cudacodec.java index 6ec089160ee..9dd1e4e6ab5 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_cudacodec.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_cudacodec.java @@ -80,7 +80,7 @@ public class opencv_cudacodec extends org.bytedeco.opencv.presets.opencv_cudacod \{ \defgroup cudacodec Video Encoding/Decoding \} - */ // Stream + */ /** \addtogroup cudacodec * \{ @@ -229,9 +229,9 @@ public class opencv_cudacodec extends org.bytedeco.opencv.presets.opencv_cudacod /** \brief Creates video writer.

-@param fileName Name of the output video file. Only raw h264 or hevc files are supported. +@param fileName Name of the output video file. @param frameSize Size of the input video frames. -@param codec Codec. +@param codec Supports Codec::H264 and Codec::HEVC. @param fps Framerate of the created video stream. @param colorFormat OpenCv color format of the frames to be encoded. @param encoderCallback Callbacks for video encoder. See cudacodec::EncoderCallback. Required for working with the encoded video stream. @@ -246,9 +246,9 @@ public class opencv_cudacodec extends org.bytedeco.opencv.presets.opencv_cudacod /** \brief Creates video writer.

-@param fileName Name of the output video file. Only raw h264 or hevc files are supported. +@param fileName Name of the output video file. @param frameSize Size of the input video frames. -@param codec Codec. +@param codec Supports Codec::H264 and Codec::HEVC. @param fps Framerate of the created video stream. @param colorFormat OpenCv color format of the frames to be encoded. @param params Additional encoding parameters. @@ -278,7 +278,7 @@ public class opencv_cudacodec extends org.bytedeco.opencv.presets.opencv_cudacod /** \brief Deinterlacing mode used by decoder. * @param Weave Weave both fields (no deinterlacing). For progressive content and for content that doesn't need deinterlacing. -* Bob Drop one field. +* @param Bob Drop one field. * @param Adaptive Adaptive deinterlacing needs more video memory than other deinterlacing modes. * */ /** enum cv::cudacodec::DeinterlaceMode */ @@ -286,6 +286,16 @@ public class opencv_cudacodec extends org.bytedeco.opencv.presets.opencv_cudacod Weave = 0, Bob = 1, Adaptive = 2; + +/** \brief Utility function demonstrating how to map the luma histogram when FormatInfo::videoFullRangeFlag == false + @param hist Luma histogram \a hist returned from VideoReader::nextFrame(GpuMat& frame, GpuMat& hist, Stream& stream). + @param histFull Host histogram equivelent to downloading \a hist after calling cuda::calcHist(InputArray frame, OutputArray hist, Stream& stream). +

+ \note + - This function demonstrates how to map the luma histogram back so that it is equivalent to the result obtained from cuda::calcHist() + if the returned frame was colorFormat::GRAY. + */ +@Namespace("cv::cudacodec") public static native void MapHist(@Const @ByRef GpuMat hist, @ByRef Mat histFull); // Targeting ../opencv_cudacodec/FormatInfo.java diff --git a/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_cudaimgproc.java b/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_cudaimgproc.java index 14558966a1e..46ec5ef7161 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_cudaimgproc.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_cudaimgproc.java @@ -83,6 +83,7 @@ public class opencv_cudaimgproc extends org.bytedeco.opencv.presets.opencv_cudai \{ \defgroup cudaimgproc_color Color space processing \defgroup cudaimgproc_hist Histogram Calculation + \defgroup cudaimgproc_shape Structural Analysis and Shape Descriptors \defgroup cudaimgproc_hough Hough Transform \defgroup cudaimgproc_feature Feature Detection \} @@ -420,8 +421,10 @@ public class opencv_cudaimgproc extends org.bytedeco.opencv.presets.opencv_cudai @param minLineLength Minimum line length. Line segments shorter than that are rejected. @param maxLineGap Maximum allowed gap between points on the same line to link them. @param maxLines Maximum number of output lines. +@param threshold %Accumulator threshold parameter. Only those lines are returned that get enough +votes ( {@code >\texttt{threshold}} ). */ -@Namespace("cv::cuda") public static native @Ptr HoughSegmentDetector createHoughSegmentDetector(float rho, float theta, int minLineLength, int maxLineGap, int maxLines/*=4096*/); +@Namespace("cv::cuda") public static native @Ptr HoughSegmentDetector createHoughSegmentDetector(float rho, float theta, int minLineLength, int maxLineGap, int maxLines/*=4096*/, int threshold/*=-1*/); @Namespace("cv::cuda") public static native @Ptr HoughSegmentDetector createHoughSegmentDetector(float rho, float theta, int minLineLength, int maxLineGap); // Targeting ../opencv_cudaimgproc/HoughCirclesDetector.java @@ -735,8 +738,93 @@ is an image where each Connected Component is assigned a unique label (integer v int connectivity/*=8*/, int ltype/*=CV_32S*/); @Namespace("cv::cuda") public static native void connectedComponents(@ByVal GpuMat image, @ByVal GpuMat labels); +/** \} +

+ * \addtogroup cudaimgproc_shape + * \{ +

+ /** \brief Order of image moments. + * @param FIRST_ORDER_MOMENTS First order moments + * @param SECOND_ORDER_MOMENTS Second order moments. + * @param THIRD_ORDER_MOMENTS Third order moments. + * */ +/** enum cv::cuda::MomentsOrder */ +public static final int + FIRST_ORDER_MOMENTS = 1, + SECOND_ORDER_MOMENTS = 2, + THIRD_ORDER_MOMENTS = 3; + +/** \brief Returns the number of image moments less than or equal to the largest image moments \a order. +@param order Order of largest moments to calculate with lower order moments requiring less computation. +@return number of image moments. +

+@see cuda::moments, cuda::spatialMoments, cuda::MomentsOrder + */ +@Namespace("cv::cuda") public static native int numMoments(@Cast("const cv::cuda::MomentsOrder") int order); -/** \} */ +/** \brief Calculates all of the spatial moments up to the 3rd order of a rasterized shape. +

+Asynchronous version of cuda::moments() which only calculates the spatial (not centralized or normalized) moments, up to the 3rd order, of a rasterized shape. +Each moment is returned as a column entry in the 1D \a moments array. +

+@param src Raster image (single-channel 2D array). +@param moments [out] 1D array with each column entry containing a spatial image moment. +@param binaryImage If it is true, all non-zero image pixels are treated as 1's. +@param order Order of largest moments to calculate with lower order moments requiring less computation. +@param momentsType Precision to use when calculating moments. Available types are {@code CV_32F} and {@code CV_64F} with the performance of {@code CV_32F} an order of magnitude greater than {@code CV_64F}. If the image is small the accuracy from {@code CV_32F} can be equal or very close to {@code CV_64F}. +@param stream Stream for the asynchronous version. +

+\note For maximum performance pre-allocate a 1D GpuMat for \a moments of the correct type and size large enough to store the all the image moments of up to the desired \a order. e.g. With \a order === MomentsOrder::SECOND_ORDER_MOMENTS and \a momentsType == {@code CV_32F} \a moments can be allocated as +

{@code
+GpuMat momentsDevice(1,numMoments(MomentsOrder::SECOND_ORDER_MOMENTS),CV_32F)
+}
+The central and normalized moments can easily be calculated on the host by downloading the \a moments array and using the cv::Moments constructor. e.g. +
{@code
+HostMem momentsHostMem(1, numMoments(MomentsOrder::SECOND_ORDER_MOMENTS), CV_32F);
+momentsDevice.download(momentsHostMem, stream);
+stream.waitForCompletion();
+Mat momentsMat = momentsHostMem.createMatHeader();
+cv::Moments cvMoments(momentsMat.at(0), momentsMat.at(1), momentsMat.at(2), momentsMat.at(3), momentsMat.at(4), momentsMat.at(5), momentsMat.at(6), momentsMat.at(7), momentsMat.at(8), momentsMat.at(9));
+}
+see the \a CUDA_TEST_P(Moments, Async) test inside opencv_contrib_source_code/modules/cudaimgproc/test/test_moments.cpp for an example. +@return cv::Moments. +@see cuda::moments +*/ +@Namespace("cv::cuda") public static native void spatialMoments(@ByVal Mat src, @ByVal Mat moments, @Cast("const bool") boolean binaryImage/*=false*/, @Cast("const cv::cuda::MomentsOrder") int order/*=cv::cuda::MomentsOrder::THIRD_ORDER_MOMENTS*/, int momentsType/*=CV_64F*/, @ByRef(nullValue = "cv::cuda::Stream::Null()") Stream stream); +@Namespace("cv::cuda") public static native void spatialMoments(@ByVal Mat src, @ByVal Mat moments); +@Namespace("cv::cuda") public static native void spatialMoments(@ByVal UMat src, @ByVal UMat moments, @Cast("const bool") boolean binaryImage/*=false*/, @Cast("const cv::cuda::MomentsOrder") int order/*=cv::cuda::MomentsOrder::THIRD_ORDER_MOMENTS*/, int momentsType/*=CV_64F*/, @ByRef(nullValue = "cv::cuda::Stream::Null()") Stream stream); +@Namespace("cv::cuda") public static native void spatialMoments(@ByVal UMat src, @ByVal UMat moments); +@Namespace("cv::cuda") public static native void spatialMoments(@ByVal GpuMat src, @ByVal GpuMat moments, @Cast("const bool") boolean binaryImage/*=false*/, @Cast("const cv::cuda::MomentsOrder") int order/*=cv::cuda::MomentsOrder::THIRD_ORDER_MOMENTS*/, int momentsType/*=CV_64F*/, @ByRef(nullValue = "cv::cuda::Stream::Null()") Stream stream); +@Namespace("cv::cuda") public static native void spatialMoments(@ByVal GpuMat src, @ByVal GpuMat moments); + +/** \brief Calculates all of the moments up to the 3rd order of a rasterized shape. +

+The function computes moments, up to the 3rd order, of a rasterized shape. The +results are returned in the structure cv::Moments. +

+@param src Raster image (single-channel 2D array). +@param binaryImage If it is true, all non-zero image pixels are treated as 1's. +@param order Order of largest moments to calculate with lower order moments requiring less computation. + @param momentsType Precision to use when calculating moments. Available types are {@code CV_32F} and {@code CV_64F} with the performance of {@code CV_32F} an order of magnitude greater than {@code CV_64F}. If the image is small the accuracy from {@code CV_32F} can be equal or very close to {@code CV_64F}. +

+\note For maximum performance use the asynchronous version cuda::spatialMoments() as this version interally allocates and deallocates both GpuMat and HostMem to respectively perform the calculation on the device and download the result to the host. +The costly HostMem allocation cannot be avoided however the GpuMat device allocation can be by using BufferPool, e.g. +

{@code
+    setBufferPoolUsage(true);
+    setBufferPoolConfig(getDevice(), numMoments(order) * ((momentsType == CV_64F) ? sizeof(double) : sizeof(float)), 1);
+}
+see the \a CUDA_TEST_P(Moments, Accuracy) test inside opencv_contrib_source_code/modules/cudaimgproc/test/test_moments.cpp for an example. +@return cv::Moments. +@see cuda::spatialMoments + */ +@Namespace("cv::cuda") public static native @ByVal Moments moments(@ByVal Mat src, @Cast("const bool") boolean binaryImage/*=false*/, @Cast("const cv::cuda::MomentsOrder") int order/*=cv::cuda::MomentsOrder::THIRD_ORDER_MOMENTS*/, int momentsType/*=CV_64F*/); +@Namespace("cv::cuda") public static native @ByVal Moments moments(@ByVal Mat src); +@Namespace("cv::cuda") public static native @ByVal Moments moments(@ByVal UMat src, @Cast("const bool") boolean binaryImage/*=false*/, @Cast("const cv::cuda::MomentsOrder") int order/*=cv::cuda::MomentsOrder::THIRD_ORDER_MOMENTS*/, int momentsType/*=CV_64F*/); +@Namespace("cv::cuda") public static native @ByVal Moments moments(@ByVal UMat src); +@Namespace("cv::cuda") public static native @ByVal Moments moments(@ByVal GpuMat src, @Cast("const bool") boolean binaryImage/*=false*/, @Cast("const cv::cuda::MomentsOrder") int order/*=cv::cuda::MomentsOrder::THIRD_ORDER_MOMENTS*/, int momentsType/*=CV_64F*/); +@Namespace("cv::cuda") public static native @ByVal Moments moments(@ByVal GpuMat src); + +/** \} cudaimgproc_shape */ // namespace cv { namespace cuda { diff --git a/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_features2d.java b/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_features2d.java index 9a9f9ec445f..660c24eb197 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_features2d.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_features2d.java @@ -229,9 +229,12 @@ public class opencv_features2d extends org.bytedeco.opencv.presets.opencv_featur // Targeting ../opencv_features2d/AKAZE.java -// Targeting ../opencv_features2d/Accumulator.java - +/** \} features2d_main +

+/****************************************************************************************\ +* Distance * +\****************************************************************************************/ /* * Squared Euclidean distance functor diff --git a/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_videoio.java b/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_videoio.java index d689f79094a..dccb6267b4b 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_videoio.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_videoio.java @@ -1025,12 +1025,8 @@ public class opencv_videoio extends org.bytedeco.opencv.presets.opencv_videoio { // Targeting ../opencv_videoio/VideoWriter.java -// Targeting ../opencv_videoio/CvCaptureDefaultDeleter.java - - -// Targeting ../opencv_videoio/CvVideoWriterDefaultDeleter.java - +/** \cond IGNORED */ /** \endcond IGNORED

* \} videoio */ diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_bgsegm/BackgroundSubtractorCNT.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_bgsegm/BackgroundSubtractorCNT.java index 6419dedcf8d..2d6e5c30217 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_bgsegm/BackgroundSubtractorCNT.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_bgsegm/BackgroundSubtractorCNT.java @@ -46,7 +46,7 @@ public class BackgroundSubtractorCNT extends BackgroundSubtractor { public BackgroundSubtractorCNT(Pointer p) { super(p); } /** Downcast constructor. */ public BackgroundSubtractorCNT(Algorithm pointer) { super((Pointer)null); allocate(pointer); } - @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); // BackgroundSubtractor interface public native @Override void apply(@ByVal Mat image, @ByVal Mat fgmask, double learningRate/*=-1*/); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_bgsegm/BackgroundSubtractorGMG.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_bgsegm/BackgroundSubtractorGMG.java index 30fe0b8090b..8b69c986698 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_bgsegm/BackgroundSubtractorGMG.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_bgsegm/BackgroundSubtractorGMG.java @@ -48,7 +48,7 @@ public class BackgroundSubtractorGMG extends BackgroundSubtractor { public BackgroundSubtractorGMG(Pointer p) { super(p); } /** Downcast constructor. */ public BackgroundSubtractorGMG(Algorithm pointer) { super((Pointer)null); allocate(pointer); } - @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); /** \brief Returns total number of distinct colors to maintain in histogram. */ diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_bgsegm/BackgroundSubtractorGSOC.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_bgsegm/BackgroundSubtractorGSOC.java index cb7ef3d8fa6..ae2b2f78897 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_bgsegm/BackgroundSubtractorGSOC.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_bgsegm/BackgroundSubtractorGSOC.java @@ -43,7 +43,7 @@ public class BackgroundSubtractorGSOC extends BackgroundSubtractor { public BackgroundSubtractorGSOC(Pointer p) { super(p); } /** Downcast constructor. */ public BackgroundSubtractorGSOC(Algorithm pointer) { super((Pointer)null); allocate(pointer); } - @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); // BackgroundSubtractor interface public native @Override void apply(@ByVal Mat image, @ByVal Mat fgmask, double learningRate/*=-1*/); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_bgsegm/BackgroundSubtractorLSBP.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_bgsegm/BackgroundSubtractorLSBP.java index 3b85b41e6ba..051dee3c17f 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_bgsegm/BackgroundSubtractorLSBP.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_bgsegm/BackgroundSubtractorLSBP.java @@ -41,7 +41,7 @@ public class BackgroundSubtractorLSBP extends BackgroundSubtractor { public BackgroundSubtractorLSBP(Pointer p) { super(p); } /** Downcast constructor. */ public BackgroundSubtractorLSBP(Algorithm pointer) { super((Pointer)null); allocate(pointer); } - @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); // BackgroundSubtractor interface public native @Override void apply(@ByVal Mat image, @ByVal Mat fgmask, double learningRate/*=-1*/); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_bgsegm/BackgroundSubtractorMOG.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_bgsegm/BackgroundSubtractorMOG.java index 2383ab3c1b3..fe7fb3d4d6a 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_bgsegm/BackgroundSubtractorMOG.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_bgsegm/BackgroundSubtractorMOG.java @@ -46,7 +46,7 @@ public class BackgroundSubtractorMOG extends BackgroundSubtractor { public BackgroundSubtractorMOG(Pointer p) { super(p); } /** Downcast constructor. */ public BackgroundSubtractorMOG(Algorithm pointer) { super((Pointer)null); allocate(pointer); } - @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); public native int getHistory(); public native void setHistory(int nframes); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_bgsegm/SyntheticSequenceGenerator.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_bgsegm/SyntheticSequenceGenerator.java index dd94ae36bef..c7a4c9faa47 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_bgsegm/SyntheticSequenceGenerator.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_bgsegm/SyntheticSequenceGenerator.java @@ -44,7 +44,9 @@ public class SyntheticSequenceGenerator extends Algorithm { public SyntheticSequenceGenerator(Pointer p) { super(p); } /** Downcast constructor. */ public SyntheticSequenceGenerator(Algorithm pointer) { super((Pointer)null); allocate(pointer); } - @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); + @Override public Algorithm asAlgorithm() { return asAlgorithm(this); } + @Namespace public static native @Name("static_cast") Algorithm asAlgorithm(SyntheticSequenceGenerator pointer); /** \brief Creates an instance of SyntheticSequenceGenerator.

diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_bioinspired/Retina.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_bioinspired/Retina.java index 602b4a524ac..8a5d277b560 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_bioinspired/Retina.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_bioinspired/Retina.java @@ -52,6 +52,11 @@ public class Retina extends Algorithm { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public Retina(Pointer p) { super(p); } + /** Downcast constructor. */ + public Retina(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); + @Override public Algorithm asAlgorithm() { return asAlgorithm(this); } + @Namespace public static native @Name("static_cast") Algorithm asAlgorithm(Retina pointer); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_bioinspired/RetinaFastToneMapping.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_bioinspired/RetinaFastToneMapping.java index 6d36766c27f..8645c111587 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_bioinspired/RetinaFastToneMapping.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_bioinspired/RetinaFastToneMapping.java @@ -45,6 +45,11 @@ public class RetinaFastToneMapping extends Algorithm { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public RetinaFastToneMapping(Pointer p) { super(p); } + /** Downcast constructor. */ + public RetinaFastToneMapping(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); + @Override public Algorithm asAlgorithm() { return asAlgorithm(this); } + @Namespace public static native @Name("static_cast") Algorithm asAlgorithm(RetinaFastToneMapping pointer); /** \brief applies a luminance correction (initially High Dynamic Range (HDR) tone mapping) diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_bioinspired/TransientAreasSegmentationModule.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_bioinspired/TransientAreasSegmentationModule.java index d8d85be7216..ce7863c152c 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_bioinspired/TransientAreasSegmentationModule.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_bioinspired/TransientAreasSegmentationModule.java @@ -41,6 +41,11 @@ public class TransientAreasSegmentationModule extends Algorithm { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public TransientAreasSegmentationModule(Pointer p) { super(p); } + /** Downcast constructor. */ + public TransientAreasSegmentationModule(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); + @Override public Algorithm asAlgorithm() { return asAlgorithm(this); } + @Namespace public static native @Name("static_cast") Algorithm asAlgorithm(TransientAreasSegmentationModule pointer); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_calib3d/LMSolver.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_calib3d/LMSolver.java index 89f700c70bc..78ae2482954 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_calib3d/LMSolver.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_calib3d/LMSolver.java @@ -41,7 +41,9 @@ public class LMSolver extends Algorithm { public LMSolver(Pointer p) { super(p); } /** Downcast constructor. */ public LMSolver(Algorithm pointer) { super((Pointer)null); allocate(pointer); } - @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); + @Override public Algorithm asAlgorithm() { return asAlgorithm(this); } + @Namespace public static native @Name("static_cast") Algorithm asAlgorithm(LMSolver pointer); public static class Callback extends Pointer { static { Loader.load(); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_calib3d/StereoBM.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_calib3d/StereoBM.java index 86e22baefb6..7033f5fef88 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_calib3d/StereoBM.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_calib3d/StereoBM.java @@ -37,7 +37,7 @@ public class StereoBM extends StereoMatcher { public StereoBM(Pointer p) { super(p); } /** Downcast constructor. */ public StereoBM(Algorithm pointer) { super((Pointer)null); allocate(pointer); } - @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); /** enum cv::StereoBM:: */ public static final int PREFILTER_NORMALIZED_RESPONSE = 0, diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_calib3d/StereoMatcher.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_calib3d/StereoMatcher.java index f20aedfea53..97ca8ea5802 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_calib3d/StereoMatcher.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_calib3d/StereoMatcher.java @@ -35,7 +35,9 @@ public class StereoMatcher extends Algorithm { public StereoMatcher(Pointer p) { super(p); } /** Downcast constructor. */ public StereoMatcher(Algorithm pointer) { super((Pointer)null); allocate(pointer); } - @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); + @Override public Algorithm asAlgorithm() { return asAlgorithm(this); } + @Namespace public static native @Name("static_cast") Algorithm asAlgorithm(StereoMatcher pointer); /** enum cv::StereoMatcher:: */ public static final int DISP_SHIFT = 4, diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_calib3d/StereoSGBM.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_calib3d/StereoSGBM.java index b74e533659a..45bb3919531 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_calib3d/StereoSGBM.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_calib3d/StereoSGBM.java @@ -51,7 +51,7 @@ public class StereoSGBM extends StereoMatcher { public StereoSGBM(Pointer p) { super(p); } /** Downcast constructor. */ public StereoSGBM(Algorithm pointer) { super((Pointer)null); allocate(pointer); } - @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); /** enum cv::StereoSGBM:: */ public static final int diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Algorithm.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Algorithm.java index 53cb9cba1bd..ba56779373d 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Algorithm.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/Algorithm.java @@ -39,34 +39,41 @@ public class Algorithm extends Pointer { @Override public Algorithm getPointer(long i) { return new Algorithm((Pointer)this).offsetAddress(i); } + public Algorithm asAlgorithm() { return this; } public Algorithm() { super((Pointer)null); allocate(); } private native void allocate(); /** \brief Clears the algorithm state */ - public native void clear(); + public void clear() { asAlgorithm()._clear(); } + private native @Name("clear") void _clear(); /** \brief Stores algorithm parameters in a file storage */ - public native void write(@ByRef FileStorage fs); + public void write(FileStorage fs) { asAlgorithm()._write(fs); } + private native @Name("write") void _write(@ByRef FileStorage fs); /** * \overload */ - public native void write(@ByRef FileStorage fs, @Str BytePointer name); - public native void write(@ByRef FileStorage fs, @Str String name); + public void write(FileStorage fs, BytePointer name) { asAlgorithm()._write(fs, name); } + private native @Name("write") void _write(@ByRef FileStorage fs, @Str BytePointer name); + public void write(FileStorage fs, String name) { asAlgorithm()._write(fs, name); } + private native @Name("write") void _write(@ByRef FileStorage fs, @Str String name); // #if CV_VERSION_MAJOR < 5 /** @deprecated */ // #endif /** \brief Reads algorithm parameters from a file storage */ - public native void read(@Const @ByRef FileNode fn); + public void read(FileNode fn) { asAlgorithm()._read(fn); } + private native @Name("read") void _read(@Const @ByRef FileNode fn); /** \brief Returns true if the Algorithm is empty (e.g. in the very beginning or after unsuccessful read */ - public native @Cast("bool") boolean empty(); + public boolean empty() { return asAlgorithm()._empty(); } + private native @Cast("bool") @Name("empty") boolean _empty(); /** \brief Reads algorithm from the file node

@@ -106,10 +113,13 @@ public class Algorithm extends Pointer { /** Saves the algorithm to a file. In order to make this method work, the derived class must implement Algorithm::write(FileStorage& fs). */ - public native void save(@Str BytePointer filename); - public native void save(@Str String filename); + public void save(BytePointer filename) { asAlgorithm()._save(filename); } + private native @Name("save") void _save(@Str BytePointer filename); + public void save(String filename) { asAlgorithm()._save(filename); } + private native @Name("save") void _save(@Str String filename); /** Returns the algorithm string identifier. This string is used as top level xml/yml node tag when the object is saved to a file or string. */ - public native @Str BytePointer getDefaultName(); + public BytePointer getDefaultName() { return asAlgorithm()._getDefaultName(); } + private native @Str @Name("getDefaultName") BytePointer _getDefaultName(); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvMatDefaultDeleter.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvMatDefaultDeleter.java deleted file mode 100644 index de08f4c0511..00000000000 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/CvMatDefaultDeleter.java +++ /dev/null @@ -1,37 +0,0 @@ -// Targeted by JavaCPP version 1.5.10-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.javacpp.presets.javacpp.*; -import static org.bytedeco.openblas.global.openblas_nolapack.*; -import static org.bytedeco.openblas.global.openblas.*; - -import static org.bytedeco.opencv.global.opencv_core.*; - - - - -////// specialized implementations of DefaultDeleter::operator() for classic OpenCV types ////// - -@Name("cv::DefaultDeleter") @Properties(inherit = org.bytedeco.opencv.presets.opencv_core.class) -public class CvMatDefaultDeleter extends Pointer { - static { Loader.load(); } - /** Default native constructor. */ - public CvMatDefaultDeleter() { super((Pointer)null); allocate(); } - /** Native array allocator. Access with {@link Pointer#position(long)}. */ - public CvMatDefaultDeleter(long size) { super((Pointer)null); allocateArray(size); } - /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ - public CvMatDefaultDeleter(Pointer p) { super(p); } - private native void allocate(); - private native void allocateArray(long size); - @Override public CvMatDefaultDeleter position(long position) { - return (CvMatDefaultDeleter)super.position(position); - } - @Override public CvMatDefaultDeleter getPointer(long i) { - return new CvMatDefaultDeleter((Pointer)this).offsetAddress(i); - } - public native @Name("operator ()") void apply(CvMat obj); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/MinProblemSolver.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/MinProblemSolver.java index 9f73f0cebcb..29c27056417 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/MinProblemSolver.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_core/MinProblemSolver.java @@ -26,6 +26,11 @@ public class MinProblemSolver extends Algorithm { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public MinProblemSolver(Pointer p) { super(p); } + /** Downcast constructor. */ + public MinProblemSolver(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); + @Override public Algorithm asAlgorithm() { return asAlgorithm(this); } + @Namespace public static native @Name("static_cast") Algorithm asAlgorithm(MinProblemSolver pointer); /** \brief Represents function being optimized */ diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaarithm/Convolution.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaarithm/Convolution.java index d76a9464b31..874d3465322 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaarithm/Convolution.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaarithm/Convolution.java @@ -22,6 +22,11 @@ public class Convolution extends Algorithm { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public Convolution(Pointer p) { super(p); } + /** Downcast constructor. */ + public Convolution(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); + @Override public Algorithm asAlgorithm() { return asAlgorithm(this); } + @Namespace public static native @Name("static_cast") Algorithm asAlgorithm(Convolution pointer); /** \brief Computes a convolution (or cross-correlation) of two images.

diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaarithm/DFT.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaarithm/DFT.java index e06703cf7a2..227cb442adb 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaarithm/DFT.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaarithm/DFT.java @@ -22,6 +22,11 @@ public class DFT extends Algorithm { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public DFT(Pointer p) { super(p); } + /** Downcast constructor. */ + public DFT(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); + @Override public Algorithm asAlgorithm() { return asAlgorithm(this); } + @Namespace public static native @Name("static_cast") Algorithm asAlgorithm(DFT pointer); /** \brief Computes an FFT of a given image.

diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaarithm/LookUpTable.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaarithm/LookUpTable.java index f62850e2557..625a905a86e 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaarithm/LookUpTable.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaarithm/LookUpTable.java @@ -22,6 +22,11 @@ public class LookUpTable extends Algorithm { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public LookUpTable(Pointer p) { super(p); } + /** Downcast constructor. */ + public LookUpTable(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); + @Override public Algorithm asAlgorithm() { return asAlgorithm(this); } + @Namespace public static native @Name("static_cast") Algorithm asAlgorithm(LookUpTable pointer); /** \brief Transforms the source matrix into the destination matrix using the given look-up table: dst(I) = lut(src(I)) . diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudabgsegm/BackgroundSubtractorMOG.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudabgsegm/BackgroundSubtractorMOG.java index b9ae1475355..0219450b09d 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudabgsegm/BackgroundSubtractorMOG.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudabgsegm/BackgroundSubtractorMOG.java @@ -55,6 +55,9 @@ public class BackgroundSubtractorMOG extends BackgroundSubtractor { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public BackgroundSubtractorMOG(Pointer p) { super(p); } + /** Downcast constructor. */ + public BackgroundSubtractorMOG(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); public native void apply(@ByVal Mat image, @ByVal Mat fgmask, double learningRate, @ByRef Stream stream); public native void apply(@ByVal UMat image, @ByVal UMat fgmask, double learningRate, @ByRef Stream stream); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudabgsegm/BackgroundSubtractorMOG2.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudabgsegm/BackgroundSubtractorMOG2.java index 2933e87f7fe..42fbe5862f0 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudabgsegm/BackgroundSubtractorMOG2.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudabgsegm/BackgroundSubtractorMOG2.java @@ -48,6 +48,9 @@ public class BackgroundSubtractorMOG2 extends org.bytedeco.opencv.opencv_video.B static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public BackgroundSubtractorMOG2(Pointer p) { super(p); } + /** Downcast constructor. */ + public BackgroundSubtractorMOG2(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); public native void apply(@ByVal Mat image, @ByVal Mat fgmask, double learningRate, @ByRef Stream stream); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudacodec/EncoderCallback.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudacodec/EncoderCallback.java index d3e89ffb81d..cafb6f74f86 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudacodec/EncoderCallback.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudacodec/EncoderCallback.java @@ -34,7 +34,7 @@ public class EncoderCallback extends Pointer {

@param vPacket The raw bitstream for one or more frames. */ - public native void onEncoded(@ByVal @Cast("std::vector >*") ByteVectorVector vPacket); + public native void onEncoded(@Cast("const std::vector >*") @ByRef ByteVectorVector vPacket); /** \brief Callback function to that the encoding has finished. * */ diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudacodec/EncoderParams.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudacodec/EncoderParams.java index 1d9b53229f7..e210e71921e 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudacodec/EncoderParams.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudacodec/EncoderParams.java @@ -39,19 +39,21 @@ public class EncoderParams extends Pointer { public EncoderParams() { super((Pointer)null); allocate(); } private native void allocate(); - public native @Cast("cv::cudacodec::EncodePreset") int nvPreset(); public native EncoderParams nvPreset(int setter); public native @Cast("cv::cudacodec::EncodeTuningInfo") int tuningInfo(); public native EncoderParams tuningInfo(int setter); public native @Cast("cv::cudacodec::EncodeProfile") int encodingProfile(); public native EncoderParams encodingProfile(int setter); public native @Cast("cv::cudacodec::EncodeParamsRcMode") int rateControlMode(); public native EncoderParams rateControlMode(int setter); public native @Cast("cv::cudacodec::EncodeMultiPass") int multiPassEncoding(); public native EncoderParams multiPassEncoding(int setter); - /** QP's for ENC_PARAMS_RC_CONSTQP. */ + /** QP's for \ref ENC_PARAMS_RC_CONSTQP. */ public native @ByRef EncodeQp constQp(); public native EncoderParams constQp(EncodeQp setter); - /** target bitrate for ENC_PARAMS_RC_VBR and ENC_PARAMS_RC_CBR. */ + /** target bitrate for \ref ENC_PARAMS_RC_VBR and \ref ENC_PARAMS_RC_CBR. */ public native int averageBitRate(); public native EncoderParams averageBitRate(int setter); - /** upper bound on bitrate for ENC_PARAMS_RC_VBR and ENC_PARAMS_RC_CONSTQP. */ + /** upper bound on bitrate for \ref ENC_PARAMS_RC_VBR and \ref ENC_PARAMS_RC_CONSTQP. */ public native int maxBitRate(); public native EncoderParams maxBitRate(int setter); - /** value 0 - 51 where video quality decreases as targetQuality increases, used with ENC_PARAMS_RC_VBR. */ + /** value 0 - 51 where video quality decreases as targetQuality increases, used with \ref ENC_PARAMS_RC_VBR. */ public native @Cast("cv::uint8_t") byte targetQuality(); public native EncoderParams targetQuality(byte setter); + /** the number of pictures in one GOP, ensuring \ref idrPeriod >= \ref gopLength. */ public native int gopLength(); public native EncoderParams gopLength(int setter); + /** IDR interval, ensuring \ref idrPeriod >= \ref gopLength. */ + public native int idrPeriod(); public native EncoderParams idrPeriod(int setter); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudacodec/FormatInfo.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudacodec/FormatInfo.java index ef47a57974a..20053ed5da4 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudacodec/FormatInfo.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudacodec/FormatInfo.java @@ -43,6 +43,7 @@ public class FormatInfo extends Pointer { public native @Cast("cv::cudacodec::Codec") int codec(); public native FormatInfo codec(int setter); public native @Cast("cv::cudacodec::ChromaFormat") int chromaFormat(); public native FormatInfo chromaFormat(int setter); public native int nBitDepthMinus8(); public native FormatInfo nBitDepthMinus8(int setter); + public native int nBitDepthChromaMinus8(); public native FormatInfo nBitDepthChromaMinus8(int setter); /** Coded sequence width in pixels. */ public native int ulWidth(); public native FormatInfo ulWidth(int setter); /** Coded sequence height in pixels. */ @@ -66,4 +67,12 @@ public class FormatInfo extends Pointer { public native @ByRef Rect srcRoi(); public native FormatInfo srcRoi(Rect setter); /** Region of interest in the output frame containing the decoded frame. */ public native @ByRef Rect targetRoi(); public native FormatInfo targetRoi(Rect setter); + /** Output value indicating if the black level, luma and chroma of the source are represented using the full or limited range (AKA TV or "analogue" range) of values as defined in Annex E of the ITU-T Specification. Internally the conversion from NV12 to BGR obeys ITU 709. */ + public native @Cast("bool") boolean videoFullRangeFlag(); public native FormatInfo videoFullRangeFlag(boolean setter); + /** Flag requesting histogram output if supported. Exception will be thrown when requested but not supported. */ + public native @Cast("bool") boolean enableHistogram(); public native FormatInfo enableHistogram(boolean setter); + /** Bit depth of histogram bins if histogram output is requested and supported. */ + public native int nCounterBitDepth(); public native FormatInfo nCounterBitDepth(int setter); + /** Max number of histogram bins if histogram output is requested and supported. */ + public native int nMaxHistogramBins(); public native FormatInfo nMaxHistogramBins(int setter); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudacodec/RawVideoSource.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudacodec/RawVideoSource.java index d61db3c29e9..9f0646a3196 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudacodec/RawVideoSource.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudacodec/RawVideoSource.java @@ -70,4 +70,12 @@ public class RawVideoSource extends Pointer { public native @Cast("bool") boolean get(int propertyId, @ByRef DoublePointer propertyVal); public native @Cast("bool") boolean get(int propertyId, @ByRef DoubleBuffer propertyVal); public native @Cast("bool") boolean get(int propertyId, @ByRef double[] propertyVal); + + /** \brief Retrieve the index of the first frame that will returned after construction. +

+ @return index of the index of the first frame that will returned after construction. +

+ \note To reduce the decoding overhead when initializing VideoReader to start its decoding from frame N, RawVideoSource should seek to the first valid key frame less than or equal to N and return that index here. + */ + public native int getFirstFrameIdx(); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudacodec/VideoReader.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudacodec/VideoReader.java index deaaea951b9..48c14dcc478 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudacodec/VideoReader.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudacodec/VideoReader.java @@ -20,14 +20,14 @@ import static org.bytedeco.opencv.global.opencv_cudacodec.*; -/** \brief Video reader interface. +/** \brief Video reader interface, see createVideoReader().

-Available when built with WITH_NVCUVID=ON while Nvidia's Video Codec SDK is installed. +Available if Nvidia's Video Codec SDK is installed.

Decoding support is dependent on the GPU, refer to the Nvidia Video Codec SDK Video Encode and Decode GPU Support Matrix for details.

\note - - An example on how to use the videoReader class can be found at + - An example on how to use the VideoReader interface can be found at opencv_source_code/samples/gpu/video_reader.cpp */ @Name("cv::cudacodec::VideoReader") @Properties(inherit = org.bytedeco.opencv.presets.opencv_cudacodec.class) @@ -49,6 +49,21 @@ If no frames have been grabbed (there are no more frames in video file), the met public native @Cast("bool") boolean nextFrame(@ByRef GpuMat frame, @ByRef(nullValue = "cv::cuda::Stream::Null()") Stream stream); public native @Cast("bool") boolean nextFrame(@ByRef GpuMat frame); + /** \brief Grabs, decodes and returns the next video frame and frame luma histogram. +

+ @param frame [out] The video frame. + @param histogram [out] Histogram of the luma component of the encoded frame, see note. + @param stream Stream for the asynchronous version. + @return {@code false} if no frames have been grabbed. +

+ If no frames have been grabbed (there are no more frames in video file), the methods return false. + The method throws an Exception if error occurs. +

+ \note Histogram data is collected by NVDEC during the decoding process resulting in zero performance penalty. NVDEC computes the histogram data for only the luma component of decoded output, not on post-processed frame(i.e. when scaling, cropping, etc. applied). If the source is encoded using a limited range of luma values (FormatInfo::videoFullRangeFlag == false) then the histogram bin values will correspond to to this limited range of values and will need to be mapped to contain the same output as cuda::calcHist(). The MapHist() utility function can be used to perform this mapping on the host if required. + */ + public native @Cast("bool") @Name("nextFrame") boolean nextFrameWithHist(@ByRef GpuMat frame, @ByRef GpuMat histogram, @ByRef(nullValue = "cv::cuda::Stream::Null()") Stream stream); + public native @Cast("bool") @Name("nextFrame") boolean nextFrameWithHist(@ByRef GpuMat frame, @ByRef GpuMat histogram); + /** \brief Returns information about video file format. */ public native @ByVal FormatInfo format(); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudacodec/VideoReaderInitParams.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudacodec/VideoReaderInitParams.java index c68a2424fe7..ade470b7b63 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudacodec/VideoReaderInitParams.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudacodec/VideoReaderInitParams.java @@ -34,6 +34,8 @@ overall application. The optimal number of decode surfaces (in terms of performa @param srcRoi Region of interest (x/width should be multiples of 4 and y/height multiples of 2) decoded from video source, defaults to the full frame. @param targetRoi Region of interest (x/width should be multiples of 4 and y/height multiples of 2) within the output frame to copy and resize the decoded frame to, defaults to the full frame. +@param enableHistogram Request output of decoded luma histogram \a hist from VideoReader::nextFrame(GpuMat& frame, GpuMat& hist, Stream& stream), if hardware supported. +@param firstFrameIdx Index of the first frame to seek to on initialization of the VideoReader. */ @Namespace("cv::cudacodec") @NoOffset @Properties(inherit = org.bytedeco.opencv.presets.opencv_cudacodec.class) public class VideoReaderInitParams extends Pointer { @@ -59,4 +61,6 @@ public class VideoReaderInitParams extends Pointer { public native @ByRef Size targetSz(); public native VideoReaderInitParams targetSz(Size setter); public native @ByRef Rect srcRoi(); public native VideoReaderInitParams srcRoi(Rect setter); public native @ByRef Rect targetRoi(); public native VideoReaderInitParams targetRoi(Rect setter); + public native @Cast("bool") boolean enableHistogram(); public native VideoReaderInitParams enableHistogram(boolean setter); + public native int firstFrameIdx(); public native VideoReaderInitParams firstFrameIdx(int setter); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudacodec/VideoWriter.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudacodec/VideoWriter.java index da0c5d60c64..4c0b3b6b109 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudacodec/VideoWriter.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudacodec/VideoWriter.java @@ -20,14 +20,14 @@ import static org.bytedeco.opencv.global.opencv_cudacodec.*; -/** \brief Video writer interface. +/** \brief Video writer interface, see createVideoWriter().

-Available when built with WITH_NVCUVENC=ON while Nvidia's Video Codec SDK is installed. +Available if Nvidia's Video Codec SDK is installed.

-Encoding support is dependent on the GPU, refer to the Nvidia Video Codec SDK Video Encode and Decode GPU Support Matrix for details. +Only Codec::H264 and Codec::HEVC are supported with encoding support dependent on the GPU, refer to the Nvidia Video Codec SDK Video Encode and Decode GPU Support Matrix for details.

\note - - An example on how to use the videoWriter class can be found at + - An example on how to use the VideoWriter class can be found at opencv_source_code/samples/gpu/video_writer.cpp */ @Name("cv::cudacodec::VideoWriter") @Properties(inherit = org.bytedeco.opencv.presets.opencv_cudacodec.class) diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudafeatures2d/DescriptorMatcher.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudafeatures2d/DescriptorMatcher.java index 72bb6f236b1..e30a1984cb8 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudafeatures2d/DescriptorMatcher.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudafeatures2d/DescriptorMatcher.java @@ -48,6 +48,11 @@ public class DescriptorMatcher extends Algorithm { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public DescriptorMatcher(Pointer p) { super(p); } + /** Downcast constructor. */ + public DescriptorMatcher(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); + @Override public Algorithm asAlgorithm() { return asAlgorithm(this); } + @Namespace public static native @Name("static_cast") Algorithm asAlgorithm(DescriptorMatcher pointer); // // Factories diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudafeatures2d/FastFeatureDetector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudafeatures2d/FastFeatureDetector.java index 7da0bf5f3c6..35eb91df590 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudafeatures2d/FastFeatureDetector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudafeatures2d/FastFeatureDetector.java @@ -42,6 +42,9 @@ public class FastFeatureDetector extends Feature2DAsync { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public FastFeatureDetector(Pointer p) { super(p); } + /** Downcast constructor. */ + public FastFeatureDetector(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); @MemberGetter public static native int LOCATION_ROW(); public static final int LOCATION_ROW = LOCATION_ROW(); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudafeatures2d/Feature2DAsync.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudafeatures2d/Feature2DAsync.java index 511110734f9..45bca07f57b 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudafeatures2d/Feature2DAsync.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudafeatures2d/Feature2DAsync.java @@ -42,6 +42,9 @@ public class Feature2DAsync extends Feature2D { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public Feature2DAsync(Pointer p) { super(p); } + /** Downcast constructor. */ + public Feature2DAsync(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); /** \brief Detects keypoints in an image. diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudafeatures2d/ORB.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudafeatures2d/ORB.java index 85ba433902c..c99f1d5df14 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudafeatures2d/ORB.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudafeatures2d/ORB.java @@ -44,6 +44,9 @@ public class ORB extends Feature2DAsync { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public ORB(Pointer p) { super(p); } + /** Downcast constructor. */ + public ORB(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); @MemberGetter public static native int X_ROW(); public static final int X_ROW = X_ROW(); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudafilters/Filter.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudafilters/Filter.java index eb769ccd357..d18ba354131 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudafilters/Filter.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudafilters/Filter.java @@ -29,6 +29,11 @@ public class Filter extends Algorithm { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public Filter(Pointer p) { super(p); } + /** Downcast constructor. */ + public Filter(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); + @Override public Algorithm asAlgorithm() { return asAlgorithm(this); } + @Namespace public static native @Name("static_cast") Algorithm asAlgorithm(Filter pointer); /** \brief Applies the specified filter to the image.

diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaimgproc/CannyEdgeDetector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaimgproc/CannyEdgeDetector.java index 969f43929fd..078f92cbe35 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaimgproc/CannyEdgeDetector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaimgproc/CannyEdgeDetector.java @@ -32,6 +32,11 @@ public class CannyEdgeDetector extends Algorithm { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public CannyEdgeDetector(Pointer p) { super(p); } + /** Downcast constructor. */ + public CannyEdgeDetector(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); + @Override public Algorithm asAlgorithm() { return asAlgorithm(this); } + @Namespace public static native @Name("static_cast") Algorithm asAlgorithm(CannyEdgeDetector pointer); /** \brief Finds edges in an image using the \cite Canny86 algorithm.

diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaimgproc/CornernessCriteria.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaimgproc/CornernessCriteria.java index a25032d8d8e..84163df8915 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaimgproc/CornernessCriteria.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaimgproc/CornernessCriteria.java @@ -35,6 +35,11 @@ public class CornernessCriteria extends Algorithm { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public CornernessCriteria(Pointer p) { super(p); } + /** Downcast constructor. */ + public CornernessCriteria(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); + @Override public Algorithm asAlgorithm() { return asAlgorithm(this); } + @Namespace public static native @Name("static_cast") Algorithm asAlgorithm(CornernessCriteria pointer); /** \brief Computes the cornerness criteria at each image pixel.

diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaimgproc/CornersDetector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaimgproc/CornersDetector.java index e20206d9905..a949d51ca87 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaimgproc/CornersDetector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaimgproc/CornersDetector.java @@ -30,6 +30,11 @@ public class CornersDetector extends Algorithm { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public CornersDetector(Pointer p) { super(p); } + /** Downcast constructor. */ + public CornersDetector(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); + @Override public Algorithm asAlgorithm() { return asAlgorithm(this); } + @Namespace public static native @Name("static_cast") Algorithm asAlgorithm(CornersDetector pointer); /** \brief Determines strong corners on an image.

diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaimgproc/CudaCLAHE.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaimgproc/CudaCLAHE.java index 138ef7dfab2..b05e40d614b 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaimgproc/CudaCLAHE.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaimgproc/CudaCLAHE.java @@ -28,6 +28,9 @@ public class CudaCLAHE extends CLAHE { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public CudaCLAHE(Pointer p) { super(p); } + /** Downcast constructor. */ + public CudaCLAHE(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); /** \brief Equalizes the histogram of a grayscale image using Contrast Limited Adaptive Histogram Equalization.

diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaimgproc/HoughCirclesDetector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaimgproc/HoughCirclesDetector.java index 3a9db0e2f4d..712e4aaf9b4 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaimgproc/HoughCirclesDetector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaimgproc/HoughCirclesDetector.java @@ -31,6 +31,11 @@ public class HoughCirclesDetector extends Algorithm { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public HoughCirclesDetector(Pointer p) { super(p); } + /** Downcast constructor. */ + public HoughCirclesDetector(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); + @Override public Algorithm asAlgorithm() { return asAlgorithm(this); } + @Namespace public static native @Name("static_cast") Algorithm asAlgorithm(HoughCirclesDetector pointer); /** \brief Finds circles in a grayscale image using the Hough transform.

diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaimgproc/HoughLinesDetector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaimgproc/HoughLinesDetector.java index 04b454ab3da..f20788c65c7 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaimgproc/HoughLinesDetector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaimgproc/HoughLinesDetector.java @@ -36,6 +36,11 @@ public class HoughLinesDetector extends Algorithm { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public HoughLinesDetector(Pointer p) { super(p); } + /** Downcast constructor. */ + public HoughLinesDetector(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); + @Override public Algorithm asAlgorithm() { return asAlgorithm(this); } + @Namespace public static native @Name("static_cast") Algorithm asAlgorithm(HoughLinesDetector pointer); /** \brief Finds lines in a binary image using the classical Hough transform.

diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaimgproc/HoughSegmentDetector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaimgproc/HoughSegmentDetector.java index f15af5fab98..2c72ff28125 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaimgproc/HoughSegmentDetector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaimgproc/HoughSegmentDetector.java @@ -32,6 +32,11 @@ public class HoughSegmentDetector extends Algorithm { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public HoughSegmentDetector(Pointer p) { super(p); } + /** Downcast constructor. */ + public HoughSegmentDetector(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); + @Override public Algorithm asAlgorithm() { return asAlgorithm(this); } + @Namespace public static native @Name("static_cast") Algorithm asAlgorithm(HoughSegmentDetector pointer); /** \brief Finds line segments in a binary image using the probabilistic Hough transform.

@@ -64,4 +69,7 @@ public class HoughSegmentDetector extends Algorithm { public native void setMaxLines(int maxLines); public native int getMaxLines(); + + public native void setThreshold(int threshold); + public native int getThreshold(); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaimgproc/TemplateMatching.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaimgproc/TemplateMatching.java index e3107912b45..f738c0bb6e5 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaimgproc/TemplateMatching.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaimgproc/TemplateMatching.java @@ -30,6 +30,11 @@ public class TemplateMatching extends Algorithm { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public TemplateMatching(Pointer p) { super(p); } + /** Downcast constructor. */ + public TemplateMatching(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); + @Override public Algorithm asAlgorithm() { return asAlgorithm(this); } + @Namespace public static native @Name("static_cast") Algorithm asAlgorithm(TemplateMatching pointer); /** \brief Computes a proximity map for a raster template and an image where the template is searched for.

diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaobjdetect/CudaCascadeClassifier.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaobjdetect/CudaCascadeClassifier.java index 39db8821425..24aeb2df815 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaobjdetect/CudaCascadeClassifier.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaobjdetect/CudaCascadeClassifier.java @@ -58,6 +58,11 @@ public class CudaCascadeClassifier extends Algorithm { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public CudaCascadeClassifier(Pointer p) { super(p); } + /** Downcast constructor. */ + public CudaCascadeClassifier(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); + @Override public Algorithm asAlgorithm() { return asAlgorithm(this); } + @Namespace public static native @Name("static_cast") Algorithm asAlgorithm(CudaCascadeClassifier pointer); /** \brief Loads the classifier from a file. Cascade type is detected automatically by constructor parameter.

diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaobjdetect/HOG.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaobjdetect/HOG.java index dc1dffd7f40..b7a5739f931 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaobjdetect/HOG.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaobjdetect/HOG.java @@ -63,6 +63,11 @@ public class HOG extends Algorithm { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public HOG(Pointer p) { super(p); } + /** Downcast constructor. */ + public HOG(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); + @Override public Algorithm asAlgorithm() { return asAlgorithm(this); } + @Namespace public static native @Name("static_cast") Algorithm asAlgorithm(HOG pointer); /** \brief Creates the HOG descriptor and detector.

diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaoptflow/BroxOpticalFlow.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaoptflow/BroxOpticalFlow.java index 028f2b5e3fd..a3d8aa81a87 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaoptflow/BroxOpticalFlow.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaoptflow/BroxOpticalFlow.java @@ -56,6 +56,9 @@ public class BroxOpticalFlow extends DenseOpticalFlow { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public BroxOpticalFlow(Pointer p) { super(p); } + /** Downcast constructor. */ + public BroxOpticalFlow(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); public native double getFlowSmoothness(); public native void setFlowSmoothness(double alpha); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaoptflow/DenseOpticalFlow.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaoptflow/DenseOpticalFlow.java index 8fb72560b5d..01839ead679 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaoptflow/DenseOpticalFlow.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaoptflow/DenseOpticalFlow.java @@ -59,6 +59,11 @@ public class DenseOpticalFlow extends Algorithm { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public DenseOpticalFlow(Pointer p) { super(p); } + /** Downcast constructor. */ + public DenseOpticalFlow(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); + @Override public Algorithm asAlgorithm() { return asAlgorithm(this); } + @Namespace public static native @Name("static_cast") Algorithm asAlgorithm(DenseOpticalFlow pointer); /** \brief Calculates a dense optical flow.

diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaoptflow/DensePyrLKOpticalFlow.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaoptflow/DensePyrLKOpticalFlow.java index 288d06e4e8a..2987726499b 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaoptflow/DensePyrLKOpticalFlow.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaoptflow/DensePyrLKOpticalFlow.java @@ -55,6 +55,9 @@ public class DensePyrLKOpticalFlow extends DenseOpticalFlow { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public DensePyrLKOpticalFlow(Pointer p) { super(p); } + /** Downcast constructor. */ + public DensePyrLKOpticalFlow(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); public native @ByVal Size getWinSize(); public native void setWinSize(@ByVal Size winSize); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaoptflow/FarnebackOpticalFlow.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaoptflow/FarnebackOpticalFlow.java index bbafa2e0203..e6c0ebbc0c5 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaoptflow/FarnebackOpticalFlow.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaoptflow/FarnebackOpticalFlow.java @@ -56,6 +56,9 @@ public class FarnebackOpticalFlow extends DenseOpticalFlow { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public FarnebackOpticalFlow(Pointer p) { super(p); } + /** Downcast constructor. */ + public FarnebackOpticalFlow(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); public native int getNumLevels(); public native void setNumLevels(int numLevels); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaoptflow/NvidiaHWOpticalFlow.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaoptflow/NvidiaHWOpticalFlow.java index c604f90940c..78895c3c994 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaoptflow/NvidiaHWOpticalFlow.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaoptflow/NvidiaHWOpticalFlow.java @@ -51,6 +51,11 @@ public class NvidiaHWOpticalFlow extends Algorithm { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public NvidiaHWOpticalFlow(Pointer p) { super(p); } + /** Downcast constructor. */ + public NvidiaHWOpticalFlow(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); + @Override public Algorithm asAlgorithm() { return asAlgorithm(this); } + @Namespace public static native @Name("static_cast") Algorithm asAlgorithm(NvidiaHWOpticalFlow pointer); /** \brief Calculates Optical Flow using NVIDIA Optical Flow SDK.

diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaoptflow/NvidiaOpticalFlow_1_0.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaoptflow/NvidiaOpticalFlow_1_0.java index 85a51e6476c..82d4b9670eb 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaoptflow/NvidiaOpticalFlow_1_0.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaoptflow/NvidiaOpticalFlow_1_0.java @@ -62,6 +62,9 @@ public class NvidiaOpticalFlow_1_0 extends NvidiaHWOpticalFlow { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public NvidiaOpticalFlow_1_0(Pointer p) { super(p); } + /** Downcast constructor. */ + public NvidiaOpticalFlow_1_0(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); /** * Supported optical flow performance levels. diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaoptflow/NvidiaOpticalFlow_2_0.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaoptflow/NvidiaOpticalFlow_2_0.java index a75faad913c..98d59cf65eb 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaoptflow/NvidiaOpticalFlow_2_0.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaoptflow/NvidiaOpticalFlow_2_0.java @@ -58,6 +58,9 @@ public class NvidiaOpticalFlow_2_0 extends NvidiaHWOpticalFlow { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public NvidiaOpticalFlow_2_0(Pointer p) { super(p); } + /** Downcast constructor. */ + public NvidiaOpticalFlow_2_0(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); /** * Supported optical flow performance levels. diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaoptflow/OpticalFlowDual_TVL1.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaoptflow/OpticalFlowDual_TVL1.java index 06e3fa82318..4b499052f71 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaoptflow/OpticalFlowDual_TVL1.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaoptflow/OpticalFlowDual_TVL1.java @@ -59,6 +59,9 @@ public class OpticalFlowDual_TVL1 extends DenseOpticalFlow { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public OpticalFlowDual_TVL1(Pointer p) { super(p); } + /** Downcast constructor. */ + public OpticalFlowDual_TVL1(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); /** * Time step of the numerical scheme. diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaoptflow/SparseOpticalFlow.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaoptflow/SparseOpticalFlow.java index 0f9b8d0b3e7..ae4c558a511 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaoptflow/SparseOpticalFlow.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaoptflow/SparseOpticalFlow.java @@ -52,6 +52,11 @@ public class SparseOpticalFlow extends Algorithm { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public SparseOpticalFlow(Pointer p) { super(p); } + /** Downcast constructor. */ + public SparseOpticalFlow(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); + @Override public Algorithm asAlgorithm() { return asAlgorithm(this); } + @Namespace public static native @Name("static_cast") Algorithm asAlgorithm(SparseOpticalFlow pointer); /** \brief Calculates a sparse optical flow.

diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaoptflow/SparsePyrLKOpticalFlow.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaoptflow/SparsePyrLKOpticalFlow.java index 322b29644e6..2357f9c2e52 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaoptflow/SparsePyrLKOpticalFlow.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudaoptflow/SparsePyrLKOpticalFlow.java @@ -65,6 +65,9 @@ public class SparsePyrLKOpticalFlow extends SparseOpticalFlow { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public SparsePyrLKOpticalFlow(Pointer p) { super(p); } + /** Downcast constructor. */ + public SparsePyrLKOpticalFlow(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); public native @ByVal Size getWinSize(); public native void setWinSize(@ByVal Size winSize); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudastereo/DisparityBilateralFilter.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudastereo/DisparityBilateralFilter.java index d2977f79c0a..cc0251da0c5 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudastereo/DisparityBilateralFilter.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudastereo/DisparityBilateralFilter.java @@ -40,6 +40,11 @@ public class DisparityBilateralFilter extends Algorithm { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public DisparityBilateralFilter(Pointer p) { super(p); } + /** Downcast constructor. */ + public DisparityBilateralFilter(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); + @Override public Algorithm asAlgorithm() { return asAlgorithm(this); } + @Namespace public static native @Name("static_cast") Algorithm asAlgorithm(DisparityBilateralFilter pointer); /** \brief Refines a disparity map using joint bilateral filtering.

diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudastereo/StereoBM.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudastereo/StereoBM.java index e6f82e93c44..2c1f0eb92ac 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudastereo/StereoBM.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudastereo/StereoBM.java @@ -43,6 +43,9 @@ public class StereoBM extends org.bytedeco.opencv.opencv_calib3d.StereoBM { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public StereoBM(Pointer p) { super(p); } + /** Downcast constructor. */ + public StereoBM(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); public native void compute(@ByVal Mat left, @ByVal Mat right, @ByVal Mat disparity, @ByRef Stream stream); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudastereo/StereoBeliefPropagation.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudastereo/StereoBeliefPropagation.java index c52391663fc..60c7aa72086 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudastereo/StereoBeliefPropagation.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudastereo/StereoBeliefPropagation.java @@ -69,6 +69,9 @@ public class StereoBeliefPropagation extends StereoMatcher { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public StereoBeliefPropagation(Pointer p) { super(p); } + /** Downcast constructor. */ + public StereoBeliefPropagation(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); /** \overload */ diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudastereo/StereoConstantSpaceBP.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudastereo/StereoConstantSpaceBP.java index ba1447ccce3..90ae00e87d6 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudastereo/StereoConstantSpaceBP.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudastereo/StereoConstantSpaceBP.java @@ -59,6 +59,9 @@ public class StereoConstantSpaceBP extends StereoBeliefPropagation { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public StereoConstantSpaceBP(Pointer p) { super(p); } + /** Downcast constructor. */ + public StereoConstantSpaceBP(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); /** number of active disparity on the first level */ public native int getNrPlane(); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudastereo/StereoSGM.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudastereo/StereoSGM.java index f91b64146b8..f62611440d9 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudastereo/StereoSGM.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_cudastereo/StereoSGM.java @@ -47,6 +47,9 @@ public class StereoSGM extends StereoSGBM { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public StereoSGM(Pointer p) { super(p); } + /** Downcast constructor. */ + public StereoSGM(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); /** \brief Computes disparity map for the specified stereo pair

diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/Layer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/Layer.java index 58e71156a65..32a20503dca 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/Layer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_dnn/Layer.java @@ -36,6 +36,11 @@ public class Layer extends Algorithm { @Override public Layer getPointer(long i) { return new Layer((Pointer)this).offsetAddress(i); } + /** Downcast constructor. */ + public Layer(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); + @Override public Algorithm asAlgorithm() { return asAlgorithm(this); } + @Namespace public static native @Name("static_cast") Algorithm asAlgorithm(Layer pointer); /** List of learned parameters must be stored here to allow read them by using Net::getParam(). */ diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_face/BasicFaceRecognizer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_face/BasicFaceRecognizer.java index 5faeaadac2b..7ff37ecaee5 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_face/BasicFaceRecognizer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_face/BasicFaceRecognizer.java @@ -45,7 +45,7 @@ public class BasicFaceRecognizer extends FaceRecognizer { public BasicFaceRecognizer(Pointer p) { super(p); } /** Downcast constructor. */ public BasicFaceRecognizer(Algorithm pointer) { super((Pointer)null); allocate(pointer); } - @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); /** @see setNumComponents */ public native int getNumComponents(); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_face/EigenFaceRecognizer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_face/EigenFaceRecognizer.java index 158e0bb8169..70ca716bae0 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_face/EigenFaceRecognizer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_face/EigenFaceRecognizer.java @@ -41,7 +41,7 @@ public class EigenFaceRecognizer extends BasicFaceRecognizer { public EigenFaceRecognizer(Pointer p) { super(p); } /** Downcast constructor. */ public EigenFaceRecognizer(Algorithm pointer) { super((Pointer)null); allocate(pointer); } - @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); /** @param num_components The number of components (read: Eigenfaces) kept for this Principal diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_face/FaceRecognizer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_face/FaceRecognizer.java index 0f7b8d4e8f6..691ca23cd9b 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_face/FaceRecognizer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_face/FaceRecognizer.java @@ -142,7 +142,9 @@ public class FaceRecognizer extends Algorithm { public FaceRecognizer(Pointer p) { super(p); } /** Downcast constructor. */ public FaceRecognizer(Algorithm pointer) { super((Pointer)null); allocate(pointer); } - @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); + @Override public Algorithm asAlgorithm() { return asAlgorithm(this); } + @Namespace public static native @Name("static_cast") Algorithm asAlgorithm(FaceRecognizer pointer); /** \brief Trains a FaceRecognizer with given data and associated labels.

diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_face/Facemark.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_face/Facemark.java index 2ca9d9f2a33..cdd1de5b5b2 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_face/Facemark.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_face/Facemark.java @@ -61,7 +61,7 @@ public class Facemark extends Algorithm { /** Downcast constructor. */ public Facemark(Algorithm pointer) { super((Pointer)null); allocate(pointer); } @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); - public Algorithm asAlgorithm() { return asAlgorithm(this); } + @Override public Algorithm asAlgorithm() { return asAlgorithm(this); } @Namespace public static native @Name("static_cast") Algorithm asAlgorithm(Facemark pointer); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_face/FisherFaceRecognizer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_face/FisherFaceRecognizer.java index 9602ae825cd..b8d3ddbd711 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_face/FisherFaceRecognizer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_face/FisherFaceRecognizer.java @@ -41,7 +41,7 @@ public class FisherFaceRecognizer extends BasicFaceRecognizer { public FisherFaceRecognizer(Pointer p) { super(p); } /** Downcast constructor. */ public FisherFaceRecognizer(Algorithm pointer) { super((Pointer)null); allocate(pointer); } - @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); /** @param num_components The number of components (read: Fisherfaces) kept for this Linear diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_face/LBPHFaceRecognizer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_face/LBPHFaceRecognizer.java index b89f2f3a05f..97fd1c66369 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_face/LBPHFaceRecognizer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_face/LBPHFaceRecognizer.java @@ -42,7 +42,7 @@ public class LBPHFaceRecognizer extends FaceRecognizer { public LBPHFaceRecognizer(Pointer p) { super(p); } /** Downcast constructor. */ public LBPHFaceRecognizer(Algorithm pointer) { super((Pointer)null); allocate(pointer); } - @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); /** @see setGridX */ public native int getGridX(); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/AKAZE.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/AKAZE.java index bca793f50bf..617b3cacd48 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/AKAZE.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/AKAZE.java @@ -45,6 +45,9 @@ public class AKAZE extends Feature2D { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public AKAZE(Pointer p) { super(p); } + /** Downcast constructor. */ + public AKAZE(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); // AKAZE descriptor type /** enum cv::AKAZE::DescriptorType */ diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/Accumulator.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/Accumulator.java deleted file mode 100644 index 34e93e3eff3..00000000000 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/Accumulator.java +++ /dev/null @@ -1,50 +0,0 @@ -// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE - -package org.bytedeco.opencv.opencv_features2d; - -import java.nio.*; -import org.bytedeco.javacpp.*; -import org.bytedeco.javacpp.annotation.*; - -import static org.bytedeco.javacpp.presets.javacpp.*; -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.opencv.opencv_flann.*; -import static org.bytedeco.opencv.global.opencv_flann.*; - -import static org.bytedeco.opencv.global.opencv_features2d.*; - - -/** \} features2d_main -

-/****************************************************************************************\ -* Distance * -\****************************************************************************************/ - -@Name("cv::Accumulator") @Properties(inherit = org.bytedeco.opencv.presets.opencv_features2d.class) -public class Accumulator extends Pointer { - static { Loader.load(); } - /** Default native constructor. */ - public Accumulator() { super((Pointer)null); allocate(); } - /** Native array allocator. Access with {@link Pointer#position(long)}. */ - public Accumulator(long size) { super((Pointer)null); allocateArray(size); } - /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ - public Accumulator(Pointer p) { super(p); } - private native void allocate(); - private native void allocateArray(long size); - @Override public Accumulator position(long position) { - return (Accumulator)super.position(position); - } - @Override public Accumulator getPointer(long i) { - return new Accumulator((Pointer)this).offsetAddress(i); - } - } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/AffineFeature.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/AffineFeature.java index f332c8d2224..8d8f1f41d7d 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/AffineFeature.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/AffineFeature.java @@ -33,6 +33,9 @@ public class AffineFeature extends Feature2D { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public AffineFeature(Pointer p) { super(p); } + /** Downcast constructor. */ + public AffineFeature(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); /** @param backend The detector/extractor you want to use as backend. diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/AgastFeatureDetector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/AgastFeatureDetector.java index 13db9de8208..c3f5807d559 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/AgastFeatureDetector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/AgastFeatureDetector.java @@ -36,6 +36,9 @@ public class AgastFeatureDetector extends Feature2D { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public AgastFeatureDetector(Pointer p) { super(p); } + /** Downcast constructor. */ + public AgastFeatureDetector(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); /** enum cv::AgastFeatureDetector::DetectorType */ public static final int diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/BFMatcher.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/BFMatcher.java index d62707ce75c..91f16babf93 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/BFMatcher.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/BFMatcher.java @@ -46,7 +46,7 @@ public class BFMatcher extends DescriptorMatcher { } /** Downcast constructor. */ public BFMatcher(Algorithm pointer) { super((Pointer)null); allocate(pointer); } - @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); /** \brief Brute-force matcher constructor (obsolete). Please use BFMatcher.create() * diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/BRISK.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/BRISK.java index 6337a1a74f7..bb06d4d4f48 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/BRISK.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/BRISK.java @@ -32,6 +32,9 @@ public class BRISK extends Feature2D { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public BRISK(Pointer p) { super(p); } + /** Downcast constructor. */ + public BRISK(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); /** \brief The BRISK constructor

diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/DescriptorMatcher.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/DescriptorMatcher.java index f974cba5ab5..d449eda1378 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/DescriptorMatcher.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/DescriptorMatcher.java @@ -43,7 +43,9 @@ public class DescriptorMatcher extends Algorithm { public DescriptorMatcher(Pointer p) { super(p); } /** Downcast constructor. */ public DescriptorMatcher(Algorithm pointer) { super((Pointer)null); allocate(pointer); } - @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); + @Override public Algorithm asAlgorithm() { return asAlgorithm(this); } + @Namespace public static native @Name("static_cast") Algorithm asAlgorithm(DescriptorMatcher pointer); /** enum cv::DescriptorMatcher::MatcherType */ public static final int diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/FastFeatureDetector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/FastFeatureDetector.java index 9eca1fbefa8..a4b15ee41db 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/FastFeatureDetector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/FastFeatureDetector.java @@ -36,6 +36,9 @@ public class FastFeatureDetector extends Feature2D { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public FastFeatureDetector(Pointer p) { super(p); } + /** Downcast constructor. */ + public FastFeatureDetector(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); /** enum cv::FastFeatureDetector::DetectorType */ public static final int diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/Feature2D.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/Feature2D.java index 9529a3e9adf..8ddefcb37f4 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/Feature2D.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/Feature2D.java @@ -51,7 +51,7 @@ public class Feature2D extends Algorithm { /** Downcast constructor. */ public Feature2D(Algorithm pointer) { super((Pointer)null); allocate(pointer); } @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); - public Algorithm asAlgorithm() { return asAlgorithm(this); } + @Override public Algorithm asAlgorithm() { return asAlgorithm(this); } @Namespace public static native @Name("static_cast") Algorithm asAlgorithm(Feature2D pointer); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/FlannBasedMatcher.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/FlannBasedMatcher.java index 820eb6c0f8f..a57bed0d4cc 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/FlannBasedMatcher.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/FlannBasedMatcher.java @@ -49,7 +49,7 @@ public class FlannBasedMatcher extends DescriptorMatcher { } /** Downcast constructor. */ public FlannBasedMatcher(Algorithm pointer) { super((Pointer)null); allocate(pointer); } - @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); public FlannBasedMatcher( @Ptr IndexParams indexParams/*=makePtr()*/, @Ptr SearchParams searchParams/*=makePtr()*/ ) { super((Pointer)null); allocate(indexParams, searchParams); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/GFTTDetector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/GFTTDetector.java index b29561b257e..4700b34d9ac 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/GFTTDetector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/GFTTDetector.java @@ -31,6 +31,9 @@ public class GFTTDetector extends Feature2D { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public GFTTDetector(Pointer p) { super(p); } + /** Downcast constructor. */ + public GFTTDetector(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); public static native @Ptr GFTTDetector create( int maxCorners/*=1000*/, double qualityLevel/*=0.01*/, double minDistance/*=1*/, int blockSize/*=3*/, @Cast("bool") boolean useHarrisDetector/*=false*/, double k/*=0.04*/ ); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/KAZE.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/KAZE.java index 3b0c1246978..657e31f528a 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/KAZE.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/KAZE.java @@ -40,6 +40,9 @@ public class KAZE extends Feature2D { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public KAZE(Pointer p) { super(p); } + /** Downcast constructor. */ + public KAZE(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); /** enum cv::KAZE::DiffusivityType */ public static final int diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/MSER.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/MSER.java index 76e58c7ff1e..9638fce5a65 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/MSER.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/MSER.java @@ -44,6 +44,9 @@ public class MSER extends Feature2D { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public MSER(Pointer p) { super(p); } + /** Downcast constructor. */ + public MSER(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); /** \brief Full constructor for %MSER detector

diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/ORB.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/ORB.java index 439dc952d15..30eb9721c64 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/ORB.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/ORB.java @@ -36,6 +36,9 @@ public class ORB extends Feature2D { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public ORB(Pointer p) { super(p); } + /** Downcast constructor. */ + public ORB(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); /** enum cv::ORB::ScoreType */ public static final int HARRIS_SCORE = 0, FAST_SCORE = 1; diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/SIFT.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/SIFT.java index 33b77b20896..84b1b20a2db 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/SIFT.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/SIFT.java @@ -33,6 +33,9 @@ public class SIFT extends Feature2D { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public SIFT(Pointer p) { super(p); } + /** Downcast constructor. */ + public SIFT(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); /** @param nfeatures The number of best features to retain. The features are ranked by their scores diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/SimpleBlobDetector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/SimpleBlobDetector.java index 04e0d1c6242..bd0832e96fe 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/SimpleBlobDetector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_features2d/SimpleBlobDetector.java @@ -60,6 +60,9 @@ public class SimpleBlobDetector extends Feature2D { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public SimpleBlobDetector(Pointer p) { super(p); } + /** Downcast constructor. */ + public SimpleBlobDetector(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); @NoOffset public static class Params extends Pointer { static { Loader.load(); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_img_hash/AverageHash.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_img_hash/AverageHash.java index dbcd60548ff..0f33febccd9 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_img_hash/AverageHash.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_img_hash/AverageHash.java @@ -30,6 +30,9 @@ public class AverageHash extends ImgHashBase { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public AverageHash(Pointer p) { super(p); } + /** Downcast constructor. */ + public AverageHash(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); public static native @Ptr AverageHash create(); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_img_hash/BlockMeanHash.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_img_hash/BlockMeanHash.java index ee5a6ec80c1..c85068b55e9 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_img_hash/BlockMeanHash.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_img_hash/BlockMeanHash.java @@ -26,6 +26,9 @@ public class BlockMeanHash extends ImgHashBase { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public BlockMeanHash(Pointer p) { super(p); } + /** Downcast constructor. */ + public BlockMeanHash(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); /** \brief Create BlockMeanHash object @param mode the mode diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_img_hash/ColorMomentHash.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_img_hash/ColorMomentHash.java index 38306914e29..f0a79885f2a 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_img_hash/ColorMomentHash.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_img_hash/ColorMomentHash.java @@ -29,6 +29,9 @@ public class ColorMomentHash extends ImgHashBase { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public ColorMomentHash(Pointer p) { super(p); } + /** Downcast constructor. */ + public ColorMomentHash(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); public static native @Ptr ColorMomentHash create(); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_img_hash/ImgHashBase.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_img_hash/ImgHashBase.java index a1384740d01..0fbbdabd53b 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_img_hash/ImgHashBase.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_img_hash/ImgHashBase.java @@ -27,6 +27,11 @@ public class ImgHashBase extends Algorithm { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public ImgHashBase(Pointer p) { super(p); } + /** Downcast constructor. */ + public ImgHashBase(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); + @Override public Algorithm asAlgorithm() { return asAlgorithm(this); } + @Namespace public static native @Name("static_cast") Algorithm asAlgorithm(ImgHashBase pointer); @Opaque public static class ImgHashImpl extends Pointer { /** Empty constructor. Calls {@code super((Pointer)null)}. */ diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_img_hash/MarrHildrethHash.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_img_hash/MarrHildrethHash.java index 9bb84ad91dd..8ba43357626 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_img_hash/MarrHildrethHash.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_img_hash/MarrHildrethHash.java @@ -29,6 +29,9 @@ public class MarrHildrethHash extends ImgHashBase { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public MarrHildrethHash(Pointer p) { super(p); } + /** Downcast constructor. */ + public MarrHildrethHash(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); /** * \brief self explain diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_img_hash/PHash.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_img_hash/PHash.java index 00ec33d0cd9..deea77c2591 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_img_hash/PHash.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_img_hash/PHash.java @@ -31,6 +31,9 @@ public class PHash extends ImgHashBase { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public PHash(Pointer p) { super(p); } + /** Downcast constructor. */ + public PHash(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); public static native @Ptr PHash create(); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_img_hash/RadialVarianceHash.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_img_hash/RadialVarianceHash.java index 3589f80ec1d..fccc0812268 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_img_hash/RadialVarianceHash.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_img_hash/RadialVarianceHash.java @@ -30,6 +30,9 @@ public class RadialVarianceHash extends ImgHashBase { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public RadialVarianceHash(Pointer p) { super(p); } + /** Downcast constructor. */ + public RadialVarianceHash(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); public static native @Ptr RadialVarianceHash create(double sigma/*=1*/, int numOfAngleLine/*=180*/); public static native @Ptr RadialVarianceHash create(); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/CLAHE.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/CLAHE.java index b0ede50133e..5dd48cab54f 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/CLAHE.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/CLAHE.java @@ -27,6 +27,11 @@ public class CLAHE extends Algorithm { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public CLAHE(Pointer p) { super(p); } + /** Downcast constructor. */ + public CLAHE(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); + @Override public Algorithm asAlgorithm() { return asAlgorithm(this); } + @Namespace public static native @Name("static_cast") Algorithm asAlgorithm(CLAHE pointer); /** \brief Equalizes the histogram of a grayscale image using Contrast Limited Adaptive Histogram Equalization.

diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/GeneralizedHough.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/GeneralizedHough.java index 323e5659a66..e1c877bdb9f 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/GeneralizedHough.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/GeneralizedHough.java @@ -22,6 +22,11 @@ public class GeneralizedHough extends Algorithm { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public GeneralizedHough(Pointer p) { super(p); } + /** Downcast constructor. */ + public GeneralizedHough(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); + @Override public Algorithm asAlgorithm() { return asAlgorithm(this); } + @Namespace public static native @Name("static_cast") Algorithm asAlgorithm(GeneralizedHough pointer); /** set template to search */ public native void setTemplate(@ByVal Mat templ, @ByVal(nullValue = "cv::Point(-1, -1)") Point templCenter); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/GeneralizedHoughBallard.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/GeneralizedHoughBallard.java index be0f5b9f4b2..f2967b1dee5 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/GeneralizedHoughBallard.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/GeneralizedHoughBallard.java @@ -24,6 +24,9 @@ public class GeneralizedHoughBallard extends GeneralizedHough { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public GeneralizedHoughBallard(Pointer p) { super(p); } + /** Downcast constructor. */ + public GeneralizedHoughBallard(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); /** R-Table levels. */ public native void setLevels(int levels); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/GeneralizedHoughGuil.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/GeneralizedHoughGuil.java index 30095ed7d13..7f7d89687ce 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/GeneralizedHoughGuil.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/GeneralizedHoughGuil.java @@ -24,6 +24,9 @@ public class GeneralizedHoughGuil extends GeneralizedHough { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public GeneralizedHoughGuil(Pointer p) { super(p); } + /** Downcast constructor. */ + public GeneralizedHoughGuil(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); /** Angle difference in degrees between two points in feature. */ public native void setXi(double xi); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/LineSegmentDetector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/LineSegmentDetector.java index 98fb5d055c3..41c8d16d248 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/LineSegmentDetector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_imgproc/LineSegmentDetector.java @@ -37,6 +37,11 @@ public class LineSegmentDetector extends Algorithm { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public LineSegmentDetector(Pointer p) { super(p); } + /** Downcast constructor. */ + public LineSegmentDetector(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); + @Override public Algorithm asAlgorithm() { return asAlgorithm(this); } + @Namespace public static native @Name("static_cast") Algorithm asAlgorithm(LineSegmentDetector pointer); /** \brief Finds lines in the input image. diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_mcc/CCheckerDetector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_mcc/CCheckerDetector.java index b67df3c51d0..369989463db 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_mcc/CCheckerDetector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_mcc/CCheckerDetector.java @@ -41,7 +41,9 @@ public class CCheckerDetector extends Algorithm { public CCheckerDetector(Pointer p) { super(p); } /** Downcast constructor. */ public CCheckerDetector(Algorithm pointer) { super((Pointer)null); allocate(pointer); } - @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); + @Override public Algorithm asAlgorithm() { return asAlgorithm(this); } + @Namespace public static native @Name("static_cast") Algorithm asAlgorithm(CCheckerDetector pointer); /** \brief Set the net which will be used to find the approximate * bounding boxes for the color charts. diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ml/ANN_MLP.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ml/ANN_MLP.java index cda24bdacc1..75814e331d0 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ml/ANN_MLP.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ml/ANN_MLP.java @@ -67,6 +67,9 @@ public class ANN_MLP extends StatModel { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public ANN_MLP(Pointer p) { super(p); } + /** Downcast constructor. */ + public ANN_MLP(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); /** Available training methods */ /** enum cv::ml::ANN_MLP::TrainingMethods */ diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ml/Boost.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ml/Boost.java index a13b29af6af..92a7c52e559 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ml/Boost.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ml/Boost.java @@ -28,6 +28,9 @@ public class Boost extends DTrees { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public Boost(Pointer p) { super(p); } + /** Downcast constructor. */ + public Boost(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); /** Type of the boosting algorithm. See Boost::Types. Default value is Boost::REAL. */ diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ml/DTrees.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ml/DTrees.java index 224683ed1b1..d5761d719fd 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ml/DTrees.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ml/DTrees.java @@ -33,6 +33,9 @@ public class DTrees extends StatModel { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public DTrees(Pointer p) { super(p); } + /** Downcast constructor. */ + public DTrees(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); /** Predict options */ /** enum cv::ml::DTrees::Flags */ diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ml/EM.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ml/EM.java index a35a4d4719f..fa000a6aabe 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ml/EM.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ml/EM.java @@ -28,6 +28,9 @@ public class EM extends StatModel { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public EM(Pointer p) { super(p); } + /** Downcast constructor. */ + public EM(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); /** Type of covariation matrices */ /** enum cv::ml::EM::Types */ diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ml/KNearest.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ml/KNearest.java index 019e33f81d8..29b60d94209 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ml/KNearest.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ml/KNearest.java @@ -28,6 +28,9 @@ public class KNearest extends StatModel { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public KNearest(Pointer p) { super(p); } + /** Downcast constructor. */ + public KNearest(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); /** Default number of neighbors to use in predict method. */ diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ml/LogisticRegression.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ml/LogisticRegression.java index 04d2440ff4e..1c83c8ed7d0 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ml/LogisticRegression.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ml/LogisticRegression.java @@ -29,6 +29,9 @@ public class LogisticRegression extends StatModel { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public LogisticRegression(Pointer p) { super(p); } + /** Downcast constructor. */ + public LogisticRegression(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); /** Learning rate. */ diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ml/NormalBayesClassifier.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ml/NormalBayesClassifier.java index 9820abbbb30..500fc0f083d 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ml/NormalBayesClassifier.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ml/NormalBayesClassifier.java @@ -28,6 +28,9 @@ public class NormalBayesClassifier extends StatModel { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public NormalBayesClassifier(Pointer p) { super(p); } + /** Downcast constructor. */ + public NormalBayesClassifier(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); /** \brief Predicts the response for sample(s).

diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ml/RTrees.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ml/RTrees.java index 98450397c41..1b0882f73bc 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ml/RTrees.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ml/RTrees.java @@ -28,6 +28,9 @@ public class RTrees extends DTrees { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public RTrees(Pointer p) { super(p); } + /** Downcast constructor. */ + public RTrees(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); /** If true then variable importance will be calculated and then it can be retrieved by RTrees::getVarImportance. diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ml/SVM.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ml/SVM.java index 3e2b6a2feb3..7952b2e50ca 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ml/SVM.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ml/SVM.java @@ -28,12 +28,20 @@ public class SVM extends StatModel { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public SVM(Pointer p) { super(p); } + /** Downcast constructor. */ + public SVM(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); public static class Kernel extends Algorithm { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public Kernel(Pointer p) { super(p); } + /** Downcast constructor. */ + public Kernel(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); + @Override public Algorithm asAlgorithm() { return asAlgorithm(this); } + @Namespace public static native @Name("static_cast") Algorithm asAlgorithm(SVM.Kernel pointer); public native int getType(); public native void calc( int vcount, int n, @Const FloatPointer vecs, @Const FloatPointer another, FloatPointer results ); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ml/SVMSGD.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ml/SVMSGD.java index 149957b7642..b08557fd3d5 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ml/SVMSGD.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ml/SVMSGD.java @@ -98,6 +98,9 @@ public class SVMSGD extends StatModel { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public SVMSGD(Pointer p) { super(p); } + /** Downcast constructor. */ + public SVMSGD(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); /** SVMSGD type. diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ml/StatModel.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ml/StatModel.java index f86deaf6563..2b4e0f90354 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ml/StatModel.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ml/StatModel.java @@ -22,6 +22,11 @@ public class StatModel extends AbstractStatModel { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public StatModel(Pointer p) { super(p); } + /** Downcast constructor. */ + public StatModel(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); + @Override public Algorithm asAlgorithm() { return asAlgorithm(this); } + @Namespace public static native @Name("static_cast") Algorithm asAlgorithm(StatModel pointer); /** Predict options */ /** enum cv::ml::StatModel::Flags */ diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_objdetect/ArucoDetector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_objdetect/ArucoDetector.java index 0a60e452e9d..075106903a3 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_objdetect/ArucoDetector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_objdetect/ArucoDetector.java @@ -53,7 +53,9 @@ public class ArucoDetector extends Algorithm { } /** Downcast constructor. */ public ArucoDetector(Algorithm pointer) { super((Pointer)null); allocate(pointer); } - @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); + @Override public Algorithm asAlgorithm() { return asAlgorithm(this); } + @Namespace public static native @Name("static_cast") Algorithm asAlgorithm(ArucoDetector pointer); /** \brief Basic ArucoDetector constructor * diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_objdetect/BaseCascadeClassifier.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_objdetect/BaseCascadeClassifier.java index 07f24a9fe60..df52471e0db 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_objdetect/BaseCascadeClassifier.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_objdetect/BaseCascadeClassifier.java @@ -37,7 +37,9 @@ public class BaseCascadeClassifier extends Algorithm { public BaseCascadeClassifier(Pointer p) { super(p); } /** Downcast constructor. */ public BaseCascadeClassifier(Algorithm pointer) { super((Pointer)null); allocate(pointer); } - @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); + @Override public Algorithm asAlgorithm() { return asAlgorithm(this); } + @Namespace public static native @Name("static_cast") Algorithm asAlgorithm(BaseCascadeClassifier pointer); public native @Cast("bool") @Override boolean empty(); public native @Cast("bool") boolean load( @Str BytePointer filename ); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_objdetect/CharucoDetector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_objdetect/CharucoDetector.java index 18da50e32d6..6e409eaf462 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_objdetect/CharucoDetector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_objdetect/CharucoDetector.java @@ -37,7 +37,9 @@ public class CharucoDetector extends Algorithm { public CharucoDetector(Pointer p) { super(p); } /** Downcast constructor. */ public CharucoDetector(Algorithm pointer) { super((Pointer)null); allocate(pointer); } - @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); + @Override public Algorithm asAlgorithm() { return asAlgorithm(this); } + @Namespace public static native @Name("static_cast") Algorithm asAlgorithm(CharucoDetector pointer); /** \brief Basic CharucoDetector constructor * diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_optflow/DualTVL1OpticalFlow.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_optflow/DualTVL1OpticalFlow.java index d4371574a76..9b7d6da456c 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_optflow/DualTVL1OpticalFlow.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_optflow/DualTVL1OpticalFlow.java @@ -83,7 +83,7 @@ public class DualTVL1OpticalFlow extends DenseOpticalFlow { public DualTVL1OpticalFlow(Pointer p) { super(p); } /** Downcast constructor. */ public DualTVL1OpticalFlow(Algorithm pointer) { super((Pointer)null); allocate(pointer); } - @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); /** \brief Time step of the numerical scheme /** @see setTau */ diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_phase_unwrapping/HistogramPhaseUnwrapping.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_phase_unwrapping/HistogramPhaseUnwrapping.java index b2fa5c72e4c..62a9ffdd548 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_phase_unwrapping/HistogramPhaseUnwrapping.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_phase_unwrapping/HistogramPhaseUnwrapping.java @@ -35,6 +35,9 @@ public class HistogramPhaseUnwrapping extends PhaseUnwrapping { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public HistogramPhaseUnwrapping(Pointer p) { super(p); } + /** Downcast constructor. */ + public HistogramPhaseUnwrapping(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); /** * \brief Parameters of phaseUnwrapping constructor. diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_phase_unwrapping/PhaseUnwrapping.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_phase_unwrapping/PhaseUnwrapping.java index 816525a706d..badd6ae2452 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_phase_unwrapping/PhaseUnwrapping.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_phase_unwrapping/PhaseUnwrapping.java @@ -30,7 +30,7 @@ public class PhaseUnwrapping extends Algorithm { /** Downcast constructor. */ public PhaseUnwrapping(Algorithm pointer) { super((Pointer)null); allocate(pointer); } @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); - public Algorithm asAlgorithm() { return asAlgorithm(this); } + @Override public Algorithm asAlgorithm() { return asAlgorithm(this); } @Namespace public static native @Name("static_cast") Algorithm asAlgorithm(PhaseUnwrapping pointer); /** diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_photo/AlignExposures.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_photo/AlignExposures.java index 4616163af9e..aab9e317e49 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_photo/AlignExposures.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_photo/AlignExposures.java @@ -24,6 +24,11 @@ public class AlignExposures extends Algorithm { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public AlignExposures(Pointer p) { super(p); } + /** Downcast constructor. */ + public AlignExposures(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); + @Override public Algorithm asAlgorithm() { return asAlgorithm(this); } + @Namespace public static native @Name("static_cast") Algorithm asAlgorithm(AlignExposures pointer); /** \brief Aligns images

diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_photo/AlignMTB.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_photo/AlignMTB.java index 2e1782d48ef..2228fff7e43 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_photo/AlignMTB.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_photo/AlignMTB.java @@ -31,6 +31,9 @@ public class AlignMTB extends AlignExposures { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public AlignMTB(Pointer p) { super(p); } + /** Downcast constructor. */ + public AlignMTB(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); public native @Override void process(@ByVal MatVector src, @ByRef MatVector dst, @ByVal Mat times, @ByVal Mat response); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_photo/CalibrateCRF.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_photo/CalibrateCRF.java index 2e407f40146..50820bcf915 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_photo/CalibrateCRF.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_photo/CalibrateCRF.java @@ -24,6 +24,11 @@ public class CalibrateCRF extends Algorithm { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public CalibrateCRF(Pointer p) { super(p); } + /** Downcast constructor. */ + public CalibrateCRF(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); + @Override public Algorithm asAlgorithm() { return asAlgorithm(this); } + @Namespace public static native @Name("static_cast") Algorithm asAlgorithm(CalibrateCRF pointer); /** \brief Recovers inverse camera response.

diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_photo/CalibrateDebevec.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_photo/CalibrateDebevec.java index 8dd4ba57214..49a9caae3ee 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_photo/CalibrateDebevec.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_photo/CalibrateDebevec.java @@ -28,6 +28,9 @@ public class CalibrateDebevec extends CalibrateCRF { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public CalibrateDebevec(Pointer p) { super(p); } + /** Downcast constructor. */ + public CalibrateDebevec(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); public native float getLambda(); public native void setLambda(float lambda); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_photo/CalibrateRobertson.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_photo/CalibrateRobertson.java index 1e748e86479..d7beb188ab0 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_photo/CalibrateRobertson.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_photo/CalibrateRobertson.java @@ -27,6 +27,9 @@ public class CalibrateRobertson extends CalibrateCRF { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public CalibrateRobertson(Pointer p) { super(p); } + /** Downcast constructor. */ + public CalibrateRobertson(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); public native int getMaxIter(); public native void setMaxIter(int max_iter); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_photo/MergeDebevec.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_photo/MergeDebevec.java index fa75321844c..8001936cbb3 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_photo/MergeDebevec.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_photo/MergeDebevec.java @@ -27,6 +27,9 @@ public class MergeDebevec extends MergeExposures { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public MergeDebevec(Pointer p) { super(p); } + /** Downcast constructor. */ + public MergeDebevec(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); public native @Override void process(@ByVal MatVector src, @ByVal Mat dst, @ByVal Mat times, @ByVal Mat response); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_photo/MergeExposures.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_photo/MergeExposures.java index eea4fd78b57..b109d80d023 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_photo/MergeExposures.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_photo/MergeExposures.java @@ -24,6 +24,11 @@ public class MergeExposures extends Algorithm { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public MergeExposures(Pointer p) { super(p); } + /** Downcast constructor. */ + public MergeExposures(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); + @Override public Algorithm asAlgorithm() { return asAlgorithm(this); } + @Namespace public static native @Name("static_cast") Algorithm asAlgorithm(MergeExposures pointer); /** \brief Merges images.

diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_photo/MergeMertens.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_photo/MergeMertens.java index e26fc28a96a..1e14db8288c 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_photo/MergeMertens.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_photo/MergeMertens.java @@ -33,6 +33,9 @@ public class MergeMertens extends MergeExposures { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public MergeMertens(Pointer p) { super(p); } + /** Downcast constructor. */ + public MergeMertens(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); public native @Override void process(@ByVal MatVector src, @ByVal Mat dst, @ByVal Mat times, @ByVal Mat response); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_photo/MergeRobertson.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_photo/MergeRobertson.java index 3663a26f835..75860d7f272 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_photo/MergeRobertson.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_photo/MergeRobertson.java @@ -27,6 +27,9 @@ public class MergeRobertson extends MergeExposures { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public MergeRobertson(Pointer p) { super(p); } + /** Downcast constructor. */ + public MergeRobertson(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); public native @Override void process(@ByVal MatVector src, @ByVal Mat dst, @ByVal Mat times, @ByVal Mat response); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_photo/Tonemap.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_photo/Tonemap.java index 3ab543dadc9..c14fa1b0f7c 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_photo/Tonemap.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_photo/Tonemap.java @@ -24,6 +24,11 @@ public class Tonemap extends Algorithm { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public Tonemap(Pointer p) { super(p); } + /** Downcast constructor. */ + public Tonemap(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); + @Override public Algorithm asAlgorithm() { return asAlgorithm(this); } + @Namespace public static native @Name("static_cast") Algorithm asAlgorithm(Tonemap pointer); /** \brief Tonemaps image

diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_photo/TonemapDrago.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_photo/TonemapDrago.java index 82ffa39e7dc..19b45ede9fd 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_photo/TonemapDrago.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_photo/TonemapDrago.java @@ -32,6 +32,9 @@ public class TonemapDrago extends Tonemap { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public TonemapDrago(Pointer p) { super(p); } + /** Downcast constructor. */ + public TonemapDrago(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); public native float getSaturation(); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_photo/TonemapMantiuk.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_photo/TonemapMantiuk.java index 080a93e4dfc..1abcd5f4629 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_photo/TonemapMantiuk.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_photo/TonemapMantiuk.java @@ -28,6 +28,9 @@ public class TonemapMantiuk extends Tonemap { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public TonemapMantiuk(Pointer p) { super(p); } + /** Downcast constructor. */ + public TonemapMantiuk(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); public native float getScale(); public native void setScale(float scale); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_photo/TonemapReinhard.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_photo/TonemapReinhard.java index 76e918d6105..2c4f640097c 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_photo/TonemapReinhard.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_photo/TonemapReinhard.java @@ -30,6 +30,9 @@ public class TonemapReinhard extends Tonemap { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public TonemapReinhard(Pointer p) { super(p); } + /** Downcast constructor. */ + public TonemapReinhard(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); public native float getIntensity(); public native void setIntensity(float intensity); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_plot/Plot2d.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_plot/Plot2d.java index 01b8e360696..7cd0d1e00b3 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_plot/Plot2d.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_plot/Plot2d.java @@ -24,6 +24,11 @@ public class Plot2d extends Algorithm { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public Plot2d(Pointer p) { super(p); } + /** Downcast constructor. */ + public Plot2d(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); + @Override public Algorithm asAlgorithm() { return asAlgorithm(this); } + @Namespace public static native @Name("static_cast") Algorithm asAlgorithm(Plot2d pointer); public native void setMinX(double _plotMinX); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_quality/QualityBRISQUE.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_quality/QualityBRISQUE.java index baa7c368f7e..4d4aa009789 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_quality/QualityBRISQUE.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_quality/QualityBRISQUE.java @@ -34,6 +34,9 @@ public class QualityBRISQUE extends QualityBase { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public QualityBRISQUE(Pointer p) { super(p); } + /** Downcast constructor. */ + public QualityBRISQUE(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); /** \brief Computes BRISQUE quality score for input image diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_quality/QualityBase.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_quality/QualityBase.java index 72009421a45..d0eb51f3aff 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_quality/QualityBase.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_quality/QualityBase.java @@ -31,7 +31,7 @@ public class QualityBase extends Algorithm { /** Downcast constructor. */ public QualityBase(Algorithm pointer) { super((Pointer)null); allocate(pointer); } @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); - public Algorithm asAlgorithm() { return asAlgorithm(this); } + @Override public Algorithm asAlgorithm() { return asAlgorithm(this); } @Namespace public static native @Name("static_cast") Algorithm asAlgorithm(QualityBase pointer); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_quality/QualityGMSD.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_quality/QualityGMSD.java index 9116b52f649..0440a8f9833 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_quality/QualityGMSD.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_quality/QualityGMSD.java @@ -28,6 +28,9 @@ public class QualityGMSD extends QualityBase { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public QualityGMSD(Pointer p) { super(p); } + /** Downcast constructor. */ + public QualityGMSD(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); /** diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_quality/QualityMSE.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_quality/QualityMSE.java index 7cefd442b85..4ec7ef66277 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_quality/QualityMSE.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_quality/QualityMSE.java @@ -27,6 +27,9 @@ public class QualityMSE extends QualityBase { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public QualityMSE(Pointer p) { super(p); } + /** Downcast constructor. */ + public QualityMSE(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); /** \brief Computes MSE for reference images supplied in class constructor and provided comparison images diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_quality/QualityPSNR.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_quality/QualityPSNR.java index aaaa2a7574b..58b58c64235 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_quality/QualityPSNR.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_quality/QualityPSNR.java @@ -27,6 +27,9 @@ public class QualityPSNR extends QualityBase { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public QualityPSNR(Pointer p) { super(p); } + /** Downcast constructor. */ + public QualityPSNR(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); /** \brief Default maximum pixel value */ diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_quality/QualitySSIM.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_quality/QualitySSIM.java index 6a011d85b5f..61909cc7672 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_quality/QualitySSIM.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_quality/QualitySSIM.java @@ -27,6 +27,9 @@ public class QualitySSIM extends QualityBase { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public QualitySSIM(Pointer p) { super(p); } + /** Downcast constructor. */ + public QualitySSIM(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); /** diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_rapid/GOSTracker.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_rapid/GOSTracker.java index af501d91235..7522d495c05 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_rapid/GOSTracker.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_rapid/GOSTracker.java @@ -37,7 +37,7 @@ public class GOSTracker extends Tracker { public GOSTracker(Pointer p) { super(p); } /** Downcast constructor. */ public GOSTracker(Algorithm pointer) { super((Pointer)null); allocate(pointer); } - @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); public static native @Ptr OLSTracker create(@ByVal Mat pts3d, @ByVal Mat tris, int histBins/*=4*/, @Cast("uchar") byte sobelThesh/*=10*/); public static native @Ptr OLSTracker create(@ByVal Mat pts3d, @ByVal Mat tris); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_rapid/OLSTracker.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_rapid/OLSTracker.java index 8f8482b6c63..7085e72d8c5 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_rapid/OLSTracker.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_rapid/OLSTracker.java @@ -38,7 +38,7 @@ public class OLSTracker extends Tracker { public OLSTracker(Pointer p) { super(p); } /** Downcast constructor. */ public OLSTracker(Algorithm pointer) { super((Pointer)null); allocate(pointer); } - @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); public static native @Ptr OLSTracker create(@ByVal Mat pts3d, @ByVal Mat tris, int histBins/*=8*/, @Cast("uchar") byte sobelThesh/*=10*/); public static native @Ptr OLSTracker create(@ByVal Mat pts3d, @ByVal Mat tris); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_rapid/Rapid.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_rapid/Rapid.java index 2d6887a3109..9e9dec569ec 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_rapid/Rapid.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_rapid/Rapid.java @@ -36,7 +36,7 @@ public class Rapid extends Tracker { public Rapid(Pointer p) { super(p); } /** Downcast constructor. */ public Rapid(Algorithm pointer) { super((Pointer)null); allocate(pointer); } - @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); public static native @Ptr Rapid create(@ByVal Mat pts3d, @ByVal Mat tris); public static native @Ptr Rapid create(@ByVal UMat pts3d, @ByVal UMat tris); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_rapid/Tracker.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_rapid/Tracker.java index 0ff8e0ebab7..79ede30d83b 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_rapid/Tracker.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_rapid/Tracker.java @@ -36,7 +36,9 @@ public class Tracker extends Algorithm { public Tracker(Pointer p) { super(p); } /** Downcast constructor. */ public Tracker(Algorithm pointer) { super((Pointer)null); allocate(pointer); } - @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); + @Override public Algorithm asAlgorithm() { return asAlgorithm(this); } + @Namespace public static native @Name("static_cast") Algorithm asAlgorithm(Tracker pointer); public native float compute(@ByVal Mat img, int num, int len, @ByVal Mat K, @ByVal Mat rvec, @ByVal Mat tvec, @Const @ByRef(nullValue = "cv::TermCriteria(cv::TermCriteria::MAX_ITER | cv::TermCriteria::EPS, 5, 1.5)") TermCriteria termcrit); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_saliency/Saliency.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_saliency/Saliency.java index e8c8b6c36a5..b516a4ccdce 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_saliency/Saliency.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_saliency/Saliency.java @@ -39,7 +39,7 @@ public class Saliency extends Algorithm { /** Downcast constructor. */ public Saliency(Algorithm pointer) { super((Pointer)null); allocate(pointer); } @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); - public Algorithm asAlgorithm() { return asAlgorithm(this); } + @Override public Algorithm asAlgorithm() { return asAlgorithm(this); } @Namespace public static native @Name("static_cast") Algorithm asAlgorithm(Saliency pointer); /** diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_shape/AffineTransformer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_shape/AffineTransformer.java index 6556ec36dbb..b076ee45d76 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_shape/AffineTransformer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_shape/AffineTransformer.java @@ -40,7 +40,7 @@ public class AffineTransformer extends ShapeTransformer { public AffineTransformer(Pointer p) { super(p); } /** Downcast constructor. */ public AffineTransformer(Algorithm pointer) { super((Pointer)null); allocate(pointer); } - @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); public native void setFullAffine(@Cast("bool") boolean fullAffine); public native @Cast("bool") boolean getFullAffine(); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_shape/EMDHistogramCostExtractor.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_shape/EMDHistogramCostExtractor.java index d05ef9f2036..de0b5e9c768 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_shape/EMDHistogramCostExtractor.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_shape/EMDHistogramCostExtractor.java @@ -37,7 +37,7 @@ public class EMDHistogramCostExtractor extends HistogramCostExtractor { public EMDHistogramCostExtractor(Pointer p) { super(p); } /** Downcast constructor. */ public EMDHistogramCostExtractor(Algorithm pointer) { super((Pointer)null); allocate(pointer); } - @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); public native void setNormFlag(int flag); public native int getNormFlag(); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_shape/HausdorffDistanceExtractor.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_shape/HausdorffDistanceExtractor.java index 0c8a4e8604a..fff6586cf0d 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_shape/HausdorffDistanceExtractor.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_shape/HausdorffDistanceExtractor.java @@ -43,7 +43,7 @@ public class HausdorffDistanceExtractor extends ShapeDistanceExtractor { public HausdorffDistanceExtractor(Pointer p) { super(p); } /** Downcast constructor. */ public HausdorffDistanceExtractor(Algorithm pointer) { super((Pointer)null); allocate(pointer); } - @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); /** \brief Set the norm used to compute the Hausdorff value between two shapes. It can be L1 or L2 norm.

diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_shape/HistogramCostExtractor.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_shape/HistogramCostExtractor.java index fedfd16f4cd..028ca9c43b2 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_shape/HistogramCostExtractor.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_shape/HistogramCostExtractor.java @@ -40,7 +40,9 @@ public class HistogramCostExtractor extends Algorithm { public HistogramCostExtractor(Pointer p) { super(p); } /** Downcast constructor. */ public HistogramCostExtractor(Algorithm pointer) { super((Pointer)null); allocate(pointer); } - @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); + @Override public Algorithm asAlgorithm() { return asAlgorithm(this); } + @Namespace public static native @Name("static_cast") Algorithm asAlgorithm(HistogramCostExtractor pointer); public native void buildCostMatrix(@ByVal Mat descriptors1, @ByVal Mat descriptors2, @ByVal Mat costMatrix); public native void buildCostMatrix(@ByVal UMat descriptors1, @ByVal UMat descriptors2, @ByVal UMat costMatrix); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_shape/NormHistogramCostExtractor.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_shape/NormHistogramCostExtractor.java index fc58e36510b..b2fcf3c8456 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_shape/NormHistogramCostExtractor.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_shape/NormHistogramCostExtractor.java @@ -37,7 +37,7 @@ public class NormHistogramCostExtractor extends HistogramCostExtractor { public NormHistogramCostExtractor(Pointer p) { super(p); } /** Downcast constructor. */ public NormHistogramCostExtractor(Algorithm pointer) { super((Pointer)null); allocate(pointer); } - @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); public native void setNormFlag(int flag); public native int getNormFlag(); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_shape/ShapeContextDistanceExtractor.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_shape/ShapeContextDistanceExtractor.java index d3d26291ec5..e5c0c33f7e4 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_shape/ShapeContextDistanceExtractor.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_shape/ShapeContextDistanceExtractor.java @@ -44,7 +44,7 @@ public class ShapeContextDistanceExtractor extends ShapeDistanceExtractor { public ShapeContextDistanceExtractor(Pointer p) { super(p); } /** Downcast constructor. */ public ShapeContextDistanceExtractor(Algorithm pointer) { super((Pointer)null); allocate(pointer); } - @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); /** \brief Establish the number of angular bins for the Shape Context Descriptor used in the shape matching pipeline. diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_shape/ShapeDistanceExtractor.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_shape/ShapeDistanceExtractor.java index 99b10e25cfa..eddbdf02bf0 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_shape/ShapeDistanceExtractor.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_shape/ShapeDistanceExtractor.java @@ -43,7 +43,9 @@ public class ShapeDistanceExtractor extends Algorithm { public ShapeDistanceExtractor(Pointer p) { super(p); } /** Downcast constructor. */ public ShapeDistanceExtractor(Algorithm pointer) { super((Pointer)null); allocate(pointer); } - @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); + @Override public Algorithm asAlgorithm() { return asAlgorithm(this); } + @Namespace public static native @Name("static_cast") Algorithm asAlgorithm(ShapeDistanceExtractor pointer); /** \brief Compute the shape distance between two shapes defined by its contours.

diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_shape/ShapeTransformer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_shape/ShapeTransformer.java index 7831093ded2..70708c04d28 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_shape/ShapeTransformer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_shape/ShapeTransformer.java @@ -40,7 +40,9 @@ public class ShapeTransformer extends Algorithm { public ShapeTransformer(Pointer p) { super(p); } /** Downcast constructor. */ public ShapeTransformer(Algorithm pointer) { super((Pointer)null); allocate(pointer); } - @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); + @Override public Algorithm asAlgorithm() { return asAlgorithm(this); } + @Namespace public static native @Name("static_cast") Algorithm asAlgorithm(ShapeTransformer pointer); /** \brief Estimate the transformation parameters of the current transformer algorithm, based on point matches.

diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_shape/ThinPlateSplineShapeTransformer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_shape/ThinPlateSplineShapeTransformer.java index d47454ee088..93441bb1dae 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_shape/ThinPlateSplineShapeTransformer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_shape/ThinPlateSplineShapeTransformer.java @@ -43,7 +43,7 @@ public class ThinPlateSplineShapeTransformer extends ShapeTransformer { public ThinPlateSplineShapeTransformer(Pointer p) { super(p); } /** Downcast constructor. */ public ThinPlateSplineShapeTransformer(Algorithm pointer) { super((Pointer)null); allocate(pointer); } - @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); /** \brief Set the regularization parameter for relaxing the exact interpolation requirements of the TPS algorithm. diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_structured_light/StructuredLightPattern.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_structured_light/StructuredLightPattern.java index e5c9886d326..8d4ffbcaff3 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_structured_light/StructuredLightPattern.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_structured_light/StructuredLightPattern.java @@ -40,7 +40,7 @@ public class StructuredLightPattern extends Algorithm { /** Downcast constructor. */ public StructuredLightPattern(Algorithm pointer) { super((Pointer)null); allocate(pointer); } @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); - public Algorithm asAlgorithm() { return asAlgorithm(this); } + @Override public Algorithm asAlgorithm() { return asAlgorithm(this); } @Namespace public static native @Name("static_cast") Algorithm asAlgorithm(StructuredLightPattern pointer); /** \brief Generates the structured light pattern to project. diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_superres/DenseOpticalFlowExt.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_superres/DenseOpticalFlowExt.java index 6e17f5c63f9..6851eb0e0a9 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_superres/DenseOpticalFlowExt.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_superres/DenseOpticalFlowExt.java @@ -48,7 +48,9 @@ public class DenseOpticalFlowExt extends Algorithm { public DenseOpticalFlowExt(Pointer p) { super(p); } /** Downcast constructor. */ public DenseOpticalFlowExt(Algorithm pointer) { super((Pointer)null); allocate(pointer); } - @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); + @Override public Algorithm asAlgorithm() { return asAlgorithm(this); } + @Namespace public static native @Name("static_cast") Algorithm asAlgorithm(DenseOpticalFlowExt pointer); public native void calc(@ByVal Mat frame0, @ByVal Mat frame1, @ByVal Mat flow1, @ByVal(nullValue = "cv::OutputArray(cv::noArray())") Mat flow2); public native void calc(@ByVal Mat frame0, @ByVal Mat frame1, @ByVal Mat flow1); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_superres/SuperResolution.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_superres/SuperResolution.java index 4957c8192e8..2e4ab3fb79b 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_superres/SuperResolution.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_superres/SuperResolution.java @@ -50,9 +50,11 @@ public class SuperResolution extends Algorithm { public SuperResolution(Pointer p) { super(p); } /** Downcast constructor. */ public SuperResolution(Algorithm pointer) { super((Pointer)null); allocate(pointer); } - @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); public FrameSource asFrameSource() { return asFrameSource(this); } @Namespace public static native @Name("static_cast") FrameSource asFrameSource(SuperResolution pointer); + @Override public Algorithm asAlgorithm() { return asAlgorithm(this); } + @Namespace public static native @Name("static_cast") Algorithm asAlgorithm(SuperResolution pointer); /** \brief Set input frame source for Super Resolution algorithm.

diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_text/ERFilter.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_text/ERFilter.java index dcd9e6e297e..bf26ce75ae9 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_text/ERFilter.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_text/ERFilter.java @@ -42,7 +42,9 @@ public class ERFilter extends Algorithm { public ERFilter(Pointer p) { super(p); } /** Downcast constructor. */ public ERFilter(Algorithm pointer) { super((Pointer)null); allocate(pointer); } - @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); + @Override public Algorithm asAlgorithm() { return asAlgorithm(this); } + @Namespace public static native @Name("static_cast") Algorithm asAlgorithm(ERFilter pointer); /** \brief Callback with the classifier is made a class. diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_video/BackgroundSubtractor.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_video/BackgroundSubtractor.java index 33e76597d04..77c7669091a 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_video/BackgroundSubtractor.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_video/BackgroundSubtractor.java @@ -45,7 +45,9 @@ public class BackgroundSubtractor extends Algorithm { public BackgroundSubtractor(Pointer p) { super(p); } /** Downcast constructor. */ public BackgroundSubtractor(Algorithm pointer) { super((Pointer)null); allocate(pointer); } - @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); + @Override public Algorithm asAlgorithm() { return asAlgorithm(this); } + @Namespace public static native @Name("static_cast") Algorithm asAlgorithm(BackgroundSubtractor pointer); /** \brief Computes a foreground mask.

diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_video/BackgroundSubtractorKNN.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_video/BackgroundSubtractorKNN.java index f0c34982366..e712c1c3a84 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_video/BackgroundSubtractorKNN.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_video/BackgroundSubtractorKNN.java @@ -42,7 +42,7 @@ public class BackgroundSubtractorKNN extends BackgroundSubtractor { public BackgroundSubtractorKNN(Pointer p) { super(p); } /** Downcast constructor. */ public BackgroundSubtractorKNN(Algorithm pointer) { super((Pointer)null); allocate(pointer); } - @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); /** \brief Returns the number of last frames that affect the background model */ diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_video/BackgroundSubtractorMOG2.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_video/BackgroundSubtractorMOG2.java index b76811ab6fa..b4205ff80d4 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_video/BackgroundSubtractorMOG2.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_video/BackgroundSubtractorMOG2.java @@ -43,7 +43,7 @@ public class BackgroundSubtractorMOG2 extends BackgroundSubtractor { public BackgroundSubtractorMOG2(Pointer p) { super(p); } /** Downcast constructor. */ public BackgroundSubtractorMOG2(Algorithm pointer) { super((Pointer)null); allocate(pointer); } - @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); /** \brief Returns the number of last frames that affect the background model */ diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_video/DISOpticalFlow.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_video/DISOpticalFlow.java index 332fcf3eefb..6dc0b397115 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_video/DISOpticalFlow.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_video/DISOpticalFlow.java @@ -49,7 +49,7 @@ public class DISOpticalFlow extends DenseOpticalFlow { public DISOpticalFlow(Pointer p) { super(p); } /** Downcast constructor. */ public DISOpticalFlow(Algorithm pointer) { super((Pointer)null); allocate(pointer); } - @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); /** enum cv::DISOpticalFlow:: */ public static final int diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_video/DenseOpticalFlow.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_video/DenseOpticalFlow.java index 29c98394a6b..8a9792d41f7 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_video/DenseOpticalFlow.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_video/DenseOpticalFlow.java @@ -40,7 +40,9 @@ public class DenseOpticalFlow extends Algorithm { public DenseOpticalFlow(Pointer p) { super(p); } /** Downcast constructor. */ public DenseOpticalFlow(Algorithm pointer) { super((Pointer)null); allocate(pointer); } - @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); + @Override public Algorithm asAlgorithm() { return asAlgorithm(this); } + @Namespace public static native @Name("static_cast") Algorithm asAlgorithm(DenseOpticalFlow pointer); /** \brief Calculates an optical flow.

diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_video/FarnebackOpticalFlow.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_video/FarnebackOpticalFlow.java index b2b56d6a08d..24901c2ad81 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_video/FarnebackOpticalFlow.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_video/FarnebackOpticalFlow.java @@ -40,7 +40,7 @@ public class FarnebackOpticalFlow extends DenseOpticalFlow { public FarnebackOpticalFlow(Pointer p) { super(p); } /** Downcast constructor. */ public FarnebackOpticalFlow(Algorithm pointer) { super((Pointer)null); allocate(pointer); } - @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); public native int getNumLevels(); public native void setNumLevels(int numLevels); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_video/SparseOpticalFlow.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_video/SparseOpticalFlow.java index 4e90346d385..e6c96dc46bf 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_video/SparseOpticalFlow.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_video/SparseOpticalFlow.java @@ -39,7 +39,9 @@ public class SparseOpticalFlow extends Algorithm { public SparseOpticalFlow(Pointer p) { super(p); } /** Downcast constructor. */ public SparseOpticalFlow(Algorithm pointer) { super((Pointer)null); allocate(pointer); } - @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); + @Override public Algorithm asAlgorithm() { return asAlgorithm(this); } + @Namespace public static native @Name("static_cast") Algorithm asAlgorithm(SparseOpticalFlow pointer); /** \brief Calculates a sparse optical flow.

diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_video/SparsePyrLKOpticalFlow.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_video/SparsePyrLKOpticalFlow.java index c76544be002..eae30b5544b 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_video/SparsePyrLKOpticalFlow.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_video/SparsePyrLKOpticalFlow.java @@ -45,7 +45,7 @@ public class SparsePyrLKOpticalFlow extends SparseOpticalFlow { public SparsePyrLKOpticalFlow(Pointer p) { super(p); } /** Downcast constructor. */ public SparsePyrLKOpticalFlow(Algorithm pointer) { super((Pointer)null); allocate(pointer); } - @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); public native @ByVal Size getWinSize(); public native void setWinSize(@ByVal Size winSize); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_video/VariationalRefinement.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_video/VariationalRefinement.java index b205ec83ef7..153163c0212 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_video/VariationalRefinement.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_video/VariationalRefinement.java @@ -47,7 +47,7 @@ public class VariationalRefinement extends DenseOpticalFlow { public VariationalRefinement(Pointer p) { super(p); } /** Downcast constructor. */ public VariationalRefinement(Algorithm pointer) { super((Pointer)null); allocate(pointer); } - @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); /** \brief \ref calc function overload to handle separate horizontal (u) and vertical (v) flow components (to avoid extra splits/merges) */ diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videoio/CvCaptureDefaultDeleter.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videoio/CvCaptureDefaultDeleter.java deleted file mode 100644 index 8f79a279118..00000000000 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videoio/CvCaptureDefaultDeleter.java +++ /dev/null @@ -1,39 +0,0 @@ -// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE - -package org.bytedeco.opencv.opencv_videoio; - -import java.nio.*; -import org.bytedeco.javacpp.*; -import org.bytedeco.javacpp.annotation.*; - -import static org.bytedeco.javacpp.presets.javacpp.*; -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 static org.bytedeco.opencv.global.opencv_videoio.*; - - -/** \cond IGNORED */ -@Name("cv::DefaultDeleter") @Properties(inherit = org.bytedeco.opencv.presets.opencv_videoio.class) -public class CvCaptureDefaultDeleter extends Pointer { - static { Loader.load(); } - /** Default native constructor. */ - public CvCaptureDefaultDeleter() { super((Pointer)null); allocate(); } - /** Native array allocator. Access with {@link Pointer#position(long)}. */ - public CvCaptureDefaultDeleter(long size) { super((Pointer)null); allocateArray(size); } - /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ - public CvCaptureDefaultDeleter(Pointer p) { super(p); } - private native void allocate(); - private native void allocateArray(long size); - @Override public CvCaptureDefaultDeleter position(long position) { - return (CvCaptureDefaultDeleter)super.position(position); - } - @Override public CvCaptureDefaultDeleter getPointer(long i) { - return new CvCaptureDefaultDeleter((Pointer)this).offsetAddress(i); - } - public native @Name("operator ()") void apply(CvCapture obj); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videoio/CvVideoWriterDefaultDeleter.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_videoio/CvVideoWriterDefaultDeleter.java deleted file mode 100644 index f2117ce6d60..00000000000 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_videoio/CvVideoWriterDefaultDeleter.java +++ /dev/null @@ -1,37 +0,0 @@ -// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE - -package org.bytedeco.opencv.opencv_videoio; - -import java.nio.*; -import org.bytedeco.javacpp.*; -import org.bytedeco.javacpp.annotation.*; - -import static org.bytedeco.javacpp.presets.javacpp.*; -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 static org.bytedeco.opencv.global.opencv_videoio.*; - -@Name("cv::DefaultDeleter") @Properties(inherit = org.bytedeco.opencv.presets.opencv_videoio.class) -public class CvVideoWriterDefaultDeleter extends Pointer { - static { Loader.load(); } - /** Default native constructor. */ - public CvVideoWriterDefaultDeleter() { super((Pointer)null); allocate(); } - /** Native array allocator. Access with {@link Pointer#position(long)}. */ - public CvVideoWriterDefaultDeleter(long size) { super((Pointer)null); allocateArray(size); } - /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ - public CvVideoWriterDefaultDeleter(Pointer p) { super(p); } - private native void allocate(); - private native void allocateArray(long size); - @Override public CvVideoWriterDefaultDeleter position(long position) { - return (CvVideoWriterDefaultDeleter)super.position(position); - } - @Override public CvVideoWriterDefaultDeleter getPointer(long i) { - return new CvVideoWriterDefaultDeleter((Pointer)this).offsetAddress(i); - } - public native @Name("operator ()") void apply(CvVideoWriter obj); } diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/AffineFeature2D.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/AffineFeature2D.java index 3fd4b0c63cb..e5313ee521b 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/AffineFeature2D.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/AffineFeature2D.java @@ -47,6 +47,9 @@ public class AffineFeature2D extends Feature2D { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public AffineFeature2D(Pointer p) { super(p); } + /** Downcast constructor. */ + public AffineFeature2D(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); /** * \brief Creates an instance wrapping the given keypoint detector and diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/BEBLID.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/BEBLID.java index 7595e54e408..9667d081c4c 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/BEBLID.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/BEBLID.java @@ -59,6 +59,9 @@ public class BEBLID extends Feature2D { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public BEBLID(Pointer p) { super(p); } + /** Downcast constructor. */ + public BEBLID(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); /** * \brief Descriptor number of bits, each bit is a boosting weak-learner. diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/BoostDesc.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/BoostDesc.java index da019cf9813..c40fde60c3a 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/BoostDesc.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/BoostDesc.java @@ -64,6 +64,9 @@ public class BoostDesc extends Feature2D { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public BoostDesc(Pointer p) { super(p); } + /** Downcast constructor. */ + public BoostDesc(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); /** enum cv::xfeatures2d::BoostDesc:: */ diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/BriefDescriptorExtractor.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/BriefDescriptorExtractor.java index 75983099013..2323c42823f 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/BriefDescriptorExtractor.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/BriefDescriptorExtractor.java @@ -47,6 +47,9 @@ public class BriefDescriptorExtractor extends Feature2D { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public BriefDescriptorExtractor(Pointer p) { super(p); } + /** Downcast constructor. */ + public BriefDescriptorExtractor(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); public static native @Ptr BriefDescriptorExtractor create( int bytes/*=32*/, @Cast("bool") boolean use_orientation/*=false*/ ); public static native @Ptr BriefDescriptorExtractor create( ); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/DAISY.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/DAISY.java index 672247ad9c1..6e68590251b 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/DAISY.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/DAISY.java @@ -53,6 +53,9 @@ public class DAISY extends Feature2D { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public DAISY(Pointer p) { super(p); } + /** Downcast constructor. */ + public DAISY(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); /** enum cv::xfeatures2d::DAISY::NormalizationType */ public static final int diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/FREAK.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/FREAK.java index d4a6081b914..aff27c50fe9 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/FREAK.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/FREAK.java @@ -52,6 +52,9 @@ public class FREAK extends Feature2D { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public FREAK(Pointer p) { super(p); } + /** Downcast constructor. */ + public FREAK(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); @MemberGetter public static native int NB_SCALES(); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/HarrisLaplaceFeatureDetector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/HarrisLaplaceFeatureDetector.java index 44c283d7196..1c5f6d792d1 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/HarrisLaplaceFeatureDetector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/HarrisLaplaceFeatureDetector.java @@ -40,6 +40,9 @@ public class HarrisLaplaceFeatureDetector extends Feature2D { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public HarrisLaplaceFeatureDetector(Pointer p) { super(p); } + /** Downcast constructor. */ + public HarrisLaplaceFeatureDetector(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); /** * \brief Creates a new implementation instance. diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/LATCH.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/LATCH.java index 20111eff574..b464f875851 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/LATCH.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/LATCH.java @@ -60,6 +60,9 @@ public class LATCH extends Feature2D { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public LATCH(Pointer p) { super(p); } + /** Downcast constructor. */ + public LATCH(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); public static native @Ptr LATCH create(int bytes/*=32*/, @Cast("bool") boolean rotationInvariance/*=true*/, int half_ssd_size/*=3*/, double sigma/*=2.0*/); public static native @Ptr LATCH create(); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/LUCID.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/LUCID.java index 3f122aee644..d67aa4b7da1 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/LUCID.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/LUCID.java @@ -44,6 +44,9 @@ public class LUCID extends Feature2D { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public LUCID(Pointer p) { super(p); } + /** Downcast constructor. */ + public LUCID(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); /** * @param lucid_kernel kernel for descriptor construction, where 1=3x3, 2=5x5, 3=7x7 and so forth diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/MSDDetector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/MSDDetector.java index 99679427daa..0007e4a65bf 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/MSDDetector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/MSDDetector.java @@ -50,6 +50,9 @@ public class MSDDetector extends Feature2D { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public MSDDetector(Pointer p) { super(p); } + /** Downcast constructor. */ + public MSDDetector(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); public static native @Ptr MSDDetector create(int m_patch_radius/*=3*/, int m_search_area_radius/*=5*/, diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/PCTSignatures.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/PCTSignatures.java index 177e6be4203..c477100fa8e 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/PCTSignatures.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/PCTSignatures.java @@ -58,7 +58,9 @@ public class PCTSignatures extends Algorithm { public PCTSignatures(Pointer p) { super(p); } /** Downcast constructor. */ public PCTSignatures(Algorithm pointer) { super((Pointer)null); allocate(pointer); } - @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); + @Override public Algorithm asAlgorithm() { return asAlgorithm(this); } + @Namespace public static native @Name("static_cast") Algorithm asAlgorithm(PCTSignatures pointer); /** * \brief Lp distance function selector. diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/PCTSignaturesSQFD.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/PCTSignaturesSQFD.java index 04bd3662f1d..ae9700f31ee 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/PCTSignaturesSQFD.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/PCTSignaturesSQFD.java @@ -47,7 +47,9 @@ public class PCTSignaturesSQFD extends Algorithm { public PCTSignaturesSQFD(Pointer p) { super(p); } /** Downcast constructor. */ public PCTSignaturesSQFD(Algorithm pointer) { super((Pointer)null); allocate(pointer); } - @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); + @Override public Algorithm asAlgorithm() { return asAlgorithm(this); } + @Namespace public static native @Name("static_cast") Algorithm asAlgorithm(PCTSignaturesSQFD pointer); /** diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/SURF.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/SURF.java index 798c3239441..dfa5f2016e9 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/SURF.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/SURF.java @@ -66,6 +66,9 @@ public class SURF extends Feature2D { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public SURF(Pointer p) { super(p); } + /** Downcast constructor. */ + public SURF(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); /** @param hessianThreshold Threshold for hessian keypoint detector used in SURF. diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/StarDetector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/StarDetector.java index ee072c6826e..34ced3fba18 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/StarDetector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/StarDetector.java @@ -40,6 +40,9 @@ public class StarDetector extends Feature2D { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public StarDetector(Pointer p) { super(p); } + /** Downcast constructor. */ + public StarDetector(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); /** the full constructor */ public static native @Ptr StarDetector create(int maxSize/*=45*/, int responseThreshold/*=30*/, diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/TBMR.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/TBMR.java index 60e130003ae..e5d652f17af 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/TBMR.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/TBMR.java @@ -54,6 +54,9 @@ public class TBMR extends AffineFeature2D { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public TBMR(Pointer p) { super(p); } + /** Downcast constructor. */ + public TBMR(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); public static native @Ptr TBMR create(int min_area/*=60*/, float max_area_relative/*=0.01f*/, diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/TEBLID.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/TEBLID.java index 2932ae69512..dd57d9f0ee6 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/TEBLID.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/TEBLID.java @@ -69,6 +69,9 @@ public class TEBLID extends Feature2D { @Override public TEBLID getPointer(long i) { return new TEBLID((Pointer)this).offsetAddress(i); } + /** Downcast constructor. */ + public TEBLID(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); /** * \brief Descriptor number of bits, each bit is a box average difference. diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/VGG.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/VGG.java index 4b52d3ad999..f65afb7e119 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/VGG.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_xfeatures2d/VGG.java @@ -54,6 +54,9 @@ public class VGG extends Feature2D { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public VGG(Pointer p) { super(p); } + /** Downcast constructor. */ + public VGG(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); /** enum cv::xfeatures2d::VGG:: */ diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/AdaptiveManifoldFilter.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/AdaptiveManifoldFilter.java index ace95c4f9b3..e677f0b5df7 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/AdaptiveManifoldFilter.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/AdaptiveManifoldFilter.java @@ -60,7 +60,9 @@ public class AdaptiveManifoldFilter extends Algorithm { public AdaptiveManifoldFilter(Pointer p) { super(p); } /** Downcast constructor. */ public AdaptiveManifoldFilter(Algorithm pointer) { super((Pointer)null); allocate(pointer); } - @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); + @Override public Algorithm asAlgorithm() { return asAlgorithm(this); } + @Namespace public static native @Name("static_cast") Algorithm asAlgorithm(AdaptiveManifoldFilter pointer); /** \brief Apply high-dimensional filtering using adaptive manifolds.

diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/ContourFitting.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/ContourFitting.java index 13a4f71912b..dd97a51d715 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/ContourFitting.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/ContourFitting.java @@ -55,7 +55,9 @@ public class ContourFitting extends Algorithm { } /** Downcast constructor. */ public ContourFitting(Algorithm pointer) { super((Pointer)null); allocate(pointer); } - @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); + @Override public Algorithm asAlgorithm() { return asAlgorithm(this); } + @Namespace public static native @Name("static_cast") Algorithm asAlgorithm(ContourFitting pointer); /** \brief Fit two closed curves using fourier descriptors. More details in \cite PersoonFu1977 and \cite BergerRaghunathan1998

diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/DTFilter.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/DTFilter.java index 82d9aed7741..27b9deeaea3 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/DTFilter.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/DTFilter.java @@ -44,7 +44,9 @@ public class DTFilter extends Algorithm { public DTFilter(Pointer p) { super(p); } /** Downcast constructor. */ public DTFilter(Algorithm pointer) { super((Pointer)null); allocate(pointer); } - @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); + @Override public Algorithm asAlgorithm() { return asAlgorithm(this); } + @Namespace public static native @Name("static_cast") Algorithm asAlgorithm(DTFilter pointer); /** \brief Produce domain transform filtering operation on source image. diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/DisparityFilter.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/DisparityFilter.java index 1cc5cd589ae..b80841629ca 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/DisparityFilter.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/DisparityFilter.java @@ -44,7 +44,9 @@ public class DisparityFilter extends Algorithm { public DisparityFilter(Pointer p) { super(p); } /** Downcast constructor. */ public DisparityFilter(Algorithm pointer) { super((Pointer)null); allocate(pointer); } - @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); + @Override public Algorithm asAlgorithm() { return asAlgorithm(this); } + @Namespace public static native @Name("static_cast") Algorithm asAlgorithm(DisparityFilter pointer); /** \brief Apply filtering to the disparity map. diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/DisparityWLSFilter.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/DisparityWLSFilter.java index 6a0bdebcef4..d38c03d5200 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/DisparityWLSFilter.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/DisparityWLSFilter.java @@ -43,7 +43,7 @@ public class DisparityWLSFilter extends DisparityFilter { public DisparityWLSFilter(Pointer p) { super(p); } /** Downcast constructor. */ public DisparityWLSFilter(Algorithm pointer) { super((Pointer)null); allocate(pointer); } - @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); /** filter parameters */ diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/EdgeAwareInterpolator.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/EdgeAwareInterpolator.java index 8b96c7a08ba..fe8ff435fd9 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/EdgeAwareInterpolator.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/EdgeAwareInterpolator.java @@ -42,7 +42,7 @@ public class EdgeAwareInterpolator extends SparseMatchInterpolator { public EdgeAwareInterpolator(Pointer p) { super(p); } /** Downcast constructor. */ public EdgeAwareInterpolator(Algorithm pointer) { super((Pointer)null); allocate(pointer); } - @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); /** \brief Interface to provide a more elaborated cost map, i.e. edge map, for the edge-aware term. * This implementation is based on a rather simple gradient-based edge map estimation. diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/EdgeBoxes.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/EdgeBoxes.java index 9c45f31998e..53570d944b4 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/EdgeBoxes.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/EdgeBoxes.java @@ -41,7 +41,9 @@ public class EdgeBoxes extends Algorithm { public EdgeBoxes(Pointer p) { super(p); } /** Downcast constructor. */ public EdgeBoxes(Algorithm pointer) { super((Pointer)null); allocate(pointer); } - @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); + @Override public Algorithm asAlgorithm() { return asAlgorithm(this); } + @Namespace public static native @Name("static_cast") Algorithm asAlgorithm(EdgeBoxes pointer); /** \brief Returns array containing proposal boxes. diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/FastBilateralSolverFilter.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/FastBilateralSolverFilter.java index f2b1cd28584..73ca4253bc9 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/FastBilateralSolverFilter.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/FastBilateralSolverFilter.java @@ -46,7 +46,9 @@ public class FastBilateralSolverFilter extends Algorithm { public FastBilateralSolverFilter(Pointer p) { super(p); } /** Downcast constructor. */ public FastBilateralSolverFilter(Algorithm pointer) { super((Pointer)null); allocate(pointer); } - @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); + @Override public Algorithm asAlgorithm() { return asAlgorithm(this); } + @Namespace public static native @Name("static_cast") Algorithm asAlgorithm(FastBilateralSolverFilter pointer); /** \brief Apply smoothing operation to the source image.

diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/FastGlobalSmootherFilter.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/FastGlobalSmootherFilter.java index 4bf086abb0e..3e01a4ca95c 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/FastGlobalSmootherFilter.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/FastGlobalSmootherFilter.java @@ -46,7 +46,9 @@ public class FastGlobalSmootherFilter extends Algorithm { public FastGlobalSmootherFilter(Pointer p) { super(p); } /** Downcast constructor. */ public FastGlobalSmootherFilter(Algorithm pointer) { super((Pointer)null); allocate(pointer); } - @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); + @Override public Algorithm asAlgorithm() { return asAlgorithm(this); } + @Namespace public static native @Name("static_cast") Algorithm asAlgorithm(FastGlobalSmootherFilter pointer); /** \brief Apply smoothing operation to the source image.

diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/FastLineDetector.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/FastLineDetector.java index 21f8dfba542..0e57637fb45 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/FastLineDetector.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/FastLineDetector.java @@ -48,7 +48,9 @@ public class FastLineDetector extends Algorithm { public FastLineDetector(Pointer p) { super(p); } /** Downcast constructor. */ public FastLineDetector(Algorithm pointer) { super((Pointer)null); allocate(pointer); } - @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); + @Override public Algorithm asAlgorithm() { return asAlgorithm(this); } + @Namespace public static native @Name("static_cast") Algorithm asAlgorithm(FastLineDetector pointer); /** \example fld_lines.cpp An example using the FastLineDetector diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/GraphSegmentation.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/GraphSegmentation.java index 78cd823d4c0..18e671d906f 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/GraphSegmentation.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/GraphSegmentation.java @@ -44,7 +44,9 @@ public class GraphSegmentation extends Algorithm { public GraphSegmentation(Pointer p) { super(p); } /** Downcast constructor. */ public GraphSegmentation(Algorithm pointer) { super((Pointer)null); allocate(pointer); } - @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); + @Override public Algorithm asAlgorithm() { return asAlgorithm(this); } + @Namespace public static native @Name("static_cast") Algorithm asAlgorithm(GraphSegmentation pointer); /** \brief Segment an image and store output in dst @param src The input image. Any number of channel (1 (Eg: Gray), 3 (Eg: RGB), 4 (Eg: RGB-D)) can be provided diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/GuidedFilter.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/GuidedFilter.java index f2fcbca6693..09e96ca1fec 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/GuidedFilter.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/GuidedFilter.java @@ -46,7 +46,9 @@ public class GuidedFilter extends Algorithm { public GuidedFilter(Pointer p) { super(p); } /** Downcast constructor. */ public GuidedFilter(Algorithm pointer) { super((Pointer)null); allocate(pointer); } - @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); + @Override public Algorithm asAlgorithm() { return asAlgorithm(this); } + @Namespace public static native @Name("static_cast") Algorithm asAlgorithm(GuidedFilter pointer); /** \brief Apply Guided Filter to the filtering image. diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/RFFeatureGetter.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/RFFeatureGetter.java index 1976637a306..a8680f5deac 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/RFFeatureGetter.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/RFFeatureGetter.java @@ -45,7 +45,9 @@ public class RFFeatureGetter extends Algorithm { public RFFeatureGetter(Pointer p) { super(p); } /** Downcast constructor. */ public RFFeatureGetter(Algorithm pointer) { super((Pointer)null); allocate(pointer); } - @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); + @Override public Algorithm asAlgorithm() { return asAlgorithm(this); } + @Namespace public static native @Name("static_cast") Algorithm asAlgorithm(RFFeatureGetter pointer); /** diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/RICInterpolator.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/RICInterpolator.java index 97bdfae1768..9cd7c82d078 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/RICInterpolator.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/RICInterpolator.java @@ -45,7 +45,7 @@ public class RICInterpolator extends SparseMatchInterpolator { public RICInterpolator(Pointer p) { super(p); } /** Downcast constructor. */ public RICInterpolator(Algorithm pointer) { super((Pointer)null); allocate(pointer); } - @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); /** \brief K is a number of nearest-neighbor matches considered, when fitting a locally affine *model for a superpixel segment. However, lower values would make the interpolation diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/RidgeDetectionFilter.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/RidgeDetectionFilter.java index 9f5514b9308..99ed81c7ae2 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/RidgeDetectionFilter.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/RidgeDetectionFilter.java @@ -48,7 +48,9 @@ public class RidgeDetectionFilter extends Algorithm { public RidgeDetectionFilter(Pointer p) { super(p); } /** Downcast constructor. */ public RidgeDetectionFilter(Algorithm pointer) { super((Pointer)null); allocate(pointer); } - @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); + @Override public Algorithm asAlgorithm() { return asAlgorithm(this); } + @Namespace public static native @Name("static_cast") Algorithm asAlgorithm(RidgeDetectionFilter pointer); /** \brief Create pointer to the Ridge detection filter. diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/SelectiveSearchSegmentation.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/SelectiveSearchSegmentation.java index 617620a5d63..97975bc5a0a 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/SelectiveSearchSegmentation.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/SelectiveSearchSegmentation.java @@ -42,7 +42,9 @@ public class SelectiveSearchSegmentation extends Algorithm { public SelectiveSearchSegmentation(Pointer p) { super(p); } /** Downcast constructor. */ public SelectiveSearchSegmentation(Algorithm pointer) { super((Pointer)null); allocate(pointer); } - @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); + @Override public Algorithm asAlgorithm() { return asAlgorithm(this); } + @Namespace public static native @Name("static_cast") Algorithm asAlgorithm(SelectiveSearchSegmentation pointer); /** \brief Set a image used by switch* functions to initialize the class diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/SelectiveSearchSegmentationStrategy.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/SelectiveSearchSegmentationStrategy.java index 45ea729a2b3..94f1984cc0d 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/SelectiveSearchSegmentationStrategy.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/SelectiveSearchSegmentationStrategy.java @@ -42,7 +42,9 @@ public class SelectiveSearchSegmentationStrategy extends Algorithm { public SelectiveSearchSegmentationStrategy(Pointer p) { super(p); } /** Downcast constructor. */ public SelectiveSearchSegmentationStrategy(Algorithm pointer) { super((Pointer)null); allocate(pointer); } - @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); + @Override public Algorithm asAlgorithm() { return asAlgorithm(this); } + @Namespace public static native @Name("static_cast") Algorithm asAlgorithm(SelectiveSearchSegmentationStrategy pointer); /** \brief Set a initial image, with a segmentation. @param img The input image. Any number of channel can be provided diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/SelectiveSearchSegmentationStrategyMultiple.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/SelectiveSearchSegmentationStrategyMultiple.java index ad378f0d5cc..f3f7df32946 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/SelectiveSearchSegmentationStrategyMultiple.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/SelectiveSearchSegmentationStrategyMultiple.java @@ -41,7 +41,7 @@ public class SelectiveSearchSegmentationStrategyMultiple extends SelectiveSearch public SelectiveSearchSegmentationStrategyMultiple(Pointer p) { super(p); } /** Downcast constructor. */ public SelectiveSearchSegmentationStrategyMultiple(Algorithm pointer) { super((Pointer)null); allocate(pointer); } - @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); /** \brief Add a new sub-strategy diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/SparseMatchInterpolator.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/SparseMatchInterpolator.java index 9efbdcbc4ea..e6f4f1179f5 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/SparseMatchInterpolator.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/SparseMatchInterpolator.java @@ -45,7 +45,9 @@ public class SparseMatchInterpolator extends Algorithm { public SparseMatchInterpolator(Pointer p) { super(p); } /** Downcast constructor. */ public SparseMatchInterpolator(Algorithm pointer) { super((Pointer)null); allocate(pointer); } - @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); + @Override public Algorithm asAlgorithm() { return asAlgorithm(this); } + @Namespace public static native @Name("static_cast") Algorithm asAlgorithm(SparseMatchInterpolator pointer); /** \brief Interpolate input sparse matches.

diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/StructuredEdgeDetection.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/StructuredEdgeDetection.java index 58452293862..3127eb036c4 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/StructuredEdgeDetection.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/StructuredEdgeDetection.java @@ -43,7 +43,9 @@ public class StructuredEdgeDetection extends Algorithm { public StructuredEdgeDetection(Pointer p) { super(p); } /** Downcast constructor. */ public StructuredEdgeDetection(Algorithm pointer) { super((Pointer)null); allocate(pointer); } - @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); + @Override public Algorithm asAlgorithm() { return asAlgorithm(this); } + @Namespace public static native @Name("static_cast") Algorithm asAlgorithm(StructuredEdgeDetection pointer); /** \brief The function detects edges in src and draw them to dst. diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/SuperpixelLSC.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/SuperpixelLSC.java index fff684fc757..a21723df049 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/SuperpixelLSC.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/SuperpixelLSC.java @@ -53,7 +53,9 @@ public class SuperpixelLSC extends Algorithm { public SuperpixelLSC(Pointer p) { super(p); } /** Downcast constructor. */ public SuperpixelLSC(Algorithm pointer) { super((Pointer)null); allocate(pointer); } - @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); + @Override public Algorithm asAlgorithm() { return asAlgorithm(this); } + @Namespace public static native @Name("static_cast") Algorithm asAlgorithm(SuperpixelLSC pointer); /** \brief Calculates the actual amount of superpixels on a given segmentation computed diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/SuperpixelSEEDS.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/SuperpixelSEEDS.java index b410acd5b2d..8fd2bdab547 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/SuperpixelSEEDS.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/SuperpixelSEEDS.java @@ -52,7 +52,9 @@ public class SuperpixelSEEDS extends Algorithm { public SuperpixelSEEDS(Pointer p) { super(p); } /** Downcast constructor. */ public SuperpixelSEEDS(Algorithm pointer) { super((Pointer)null); allocate(pointer); } - @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); + @Override public Algorithm asAlgorithm() { return asAlgorithm(this); } + @Namespace public static native @Name("static_cast") Algorithm asAlgorithm(SuperpixelSEEDS pointer); /** \brief Calculates the superpixel segmentation on a given image stored in SuperpixelSEEDS object. diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/SuperpixelSLIC.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/SuperpixelSLIC.java index 22f2f70aa0c..6234ebf604c 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/SuperpixelSLIC.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_ximgproc/SuperpixelSLIC.java @@ -51,7 +51,9 @@ public class SuperpixelSLIC extends Algorithm { public SuperpixelSLIC(Pointer p) { super(p); } /** Downcast constructor. */ public SuperpixelSLIC(Algorithm pointer) { super((Pointer)null); allocate(pointer); } - @Namespace private native @Name("dynamic_cast") void allocate(Algorithm pointer); + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); + @Override public Algorithm asAlgorithm() { return asAlgorithm(this); } + @Namespace public static native @Name("static_cast") Algorithm asAlgorithm(SuperpixelSLIC pointer); /** \brief Calculates the actual amount of superpixels on a given segmentation computed diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_xphoto/GrayworldWB.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_xphoto/GrayworldWB.java index 3d6c35f2abb..886e1abf998 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_xphoto/GrayworldWB.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_xphoto/GrayworldWB.java @@ -46,6 +46,9 @@ public class GrayworldWB extends WhiteBalancer { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public GrayworldWB(Pointer p) { super(p); } + /** Downcast constructor. */ + public GrayworldWB(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); /** \brief Maximum saturation for a pixel to be included in the gray-world assumption diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_xphoto/LearningBasedWB.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_xphoto/LearningBasedWB.java index bb05cf9a0d7..050532a1da2 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_xphoto/LearningBasedWB.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_xphoto/LearningBasedWB.java @@ -38,6 +38,9 @@ public class LearningBasedWB extends WhiteBalancer { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public LearningBasedWB(Pointer p) { super(p); } + /** Downcast constructor. */ + public LearningBasedWB(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); /** \brief Implements the feature extraction part of the algorithm.

diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_xphoto/SimpleWB.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_xphoto/SimpleWB.java index 48b46736246..1987c926280 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_xphoto/SimpleWB.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_xphoto/SimpleWB.java @@ -28,6 +28,9 @@ public class SimpleWB extends WhiteBalancer { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public SimpleWB(Pointer p) { super(p); } + /** Downcast constructor. */ + public SimpleWB(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); /** \brief Input image range minimum value @see setInputMin */ diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_xphoto/TonemapDurand.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_xphoto/TonemapDurand.java index 03137e103d4..f538dbcb546 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_xphoto/TonemapDurand.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_xphoto/TonemapDurand.java @@ -36,6 +36,9 @@ public class TonemapDurand extends Tonemap { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public TonemapDurand(Pointer p) { super(p); } + /** Downcast constructor. */ + public TonemapDurand(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); public native float getSaturation(); diff --git a/opencv/src/gen/java/org/bytedeco/opencv/opencv_xphoto/WhiteBalancer.java b/opencv/src/gen/java/org/bytedeco/opencv/opencv_xphoto/WhiteBalancer.java index 6657256d709..0fa95b9d287 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/opencv_xphoto/WhiteBalancer.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/opencv_xphoto/WhiteBalancer.java @@ -29,6 +29,11 @@ public class WhiteBalancer extends Algorithm { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public WhiteBalancer(Pointer p) { super(p); } + /** Downcast constructor. */ + public WhiteBalancer(Algorithm pointer) { super((Pointer)null); allocate(pointer); } + @Namespace private native @Name("static_cast") void allocate(Algorithm pointer); + @Override public Algorithm asAlgorithm() { return asAlgorithm(this); } + @Namespace public static native @Name("static_cast") Algorithm asAlgorithm(WhiteBalancer pointer); /** \brief Applies white balancing to the input image

diff --git a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_core.java b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_core.java index 8cf6c51419a..097da5e8215 100644 --- a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_core.java +++ b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_core.java @@ -417,7 +417,45 @@ public void map(InfoMap infoMap) { .put(new Info("std::function").pointerTypes("Functor")) .put(new Info("cv::Ptr").skip().annotations("@Ptr")) - .put(new Info("cv::String").skip().annotations("@Str").valueTypes("BytePointer", "String")); + .put(new Info("cv::String").skip().annotations("@Str").valueTypes("BytePointer", "String")) + + .put(new Info("cv::Algorithm").upcast()) + + .put(new Info("cv::read", "cv::read", "cv::read").define()) + .put(new Info("cv::read(const cv::FileNode&, cv::Complex&, const cv::Complex&)").skip()) + .put(new Info("cv::read<_Tp,std>(const cv::FileNode&, _Tp&, const _Tp&)").skip()) // Really template::value >::type* = nullptr> read(...) + + // Without this info, Algorithm.read() gets mapped to cv::read + .put(new Info("cv::Algorithm::read")); + + for (String c : new String[] {"int", "float", "double", "cv::String"}) { + infoMap.put(new Info("cv::write<" + c + ">(cv::FileStorage&, const _Tp&)", + "cv::write<" + c + ">(cv::FileStorage&, const " + c + "&)").define()); + } + + for (String c : new String[] {"cv::Point_", "cv::Point3_", "cv::Size_", "cv::Complex", "cv::Rect_", "cv::Scalar_"}) { + for (String t : new String[] {"int", "float", "double"}) { + if (c.equals("cv::Complex") && t.equals("int")) { + continue; + } + infoMap.put(new Info("cv::write<" + c + "<" + t + "> >(cv::FileStorage&, const cv::String&, const _Tp&)", + "cv::write<" + c + "<" + t + "> >(cv::FileStorage&, const cv::String&, const " + c + "<" + t + ">&)", + "cv::write<" + c + "<" + t + "> >(cv::FileStorage&, const _Tp&)", + "cv::write<" + c + "<" + t + "> >(cv::FileStorage&, const " + c + "<" + t + ">&)").define()); + } + } + + for (String c : infoMap.keySet().toArray(new String[0])) { + if (c.startsWith("std::vector<")) { + c = c.substring(12, c.length() - 1); + infoMap.put(new Info("cv::write<" + c + (c.endsWith(">") ? " " : "") + ">(cv::FileStorage&, const std::vector<_Tp>&)", + "cv::write<" + c + (c.endsWith(">") ? " " : "") + ">(cv::FileStorage&, const " + c + "&)", + "cv::write<" + c + (c.endsWith(">") ? " " : "") + ">(cv::FileStorage&, const cv::String&, const std::vector<_Tp>&)", + "cv::write<" + c + (c.endsWith(">") ? " " : "") + ">(cv::FileStorage&, const cv::String&, const " + c + "&)", + "cv::read<" + c + (c.endsWith(">") ? " " : "") + ">(const cv::FileNode&, std::vector<_Tp>&, const std::vector<_Tp>&)", + "cv::read<" + c + (c.endsWith(">") ? " " : "") + ">(const cv::FileNode&, " + c + "&, const " + c + "&)").define()); + } + } } public static class Functor extends FunctionPointer { diff --git a/pytorch/src/gen/java/org/bytedeco/pytorch/BooleanElementReference.java b/pytorch/src/gen/java/org/bytedeco/pytorch/BooleanElementReference.java index b194b3416ad..b88c2f26df7 100644 --- a/pytorch/src/gen/java/org/bytedeco/pytorch/BooleanElementReference.java +++ b/pytorch/src/gen/java/org/bytedeco/pytorch/BooleanElementReference.java @@ -35,7 +35,8 @@ public class BooleanElementReference extends Pointer { public native @Const @ByRef IValue get(); - + private static native @Namespace void swap(@ByRef(true) BooleanElementReference lhs, @ByRef(true) BooleanElementReference rhs); + public void swap(BooleanElementReference rhs) { swap(this, rhs); } diff --git a/pytorch/src/gen/java/org/bytedeco/pytorch/ClassType.java b/pytorch/src/gen/java/org/bytedeco/pytorch/ClassType.java index 3a400637c06..3a263e10183 100644 --- a/pytorch/src/gen/java/org/bytedeco/pytorch/ClassType.java +++ b/pytorch/src/gen/java/org/bytedeco/pytorch/ClassType.java @@ -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); diff --git a/pytorch/src/gen/java/org/bytedeco/pytorch/DimnameArrayRef.java b/pytorch/src/gen/java/org/bytedeco/pytorch/DimnameArrayRef.java index 11347cb7689..06845ecf6ea 100644 --- a/pytorch/src/gen/java/org/bytedeco/pytorch/DimnameArrayRef.java +++ b/pytorch/src/gen/java/org/bytedeco/pytorch/DimnameArrayRef.java @@ -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); diff --git a/pytorch/src/gen/java/org/bytedeco/pytorch/DimnameListOptional.java b/pytorch/src/gen/java/org/bytedeco/pytorch/DimnameListOptional.java index 35ec2490e64..a8d858edd81 100644 --- a/pytorch/src/gen/java/org/bytedeco/pytorch/DimnameListOptional.java +++ b/pytorch/src/gen/java/org/bytedeco/pytorch/DimnameListOptional.java @@ -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); @@ -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); } diff --git a/pytorch/src/gen/java/org/bytedeco/pytorch/DoubleComplexElementReference.java b/pytorch/src/gen/java/org/bytedeco/pytorch/DoubleComplexElementReference.java index 3a3de8a5159..b2cff9eb382 100644 --- a/pytorch/src/gen/java/org/bytedeco/pytorch/DoubleComplexElementReference.java +++ b/pytorch/src/gen/java/org/bytedeco/pytorch/DoubleComplexElementReference.java @@ -35,7 +35,8 @@ public class DoubleComplexElementReference extends Pointer { public native @Const @ByRef IValue get(); - + private static native @Namespace void swap(@ByRef(true) DoubleComplexElementReference lhs, @ByRef(true) DoubleComplexElementReference rhs); + public void swap(DoubleComplexElementReference rhs) { swap(this, rhs); } diff --git a/pytorch/src/gen/java/org/bytedeco/pytorch/DoubleElementReference.java b/pytorch/src/gen/java/org/bytedeco/pytorch/DoubleElementReference.java index e5ca9af5e16..65776d25482 100644 --- a/pytorch/src/gen/java/org/bytedeco/pytorch/DoubleElementReference.java +++ b/pytorch/src/gen/java/org/bytedeco/pytorch/DoubleElementReference.java @@ -35,7 +35,8 @@ public class DoubleElementReference extends Pointer { public native @Const @ByRef IValue get(); - + private static native @Namespace void swap(@ByRef(true) DoubleElementReference lhs, @ByRef(true) DoubleElementReference rhs); + public void swap(DoubleElementReference rhs) { swap(this, rhs); } diff --git a/pytorch/src/gen/java/org/bytedeco/pytorch/ExampleStack.java b/pytorch/src/gen/java/org/bytedeco/pytorch/ExampleStack.java index 76b3468f69a..c349b470401 100644 --- a/pytorch/src/gen/java/org/bytedeco/pytorch/ExampleStack.java +++ b/pytorch/src/gen/java/org/bytedeco/pytorch/ExampleStack.java @@ -18,25 +18,10 @@ import static org.bytedeco.pytorch.global.torch.*; -/** A {@code Collation} for {@code Example} types that stacks all data - * tensors into one tensor, and all target (label) tensors into one tensor. */ -@Name("torch::data::transforms::Stack >") @Properties(inherit = org.bytedeco.pytorch.presets.torch.class) +@Name("torch::data::transforms::Stack >") @Opaque @Properties(inherit = org.bytedeco.pytorch.presets.torch.class) public class ExampleStack extends ExampleCollation { - static { Loader.load(); } - /** Default native constructor. */ - public ExampleStack() { super((Pointer)null); allocate(); } - /** Native array allocator. Access with {@link Pointer#position(long)}. */ - public ExampleStack(long size) { super((Pointer)null); allocateArray(size); } + /** Empty constructor. Calls {@code super((Pointer)null)}. */ + public ExampleStack() { super((Pointer)null); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public ExampleStack(Pointer p) { super(p); } - private native void allocate(); - private native void allocateArray(long size); - @Override public ExampleStack position(long position) { - return (ExampleStack)super.position(position); - } - @Override public ExampleStack getPointer(long i) { - return new ExampleStack((Pointer)this).offsetAddress(i); - } - - public native @ByVal Example apply_batch(@StdVector Example examples); } diff --git a/pytorch/src/gen/java/org/bytedeco/pytorch/FuturePtrElementReference.java b/pytorch/src/gen/java/org/bytedeco/pytorch/FuturePtrElementReference.java index 2f433b92efd..73efb1e3e95 100644 --- a/pytorch/src/gen/java/org/bytedeco/pytorch/FuturePtrElementReference.java +++ b/pytorch/src/gen/java/org/bytedeco/pytorch/FuturePtrElementReference.java @@ -35,7 +35,8 @@ public class FuturePtrElementReference extends Pointer { public native @Const @ByRef IValue get(); - + private static native @Namespace void swap(@ByRef(true) FuturePtrElementReference lhs, @ByRef(true) FuturePtrElementReference rhs); + public void swap(FuturePtrElementReference rhs) { swap(this, rhs); } diff --git a/pytorch/src/gen/java/org/bytedeco/pytorch/GenericElementReference.java b/pytorch/src/gen/java/org/bytedeco/pytorch/GenericElementReference.java index 93d8bda6401..d1c2b3f0ad4 100644 --- a/pytorch/src/gen/java/org/bytedeco/pytorch/GenericElementReference.java +++ b/pytorch/src/gen/java/org/bytedeco/pytorch/GenericElementReference.java @@ -35,7 +35,8 @@ public class GenericElementReference extends Pointer { public native @Const @ByRef IValue get(); - + private static native @Namespace void swap(@ByRef(true) GenericElementReference lhs, @ByRef(true) GenericElementReference rhs); + public void swap(GenericElementReference rhs) { swap(this, rhs); } diff --git a/pytorch/src/gen/java/org/bytedeco/pytorch/Graph.java b/pytorch/src/gen/java/org/bytedeco/pytorch/Graph.java index fac88eff6ab..b41f2ecc98c 100644 --- a/pytorch/src/gen/java/org/bytedeco/pytorch/Graph.java +++ b/pytorch/src/gen/java/org/bytedeco/pytorch/Graph.java @@ -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(); @@ -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, @@ -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( @@ -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); diff --git a/pytorch/src/gen/java/org/bytedeco/pytorch/HalfComplex.java b/pytorch/src/gen/java/org/bytedeco/pytorch/HalfComplex.java index b6b36add496..fdde6aeb652 100644 --- a/pytorch/src/gen/java/org/bytedeco/pytorch/HalfComplex.java +++ b/pytorch/src/gen/java/org/bytedeco/pytorch/HalfComplex.java @@ -18,7 +18,6 @@ import static org.bytedeco.pytorch.global.torch.*; -// TODO : move to complex.h @Name("c10::complex") @NoOffset @Properties(inherit = org.bytedeco.pytorch.presets.torch.class) public class HalfComplex extends Pointer { static { Loader.load(); } @@ -34,28 +33,59 @@ public class HalfComplex extends Pointer { return new HalfComplex((Pointer)this).offsetAddress(i); } + public native @ByRef Half real_(); public native HalfComplex real_(Half setter); public native @ByRef Half imag_(); public native HalfComplex imag_(Half setter); - // Constructors public HalfComplex() { super((Pointer)null); allocate(); } private native void allocate(); - // Half constructor is not constexpr so the following constructor can't - // be constexpr - public HalfComplex(@Const @ByRef Half real, @Const @ByRef Half imag) { super((Pointer)null); allocate(real, imag); } - private native void allocate(@Const @ByRef Half real, @Const @ByRef Half imag); + public HalfComplex(Half re, Half im) { super((Pointer)null); allocate(re, im); } + private native void allocate(@Const @ByRef Half re, @Const @ByRef(nullValue = "c10::Half()") Half im); public HalfComplex(@Const @ByRef FloatComplex value) { super((Pointer)null); allocate(value); } private native void allocate(@Const @ByRef FloatComplex value); - + // Conversion operator public native @ByVal @Name("operator c10::complex") FloatComplex asFloatComplex(); + + public native @ByRef @Name("operator +=") HalfComplex addPut(@Const @ByRef HalfComplex other); + + public native @ByRef @Name("operator -=") HalfComplex subtractPut(@Const @ByRef HalfComplex other); + + public native @ByRef @Name("operator *=") HalfComplex multiplyPut(@Const @ByRef HalfComplex other); +// #if defined(__CUDACC__) || defined(__HIPCC__) +// #endif - public native @Const @ByVal @org.bytedeco.javacpp.annotation.Function Half real(); - public native @Const @ByVal @org.bytedeco.javacpp.annotation.Function Half imag(); + // Use SFINAE to specialize casting constructor for c10::complex and + // c10::complex - public native @ByRef @Name("operator +=") HalfComplex addPut(@Const @ByRef HalfComplex other); + - public native @ByRef @Name("operator -=") HalfComplex subtractPut(@Const @ByRef HalfComplex other); + - public native @ByRef @Name("operator *=") HalfComplex multiplyPut(@Const @ByRef HalfComplex other); + + + + + + +// #ifdef __APPLE__ +// #define FORCE_INLINE_APPLE __attribute__((always_inline)) +// #else +// #define FORCE_INLINE_APPLE +// #endif +// #undef FORCE_INLINE_APPLE + +// #if defined(__CUDACC__) || defined(__HIPCC__) +// #endif + +// #if defined(__CUDACC__) || defined(__HIPCC__) +// #endif + + // consistent with NumPy behavior + + + public native @Const @ByVal @org.bytedeco.javacpp.annotation.Function Half real(); + + public native @Const @ByVal @org.bytedeco.javacpp.annotation.Function Half imag(); + } diff --git a/pytorch/src/gen/java/org/bytedeco/pytorch/IValueArrayRef.java b/pytorch/src/gen/java/org/bytedeco/pytorch/IValueArrayRef.java index 74bce3536a7..8efe6c4444e 100644 --- a/pytorch/src/gen/java/org/bytedeco/pytorch/IValueArrayRef.java +++ b/pytorch/src/gen/java/org/bytedeco/pytorch/IValueArrayRef.java @@ -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); diff --git a/pytorch/src/gen/java/org/bytedeco/pytorch/JitNode.java b/pytorch/src/gen/java/org/bytedeco/pytorch/JitNode.java index 3a0f8d63ed4..a34ee73a363 100644 --- a/pytorch/src/gen/java/org/bytedeco/pytorch/JitNode.java +++ b/pytorch/src/gen/java/org/bytedeco/pytorch/JitNode.java @@ -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{}") SymbolArrayRef const_inputs); + @ByVal(nullValue = "at::ArrayRef{}") SymbolVector const_inputs); public native @Cast("bool") boolean matches( String signature_literal); diff --git a/pytorch/src/gen/java/org/bytedeco/pytorch/LongElementReference.java b/pytorch/src/gen/java/org/bytedeco/pytorch/LongElementReference.java index 7a77261b758..36d4873a234 100644 --- a/pytorch/src/gen/java/org/bytedeco/pytorch/LongElementReference.java +++ b/pytorch/src/gen/java/org/bytedeco/pytorch/LongElementReference.java @@ -35,7 +35,8 @@ public class LongElementReference extends Pointer { public native @Const @ByRef IValue get(); - + private static native @Namespace void swap(@ByRef(true) LongElementReference lhs, @ByRef(true) LongElementReference rhs); + public void swap(LongElementReference rhs) { swap(this, rhs); } diff --git a/pytorch/src/gen/java/org/bytedeco/pytorch/LongOptionalArrayRef.java b/pytorch/src/gen/java/org/bytedeco/pytorch/LongOptionalArrayRef.java index 61effcb0bab..1bf7a0d3c6e 100644 --- a/pytorch/src/gen/java/org/bytedeco/pytorch/LongOptionalArrayRef.java +++ b/pytorch/src/gen/java/org/bytedeco/pytorch/LongOptionalArrayRef.java @@ -59,6 +59,8 @@ public class LongOptionalArrayRef extends Pointer { // The enable_if stuff here makes sure that this isn't used for // std::vector, because ArrayRef can't work on a std::vector // 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 */ @@ -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); diff --git a/pytorch/src/gen/java/org/bytedeco/pytorch/MetaBase.java b/pytorch/src/gen/java/org/bytedeco/pytorch/MetaBase.java index 05270ff5b61..40008807ca3 100644 --- a/pytorch/src/gen/java/org/bytedeco/pytorch/MetaBase.java +++ b/pytorch/src/gen/java/org/bytedeco/pytorch/MetaBase.java @@ -69,7 +69,7 @@ public native void set_output_strided( @ByVal @Cast({"int64_t*", "c10::ArrayRef", "std::vector&"}) @StdVector("int64_t") long[] sizes, @ByVal @Cast({"int64_t*", "c10::ArrayRef", "std::vector&"}) @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", "std::vector&"}) @StdVector("int64_t") long[] sizes, @@ -95,7 +95,7 @@ public native void set_output_raw_strided( @ByVal @Cast({"int64_t*", "c10::ArrayRef", "std::vector&"}) @StdVector("int64_t") long[] sizes, @ByVal @Cast({"int64_t*", "c10::ArrayRef", "std::vector&"}) @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", "std::vector&"}) @StdVector("int64_t") long[] sizes, @@ -117,7 +117,7 @@ public native void set_output_contiguous( @Cast("int64_t") long output_idx, @ByVal @Cast({"int64_t*", "c10::ArrayRef", "std::vector&"}) @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", "std::vector&"}) @StdVector("int64_t") long[] sizes, diff --git a/pytorch/src/gen/java/org/bytedeco/pytorch/NamedTensorMeta.java b/pytorch/src/gen/java/org/bytedeco/pytorch/NamedTensorMeta.java index 7640c19c132..a7644d844d0 100644 --- a/pytorch/src/gen/java/org/bytedeco/pytorch/NamedTensorMeta.java +++ b/pytorch/src/gen/java/org/bytedeco/pytorch/NamedTensorMeta.java @@ -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(); @@ -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); diff --git a/pytorch/src/gen/java/org/bytedeco/pytorch/ScalarTypeArrayRef.java b/pytorch/src/gen/java/org/bytedeco/pytorch/ScalarTypeArrayRef.java index 242787ca4dc..cfe65660252 100644 --- a/pytorch/src/gen/java/org/bytedeco/pytorch/ScalarTypeArrayRef.java +++ b/pytorch/src/gen/java/org/bytedeco/pytorch/ScalarTypeArrayRef.java @@ -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); diff --git a/pytorch/src/gen/java/org/bytedeco/pytorch/StrideArrayRef.java b/pytorch/src/gen/java/org/bytedeco/pytorch/StrideArrayRef.java index 3e6509f5c18..da32c5fd05b 100644 --- a/pytorch/src/gen/java/org/bytedeco/pytorch/StrideArrayRef.java +++ b/pytorch/src/gen/java/org/bytedeco/pytorch/StrideArrayRef.java @@ -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); diff --git a/pytorch/src/gen/java/org/bytedeco/pytorch/StringArrayRef.java b/pytorch/src/gen/java/org/bytedeco/pytorch/StringArrayRef.java index d5ef995e3a9..957a9cbf0fb 100644 --- a/pytorch/src/gen/java/org/bytedeco/pytorch/StringArrayRef.java +++ b/pytorch/src/gen/java/org/bytedeco/pytorch/StringArrayRef.java @@ -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); diff --git a/pytorch/src/gen/java/org/bytedeco/pytorch/SymbolArrayRef.java b/pytorch/src/gen/java/org/bytedeco/pytorch/SymbolArrayRef.java index 18c9f6f084c..6b6a2e644c0 100644 --- a/pytorch/src/gen/java/org/bytedeco/pytorch/SymbolArrayRef.java +++ b/pytorch/src/gen/java/org/bytedeco/pytorch/SymbolArrayRef.java @@ -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); diff --git a/pytorch/src/gen/java/org/bytedeco/pytorch/Tensor.java b/pytorch/src/gen/java/org/bytedeco/pytorch/Tensor.java index d0e0cb5b3d2..deaaadf42a3 100644 --- a/pytorch/src/gen/java/org/bytedeco/pytorch/Tensor.java +++ b/pytorch/src/gen/java/org/bytedeco/pytorch/Tensor.java @@ -183,9 +183,12 @@ private native void allocate( public native @ByVal @Name("operator []") Tensor get(@Cast("int64_t") long index); public native @ByVal Tensor index(@ByVal TensorIndexArrayRef indices); + public native @ByVal Tensor index(@ByVal TensorIndexVector indices); public native @ByRef Tensor index_put_(@ByVal TensorIndexArrayRef indices, @Const @ByRef Tensor rhs); + public native @ByRef Tensor index_put_(@ByVal TensorIndexVector indices, @Const @ByRef Tensor rhs); public native @ByRef Tensor index_put_(@ByVal TensorIndexArrayRef indices, @Const @ByRef Scalar v); + public native @ByRef Tensor index_put_(@ByVal TensorIndexVector indices, @Const @ByRef Scalar v); public native @ByVal Tensor cpu(); @@ -352,6 +355,8 @@ private native void allocate( //Tensor * add(Tensor & b); public native void __dispatch__backward(@ByVal TensorArrayRef inputs, @Const @ByRef(nullValue = "c10::optional{}") TensorOptional gradient, @ByVal(nullValue = "c10::optional(c10::nullopt)") BoolOptional retain_graph, @Cast("bool") boolean create_graph/*=false*/); public native void __dispatch__backward(@ByVal TensorArrayRef inputs); + public native void __dispatch__backward(@ByVal TensorVector inputs, @Const @ByRef(nullValue = "c10::optional{}") TensorOptional gradient, @ByVal(nullValue = "c10::optional(c10::nullopt)") BoolOptional retain_graph, @Cast("bool") boolean create_graph/*=false*/); + public native void __dispatch__backward(@ByVal TensorVector inputs); public native void __dispatch_set_data(@Const @ByRef Tensor new_data); public native @ByVal Tensor __dispatch_data(); public native @Cast("bool") boolean __dispatch_is_leaf(); @@ -365,9 +370,12 @@ private native void allocate( public native @ByRef Tensor rename_(@ByVal DimnameListOptional names); public native @ByVal Tensor rename(@ByVal DimnameListOptional names); public native @ByVal Tensor align_to(@ByVal DimnameArrayRef names); + public native @ByVal Tensor align_to(@ByVal DimnameVector names); public native @ByVal Tensor align_to(@ByVal DimnameArrayRef order, @Cast("int64_t") long ellipsis_idx); + public native @ByVal Tensor align_to(@ByVal DimnameVector order, @Cast("int64_t") long ellipsis_idx); public native @ByVal Tensor align_as(@Const @ByRef Tensor other); public native @ByVal Tensor refine_names(@ByVal DimnameArrayRef names); + public native @ByVal Tensor refine_names(@ByVal DimnameVector names); public native @ByVal Tensor abs(); public native @ByRef Tensor abs_(); public native @ByVal Tensor absolute(); @@ -669,12 +677,14 @@ private native void allocate( public native @ByVal Tensor flatten(@Cast("int64_t") long start_dim, @Cast("int64_t") long end_dim, @ByVal Dimname out_dim); public native @ByVal Tensor flatten(@ByVal Dimname start_dim, @ByVal Dimname end_dim, @ByVal Dimname out_dim); public native @ByVal Tensor flatten(@ByVal DimnameArrayRef dims, @ByVal Dimname out_dim); + public native @ByVal Tensor flatten(@ByVal DimnameVector dims, @ByVal Dimname out_dim); public native @ByVal Tensor unflatten(@Cast("int64_t") long dim, @ByVal LongArrayRef sizes); public native @ByVal Tensor unflatten(@Cast("int64_t") long dim, @ByVal @Cast({"int64_t*", "c10::ArrayRef", "std::vector&"}) @StdVector("int64_t") long... sizes); public native @ByVal Tensor unflatten_symint(@Cast("int64_t") long dim, @ByVal SymIntArrayRef sizes); public native @ByVal Tensor unflatten(@ByVal Dimname dim, @ByVal LongArrayRef sizes, @ByVal DimnameArrayRef names); - public native @ByVal Tensor unflatten(@ByVal Dimname dim, @ByVal @Cast({"int64_t*", "c10::ArrayRef", "std::vector&"}) @StdVector("int64_t") long[] sizes, @ByVal DimnameArrayRef names); + public native @ByVal Tensor unflatten(@ByVal Dimname dim, @ByVal @Cast({"int64_t*", "c10::ArrayRef", "std::vector&"}) @StdVector("int64_t") long[] sizes, @ByVal DimnameVector names); public native @ByVal Tensor unflatten_symint(@ByVal Dimname dim, @ByVal SymIntArrayRef sizes, @ByVal DimnameArrayRef names); + public native @ByVal Tensor unflatten_symint(@ByVal Dimname dim, @ByVal SymIntArrayRef sizes, @ByVal DimnameVector names); public native @ByRef Tensor fill_(@Const @ByRef Scalar value); public native @ByRef Tensor fill_(@Const @ByRef Tensor value); public native @ByVal Tensor floor(); @@ -749,6 +759,8 @@ private native void allocate( public native @ByVal Tensor logsumexp(@ByVal @Cast({"int64_t*", "c10::ArrayRef", "std::vector&"}) @StdVector("int64_t") long... dim); public native @ByVal Tensor logsumexp(@ByVal DimnameArrayRef dim, @Cast("bool") boolean keepdim/*=false*/); public native @ByVal Tensor logsumexp(@ByVal DimnameArrayRef dim); + public native @ByVal Tensor logsumexp(@ByVal DimnameVector dim, @Cast("bool") boolean keepdim/*=false*/); + public native @ByVal Tensor logsumexp(@ByVal DimnameVector dim); public native @ByVal Tensor matmul(@Const @ByRef Tensor other); public native @ByVal Tensor matrix_power(@Cast("int64_t") long n); public native @ByVal Tensor matrix_exp(); @@ -769,6 +781,8 @@ private native void allocate( public native @ByVal Tensor mean(@ByVal @Cast({"int64_t*", "c10::ArrayRef", "std::vector&"}) @StdVector long... dim); public native @ByVal Tensor mean(@ByVal DimnameArrayRef dim, @Cast("bool") boolean keepdim/*=false*/, @ByVal(nullValue = "c10::optional(c10::nullopt)") ScalarTypeOptional dtype); public native @ByVal Tensor mean(@ByVal DimnameArrayRef dim); + public native @ByVal Tensor mean(@ByVal DimnameVector dim, @Cast("bool") boolean keepdim/*=false*/, @ByVal(nullValue = "c10::optional(c10::nullopt)") ScalarTypeOptional dtype); + public native @ByVal Tensor mean(@ByVal DimnameVector dim); public native @ByVal Tensor nanmean(@ByVal(nullValue = "at::OptionalIntArrayRef(c10::nullopt)") LongArrayRefOptional dim, @Cast("bool") boolean keepdim/*=false*/, @ByVal(nullValue = "c10::optional(c10::nullopt)") ScalarTypeOptional dtype); public native @ByVal Tensor nanmean(); public native @ByVal Tensor nanmean(@ByVal(nullValue = "at::OptionalIntArrayRef(c10::nullopt)") @Cast({"int64_t*", "c10::ArrayRef", "std::vector&"}) @StdVector long[] dim, @Cast("bool") boolean keepdim/*=false*/, @ByVal(nullValue = "c10::optional(c10::nullopt)") ScalarTypeOptional dtype); @@ -971,6 +985,8 @@ private native void allocate( public native @ByVal Tensor sum(@ByVal @Cast({"int64_t*", "c10::ArrayRef", "std::vector&"}) @StdVector long... dim); public native @ByVal Tensor sum(@ByVal DimnameArrayRef dim, @Cast("bool") boolean keepdim/*=false*/, @ByVal(nullValue = "c10::optional(c10::nullopt)") ScalarTypeOptional dtype); public native @ByVal Tensor sum(@ByVal DimnameArrayRef dim); + public native @ByVal Tensor sum(@ByVal DimnameVector dim, @Cast("bool") boolean keepdim/*=false*/, @ByVal(nullValue = "c10::optional(c10::nullopt)") ScalarTypeOptional dtype); + public native @ByVal Tensor sum(@ByVal DimnameVector dim); public native @ByVal Tensor nansum(@ByVal(nullValue = "at::OptionalIntArrayRef(c10::nullopt)") LongArrayRefOptional dim, @Cast("bool") boolean keepdim/*=false*/, @ByVal(nullValue = "c10::optional(c10::nullopt)") ScalarTypeOptional dtype); public native @ByVal Tensor nansum(); public native @ByVal Tensor nansum(@ByVal(nullValue = "at::OptionalIntArrayRef(c10::nullopt)") @Cast({"int64_t*", "c10::ArrayRef", "std::vector&"}) @StdVector long[] dim, @Cast("bool") boolean keepdim/*=false*/, @ByVal(nullValue = "c10::optional(c10::nullopt)") ScalarTypeOptional dtype); @@ -991,8 +1007,12 @@ private native void allocate( public native @ByVal Tensor std(@ByVal(nullValue = "at::OptionalIntArrayRef(c10::nullopt)") @Cast({"int64_t*", "c10::ArrayRef", "std::vector&"}) @StdVector long[] dim, @Const @ByRef(nullValue = "c10::optional(c10::nullopt)") ScalarOptional correction, @Cast("bool") boolean keepdim/*=false*/); public native @ByVal Tensor std(@ByVal DimnameArrayRef dim, @Cast("bool") boolean unbiased, @Cast("bool") boolean keepdim/*=false*/); public native @ByVal Tensor std(@ByVal DimnameArrayRef dim, @Cast("bool") boolean unbiased); + public native @ByVal Tensor std(@ByVal DimnameVector dim, @Cast("bool") boolean unbiased, @Cast("bool") boolean keepdim/*=false*/); + public native @ByVal Tensor std(@ByVal DimnameVector dim, @Cast("bool") boolean unbiased); public native @ByVal Tensor std(@ByVal DimnameArrayRef dim, @Const @ByRef(nullValue = "c10::optional(c10::nullopt)") ScalarOptional correction, @Cast("bool") boolean keepdim/*=false*/); public native @ByVal Tensor std(@ByVal DimnameArrayRef dim); + public native @ByVal Tensor std(@ByVal DimnameVector dim, @Const @ByRef(nullValue = "c10::optional(c10::nullopt)") ScalarOptional correction, @Cast("bool") boolean keepdim/*=false*/); + public native @ByVal Tensor std(@ByVal DimnameVector dim); public native @ByVal Tensor prod(@ByVal(nullValue = "c10::optional(c10::nullopt)") ScalarTypeOptional dtype); public native @ByVal Tensor prod(); public native @ByVal Tensor prod(@Cast("int64_t") long dim, @Cast("bool") boolean keepdim/*=false*/, @ByVal(nullValue = "c10::optional(c10::nullopt)") ScalarTypeOptional dtype); @@ -1045,8 +1065,12 @@ private native void allocate( public native @ByVal Tensor var(@ByVal(nullValue = "at::OptionalIntArrayRef(c10::nullopt)") @Cast({"int64_t*", "c10::ArrayRef", "std::vector&"}) @StdVector long[] dim, @Const @ByRef(nullValue = "c10::optional(c10::nullopt)") ScalarOptional correction, @Cast("bool") boolean keepdim/*=false*/); public native @ByVal Tensor var(@ByVal DimnameArrayRef dim, @Cast("bool") boolean unbiased, @Cast("bool") boolean keepdim/*=false*/); public native @ByVal Tensor var(@ByVal DimnameArrayRef dim, @Cast("bool") boolean unbiased); + public native @ByVal Tensor var(@ByVal DimnameVector dim, @Cast("bool") boolean unbiased, @Cast("bool") boolean keepdim/*=false*/); + public native @ByVal Tensor var(@ByVal DimnameVector dim, @Cast("bool") boolean unbiased); public native @ByVal Tensor var(@ByVal DimnameArrayRef dim, @Const @ByRef(nullValue = "c10::optional(c10::nullopt)") ScalarOptional correction, @Cast("bool") boolean keepdim/*=false*/); public native @ByVal Tensor var(@ByVal DimnameArrayRef dim); + public native @ByVal Tensor var(@ByVal DimnameVector dim, @Const @ByRef(nullValue = "c10::optional(c10::nullopt)") ScalarOptional correction, @Cast("bool") boolean keepdim/*=false*/); + public native @ByVal Tensor var(@ByVal DimnameVector dim); public native @ByVal Tensor view_as(@Const @ByRef Tensor other); public native @ByVal Tensor where(@Const @ByRef Tensor condition, @Const @ByRef Tensor other); public native @ByVal Tensor where(@Const @ByRef Tensor condition, @Const @ByRef Scalar other); @@ -1060,8 +1084,11 @@ private native void allocate( public native @ByVal Tensor norm(@Const @ByRef ScalarOptional p, @ByVal @Cast({"int64_t*", "c10::ArrayRef", "std::vector&"}) @StdVector("int64_t") long[] dim, @Cast("bool") boolean keepdim/*=false*/); public native @ByVal Tensor norm(@Const @ByRef ScalarOptional p, @ByVal @Cast({"int64_t*", "c10::ArrayRef", "std::vector&"}) @StdVector("int64_t") long... dim); public native @ByVal Tensor norm(@Const @ByRef ScalarOptional p, @ByVal DimnameArrayRef dim, @Cast("bool") boolean keepdim, ScalarType dtype); + public native @ByVal Tensor norm(@Const @ByRef ScalarOptional p, @ByVal DimnameVector dim, @Cast("bool") boolean keepdim, ScalarType dtype); public native @ByVal Tensor norm(@Const @ByRef ScalarOptional p, @ByVal DimnameArrayRef dim, @Cast("bool") boolean keepdim/*=false*/); public native @ByVal Tensor norm(@Const @ByRef ScalarOptional p, @ByVal DimnameArrayRef dim); + public native @ByVal Tensor norm(@Const @ByRef ScalarOptional p, @ByVal DimnameVector dim, @Cast("bool") boolean keepdim/*=false*/); + public native @ByVal Tensor norm(@Const @ByRef ScalarOptional p, @ByVal DimnameVector dim); public native @ByVal T_TensorTensor_T frexp(); public native @ByVal Tensor clone(@ByVal(nullValue = "c10::optional(c10::nullopt)") MemoryFormatOptional memory_format); public native @ByVal Tensor clone(); @@ -1625,6 +1652,7 @@ private native void allocate( public native @ByVal Tensor data(); public native void _backward(@ByVal TensorArrayRef inputs, @Const @ByRef TensorOptional gradient, @ByVal BoolOptional keep_graph, @Cast("bool") boolean create_graph); + public native void _backward(@ByVal TensorVector inputs, @Const @ByRef TensorOptional gradient, @ByVal BoolOptional keep_graph, @Cast("bool") boolean create_graph); public native @Const @ByRef Tensor requires_grad_(@Cast("bool") boolean _requires_grad/*=true*/); public native @Const @ByRef Tensor requires_grad_(); diff --git a/pytorch/src/gen/java/org/bytedeco/pytorch/TensorArrayRefOptional.java b/pytorch/src/gen/java/org/bytedeco/pytorch/TensorArrayRefOptional.java index 54ee280728d..450978f51e0 100644 --- a/pytorch/src/gen/java/org/bytedeco/pytorch/TensorArrayRefOptional.java +++ b/pytorch/src/gen/java/org/bytedeco/pytorch/TensorArrayRefOptional.java @@ -23,6 +23,7 @@ public class TensorArrayRefOptional extends Pointer { /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public TensorArrayRefOptional(Pointer p) { super(p); } public TensorArrayRefOptional(TensorArrayRef value) { this(); put(value); } + public TensorArrayRefOptional(TensorVector value) { this(); put(value); } public TensorArrayRefOptional() { allocate(); } private native void allocate(); public native @Name("operator =") @ByRef TensorArrayRefOptional put(@ByRef TensorArrayRefOptional x); @@ -31,5 +32,6 @@ public class TensorArrayRefOptional extends Pointer { public native void reset(); public native @Name("value") @ByRef TensorArrayRef get(); @ValueSetter public native TensorArrayRefOptional put(@ByRef TensorArrayRef value); + @ValueSetter public native TensorArrayRefOptional put(@ByRef TensorVector value); } diff --git a/pytorch/src/gen/java/org/bytedeco/pytorch/TensorElementReference.java b/pytorch/src/gen/java/org/bytedeco/pytorch/TensorElementReference.java index 8834ac5b11f..8bda59f178a 100644 --- a/pytorch/src/gen/java/org/bytedeco/pytorch/TensorElementReference.java +++ b/pytorch/src/gen/java/org/bytedeco/pytorch/TensorElementReference.java @@ -35,7 +35,8 @@ public class TensorElementReference extends Pointer { public native @Const @ByRef IValue get(); - + private static native @Namespace void swap(@ByRef(true) TensorElementReference lhs, @ByRef(true) TensorElementReference rhs); + public void swap(TensorElementReference rhs) { swap(this, rhs); } diff --git a/pytorch/src/gen/java/org/bytedeco/pytorch/TensorExampleStack.java b/pytorch/src/gen/java/org/bytedeco/pytorch/TensorExampleStack.java index c05d4c21576..a079551b6aa 100644 --- a/pytorch/src/gen/java/org/bytedeco/pytorch/TensorExampleStack.java +++ b/pytorch/src/gen/java/org/bytedeco/pytorch/TensorExampleStack.java @@ -18,25 +18,10 @@ import static org.bytedeco.pytorch.global.torch.*; -/** A {@code Collation} for {@code Example} types that stacks all data - * tensors into one tensor. */ -@Name("torch::data::transforms::Stack") @Properties(inherit = org.bytedeco.pytorch.presets.torch.class) +@Name("torch::data::transforms::Stack >") @Opaque @Properties(inherit = org.bytedeco.pytorch.presets.torch.class) public class TensorExampleStack extends TensorExampleCollation { - static { Loader.load(); } - /** Default native constructor. */ - public TensorExampleStack() { super((Pointer)null); allocate(); } - /** Native array allocator. Access with {@link Pointer#position(long)}. */ - public TensorExampleStack(long size) { super((Pointer)null); allocateArray(size); } + /** Empty constructor. Calls {@code super((Pointer)null)}. */ + public TensorExampleStack() { super((Pointer)null); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public TensorExampleStack(Pointer p) { super(p); } - private native void allocate(); - private native void allocateArray(long size); - @Override public TensorExampleStack position(long position) { - return (TensorExampleStack)super.position(position); - } - @Override public TensorExampleStack getPointer(long i) { - return new TensorExampleStack((Pointer)this).offsetAddress(i); - } - - public native @ByVal @Cast("torch::data::TensorExample*") Example apply_batch(@Cast("torch::data::TensorExample*") @StdVector Example examples); } diff --git a/pytorch/src/gen/java/org/bytedeco/pytorch/TensorIterator.java b/pytorch/src/gen/java/org/bytedeco/pytorch/TensorIterator.java index 063586f8b4e..460178b28de 100644 --- a/pytorch/src/gen/java/org/bytedeco/pytorch/TensorIterator.java +++ b/pytorch/src/gen/java/org/bytedeco/pytorch/TensorIterator.java @@ -83,5 +83,5 @@ public native void set_output_raw_strided( @ByVal @Cast({"int64_t*", "c10::ArrayRef", "std::vector&"}) @StdVector("int64_t") long[] sizes, @ByVal @Cast({"int64_t*", "c10::ArrayRef", "std::vector&"}) @StdVector("int64_t") long[] strides, @ByVal TensorOptions options, - @ByVal DimnameArrayRef names); + @ByVal DimnameVector names); } diff --git a/pytorch/src/gen/java/org/bytedeco/pytorch/TensorIteratorBase.java b/pytorch/src/gen/java/org/bytedeco/pytorch/TensorIteratorBase.java index 2a5d0fc3ca0..70de45d94d3 100644 --- a/pytorch/src/gen/java/org/bytedeco/pytorch/TensorIteratorBase.java +++ b/pytorch/src/gen/java/org/bytedeco/pytorch/TensorIteratorBase.java @@ -182,7 +182,7 @@ public native void set_output_raw_strided( @ByVal @Cast({"int64_t*", "c10::ArrayRef", "std::vector&"}) @StdVector("int64_t") long[] sizes, @ByVal @Cast({"int64_t*", "c10::ArrayRef", "std::vector&"}) @StdVector("int64_t") long[] strides, @ByVal TensorOptions options, - @ByVal DimnameArrayRef names); + @ByVal DimnameVector names); // #define TORCH_DISALLOW_TEMPORARIES_IMPL(methodname, maybestatic) // maybestatic void methodname( diff --git a/pytorch/src/gen/java/org/bytedeco/pytorch/TensorList.java b/pytorch/src/gen/java/org/bytedeco/pytorch/TensorList.java index 5d358a23abd..1c3104261b5 100644 --- a/pytorch/src/gen/java/org/bytedeco/pytorch/TensorList.java +++ b/pytorch/src/gen/java/org/bytedeco/pytorch/TensorList.java @@ -46,6 +46,8 @@ public class TensorList extends Pointer { */ public TensorList(@ByVal TensorArrayRef initial_values) { super((Pointer)null); allocate(initial_values); } private native void allocate(@ByVal TensorArrayRef initial_values); + public TensorList(@ByVal TensorVector initial_values) { super((Pointer)null); allocate(initial_values); } + private native void allocate(@ByVal TensorVector initial_values); /** * Create a generic list with runtime type information. diff --git a/pytorch/src/gen/java/org/bytedeco/pytorch/TensorName.java b/pytorch/src/gen/java/org/bytedeco/pytorch/TensorName.java index bc5149b11e6..113e8f3d744 100644 --- a/pytorch/src/gen/java/org/bytedeco/pytorch/TensorName.java +++ b/pytorch/src/gen/java/org/bytedeco/pytorch/TensorName.java @@ -47,6 +47,8 @@ public class TensorName extends Pointer { public TensorName(@ByVal DimnameArrayRef origin, int origin_idx) { super((Pointer)null); allocate(origin, origin_idx); } private native void allocate(@ByVal DimnameArrayRef origin, int origin_idx); + public TensorName(@ByVal DimnameVector origin, int origin_idx) { super((Pointer)null); allocate(origin, origin_idx); } + private native void allocate(@ByVal DimnameVector origin, int origin_idx); // op_name is only used for error reporting. public native @Cast({"", "at::namedinference::TensorName&&"}) @StdMove TensorName unify(@Cast({"", "at::namedinference::TensorName&&"}) @StdMove TensorName other, @Cast("const char*") BytePointer op_name); diff --git a/pytorch/src/gen/java/org/bytedeco/pytorch/TensorNames.java b/pytorch/src/gen/java/org/bytedeco/pytorch/TensorNames.java index 227c8a6c60d..bd3894e0068 100644 --- a/pytorch/src/gen/java/org/bytedeco/pytorch/TensorNames.java +++ b/pytorch/src/gen/java/org/bytedeco/pytorch/TensorNames.java @@ -26,12 +26,16 @@ public class TensorNames extends Pointer { public TensorNames(@ByVal DimnameArrayRef names) { super((Pointer)null); allocate(names); } private native void allocate(@ByVal DimnameArrayRef names); + public TensorNames(@ByVal DimnameVector names) { super((Pointer)null); allocate(names); } + private native void allocate(@ByVal DimnameVector names); // Create TensorNames from names[start:end]. Each individual TensorName stores // `names`, NOT names[start:end], because the original tensor's names are // `names`. public TensorNames(@ByVal DimnameArrayRef names, @Cast("int64_t") long start, @Cast("int64_t") long end) { super((Pointer)null); allocate(names, start, end); } private native void allocate(@ByVal DimnameArrayRef names, @Cast("int64_t") long start, @Cast("int64_t") long end); + public TensorNames(@ByVal DimnameVector names, @Cast("int64_t") long start, @Cast("int64_t") long end) { super((Pointer)null); allocate(names, start, end); } + private native void allocate(@ByVal DimnameVector names, @Cast("int64_t") long start, @Cast("int64_t") long end); // op_name is only used for error reporting. public native @ByRef TensorNames unifyFromRightInplace( diff --git a/pytorch/src/gen/java/org/bytedeco/pytorch/TensorOptionalElementReference.java b/pytorch/src/gen/java/org/bytedeco/pytorch/TensorOptionalElementReference.java index 25cf4f9985f..7a847b2dda3 100644 --- a/pytorch/src/gen/java/org/bytedeco/pytorch/TensorOptionalElementReference.java +++ b/pytorch/src/gen/java/org/bytedeco/pytorch/TensorOptionalElementReference.java @@ -35,7 +35,8 @@ public class TensorOptionalElementReference extends Pointer { public native @Const @ByRef IValue get(); - + private static native @Namespace void swap(@ByRef(true) TensorOptionalElementReference lhs, @ByRef(true) TensorOptionalElementReference rhs); + public void swap(TensorOptionalElementReference rhs) { swap(this, rhs); } diff --git a/pytorch/src/gen/java/org/bytedeco/pytorch/TensorOptionalList.java b/pytorch/src/gen/java/org/bytedeco/pytorch/TensorOptionalList.java index 50b5e98badf..850dd68aa5c 100644 --- a/pytorch/src/gen/java/org/bytedeco/pytorch/TensorOptionalList.java +++ b/pytorch/src/gen/java/org/bytedeco/pytorch/TensorOptionalList.java @@ -46,6 +46,8 @@ public class TensorOptionalList extends Pointer { */ public TensorOptionalList(@ByVal TensorOptionalArrayRef initial_values) { super((Pointer)null); allocate(initial_values); } private native void allocate(@ByVal TensorOptionalArrayRef initial_values); + public TensorOptionalList(@ByVal TensorOptionalVector initial_values) { super((Pointer)null); allocate(initial_values); } + private native void allocate(@ByVal TensorOptionalVector initial_values); /** * Create a generic list with runtime type information. diff --git a/pytorch/src/gen/java/org/bytedeco/pytorch/TypeArrayRef.java b/pytorch/src/gen/java/org/bytedeco/pytorch/TypeArrayRef.java index 59140d35d33..46ba9d30057 100644 --- a/pytorch/src/gen/java/org/bytedeco/pytorch/TypeArrayRef.java +++ b/pytorch/src/gen/java/org/bytedeco/pytorch/TypeArrayRef.java @@ -97,6 +97,7 @@ public class TypeArrayRef extends Pointer { /** equals - Check for element-wise equality. */ public native @Cast("const bool") boolean equals(@ByVal TypeArrayRef RHS); + public native @Cast("const bool") boolean equals(@ByVal TypeVector RHS); /** slice(n, m) - Take M elements of the array starting at element N */ public native @Const @ByVal TypeArrayRef slice(@Cast("size_t") long N, @Cast("size_t") long M); diff --git a/pytorch/src/gen/java/org/bytedeco/pytorch/ValueArrayRef.java b/pytorch/src/gen/java/org/bytedeco/pytorch/ValueArrayRef.java index 702fdf21fd2..ea084d497b6 100644 --- a/pytorch/src/gen/java/org/bytedeco/pytorch/ValueArrayRef.java +++ b/pytorch/src/gen/java/org/bytedeco/pytorch/ValueArrayRef.java @@ -101,6 +101,7 @@ public class ValueArrayRef extends Pointer { /** equals - Check for element-wise equality. */ public native @Cast("const bool") boolean equals(@ByVal ValueArrayRef RHS); + public native @Cast("const bool") boolean equals(@ByVal ValueVector RHS); /** slice(n, m) - Take M elements of the array starting at element N */ public native @Const @ByVal ValueArrayRef slice(@Cast("size_t") long N, @Cast("size_t") long M); diff --git a/pytorch/src/gen/java/org/bytedeco/pytorch/VariableHooksInterface.java b/pytorch/src/gen/java/org/bytedeco/pytorch/VariableHooksInterface.java index bcb9a4d69cc..925e262ade7 100644 --- a/pytorch/src/gen/java/org/bytedeco/pytorch/VariableHooksInterface.java +++ b/pytorch/src/gen/java/org/bytedeco/pytorch/VariableHooksInterface.java @@ -40,6 +40,7 @@ public class VariableHooksInterface extends Pointer { public native void retain_grad(@Const @ByRef TensorBase arg0); public native @Cast("bool") boolean retains_grad(@Const @ByRef TensorBase arg0); public native void _backward(@Const @ByRef Tensor arg0, @ByVal TensorArrayRef arg1, @Const @ByRef TensorOptional arg2, @ByVal BoolOptional arg3, @Cast("bool") boolean arg4); + public native void _backward(@Const @ByRef Tensor arg0, @ByVal TensorVector arg1, @Const @ByRef TensorOptional arg2, @ByVal BoolOptional arg3, @Cast("bool") boolean arg4); public native void requires_grad_(@Const @ByRef TensorBase arg0, @Cast("bool") boolean arg1); public native void basic_autograd_not_implemented_fallback(@Const @ByRef OperatorHandle op, @ByVal DispatchKeySet dispatch_keys, IValueVector stack); } diff --git a/pytorch/src/gen/java/org/bytedeco/pytorch/class_.java b/pytorch/src/gen/java/org/bytedeco/pytorch/class_.java deleted file mode 100644 index c70b60d5c01..00000000000 --- a/pytorch/src/gen/java/org/bytedeco/pytorch/class_.java +++ /dev/null @@ -1,26 +0,0 @@ -// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE - -package org.bytedeco.pytorch; - -import org.bytedeco.pytorch.Allocator; -import org.bytedeco.pytorch.Function; -import org.bytedeco.pytorch.functions.*; -import org.bytedeco.pytorch.Module; -import org.bytedeco.javacpp.annotation.Cast; -import java.nio.*; -import org.bytedeco.javacpp.*; -import org.bytedeco.javacpp.annotation.*; - -import static org.bytedeco.javacpp.presets.javacpp.*; -import static org.bytedeco.openblas.global.openblas_nolapack.*; -import static org.bytedeco.openblas.global.openblas.*; - -import static org.bytedeco.pytorch.global.torch.*; - -@Namespace("pybind11") @Opaque @Properties(inherit = org.bytedeco.pytorch.presets.torch.class) -public class class_ extends Pointer { - /** Empty constructor. Calls {@code super((Pointer)null)}. */ - public class_() { super((Pointer)null); } - /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ - public class_(Pointer p) { super(p); } -} diff --git a/pytorch/src/gen/java/org/bytedeco/pytorch/global/torch.java b/pytorch/src/gen/java/org/bytedeco/pytorch/global/torch.java index 296eb21d819..9cbb7c23035 100644 --- a/pytorch/src/gen/java/org/bytedeco/pytorch/global/torch.java +++ b/pytorch/src/gen/java/org/bytedeco/pytorch/global/torch.java @@ -1463,9 +1463,13 @@ public class torch extends org.bytedeco.pytorch.presets.torch { -@Namespace("c10::detail") public static native @Cast("std::ostream*") @ByRef Pointer _str(@Cast("std::ostream*") @ByRef Pointer ss); -@Namespace("c10::detail") public static native @Cast("std::ostream*") @ByRef @Name("_str") Pointer _strCompileTimeEmptyString(@Cast("std::ostream*") @ByRef Pointer ss, @Const @ByRef CompileTimeEmptyString t); + + + + + + // Specializations for already-a-string types. @@ -4484,136 +4488,107 @@ public class torch extends org.bytedeco.pytorch.presets.torch { // namespace std -// Parsed from c10/util/Half.h +// Parsed from c10/util/complex_utils.h + +// #if !defined(C10_INTERNAL_INCLUDE_COMPLEX_REMAINING_H) +// #error +// "c10/util/complex_utils.h is not meant to be individually included. Include c10/util/complex.h instead." +// #endif + +// #include + +// Extract double from std::complex; is identity otherwise +// TODO: Write in more idiomatic C++17 + + // namespace c10 + + // namespace std + + +// Parsed from c10/util/complex.h // #pragma once -/** Defines the Half type (half-precision floating-point) including conversions - * to standard C types and basic arithmetic operations. Note that arithmetic - * operations are implemented by converting to floating point and - * performing the operation in float32, instead of using CUDA half intrinsics. - * Most uses of this type within ATen are memory bound, including the - * element-wise kernels, and the half intrinsics aren't efficient on all GPUs. - * If you are writing a compute bound kernel, you can use the CUDA half - * intrinsics directly on the Half type from device code. */ +// #include // #include -// #include -// #include -// #include -// #include -// #include -// #if defined(__cplusplus) && (__cplusplus >= 201103L) -// #include -// #include -// #elif !defined(__OPENCL_VERSION__) -// #include -// #include +// #if defined(__CUDACC__) || defined(__HIPCC__) // #endif -// #ifdef _MSC_VER -// #include +// #if C10_CLANG_HAS_WARNING("-Wimplicit-float-conversion") // #endif +// #if C10_CLANG_HAS_WARNING("-Wfloat-conversion") +// #endif +// Targeting ../DoubleComplex.java -// #include -// #include -// #include -// #include -// #include -// #include -// #include -// #include -// #include -// #ifdef __CUDACC__ -// #include -// #endif +// Targeting ../FloatComplex.java -// #ifdef __HIPCC__ -// #include -// #endif -// #if defined(CL_SYCL_LANGUAGE_VERSION) -// #include // for SYCL 1.2.1 -// #elif defined(SYCL_LANGUAGE_VERSION) -// #include // for SYCL 2020 -// #endif +// Targeting ../HalfComplex.java -// #include // operator typeid -/* - * Convert a 16-bit floating-point number in IEEE half-precision format, in bit - * representation, to a 32-bit floating-point number in IEEE single-precision - * format, in bit representation. - * - * @note The implementation doesn't use any floating-point operations. - */ -@Namespace("c10::detail") public static native @Cast("uint32_t") int fp16_ieee_to_fp32_bits(@Cast("uint16_t") short h); -/* - * Convert a 16-bit floating-point number in IEEE half-precision format, in bit - * representation, to a 32-bit floating-point number in IEEE single-precision - * format. - * - * @note The implementation relies on IEEE-like (no assumption about rounding - * mode and no operations on denormals) floating-point operations and bitcasts - * between integer and floating-point variables. - */ -@Namespace("c10::detail") public static native float fp16_ieee_to_fp32_value(@Cast("uint16_t") short h); -/* - * Convert a 32-bit floating-point number in IEEE single-precision format to a - * 16-bit floating-point number in IEEE half-precision format, in bit - * representation. - * - * @note The implementation relies on IEEE-like (no assumption about rounding - * mode and no operations on denormals) floating-point operations and bitcasts - * between integer and floating-point variables. - */ -@Namespace("c10::detail") public static native @Cast("uint16_t") short fp16_ieee_from_fp32_value(float f); -// Targeting ../Half.java -// Targeting ../HalfComplex.java -// In some versions of MSVC, there will be a compiler error when building. -// C4146: unary minus operator applied to unsigned type, result still unsigned -// C4804: unsafe use of type 'bool' in operation -// It can be addressed by disabling the following warning. -// #ifdef _MSC_VER -// #pragma warning(push) -// #pragma warning(disable : 4146) -// #pragma warning(disable : 4804) -// #pragma warning(disable : 4018) -// #endif + // namespace complex_literals -// The overflow checks may involve float to int conversion which may -// trigger precision loss warning. Re-enable the warning once the code -// is fixed. See T58053069. -// #if C10_CLANG_HAS_WARNING("-Wimplicit-float-conversion") -// #endif +// Define operators between integral scalars and c10::complex. std::complex does +// not support this when T is a floating-point number. This is useful because it +// saves a lot of "static_cast" when operate a complex and an integer. This +// makes the code both less verbose and potentially more efficient. +// #define COMPLEX_INTEGER_OP_TEMPLATE_CONDITION +// typename std::enable_if_t< +// std::is_floating_point::value && std::is_integral::value, +// int> = 0 -// bool can be converted to any type. -// Without specializing on bool, in pytorch_linux_trusty_py2_7_9_build: -// `error: comparison of constant '255' with boolean expression is always false` -// for `f > limit::max()` below +// #undef COMPLEX_INTEGER_OP_TEMPLATE_CONDITION -// skip isnan and isinf check for integral types + // namespace c10 -// #ifdef _MSC_VER -// #pragma warning(pop) +// std functions +// +// The implementation of these functions also follow the design of C++20 + +// #if defined(USE_ROCM) +// #else +// #define ROCm_Bug(x) x // #endif -@Namespace("c10") public static native @Cast("std::ostream*") @ByRef @Name("operator <<") Pointer shiftLeft(@Cast("std::ostream*") @ByRef Pointer out, @Const @ByRef Half value); +// #undef ROCm_Bug + +// For std::conj, there are other versions of it: +// constexpr std::complex conj( float z ); +// template< class DoubleOrInteger > +// constexpr std::complex conj( DoubleOrInteger z ); +// constexpr std::complex conj( long double z ); +// These are not implemented +// TODO(@zasdfgbnm): implement them as c10::conj + +// Thrust does not have complex --> complex version of thrust::proj, +// so this function is not implemented at c10 right now. +// TODO(@zasdfgbnm): implement it by ourselves + +// There is no c10 version of std::polar, because std::polar always +// returns std::complex. Use c10::polar instead; + + // namespace std // namespace c10 -// #include // IWYU pragma: keep +// #define C10_INTERNAL_INCLUDE_COMPLEX_REMAINING_H +// math functions are included in a separate file +// #include // IWYU pragma: keep +// utilities for complex types +// #include // IWYU pragma: keep +// #undef C10_INTERNAL_INCLUDE_COMPLEX_REMAINING_H // Parsed from c10/util/Half-inl.h @@ -4754,104 +4729,135 @@ public class torch extends org.bytedeco.pytorch.presets.torch { -// Parsed from c10/util/complex_utils.h - -// #if !defined(C10_INTERNAL_INCLUDE_COMPLEX_REMAINING_H) -// #error -// "c10/util/complex_utils.h is not meant to be individually included. Include c10/util/complex.h instead." -// #endif - -// #include - -// Extract double from std::complex; is identity otherwise -// TODO: Write in more idiomatic C++17 - - // namespace c10 - - // namespace std - - -// Parsed from c10/util/complex.h +// Parsed from c10/util/Half.h // #pragma once -// #include +/** Defines the Half type (half-precision floating-point) including conversions + * to standard C types and basic arithmetic operations. Note that arithmetic + * operations are implemented by converting to floating point and + * performing the operation in float32, instead of using CUDA half intrinsics. + * Most uses of this type within ATen are memory bound, including the + * element-wise kernels, and the half intrinsics aren't efficient on all GPUs. + * If you are writing a compute bound kernel, you can use the CUDA half + * intrinsics directly on the Half type from device code. */ // #include +// #include +// #include +// #include +// #include +// #include -// #if defined(__CUDACC__) || defined(__HIPCC__) +// #if defined(__cplusplus) && (__cplusplus >= 201103L) +// #include +// #include +// #elif !defined(__OPENCL_VERSION__) +// #include +// #include // #endif -// #if C10_CLANG_HAS_WARNING("-Wimplicit-float-conversion") -// #endif -// #if C10_CLANG_HAS_WARNING("-Wfloat-conversion") +// #ifdef _MSC_VER +// #include // #endif -// Targeting ../DoubleComplex.java - - -// Targeting ../FloatComplex.java - - +// #include +// #include +// #include +// #include +// #include +// #include +// #include +// #include +// #include +// #ifdef __CUDACC__ +// #include +// #endif +// #ifdef __HIPCC__ +// #include +// #endif +// #if defined(CL_SYCL_LANGUAGE_VERSION) +// #include // for SYCL 1.2.1 +// #elif defined(SYCL_LANGUAGE_VERSION) +// #include // for SYCL 2020 +// #endif +// #include // operator typeid +/* + * Convert a 16-bit floating-point number in IEEE half-precision format, in bit + * representation, to a 32-bit floating-point number in IEEE single-precision + * format, in bit representation. + * + * @note The implementation doesn't use any floating-point operations. + */ +@Namespace("c10::detail") public static native @Cast("uint32_t") int fp16_ieee_to_fp32_bits(@Cast("uint16_t") short h); +/* + * Convert a 16-bit floating-point number in IEEE half-precision format, in bit + * representation, to a 32-bit floating-point number in IEEE single-precision + * format. + * + * @note The implementation relies on IEEE-like (no assumption about rounding + * mode and no operations on denormals) floating-point operations and bitcasts + * between integer and floating-point variables. + */ +@Namespace("c10::detail") public static native float fp16_ieee_to_fp32_value(@Cast("uint16_t") short h); +/* + * Convert a 32-bit floating-point number in IEEE single-precision format to a + * 16-bit floating-point number in IEEE half-precision format, in bit + * representation. + * + * @note The implementation relies on IEEE-like (no assumption about rounding + * mode and no operations on denormals) floating-point operations and bitcasts + * between integer and floating-point variables. + */ +@Namespace("c10::detail") public static native @Cast("uint16_t") short fp16_ieee_from_fp32_value(float f); - // namespace complex_literals -// Define operators between integral scalars and c10::complex. std::complex does -// not support this when T is a floating-point number. This is useful because it -// saves a lot of "static_cast" when operate a complex and an integer. This -// makes the code both less verbose and potentially more efficient. -// #define COMPLEX_INTEGER_OP_TEMPLATE_CONDITION -// typename std::enable_if_t< -// std::is_floating_point::value && std::is_integral::value, -// int> = 0 +// Targeting ../Half.java -// #undef COMPLEX_INTEGER_OP_TEMPLATE_CONDITION - // namespace c10 -// std functions -// -// The implementation of these functions also follow the design of C++20 +// TODO : move to complex.h -// #if defined(USE_ROCM) -// #else -// #define ROCm_Bug(x) x +// In some versions of MSVC, there will be a compiler error when building. +// C4146: unary minus operator applied to unsigned type, result still unsigned +// C4804: unsafe use of type 'bool' in operation +// It can be addressed by disabling the following warning. +// #ifdef _MSC_VER +// #pragma warning(push) +// #pragma warning(disable : 4146) +// #pragma warning(disable : 4804) +// #pragma warning(disable : 4018) // #endif -// #undef ROCm_Bug +// The overflow checks may involve float to int conversion which may +// trigger precision loss warning. Re-enable the warning once the code +// is fixed. See T58053069. +// #if C10_CLANG_HAS_WARNING("-Wimplicit-float-conversion") +// #endif -// For std::conj, there are other versions of it: -// constexpr std::complex conj( float z ); -// template< class DoubleOrInteger > -// constexpr std::complex conj( DoubleOrInteger z ); -// constexpr std::complex conj( long double z ); -// These are not implemented -// TODO(@zasdfgbnm): implement them as c10::conj +// bool can be converted to any type. +// Without specializing on bool, in pytorch_linux_trusty_py2_7_9_build: +// `error: comparison of constant '255' with boolean expression is always false` +// for `f > limit::max()` below -// Thrust does not have complex --> complex version of thrust::proj, -// so this function is not implemented at c10 right now. -// TODO(@zasdfgbnm): implement it by ourselves +// skip isnan and isinf check for integral types -// There is no c10 version of std::polar, because std::polar always -// returns std::complex. Use c10::polar instead; +// #ifdef _MSC_VER +// #pragma warning(pop) +// #endif - // namespace std +@Namespace("c10") public static native @Cast("std::ostream*") @ByRef @Name("operator <<") Pointer shiftLeft(@Cast("std::ostream*") @ByRef Pointer out, @Const @ByRef Half value); // namespace c10 -// #define C10_INTERNAL_INCLUDE_COMPLEX_REMAINING_H -// math functions are included in a separate file -// #include // IWYU pragma: keep -// utilities for complex types -// #include // IWYU pragma: keep -// #undef C10_INTERNAL_INCLUDE_COMPLEX_REMAINING_H +// #include // IWYU pragma: keep // Parsed from c10/util/Float8_e5m2-inl.h @@ -6708,9 +6714,6 @@ public class torch extends org.bytedeco.pytorch.presets.torch { // #include // #include -@Namespace("c10") public static native @StdString BytePointer KeyStrRepr(@StdString BytePointer key); -@Namespace("c10") public static native @StdString String KeyStrRepr(@StdString String key); - @Namespace("c10") public enum RegistryPriority { REGISTRY_FALLBACK(1), REGISTRY_DEFAULT(2), @@ -12618,20 +12621,18 @@ public class torch extends org.bytedeco.pytorch.presets.torch { // Targeting ../OptionalType.java + + // Targeting ../Stride.java -@Namespace("c10") public static native @ByVal StrideOptional merge_primitive( - @Const @ByRef StrideOptional a, - @Const @ByRef StrideOptional b); + // Targeting ../ShapeSymbol.java -@Namespace("c10") public static native @ByVal ShapeSymbol merge_primitive( - @Const @ByRef ShapeSymbol a, - @Const @ByRef ShapeSymbol b); + // Targeting ../SymbolicShape.java @@ -12827,6 +12828,14 @@ public class torch extends org.bytedeco.pytorch.presets.torch { @Namespace("c10") public static native @ByVal TypePtrOptional unifyTypeList( @ByVal TypeArrayRef elements, @Cast("std::ostream*") @ByRef Pointer why_not); +@Namespace("c10") public static native @ByVal TypePtrOptional unifyTypeList( + @ByVal TypeVector elements, + @Cast("std::ostream*") @ByRef Pointer why_not, + @Cast("bool") boolean default_to_union/*=false*/, + @ByVal(nullValue = "c10::TypePtr(nullptr)") Type.TypePtr type_hint); +@Namespace("c10") public static native @ByVal TypePtrOptional unifyTypeList( + @ByVal TypeVector elements, + @Cast("std::ostream*") @ByRef Pointer why_not); // namespace detail // Targeting ../MatchTypeReturn.java @@ -13290,9 +13299,6 @@ public class torch extends org.bytedeco.pytorch.presets.torch { // #include // #include // #include -// Targeting ../class_.java - - @Namespace("c10::raw::weak_intrusive_ptr") public static native void incref(@Cast("c10::intrusive_ptr_target*") Pointer self); @@ -14556,6 +14562,7 @@ public class torch extends org.bytedeco.pytorch.presets.torch { @Namespace("at") public static native @Cast("int64_t") long maybe_wrap_dim(@Cast("int64_t") long dim, TensorImpl tensor); @Namespace("at") public static native @Cast("int64_t") long maybe_wrap_dim(@Cast("int64_t") long dim, @ByVal TensorArrayRef tensors); +@Namespace("at") public static native @Cast("int64_t") long maybe_wrap_dim(@Cast("int64_t") long dim, @ByVal TensorVector tensors); @Namespace("at") public static native @Cast("int64_t") long maybe_wrap_dim( @Cast("int64_t") long dim, @@ -14655,6 +14662,7 @@ public class torch extends org.bytedeco.pytorch.presets.torch { // #include @Namespace("at") public static native @Cast("bool") boolean has_names(@ByVal TensorArrayRef tensors); +@Namespace("at") public static native @Cast("bool") boolean has_names(@ByVal TensorVector tensors); // Converts dim to an positional index. Errors if `dim` cannot be used to // refer to any dimension of tensor. @@ -14662,6 +14670,9 @@ public class torch extends org.bytedeco.pytorch.presets.torch { @Namespace("at") public static native @ByVal @Cast("std::vector*") LongVector dimnames_to_positions( @Const @ByRef Tensor tensor, @ByVal DimnameArrayRef dims); +@Namespace("at") public static native @ByVal @Cast("std::vector*") LongVector dimnames_to_positions( + @Const @ByRef Tensor tensor, + @ByVal DimnameVector dims); // Unifies two DimnameList to produce a third. This is useful for implementing // the named inference rule for binary broadcasting operations like add. @@ -14680,9 +14691,12 @@ public class torch extends org.bytedeco.pytorch.presets.torch { @ByVal DimnameArrayRef names, @ByVal DimnameArrayRef other); @Namespace("at") public static native @StdMove DimnameVector unify_from_right( - @ByVal DimnameArrayRef names, - @ByVal DimnameArrayRef other, + @ByVal DimnameVector names, + @ByVal DimnameVector other, String action/*="broadcast"*/); +@Namespace("at") public static native @StdMove DimnameVector unify_from_right( + @ByVal DimnameVector names, + @ByVal DimnameVector other); @Namespace("at") public static native void reportNYIDimnameOverload(@Cast("const char*") BytePointer op_name); @Namespace("at") public static native void reportNYIDimnameOverload(String op_name); @@ -14729,6 +14743,13 @@ public class torch extends org.bytedeco.pytorch.presets.torch { @Namespace("at::namedinference") public static native @Const @ByRef Tensor propagate_names_if_nonempty( @Const @ByRef Tensor result, @ByVal DimnameArrayRef maybe_names); +@Namespace("at::namedinference") public static native @Const @ByRef Tensor propagate_names_if_nonempty( + @Const @ByRef Tensor result, + @ByVal DimnameVector maybe_names, + @Cast("bool") boolean validate_names/*=false*/); +@Namespace("at::namedinference") public static native @Const @ByRef Tensor propagate_names_if_nonempty( + @Const @ByRef Tensor result, + @ByVal DimnameVector maybe_names); // Propagates `names` to `result`. Only use this if we are certain that there // are names to propagate (that names is not empty). @@ -14739,6 +14760,13 @@ public class torch extends org.bytedeco.pytorch.presets.torch { @Namespace("at::namedinference") public static native @Const @ByRef Tensor propagate_names( @Const @ByRef Tensor result, @ByVal DimnameArrayRef names); +@Namespace("at::namedinference") public static native @Const @ByRef Tensor propagate_names( + @Const @ByRef Tensor result, + @ByVal DimnameVector names, + @Cast("bool") boolean validate_names/*=false*/); +@Namespace("at::namedinference") public static native @Const @ByRef Tensor propagate_names( + @Const @ByRef Tensor result, + @ByVal DimnameVector names); // Propagates all names from src to result. @Namespace("at::namedinference") public static native void propagate_names(@Const @ByRef Tensor result, @Const @ByRef Tensor src); @@ -14811,6 +14839,13 @@ public class torch extends org.bytedeco.pytorch.presets.torch { @Namespace("at::namedinference") public static native TensorImpl propagate_names_if_nonempty( TensorImpl result, @ByVal DimnameArrayRef maybe_names); +@Namespace("at::namedinference") public static native TensorImpl propagate_names_if_nonempty( + TensorImpl result, + @ByVal DimnameVector maybe_names, + @Cast("bool") boolean validate_names/*=false*/); +@Namespace("at::namedinference") public static native TensorImpl propagate_names_if_nonempty( + TensorImpl result, + @ByVal DimnameVector maybe_names); @Namespace("at::namedinference") public static native TensorImpl propagate_names( TensorImpl result, @@ -14819,6 +14854,13 @@ public class torch extends org.bytedeco.pytorch.presets.torch { @Namespace("at::namedinference") public static native TensorImpl propagate_names( TensorImpl result, @ByVal DimnameArrayRef names); +@Namespace("at::namedinference") public static native TensorImpl propagate_names( + TensorImpl result, + @ByVal DimnameVector names, + @Cast("bool") boolean validate_names/*=false*/); +@Namespace("at::namedinference") public static native TensorImpl propagate_names( + TensorImpl result, + @ByVal DimnameVector names); @Namespace("at::namedinference") public static native void propagate_names(TensorImpl result, TensorImpl src); @@ -14829,6 +14871,13 @@ public class torch extends org.bytedeco.pytorch.presets.torch { @Namespace("at::namedinference") public static native void propagate_names( @Const @ByRef TensorBase result, @ByVal DimnameArrayRef names); +@Namespace("at::namedinference") public static native void propagate_names( + @Const @ByRef TensorBase result, + @ByVal DimnameVector names, + @Cast("bool") boolean validate_names/*=false*/); +@Namespace("at::namedinference") public static native void propagate_names( + @Const @ByRef TensorBase result, + @ByVal DimnameVector names); @Namespace("at::namedinference") public static native void propagate_names_if_nonempty( @Const @ByRef TensorBase result, @@ -14837,6 +14886,13 @@ public class torch extends org.bytedeco.pytorch.presets.torch { @Namespace("at::namedinference") public static native void propagate_names_if_nonempty( @Const @ByRef TensorBase result, @ByVal DimnameArrayRef names); +@Namespace("at::namedinference") public static native void propagate_names_if_nonempty( + @Const @ByRef TensorBase result, + @ByVal DimnameVector names, + @Cast("bool") boolean validate_names/*=false*/); +@Namespace("at::namedinference") public static native void propagate_names_if_nonempty( + @Const @ByRef TensorBase result, + @ByVal DimnameVector names); @Namespace("at::namedinference") public static native void propagate_names( @Const @ByRef TensorBase result, @@ -16736,12 +16792,6 @@ public class torch extends org.bytedeco.pytorch.presets.torch { // forward; it doesn't work if you try to deduce it // NB: keep this in sync with cloneWithRealTypes in function_schema.cpp -@Namespace("c10") public static native long unpackSymInt(@ByVal SymInt x); - -@Namespace("c10") public static native @ByVal LongArrayRef unpackSymInt(@ByVal SymIntArrayRef x); - -@Namespace("c10") public static native @ByVal LongOptional unpackSymInt(@ByVal SymIntOptional x); - @@ -18219,6 +18269,7 @@ public class torch extends org.bytedeco.pytorch.presets.torch { * the first Tensor is defined. (This function implicitly assumes * that all tensors in the list have the same device.) */ @Namespace("at") public static native @ByVal DeviceOptional device_of(@ByVal TensorArrayRef t); +@Namespace("at") public static native @ByVal DeviceOptional device_of(@ByVal TensorVector t); // namespace at @@ -18577,7 +18628,7 @@ public class torch extends org.bytedeco.pytorch.presets.torch { DeviceType device_type, ScalarType scalar_type); @Namespace("at") public static native @ByVal TensorImplVector checked_dense_tensor_list_unwrap( - @ByVal TensorArrayRef tensors, + @ByVal TensorVector tensors, String name, int pos, @Cast("c10::DeviceType") byte device_type, @@ -18718,7 +18769,7 @@ public class torch extends org.bytedeco.pytorch.presets.torch { @Namespace("at") public static native void checkScalarTypes( @Cast("at::CheckedFrom") String c, @Const @ByRef TensorArg t, - @ByVal ScalarTypeArrayRef l); + @ByVal ScalarTypeVector l); @Namespace("at") public static native void checkSameGPU( @Cast("at::CheckedFrom") BytePointer c, @Const @ByRef TensorArg t1, @@ -18761,7 +18812,7 @@ public class torch extends org.bytedeco.pytorch.presets.torch { @ByVal Backend backend); @Namespace("at") public static native void checkBackend( @Cast("at::CheckedFrom") String c, - @ByVal TensorArrayRef t, + @ByVal TensorVector t, @ByVal Backend backend); @Namespace("at") public static native void checkDeviceType( @@ -18770,7 +18821,7 @@ public class torch extends org.bytedeco.pytorch.presets.torch { @ByVal DeviceType device_type); @Namespace("at") public static native void checkDeviceType( @Cast("at::CheckedFrom") String c, - @ByVal TensorArrayRef tensors, + @ByVal TensorVector tensors, @ByVal DeviceType device_type); @Namespace("at") public static native void checkLayout(@Cast("at::CheckedFrom") BytePointer c, @Const @ByRef Tensor t, Layout layout); @@ -18782,7 +18833,7 @@ public class torch extends org.bytedeco.pytorch.presets.torch { @ByVal Layout layout); @Namespace("at") public static native void checkLayout( @Cast("at::CheckedFrom") String c, - @ByVal TensorArrayRef tensors, + @ByVal TensorVector tensors, @ByVal Layout layout); // Methods for getting data_ptr if tensor is defined @@ -19979,6 +20030,7 @@ public class torch extends org.bytedeco.pytorch.presets.torch { // aten::align_tensors(Tensor[] tensors) -> Tensor[] @Namespace("at") public static native @Cast({"", "std::vector"}) @StdMove TensorVector align_tensors(@ByVal TensorArrayRef tensors); +@Namespace("at") public static native @Cast({"", "std::vector"}) @StdMove TensorVector align_tensors(@ByVal TensorVector tensors); @@ -21224,6 +21276,7 @@ public class torch extends org.bytedeco.pytorch.presets.torch { // aten::atleast_1d.Sequence(Tensor[] tensors) -> Tensor[] @Namespace("at") public static native @Cast({"", "std::vector"}) @StdMove TensorVector atleast_1d(@ByVal TensorArrayRef tensors); +@Namespace("at") public static native @Cast({"", "std::vector"}) @StdMove TensorVector atleast_1d(@ByVal TensorVector tensors); @@ -21257,6 +21310,7 @@ public class torch extends org.bytedeco.pytorch.presets.torch { // aten::atleast_2d.Sequence(Tensor[] tensors) -> Tensor[] @Namespace("at") public static native @Cast({"", "std::vector"}) @StdMove TensorVector atleast_2d(@ByVal TensorArrayRef tensors); +@Namespace("at") public static native @Cast({"", "std::vector"}) @StdMove TensorVector atleast_2d(@ByVal TensorVector tensors); @@ -21290,6 +21344,7 @@ public class torch extends org.bytedeco.pytorch.presets.torch { // aten::atleast_3d.Sequence(Tensor[] tensors) -> Tensor[] @Namespace("at") public static native @Cast({"", "std::vector"}) @StdMove TensorVector atleast_3d(@ByVal TensorArrayRef tensors); +@Namespace("at") public static native @Cast({"", "std::vector"}) @StdMove TensorVector atleast_3d(@ByVal TensorVector tensors); @@ -22483,11 +22538,14 @@ public class torch extends org.bytedeco.pytorch.presets.torch { // aten::block_diag(Tensor[] tensors) -> Tensor @Namespace("at") public static native @ByVal Tensor block_diag(@ByVal TensorArrayRef tensors); +@Namespace("at") public static native @ByVal Tensor block_diag(@ByVal TensorVector tensors); // aten::block_diag.out(Tensor[] tensors, *, Tensor(a!) out) -> Tensor(a!) @Namespace("at") public static native @ByRef Tensor block_diag_out(@ByRef Tensor out, @ByVal TensorArrayRef tensors); +@Namespace("at") public static native @ByRef Tensor block_diag_out(@ByRef Tensor out, @ByVal TensorVector tensors); // aten::block_diag.out(Tensor[] tensors, *, Tensor(a!) out) -> Tensor(a!) @Namespace("at") public static native @ByRef Tensor block_diag_outf(@ByVal TensorArrayRef tensors, @ByRef Tensor out); +@Namespace("at") public static native @ByRef Tensor block_diag_outf(@ByVal TensorVector tensors, @ByRef Tensor out); @@ -22553,6 +22611,7 @@ public class torch extends org.bytedeco.pytorch.presets.torch { // aten::broadcast_tensors(Tensor[] tensors) -> Tensor[] @Namespace("at") public static native @Cast({"", "std::vector"}) @StdMove TensorVector broadcast_tensors(@ByVal TensorArrayRef tensors); +@Namespace("at") public static native @Cast({"", "std::vector"}) @StdMove TensorVector broadcast_tensors(@ByVal TensorVector tensors); @@ -22696,6 +22755,7 @@ public class torch extends org.bytedeco.pytorch.presets.torch { // aten::cartesian_prod(Tensor[] tensors) -> Tensor @Namespace("at") public static native @ByVal Tensor cartesian_prod(@ByVal TensorArrayRef tensors); +@Namespace("at") public static native @ByVal Tensor cartesian_prod(@ByVal TensorVector tensors); @@ -22727,20 +22787,28 @@ public class torch extends org.bytedeco.pytorch.presets.torch { // aten::cat(Tensor[] tensors, int dim=0) -> Tensor @Namespace("at") public static native @ByVal Tensor cat(@Const @ByRef TensorArrayRef tensors, @Cast("int64_t") long dim/*=0*/); @Namespace("at") public static native @ByVal Tensor cat(@Const @ByRef TensorArrayRef tensors); +@Namespace("at") public static native @ByVal Tensor cat(@Const @ByRef TensorVector tensors, @Cast("int64_t") long dim/*=0*/); +@Namespace("at") public static native @ByVal Tensor cat(@Const @ByRef TensorVector tensors); // aten::cat.out(Tensor[] tensors, int dim=0, *, Tensor(a!) out) -> Tensor(a!) @Namespace("at") public static native @ByRef Tensor cat_out(@ByRef Tensor out, @Const @ByRef TensorArrayRef tensors, @Cast("int64_t") long dim/*=0*/); @Namespace("at") public static native @ByRef Tensor cat_out(@ByRef Tensor out, @Const @ByRef TensorArrayRef tensors); +@Namespace("at") public static native @ByRef Tensor cat_out(@ByRef Tensor out, @Const @ByRef TensorVector tensors, @Cast("int64_t") long dim/*=0*/); +@Namespace("at") public static native @ByRef Tensor cat_out(@ByRef Tensor out, @Const @ByRef TensorVector tensors); // aten::cat.out(Tensor[] tensors, int dim=0, *, Tensor(a!) out) -> Tensor(a!) @Namespace("at") public static native @ByRef Tensor cat_outf(@Const @ByRef TensorArrayRef tensors, @Cast("int64_t") long dim, @ByRef Tensor out); +@Namespace("at") public static native @ByRef Tensor cat_outf(@Const @ByRef TensorVector tensors, @Cast("int64_t") long dim, @ByRef Tensor out); // aten::cat.names(Tensor[] tensors, Dimname dim) -> Tensor @Namespace("at") public static native @ByVal Tensor cat(@ByVal TensorArrayRef tensors, @ByVal Dimname dim); +@Namespace("at") public static native @ByVal Tensor cat(@ByVal TensorVector tensors, @ByVal Dimname dim); // aten::cat.names_out(Tensor[] tensors, Dimname dim, *, Tensor(a!) out) -> Tensor(a!) @Namespace("at") public static native @ByRef Tensor cat_out(@ByRef Tensor out, @ByVal TensorArrayRef tensors, @ByVal Dimname dim); +@Namespace("at") public static native @ByRef Tensor cat_out(@ByRef Tensor out, @ByVal TensorVector tensors, @ByVal Dimname dim); // aten::cat.names_out(Tensor[] tensors, Dimname dim, *, Tensor(a!) out) -> Tensor(a!) @Namespace("at") public static native @ByRef Tensor cat_outf(@ByVal TensorArrayRef tensors, @ByVal Dimname dim, @ByRef Tensor out); +@Namespace("at") public static native @ByRef Tensor cat_outf(@ByVal TensorVector tensors, @ByVal Dimname dim, @ByRef Tensor out); @@ -22981,11 +23049,14 @@ public class torch extends org.bytedeco.pytorch.presets.torch { // aten::chain_matmul(Tensor[] matrices) -> Tensor @Namespace("at") public static native @ByVal Tensor chain_matmul(@ByVal TensorArrayRef matrices); +@Namespace("at") public static native @ByVal Tensor chain_matmul(@ByVal TensorVector matrices); // aten::chain_matmul.out(Tensor[] matrices, *, Tensor(a!) out) -> Tensor(a!) @Namespace("at") public static native @ByRef Tensor chain_matmul_out(@ByRef Tensor out, @ByVal TensorArrayRef matrices); +@Namespace("at") public static native @ByRef Tensor chain_matmul_out(@ByRef Tensor out, @ByVal TensorVector matrices); // aten::chain_matmul.out(Tensor[] matrices, *, Tensor(a!) out) -> Tensor(a!) @Namespace("at") public static native @ByRef Tensor chain_matmul_outf(@ByVal TensorArrayRef matrices, @ByRef Tensor out); +@Namespace("at") public static native @ByRef Tensor chain_matmul_outf(@ByVal TensorVector matrices, @ByRef Tensor out); @@ -23644,11 +23715,14 @@ public class torch extends org.bytedeco.pytorch.presets.torch { // aten::column_stack(Tensor[] tensors) -> Tensor @Namespace("at") public static native @ByVal Tensor column_stack(@ByVal TensorArrayRef tensors); +@Namespace("at") public static native @ByVal Tensor column_stack(@ByVal TensorVector tensors); // aten::column_stack.out(Tensor[] tensors, *, Tensor(a!) out) -> Tensor(a!) @Namespace("at") public static native @ByRef Tensor column_stack_out(@ByRef Tensor out, @ByVal TensorArrayRef tensors); +@Namespace("at") public static native @ByRef Tensor column_stack_out(@ByRef Tensor out, @ByVal TensorVector tensors); // aten::column_stack.out(Tensor[] tensors, *, Tensor(a!) out) -> Tensor(a!) @Namespace("at") public static native @ByRef Tensor column_stack_outf(@ByVal TensorArrayRef tensors, @ByRef Tensor out); +@Namespace("at") public static native @ByRef Tensor column_stack_outf(@ByVal TensorVector tensors, @ByRef Tensor out); @@ -23746,20 +23820,28 @@ public class torch extends org.bytedeco.pytorch.presets.torch { // aten::concat(Tensor[] tensors, int dim=0) -> Tensor @Namespace("at") public static native @ByVal Tensor concat(@ByVal TensorArrayRef tensors, @Cast("int64_t") long dim/*=0*/); @Namespace("at") public static native @ByVal Tensor concat(@ByVal TensorArrayRef tensors); +@Namespace("at") public static native @ByVal Tensor concat(@ByVal TensorVector tensors, @Cast("int64_t") long dim/*=0*/); +@Namespace("at") public static native @ByVal Tensor concat(@ByVal TensorVector tensors); // aten::concat.out(Tensor[] tensors, int dim=0, *, Tensor(a!) out) -> Tensor(a!) @Namespace("at") public static native @ByRef Tensor concat_out(@ByRef Tensor out, @ByVal TensorArrayRef tensors, @Cast("int64_t") long dim/*=0*/); @Namespace("at") public static native @ByRef Tensor concat_out(@ByRef Tensor out, @ByVal TensorArrayRef tensors); +@Namespace("at") public static native @ByRef Tensor concat_out(@ByRef Tensor out, @ByVal TensorVector tensors, @Cast("int64_t") long dim/*=0*/); +@Namespace("at") public static native @ByRef Tensor concat_out(@ByRef Tensor out, @ByVal TensorVector tensors); // aten::concat.out(Tensor[] tensors, int dim=0, *, Tensor(a!) out) -> Tensor(a!) @Namespace("at") public static native @ByRef Tensor concat_outf(@ByVal TensorArrayRef tensors, @Cast("int64_t") long dim, @ByRef Tensor out); +@Namespace("at") public static native @ByRef Tensor concat_outf(@ByVal TensorVector tensors, @Cast("int64_t") long dim, @ByRef Tensor out); // aten::concat.names(Tensor[] tensors, Dimname dim) -> Tensor @Namespace("at") public static native @ByVal Tensor concat(@ByVal TensorArrayRef tensors, @ByVal Dimname dim); +@Namespace("at") public static native @ByVal Tensor concat(@ByVal TensorVector tensors, @ByVal Dimname dim); // aten::concat.names_out(Tensor[] tensors, Dimname dim, *, Tensor(a!) out) -> Tensor(a!) @Namespace("at") public static native @ByRef Tensor concat_out(@ByRef Tensor out, @ByVal TensorArrayRef tensors, @ByVal Dimname dim); +@Namespace("at") public static native @ByRef Tensor concat_out(@ByRef Tensor out, @ByVal TensorVector tensors, @ByVal Dimname dim); // aten::concat.names_out(Tensor[] tensors, Dimname dim, *, Tensor(a!) out) -> Tensor(a!) @Namespace("at") public static native @ByRef Tensor concat_outf(@ByVal TensorArrayRef tensors, @ByVal Dimname dim, @ByRef Tensor out); +@Namespace("at") public static native @ByRef Tensor concat_outf(@ByVal TensorVector tensors, @ByVal Dimname dim, @ByRef Tensor out); @@ -23791,20 +23873,28 @@ public class torch extends org.bytedeco.pytorch.presets.torch { // aten::concatenate(Tensor[] tensors, int dim=0) -> Tensor @Namespace("at") public static native @ByVal Tensor concatenate(@ByVal TensorArrayRef tensors, @Cast("int64_t") long dim/*=0*/); @Namespace("at") public static native @ByVal Tensor concatenate(@ByVal TensorArrayRef tensors); +@Namespace("at") public static native @ByVal Tensor concatenate(@ByVal TensorVector tensors, @Cast("int64_t") long dim/*=0*/); +@Namespace("at") public static native @ByVal Tensor concatenate(@ByVal TensorVector tensors); // aten::concatenate.out(Tensor[] tensors, int dim=0, *, Tensor(a!) out) -> Tensor(a!) @Namespace("at") public static native @ByRef Tensor concatenate_out(@ByRef Tensor out, @ByVal TensorArrayRef tensors, @Cast("int64_t") long dim/*=0*/); @Namespace("at") public static native @ByRef Tensor concatenate_out(@ByRef Tensor out, @ByVal TensorArrayRef tensors); +@Namespace("at") public static native @ByRef Tensor concatenate_out(@ByRef Tensor out, @ByVal TensorVector tensors, @Cast("int64_t") long dim/*=0*/); +@Namespace("at") public static native @ByRef Tensor concatenate_out(@ByRef Tensor out, @ByVal TensorVector tensors); // aten::concatenate.out(Tensor[] tensors, int dim=0, *, Tensor(a!) out) -> Tensor(a!) @Namespace("at") public static native @ByRef Tensor concatenate_outf(@ByVal TensorArrayRef tensors, @Cast("int64_t") long dim, @ByRef Tensor out); +@Namespace("at") public static native @ByRef Tensor concatenate_outf(@ByVal TensorVector tensors, @Cast("int64_t") long dim, @ByRef Tensor out); // aten::concatenate.names(Tensor[] tensors, Dimname dim) -> Tensor @Namespace("at") public static native @ByVal Tensor concatenate(@ByVal TensorArrayRef tensors, @ByVal Dimname dim); +@Namespace("at") public static native @ByVal Tensor concatenate(@ByVal TensorVector tensors, @ByVal Dimname dim); // aten::concatenate.names_out(Tensor[] tensors, Dimname dim, *, Tensor(a!) out) -> Tensor(a!) @Namespace("at") public static native @ByRef Tensor concatenate_out(@ByRef Tensor out, @ByVal TensorArrayRef tensors, @ByVal Dimname dim); +@Namespace("at") public static native @ByRef Tensor concatenate_out(@ByRef Tensor out, @ByVal TensorVector tensors, @ByVal Dimname dim); // aten::concatenate.names_out(Tensor[] tensors, Dimname dim, *, Tensor(a!) out) -> Tensor(a!) @Namespace("at") public static native @ByRef Tensor concatenate_outf(@ByVal TensorArrayRef tensors, @ByVal Dimname dim, @ByRef Tensor out); +@Namespace("at") public static native @ByRef Tensor concatenate_outf(@ByVal TensorVector tensors, @ByVal Dimname dim, @ByRef Tensor out); @@ -25863,6 +25953,7 @@ public class torch extends org.bytedeco.pytorch.presets.torch { // aten::dequantize.tensors(Tensor[] tensors) -> Tensor[] @Namespace("at") public static native @Cast({"", "std::vector"}) @StdMove TensorVector dequantize(@ByVal TensorArrayRef tensors); +@Namespace("at") public static native @Cast({"", "std::vector"}) @StdMove TensorVector dequantize(@ByVal TensorVector tensors); // aten::dequantize.self_out(Tensor self, *, Tensor(a!) out) -> Tensor(a!) @Namespace("at") public static native @ByRef Tensor dequantize_out(@ByRef Tensor out, @Const @ByRef Tensor self); @@ -25871,8 +25962,10 @@ public class torch extends org.bytedeco.pytorch.presets.torch { // aten::dequantize.tensors_out(Tensor[] tensors, *, Tensor(a!)[] out) -> () @Namespace("at") public static native void dequantize_out(@ByVal TensorArrayRef out, @ByVal TensorArrayRef tensors); +@Namespace("at") public static native void dequantize_out(@ByVal TensorVector out, @ByVal TensorVector tensors); // aten::dequantize.tensors_out(Tensor[] tensors, *, Tensor(a!)[] out) -> () @Namespace("at") public static native void dequantize_outf(@ByVal TensorArrayRef tensors, @ByVal TensorArrayRef out); +@Namespace("at") public static native void dequantize_outf(@ByVal TensorVector tensors, @ByVal TensorVector out); @@ -26588,11 +26681,14 @@ public class torch extends org.bytedeco.pytorch.presets.torch { // aten::dstack(Tensor[] tensors) -> Tensor @Namespace("at") public static native @ByVal Tensor dstack(@ByVal TensorArrayRef tensors); +@Namespace("at") public static native @ByVal Tensor dstack(@ByVal TensorVector tensors); // aten::dstack.out(Tensor[] tensors, *, Tensor(a!) out) -> Tensor(a!) @Namespace("at") public static native @ByRef Tensor dstack_out(@ByRef Tensor out, @ByVal TensorArrayRef tensors); +@Namespace("at") public static native @ByRef Tensor dstack_out(@ByRef Tensor out, @ByVal TensorVector tensors); // aten::dstack.out(Tensor[] tensors, *, Tensor(a!) out) -> Tensor(a!) @Namespace("at") public static native @ByRef Tensor dstack_outf(@ByVal TensorArrayRef tensors, @ByRef Tensor out); +@Namespace("at") public static native @ByRef Tensor dstack_outf(@ByVal TensorVector tensors, @ByRef Tensor out); @@ -26624,8 +26720,8 @@ public class torch extends org.bytedeco.pytorch.presets.torch { // aten::einsum(str equation, Tensor[] tensors, *, int[]? path=None) -> Tensor @Namespace("at") public static native @ByVal Tensor einsum(@StringView BytePointer equation, @ByVal TensorArrayRef tensors, @ByVal(nullValue = "at::OptionalIntArrayRef(c10::nullopt)") LongArrayRefOptional path); @Namespace("at") public static native @ByVal Tensor einsum(@StringView BytePointer equation, @ByVal TensorArrayRef tensors); -@Namespace("at") public static native @ByVal Tensor einsum(@StringView String equation, @ByVal TensorArrayRef tensors, @ByVal(nullValue = "at::OptionalIntArrayRef(c10::nullopt)") @Cast({"int64_t*", "c10::ArrayRef", "std::vector&"}) @StdVector long... path); -@Namespace("at") public static native @ByVal Tensor einsum(@StringView String equation, @ByVal TensorArrayRef tensors); +@Namespace("at") public static native @ByVal Tensor einsum(@StringView String equation, @ByVal TensorVector tensors, @ByVal(nullValue = "at::OptionalIntArrayRef(c10::nullopt)") @Cast({"int64_t*", "c10::ArrayRef", "std::vector&"}) @StdVector long... path); +@Namespace("at") public static native @ByVal Tensor einsum(@StringView String equation, @ByVal TensorVector tensors); @@ -29630,6 +29726,7 @@ public class torch extends org.bytedeco.pytorch.presets.torch { // aten::flatten.DimnameList(Tensor(a) self, Dimname[] dims, Dimname out_dim) -> Tensor(a) @Namespace("at") public static native @ByVal Tensor flatten(@Const @ByRef Tensor self, @ByVal DimnameArrayRef dims, @ByVal Dimname out_dim); +@Namespace("at") public static native @ByVal Tensor flatten(@Const @ByRef Tensor self, @ByVal DimnameVector dims, @ByVal Dimname out_dim); @@ -29660,6 +29757,7 @@ public class torch extends org.bytedeco.pytorch.presets.torch { // aten::flatten_dense_tensors(Tensor[] tensors) -> Tensor @Namespace("at") public static native @ByVal Tensor flatten_dense_tensors(@ByVal TensorArrayRef tensors); +@Namespace("at") public static native @ByVal Tensor flatten_dense_tensors(@ByVal TensorVector tensors); @@ -31138,12 +31236,14 @@ public class torch extends org.bytedeco.pytorch.presets.torch { // aten::gradient.tensorarrayint(Tensor self, *, Tensor[] spacing, int? dim=None, int edge_order=1) -> Tensor[] @Namespace("at") public static native @Cast({"", "std::vector"}) @StdMove TensorVector gradient(@Const @ByRef Tensor self, @ByVal TensorArrayRef spacing, @ByVal(nullValue = "c10::optional(c10::nullopt)") LongOptional dim, @Cast("int64_t") long edge_order/*=1*/); @Namespace("at") public static native @Cast({"", "std::vector"}) @StdMove TensorVector gradient(@Const @ByRef Tensor self, @ByVal TensorArrayRef spacing); +@Namespace("at") public static native @Cast({"", "std::vector"}) @StdMove TensorVector gradient(@Const @ByRef Tensor self, @ByVal TensorVector spacing, @ByVal(nullValue = "c10::optional(c10::nullopt)") LongOptional dim, @Cast("int64_t") long edge_order/*=1*/); +@Namespace("at") public static native @Cast({"", "std::vector"}) @StdMove TensorVector gradient(@Const @ByRef Tensor self, @ByVal TensorVector spacing); // aten::gradient.tensorarray(Tensor self, *, Tensor[] spacing, int[] dim, int edge_order=1) -> Tensor[] @Namespace("at") public static native @Cast({"", "std::vector"}) @StdMove TensorVector gradient(@Const @ByRef Tensor self, @ByVal TensorArrayRef spacing, @ByVal LongArrayRef dim, @Cast("int64_t") long edge_order/*=1*/); @Namespace("at") public static native @Cast({"", "std::vector"}) @StdMove TensorVector gradient(@Const @ByRef Tensor self, @ByVal TensorArrayRef spacing, @ByVal LongArrayRef dim); -@Namespace("at") public static native @Cast({"", "std::vector"}) @StdMove TensorVector gradient(@Const @ByRef Tensor self, @ByVal TensorArrayRef spacing, @ByVal @Cast({"int64_t*", "c10::ArrayRef", "std::vector&"}) @StdVector("int64_t") long[] dim, @Cast("int64_t") long edge_order/*=1*/); -@Namespace("at") public static native @Cast({"", "std::vector"}) @StdMove TensorVector gradient(@Const @ByRef Tensor self, @ByVal TensorArrayRef spacing, @ByVal @Cast({"int64_t*", "c10::ArrayRef", "std::vector&"}) @StdVector("int64_t") long... dim); +@Namespace("at") public static native @Cast({"", "std::vector"}) @StdMove TensorVector gradient(@Const @ByRef Tensor self, @ByVal TensorVector spacing, @ByVal @Cast({"int64_t*", "c10::ArrayRef", "std::vector&"}) @StdVector("int64_t") long[] dim, @Cast("int64_t") long edge_order/*=1*/); +@Namespace("at") public static native @Cast({"", "std::vector"}) @StdMove TensorVector gradient(@Const @ByRef Tensor self, @ByVal TensorVector spacing, @ByVal @Cast({"int64_t*", "c10::ArrayRef", "std::vector&"}) @StdVector("int64_t") long... dim); @@ -31461,9 +31561,11 @@ public class torch extends org.bytedeco.pytorch.presets.torch { // aten::gru.input(Tensor input, Tensor hx, Tensor[] params, bool has_biases, int num_layers, float dropout, bool train, bool bidirectional, bool batch_first) -> (Tensor, Tensor) @Namespace("at") public static native @ByVal T_TensorTensor_T gru(@Const @ByRef Tensor input, @Const @ByRef Tensor hx, @ByVal TensorArrayRef params, @Cast("bool") boolean has_biases, @Cast("int64_t") long num_layers, double dropout, @Cast("bool") boolean train, @Cast("bool") boolean bidirectional, @Cast("bool") boolean batch_first); +@Namespace("at") public static native @ByVal T_TensorTensor_T gru(@Const @ByRef Tensor input, @Const @ByRef Tensor hx, @ByVal TensorVector params, @Cast("bool") boolean has_biases, @Cast("int64_t") long num_layers, double dropout, @Cast("bool") boolean train, @Cast("bool") boolean bidirectional, @Cast("bool") boolean batch_first); // aten::gru.data(Tensor data, Tensor batch_sizes, Tensor hx, Tensor[] params, bool has_biases, int num_layers, float dropout, bool train, bool bidirectional) -> (Tensor, Tensor) @Namespace("at") public static native @ByVal T_TensorTensor_T gru(@Const @ByRef Tensor data, @Const @ByRef Tensor batch_sizes, @Const @ByRef Tensor hx, @ByVal TensorArrayRef params, @Cast("bool") boolean has_biases, @Cast("int64_t") long num_layers, double dropout, @Cast("bool") boolean train, @Cast("bool") boolean bidirectional); +@Namespace("at") public static native @ByVal T_TensorTensor_T gru(@Const @ByRef Tensor data, @Const @ByRef Tensor batch_sizes, @Const @ByRef Tensor hx, @ByVal TensorVector params, @Cast("bool") boolean has_biases, @Cast("int64_t") long num_layers, double dropout, @Cast("bool") boolean train, @Cast("bool") boolean bidirectional); @@ -32147,7 +32249,8 @@ public class torch extends org.bytedeco.pytorch.presets.torch { // aten::histogramdd.TensorList_bins(Tensor self, Tensor[] bins, float[]? range=None, Tensor? weight=None, bool density=False) -> (Tensor hist, Tensor[] bin_edges) @Namespace("at") public static native @ByVal T_TensorTensorVector_T histogramdd(@Const @ByRef Tensor self, @ByVal TensorArrayRef bins, @ByVal(nullValue = "c10::optional >(c10::nullopt)") DoubleArrayRefOptional range, @Const @ByRef(nullValue = "c10::optional{}") TensorOptional weight, @Cast("bool") boolean density/*=false*/); @Namespace("at") public static native @ByVal T_TensorTensorVector_T histogramdd(@Const @ByRef Tensor self, @ByVal TensorArrayRef bins); -@Namespace("at") public static native @ByVal T_TensorTensorVector_T histogramdd(@Const @ByRef Tensor self, @ByVal TensorArrayRef bins, @ByVal(nullValue = "c10::optional >(c10::nullopt)") @Cast({"double*", "c10::ArrayRef", "std::vector&"}) @StdVector double[] range, @Const @ByRef(nullValue = "c10::optional{}") TensorOptional weight, @Cast("bool") boolean density/*=false*/); +@Namespace("at") public static native @ByVal T_TensorTensorVector_T histogramdd(@Const @ByRef Tensor self, @ByVal TensorVector bins, @ByVal(nullValue = "c10::optional >(c10::nullopt)") @Cast({"double*", "c10::ArrayRef", "std::vector&"}) @StdVector double[] range, @Const @ByRef(nullValue = "c10::optional{}") TensorOptional weight, @Cast("bool") boolean density/*=false*/); +@Namespace("at") public static native @ByVal T_TensorTensorVector_T histogramdd(@Const @ByRef Tensor self, @ByVal TensorVector bins); @@ -32247,11 +32350,14 @@ public class torch extends org.bytedeco.pytorch.presets.torch { // aten::hstack(Tensor[] tensors) -> Tensor @Namespace("at") public static native @ByVal Tensor hstack(@ByVal TensorArrayRef tensors); +@Namespace("at") public static native @ByVal Tensor hstack(@ByVal TensorVector tensors); // aten::hstack.out(Tensor[] tensors, *, Tensor(a!) out) -> Tensor(a!) @Namespace("at") public static native @ByRef Tensor hstack_out(@ByRef Tensor out, @ByVal TensorArrayRef tensors); +@Namespace("at") public static native @ByRef Tensor hstack_out(@ByRef Tensor out, @ByVal TensorVector tensors); // aten::hstack.out(Tensor[] tensors, *, Tensor(a!) out) -> Tensor(a!) @Namespace("at") public static native @ByRef Tensor hstack_outf(@ByVal TensorArrayRef tensors, @ByRef Tensor out); +@Namespace("at") public static native @ByRef Tensor hstack_outf(@ByVal TensorVector tensors, @ByRef Tensor out); @@ -35582,11 +35688,14 @@ public class torch extends org.bytedeco.pytorch.presets.torch { // aten::linalg_multi_dot(Tensor[] tensors) -> Tensor @Namespace("at") public static native @ByVal Tensor linalg_multi_dot(@ByVal TensorArrayRef tensors); +@Namespace("at") public static native @ByVal Tensor linalg_multi_dot(@ByVal TensorVector tensors); // aten::linalg_multi_dot.out(Tensor[] tensors, *, Tensor(a!) out) -> Tensor(a!) @Namespace("at") public static native @ByRef Tensor linalg_multi_dot_out(@ByRef Tensor out, @ByVal TensorArrayRef tensors); +@Namespace("at") public static native @ByRef Tensor linalg_multi_dot_out(@ByRef Tensor out, @ByVal TensorVector tensors); // aten::linalg_multi_dot.out(Tensor[] tensors, *, Tensor(a!) out) -> Tensor(a!) @Namespace("at") public static native @ByRef Tensor linalg_multi_dot_outf(@ByVal TensorArrayRef tensors, @ByRef Tensor out); +@Namespace("at") public static native @ByRef Tensor linalg_multi_dot_outf(@ByVal TensorVector tensors, @ByRef Tensor out); @@ -37051,12 +37160,17 @@ public class torch extends org.bytedeco.pytorch.presets.torch { // aten::logsumexp.names(Tensor self, Dimname[1] dim, bool keepdim=False) -> Tensor @Namespace("at") public static native @ByVal Tensor logsumexp(@Const @ByRef Tensor self, @ByVal DimnameArrayRef dim, @Cast("bool") boolean keepdim/*=false*/); @Namespace("at") public static native @ByVal Tensor logsumexp(@Const @ByRef Tensor self, @ByVal DimnameArrayRef dim); +@Namespace("at") public static native @ByVal Tensor logsumexp(@Const @ByRef Tensor self, @ByVal DimnameVector dim, @Cast("bool") boolean keepdim/*=false*/); +@Namespace("at") public static native @ByVal Tensor logsumexp(@Const @ByRef Tensor self, @ByVal DimnameVector dim); // aten::logsumexp.names_out(Tensor self, Dimname[1] dim, bool keepdim=False, *, Tensor(a!) out) -> Tensor(a!) @Namespace("at") public static native @ByRef Tensor logsumexp_out(@ByRef Tensor out, @Const @ByRef Tensor self, @ByVal DimnameArrayRef dim, @Cast("bool") boolean keepdim/*=false*/); @Namespace("at") public static native @ByRef Tensor logsumexp_out(@ByRef Tensor out, @Const @ByRef Tensor self, @ByVal DimnameArrayRef dim); +@Namespace("at") public static native @ByRef Tensor logsumexp_out(@ByRef Tensor out, @Const @ByRef Tensor self, @ByVal DimnameVector dim, @Cast("bool") boolean keepdim/*=false*/); +@Namespace("at") public static native @ByRef Tensor logsumexp_out(@ByRef Tensor out, @Const @ByRef Tensor self, @ByVal DimnameVector dim); // aten::logsumexp.names_out(Tensor self, Dimname[1] dim, bool keepdim=False, *, Tensor(a!) out) -> Tensor(a!) @Namespace("at") public static native @ByRef Tensor logsumexp_outf(@Const @ByRef Tensor self, @ByVal DimnameArrayRef dim, @Cast("bool") boolean keepdim, @ByRef Tensor out); +@Namespace("at") public static native @ByRef Tensor logsumexp_outf(@Const @ByRef Tensor self, @ByVal DimnameVector dim, @Cast("bool") boolean keepdim, @ByRef Tensor out); @@ -37130,9 +37244,11 @@ public class torch extends org.bytedeco.pytorch.presets.torch { // aten::lstm.input(Tensor input, Tensor[] hx, Tensor[] params, bool has_biases, int num_layers, float dropout, bool train, bool bidirectional, bool batch_first) -> (Tensor, Tensor, Tensor) @Namespace("at") public static native @ByVal T_TensorTensorTensor_T lstm(@Const @ByRef Tensor input, @ByVal TensorArrayRef hx, @ByVal TensorArrayRef params, @Cast("bool") boolean has_biases, @Cast("int64_t") long num_layers, double dropout, @Cast("bool") boolean train, @Cast("bool") boolean bidirectional, @Cast("bool") boolean batch_first); +@Namespace("at") public static native @ByVal T_TensorTensorTensor_T lstm(@Const @ByRef Tensor input, @ByVal TensorVector hx, @ByVal TensorVector params, @Cast("bool") boolean has_biases, @Cast("int64_t") long num_layers, double dropout, @Cast("bool") boolean train, @Cast("bool") boolean bidirectional, @Cast("bool") boolean batch_first); // aten::lstm.data(Tensor data, Tensor batch_sizes, Tensor[] hx, Tensor[] params, bool has_biases, int num_layers, float dropout, bool train, bool bidirectional) -> (Tensor, Tensor, Tensor) @Namespace("at") public static native @ByVal T_TensorTensorTensor_T lstm(@Const @ByRef Tensor data, @Const @ByRef Tensor batch_sizes, @ByVal TensorArrayRef hx, @ByVal TensorArrayRef params, @Cast("bool") boolean has_biases, @Cast("int64_t") long num_layers, double dropout, @Cast("bool") boolean train, @Cast("bool") boolean bidirectional); +@Namespace("at") public static native @ByVal T_TensorTensorTensor_T lstm(@Const @ByRef Tensor data, @Const @ByRef Tensor batch_sizes, @ByVal TensorVector hx, @ByVal TensorVector params, @Cast("bool") boolean has_biases, @Cast("int64_t") long num_layers, double dropout, @Cast("bool") boolean train, @Cast("bool") boolean bidirectional); @@ -37164,6 +37280,8 @@ public class torch extends org.bytedeco.pytorch.presets.torch { // aten::lstm_cell(Tensor input, Tensor[] hx, Tensor w_ih, Tensor w_hh, Tensor? b_ih=None, Tensor? b_hh=None) -> (Tensor, Tensor) @Namespace("at") public static native @ByVal T_TensorTensor_T lstm_cell(@Const @ByRef Tensor input, @ByVal TensorArrayRef hx, @Const @ByRef Tensor w_ih, @Const @ByRef Tensor w_hh, @Const @ByRef(nullValue = "c10::optional{}") TensorOptional b_ih, @Const @ByRef(nullValue = "c10::optional{}") TensorOptional b_hh); @Namespace("at") public static native @ByVal T_TensorTensor_T lstm_cell(@Const @ByRef Tensor input, @ByVal TensorArrayRef hx, @Const @ByRef Tensor w_ih, @Const @ByRef Tensor w_hh); +@Namespace("at") public static native @ByVal T_TensorTensor_T lstm_cell(@Const @ByRef Tensor input, @ByVal TensorVector hx, @Const @ByRef Tensor w_ih, @Const @ByRef Tensor w_hh, @Const @ByRef(nullValue = "c10::optional{}") TensorOptional b_ih, @Const @ByRef(nullValue = "c10::optional{}") TensorOptional b_hh); +@Namespace("at") public static native @ByVal T_TensorTensor_T lstm_cell(@Const @ByRef Tensor input, @ByVal TensorVector hx, @Const @ByRef Tensor w_ih, @Const @ByRef Tensor w_hh); @@ -37194,11 +37312,14 @@ public class torch extends org.bytedeco.pytorch.presets.torch { // aten::lstm_mps_backward(Tensor? grad_y, Tensor? grad_hy, Tensor? grad_cy, Tensor z_state, Tensor cell_state_fwd, Tensor input, Tensor layersOutputs, Tensor[] hx, Tensor[] params, bool has_biases, int num_layers, float dropout, bool train, bool bidirectional, bool batch_first) -> (Tensor, Tensor[], Tensor[]) @Namespace("at") public static native @ByVal T_TensorTensorVectorTensorVector_T lstm_mps_backward(@Const @ByRef TensorOptional grad_y, @Const @ByRef TensorOptional grad_hy, @Const @ByRef TensorOptional grad_cy, @Const @ByRef Tensor z_state, @Const @ByRef Tensor cell_state_fwd, @Const @ByRef Tensor input, @Const @ByRef Tensor layersOutputs, @ByVal TensorArrayRef hx, @ByVal TensorArrayRef params, @Cast("bool") boolean has_biases, @Cast("int64_t") long num_layers, double dropout, @Cast("bool") boolean train, @Cast("bool") boolean bidirectional, @Cast("bool") boolean batch_first); +@Namespace("at") public static native @ByVal T_TensorTensorVectorTensorVector_T lstm_mps_backward(@Const @ByRef TensorOptional grad_y, @Const @ByRef TensorOptional grad_hy, @Const @ByRef TensorOptional grad_cy, @Const @ByRef Tensor z_state, @Const @ByRef Tensor cell_state_fwd, @Const @ByRef Tensor input, @Const @ByRef Tensor layersOutputs, @ByVal TensorVector hx, @ByVal TensorVector params, @Cast("bool") boolean has_biases, @Cast("int64_t") long num_layers, double dropout, @Cast("bool") boolean train, @Cast("bool") boolean bidirectional, @Cast("bool") boolean batch_first); // aten::lstm_mps_backward.out(Tensor? grad_y, Tensor? grad_hy, Tensor? grad_cy, Tensor z_state, Tensor cell_state_fwd, Tensor input, Tensor layersOutputs, Tensor[] hx, Tensor[] params, bool has_biases, int num_layers, float dropout, bool train, bool bidirectional, bool batch_first, *, Tensor(a!) out0, Tensor(b!)[] out1, Tensor(c!)[] out2) -> () @Namespace("at") public static native void lstm_mps_backward_out(@ByRef Tensor out0, @ByVal TensorArrayRef out1, @ByVal TensorArrayRef out2, @Const @ByRef TensorOptional grad_y, @Const @ByRef TensorOptional grad_hy, @Const @ByRef TensorOptional grad_cy, @Const @ByRef Tensor z_state, @Const @ByRef Tensor cell_state_fwd, @Const @ByRef Tensor input, @Const @ByRef Tensor layersOutputs, @ByVal TensorArrayRef hx, @ByVal TensorArrayRef params, @Cast("bool") boolean has_biases, @Cast("int64_t") long num_layers, double dropout, @Cast("bool") boolean train, @Cast("bool") boolean bidirectional, @Cast("bool") boolean batch_first); +@Namespace("at") public static native void lstm_mps_backward_out(@ByRef Tensor out0, @ByVal TensorVector out1, @ByVal TensorVector out2, @Const @ByRef TensorOptional grad_y, @Const @ByRef TensorOptional grad_hy, @Const @ByRef TensorOptional grad_cy, @Const @ByRef Tensor z_state, @Const @ByRef Tensor cell_state_fwd, @Const @ByRef Tensor input, @Const @ByRef Tensor layersOutputs, @ByVal TensorVector hx, @ByVal TensorVector params, @Cast("bool") boolean has_biases, @Cast("int64_t") long num_layers, double dropout, @Cast("bool") boolean train, @Cast("bool") boolean bidirectional, @Cast("bool") boolean batch_first); // aten::lstm_mps_backward.out(Tensor? grad_y, Tensor? grad_hy, Tensor? grad_cy, Tensor z_state, Tensor cell_state_fwd, Tensor input, Tensor layersOutputs, Tensor[] hx, Tensor[] params, bool has_biases, int num_layers, float dropout, bool train, bool bidirectional, bool batch_first, *, Tensor(a!) out0, Tensor(b!)[] out1, Tensor(c!)[] out2) -> () @Namespace("at") public static native void lstm_mps_backward_outf(@Const @ByRef TensorOptional grad_y, @Const @ByRef TensorOptional grad_hy, @Const @ByRef TensorOptional grad_cy, @Const @ByRef Tensor z_state, @Const @ByRef Tensor cell_state_fwd, @Const @ByRef Tensor input, @Const @ByRef Tensor layersOutputs, @ByVal TensorArrayRef hx, @ByVal TensorArrayRef params, @Cast("bool") boolean has_biases, @Cast("int64_t") long num_layers, double dropout, @Cast("bool") boolean train, @Cast("bool") boolean bidirectional, @Cast("bool") boolean batch_first, @ByRef Tensor out0, @ByVal TensorArrayRef out1, @ByVal TensorArrayRef out2); +@Namespace("at") public static native void lstm_mps_backward_outf(@Const @ByRef TensorOptional grad_y, @Const @ByRef TensorOptional grad_hy, @Const @ByRef TensorOptional grad_cy, @Const @ByRef Tensor z_state, @Const @ByRef Tensor cell_state_fwd, @Const @ByRef Tensor input, @Const @ByRef Tensor layersOutputs, @ByVal TensorVector hx, @ByVal TensorVector params, @Cast("bool") boolean has_biases, @Cast("int64_t") long num_layers, double dropout, @Cast("bool") boolean train, @Cast("bool") boolean bidirectional, @Cast("bool") boolean batch_first, @ByRef Tensor out0, @ByVal TensorVector out1, @ByVal TensorVector out2); @@ -38330,12 +38451,17 @@ public class torch extends org.bytedeco.pytorch.presets.torch { // aten::mean.names_dim(Tensor self, Dimname[1] dim, bool keepdim=False, *, ScalarType? dtype=None) -> Tensor @Namespace("at") public static native @ByVal Tensor mean(@Const @ByRef Tensor self, @ByVal DimnameArrayRef dim, @Cast("bool") boolean keepdim/*=false*/, @ByVal(nullValue = "c10::optional(c10::nullopt)") ScalarTypeOptional dtype); @Namespace("at") public static native @ByVal Tensor mean(@Const @ByRef Tensor self, @ByVal DimnameArrayRef dim); +@Namespace("at") public static native @ByVal Tensor mean(@Const @ByRef Tensor self, @ByVal DimnameVector dim, @Cast("bool") boolean keepdim/*=false*/, @ByVal(nullValue = "c10::optional(c10::nullopt)") ScalarTypeOptional dtype); +@Namespace("at") public static native @ByVal Tensor mean(@Const @ByRef Tensor self, @ByVal DimnameVector dim); // aten::mean.names_out(Tensor self, Dimname[1] dim, bool keepdim=False, *, ScalarType? dtype=None, Tensor(a!) out) -> Tensor(a!) @Namespace("at") public static native @ByRef Tensor mean_out(@ByRef Tensor out, @Const @ByRef Tensor self, @ByVal DimnameArrayRef dim, @Cast("bool") boolean keepdim/*=false*/, @ByVal(nullValue = "c10::optional(c10::nullopt)") ScalarTypeOptional dtype); @Namespace("at") public static native @ByRef Tensor mean_out(@ByRef Tensor out, @Const @ByRef Tensor self, @ByVal DimnameArrayRef dim); +@Namespace("at") public static native @ByRef Tensor mean_out(@ByRef Tensor out, @Const @ByRef Tensor self, @ByVal DimnameVector dim, @Cast("bool") boolean keepdim/*=false*/, @ByVal(nullValue = "c10::optional(c10::nullopt)") ScalarTypeOptional dtype); +@Namespace("at") public static native @ByRef Tensor mean_out(@ByRef Tensor out, @Const @ByRef Tensor self, @ByVal DimnameVector dim); // aten::mean.names_out(Tensor self, Dimname[1] dim, bool keepdim=False, *, ScalarType? dtype=None, Tensor(a!) out) -> Tensor(a!) @Namespace("at") public static native @ByRef Tensor mean_outf(@Const @ByRef Tensor self, @ByVal DimnameArrayRef dim, @Cast("bool") boolean keepdim, @ByVal ScalarTypeOptional dtype, @ByRef Tensor out); +@Namespace("at") public static native @ByRef Tensor mean_outf(@Const @ByRef Tensor self, @ByVal DimnameVector dim, @Cast("bool") boolean keepdim, @ByVal ScalarTypeOptional dtype, @ByRef Tensor out); @@ -38421,10 +38547,11 @@ public class torch extends org.bytedeco.pytorch.presets.torch { // aten::meshgrid(Tensor[] tensors) -> Tensor[] @Namespace("at") public static native @Cast({"", "std::vector"}) @StdMove TensorVector meshgrid(@ByVal TensorArrayRef tensors); +@Namespace("at") public static native @Cast({"", "std::vector"}) @StdMove TensorVector meshgrid(@ByVal TensorVector tensors); // aten::meshgrid.indexing(Tensor[] tensors, *, str indexing) -> Tensor[] @Namespace("at") public static native @Cast({"", "std::vector"}) @StdMove TensorVector meshgrid(@ByVal TensorArrayRef tensors, @StringView BytePointer indexing); -@Namespace("at") public static native @Cast({"", "std::vector"}) @StdMove TensorVector meshgrid(@ByVal TensorArrayRef tensors, @StringView String indexing); +@Namespace("at") public static native @Cast({"", "std::vector"}) @StdMove TensorVector meshgrid(@ByVal TensorVector tensors, @StringView String indexing); @@ -38856,14 +38983,14 @@ public class torch extends org.bytedeco.pytorch.presets.torch { // aten::miopen_rnn(Tensor input, Tensor[] weight, int weight_stride0, Tensor hx, Tensor? cx, int mode, int hidden_size, int num_layers, bool batch_first, float dropout, bool train, bool bidirectional, int[] batch_sizes, Tensor? dropout_state) -> (Tensor, Tensor, Tensor, Tensor, Tensor) @Namespace("at") public static native @ByVal T_TensorTensorTensorTensorTensor_T miopen_rnn(@Const @ByRef Tensor input, @ByVal TensorArrayRef weight, @Cast("int64_t") long weight_stride0, @Const @ByRef Tensor hx, @Const @ByRef TensorOptional cx, @Cast("int64_t") long mode, @Cast("int64_t") long hidden_size, @Cast("int64_t") long num_layers, @Cast("bool") boolean batch_first, double dropout, @Cast("bool") boolean train, @Cast("bool") boolean bidirectional, @ByVal LongArrayRef batch_sizes, @Const @ByRef TensorOptional dropout_state); -@Namespace("at") public static native @ByVal T_TensorTensorTensorTensorTensor_T miopen_rnn(@Const @ByRef Tensor input, @ByVal TensorArrayRef weight, @Cast("int64_t") long weight_stride0, @Const @ByRef Tensor hx, @Const @ByRef TensorOptional cx, @Cast("int64_t") long mode, @Cast("int64_t") long hidden_size, @Cast("int64_t") long num_layers, @Cast("bool") boolean batch_first, double dropout, @Cast("bool") boolean train, @Cast("bool") boolean bidirectional, @ByVal @Cast({"int64_t*", "c10::ArrayRef", "std::vector&"}) @StdVector("int64_t") long[] batch_sizes, @Const @ByRef TensorOptional dropout_state); +@Namespace("at") public static native @ByVal T_TensorTensorTensorTensorTensor_T miopen_rnn(@Const @ByRef Tensor input, @ByVal TensorVector weight, @Cast("int64_t") long weight_stride0, @Const @ByRef Tensor hx, @Const @ByRef TensorOptional cx, @Cast("int64_t") long mode, @Cast("int64_t") long hidden_size, @Cast("int64_t") long num_layers, @Cast("bool") boolean batch_first, double dropout, @Cast("bool") boolean train, @Cast("bool") boolean bidirectional, @ByVal @Cast({"int64_t*", "c10::ArrayRef", "std::vector&"}) @StdVector("int64_t") long[] batch_sizes, @Const @ByRef TensorOptional dropout_state); // aten::miopen_rnn.out(Tensor input, Tensor[] weight, int weight_stride0, Tensor hx, Tensor? cx, int mode, int hidden_size, int num_layers, bool batch_first, float dropout, bool train, bool bidirectional, int[] batch_sizes, Tensor? dropout_state, *, Tensor(a!) out0, Tensor(b!) out1, Tensor(c!) out2, Tensor(d!) out3, Tensor(e!) out4) -> (Tensor(a!), Tensor(b!), Tensor(c!), Tensor(d!), Tensor(e!)) @Namespace("at") public static native @ByVal T_TensorTensorTensorTensorTensor_T miopen_rnn_out(@ByRef Tensor out0, @ByRef Tensor out1, @ByRef Tensor out2, @ByRef Tensor out3, @ByRef Tensor out4, @Const @ByRef Tensor input, @ByVal TensorArrayRef weight, @Cast("int64_t") long weight_stride0, @Const @ByRef Tensor hx, @Const @ByRef TensorOptional cx, @Cast("int64_t") long mode, @Cast("int64_t") long hidden_size, @Cast("int64_t") long num_layers, @Cast("bool") boolean batch_first, double dropout, @Cast("bool") boolean train, @Cast("bool") boolean bidirectional, @ByVal LongArrayRef batch_sizes, @Const @ByRef TensorOptional dropout_state); -@Namespace("at") public static native @ByVal T_TensorTensorTensorTensorTensor_T miopen_rnn_out(@ByRef Tensor out0, @ByRef Tensor out1, @ByRef Tensor out2, @ByRef Tensor out3, @ByRef Tensor out4, @Const @ByRef Tensor input, @ByVal TensorArrayRef weight, @Cast("int64_t") long weight_stride0, @Const @ByRef Tensor hx, @Const @ByRef TensorOptional cx, @Cast("int64_t") long mode, @Cast("int64_t") long hidden_size, @Cast("int64_t") long num_layers, @Cast("bool") boolean batch_first, double dropout, @Cast("bool") boolean train, @Cast("bool") boolean bidirectional, @ByVal @Cast({"int64_t*", "c10::ArrayRef", "std::vector&"}) @StdVector("int64_t") long[] batch_sizes, @Const @ByRef TensorOptional dropout_state); +@Namespace("at") public static native @ByVal T_TensorTensorTensorTensorTensor_T miopen_rnn_out(@ByRef Tensor out0, @ByRef Tensor out1, @ByRef Tensor out2, @ByRef Tensor out3, @ByRef Tensor out4, @Const @ByRef Tensor input, @ByVal TensorVector weight, @Cast("int64_t") long weight_stride0, @Const @ByRef Tensor hx, @Const @ByRef TensorOptional cx, @Cast("int64_t") long mode, @Cast("int64_t") long hidden_size, @Cast("int64_t") long num_layers, @Cast("bool") boolean batch_first, double dropout, @Cast("bool") boolean train, @Cast("bool") boolean bidirectional, @ByVal @Cast({"int64_t*", "c10::ArrayRef", "std::vector&"}) @StdVector("int64_t") long[] batch_sizes, @Const @ByRef TensorOptional dropout_state); // aten::miopen_rnn.out(Tensor input, Tensor[] weight, int weight_stride0, Tensor hx, Tensor? cx, int mode, int hidden_size, int num_layers, bool batch_first, float dropout, bool train, bool bidirectional, int[] batch_sizes, Tensor? dropout_state, *, Tensor(a!) out0, Tensor(b!) out1, Tensor(c!) out2, Tensor(d!) out3, Tensor(e!) out4) -> (Tensor(a!), Tensor(b!), Tensor(c!), Tensor(d!), Tensor(e!)) @Namespace("at") public static native @ByVal T_TensorTensorTensorTensorTensor_T miopen_rnn_outf(@Const @ByRef Tensor input, @ByVal TensorArrayRef weight, @Cast("int64_t") long weight_stride0, @Const @ByRef Tensor hx, @Const @ByRef TensorOptional cx, @Cast("int64_t") long mode, @Cast("int64_t") long hidden_size, @Cast("int64_t") long num_layers, @Cast("bool") boolean batch_first, double dropout, @Cast("bool") boolean train, @Cast("bool") boolean bidirectional, @ByVal LongArrayRef batch_sizes, @Const @ByRef TensorOptional dropout_state, @ByRef Tensor out0, @ByRef Tensor out1, @ByRef Tensor out2, @ByRef Tensor out3, @ByRef Tensor out4); -@Namespace("at") public static native @ByVal T_TensorTensorTensorTensorTensor_T miopen_rnn_outf(@Const @ByRef Tensor input, @ByVal TensorArrayRef weight, @Cast("int64_t") long weight_stride0, @Const @ByRef Tensor hx, @Const @ByRef TensorOptional cx, @Cast("int64_t") long mode, @Cast("int64_t") long hidden_size, @Cast("int64_t") long num_layers, @Cast("bool") boolean batch_first, double dropout, @Cast("bool") boolean train, @Cast("bool") boolean bidirectional, @ByVal @Cast({"int64_t*", "c10::ArrayRef", "std::vector&"}) @StdVector("int64_t") long[] batch_sizes, @Const @ByRef TensorOptional dropout_state, @ByRef Tensor out0, @ByRef Tensor out1, @ByRef Tensor out2, @ByRef Tensor out3, @ByRef Tensor out4); +@Namespace("at") public static native @ByVal T_TensorTensorTensorTensorTensor_T miopen_rnn_outf(@Const @ByRef Tensor input, @ByVal TensorVector weight, @Cast("int64_t") long weight_stride0, @Const @ByRef Tensor hx, @Const @ByRef TensorOptional cx, @Cast("int64_t") long mode, @Cast("int64_t") long hidden_size, @Cast("int64_t") long num_layers, @Cast("bool") boolean batch_first, double dropout, @Cast("bool") boolean train, @Cast("bool") boolean bidirectional, @ByVal @Cast({"int64_t*", "c10::ArrayRef", "std::vector&"}) @StdVector("int64_t") long[] batch_sizes, @Const @ByRef TensorOptional dropout_state, @ByRef Tensor out0, @ByRef Tensor out1, @ByRef Tensor out2, @ByRef Tensor out3, @ByRef Tensor out4); @@ -38894,14 +39021,14 @@ public class torch extends org.bytedeco.pytorch.presets.torch { // aten::miopen_rnn_backward(Tensor input, Tensor[] weight, int weight_stride0, Tensor weight_buf, Tensor hx, Tensor? cx, Tensor output, Tensor? grad_output, Tensor? grad_hy, Tensor? grad_cy, int mode, int hidden_size, int num_layers, bool batch_first, float dropout, bool train, bool bidirectional, int[] batch_sizes, Tensor? dropout_state, Tensor reserve, bool[4] output_mask) -> (Tensor, Tensor, Tensor, Tensor[]) @Namespace("at") public static native @ByVal T_TensorTensorTensorTensorVector_T miopen_rnn_backward(@Const @ByRef Tensor input, @ByVal TensorArrayRef weight, @Cast("int64_t") long weight_stride0, @Const @ByRef Tensor weight_buf, @Const @ByRef Tensor hx, @Const @ByRef TensorOptional cx, @Const @ByRef Tensor output, @Const @ByRef TensorOptional grad_output, @Const @ByRef TensorOptional grad_hy, @Const @ByRef TensorOptional grad_cy, @Cast("int64_t") long mode, @Cast("int64_t") long hidden_size, @Cast("int64_t") long num_layers, @Cast("bool") boolean batch_first, double dropout, @Cast("bool") boolean train, @Cast("bool") boolean bidirectional, @ByVal LongArrayRef batch_sizes, @Const @ByRef TensorOptional dropout_state, @Const @ByRef Tensor reserve, @ByVal @Cast("std::array*") BoolPointer output_mask); -@Namespace("at") public static native @ByVal T_TensorTensorTensorTensorVector_T miopen_rnn_backward(@Const @ByRef Tensor input, @ByVal TensorArrayRef weight, @Cast("int64_t") long weight_stride0, @Const @ByRef Tensor weight_buf, @Const @ByRef Tensor hx, @Const @ByRef TensorOptional cx, @Const @ByRef Tensor output, @Const @ByRef TensorOptional grad_output, @Const @ByRef TensorOptional grad_hy, @Const @ByRef TensorOptional grad_cy, @Cast("int64_t") long mode, @Cast("int64_t") long hidden_size, @Cast("int64_t") long num_layers, @Cast("bool") boolean batch_first, double dropout, @Cast("bool") boolean train, @Cast("bool") boolean bidirectional, @ByVal @Cast({"int64_t*", "c10::ArrayRef", "std::vector&"}) @StdVector("int64_t") long[] batch_sizes, @Const @ByRef TensorOptional dropout_state, @Const @ByRef Tensor reserve, @ByVal @Cast("std::array*") BoolPointer output_mask); +@Namespace("at") public static native @ByVal T_TensorTensorTensorTensorVector_T miopen_rnn_backward(@Const @ByRef Tensor input, @ByVal TensorVector weight, @Cast("int64_t") long weight_stride0, @Const @ByRef Tensor weight_buf, @Const @ByRef Tensor hx, @Const @ByRef TensorOptional cx, @Const @ByRef Tensor output, @Const @ByRef TensorOptional grad_output, @Const @ByRef TensorOptional grad_hy, @Const @ByRef TensorOptional grad_cy, @Cast("int64_t") long mode, @Cast("int64_t") long hidden_size, @Cast("int64_t") long num_layers, @Cast("bool") boolean batch_first, double dropout, @Cast("bool") boolean train, @Cast("bool") boolean bidirectional, @ByVal @Cast({"int64_t*", "c10::ArrayRef", "std::vector&"}) @StdVector("int64_t") long[] batch_sizes, @Const @ByRef TensorOptional dropout_state, @Const @ByRef Tensor reserve, @ByVal @Cast("std::array*") BoolPointer output_mask); // aten::miopen_rnn_backward.out(Tensor input, Tensor[] weight, int weight_stride0, Tensor weight_buf, Tensor hx, Tensor? cx, Tensor output, Tensor? grad_output, Tensor? grad_hy, Tensor? grad_cy, int mode, int hidden_size, int num_layers, bool batch_first, float dropout, bool train, bool bidirectional, int[] batch_sizes, Tensor? dropout_state, Tensor reserve, bool[4] output_mask, *, Tensor(a!) out0, Tensor(b!) out1, Tensor(c!) out2, Tensor(d!)[] out3) -> () @Namespace("at") public static native void miopen_rnn_backward_out(@ByRef Tensor out0, @ByRef Tensor out1, @ByRef Tensor out2, @ByVal TensorArrayRef out3, @Const @ByRef Tensor input, @ByVal TensorArrayRef weight, @Cast("int64_t") long weight_stride0, @Const @ByRef Tensor weight_buf, @Const @ByRef Tensor hx, @Const @ByRef TensorOptional cx, @Const @ByRef Tensor output, @Const @ByRef TensorOptional grad_output, @Const @ByRef TensorOptional grad_hy, @Const @ByRef TensorOptional grad_cy, @Cast("int64_t") long mode, @Cast("int64_t") long hidden_size, @Cast("int64_t") long num_layers, @Cast("bool") boolean batch_first, double dropout, @Cast("bool") boolean train, @Cast("bool") boolean bidirectional, @ByVal LongArrayRef batch_sizes, @Const @ByRef TensorOptional dropout_state, @Const @ByRef Tensor reserve, @ByVal @Cast("std::array*") BoolPointer output_mask); -@Namespace("at") public static native void miopen_rnn_backward_out(@ByRef Tensor out0, @ByRef Tensor out1, @ByRef Tensor out2, @ByVal TensorArrayRef out3, @Const @ByRef Tensor input, @ByVal TensorArrayRef weight, @Cast("int64_t") long weight_stride0, @Const @ByRef Tensor weight_buf, @Const @ByRef Tensor hx, @Const @ByRef TensorOptional cx, @Const @ByRef Tensor output, @Const @ByRef TensorOptional grad_output, @Const @ByRef TensorOptional grad_hy, @Const @ByRef TensorOptional grad_cy, @Cast("int64_t") long mode, @Cast("int64_t") long hidden_size, @Cast("int64_t") long num_layers, @Cast("bool") boolean batch_first, double dropout, @Cast("bool") boolean train, @Cast("bool") boolean bidirectional, @ByVal @Cast({"int64_t*", "c10::ArrayRef", "std::vector&"}) @StdVector("int64_t") long[] batch_sizes, @Const @ByRef TensorOptional dropout_state, @Const @ByRef Tensor reserve, @ByVal @Cast("std::array*") BoolPointer output_mask); +@Namespace("at") public static native void miopen_rnn_backward_out(@ByRef Tensor out0, @ByRef Tensor out1, @ByRef Tensor out2, @ByVal TensorVector out3, @Const @ByRef Tensor input, @ByVal TensorVector weight, @Cast("int64_t") long weight_stride0, @Const @ByRef Tensor weight_buf, @Const @ByRef Tensor hx, @Const @ByRef TensorOptional cx, @Const @ByRef Tensor output, @Const @ByRef TensorOptional grad_output, @Const @ByRef TensorOptional grad_hy, @Const @ByRef TensorOptional grad_cy, @Cast("int64_t") long mode, @Cast("int64_t") long hidden_size, @Cast("int64_t") long num_layers, @Cast("bool") boolean batch_first, double dropout, @Cast("bool") boolean train, @Cast("bool") boolean bidirectional, @ByVal @Cast({"int64_t*", "c10::ArrayRef", "std::vector&"}) @StdVector("int64_t") long[] batch_sizes, @Const @ByRef TensorOptional dropout_state, @Const @ByRef Tensor reserve, @ByVal @Cast("std::array*") BoolPointer output_mask); // aten::miopen_rnn_backward.out(Tensor input, Tensor[] weight, int weight_stride0, Tensor weight_buf, Tensor hx, Tensor? cx, Tensor output, Tensor? grad_output, Tensor? grad_hy, Tensor? grad_cy, int mode, int hidden_size, int num_layers, bool batch_first, float dropout, bool train, bool bidirectional, int[] batch_sizes, Tensor? dropout_state, Tensor reserve, bool[4] output_mask, *, Tensor(a!) out0, Tensor(b!) out1, Tensor(c!) out2, Tensor(d!)[] out3) -> () @Namespace("at") public static native void miopen_rnn_backward_outf(@Const @ByRef Tensor input, @ByVal TensorArrayRef weight, @Cast("int64_t") long weight_stride0, @Const @ByRef Tensor weight_buf, @Const @ByRef Tensor hx, @Const @ByRef TensorOptional cx, @Const @ByRef Tensor output, @Const @ByRef TensorOptional grad_output, @Const @ByRef TensorOptional grad_hy, @Const @ByRef TensorOptional grad_cy, @Cast("int64_t") long mode, @Cast("int64_t") long hidden_size, @Cast("int64_t") long num_layers, @Cast("bool") boolean batch_first, double dropout, @Cast("bool") boolean train, @Cast("bool") boolean bidirectional, @ByVal LongArrayRef batch_sizes, @Const @ByRef TensorOptional dropout_state, @Const @ByRef Tensor reserve, @ByVal @Cast("std::array*") BoolPointer output_mask, @ByRef Tensor out0, @ByRef Tensor out1, @ByRef Tensor out2, @ByVal TensorArrayRef out3); -@Namespace("at") public static native void miopen_rnn_backward_outf(@Const @ByRef Tensor input, @ByVal TensorArrayRef weight, @Cast("int64_t") long weight_stride0, @Const @ByRef Tensor weight_buf, @Const @ByRef Tensor hx, @Const @ByRef TensorOptional cx, @Const @ByRef Tensor output, @Const @ByRef TensorOptional grad_output, @Const @ByRef TensorOptional grad_hy, @Const @ByRef TensorOptional grad_cy, @Cast("int64_t") long mode, @Cast("int64_t") long hidden_size, @Cast("int64_t") long num_layers, @Cast("bool") boolean batch_first, double dropout, @Cast("bool") boolean train, @Cast("bool") boolean bidirectional, @ByVal @Cast({"int64_t*", "c10::ArrayRef", "std::vector&"}) @StdVector("int64_t") long[] batch_sizes, @Const @ByRef TensorOptional dropout_state, @Const @ByRef Tensor reserve, @ByVal @Cast("std::array*") BoolPointer output_mask, @ByRef Tensor out0, @ByRef Tensor out1, @ByRef Tensor out2, @ByVal TensorArrayRef out3); +@Namespace("at") public static native void miopen_rnn_backward_outf(@Const @ByRef Tensor input, @ByVal TensorVector weight, @Cast("int64_t") long weight_stride0, @Const @ByRef Tensor weight_buf, @Const @ByRef Tensor hx, @Const @ByRef TensorOptional cx, @Const @ByRef Tensor output, @Const @ByRef TensorOptional grad_output, @Const @ByRef TensorOptional grad_hy, @Const @ByRef TensorOptional grad_cy, @Cast("int64_t") long mode, @Cast("int64_t") long hidden_size, @Cast("int64_t") long num_layers, @Cast("bool") boolean batch_first, double dropout, @Cast("bool") boolean train, @Cast("bool") boolean bidirectional, @ByVal @Cast({"int64_t*", "c10::ArrayRef", "std::vector&"}) @StdVector("int64_t") long[] batch_sizes, @Const @ByRef TensorOptional dropout_state, @Const @ByRef Tensor reserve, @ByVal @Cast("std::array*") BoolPointer output_mask, @ByRef Tensor out0, @ByRef Tensor out1, @ByRef Tensor out2, @ByVal TensorVector out3); @@ -41964,21 +42091,29 @@ public class torch extends org.bytedeco.pytorch.presets.torch { // aten::norm.names_ScalarOpt_dim_dtype(Tensor self, Scalar? p, Dimname[1] dim, bool keepdim, *, ScalarType dtype) -> Tensor @Namespace("at") public static native @ByVal Tensor norm(@Const @ByRef Tensor self, @Const @ByRef ScalarOptional p, @ByVal DimnameArrayRef dim, @Cast("bool") boolean keepdim, ScalarType dtype); +@Namespace("at") public static native @ByVal Tensor norm(@Const @ByRef Tensor self, @Const @ByRef ScalarOptional p, @ByVal DimnameVector dim, @Cast("bool") boolean keepdim, ScalarType dtype); // aten::norm.names_ScalarOpt_dim(Tensor self, Scalar? p, Dimname[1] dim, bool keepdim=False) -> Tensor @Namespace("at") public static native @ByVal Tensor norm(@Const @ByRef Tensor self, @Const @ByRef ScalarOptional p, @ByVal DimnameArrayRef dim, @Cast("bool") boolean keepdim/*=false*/); @Namespace("at") public static native @ByVal Tensor norm(@Const @ByRef Tensor self, @Const @ByRef ScalarOptional p, @ByVal DimnameArrayRef dim); +@Namespace("at") public static native @ByVal Tensor norm(@Const @ByRef Tensor self, @Const @ByRef ScalarOptional p, @ByVal DimnameVector dim, @Cast("bool") boolean keepdim/*=false*/); +@Namespace("at") public static native @ByVal Tensor norm(@Const @ByRef Tensor self, @Const @ByRef ScalarOptional p, @ByVal DimnameVector dim); // aten::norm.names_dtype_out(Tensor self, Scalar? p, Dimname[1] dim, bool keepdim, *, ScalarType dtype, Tensor(a!) out) -> Tensor(a!) @Namespace("at") public static native @ByRef Tensor norm_out(@ByRef Tensor out, @Const @ByRef Tensor self, @Const @ByRef ScalarOptional p, @ByVal DimnameArrayRef dim, @Cast("bool") boolean keepdim, ScalarType dtype); +@Namespace("at") public static native @ByRef Tensor norm_out(@ByRef Tensor out, @Const @ByRef Tensor self, @Const @ByRef ScalarOptional p, @ByVal DimnameVector dim, @Cast("bool") boolean keepdim, ScalarType dtype); // aten::norm.names_dtype_out(Tensor self, Scalar? p, Dimname[1] dim, bool keepdim, *, ScalarType dtype, Tensor(a!) out) -> Tensor(a!) @Namespace("at") public static native @ByRef Tensor norm_outf(@Const @ByRef Tensor self, @Const @ByRef ScalarOptional p, @ByVal DimnameArrayRef dim, @Cast("bool") boolean keepdim, ScalarType dtype, @ByRef Tensor out); +@Namespace("at") public static native @ByRef Tensor norm_outf(@Const @ByRef Tensor self, @Const @ByRef ScalarOptional p, @ByVal DimnameVector dim, @Cast("bool") boolean keepdim, ScalarType dtype, @ByRef Tensor out); // aten::norm.names_out(Tensor self, Scalar? p, Dimname[1] dim, bool keepdim=False, *, Tensor(a!) out) -> Tensor(a!) @Namespace("at") public static native @ByRef Tensor norm_out(@ByRef Tensor out, @Const @ByRef Tensor self, @Const @ByRef ScalarOptional p, @ByVal DimnameArrayRef dim, @Cast("bool") boolean keepdim/*=false*/); @Namespace("at") public static native @ByRef Tensor norm_out(@ByRef Tensor out, @Const @ByRef Tensor self, @Const @ByRef ScalarOptional p, @ByVal DimnameArrayRef dim); +@Namespace("at") public static native @ByRef Tensor norm_out(@ByRef Tensor out, @Const @ByRef Tensor self, @Const @ByRef ScalarOptional p, @ByVal DimnameVector dim, @Cast("bool") boolean keepdim/*=false*/); +@Namespace("at") public static native @ByRef Tensor norm_out(@ByRef Tensor out, @Const @ByRef Tensor self, @Const @ByRef ScalarOptional p, @ByVal DimnameVector dim); // aten::norm.names_out(Tensor self, Scalar? p, Dimname[1] dim, bool keepdim=False, *, Tensor(a!) out) -> Tensor(a!) @Namespace("at") public static native @ByRef Tensor norm_outf(@Const @ByRef Tensor self, @Const @ByRef ScalarOptional p, @ByVal DimnameArrayRef dim, @Cast("bool") boolean keepdim, @ByRef Tensor out); +@Namespace("at") public static native @ByRef Tensor norm_outf(@Const @ByRef Tensor self, @Const @ByRef ScalarOptional p, @ByVal DimnameVector dim, @Cast("bool") boolean keepdim, @ByRef Tensor out); // aten::norm.ScalarOpt_dtype_out(Tensor self, Scalar? p, *, ScalarType dtype, Tensor(a!) out) -> Tensor(a!) @Namespace("at") public static native @ByRef Tensor norm_out(@ByRef Tensor out, @Const @ByRef Tensor self, @Const @ByRef ScalarOptional p, ScalarType dtype); @@ -42640,6 +42775,8 @@ public class torch extends org.bytedeco.pytorch.presets.torch { // aten::pad_sequence(Tensor[] sequences, bool batch_first=False, float padding_value=0.0) -> Tensor @Namespace("at") public static native @ByVal Tensor pad_sequence(@ByVal TensorArrayRef sequences, @Cast("bool") boolean batch_first/*=false*/, double padding_value/*=0.0*/); @Namespace("at") public static native @ByVal Tensor pad_sequence(@ByVal TensorArrayRef sequences); +@Namespace("at") public static native @ByVal Tensor pad_sequence(@ByVal TensorVector sequences, @Cast("bool") boolean batch_first/*=false*/, double padding_value/*=0.0*/); +@Namespace("at") public static native @ByVal Tensor pad_sequence(@ByVal TensorVector sequences); @@ -43621,6 +43758,7 @@ public class torch extends org.bytedeco.pytorch.presets.torch { // aten::quantize_per_tensor.tensors(Tensor[] tensors, Tensor scales, Tensor zero_points, ScalarType dtype) -> Tensor[] @Namespace("at") public static native @Cast({"", "std::vector"}) @StdMove TensorVector quantize_per_tensor(@ByVal TensorArrayRef tensors, @Const @ByRef Tensor scales, @Const @ByRef Tensor zero_points, ScalarType dtype); +@Namespace("at") public static native @Cast({"", "std::vector"}) @StdMove TensorVector quantize_per_tensor(@ByVal TensorVector tensors, @Const @ByRef Tensor scales, @Const @ByRef Tensor zero_points, ScalarType dtype); // aten::quantize_per_tensor.out(Tensor self, float scale, int zero_point, ScalarType dtype, *, Tensor(a!) out) -> Tensor(a!) @Namespace("at") public static native @ByRef Tensor quantize_per_tensor_out(@ByRef Tensor out, @Const @ByRef Tensor self, double scale, @Cast("int64_t") long zero_point, ScalarType dtype); @@ -43634,8 +43772,10 @@ public class torch extends org.bytedeco.pytorch.presets.torch { // aten::quantize_per_tensor.tensors_out(Tensor[] tensors, Tensor scales, Tensor zero_points, ScalarType dtype, *, Tensor(a!)[] out) -> () @Namespace("at") public static native void quantize_per_tensor_out(@ByVal TensorArrayRef out, @ByVal TensorArrayRef tensors, @Const @ByRef Tensor scales, @Const @ByRef Tensor zero_points, ScalarType dtype); +@Namespace("at") public static native void quantize_per_tensor_out(@ByVal TensorVector out, @ByVal TensorVector tensors, @Const @ByRef Tensor scales, @Const @ByRef Tensor zero_points, ScalarType dtype); // aten::quantize_per_tensor.tensors_out(Tensor[] tensors, Tensor scales, Tensor zero_points, ScalarType dtype, *, Tensor(a!)[] out) -> () @Namespace("at") public static native void quantize_per_tensor_outf(@ByVal TensorArrayRef tensors, @Const @ByRef Tensor scales, @Const @ByRef Tensor zero_points, ScalarType dtype, @ByVal TensorArrayRef out); +@Namespace("at") public static native void quantize_per_tensor_outf(@ByVal TensorVector tensors, @Const @ByRef Tensor scales, @Const @ByRef Tensor zero_points, ScalarType dtype, @ByVal TensorVector out); @@ -43766,6 +43906,7 @@ public class torch extends org.bytedeco.pytorch.presets.torch { // aten::quantized_lstm_cell(Tensor input, Tensor[] hx, Tensor w_ih, Tensor w_hh, Tensor b_ih, Tensor b_hh, Tensor packed_ih, Tensor packed_hh, Tensor col_offsets_ih, Tensor col_offsets_hh, Scalar scale_ih, Scalar scale_hh, Scalar zero_point_ih, Scalar zero_point_hh) -> (Tensor, Tensor) @Namespace("at") public static native @ByVal T_TensorTensor_T quantized_lstm_cell(@Const @ByRef Tensor input, @ByVal TensorArrayRef hx, @Const @ByRef Tensor w_ih, @Const @ByRef Tensor w_hh, @Const @ByRef Tensor b_ih, @Const @ByRef Tensor b_hh, @Const @ByRef Tensor packed_ih, @Const @ByRef Tensor packed_hh, @Const @ByRef Tensor col_offsets_ih, @Const @ByRef Tensor col_offsets_hh, @Const @ByRef Scalar scale_ih, @Const @ByRef Scalar scale_hh, @Const @ByRef Scalar zero_point_ih, @Const @ByRef Scalar zero_point_hh); +@Namespace("at") public static native @ByVal T_TensorTensor_T quantized_lstm_cell(@Const @ByRef Tensor input, @ByVal TensorVector hx, @Const @ByRef Tensor w_ih, @Const @ByRef Tensor w_hh, @Const @ByRef Tensor b_ih, @Const @ByRef Tensor b_hh, @Const @ByRef Tensor packed_ih, @Const @ByRef Tensor packed_hh, @Const @ByRef Tensor col_offsets_ih, @Const @ByRef Tensor col_offsets_hh, @Const @ByRef Scalar scale_ih, @Const @ByRef Scalar scale_hh, @Const @ByRef Scalar zero_point_ih, @Const @ByRef Scalar zero_point_hh); @@ -46416,9 +46557,11 @@ public class torch extends org.bytedeco.pytorch.presets.torch { // aten::rnn_relu.input(Tensor input, Tensor hx, Tensor[] params, bool has_biases, int num_layers, float dropout, bool train, bool bidirectional, bool batch_first) -> (Tensor, Tensor) @Namespace("at") public static native @ByVal T_TensorTensor_T rnn_relu(@Const @ByRef Tensor input, @Const @ByRef Tensor hx, @ByVal TensorArrayRef params, @Cast("bool") boolean has_biases, @Cast("int64_t") long num_layers, double dropout, @Cast("bool") boolean train, @Cast("bool") boolean bidirectional, @Cast("bool") boolean batch_first); +@Namespace("at") public static native @ByVal T_TensorTensor_T rnn_relu(@Const @ByRef Tensor input, @Const @ByRef Tensor hx, @ByVal TensorVector params, @Cast("bool") boolean has_biases, @Cast("int64_t") long num_layers, double dropout, @Cast("bool") boolean train, @Cast("bool") boolean bidirectional, @Cast("bool") boolean batch_first); // aten::rnn_relu.data(Tensor data, Tensor batch_sizes, Tensor hx, Tensor[] params, bool has_biases, int num_layers, float dropout, bool train, bool bidirectional) -> (Tensor, Tensor) @Namespace("at") public static native @ByVal T_TensorTensor_T rnn_relu(@Const @ByRef Tensor data, @Const @ByRef Tensor batch_sizes, @Const @ByRef Tensor hx, @ByVal TensorArrayRef params, @Cast("bool") boolean has_biases, @Cast("int64_t") long num_layers, double dropout, @Cast("bool") boolean train, @Cast("bool") boolean bidirectional); +@Namespace("at") public static native @ByVal T_TensorTensor_T rnn_relu(@Const @ByRef Tensor data, @Const @ByRef Tensor batch_sizes, @Const @ByRef Tensor hx, @ByVal TensorVector params, @Cast("bool") boolean has_biases, @Cast("int64_t") long num_layers, double dropout, @Cast("bool") boolean train, @Cast("bool") boolean bidirectional); @@ -46480,9 +46623,11 @@ public class torch extends org.bytedeco.pytorch.presets.torch { // aten::rnn_tanh.input(Tensor input, Tensor hx, Tensor[] params, bool has_biases, int num_layers, float dropout, bool train, bool bidirectional, bool batch_first) -> (Tensor, Tensor) @Namespace("at") public static native @ByVal T_TensorTensor_T rnn_tanh(@Const @ByRef Tensor input, @Const @ByRef Tensor hx, @ByVal TensorArrayRef params, @Cast("bool") boolean has_biases, @Cast("int64_t") long num_layers, double dropout, @Cast("bool") boolean train, @Cast("bool") boolean bidirectional, @Cast("bool") boolean batch_first); +@Namespace("at") public static native @ByVal T_TensorTensor_T rnn_tanh(@Const @ByRef Tensor input, @Const @ByRef Tensor hx, @ByVal TensorVector params, @Cast("bool") boolean has_biases, @Cast("int64_t") long num_layers, double dropout, @Cast("bool") boolean train, @Cast("bool") boolean bidirectional, @Cast("bool") boolean batch_first); // aten::rnn_tanh.data(Tensor data, Tensor batch_sizes, Tensor hx, Tensor[] params, bool has_biases, int num_layers, float dropout, bool train, bool bidirectional) -> (Tensor, Tensor) @Namespace("at") public static native @ByVal T_TensorTensor_T rnn_tanh(@Const @ByRef Tensor data, @Const @ByRef Tensor batch_sizes, @Const @ByRef Tensor hx, @ByVal TensorArrayRef params, @Cast("bool") boolean has_biases, @Cast("int64_t") long num_layers, double dropout, @Cast("bool") boolean train, @Cast("bool") boolean bidirectional); +@Namespace("at") public static native @ByVal T_TensorTensor_T rnn_tanh(@Const @ByRef Tensor data, @Const @ByRef Tensor batch_sizes, @Const @ByRef Tensor hx, @ByVal TensorVector params, @Cast("bool") boolean has_biases, @Cast("int64_t") long num_layers, double dropout, @Cast("bool") boolean train, @Cast("bool") boolean bidirectional); @@ -46759,11 +46904,14 @@ public class torch extends org.bytedeco.pytorch.presets.torch { // aten::row_stack(Tensor[] tensors) -> Tensor @Namespace("at") public static native @ByVal Tensor row_stack(@ByVal TensorArrayRef tensors); +@Namespace("at") public static native @ByVal Tensor row_stack(@ByVal TensorVector tensors); // aten::row_stack.out(Tensor[] tensors, *, Tensor(a!) out) -> Tensor(a!) @Namespace("at") public static native @ByRef Tensor row_stack_out(@ByRef Tensor out, @ByVal TensorArrayRef tensors); +@Namespace("at") public static native @ByRef Tensor row_stack_out(@ByRef Tensor out, @ByVal TensorVector tensors); // aten::row_stack.out(Tensor[] tensors, *, Tensor(a!) out) -> Tensor(a!) @Namespace("at") public static native @ByRef Tensor row_stack_outf(@ByVal TensorArrayRef tensors, @ByRef Tensor out); +@Namespace("at") public static native @ByRef Tensor row_stack_outf(@ByVal TensorVector tensors, @ByRef Tensor out); @@ -51813,19 +51961,25 @@ public class torch extends org.bytedeco.pytorch.presets.torch { // aten::split_copy.Tensor_out(Tensor self, SymInt split_size, int dim=0, *, Tensor(a!)[] out) -> () @Namespace("at") public static native void split_copy_out(@ByVal TensorArrayRef out, @Const @ByRef Tensor self, @Cast("int64_t") long split_size, @Cast("int64_t") long dim/*=0*/); @Namespace("at") public static native void split_copy_out(@ByVal TensorArrayRef out, @Const @ByRef Tensor self, @Cast("int64_t") long split_size); +@Namespace("at") public static native void split_copy_out(@ByVal TensorVector out, @Const @ByRef Tensor self, @Cast("int64_t") long split_size, @Cast("int64_t") long dim/*=0*/); +@Namespace("at") public static native void split_copy_out(@ByVal TensorVector out, @Const @ByRef Tensor self, @Cast("int64_t") long split_size); // aten::split_copy.Tensor_out(Tensor self, SymInt split_size, int dim=0, *, Tensor(a!)[] out) -> () @Namespace("at") public static native void split_copy_outf(@Const @ByRef Tensor self, @Cast("int64_t") long split_size, @Cast("int64_t") long dim, @ByVal TensorArrayRef out); +@Namespace("at") public static native void split_copy_outf(@Const @ByRef Tensor self, @Cast("int64_t") long split_size, @Cast("int64_t") long dim, @ByVal TensorVector out); // aten::split_copy.Tensor_out(Tensor self, SymInt split_size, int dim=0, *, Tensor(a!)[] out) -> () @Namespace("at") public static native void split_copy_symint_out(@ByVal TensorArrayRef out, @Const @ByRef Tensor self, @ByVal SymInt split_size, @Cast("int64_t") long dim/*=0*/); @Namespace("at") public static native void split_copy_symint_out(@ByVal TensorArrayRef out, @Const @ByRef Tensor self, @ByVal SymInt split_size); +@Namespace("at") public static native void split_copy_symint_out(@ByVal TensorVector out, @Const @ByRef Tensor self, @ByVal SymInt split_size, @Cast("int64_t") long dim/*=0*/); +@Namespace("at") public static native void split_copy_symint_out(@ByVal TensorVector out, @Const @ByRef Tensor self, @ByVal SymInt split_size); // aten::split_copy.Tensor_out(Tensor self, SymInt split_size, int dim=0, *, Tensor(a!)[] out) -> () @Namespace("at") public static native void split_copy_symint_outf(@Const @ByRef Tensor self, @ByVal SymInt split_size, @Cast("int64_t") long dim, @ByVal TensorArrayRef out); +@Namespace("at") public static native void split_copy_symint_outf(@Const @ByRef Tensor self, @ByVal SymInt split_size, @Cast("int64_t") long dim, @ByVal TensorVector out); @@ -51909,22 +52063,25 @@ public class torch extends org.bytedeco.pytorch.presets.torch { // aten::split_with_sizes_copy.out(Tensor self, SymInt[] split_sizes, int dim=0, *, Tensor(a!)[] out) -> () @Namespace("at") public static native void split_with_sizes_copy_out(@ByVal TensorArrayRef out, @Const @ByRef Tensor self, @ByVal LongArrayRef split_sizes, @Cast("int64_t") long dim/*=0*/); @Namespace("at") public static native void split_with_sizes_copy_out(@ByVal TensorArrayRef out, @Const @ByRef Tensor self, @ByVal LongArrayRef split_sizes); -@Namespace("at") public static native void split_with_sizes_copy_out(@ByVal TensorArrayRef out, @Const @ByRef Tensor self, @ByVal @Cast({"int64_t*", "c10::ArrayRef", "std::vector&"}) @StdVector("int64_t") long[] split_sizes, @Cast("int64_t") long dim/*=0*/); -@Namespace("at") public static native void split_with_sizes_copy_out(@ByVal TensorArrayRef out, @Const @ByRef Tensor self, @ByVal @Cast({"int64_t*", "c10::ArrayRef", "std::vector&"}) @StdVector("int64_t") long... split_sizes); +@Namespace("at") public static native void split_with_sizes_copy_out(@ByVal TensorVector out, @Const @ByRef Tensor self, @ByVal @Cast({"int64_t*", "c10::ArrayRef", "std::vector&"}) @StdVector("int64_t") long[] split_sizes, @Cast("int64_t") long dim/*=0*/); +@Namespace("at") public static native void split_with_sizes_copy_out(@ByVal TensorVector out, @Const @ByRef Tensor self, @ByVal @Cast({"int64_t*", "c10::ArrayRef", "std::vector&"}) @StdVector("int64_t") long... split_sizes); // aten::split_with_sizes_copy.out(Tensor self, SymInt[] split_sizes, int dim=0, *, Tensor(a!)[] out) -> () @Namespace("at") public static native void split_with_sizes_copy_outf(@Const @ByRef Tensor self, @ByVal LongArrayRef split_sizes, @Cast("int64_t") long dim, @ByVal TensorArrayRef out); -@Namespace("at") public static native void split_with_sizes_copy_outf(@Const @ByRef Tensor self, @ByVal @Cast({"int64_t*", "c10::ArrayRef", "std::vector&"}) @StdVector("int64_t") long[] split_sizes, @Cast("int64_t") long dim, @ByVal TensorArrayRef out); +@Namespace("at") public static native void split_with_sizes_copy_outf(@Const @ByRef Tensor self, @ByVal @Cast({"int64_t*", "c10::ArrayRef", "std::vector&"}) @StdVector("int64_t") long[] split_sizes, @Cast("int64_t") long dim, @ByVal TensorVector out); // aten::split_with_sizes_copy.out(Tensor self, SymInt[] split_sizes, int dim=0, *, Tensor(a!)[] out) -> () @Namespace("at") public static native void split_with_sizes_copy_symint_out(@ByVal TensorArrayRef out, @Const @ByRef Tensor self, @ByVal SymIntArrayRef split_sizes, @Cast("int64_t") long dim/*=0*/); @Namespace("at") public static native void split_with_sizes_copy_symint_out(@ByVal TensorArrayRef out, @Const @ByRef Tensor self, @ByVal SymIntArrayRef split_sizes); +@Namespace("at") public static native void split_with_sizes_copy_symint_out(@ByVal TensorVector out, @Const @ByRef Tensor self, @ByVal SymIntArrayRef split_sizes, @Cast("int64_t") long dim/*=0*/); +@Namespace("at") public static native void split_with_sizes_copy_symint_out(@ByVal TensorVector out, @Const @ByRef Tensor self, @ByVal SymIntArrayRef split_sizes); // aten::split_with_sizes_copy.out(Tensor self, SymInt[] split_sizes, int dim=0, *, Tensor(a!)[] out) -> () @Namespace("at") public static native void split_with_sizes_copy_symint_outf(@Const @ByRef Tensor self, @ByVal SymIntArrayRef split_sizes, @Cast("int64_t") long dim, @ByVal TensorArrayRef out); +@Namespace("at") public static native void split_with_sizes_copy_symint_outf(@Const @ByRef Tensor self, @ByVal SymIntArrayRef split_sizes, @Cast("int64_t") long dim, @ByVal TensorVector out); @@ -52164,12 +52321,17 @@ public class torch extends org.bytedeco.pytorch.presets.torch { // aten::stack(Tensor[] tensors, int dim=0) -> Tensor @Namespace("at") public static native @ByVal Tensor stack(@ByVal TensorArrayRef tensors, @Cast("int64_t") long dim/*=0*/); @Namespace("at") public static native @ByVal Tensor stack(@ByVal TensorArrayRef tensors); +@Namespace("at") public static native @ByVal Tensor stack(@ByVal TensorVector tensors, @Cast("int64_t") long dim/*=0*/); +@Namespace("at") public static native @ByVal Tensor stack(@ByVal TensorVector tensors); // aten::stack.out(Tensor[] tensors, int dim=0, *, Tensor(a!) out) -> Tensor(a!) @Namespace("at") public static native @ByRef Tensor stack_out(@ByRef Tensor out, @ByVal TensorArrayRef tensors, @Cast("int64_t") long dim/*=0*/); @Namespace("at") public static native @ByRef Tensor stack_out(@ByRef Tensor out, @ByVal TensorArrayRef tensors); +@Namespace("at") public static native @ByRef Tensor stack_out(@ByRef Tensor out, @ByVal TensorVector tensors, @Cast("int64_t") long dim/*=0*/); +@Namespace("at") public static native @ByRef Tensor stack_out(@ByRef Tensor out, @ByVal TensorVector tensors); // aten::stack.out(Tensor[] tensors, int dim=0, *, Tensor(a!) out) -> Tensor(a!) @Namespace("at") public static native @ByRef Tensor stack_outf(@ByVal TensorArrayRef tensors, @Cast("int64_t") long dim, @ByRef Tensor out); +@Namespace("at") public static native @ByRef Tensor stack_outf(@ByVal TensorVector tensors, @Cast("int64_t") long dim, @ByRef Tensor out); @@ -52232,22 +52394,32 @@ public class torch extends org.bytedeco.pytorch.presets.torch { // aten::std.names_dim(Tensor self, Dimname[1] dim, bool unbiased=True, bool keepdim=False) -> Tensor @Namespace("at") public static native @ByVal Tensor std(@Const @ByRef Tensor self, @ByVal DimnameArrayRef dim, @Cast("bool") boolean unbiased, @Cast("bool") boolean keepdim/*=false*/); @Namespace("at") public static native @ByVal Tensor std(@Const @ByRef Tensor self, @ByVal DimnameArrayRef dim, @Cast("bool") boolean unbiased); +@Namespace("at") public static native @ByVal Tensor std(@Const @ByRef Tensor self, @ByVal DimnameVector dim, @Cast("bool") boolean unbiased, @Cast("bool") boolean keepdim/*=false*/); +@Namespace("at") public static native @ByVal Tensor std(@Const @ByRef Tensor self, @ByVal DimnameVector dim, @Cast("bool") boolean unbiased); // aten::std.names_out(Tensor self, Dimname[1] dim, bool unbiased=True, bool keepdim=False, *, Tensor(a!) out) -> Tensor(a!) @Namespace("at") public static native @ByRef Tensor std_out(@ByRef Tensor out, @Const @ByRef Tensor self, @ByVal DimnameArrayRef dim, @Cast("bool") boolean unbiased, @Cast("bool") boolean keepdim/*=false*/); @Namespace("at") public static native @ByRef Tensor std_out(@ByRef Tensor out, @Const @ByRef Tensor self, @ByVal DimnameArrayRef dim, @Cast("bool") boolean unbiased); +@Namespace("at") public static native @ByRef Tensor std_out(@ByRef Tensor out, @Const @ByRef Tensor self, @ByVal DimnameVector dim, @Cast("bool") boolean unbiased, @Cast("bool") boolean keepdim/*=false*/); +@Namespace("at") public static native @ByRef Tensor std_out(@ByRef Tensor out, @Const @ByRef Tensor self, @ByVal DimnameVector dim, @Cast("bool") boolean unbiased); // aten::std.names_out(Tensor self, Dimname[1] dim, bool unbiased=True, bool keepdim=False, *, Tensor(a!) out) -> Tensor(a!) @Namespace("at") public static native @ByRef Tensor std_outf(@Const @ByRef Tensor self, @ByVal DimnameArrayRef dim, @Cast("bool") boolean unbiased, @Cast("bool") boolean keepdim, @ByRef Tensor out); +@Namespace("at") public static native @ByRef Tensor std_outf(@Const @ByRef Tensor self, @ByVal DimnameVector dim, @Cast("bool") boolean unbiased, @Cast("bool") boolean keepdim, @ByRef Tensor out); // aten::std.correction_names(Tensor self, Dimname[1] dim, *, Scalar? correction=None, bool keepdim=False) -> Tensor @Namespace("at") public static native @ByVal Tensor std(@Const @ByRef Tensor self, @ByVal DimnameArrayRef dim, @Const @ByRef(nullValue = "c10::optional(c10::nullopt)") ScalarOptional correction, @Cast("bool") boolean keepdim/*=false*/); @Namespace("at") public static native @ByVal Tensor std(@Const @ByRef Tensor self, @ByVal DimnameArrayRef dim); +@Namespace("at") public static native @ByVal Tensor std(@Const @ByRef Tensor self, @ByVal DimnameVector dim, @Const @ByRef(nullValue = "c10::optional(c10::nullopt)") ScalarOptional correction, @Cast("bool") boolean keepdim/*=false*/); +@Namespace("at") public static native @ByVal Tensor std(@Const @ByRef Tensor self, @ByVal DimnameVector dim); // aten::std.correction_names_out(Tensor self, Dimname[1] dim, *, Scalar? correction=None, bool keepdim=False, Tensor(a!) out) -> Tensor(a!) @Namespace("at") public static native @ByRef Tensor std_out(@ByRef Tensor out, @Const @ByRef Tensor self, @ByVal DimnameArrayRef dim, @Const @ByRef(nullValue = "c10::optional(c10::nullopt)") ScalarOptional correction, @Cast("bool") boolean keepdim/*=false*/); @Namespace("at") public static native @ByRef Tensor std_out(@ByRef Tensor out, @Const @ByRef Tensor self, @ByVal DimnameArrayRef dim); +@Namespace("at") public static native @ByRef Tensor std_out(@ByRef Tensor out, @Const @ByRef Tensor self, @ByVal DimnameVector dim, @Const @ByRef(nullValue = "c10::optional(c10::nullopt)") ScalarOptional correction, @Cast("bool") boolean keepdim/*=false*/); +@Namespace("at") public static native @ByRef Tensor std_out(@ByRef Tensor out, @Const @ByRef Tensor self, @ByVal DimnameVector dim); // aten::std.correction_names_out(Tensor self, Dimname[1] dim, *, Scalar? correction=None, bool keepdim=False, Tensor(a!) out) -> Tensor(a!) @Namespace("at") public static native @ByRef Tensor std_outf(@Const @ByRef Tensor self, @ByVal DimnameArrayRef dim, @Const @ByRef ScalarOptional correction, @Cast("bool") boolean keepdim, @ByRef Tensor out); +@Namespace("at") public static native @ByRef Tensor std_outf(@Const @ByRef Tensor self, @ByVal DimnameVector dim, @Const @ByRef ScalarOptional correction, @Cast("bool") boolean keepdim, @ByRef Tensor out); @@ -52293,10 +52465,14 @@ public class torch extends org.bytedeco.pytorch.presets.torch { // aten::std_mean.names_dim(Tensor self, Dimname[1] dim, bool unbiased=True, bool keepdim=False) -> (Tensor, Tensor) @Namespace("at") public static native @ByVal T_TensorTensor_T std_mean(@Const @ByRef Tensor self, @ByVal DimnameArrayRef dim, @Cast("bool") boolean unbiased, @Cast("bool") boolean keepdim/*=false*/); @Namespace("at") public static native @ByVal T_TensorTensor_T std_mean(@Const @ByRef Tensor self, @ByVal DimnameArrayRef dim, @Cast("bool") boolean unbiased); +@Namespace("at") public static native @ByVal T_TensorTensor_T std_mean(@Const @ByRef Tensor self, @ByVal DimnameVector dim, @Cast("bool") boolean unbiased, @Cast("bool") boolean keepdim/*=false*/); +@Namespace("at") public static native @ByVal T_TensorTensor_T std_mean(@Const @ByRef Tensor self, @ByVal DimnameVector dim, @Cast("bool") boolean unbiased); // aten::std_mean.correction_names(Tensor self, Dimname[1] dim, *, Scalar? correction=None, bool keepdim=False) -> (Tensor, Tensor) @Namespace("at") public static native @ByVal T_TensorTensor_T std_mean(@Const @ByRef Tensor self, @ByVal DimnameArrayRef dim, @Const @ByRef(nullValue = "c10::optional(c10::nullopt)") ScalarOptional correction, @Cast("bool") boolean keepdim/*=false*/); @Namespace("at") public static native @ByVal T_TensorTensor_T std_mean(@Const @ByRef Tensor self, @ByVal DimnameArrayRef dim); +@Namespace("at") public static native @ByVal T_TensorTensor_T std_mean(@Const @ByRef Tensor self, @ByVal DimnameVector dim, @Const @ByRef(nullValue = "c10::optional(c10::nullopt)") ScalarOptional correction, @Cast("bool") boolean keepdim/*=false*/); +@Namespace("at") public static native @ByVal T_TensorTensor_T std_mean(@Const @ByRef Tensor self, @ByVal DimnameVector dim); // aten::std_mean.correction_out(Tensor self, int[1]? dim=None, *, Scalar? correction=None, bool keepdim=False, Tensor(a!) out0, Tensor(b!) out1) -> (Tensor(a!), Tensor(b!)) @Namespace("at") public static native @ByVal T_TensorTensor_T std_mean_out(@ByRef Tensor out0, @ByRef Tensor out1, @Const @ByRef Tensor self, @ByVal(nullValue = "at::OptionalIntArrayRef(c10::nullopt)") LongArrayRefOptional dim, @Const @ByRef(nullValue = "c10::optional(c10::nullopt)") ScalarOptional correction, @Cast("bool") boolean keepdim/*=false*/); @@ -52501,6 +52677,8 @@ public class torch extends org.bytedeco.pytorch.presets.torch { // aten::sum.dim_DimnameList(Tensor self, Dimname[1] dim, bool keepdim=False, *, ScalarType? dtype=None) -> Tensor @Namespace("at") public static native @ByVal Tensor sum(@Const @ByRef Tensor self, @ByVal DimnameArrayRef dim, @Cast("bool") boolean keepdim/*=false*/, @ByVal(nullValue = "c10::optional(c10::nullopt)") ScalarTypeOptional dtype); @Namespace("at") public static native @ByVal Tensor sum(@Const @ByRef Tensor self, @ByVal DimnameArrayRef dim); +@Namespace("at") public static native @ByVal Tensor sum(@Const @ByRef Tensor self, @ByVal DimnameVector dim, @Cast("bool") boolean keepdim/*=false*/, @ByVal(nullValue = "c10::optional(c10::nullopt)") ScalarTypeOptional dtype); +@Namespace("at") public static native @ByVal Tensor sum(@Const @ByRef Tensor self, @ByVal DimnameVector dim); // aten::sum.IntList_out(Tensor self, int[1]? dim, bool keepdim=False, *, ScalarType? dtype=None, Tensor(a!) out) -> Tensor(a!) @Namespace("at") public static native @ByRef Tensor sum_out(@ByRef Tensor out, @Const @ByRef Tensor self, @ByVal LongArrayRefOptional dim, @Cast("bool") boolean keepdim/*=false*/, @ByVal(nullValue = "c10::optional(c10::nullopt)") ScalarTypeOptional dtype); @@ -52514,8 +52692,11 @@ public class torch extends org.bytedeco.pytorch.presets.torch { // aten::sum.DimnameList_out(Tensor self, Dimname[1] dim, bool keepdim=False, *, ScalarType? dtype=None, Tensor(a!) out) -> Tensor(a!) @Namespace("at") public static native @ByRef Tensor sum_out(@ByRef Tensor out, @Const @ByRef Tensor self, @ByVal DimnameArrayRef dim, @Cast("bool") boolean keepdim/*=false*/, @ByVal(nullValue = "c10::optional(c10::nullopt)") ScalarTypeOptional dtype); @Namespace("at") public static native @ByRef Tensor sum_out(@ByRef Tensor out, @Const @ByRef Tensor self, @ByVal DimnameArrayRef dim); +@Namespace("at") public static native @ByRef Tensor sum_out(@ByRef Tensor out, @Const @ByRef Tensor self, @ByVal DimnameVector dim, @Cast("bool") boolean keepdim/*=false*/, @ByVal(nullValue = "c10::optional(c10::nullopt)") ScalarTypeOptional dtype); +@Namespace("at") public static native @ByRef Tensor sum_out(@ByRef Tensor out, @Const @ByRef Tensor self, @ByVal DimnameVector dim); // aten::sum.DimnameList_out(Tensor self, Dimname[1] dim, bool keepdim=False, *, ScalarType? dtype=None, Tensor(a!) out) -> Tensor(a!) @Namespace("at") public static native @ByRef Tensor sum_outf(@Const @ByRef Tensor self, @ByVal DimnameArrayRef dim, @Cast("bool") boolean keepdim, @ByVal ScalarTypeOptional dtype, @ByRef Tensor out); +@Namespace("at") public static native @ByRef Tensor sum_outf(@Const @ByRef Tensor self, @ByVal DimnameVector dim, @Cast("bool") boolean keepdim, @ByVal ScalarTypeOptional dtype, @ByRef Tensor out); // aten::sum.out(Tensor self, *, ScalarType? dtype=None, Tensor(a!) out) -> Tensor(a!) @Namespace("at") public static native @ByRef Tensor sum_out(@ByRef Tensor out, @Const @ByRef Tensor self, @ByVal(nullValue = "c10::optional(c10::nullopt)") ScalarTypeOptional dtype); @@ -54397,8 +54578,11 @@ public class torch extends org.bytedeco.pytorch.presets.torch { // aten::unbind_copy.int_out(Tensor self, int dim=0, *, Tensor(a!)[] out) -> () @Namespace("at") public static native void unbind_copy_out(@ByVal TensorArrayRef out, @Const @ByRef Tensor self, @Cast("int64_t") long dim/*=0*/); @Namespace("at") public static native void unbind_copy_out(@ByVal TensorArrayRef out, @Const @ByRef Tensor self); +@Namespace("at") public static native void unbind_copy_out(@ByVal TensorVector out, @Const @ByRef Tensor self, @Cast("int64_t") long dim/*=0*/); +@Namespace("at") public static native void unbind_copy_out(@ByVal TensorVector out, @Const @ByRef Tensor self); // aten::unbind_copy.int_out(Tensor self, int dim=0, *, Tensor(a!)[] out) -> () @Namespace("at") public static native void unbind_copy_outf(@Const @ByRef Tensor self, @Cast("int64_t") long dim, @ByVal TensorArrayRef out); +@Namespace("at") public static native void unbind_copy_outf(@Const @ByRef Tensor self, @Cast("int64_t") long dim, @ByVal TensorVector out); @@ -54438,11 +54622,12 @@ public class torch extends org.bytedeco.pytorch.presets.torch { // aten::unflatten.Dimname(Tensor(a) self, Dimname dim, SymInt[] sizes, Dimname[] names) -> Tensor(a) @Namespace("at") public static native @ByVal Tensor unflatten(@Const @ByRef Tensor self, @ByVal Dimname dim, @ByVal LongArrayRef sizes, @ByVal DimnameArrayRef names); -@Namespace("at") public static native @ByVal Tensor unflatten(@Const @ByRef Tensor self, @ByVal Dimname dim, @ByVal @Cast({"int64_t*", "c10::ArrayRef", "std::vector&"}) @StdVector("int64_t") long[] sizes, @ByVal DimnameArrayRef names); +@Namespace("at") public static native @ByVal Tensor unflatten(@Const @ByRef Tensor self, @ByVal Dimname dim, @ByVal @Cast({"int64_t*", "c10::ArrayRef", "std::vector&"}) @StdVector("int64_t") long[] sizes, @ByVal DimnameVector names); // aten::unflatten.Dimname(Tensor(a) self, Dimname dim, SymInt[] sizes, Dimname[] names) -> Tensor(a) @Namespace("at") public static native @ByVal Tensor unflatten_symint(@Const @ByRef Tensor self, @ByVal Dimname dim, @ByVal SymIntArrayRef sizes, @ByVal DimnameArrayRef names); +@Namespace("at") public static native @ByVal Tensor unflatten_symint(@Const @ByRef Tensor self, @ByVal Dimname dim, @ByVal SymIntArrayRef sizes, @ByVal DimnameVector names); @@ -54474,6 +54659,7 @@ public class torch extends org.bytedeco.pytorch.presets.torch { // aten::unflatten_dense_tensors(Tensor flat, Tensor[] tensors) -> Tensor[] @Namespace("at") public static native @Cast({"", "std::vector"}) @StdMove TensorVector unflatten_dense_tensors(@Const @ByRef Tensor flat, @ByVal TensorArrayRef tensors); +@Namespace("at") public static native @Cast({"", "std::vector"}) @StdMove TensorVector unflatten_dense_tensors(@Const @ByRef Tensor flat, @ByVal TensorVector tensors); @@ -54811,19 +54997,25 @@ public class torch extends org.bytedeco.pytorch.presets.torch { // aten::unsafe_split.Tensor_out(Tensor self, SymInt split_size, int dim=0, *, Tensor(a!)[] out) -> () @Namespace("at") public static native void unsafe_split_out(@ByVal TensorArrayRef out, @Const @ByRef Tensor self, @Cast("int64_t") long split_size, @Cast("int64_t") long dim/*=0*/); @Namespace("at") public static native void unsafe_split_out(@ByVal TensorArrayRef out, @Const @ByRef Tensor self, @Cast("int64_t") long split_size); +@Namespace("at") public static native void unsafe_split_out(@ByVal TensorVector out, @Const @ByRef Tensor self, @Cast("int64_t") long split_size, @Cast("int64_t") long dim/*=0*/); +@Namespace("at") public static native void unsafe_split_out(@ByVal TensorVector out, @Const @ByRef Tensor self, @Cast("int64_t") long split_size); // aten::unsafe_split.Tensor_out(Tensor self, SymInt split_size, int dim=0, *, Tensor(a!)[] out) -> () @Namespace("at") public static native void unsafe_split_outf(@Const @ByRef Tensor self, @Cast("int64_t") long split_size, @Cast("int64_t") long dim, @ByVal TensorArrayRef out); +@Namespace("at") public static native void unsafe_split_outf(@Const @ByRef Tensor self, @Cast("int64_t") long split_size, @Cast("int64_t") long dim, @ByVal TensorVector out); // aten::unsafe_split.Tensor_out(Tensor self, SymInt split_size, int dim=0, *, Tensor(a!)[] out) -> () @Namespace("at") public static native void unsafe_split_symint_out(@ByVal TensorArrayRef out, @Const @ByRef Tensor self, @ByVal SymInt split_size, @Cast("int64_t") long dim/*=0*/); @Namespace("at") public static native void unsafe_split_symint_out(@ByVal TensorArrayRef out, @Const @ByRef Tensor self, @ByVal SymInt split_size); +@Namespace("at") public static native void unsafe_split_symint_out(@ByVal TensorVector out, @Const @ByRef Tensor self, @ByVal SymInt split_size, @Cast("int64_t") long dim/*=0*/); +@Namespace("at") public static native void unsafe_split_symint_out(@ByVal TensorVector out, @Const @ByRef Tensor self, @ByVal SymInt split_size); // aten::unsafe_split.Tensor_out(Tensor self, SymInt split_size, int dim=0, *, Tensor(a!)[] out) -> () @Namespace("at") public static native void unsafe_split_symint_outf(@Const @ByRef Tensor self, @ByVal SymInt split_size, @Cast("int64_t") long dim, @ByVal TensorArrayRef out); +@Namespace("at") public static native void unsafe_split_symint_outf(@Const @ByRef Tensor self, @ByVal SymInt split_size, @Cast("int64_t") long dim, @ByVal TensorVector out); @@ -54868,22 +55060,25 @@ public class torch extends org.bytedeco.pytorch.presets.torch { // aten::unsafe_split_with_sizes.out(Tensor self, SymInt[] split_sizes, int dim=0, *, Tensor(a!)[] out) -> () @Namespace("at") public static native void unsafe_split_with_sizes_out(@ByVal TensorArrayRef out, @Const @ByRef Tensor self, @ByVal LongArrayRef split_sizes, @Cast("int64_t") long dim/*=0*/); @Namespace("at") public static native void unsafe_split_with_sizes_out(@ByVal TensorArrayRef out, @Const @ByRef Tensor self, @ByVal LongArrayRef split_sizes); -@Namespace("at") public static native void unsafe_split_with_sizes_out(@ByVal TensorArrayRef out, @Const @ByRef Tensor self, @ByVal @Cast({"int64_t*", "c10::ArrayRef", "std::vector&"}) @StdVector("int64_t") long[] split_sizes, @Cast("int64_t") long dim/*=0*/); -@Namespace("at") public static native void unsafe_split_with_sizes_out(@ByVal TensorArrayRef out, @Const @ByRef Tensor self, @ByVal @Cast({"int64_t*", "c10::ArrayRef", "std::vector&"}) @StdVector("int64_t") long... split_sizes); +@Namespace("at") public static native void unsafe_split_with_sizes_out(@ByVal TensorVector out, @Const @ByRef Tensor self, @ByVal @Cast({"int64_t*", "c10::ArrayRef", "std::vector&"}) @StdVector("int64_t") long[] split_sizes, @Cast("int64_t") long dim/*=0*/); +@Namespace("at") public static native void unsafe_split_with_sizes_out(@ByVal TensorVector out, @Const @ByRef Tensor self, @ByVal @Cast({"int64_t*", "c10::ArrayRef", "std::vector&"}) @StdVector("int64_t") long... split_sizes); // aten::unsafe_split_with_sizes.out(Tensor self, SymInt[] split_sizes, int dim=0, *, Tensor(a!)[] out) -> () @Namespace("at") public static native void unsafe_split_with_sizes_outf(@Const @ByRef Tensor self, @ByVal LongArrayRef split_sizes, @Cast("int64_t") long dim, @ByVal TensorArrayRef out); -@Namespace("at") public static native void unsafe_split_with_sizes_outf(@Const @ByRef Tensor self, @ByVal @Cast({"int64_t*", "c10::ArrayRef", "std::vector&"}) @StdVector("int64_t") long[] split_sizes, @Cast("int64_t") long dim, @ByVal TensorArrayRef out); +@Namespace("at") public static native void unsafe_split_with_sizes_outf(@Const @ByRef Tensor self, @ByVal @Cast({"int64_t*", "c10::ArrayRef", "std::vector&"}) @StdVector("int64_t") long[] split_sizes, @Cast("int64_t") long dim, @ByVal TensorVector out); // aten::unsafe_split_with_sizes.out(Tensor self, SymInt[] split_sizes, int dim=0, *, Tensor(a!)[] out) -> () @Namespace("at") public static native void unsafe_split_with_sizes_symint_out(@ByVal TensorArrayRef out, @Const @ByRef Tensor self, @ByVal SymIntArrayRef split_sizes, @Cast("int64_t") long dim/*=0*/); @Namespace("at") public static native void unsafe_split_with_sizes_symint_out(@ByVal TensorArrayRef out, @Const @ByRef Tensor self, @ByVal SymIntArrayRef split_sizes); +@Namespace("at") public static native void unsafe_split_with_sizes_symint_out(@ByVal TensorVector out, @Const @ByRef Tensor self, @ByVal SymIntArrayRef split_sizes, @Cast("int64_t") long dim/*=0*/); +@Namespace("at") public static native void unsafe_split_with_sizes_symint_out(@ByVal TensorVector out, @Const @ByRef Tensor self, @ByVal SymIntArrayRef split_sizes); // aten::unsafe_split_with_sizes.out(Tensor self, SymInt[] split_sizes, int dim=0, *, Tensor(a!)[] out) -> () @Namespace("at") public static native void unsafe_split_with_sizes_symint_outf(@Const @ByRef Tensor self, @ByVal SymIntArrayRef split_sizes, @Cast("int64_t") long dim, @ByVal TensorArrayRef out); +@Namespace("at") public static native void unsafe_split_with_sizes_symint_outf(@Const @ByRef Tensor self, @ByVal SymIntArrayRef split_sizes, @Cast("int64_t") long dim, @ByVal TensorVector out); @@ -56052,22 +56247,32 @@ public class torch extends org.bytedeco.pytorch.presets.torch { // aten::var.names_dim(Tensor self, Dimname[1] dim, bool unbiased=True, bool keepdim=False) -> Tensor @Namespace("at") public static native @ByVal Tensor var(@Const @ByRef Tensor self, @ByVal DimnameArrayRef dim, @Cast("bool") boolean unbiased, @Cast("bool") boolean keepdim/*=false*/); @Namespace("at") public static native @ByVal Tensor var(@Const @ByRef Tensor self, @ByVal DimnameArrayRef dim, @Cast("bool") boolean unbiased); +@Namespace("at") public static native @ByVal Tensor var(@Const @ByRef Tensor self, @ByVal DimnameVector dim, @Cast("bool") boolean unbiased, @Cast("bool") boolean keepdim/*=false*/); +@Namespace("at") public static native @ByVal Tensor var(@Const @ByRef Tensor self, @ByVal DimnameVector dim, @Cast("bool") boolean unbiased); // aten::var.names_out(Tensor self, Dimname[1] dim, bool unbiased=True, bool keepdim=False, *, Tensor(a!) out) -> Tensor(a!) @Namespace("at") public static native @ByRef Tensor var_out(@ByRef Tensor out, @Const @ByRef Tensor self, @ByVal DimnameArrayRef dim, @Cast("bool") boolean unbiased, @Cast("bool") boolean keepdim/*=false*/); @Namespace("at") public static native @ByRef Tensor var_out(@ByRef Tensor out, @Const @ByRef Tensor self, @ByVal DimnameArrayRef dim, @Cast("bool") boolean unbiased); +@Namespace("at") public static native @ByRef Tensor var_out(@ByRef Tensor out, @Const @ByRef Tensor self, @ByVal DimnameVector dim, @Cast("bool") boolean unbiased, @Cast("bool") boolean keepdim/*=false*/); +@Namespace("at") public static native @ByRef Tensor var_out(@ByRef Tensor out, @Const @ByRef Tensor self, @ByVal DimnameVector dim, @Cast("bool") boolean unbiased); // aten::var.names_out(Tensor self, Dimname[1] dim, bool unbiased=True, bool keepdim=False, *, Tensor(a!) out) -> Tensor(a!) @Namespace("at") public static native @ByRef Tensor var_outf(@Const @ByRef Tensor self, @ByVal DimnameArrayRef dim, @Cast("bool") boolean unbiased, @Cast("bool") boolean keepdim, @ByRef Tensor out); +@Namespace("at") public static native @ByRef Tensor var_outf(@Const @ByRef Tensor self, @ByVal DimnameVector dim, @Cast("bool") boolean unbiased, @Cast("bool") boolean keepdim, @ByRef Tensor out); // aten::var.correction_names(Tensor self, Dimname[1] dim, *, Scalar? correction=None, bool keepdim=False) -> Tensor @Namespace("at") public static native @ByVal Tensor var(@Const @ByRef Tensor self, @ByVal DimnameArrayRef dim, @Const @ByRef(nullValue = "c10::optional(c10::nullopt)") ScalarOptional correction, @Cast("bool") boolean keepdim/*=false*/); @Namespace("at") public static native @ByVal Tensor var(@Const @ByRef Tensor self, @ByVal DimnameArrayRef dim); +@Namespace("at") public static native @ByVal Tensor var(@Const @ByRef Tensor self, @ByVal DimnameVector dim, @Const @ByRef(nullValue = "c10::optional(c10::nullopt)") ScalarOptional correction, @Cast("bool") boolean keepdim/*=false*/); +@Namespace("at") public static native @ByVal Tensor var(@Const @ByRef Tensor self, @ByVal DimnameVector dim); // aten::var.correction_names_out(Tensor self, Dimname[1] dim, *, Scalar? correction=None, bool keepdim=False, Tensor(a!) out) -> Tensor(a!) @Namespace("at") public static native @ByRef Tensor var_out(@ByRef Tensor out, @Const @ByRef Tensor self, @ByVal DimnameArrayRef dim, @Const @ByRef(nullValue = "c10::optional(c10::nullopt)") ScalarOptional correction, @Cast("bool") boolean keepdim/*=false*/); @Namespace("at") public static native @ByRef Tensor var_out(@ByRef Tensor out, @Const @ByRef Tensor self, @ByVal DimnameArrayRef dim); +@Namespace("at") public static native @ByRef Tensor var_out(@ByRef Tensor out, @Const @ByRef Tensor self, @ByVal DimnameVector dim, @Const @ByRef(nullValue = "c10::optional(c10::nullopt)") ScalarOptional correction, @Cast("bool") boolean keepdim/*=false*/); +@Namespace("at") public static native @ByRef Tensor var_out(@ByRef Tensor out, @Const @ByRef Tensor self, @ByVal DimnameVector dim); // aten::var.correction_names_out(Tensor self, Dimname[1] dim, *, Scalar? correction=None, bool keepdim=False, Tensor(a!) out) -> Tensor(a!) @Namespace("at") public static native @ByRef Tensor var_outf(@Const @ByRef Tensor self, @ByVal DimnameArrayRef dim, @Const @ByRef ScalarOptional correction, @Cast("bool") boolean keepdim, @ByRef Tensor out); +@Namespace("at") public static native @ByRef Tensor var_outf(@Const @ByRef Tensor self, @ByVal DimnameVector dim, @Const @ByRef ScalarOptional correction, @Cast("bool") boolean keepdim, @ByRef Tensor out); @@ -56113,10 +56318,14 @@ public class torch extends org.bytedeco.pytorch.presets.torch { // aten::var_mean.names_dim(Tensor self, Dimname[1] dim, bool unbiased=True, bool keepdim=False) -> (Tensor, Tensor) @Namespace("at") public static native @ByVal T_TensorTensor_T var_mean(@Const @ByRef Tensor self, @ByVal DimnameArrayRef dim, @Cast("bool") boolean unbiased, @Cast("bool") boolean keepdim/*=false*/); @Namespace("at") public static native @ByVal T_TensorTensor_T var_mean(@Const @ByRef Tensor self, @ByVal DimnameArrayRef dim, @Cast("bool") boolean unbiased); +@Namespace("at") public static native @ByVal T_TensorTensor_T var_mean(@Const @ByRef Tensor self, @ByVal DimnameVector dim, @Cast("bool") boolean unbiased, @Cast("bool") boolean keepdim/*=false*/); +@Namespace("at") public static native @ByVal T_TensorTensor_T var_mean(@Const @ByRef Tensor self, @ByVal DimnameVector dim, @Cast("bool") boolean unbiased); // aten::var_mean.correction_names(Tensor self, Dimname[1] dim, *, Scalar? correction=None, bool keepdim=False) -> (Tensor, Tensor) @Namespace("at") public static native @ByVal T_TensorTensor_T var_mean(@Const @ByRef Tensor self, @ByVal DimnameArrayRef dim, @Const @ByRef(nullValue = "c10::optional(c10::nullopt)") ScalarOptional correction, @Cast("bool") boolean keepdim/*=false*/); @Namespace("at") public static native @ByVal T_TensorTensor_T var_mean(@Const @ByRef Tensor self, @ByVal DimnameArrayRef dim); +@Namespace("at") public static native @ByVal T_TensorTensor_T var_mean(@Const @ByRef Tensor self, @ByVal DimnameVector dim, @Const @ByRef(nullValue = "c10::optional(c10::nullopt)") ScalarOptional correction, @Cast("bool") boolean keepdim/*=false*/); +@Namespace("at") public static native @ByVal T_TensorTensor_T var_mean(@Const @ByRef Tensor self, @ByVal DimnameVector dim); // aten::var_mean.correction_out(Tensor self, int[1]? dim=None, *, Scalar? correction=None, bool keepdim=False, Tensor(a!) out0, Tensor(b!) out1) -> (Tensor(a!), Tensor(b!)) @Namespace("at") public static native @ByVal T_TensorTensor_T var_mean_out(@ByRef Tensor out0, @ByRef Tensor out1, @Const @ByRef Tensor self, @ByVal(nullValue = "at::OptionalIntArrayRef(c10::nullopt)") LongArrayRefOptional dim, @Const @ByRef(nullValue = "c10::optional(c10::nullopt)") ScalarOptional correction, @Cast("bool") boolean keepdim/*=false*/); @@ -56472,11 +56681,14 @@ public class torch extends org.bytedeco.pytorch.presets.torch { // aten::vstack(Tensor[] tensors) -> Tensor @Namespace("at") public static native @ByVal Tensor vstack(@ByVal TensorArrayRef tensors); +@Namespace("at") public static native @ByVal Tensor vstack(@ByVal TensorVector tensors); // aten::vstack.out(Tensor[] tensors, *, Tensor(a!) out) -> Tensor(a!) @Namespace("at") public static native @ByRef Tensor vstack_out(@ByRef Tensor out, @ByVal TensorArrayRef tensors); +@Namespace("at") public static native @ByRef Tensor vstack_out(@ByRef Tensor out, @ByVal TensorVector tensors); // aten::vstack.out(Tensor[] tensors, *, Tensor(a!) out) -> Tensor(a!) @Namespace("at") public static native @ByRef Tensor vstack_outf(@ByVal TensorArrayRef tensors, @ByRef Tensor out); +@Namespace("at") public static native @ByRef Tensor vstack_outf(@ByVal TensorVector tensors, @ByRef Tensor out); @@ -58344,6 +58556,7 @@ public class torch extends org.bytedeco.pytorch.presets.torch { @Namespace("at") public static native @Cast({"", "std::vector"}) @StdMove TensorVector expand_outplace(@ByVal TensorArrayRef to_expand); +@Namespace("at") public static native @Cast({"", "std::vector"}) @StdMove TensorVector expand_outplace(@ByVal TensorVector to_expand); @Namespace("at") public static native @ByVal Tensor sum_to( @ByVal Tensor tensor, @@ -58589,9 +58802,6 @@ public class torch extends org.bytedeco.pytorch.presets.torch { //===----------------------------------------------------------------------===// // Utilities //===----------------------------------------------------------------------===// -// Targeting ../pack.java - - // namespace detail // namespace torch @@ -59718,6 +59928,14 @@ public class torch extends org.bytedeco.pytorch.presets.torch { ScalarType src_type, @Const Pointer ptr); +@Namespace("c10") public static native @ByVal @Name("fetch_and_cast >") FloatComplex fetch_and_cast_to_ComplexFloat( + ScalarType src_type, + @Const Pointer ptr); + +@Namespace("c10") public static native @ByVal @Name("fetch_and_cast >") DoubleComplex fetch_and_cast_to_ComplexDouble( + ScalarType src_type, + @Const Pointer ptr); + @Namespace("c10") public static native @Cast("bool") @Name("fetch_and_cast") boolean fetch_and_cast_to_boolean( ScalarType src_type, @Const Pointer ptr); @@ -59788,11 +60006,11 @@ public class torch extends org.bytedeco.pytorch.presets.torch { ScalarType dest_type, Pointer ptr, double value); -@Namespace("c10") public static native @Name("cast_and_store") void cast_and_store_from_qint8( +@Namespace("c10") public static native @Name("cast_and_store >") void cast_and_store_from_ComplexFloat( ScalarType dest_type, Pointer ptr, @ByVal FloatComplex value); -@Namespace("c10") public static native @Name("cast_and_store") void cast_and_store_from_qint8( +@Namespace("c10") public static native @Name("cast_and_store >") void cast_and_store_from_ComplexDouble( ScalarType dest_type, Pointer ptr, @ByVal DoubleComplex value); @@ -61364,6 +61582,8 @@ public class torch extends org.bytedeco.pytorch.presets.torch { // overhead and is undesirable. @Namespace("at::indexing::impl") public static native @Cast("int64_t") long count_specified_dimensions( @Const @ByRef TensorIndexArrayRef indices); +@Namespace("at::indexing::impl") public static native @Cast("int64_t") long count_specified_dimensions( + @Const @ByRef TensorIndexVector indices); // namespace impl // NOTE: Many functions below are only for consumption from Python indexing @@ -61436,6 +61656,13 @@ public class torch extends org.bytedeco.pytorch.presets.torch { @Cast("bool") boolean disable_slice_optimization, @Const @ByRef Device self_device, @Const @ByRef SymIntArrayRefOptional self_sizes); +@Namespace("at::indexing::impl") public static native @ByVal Tensor applySlicing( + @Const @ByRef Tensor self, + @Const @ByRef TensorIndexVector indices, + @ByRef TensorVector outIndices, + @Cast("bool") boolean disable_slice_optimization, + @Const @ByRef Device self_device, + @Const @ByRef SymIntArrayRefOptional self_sizes); // namespace impl @Namespace("at::indexing") public static native @ByVal Tensor dispatch_index( @@ -61488,6 +61715,13 @@ public class torch extends org.bytedeco.pytorch.presets.torch { @Namespace("at::indexing") public static native @ByVal Tensor get_item( @Const @ByRef Tensor self, @Const @ByRef TensorIndexArrayRef indices); +@Namespace("at::indexing") public static native @ByVal Tensor get_item( + @Const @ByRef Tensor self, + @Const @ByRef TensorIndexVector indices, + @Cast("bool") boolean disable_slice_optimization/*=false*/); +@Namespace("at::indexing") public static native @ByVal Tensor get_item( + @Const @ByRef Tensor self, + @Const @ByRef TensorIndexVector indices); // This mirrors `THPVariable_setitem` in // torch/csrc/autograd/python_variable_indexing.cpp for "the assigned value is a @@ -61502,6 +61736,15 @@ public class torch extends org.bytedeco.pytorch.presets.torch { @Const @ByRef Tensor self, @Const @ByRef TensorIndexArrayRef indices, @Const @ByRef Tensor value); +@Namespace("at::indexing") public static native void set_item( + @Const @ByRef Tensor self, + @Const @ByRef TensorIndexVector indices, + @Const @ByRef Tensor value, + @Cast("bool") boolean disable_slice_optimization/*=false*/); +@Namespace("at::indexing") public static native void set_item( + @Const @ByRef Tensor self, + @Const @ByRef TensorIndexVector indices, + @Const @ByRef Tensor value); // namespace indexing // namespace at @@ -63706,11 +63949,20 @@ public class torch extends org.bytedeco.pytorch.presets.torch { @ByRef Graph g, @ByRef Graph callee, @ByVal ValueArrayRef inputs); +@Namespace("torch::jit") public static native @ByVal ValueVector insertGraph( + @ByRef Graph g, + @ByRef Graph callee, + @ByVal ValueVector inputs); @Namespace("torch::jit") public static native @ByVal ValueVector insertGraph( @ByRef Graph g, @ByRef Graph callee, @ByVal ValueArrayRef inputs, @ByRef ValueValueMap value_map); +@Namespace("torch::jit") public static native @ByVal ValueVector insertGraph( + @ByRef Graph g, + @ByRef Graph callee, + @ByVal ValueVector inputs, + @ByRef ValueValueMap value_map); /** Insert function \p CALLEE after node \p TO_REPLACE, remove the node and * replace all its uses with corresponding outputs of the inserted function. @@ -63924,6 +64176,9 @@ public class torch extends org.bytedeco.pytorch.presets.torch { @Namespace("torch::jit") public static native JitNode replaceBlockWithFallbackGraph( Block b, @ByVal ValueArrayRef inputs); +@Namespace("torch::jit") public static native JitNode replaceBlockWithFallbackGraph( + Block b, + @ByVal ValueVector inputs); // These passes need to run before it is valid to pass to the interpreter // regardless of whether sizes have been specialized or not. @@ -64848,6 +65103,12 @@ The list of (type, depth) pairs controls the type of specializations and the num // Targeting ../TensorExampleStack.java + +/** A {@code Collation} for {@code Example} types that stacks all data + * tensors into one tensor, and all target (label) tensors into one tensor. */ + +/** A {@code Collation} for {@code Example} types that stacks all data + * tensors into one tensor. */ // namespace transforms // namespace data // namespace torch @@ -65941,8 +66202,10 @@ The list of (type, depth) pairs controls the type of specializations and the num @Cast("bool") boolean hermitian); @Namespace("torch::linalg::detail") public static native @ByVal Tensor multi_dot(@ByVal TensorArrayRef tensors); +@Namespace("torch::linalg::detail") public static native @ByVal Tensor multi_dot(@ByVal TensorVector tensors); @Namespace("torch::linalg::detail") public static native @ByRef Tensor multi_dot_out(@ByVal TensorArrayRef tensors, @ByRef Tensor result); +@Namespace("torch::linalg::detail") public static native @ByRef Tensor multi_dot_out(@ByVal TensorVector tensors, @ByRef Tensor result); @Namespace("torch::linalg::detail") public static native @ByVal Tensor pinv(@Const @ByRef Tensor input, double rcond, @Cast("bool") boolean hermitian); @@ -66321,6 +66584,11 @@ The list of (type, depth) pairs controls the type of specializations and the num @Const @ByRef(nullValue = "at::TensorOptions{}") TensorOptions options); @Namespace("torch::nested") public static native @ByVal Tensor nested_tensor( @ByVal TensorArrayRef nested_tensor_data); +@Namespace("torch::nested") public static native @ByVal Tensor nested_tensor( + @ByVal TensorVector nested_tensor_data, + @Const @ByRef(nullValue = "at::TensorOptions{}") TensorOptions options); +@Namespace("torch::nested") public static native @ByVal Tensor nested_tensor( + @ByVal TensorVector nested_tensor_data); /// @@ -66346,6 +66614,12 @@ The list of (type, depth) pairs controls the type of specializations and the num @ByVal(nullValue = "c10::optional(c10::nullopt)") DeviceOptional device); @Namespace("torch::nested") public static native @ByVal Tensor as_nested_tensor( @ByVal TensorArrayRef list); +@Namespace("torch::nested") public static native @ByVal Tensor as_nested_tensor( + @ByVal TensorVector list, + @ByVal(nullValue = "c10::optional(c10::nullopt)") ScalarTypeOptional dtype, + @ByVal(nullValue = "c10::optional(c10::nullopt)") DeviceOptional device); +@Namespace("torch::nested") public static native @ByVal Tensor as_nested_tensor( + @ByVal TensorVector list); /** Nested to padded tensor * @@ -70804,7 +71078,7 @@ scalar_t sf(scalar_t x, scalar_t y) @ByVal LongOptionalArrayRef out_size, @ByVal LongArrayRef defaults); @Namespace("torch::nn::modules::utils") public static native @ByVal @Cast("std::vector*") LongVector _list_with_default( - @ByVal LongOptionalArrayRef out_size, + @ByVal LongOptionalVector out_size, @ByVal @Cast({"int64_t*", "c10::ArrayRef", "std::vector&"}) @StdVector("int64_t") long... defaults); // namespace utils @@ -74513,6 +74787,11 @@ scalar_t sf(scalar_t x, scalar_t y) @Cast("bool") boolean enforce_sorted/*=true*/); @Namespace("torch::nn::utils::rnn") public static native @ByVal PackedSequence pack_sequence( @ByVal TensorArrayRef sequences); +@Namespace("torch::nn::utils::rnn") public static native @ByVal PackedSequence pack_sequence( + @ByVal TensorVector sequences, + @Cast("bool") boolean enforce_sorted/*=true*/); +@Namespace("torch::nn::utils::rnn") public static native @ByVal PackedSequence pack_sequence( + @ByVal TensorVector sequences); // namespace rnn // namespace utils @@ -78239,6 +78518,15 @@ scalar_t sf(scalar_t x, scalar_t y) @ByVal PickleReader reader, @ByVal TypeResolver type_resolver, @ByVal TensorArrayRef tensor_table); +@Namespace("torch::jit") public static native @ByVal IValue unpickle( + @ByVal PickleReader reader, + @ByVal TypeResolver type_resolver, + @ByVal TensorVector tensor_table, + TypeParser type_parser/*=torch::jit::Unpickler::defaultTypeParser*/); +@Namespace("torch::jit") public static native @ByVal IValue unpickle( + @ByVal PickleReader reader, + @ByVal TypeResolver type_resolver, + @ByVal TensorVector tensor_table); /** Decode a chunk of memory containing pickled data into its {@code torch::IValue}s. * @@ -78259,7 +78547,7 @@ scalar_t sf(scalar_t x, scalar_t y) String data, @Cast("size_t") long size, @ByVal(nullValue = "torch::jit::TypeResolver(nullptr)") TypeResolver type_resolver, - @ByVal(nullValue = "c10::ArrayRef{}") TensorArrayRef tensor_table, + @ByVal(nullValue = "c10::ArrayRef{}") TensorVector tensor_table, TypeParser type_parser/*=torch::jit::Unpickler::defaultTypeParser*/); @Namespace("torch::jit") public static native @ByVal IValue unpickle( String data, diff --git a/pytorch/src/gen/java/org/bytedeco/pytorch/pack.java b/pytorch/src/gen/java/org/bytedeco/pytorch/pack.java deleted file mode 100644 index 462a5983648..00000000000 --- a/pytorch/src/gen/java/org/bytedeco/pytorch/pack.java +++ /dev/null @@ -1,26 +0,0 @@ -// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE - -package org.bytedeco.pytorch; - -import org.bytedeco.pytorch.Allocator; -import org.bytedeco.pytorch.Function; -import org.bytedeco.pytorch.functions.*; -import org.bytedeco.pytorch.Module; -import org.bytedeco.javacpp.annotation.Cast; -import java.nio.*; -import org.bytedeco.javacpp.*; -import org.bytedeco.javacpp.annotation.*; - -import static org.bytedeco.javacpp.presets.javacpp.*; -import static org.bytedeco.openblas.global.openblas_nolapack.*; -import static org.bytedeco.openblas.global.openblas.*; - -import static org.bytedeco.pytorch.global.torch.*; - -@Namespace("torch::detail") @Opaque @Properties(inherit = org.bytedeco.pytorch.presets.torch.class) -public class pack extends Pointer { - /** Empty constructor. Calls {@code super((Pointer)null)}. */ - public pack() { super((Pointer)null); } - /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ - public pack(Pointer p) { super(p); } -} diff --git a/pytorch/src/main/java/org/bytedeco/pytorch/presets/torch.java b/pytorch/src/main/java/org/bytedeco/pytorch/presets/torch.java index 88151c2b251..ad6b0e72d1e 100644 --- a/pytorch/src/main/java/org/bytedeco/pytorch/presets/torch.java +++ b/pytorch/src/main/java/org/bytedeco/pytorch/presets/torch.java @@ -198,8 +198,6 @@ public void mapModule(InfoMap infoMap, String name, String base, String baseBase mapModule(infoMap, name, base, baseBase, true); } - String anyModuleConstructors = ""; - public void mapModule(InfoMap infoMap, String name, String base, String baseBase, boolean anyModuleCompatible) { if (baseBase != null) { infoMap.put(new Info(baseBase).pointerTypes(name + "ImplBaseBase")); @@ -217,11 +215,18 @@ public void mapModule(InfoMap infoMap, String name, String base, String baseBase ; if (anyModuleCompatible) { - anyModuleConstructors += - "public AnyModule(" + name + "Impl module) { super((Pointer)null); allocate(module); }\n" + - // We need a @Cast because AnyModule constructor is explicit - "private native void allocate(@SharedPtr @Cast({\"\", \"std::shared_ptr\"}) " + name + "Impl module);\n"; - infoMap.put(new Info("torch::nn::SequentialImpl::push_back").javaNames("push_back")); + infoMap + // Parser queries parameter as ModuleType* instead of std::shared_ptr + // First cppName is to answer template query, second one to generate instance + .put(new Info( + "torch::nn::AnyModule::AnyModule(ModuleType*)", + "torch::nn::AnyModule::AnyModule(torch::nn::" + name + "Impl*)" + ).define().javaText( + "public AnyModule(" + name + "Impl module) { super((Pointer)null); allocate(module); }\n" + + // We need a @Cast because AnyModule constructor is explicit + "private native void allocate(@SharedPtr @Cast({\"\", \"std::shared_ptr\"}) " + name + "Impl module);\n")) + .put(new Info("torch::nn::SequentialImpl::push_back").javaNames("push_back")) + ; } } @@ -356,8 +361,6 @@ public void map(InfoMap infoMap) { .put(new Info("c10::requires_grad", "at::range", "at::bernoulli_out", "at::normal_out", "at::stft").skipDefaults()) .put(new Info("c10::prim::requires_grad").javaNames("requires_grad")) .put(new Info("c10::aten::clone").javaNames("_clone")) - .put(new Info("c10::TensorOptions").javaNames("TensorOptions")) - .put(new Info("c10::detail::_str").javaNames("_strCompileTimeEmptyString")) .put(new Info("at::TensorBase").base("AbstractTensor").pointerTypes("TensorBase")) ; @@ -657,6 +660,9 @@ public void map(InfoMap infoMap) { //// c10::ArrayRef + /* Transparent cast from variadic java args to ArrayRef is only possible for non-boolean primitives (see mapArrayRef). + * For Pointer subclasses for which a std::vector has been instantiated, we rely on ArrayRef converting constructor from std::vector and add the vector class as an otherPointerTypes() + */ for (ArrayInfo t : new ArrayInfo[]{ new ArrayInfo("Argument").elementTypes("c10::Argument"), new ArrayInfo("ArgumentDef").elementTypes("c10::detail::infer_schema::ArgumentDef"), @@ -664,7 +670,7 @@ public void map(InfoMap infoMap) { new ArrayInfo("Block").elementTypes("torch::jit::Block*").itPointerType("PointerPointer"), new ArrayInfo("Bool").itPointerType("BoolPointer").elementTypes("bool", "decltype(::c10::impl::ScalarTypeToCPPType<::c10::ScalarType::Bool>::t)").elementValueType("boolean"), new ArrayInfo("Byte").itPointerType("BytePointer").elementTypes("jbyte", "int8_t", "uint8_t").elementValueType("byte"), - new ArrayInfo("Dimname").otherCppNames("at::DimnameList").elementTypes("at::Dimname"), + new ArrayInfo("Dimname").otherCppNames("at::DimnameList").elementTypes("at::Dimname").otherPointerTypes("DimnameVector"), new ArrayInfo("Double").itPointerType("DoublePointer").elementTypes("double"), new ArrayInfo("DoubleComplex") /*.itPointertype("DoublePointer") */.elementTypes("c10::complex"), new ArrayInfo("EnumNameValue").elementTypes("c10::EnumNameValue"), @@ -672,7 +678,7 @@ public void map(InfoMap infoMap) { new ArrayInfo("FloatComplex") /*.itPointerType("FloatPointer") */.elementTypes("c10::complex"), new ArrayInfo("FuturePtr").elementTypes("c10::intrusive_ptr"), new ArrayInfo("Half") /*.itPointerType("ShortPointer") */.elementTypes("decltype(::c10::impl::ScalarTypeToCPPType<::c10::ScalarType::Half>::t)"), - new ArrayInfo("IValue").elementTypes("c10::IValue", "const at::IValue"), + new ArrayInfo("IValue").elementTypes("c10::IValue", "const at::IValue").otherPointerTypes("IValueVector"), new ArrayInfo("Int") .itPointerType("IntPointer") .elementTypes("jint", "int", "int32_t", "uint32_t") @@ -683,23 +689,23 @@ public void map(InfoMap infoMap) { .itPointerType("LongPointer") .elementTypes("int64_t", "jlong") // Order is important, since ArrayRef and ArrayRef are incompatible, even though long == long long. And jlong is long long. .elementValueType("long"), - new ArrayInfo("LongOptional").elementTypes("c10::optional"), + new ArrayInfo("LongOptional").elementTypes("c10::optional").otherPointerTypes("LongOptionalVector"), new ArrayInfo("NamedValue").elementTypes("torch::jit::NamedValue"), new ArrayInfo("Scalar").elementTypes("at::Scalar"), - new ArrayInfo("ScalarType").itPointerType("@Cast(\"c10::ScalarType*\") BytePointer").elementTypes("c10::ScalarType", "at::ScalarType"), + new ArrayInfo("ScalarType").itPointerType("@Cast(\"c10::ScalarType*\") BytePointer").elementTypes("c10::ScalarType", "at::ScalarType").otherPointerTypes("ScalarTypeVector"), new ArrayInfo("Short").itPointerType("ShortPointer").elementTypes("jshort", "int16_t", "uint16_t").elementValueType("short"), new ArrayInfo("SizeT").itPointerType("SizeTPointer").elementTypes("size_t").elementValueType("long"), - new ArrayInfo("Stride").elementTypes("c10::Stride"), - new ArrayInfo("String").itPointerType("PointerPointer" /*"@Cast({\"\", \"std::string*\"}) @StdString BytePointer"*/).elementTypes("std::string"), + new ArrayInfo("Stride").elementTypes("c10::Stride").otherPointerTypes("StrideVector"), + new ArrayInfo("String").itPointerType("PointerPointer" /*"@Cast({\"\", \"std::string*\"}) @StdString BytePointer"*/).elementTypes("std::string").otherPointerTypes("StringVector"), new ArrayInfo("SymInt").otherCppNames("c10::SymIntArrayRef").elementTypes("c10::SymInt"), new ArrayInfo("SymNode").elementTypes("c10::SymNode", "c10::intrusive_ptr"), - new ArrayInfo("Symbol").elementTypes("c10::Symbol"), - new ArrayInfo("Tensor").otherCppNames("torch::TensorList", "at::TensorList", "at::ITensorListRef").elementTypes("torch::Tensor", "at::Tensor"), // Warning: not a TensorList (List) + new ArrayInfo("Symbol").elementTypes("c10::Symbol").otherPointerTypes("SymbolVector"), + new ArrayInfo("Tensor").otherCppNames("torch::TensorList", "at::TensorList", "at::ITensorListRef").elementTypes("torch::Tensor", "at::Tensor").otherPointerTypes("TensorVector"), // Warning: not a TensorList (List) new ArrayInfo("TensorArg").elementTypes("torch::TensorArg", "at::TensorArg"), - new ArrayInfo("TensorIndex").elementTypes("at::indexing::TensorIndex"), - new ArrayInfo("TensorOptional").elementTypes("c10::optional", "c10::optional", "c10::optional"), - new ArrayInfo("Type").itPointerType("Type.TypePtr").elementTypes("c10::TypePtr", "c10::Type::TypePtr"), - new ArrayInfo("Value").elementTypes("torch::jit::Value*") + new ArrayInfo("TensorIndex").elementTypes("at::indexing::TensorIndex").otherPointerTypes("TensorIndexVector"), + new ArrayInfo("TensorOptional").elementTypes("c10::optional", "c10::optional", "c10::optional").otherPointerTypes("TensorOptionalVector"), + new ArrayInfo("Type").itPointerType("Type.TypePtr").elementTypes("c10::TypePtr", "c10::Type::TypePtr").otherPointerTypes("TypeVector"), + new ArrayInfo("Value").elementTypes("torch::jit::Value*").otherPointerTypes("ValueVector") }) { t.mapArrayRef(infoMap); @@ -760,9 +766,7 @@ public void map(InfoMap infoMap) { }) { ai.mapList(infoMap); } - // swap is a friend templated function. Parser fails to perform template substitution in this case. - infoMap.put(new Info("c10::impl::ListElementReference::swap").skip()); - // friendly global setting lost + // friendly global setting lost + full qualification not resolved by parser infoMap.put(new Info("impl::ptr_to_first_element(const c10::List&)").javaNames("ptr_to_first_element").annotations("@Name(\"c10::impl::ptr_to_first_element\")").friendly()); @@ -1089,6 +1093,32 @@ public void map(InfoMap infoMap) { .put(new Info("c10::complex::real", "c10::complex::imag", "c10::complex::real", "c10::complex::imag", "c10::complex::real", "c10::complex::imag").annotations("@org.bytedeco.javacpp.annotation.Function")) + .put(new Info( // Not implemented in c10::complex template specialization: + "c10::complex::operator =(c10::Half)", + "c10::complex::real(c10::Half)", + "c10::complex::imag(c10::Half)", + "c10::complex::operator const bool()", + "c10::complex::operator +=(c10::Half)", + "c10::complex::operator -=(c10::Half)", + "c10::complex::operator *=(c10::Half)", + "c10::complex::operator /=(c10::Half)" + ).skip()) + .put(new Info("c10::complex::complex(const c10::Half&, const c10::Half&)").javaText( // Second argument not optional + add specific functions + "public HalfComplex(Half re, Half im) { super((Pointer)null); allocate(re, im); }\n" + + "private native void allocate(@Const @ByRef Half re, @Const @ByRef(nullValue = \"c10::Half()\") Half im);\n" + + "public HalfComplex(@Const @ByRef FloatComplex value) { super((Pointer)null); allocate(value); }\n" + + "private native void allocate(@Const @ByRef FloatComplex value);\n" + + "\n" + + "// Conversion operator\n" + + "public native @ByVal @Name(\"operator c10::complex\") FloatComplex asFloatComplex();\n" + + "\n" + + "public native @ByRef @Name(\"operator +=\") HalfComplex addPut(@Const @ByRef HalfComplex other);\n" + + "\n" + + "public native @ByRef @Name(\"operator -=\") HalfComplex subtractPut(@Const @ByRef HalfComplex other);\n" + + "\n" + + "public native @ByRef @Name(\"operator *=\") HalfComplex multiplyPut(@Const @ByRef HalfComplex other);" + ) + ) ; @@ -1280,7 +1310,10 @@ public void map(InfoMap infoMap) { template("torch::data::transforms::BatchTransform", template("std::vector", example), example), template("torch::data::transforms::Collation", example) ).pointerTypes(p + "ExampleCollation")) - .put(new Info(template("torch::data::transforms::Stack", example)).pointerTypes(p + "ExampleStack")) + // The Stack primary template is empty. Constructors are defined in template specializations. + // So the generated Java classes are @Opaque and have no constructors. + // We might need to force the generation of constructors somehow. + .put(new Info(template("torch::data::transforms::Stack", example)).pointerTypes(p + "ExampleStack").base(p + "ExampleCollation")) .put(new Info(chunkDataReader).pointerTypes("Chunk" + p + "DataReader").virtualize()) .put(new Info( template("torch::data::datasets::ChunkDataset", mangledChunkDataReader, "torch::data::samplers::RandomSampler", "torch::data::samplers::RandomSampler") @@ -1728,11 +1761,7 @@ public void map(InfoMap infoMap) { "public native @ByVal @Name(\"forward>\") T_TensorTensor_T forwardT_TensorTensor_T(@Const @ByRef Tensor query, @Const @ByRef Tensor key, @Const @ByRef Tensor value, @Const @ByRef(nullValue = \"torch::Tensor{}\") Tensor key_padding_mask, @Cast(\"bool\") boolean need_weights/*=true*/, @Const @ByRef(nullValue = \"torch::Tensor{}\") Tensor attn_mask, @Cast(\"bool\") boolean average_attn_weights/*=true*/);\n" + "public native @ByVal @Name(\"forward\") ASMoutput forwardASMoutput(@Const @ByRef Tensor input, @Const @ByRef Tensor target);\n" )) - .put(new Info("torch::nn::AnyModule(ModuleType*)") - // We cannot use template instantiation mechanism in Parser with something like - // new Info("torch::nn::AnyModule(ModuleType*)") - // because it doesn't work with javaText. And we need javaText because of @Cast. - .javaText(anyModuleConstructors)); + ; for (String[] outputType : new String[][]{ {"at::Tensor", "Tensor"}, @@ -1868,7 +1897,8 @@ We need either to put an annotation info on each member, or javaName("@NoOffset "c10::ThreadLocalDebugInfo::_forceCurrentDebugInfo", "c10::impl::_force_tls_local_dispatch_key_set", "torch::jit::CompilationUnit::_clear_python_cu", - "torch::jit::GraphFunction::_set_initial_executor_execution_mode", "torch::jit::GraphFunction::_set_ignore_amp" + "torch::jit::GraphFunction::_set_initial_executor_execution_mode", "torch::jit::GraphFunction::_set_ignore_amp", + "c10::detail::_str" ).skip()); @@ -1986,6 +2016,7 @@ We need either to put an annotation info on each member, or javaName("@NoOffset "@Namespace(\"at\") public static native @ByVal @Name(\"make_generator\") Generator make_generator_cpu();\n" + "@Namespace(\"at\") public static native @ByVal @Name(\"make_generator\") Generator make_generator_cpu(@Cast(\"uint64_t&&\") long seed_in);" )) + .put(new Info("c10::TensorOptions::TensorOptions").javaNames("XXX")) ; for (String[] t : new String[][]{ @@ -2008,8 +2039,8 @@ We need either to put an annotation info on each member, or javaName("@NoOffset {"at::Float8_e4m3fn", "Float8_e4m3fn"}, {"at::Float8_e5m2", "Float8_e5m2"} }) { - infoMap.put(new Info("c10::fetch_and_cast<" + t[0] + ">").javaNames("fetch_and_cast_to_" + t[1])) - .put(new Info("c10::cast_and_store<" + t[0] + ">").javaNames("cast_and_store_from_" + t[1])); + infoMap.put(new Info(template("c10::fetch_and_cast", t[0])).javaNames("fetch_and_cast_to_" + t[1])) + .put(new Info(template("c10::cast_and_store", t[0])).javaNames("cast_and_store_from_" + t[1])); } @@ -2296,7 +2327,9 @@ We need either to put an annotation info on each member, or javaName("@NoOffset "torch::detail::constructSchemaOrName", "torch::jit::ClassDef::create", "torch::jit::Code::operator <<(std::ostream&, const torch::jit::Code&)", // The friend operator is truly a member of torch::jit and not torch::jit::Code - "torch::profiler::impl::getNvtxStr" + "torch::profiler::impl::getNvtxStr", + "c10::merge_primitive" // templated function with some specializations. Will have to figure what + // instances to create if needed. ).skip()); //// Aliases necessary because of Parser limited namespace resolution @@ -2567,15 +2600,17 @@ void mapArrayRef(InfoMap infoMap) { cppNamesRIterator[n++] = cn + "::const_reverse_iterator"; } - // Use converting constructor from std::vector when it works to allow passing java array literals - boolean noVariadicPointerType = - elementValueType.contains(" ") // No @ByVal - || elementValueType.equals("boolean"); // ArrayRef cannot be constructed from a std::vector bitfield. + // Use converting constructor from std::vector when it works to allow passing java array literals. + // Generator doesn't support passing arrays of Pointers as argument, so elementType must be primitive + // and not boolean, since ArrayRef cannot be constructed from a std::vector bitfield. + boolean variadicPointerType = elementValueType.equals("byte") || elementValueType.equals("short") || + elementValueType.equals("int") || elementValueType.equals("long") || + elementValueType.equals("float") || elementValueType.equals("double"); - String[] pt = new String[otherPointerTypes.length + (noVariadicPointerType ? 1 : 2)]; + String[] pt = new String[otherPointerTypes.length + (variadicPointerType ? 2 : 1)]; pt[0] = baseJavaName + "ArrayRef"; System.arraycopy(otherPointerTypes, 0, pt, 1, otherPointerTypes.length); - if (!noVariadicPointerType) + if (variadicPointerType) pt[otherPointerTypes.length + 1] = "@Cast({\"" + elementTypes[0] + "*\", \"" + cppNames[0] + "\", \"std::vector<" + elementTypes[0] + ">&\"}) @StdVector(\"" + elementTypes[0] + "\") " + elementValueType + "..."; Info info = new Info(cppNames).pointerTypes(pt); if (baseJavaName.contains("@Cast")) info.cast(); @@ -2588,7 +2623,7 @@ void mapArrayRef(InfoMap infoMap) { // Relies on the fact that std::vector info are created before. Info vectorInfo = infoMap.getFirst(template("std::vector", elementTypes[0]), false); if (vectorInfo != null && !elementTypes[0].equals("bool")) - infoMap.put(new Info(template(cppNames[0], template("std::allocator", elementTypes[0])) + "(" + elementTypes[0] + "*)") + infoMap.put(new Info(template(cppNames[0] + "::ArrayRef", template("std::allocator", elementTypes[0])) + "(" + elementTypes[0] + "*)").javaNames("XXX") .javaText( "public " + baseJavaName + "ArrayRef(@ByRef " + baseJavaName + "Vector vec) { super((Pointer)null); allocate(vec); }\n" + "private native void allocate(@ByRef " + baseJavaName + "Vector vec);")); @@ -2609,11 +2644,9 @@ void mapList(InfoMap infoMap) { .put(new Info(template("operator std::conditional_t", template("std::is_reference", template("c10::detail::ivalue_to_const_ref_overload_return", t) + "::type") + "::value", "const " + t + "&", t) + "()") .javaNames("get" + baseJavaName)) .put(new Info(template("c10::List", t) + "::size_type").valueTypes("long")) - .put(new Info( - template("c10::impl::ListElementReference", t, "typename c10::detail::ListImpl::list_type::iterator") + "::swap", - template("c10::impl::ListElementReference", t, "c10::detail::ListImpl::list_type::iterator") + "::swap", - template("c10::impl::ListElementReference", t, template("std::vector", t) + "::iterator") + "::swap") - .skip()); + .put(new Info(template("c10::impl::ListElementReference", t, "c10::detail::ListImpl::list_type::iterator") + "::" + template("swap", t, "c10::detail::ListImpl::list_type::iterator")) + .javaNames("swap").friendly()) + ; infoMap.put(new Info(template("c10::List", t) + "::operator []").skip()) // Returns an internal_reference_type by value, which is a ListElementReference, whose copy constructor is disabled. .put(new Info( template("c10::impl::ListIterator", t, "c10::detail::ListImpl::list_type::iterator") + "::operator []", @@ -2622,7 +2655,8 @@ void mapList(InfoMap infoMap) { .put(new Info(template("std::conditional_t", template("std::is_reference", template("c10::detail::ivalue_to_const_ref_overload_return", t) + "::type") + "::value", "const " + t + "&", t)) .pointerTypes(itPointerType).valueTypes(elementValueType)) - .put(new Info(template("c10::impl::swap", t, "typename c10::detail::ListImpl::list_type::iterator")).javaNames("swap").friendly()); + .put(new Info(template("c10::impl::swap", t, "typename c10::detail::ListImpl::list_type::iterator")).javaNames("swap")) + ; // Some List constructors are only for specific instances if (baseJavaName.equals("Generic")) diff --git a/pytorch/src/main/resources/org/bytedeco/pytorch/presets/torch_include.h b/pytorch/src/main/resources/org/bytedeco/pytorch/presets/torch_include.h index bfb6b5def37..a759d1a0c1d 100644 --- a/pytorch/src/main/resources/org/bytedeco/pytorch/presets/torch_include.h +++ b/pytorch/src/main/resources/org/bytedeco/pytorch/presets/torch_include.h @@ -47,10 +47,10 @@ #include "c10/util/Float8_e4m3fn-inl.h" #include "c10/util/Float8_e4m3fn.h" #include "c10/util/complex_math.h" -#include "c10/util/Half.h" // Moved before complex.h because it overrides complex -#include "c10/util/Half-inl.h" #include "c10/util/complex_utils.h" #include "c10/util/complex.h" +#include "c10/util/Half-inl.h" +#include "c10/util/Half.h" #include "c10/util/Float8_e5m2-inl.h" #include "c10/util/Float8_e5m2.h" #include "c10/util/bits.h" diff --git a/tensorflow-lite/src/gen/java/org/bytedeco/tensorflowlite/TfLiteTypeToType.java b/tensorflow-lite/src/gen/java/org/bytedeco/tensorflowlite/TfLiteTypeToType.java deleted file mode 100644 index 109b2067c8f..00000000000 --- a/tensorflow-lite/src/gen/java/org/bytedeco/tensorflowlite/TfLiteTypeToType.java +++ /dev/null @@ -1,29 +0,0 @@ -// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE - -package org.bytedeco.tensorflowlite; - -import java.nio.*; -import org.bytedeco.javacpp.*; -import org.bytedeco.javacpp.annotation.*; - -import static org.bytedeco.tensorflowlite.global.tensorflowlite.*; - - @Name("tflite::TfLiteTypeToType") @Properties(inherit = org.bytedeco.tensorflowlite.presets.tensorflowlite.class) -public class TfLiteTypeToType extends Pointer { - static { Loader.load(); } - /** Default native constructor. */ - public TfLiteTypeToType() { super((Pointer)null); allocate(); } - /** Native array allocator. Access with {@link Pointer#position(long)}. */ - public TfLiteTypeToType(long size) { super((Pointer)null); allocateArray(size); } - /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ - public TfLiteTypeToType(Pointer p) { super(p); } - private native void allocate(); - private native void allocateArray(long size); - @Override public TfLiteTypeToType position(long position) { - return (TfLiteTypeToType)super.position(position); - } - @Override public TfLiteTypeToType getPointer(long i) { - return new TfLiteTypeToType((Pointer)this).offsetAddress(i); - } - - } diff --git a/tensorflow-lite/src/gen/java/org/bytedeco/tensorflowlite/ValueHasher.java b/tensorflow-lite/src/gen/java/org/bytedeco/tensorflowlite/ValueHasher.java deleted file mode 100644 index 05e4969cac5..00000000000 --- a/tensorflow-lite/src/gen/java/org/bytedeco/tensorflowlite/ValueHasher.java +++ /dev/null @@ -1,34 +0,0 @@ -// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE - -package org.bytedeco.tensorflowlite; - -import java.nio.*; -import org.bytedeco.javacpp.*; -import org.bytedeco.javacpp.annotation.*; - -import static org.bytedeco.tensorflowlite.global.tensorflowlite.*; - - -// Some versions of gcc don't support partial specialization in class scope, -// so these are defined in a namescope. - -@Name("tflite::op_resolver_hasher::ValueHasher") @Properties(inherit = org.bytedeco.tensorflowlite.presets.tensorflowlite.class) -public class ValueHasher extends Pointer { - static { Loader.load(); } - /** Default native constructor. */ - public ValueHasher() { super((Pointer)null); allocate(); } - /** Native array allocator. Access with {@link Pointer#position(long)}. */ - public ValueHasher(long size) { super((Pointer)null); allocateArray(size); } - /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ - public ValueHasher(Pointer p) { super(p); } - private native void allocate(); - private native void allocateArray(long size); - @Override public ValueHasher position(long position) { - return (ValueHasher)super.position(position); - } - @Override public ValueHasher getPointer(long i) { - return new ValueHasher((Pointer)this).offsetAddress(i); - } - - public native @Cast("size_t") @Name("operator ()") long apply(@Cast("const tflite::BuiltinOperator") int v); -} diff --git a/tensorrt/src/gen/java/org/bytedeco/tensorrt/nvinfer/EnumMaxImpl.java b/tensorrt/src/gen/java/org/bytedeco/tensorrt/nvinfer/EnumMaxImpl.java deleted file mode 100644 index 08def9b69af..00000000000 --- a/tensorrt/src/gen/java/org/bytedeco/tensorrt/nvinfer/EnumMaxImpl.java +++ /dev/null @@ -1,43 +0,0 @@ -// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE - -package org.bytedeco.tensorrt.nvinfer; - -import java.nio.*; -import org.bytedeco.javacpp.*; -import org.bytedeco.javacpp.annotation.*; - -import static org.bytedeco.javacpp.presets.javacpp.*; -import org.bytedeco.cuda.cudart.*; -import static org.bytedeco.cuda.global.cudart.*; -import org.bytedeco.cuda.cublas.*; -import static org.bytedeco.cuda.global.cublas.*; -import org.bytedeco.cuda.cudnn.*; -import static org.bytedeco.cuda.global.cudnn.*; -import org.bytedeco.cuda.nvrtc.*; -import static org.bytedeco.cuda.global.nvrtc.*; - -import static org.bytedeco.tensorrt.global.nvinfer.*; - -/** Maximum number of elements in DataType enum. @see DataType */ -@Name("nvinfer1::impl::EnumMaxImpl") @Properties(inherit = org.bytedeco.tensorrt.presets.nvinfer.class) -public class EnumMaxImpl extends Pointer { - static { Loader.load(); } - /** Default native constructor. */ - public EnumMaxImpl() { super((Pointer)null); allocate(); } - /** Native array allocator. Access with {@link Pointer#position(long)}. */ - public EnumMaxImpl(long size) { super((Pointer)null); allocateArray(size); } - /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ - public EnumMaxImpl(Pointer p) { super(p); } - private native void allocate(); - private native void allocateArray(long size); - @Override public EnumMaxImpl position(long position) { - return (EnumMaxImpl)super.position(position); - } - @Override public EnumMaxImpl getPointer(long i) { - return new EnumMaxImpl((Pointer)this).offsetAddress(i); - } - - // Declaration of kVALUE that represents maximum number of elements in DataType enum - @MemberGetter public static native int kVALUE(); - public static final int kVALUE = kVALUE(); -} diff --git a/tvm/src/gen/java/org/bytedeco/tvm/Handler.java b/tvm/src/gen/java/org/bytedeco/tvm/Handler.java deleted file mode 100644 index b836353a829..00000000000 --- a/tvm/src/gen/java/org/bytedeco/tvm/Handler.java +++ /dev/null @@ -1,43 +0,0 @@ -// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE - -package org.bytedeco.tvm; - -import org.bytedeco.tvm.Module; -import java.nio.*; -import org.bytedeco.javacpp.*; -import org.bytedeco.javacpp.annotation.*; - -import static org.bytedeco.javacpp.presets.javacpp.*; -import org.bytedeco.opencl.*; -import static org.bytedeco.opencl.global.OpenCL.*; -import org.bytedeco.dnnl.*; -import static org.bytedeco.dnnl.global.dnnl.*; -import org.bytedeco.llvm.LLVM.*; -import static org.bytedeco.llvm.global.LLVM.*; -import static org.bytedeco.openblas.global.openblas_nolapack.*; -import static org.bytedeco.openblas.global.openblas.*; - -import static org.bytedeco.tvm.global.tvm_runtime.*; - - -@Name("dmlc::serializer::Handler") @Properties(inherit = org.bytedeco.tvm.presets.tvm_runtime.class) -public class Handler extends Pointer { - static { Loader.load(); } - /** Default native constructor. */ - public Handler() { super((Pointer)null); allocate(); } - /** Native array allocator. Access with {@link Pointer#position(long)}. */ - public Handler(long size) { super((Pointer)null); allocateArray(size); } - /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ - public Handler(Pointer p) { super(p); } - private native void allocate(); - private native void allocateArray(long size); - @Override public Handler position(long position) { - return (Handler)super.position(position); - } - @Override public Handler getPointer(long i) { - return new Handler((Pointer)this).offsetAddress(i); - } - - public static native void Write(Stream strm, @Const @ByRef DLDataType dtype); - public static native @Cast("bool") boolean Read(Stream strm, DLDataType dtype); -} diff --git a/tvm/src/gen/java/org/bytedeco/tvm/PackedFuncValueConverter.java b/tvm/src/gen/java/org/bytedeco/tvm/PackedFuncValueConverter.java deleted file mode 100644 index a88adc41617..00000000000 --- a/tvm/src/gen/java/org/bytedeco/tvm/PackedFuncValueConverter.java +++ /dev/null @@ -1,45 +0,0 @@ -// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE - -package org.bytedeco.tvm; - -import org.bytedeco.tvm.Module; -import java.nio.*; -import org.bytedeco.javacpp.*; -import org.bytedeco.javacpp.annotation.*; - -import static org.bytedeco.javacpp.presets.javacpp.*; -import org.bytedeco.opencl.*; -import static org.bytedeco.opencl.global.OpenCL.*; -import org.bytedeco.dnnl.*; -import static org.bytedeco.dnnl.global.dnnl.*; -import org.bytedeco.llvm.LLVM.*; -import static org.bytedeco.llvm.global.LLVM.*; -import static org.bytedeco.openblas.global.openblas_nolapack.*; -import static org.bytedeco.openblas.global.openblas.*; - -import static org.bytedeco.tvm.global.tvm_runtime.*; - - -// specializations of PackedFuncValueConverter -@Name("tvm::runtime::PackedFuncValueConverter") @Properties(inherit = org.bytedeco.tvm.presets.tvm_runtime.class) -public class PackedFuncValueConverter extends Pointer { - static { Loader.load(); } - /** Default native constructor. */ - public PackedFuncValueConverter() { super((Pointer)null); allocate(); } - /** Native array allocator. Access with {@link Pointer#position(long)}. */ - public PackedFuncValueConverter(long size) { super((Pointer)null); allocateArray(size); } - /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ - public PackedFuncValueConverter(Pointer p) { super(p); } - private native void allocate(); - private native void allocateArray(long size); - @Override public PackedFuncValueConverter position(long position) { - return (PackedFuncValueConverter)super.position(position); - } - @Override public PackedFuncValueConverter getPointer(long i) { - return new PackedFuncValueConverter((Pointer)this).offsetAddress(i); - } - - public static native @ByVal TVMString From(@Const @ByRef TVMArgValue val); - - public static native @ByVal TVMString From(@Const @ByRef TVMRetValue val); -} diff --git a/tvm/src/gen/java/org/bytedeco/tvm/Type2Str.java b/tvm/src/gen/java/org/bytedeco/tvm/Type2Str.java deleted file mode 100644 index 84a457433b3..00000000000 --- a/tvm/src/gen/java/org/bytedeco/tvm/Type2Str.java +++ /dev/null @@ -1,43 +0,0 @@ -// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE - -package org.bytedeco.tvm; - -import org.bytedeco.tvm.Module; -import java.nio.*; -import org.bytedeco.javacpp.*; -import org.bytedeco.javacpp.annotation.*; - -import static org.bytedeco.javacpp.presets.javacpp.*; -import org.bytedeco.opencl.*; -import static org.bytedeco.opencl.global.OpenCL.*; -import org.bytedeco.dnnl.*; -import static org.bytedeco.dnnl.global.dnnl.*; -import org.bytedeco.llvm.LLVM.*; -import static org.bytedeco.llvm.global.LLVM.*; -import static org.bytedeco.openblas.global.openblas_nolapack.*; -import static org.bytedeco.openblas.global.openblas.*; - -import static org.bytedeco.tvm.global.tvm_runtime.*; - - -// handle case of function ptr. -@Name("tvm::runtime::detail::type2str::Type2Str") @Properties(inherit = org.bytedeco.tvm.presets.tvm_runtime.class) -public class Type2Str extends Pointer { - static { Loader.load(); } - /** Default native constructor. */ - public Type2Str() { super((Pointer)null); allocate(); } - /** Native array allocator. Access with {@link Pointer#position(long)}. */ - public Type2Str(long size) { super((Pointer)null); allocateArray(size); } - /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ - public Type2Str(Pointer p) { super(p); } - private native void allocate(); - private native void allocateArray(long size); - @Override public Type2Str position(long position) { - return (Type2Str)super.position(position); - } - @Override public Type2Str getPointer(long i) { - return new Type2Str((Pointer)this).offsetAddress(i); - } - - public static native @StdString BytePointer v(); -} diff --git a/tvm/src/gen/java/org/bytedeco/tvm/is_floating_point.java b/tvm/src/gen/java/org/bytedeco/tvm/is_floating_point.java deleted file mode 100644 index 6b58533cc66..00000000000 --- a/tvm/src/gen/java/org/bytedeco/tvm/is_floating_point.java +++ /dev/null @@ -1,43 +0,0 @@ -// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE - -package org.bytedeco.tvm; - -import org.bytedeco.tvm.Module; -import java.nio.*; -import org.bytedeco.javacpp.*; -import org.bytedeco.javacpp.annotation.*; - -import static org.bytedeco.javacpp.presets.javacpp.*; -import org.bytedeco.opencl.*; -import static org.bytedeco.opencl.global.OpenCL.*; -import org.bytedeco.dnnl.*; -import static org.bytedeco.dnnl.global.dnnl.*; -import org.bytedeco.llvm.LLVM.*; -import static org.bytedeco.llvm.global.LLVM.*; -import static org.bytedeco.openblas.global.openblas_nolapack.*; -import static org.bytedeco.openblas.global.openblas.*; - -import static org.bytedeco.tvm.global.tvm_runtime.*; - - -@Name("dmlc::is_floating_point") @Properties(inherit = org.bytedeco.tvm.presets.tvm_runtime.class) -public class is_floating_point extends Pointer { - static { Loader.load(); } - /** Default native constructor. */ - public is_floating_point() { super((Pointer)null); allocate(); } - /** Native array allocator. Access with {@link Pointer#position(long)}. */ - public is_floating_point(long size) { super((Pointer)null); allocateArray(size); } - /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ - public is_floating_point(Pointer p) { super(p); } - private native void allocate(); - private native void allocateArray(long size); - @Override public is_floating_point position(long position) { - return (is_floating_point)super.position(position); - } - @Override public is_floating_point getPointer(long i) { - return new is_floating_point((Pointer)this).offsetAddress(i); - } - - @MemberGetter public static native @Cast("const bool") boolean value(); - public static final boolean value = value(); - } diff --git a/tvm/src/gen/java/org/bytedeco/tvm/is_integral.java b/tvm/src/gen/java/org/bytedeco/tvm/is_integral.java deleted file mode 100644 index 56664213e37..00000000000 --- a/tvm/src/gen/java/org/bytedeco/tvm/is_integral.java +++ /dev/null @@ -1,43 +0,0 @@ -// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE - -package org.bytedeco.tvm; - -import org.bytedeco.tvm.Module; -import java.nio.*; -import org.bytedeco.javacpp.*; -import org.bytedeco.javacpp.annotation.*; - -import static org.bytedeco.javacpp.presets.javacpp.*; -import org.bytedeco.opencl.*; -import static org.bytedeco.opencl.global.OpenCL.*; -import org.bytedeco.dnnl.*; -import static org.bytedeco.dnnl.global.dnnl.*; -import org.bytedeco.llvm.LLVM.*; -import static org.bytedeco.llvm.global.LLVM.*; -import static org.bytedeco.openblas.global.openblas_nolapack.*; -import static org.bytedeco.openblas.global.openblas.*; - -import static org.bytedeco.tvm.global.tvm_runtime.*; - - -@Name("dmlc::is_integral") @Properties(inherit = org.bytedeco.tvm.presets.tvm_runtime.class) -public class is_integral extends Pointer { - static { Loader.load(); } - /** Default native constructor. */ - public is_integral() { super((Pointer)null); allocate(); } - /** Native array allocator. Access with {@link Pointer#position(long)}. */ - public is_integral(long size) { super((Pointer)null); allocateArray(size); } - /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ - public is_integral(Pointer p) { super(p); } - private native void allocate(); - private native void allocateArray(long size); - @Override public is_integral position(long position) { - return (is_integral)super.position(position); - } - @Override public is_integral getPointer(long i) { - return new is_integral((Pointer)this).offsetAddress(i); - } - - @MemberGetter public static native @Cast("const bool") boolean value(); - public static final boolean value = value(); - } diff --git a/tvm/src/gen/java/org/bytedeco/tvm/is_pod.java b/tvm/src/gen/java/org/bytedeco/tvm/is_pod.java deleted file mode 100644 index e46a75179ee..00000000000 --- a/tvm/src/gen/java/org/bytedeco/tvm/is_pod.java +++ /dev/null @@ -1,46 +0,0 @@ -// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE - -package org.bytedeco.tvm; - -import org.bytedeco.tvm.Module; -import java.nio.*; -import org.bytedeco.javacpp.*; -import org.bytedeco.javacpp.annotation.*; - -import static org.bytedeco.javacpp.presets.javacpp.*; -import org.bytedeco.opencl.*; -import static org.bytedeco.opencl.global.OpenCL.*; -import org.bytedeco.dnnl.*; -import static org.bytedeco.dnnl.global.dnnl.*; -import org.bytedeco.llvm.LLVM.*; -import static org.bytedeco.llvm.global.LLVM.*; -import static org.bytedeco.openblas.global.openblas_nolapack.*; -import static org.bytedeco.openblas.global.openblas.*; - -import static org.bytedeco.tvm.global.tvm_runtime.*; - - -/** \cond Doxygen_Suppress */ -// declare special traits when C++11 is not available -// #if DMLC_USE_CXX11 == 0 -@Name("dmlc::is_pod") @Properties(inherit = org.bytedeco.tvm.presets.tvm_runtime.class) -public class is_pod extends Pointer { - static { Loader.load(); } - /** Default native constructor. */ - public is_pod() { super((Pointer)null); allocate(); } - /** Native array allocator. Access with {@link Pointer#position(long)}. */ - public is_pod(long size) { super((Pointer)null); allocateArray(size); } - /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ - public is_pod(Pointer p) { super(p); } - private native void allocate(); - private native void allocateArray(long size); - @Override public is_pod position(long position) { - return (is_pod)super.position(position); - } - @Override public is_pod getPointer(long i) { - return new is_pod((Pointer)this).offsetAddress(i); - } - - @MemberGetter public static native @Cast("const bool") boolean value(); - public static final boolean value = value(); - } diff --git a/tvm/src/gen/java/org/bytedeco/tvm/type_name_helper.java b/tvm/src/gen/java/org/bytedeco/tvm/type_name_helper.java deleted file mode 100644 index 2e7bba29569..00000000000 --- a/tvm/src/gen/java/org/bytedeco/tvm/type_name_helper.java +++ /dev/null @@ -1,44 +0,0 @@ -// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE - -package org.bytedeco.tvm; - -import org.bytedeco.tvm.Module; -import java.nio.*; -import org.bytedeco.javacpp.*; -import org.bytedeco.javacpp.annotation.*; - -import static org.bytedeco.javacpp.presets.javacpp.*; -import org.bytedeco.opencl.*; -import static org.bytedeco.opencl.global.OpenCL.*; -import org.bytedeco.dnnl.*; -import static org.bytedeco.dnnl.global.dnnl.*; -import org.bytedeco.llvm.LLVM.*; -import static org.bytedeco.llvm.global.LLVM.*; -import static org.bytedeco.openblas.global.openblas_nolapack.*; -import static org.bytedeco.openblas.global.openblas.*; - -import static org.bytedeco.tvm.global.tvm_runtime.*; - - -// #endif - -@Name("dmlc::type_name_helper") @Properties(inherit = org.bytedeco.tvm.presets.tvm_runtime.class) -public class type_name_helper extends Pointer { - static { Loader.load(); } - /** Default native constructor. */ - public type_name_helper() { super((Pointer)null); allocate(); } - /** Native array allocator. Access with {@link Pointer#position(long)}. */ - public type_name_helper(long size) { super((Pointer)null); allocateArray(size); } - /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ - public type_name_helper(Pointer p) { super(p); } - private native void allocate(); - private native void allocateArray(long size); - @Override public type_name_helper position(long position) { - return (type_name_helper)super.position(position); - } - @Override public type_name_helper getPointer(long i) { - return new type_name_helper((Pointer)this).offsetAddress(i); - } - - public static native @StdString BytePointer value(); - } diff --git a/tvm/src/gen/java/org/bytedeco/tvm/typed_packed_call_dispatcher.java b/tvm/src/gen/java/org/bytedeco/tvm/typed_packed_call_dispatcher.java deleted file mode 100644 index c9baf596a3a..00000000000 --- a/tvm/src/gen/java/org/bytedeco/tvm/typed_packed_call_dispatcher.java +++ /dev/null @@ -1,41 +0,0 @@ -// Targeted by JavaCPP version 1.5.10-SNAPSHOT: DO NOT EDIT THIS FILE - -package org.bytedeco.tvm; - -import org.bytedeco.tvm.Module; -import java.nio.*; -import org.bytedeco.javacpp.*; -import org.bytedeco.javacpp.annotation.*; - -import static org.bytedeco.javacpp.presets.javacpp.*; -import org.bytedeco.opencl.*; -import static org.bytedeco.opencl.global.OpenCL.*; -import org.bytedeco.dnnl.*; -import static org.bytedeco.dnnl.global.dnnl.*; -import org.bytedeco.llvm.LLVM.*; -import static org.bytedeco.llvm.global.LLVM.*; -import static org.bytedeco.openblas.global.openblas_nolapack.*; -import static org.bytedeco.openblas.global.openblas.*; - -import static org.bytedeco.tvm.global.tvm_runtime.*; - - -@Name("tvm::runtime::detail::typed_packed_call_dispatcher") @Properties(inherit = org.bytedeco.tvm.presets.tvm_runtime.class) -public class typed_packed_call_dispatcher extends Pointer { - static { Loader.load(); } - /** Default native constructor. */ - public typed_packed_call_dispatcher() { super((Pointer)null); allocate(); } - /** Native array allocator. Access with {@link Pointer#position(long)}. */ - public typed_packed_call_dispatcher(long size) { super((Pointer)null); allocateArray(size); } - /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ - public typed_packed_call_dispatcher(Pointer p) { super(p); } - private native void allocate(); - private native void allocateArray(long size); - @Override public typed_packed_call_dispatcher position(long position) { - return (typed_packed_call_dispatcher)super.position(position); - } - @Override public typed_packed_call_dispatcher getPointer(long i) { - return new typed_packed_call_dispatcher((Pointer)this).offsetAddress(i); - } - -}