#11962: fix rebase error

tenstorrent · Oct 3, 2024 · 3d2a9b2 · 3d2a9b2
1 parent 7376920
commit 3d2a9b2
Showing 1 changed file with 1 addition and 15 deletions.
diff --git a/ttnn/cpp/ttnn/operations/moreh/moreh_matmul/device/kernels/moreh_matmul.cpp b/ttnn/cpp/ttnn/operations/moreh/moreh_matmul/device/kernels/moreh_matmul.cpp
@@ -175,21 +175,7 @@ FORCE_INLINE void bias_add(bool is_scalar_bias) {
         math_reconfig_data_format(cb_intermed3, bias_cb_id);
 #endif
         add_bcast_rows_init_short(cb_intermed3, bias_cb_id);
->>>>>>> #11962: Split hw re(config) between unpack and math threads
-=======
-        #if defined FP32_DEST_ACC_EN
-            reconfig_data_format(cb_intermed0, bias_cb_id);
-        #endif
-        add_bcast_scalar_init_short(cb_intermed0, bias_cb_id);
-        add_tiles_bcast_scalar(cb_intermed0, bias_cb_id, 0, 0, 0);
-    }
-    else {
-        #if defined FP32_DEST_ACC_EN
-            reconfig_data_format(cb_intermed0, bias_cb_id);
-        #endif
-        add_bcast_rows_init_short(cb_intermed0, bias_cb_id);
-        add_tiles_bcast_rows(cb_intermed0, bias_cb_id, 0, 0, 0);
->>>>>>> #11962: create joined api call for unpack/math reconfig
+        add_tiles_bcast_rows(cb_intermed3, bias_cb_id, 0, 0, 0);
     }
     tile_regs_commit();