Skip to content

Commit 2a2cf98

Browse files
committed
✨ Simplify build config by integrating data loader and baremetal exclusions.
1 parent c2aa614 commit 2a2cf98

File tree

2 files changed

+9
-20
lines changed

2 files changed

+9
-20
lines changed

CMakeLists.txt

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -522,17 +522,6 @@ if(EXECUTORCH_BUILD_CORTEX_M)
522522
endif()
523523

524524
if(EXECUTORCH_BUILD_DEVTOOLS)
525-
if(NOT EXECUTORCH_BUILD_ARM_BAREMETAL)
526-
set(EXECUTORCH_BUILD_EXTENSION_DATA_LOADER
527-
ON
528-
CACHE BOOL "EXECUTORCH_BUILD_EXTENSION_DATA_LOADER" FORCE
529-
)
530-
else()
531-
set(EXECUTORCH_BUILD_EXTENSION_DATA_LOADER
532-
OFF
533-
CACHE BOOL "EXECUTORCH_BUILD_EXTENSION_DATA_LOADER" FORCE
534-
)
535-
endif()
536525
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/devtools)
537526
endif()
538527

tools/cmake/preset/default.cmake

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -342,6 +342,15 @@ check_required_options_on(
342342
EXECUTORCH_BUILD_EXTENSION_FLAT_TENSOR
343343
)
344344

345+
check_conflicting_options_on(
346+
IF_ON
347+
EXECUTORCH_BUILD_ARM_BAREMETAL
348+
CONFLICTS_WITH
349+
EXECUTORCH_BUILD_EXTENSION_DATA_LOADER
350+
EXECUTORCH_BUILD_PTHREADPOOL
351+
EXECUTORCH_BUILD_CPUINFO
352+
)
353+
345354

346355
if(NOT EXISTS ${EXECUTORCH_PAL_DEFAULT_FILE_PATH})
347356
message(FATAL_ERROR "PAL default implementation (EXECUTORCH_PAL_DEFAULT=${EXECUTORCH_PAL_DEFAULT}) file not found: ${EXECUTORCH_PAL_DEFAULT_FILE_PATH}. Choices: posix, minimal, android")
@@ -360,12 +369,3 @@ elseif(_executorch_log_level_lower STREQUAL "fatal")
360369
else()
361370
message(FATAL_ERROR "Unknown EXECUTORCH_LOG_LEVEL '${EXECUTORCH_LOG_LEVEL}'. Choices: Debug, Info, Error, Fatal")
362371
endif()
363-
364-
365-
if(EXECUTORCH_BUILD_ARM_BAREMETAL)
366-
if(EXECUTORCH_BUILD_PTHREADPOOL)
367-
message(FATAL_ERROR "Cannot enable both EXECUTORCH_BUILD_PTHREADPOOL and EXECUTORCH_BUILD_ARM_BAREMETAL")
368-
elseif(EXECUTORCH_BUILD_CPUINFO)
369-
message(FATAL_ERROR "Cannot enable both EXECUTORCH_BUILD_CPUINFO and EXECUTORCH_BUILD_ARM_BAREMETAL")
370-
endif()
371-
endif()

0 commit comments

Comments
 (0)