From 6f31ab058037ba41d6bcc9bb7a8a9a352c68ba0e Mon Sep 17 00:00:00 2001 From: Whsjrczr <123729598+Whsjrczr@users.noreply.github.com> Date: Mon, 26 Aug 2024 10:37:38 +0800 Subject: [PATCH] Update confilct in binary_infer_sym.h --- .../infer_symbolic_shape/binary_infer_sym.h | 27 ++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/paddle/fluid/pir/dialect/operator/interface/infer_symbolic_shape/binary_infer_sym.h b/paddle/fluid/pir/dialect/operator/interface/infer_symbolic_shape/binary_infer_sym.h index 6e8c8be18900b..dd37417270536 100644 --- a/paddle/fluid/pir/dialect/operator/interface/infer_symbolic_shape/binary_infer_sym.h +++ b/paddle/fluid/pir/dialect/operator/interface/infer_symbolic_shape/binary_infer_sym.h @@ -26,14 +26,18 @@ OP_DECLARE_INFER_SYMBOLIC_SHAPE(BceLoss_) OP_DECLARE_INFER_SYMBOLIC_SHAPE(BoxClip) OP_DECLARE_INFER_SYMBOLIC_SHAPE(Binomial) OP_DECLARE_INFER_SYMBOLIC_SHAPE(Binomial_) -// OP_DECLARE_INFER_SYMBOLIC_SHAPE(Bincount) +OP_DECLARE_INFER_SYMBOLIC_SHAPE(Bincount) OP_DECLARE_INFER_SYMBOLIC_SHAPE(Bmm) // OP_DECLARE_INFER_SYMBOLIC_SHAPE(CholeskySolve) OP_DECLARE_INFER_SYMBOLIC_SHAPE(CtcAlign) OP_DECLARE_INFER_SYMBOLIC_SHAPE(Conv2d) +// OP_DECLARE_INFER_SYMBOLIC_SHAPE(Conv2dTranspose) OP_DECLARE_INFER_SYMBOLIC_SHAPE(Conv3d) +// OP_DECLARE_INFER_SYMBOLIC_SHAPE(ConvTranspose) OP_DECLARE_INFER_SYMBOLIC_SHAPE(Cross) -// OP_DECLARE_INFER_SYMBOLIC_SHAPE(Dot) +// OP_DECLARE_INFER_SYMBOLIC_SHAPE(Correlation) +// OP_DECLARE_INFER_SYMBOLIC_SHAPE(DepthwiseConv) +OP_DECLARE_INFER_SYMBOLIC_SHAPE(Dot) OP_DECLARE_INFER_SYMBOLIC_SHAPE(Dropout) OP_DECLARE_INFER_SYMBOLIC_SHAPE(Embedding) OP_DECLARE_INFER_SYMBOLIC_SHAPE(EqualAll) @@ -45,32 +49,49 @@ OP_DECLARE_INFER_SYMBOLIC_SHAPE(FusedSoftmaxMask) // OP_DECLARE_INFER_SYMBOLIC_SHAPE(GridSample) OP_DECLARE_INFER_SYMBOLIC_SHAPE(Gather) OP_DECLARE_INFER_SYMBOLIC_SHAPE(GatherNd) +// OP_DECLARE_INFER_SYMBOLIC_SHAPE(GatherTree) OP_DECLARE_INFER_SYMBOLIC_SHAPE(HuberLoss) // OP_DECLARE_INFER_SYMBOLIC_SHAPE(Histogram) OP_DECLARE_INFER_SYMBOLIC_SHAPE(Isclose) +OP_DECLARE_INFER_SYMBOLIC_SHAPE(IndexAdd) +OP_DECLARE_INFER_SYMBOLIC_SHAPE(IndexAdd_) +OP_DECLARE_INFER_SYMBOLIC_SHAPE(IndexPut) +OP_DECLARE_INFER_SYMBOLIC_SHAPE(IndexPut_) +OP_DECLARE_INFER_SYMBOLIC_SHAPE(IndexSelect) OP_DECLARE_INFER_SYMBOLIC_SHAPE(AccuracyCheck) OP_DECLARE_INFER_SYMBOLIC_SHAPE(IndexSample) OP_DECLARE_INFER_SYMBOLIC_SHAPE(IndexSelectStrided) OP_DECLARE_INFER_SYMBOLIC_SHAPE(KldivLoss) OP_DECLARE_INFER_SYMBOLIC_SHAPE(Kron) // OP_DECLARE_INFER_SYMBOLIC_SHAPE(Lstsq) +OP_DECLARE_INFER_SYMBOLIC_SHAPE(LuUnpack) // OP_DECLARE_INFER_SYMBOLIC_SHAPE(MatrixRankTol) OP_DECLARE_INFER_SYMBOLIC_SHAPE(MaskedSelect) OP_DECLARE_INFER_SYMBOLIC_SHAPE(Matmul) +// OP_DECLARE_INFER_SYMBOLIC_SHAPE(MatrixNms) OP_DECLARE_INFER_SYMBOLIC_SHAPE(MarginCrossEntropy) +// OP_DECLARE_INFER_SYMBOLIC_SHAPE(MatmulWithFlatten) OP_DECLARE_INFER_SYMBOLIC_SHAPE(Mv) +// OP_DECLARE_INFER_SYMBOLIC_SHAPE(PriorBox) // OP_DECLARE_INFER_SYMBOLIC_SHAPE(PullBoxSparse) // OP_DECLARE_INFER_SYMBOLIC_SHAPE(PullGpuPsSparse) // OP_DECLARE_INFER_SYMBOLIC_SHAPE(PullSparseV2) +// OP_DECLARE_INFER_SYMBOLIC_SHAPE(RepeatInterleaveWithTensorIndex) OP_DECLARE_INFER_SYMBOLIC_SHAPE(ReduceAs) OP_DECLARE_INFER_SYMBOLIC_SHAPE(Searchsorted) OP_DECLARE_INFER_SYMBOLIC_SHAPE(SegmentPool) -// OP_DECLARE_INFER_SYMBOLIC_SHAPE(SequenceMask) +OP_DECLARE_INFER_SYMBOLIC_SHAPE(SequenceMask) +// OP_DECLARE_INFER_SYMBOLIC_SHAPE(ShuffleBatch) +// OP_DECLARE_INFER_SYMBOLIC_SHAPE(Solve) +// OP_DECLARE_INFER_SYMBOLIC_SHAPE(Stft) OP_DECLARE_INFER_SYMBOLIC_SHAPE(Swiglu) OP_DECLARE_INFER_SYMBOLIC_SHAPE(TakeAlongAxis) OP_DECLARE_INFER_SYMBOLIC_SHAPE(TopPSampling) OP_DECLARE_INFER_SYMBOLIC_SHAPE(TdmChild) +// OP_DECLARE_INFER_SYMBOLIC_SHAPE(TriangularSolve) +OP_DECLARE_INFER_SYMBOLIC_SHAPE(Unpool3d) // OP_DECLARE_INFER_SYMBOLIC_SHAPE(Unpool) +// OP_DECLARE_INFER_SYMBOLIC_SHAPE(WeightDequantize) OP_DECLARE_INFER_SYMBOLIC_SHAPE(YoloBox) OP_DECLARE_INFER_SYMBOLIC_SHAPE(YoloBoxHead)