update runner-et to use et-build. Add ET logging to build. (#251)

pytorch · Jul 17, 2024 · cef49d8 · cef49d8
1 parent d56db51
commit cef49d8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/runner-et/CMakeLists.txt b/runner-et/CMakeLists.txt
@@ -7,8 +7,8 @@ include(CMakePrintHelpers)
 set(TORCHCHAT_ROOT $ENV{TORCHCHAT_ROOT})
 cmake_print_variables(TORCHCHAT_ROOT)
 
-find_package(executorch CONFIG REQUIRED PATHS ${TORCHCHAT_ROOT}/build/install/lib/cmake/ExecuTorch)
-set(_common_include_directories ${TORCHCHAT_ROOT}/build/src)
+find_package(executorch CONFIG REQUIRED PATHS ${TORCHCHAT_ROOT}/et-build/install/lib/cmake/ExecuTorch)
+set(_common_include_directories ${TORCHCHAT_ROOT}/et-build/src)
 cmake_print_variables(_common_include_directories)
 
 target_include_directories(executorch INTERFACE ${_common_include_directories}) # Ideally ExecuTorch installation process would do this
@@ -19,7 +19,7 @@ target_link_libraries(
     runner_et PRIVATE
         executorch
         extension_module
-        ${TORCHCHAT_ROOT}/build/src/executorch/cmake-out/extension/data_loader/libextension_data_loader.a # This one does not get installed by ExecuTorch
+        ${TORCHCHAT_ROOT}/et-build/src/executorch/cmake-out/extension/data_loader/libextension_data_loader.a # This one does not get installed by ExecuTorch
         optimized_kernels
         portable_kernels
         cpublas

diff --git a/scripts/install_et.sh b/scripts/install_et.sh
@@ -49,7 +49,7 @@ install_executorch() {
   echo "Building and installing C++ libraries"
   echo "Inside: ${PWD}"
   mkdir cmake-out
-  cmake -DCMAKE_BUILD_TYPE=Release -DEXECUTORCH_BUILD_OPTIMIZED=ON -DEXECUTORCH_BUILD_EXTENSION_DATA_LOADER=ON -DEXECUTORCH_BUILD_EXTENSION_MODULE=ON -DEXECUTORCH_BUILD_XNNPACK=ON -S . -B cmake-out -G Ninja
+  cmake -DCMAKE_BUILD_TYPE=Release -DEXECUTORCH_ENABLE_LOGGING=ON -DEXECUTORCH_LOG_LEVEL=Info -DEXECUTORCH_BUILD_OPTIMIZED=ON -DEXECUTORCH_BUILD_EXTENSION_DATA_LOADER=ON -DEXECUTORCH_BUILD_EXTENSION_MODULE=ON -DEXECUTORCH_BUILD_XNNPACK=ON -S . -B cmake-out -G Ninja
   cmake --build cmake-out
   cmake --install cmake-out --prefix ${TORCHCHAT_ROOT}/et-build/install
   popd