Merge pull request #258 from Xilinx/bump_to_346a536c

[AutoBump] Merge with fixes of 346a536 (27)
Xilinx · Aug 24, 2024 · cc12c6c · cc12c6c
2 parents 9764966 + a13989e
commit cc12c6c
Show file tree

Hide file tree

Showing 7 changed files with 248 additions and 223 deletions.
diff --git a/lib/Conversion/TorchToTMTensor/TorchToTMTensor.cpp b/lib/Conversion/TorchToTMTensor/TorchToTMTensor.cpp
@@ -675,12 +675,12 @@ static Value collapseAndMoveBatchDims(Location loc, Value values, int64_t batch,
   return b.create<AtenViewOp>(loc, valuesTy, values, outDimsList);
 }
 
-class ConvertAten_IndexPutImplOp
-    : public OpConversionPattern<Aten_IndexPutImplOp> {
+class ConvertAtenIndexPutHackedTwinOp
+    : public OpConversionPattern<AtenIndexPutHackedTwinOp> {
 public:
   using OpConversionPattern::OpConversionPattern;
   LogicalResult
-  matchAndRewrite(Aten_IndexPutImplOp op, OpAdaptor adaptor,
+  matchAndRewrite(AtenIndexPutHackedTwinOp op, OpAdaptor adaptor,
                   ConversionPatternRewriter &rewriter) const override {
     if (failed(verifyLinalgCompatibleTypes(op, rewriter)))
       return failure();
@@ -699,17 +699,6 @@ class ConvertAten_IndexPutImplOp
       return rewriter.notifyMatchFailure(
           op, "unimplemented: the values tensor type must have sizes.");
 
-    // The unsafe should be either `False` or `none`.
-    if (!op.getUnsafe().getType().isa<Torch::NoneType>()) {
-      bool unsafe;
-      if (!matchPattern(op.getUnsafe(), m_TorchConstantBool(&unsafe)))
-        return rewriter.notifyMatchFailure(
-            op, "unimplemented: unsafe must be a constant");
-      else if (unsafe)
-        return rewriter.notifyMatchFailure(
-            op, "unimplemented: unsafe is expected to be false");
-    }
-
     // The accumulate should be a torch constant of boolean type.
     bool accumulate;
     if (!matchPattern(op.getAccumulate(), m_TorchConstantBool(&accumulate)))
@@ -1624,8 +1613,8 @@ class ConvertTorchToTMTensor
     RewritePatternSet patterns(context);
     target.addIllegalOp<AtenBincountOp>();
     patterns.add<ConvertAtenBincountOp>(typeConverter, context);
-    target.addIllegalOp<Aten_IndexPutImplOp>();
-    patterns.add<ConvertAten_IndexPutImplOp>(typeConverter, context);
+    target.addIllegalOp<AtenIndexPutHackedTwinOp>();
+    patterns.add<ConvertAtenIndexPutHackedTwinOp>(typeConverter, context);
     target.addIllegalOp<AtenMaxPool2dWithIndicesBackwardOp>();
     patterns.add<ConvertAtenMaxPool2dWithIndicesBackwardOp>(typeConverter,
                                                             context);

diff --git a/lib/Conversion/TorchToTosa/TorchToTosa.cpp b/lib/Conversion/TorchToTosa/TorchToTosa.cpp
@@ -3970,8 +3970,8 @@ class SimplifyAten_IndexPutImplOp
 
 // Handle Aten_IndexPutImplOp on 1d tensors
 template <>
-LogicalResult ConvertAtenOp<Aten_IndexPutImplOp>::matchAndRewrite(
-    Aten_IndexPutImplOp op, OpAdaptor adaptor,
+LogicalResult ConvertAtenOp<AtenIndexPutHackedTwinOp>::matchAndRewrite(
+    AtenIndexPutHackedTwinOp op, OpAdaptor adaptor,
     ConversionPatternRewriter &rewriter) const {
   // TOSA scatter:
   // // Copy the values_in tensor to the values_out tensor.
@@ -6227,7 +6227,7 @@ class ConvertTorchToTosa : public ConvertTorchToTosaBase<ConvertTorchToTosa> {
     INSERT_ATENOP_PATTERN(AtenSliceTensorOp);
     INSERT_ATENOP_PATTERN(AtenBroadcastToOp);
     INSERT_ATENOP_PATTERN(AtenGatherOp);
-    INSERT_ATENOP_PATTERN(Aten_IndexPutImplOp);
+    INSERT_ATENOP_PATTERN(AtenIndexPutHackedTwinOp);
     INSERT_ATENOP_PATTERN(AtenIndexTensorHackedTwinOp);
     INSERT_ATENOP_PATTERN(AtenAbsOp);
     INSERT_ATENOP_PATTERN(AtenWhereSelfOp);