Merge branch 'main' into amyachev/pytorch-prof

intel · Sep 30, 2024 · 41ff471 · 41ff471
2 parents 7c8d387 + 750b769
commit 41ff471
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/.github/pins/pytorch-upstream.txt b/.github/pins/pytorch-upstream.txt
@@ -1 +1 @@
-190e09d8b6a13f789b143f0fbd1325f924550967
+0a2685160140656e3e53818611dd2c65c4397be5
diff --git a/scripts/patch-pytorch.sh b/scripts/patch-pytorch.sh
@@ -17,4 +17,3 @@ cd "$REPO_ROOT"
 
 curl -sSL https://github.com/pytorch/pytorch/pull/126516.diff | git apply -
 curl -sSL https://github.com/pytorch/pytorch/pull/126456.diff | git apply -
-curl -sSL https://github.com/pytorch/pytorch/pull/136761.diff | git apply -
diff --git a/third_party/intel/lib/TritonIntelGPUTransforms/RewriteTensorPointer.cpp b/third_party/intel/lib/TritonIntelGPUTransforms/RewriteTensorPointer.cpp
@@ -52,6 +52,7 @@ bool shouldRemove(tt::MakeTensorPtrOp &op, bool isUsedByStoreOp) {
   TypedValue<triton::PointerType> base = op.getBase();
   Operation::operand_range shape = op.getShape();
   unsigned rank = shape.size();
+  assert(rank > 1 && "Expecting tensor with rank > 1");
   Operation::operand_range strides = op.getStrides();
   Operation::operand_range offsets = op.getOffsets();
   ArrayRef<int32_t> order = op.getOrder();