Remove handling for moe_gemm.cc and flash_decoding.cu which are no lo…

…nger used upstream.
vinx13 · Mar 19, 2024 · 05c9ba6 · 05c9ba6
1 parent 38a8651
commit 05c9ba6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 11 deletions.
diff --git a/cmake/modules/contrib/CUTLASS.cmake b/cmake/modules/contrib/CUTLASS.cmake
@@ -35,27 +35,20 @@ if(USE_CUDA AND USE_CUTLASS)
     ${PROJECT_SOURCE_DIR}/3rdparty/cutlass_fpA_intB_gemm/cutlass/include
   )
   set(CUTLASS_FPA_INTB_RUNTIME_SRCS "")
-  list(APPEND CUTLASS_FPA_INTB_RUNTIME_SRCS src/runtime/contrib/cutlass/moe_gemm.cc)
   list(APPEND CUTLASS_FPA_INTB_RUNTIME_SRCS src/runtime/contrib/cutlass/weight_preprocess.cc)
   add_library(fpA_intB_cutlass_objs OBJECT ${CUTLASS_FPA_INTB_RUNTIME_SRCS})
   target_include_directories(fpA_intB_cutlass_objs PRIVATE
-    ${PROJECT_SOURCE_DIR}/3rdparty/cutlass_fpA_intB_gemm/cutlass/include
+    ${PROJECT_SOURCE_DIR}/3rdparty/cutlass_fpA_intB_gemm
+    ${PROJECT_SOURCE_DIR}/3rdparty/cutlass_fpA_intB_gemm/cutlass/include  
   )
   list(APPEND CUTLASS_RUNTIME_OBJS "$<${CUTLASS_GEN_COND}:$<TARGET_OBJECTS:fpA_intB_cutlass_objs>>")
 
-  ### Build cutlass runtime objects for flash attention using its cutlass submodule
+  ### Build cutlass runtime objects for flash attention
   add_subdirectory(${PROJECT_SOURCE_DIR}/3rdparty/libflash_attn)
   target_include_directories(flash_attn PRIVATE
     ${PROJECT_SOURCE_DIR}/3rdparty/libflash_attn
     ${PROJECT_SOURCE_DIR}/3rdparty/libflash_attn/cutlass/include
   )
-  set(CUTLASS_FLASH_ATTN_RUNTIME_SRCS "")
-  list(APPEND CUTLASS_FLASH_ATTN_RUNTIME_SRCS src/runtime/contrib/cutlass/flash_decoding.cu)
-  add_library(flash_attn_cutlass_objs OBJECT ${CUTLASS_FLASH_ATTN_RUNTIME_SRCS})
-  target_include_directories(flash_attn_cutlass_objs PRIVATE
-    ${PROJECT_SOURCE_DIR}/3rdparty/libflash_attn/cutlass/include
-  )
-  list(APPEND CUTLASS_RUNTIME_OBJS "$<${CUTLASS_GEN_COND}:$<TARGET_OBJECTS:flash_attn_cutlass_objs>>")
 
   ### Build cutlass runtime objects using TVM's 3rdparty/cutlass submodule
   set(CUTLASS_DIR ${PROJECT_SOURCE_DIR}/3rdparty/cutlass)

diff --git a/src/runtime/contrib/cutlass/weight_preprocess.cc b/src/runtime/contrib/cutlass/weight_preprocess.cc
@@ -21,7 +21,7 @@
 #include <tvm/runtime/packed_func.h>
 #include <tvm/runtime/registry.h>
 
-#include "../../../3rdparty/cutlass_fpA_intB_gemm/cutlass_kernels/cutlass_preprocessors.h"
+#include "cutlass_kernels/cutlass_preprocessors.h"
 
 namespace tvm {
 namespace runtime {