Cleaned up wasm dependencies

Author: Conarnar

CMakeLists.txt

@@ -796,6 +796,22 @@ if(EXECUTORCH_BUILD_PYBIND)
 endif()
 
 if(EXECUTORCH_BUILD_WASM)
+  if(NOT EXECUTORCH_BUILD_EXTENSION_DATA_LOADER)
+    add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/extension/data_loader)
+  endif()
+
+  if(NOT EXECUTORCH_BUILD_EXTENSION_FLAT_TENSOR)
+    add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/extension/flat_tensor)
+  endif()
+
+  if(NOT EXECUTORCH_BUILD_EXTENSION_MODULE)
+    add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/extension/module)
+  endif()
+
+  if(NOT EXECUTORCH_BUILD_EXTENSION_TENSOR)
+    add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/extension/tensor)
+  endif()
+
   add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/extension/wasm)
 endif()
 

extension/wasm/CMakeLists.txt

@@ -37,7 +37,6 @@ list(
   embind
   executorch_core
   extension_data_loader
-  portable_ops_lib
   extension_module_static
   extension_tensor
   extension_runner_util
@@ -49,7 +48,11 @@ target_compile_options(executorch_wasm PUBLIC ${_common_compile_options})
 target_include_directories(
   executorch_wasm PUBLIC ${_common_include_directories}
 )
-target_link_libraries(executorch_wasm PUBLIC ${link_libraries})
+target_link_libraries(
+  executorch_wasm
+  PUBLIC ${link_libraries}
+  INTERFACE executorch_kernels
+)
 
 if(EXECUTORCH_BUILD_WASM_TESTS)
   add_subdirectory(test)

extension/wasm/test/CMakeLists.txt

@@ -41,10 +41,10 @@ add_custom_target(
 )
 
 add_executable(executorch_wasm_tests)
-target_link_libraries(executorch_wasm_tests PUBLIC executorch_wasm)
+target_link_libraries(executorch_wasm_tests PRIVATE executorch_wasm)
 target_link_options(
   executorch_wasm_tests
-  PUBLIC
+  PRIVATE
   --embed-file
   "${MODELS_DIR}@/"
   --post-js

scripts/build_wasm_tests.sh

@@ -9,12 +9,7 @@ CMAKE_OUT=cmake-out-wasm
 
 cd "$(dirname "${BASH_SOURCE[0]}")/../"
 emcmake cmake . -DEXECUTORCH_BUILD_WASM=ON \
-    -DEXECUTORCH_BUILD_EXTENSION_DATA_LOADER=ON \
-    -DEXECUTORCH_BUILD_EXTENSION_FLAT_TENSOR=ON \
-    -DEXECUTORCH_BUILD_DEVTOOLS=ON \
-    -DEXECUTORCH_BUILD_EXTENSION_MODULE=ON \
-    -DEXECUTORCH_BUILD_EXTENSION_TENSOR=ON \
-    -DEXECUTORCH_BUILD_EXTENSION_RUNNER_UTIL=ON \
+    -DEXECUTORCH_SELECT_OPS_LIST="aten::mm.out,aten::add.out" \
     -DEXECUTORCH_BUILD_WASM_TESTS=ON \
     -DCMAKE_BUILD_TYPE=Release \
     -B"${CMAKE_OUT}"