File tree Expand file tree Collapse file tree 1 file changed +0
-5
lines changed
Expand file tree Collapse file tree 1 file changed +0
-5
lines changed Original file line number Diff line number Diff line change @@ -84,18 +84,13 @@ if(EXECUTORCH_NNLIB_OPT)
8484 add_subdirectory (${CMAKE_CURRENT_SOURCE_DIR} /${TARGET_DIR} /kernels)
8585elseif (EXECUTORCH_FUSION_G3_OPT)
8686 set (TARGET_DIR fusion_g3)
87- <<<<<<< HEAD
8887 add_subdirectory (
8988 ${CMAKE_CURRENT_SOURCE_DIR} /${TARGET_DIR} /third-party/nnlib
9089 ${EXECUTORCH_ROOT} /runtime/core/portable_type/c10
9190 )
92- =======
93- add_subdirectory (${CMAKE_CURRENT_SOURCE_DIR} /${TARGET_DIR} /third-party/nnlib
94- ${EXECUTORCH_ROOT} /runtime/core/portable_type/c10)
9591elseif (EXECUTORCH_VISION_OPT)
9692 set (TARGET_DIR vision)
9793 add_subdirectory (${CMAKE_CURRENT_SOURCE_DIR} /${TARGET_DIR} /kernels)
98- >>>>>>> 992b83e373 ( Add: Initial backends/cadence/vision module scaffold with optimized softmax (non-iDMA))
9994else ()
10095 set (TARGET_DIR reference)
10196 add_subdirectory (${CMAKE_CURRENT_SOURCE_DIR} /${TARGET_DIR} /kernels)
You can’t perform that action at this time.
0 commit comments