Merge branch 'bump_to_b6f04fa3' into bump_to_0eba539e

Xilinx · Feb 4, 2025 · 93fa9a8 · 93fa9a8
2 parents 60fb108 + 4a7ae63
commit 93fa9a8
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/externals/llvm-project b/externals/llvm-project
diff --git a/lib/Conversion/TorchToTosa/TorchToTosa.cpp b/lib/Conversion/TorchToTosa/TorchToTosa.cpp
@@ -5194,8 +5194,11 @@ LogicalResult ConvertAtenOp<PrimNumToTensorScalarOp>::matchAndRewrite(
     ConversionPatternRewriter &rewriter) const {
 
   const TypeConverter *typeConverter = this->getTypeConverter();
-  RankedTensorType resultType = cast<RankedTensorType>(
-      typeConverter->convertType(op->getResult(0).getType()));
+  TensorType resultType =
+      cast<TensorType>(typeConverter->convertType(op->getResult(0).getType()));
+
+  if (!resultType.hasRank())
+    return rewriter.notifyMatchFailure(op, "expected ranked tensor");
 
   // Only supports integer operand type, because for the floating point operand
   // type result tensor has to be of type `f64` which is not supported in the

diff --git a/projects/pt1/e2e_testing/xfail_sets.py b/projects/pt1/e2e_testing/xfail_sets.py
@@ -423,6 +423,8 @@
     "ConvolutionBackwardModule2D_basic",
     "CumsumModule_basic",
     "CumprodModule_basic",
+    "CrossEntropyLossModule_basic",
+    "CrossEntropyLossNoReductionModule_basic",
     "DeformConv2D_basic",
     "DivFloatModule_basic",
     "DivIntModule_basic",
@@ -526,6 +528,8 @@
 if torch_version_for_comparison() < version.parse("2.6.0.dev"):
     # Passing on stable but failing on nightly
     FX_IMPORTER_XFAIL_SET -= {
+        "CrossEntropyLossModule_basic",
+        "CrossEntropyLossNoReductionModule_basic",
         "ChunkListUnpackDynamic_Module_basic",
         "ChunkListUnpackUnevenDynamic_Module_basic",
         "ChunkListUnpackUneven_Module_basic",
@@ -3754,6 +3758,7 @@
     "IntImplicitModule_basic",
     "IsFloatingPointFloat_True",
     "IsFloatingPointInt_False",
+    "IsInfiniteModule_basic",
     "LayerNormLastDimModule_basic",
     "LayerNormModule_basic",
     "LayerNormNormalizeOverAllDimsModule_basic",
@@ -4066,7 +4071,6 @@
         "ElementwiseLogSigmoidModule_basic",
         "ElementwiseRreluWithNoiseTrainModule_basic",
         "ElementwiseRreluWithNoiseTrainStaticModule_basic",
-        "IsInfiniteModule_basic",
         "NumToTensorFloatModule_basic",
         "NumToTensorIntModule_basic",
         "RsubInt0d_NumToTensor_Module_basic",