Skip to content

Delete executorch_print_configuration_summary #10806

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 13, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 15 additions & 11 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,21 @@ project(executorch)

include(${PROJECT_SOURCE_DIR}/tools/cmake/common/preset.cmake)

if(NOT CMAKE_CXX_STANDARD)
set(CMAKE_CXX_STANDARD 17)
endif()
announce_configured_options(CMAKE_CXX_STANDARD)

if(NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE Debug)
endif()
announce_configured_options(CMAKE_BUILD_TYPE)

announce_configured_options(CMAKE_CXX_COMPILER_ID)
announce_configured_options(CMAKE_TOOLCHAIN_FILE)
announce_configured_options(BUCK2)
announce_configured_options(PYTHON_EXECUTABLE)

load_build_preset()
include(${PROJECT_SOURCE_DIR}/tools/cmake/preset/default.cmake)

Expand All @@ -63,14 +78,6 @@ include(ExternalProject)

set(CMAKE_EXPORT_COMPILE_COMMANDS ON)

if(NOT CMAKE_CXX_STANDARD)
set(CMAKE_CXX_STANDARD 17)
endif()

if(NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE Debug)
endif()

# Setup RPATH.
# See https://gitlab.kitware.com/cmake/community/-/wikis/doc/cmake/RPATH-handling
# Use separate rpaths during build and install phases
Expand Down Expand Up @@ -712,6 +719,3 @@ if(EXECUTORCH_BUILD_VULKAN)
endif()

include(Test.cmake)

# Print all summary
executorch_print_configuration_summary()
3 changes: 0 additions & 3 deletions examples/models/llama/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,3 @@ target_include_directories(
)
target_link_libraries(llama_main PUBLIC llama_runner ${link_libraries})
target_compile_options(llama_main PUBLIC ${_common_compile_options})

# Print all summary
executorch_print_configuration_summary()
3 changes: 0 additions & 3 deletions examples/models/llava/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,3 @@ endif()
target_include_directories(llava_main PUBLIC ${_common_include_directories})
target_link_libraries(llava_main PUBLIC llava_runner ${link_libraries})
target_compile_options(llava_main PUBLIC ${_common_compile_options})

# Print all summary
executorch_print_configuration_summary()
3 changes: 0 additions & 3 deletions examples/selective_build/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,3 @@ target_link_libraries(
)
target_link_options_shared_lib(select_build_lib)
target_compile_options(selective_build_test PUBLIC ${_common_compile_options})

# Print all summary
executorch_print_configuration_summary()
3 changes: 0 additions & 3 deletions test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,3 @@ if(CMAKE_BUILD_TYPE EQUAL "Release")
target_link_options(size_test_all_optimized_ops PRIVATE "LINKER:--gc-sections")
endif()
endif()

# Print all summary
executorch_print_configuration_summary()
13 changes: 0 additions & 13 deletions tools/cmake/Utils.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,6 @@
# It should also be cmake-lint clean.
#

# Public function to print summary for all configurations. For new variables,
# it's recommended to add them here.
function(executorch_print_configuration_summary)
message(STATUS "")
message(STATUS "******** Summary ********")
message(STATUS " CMAKE_BUILD_TYPE : ${CMAKE_BUILD_TYPE}")
message(STATUS " CMAKE_CXX_STANDARD : ${CMAKE_CXX_STANDARD}")
message(STATUS " CMAKE_CXX_COMPILER_ID : ${CMAKE_CXX_COMPILER_ID}")
message(STATUS " CMAKE_TOOLCHAIN_FILE : ${CMAKE_TOOLCHAIN_FILE}")
message(STATUS " BUCK2 : ${BUCK2}")
message(STATUS " PYTHON_EXECUTABLE : ${PYTHON_EXECUTABLE}")
endfunction()

# This is the funtion to use -Wl, --whole-archive to link static library NB:
# target_link_options is broken for this case, it only append the interface link
# options of the first library.
Expand Down
6 changes: 5 additions & 1 deletion tools/cmake/common/preset.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,11 @@ function(print_configured_options)
set(padding "${padding} ")
math(EXPR num_spaces "${num_spaces} - 1")
endwhile()
message(STATUS "${_option}${padding} : ${${_option}}")
if(DEFINED ${_option})
message(STATUS "${_option}${padding} : ${${_option}}")
else()
message(STATUS "${_option}${padding} x (unset)")
endif()
endforeach()
message(STATUS "---------------------------")
endfunction()
Expand Down
Loading