Fix build error - error: function "torchao::marlin_24_gemm" has already been defined (previous definition at line 83) (#863)

kshitij12345 · web-flow · commit d2226a40f77e · 2024-09-10T14:26:29.000+02:00
fix compile error
diff --git a/torchao/csrc/cuda/sparse_marlin/marlin_kernel_nm.cu b/torchao/csrc/cuda/sparse_marlin/marlin_kernel_nm.cu
@@ -852,8 +852,6 @@ __global__ void Marlin_24(
   }
 }
 
-#endif
-
 #define CALL_IF_2_4(NUM_BITS, THREAD_M_BLOCKS, THREAD_N_BLOCKS,               \
                     THREAD_K_BLOCKS, GROUP_BLOCKS)                            \
   else if (num_bits == NUM_BITS && thread_m_blocks == THREAD_M_BLOCKS &&      \
@@ -1119,6 +1117,8 @@ torch::Tensor marlin_24_gemm(torch::Tensor& a, torch::Tensor& b_q_weight,
   return c;
 }
 
+#endif
+
 TORCH_LIBRARY_IMPL(torchao, CUDA, m) {
   m.impl("torchao::marlin_24_gemm", &marlin_24_gemm);
 }

Original file line number	Diff line number	Diff line change
`@@ -852,8 +852,6 @@ __global__ void Marlin_24(`
`852`	`852`	`}`
`853`	`853`	`}`
`854`	`854`
`855`		`-#endif`
`856`		`-`
`857`	`855`	`#define CALL_IF_2_4(NUM_BITS, THREAD_M_BLOCKS, THREAD_N_BLOCKS, \`
`858`	`856`	`THREAD_K_BLOCKS, GROUP_BLOCKS) \`
`859`	`857`	`else if (num_bits == NUM_BITS && thread_m_blocks == THREAD_M_BLOCKS && \`
`@@ -1119,6 +1117,8 @@ torch::Tensor marlin_24_gemm(torch::Tensor& a, torch::Tensor& b_q_weight,`
`1119`	`1117`	`return c;`
`1120`	`1118`	`}`
`1121`	`1119`
	`1120`	`+#endif`
	`1121`	`+`
`1122`	`1122`	`TORCH_LIBRARY_IMPL(torchao, CUDA, m) {`
`1123`	`1123`	`m.impl("torchao::marlin_24_gemm", &marlin_24_gemm);`
`1124`	`1124`	`}`