Fix merge conflict

samanklesaria · samanklesaria · commit 9629864f8b0f · 2025-08-07T19:23:02.000Z
diff --git a/src/libtorchaudio/forced_align/cpu/compute.cpp b/src/libtorchaudio/forced_align/cpu/compute.cpp
@@ -91,13 +91,8 @@ void forced_align_impl(
     }
     if (start == 0) {
       alphas_a[0][curIdxOffset] =
-<<<<<<< HEAD
           alphas_a[0][prevIdxOffset] + logProbs_a.index(batchIndex, t, blank);
-      backPtr_a[S * t] = 0;
-=======
-          alphas_a[0][prevIdxOffset] + logProbs_a[batchIndex][t][blank];
-      backPtr_a[S * t] = 0; // backPtr_a[t][0] = 0
->>>>>>> forced_align_backptr
+      backPtr_a[S * t] = 0;  // backPtr_a[t][0] = 0
       startloop += 1;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -91,13 +91,8 @@ void forced_align_impl(`
`91`	`91`	`}`
`92`	`92`	`if (start == 0) {`
`93`	`93`	`alphas_a[0][curIdxOffset] =`
`94`		`-<<<<<<< HEAD`
`95`	`94`	`alphas_a[0][prevIdxOffset] + logProbs_a.index(batchIndex, t, blank);`
`96`		`- backPtr_a[S * t] = 0;`
`97`		`-=======`
`98`		`- alphas_a[0][prevIdxOffset] + logProbs_a[batchIndex][t][blank];`
`99`		`- backPtr_a[S * t] = 0; // backPtr_a[t][0] = 0`
`100`		`->>>>>>> forced_align_backptr`
	`95`	`+ backPtr_a[S * t] = 0; // backPtr_a[t][0] = 0`
`101`	`96`	`startloop += 1;`
`102`	`97`	`}`
`103`	`98`