Skip to content

Commit f91d622

Browse files
committed
On clean builds, some cmake variables are not set for dtype selective build. Added in an if guard and reloading of these variables when that happens
1 parent b135046 commit f91d622

File tree

1 file changed

+12
-2
lines changed

1 file changed

+12
-2
lines changed

tools/cmake/Codegen.cmake

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -245,15 +245,25 @@ function(gen_operators_lib)
245245
list(REMOVE_ITEM GEN_KERNEL_LIBS ${portable_kernels_check})
246246

247247
# Build kernels_util_all_deps, since later selected_portable_kernels depends on it
248-
list(TRANSFORM _kernels_util_all_deps__srcs PREPEND "${EXECUTORCH_ROOT}/")
248+
if(NOT _kernels_util_all_deps__srcs)
249+
file(GLOB_RECURSE _kernels_util_all_deps__srcs "${EXECUTORCH_DIR}/kernels/portable/cpu/util/*.cpp")
250+
list(FILTER _kernels_util_all_deps__srcs EXCLUDE REGEX "${EXECUTORCH_DIR}/kernels/portable/cpu/util/test/.*")
251+
else()
252+
list(TRANSFORM _kernels_util_all_deps__srcs PREPEND "${EXECUTORCH_ROOT}/")
253+
endif()
249254
add_library(selected_kernels_util_all_deps ${_kernels_util_all_deps__srcs})
250255
target_link_libraries(selected_kernels_util_all_deps PRIVATE executorch_core)
251256
target_include_directories(selected_kernels_util_all_deps PUBLIC ${_common_include_directories})
252257
target_compile_definitions(selected_kernels_util_all_deps PUBLIC C10_USING_CUSTOM_GENERATED_MACROS)
253258
target_compile_options(selected_kernels_util_all_deps PUBLIC ${_common_compile_options})
254259

255260
# Build selected_portable_kernels
256-
list(TRANSFORM _portable_kernels__srcs PREPEND "${EXECUTORCH_ROOT}/")
261+
if(NOT _portable_kernels__srcs)
262+
file(GLOB_RECURSE _portable_kernels__srcs "${EXECUTORCH_DIR}/kernels/portable/cpu/*.cpp")
263+
list(FILTER _portable_kernels__srcs EXCLUDE REGEX "${EXECUTORCH_DIR}/kernels/portable/cpu/util/test/.*")
264+
else()
265+
list(TRANSFORM _portable_kernels__srcs PREPEND "${EXECUTORCH_ROOT}/")
266+
endif()
257267
add_library(selected_portable_kernels ${_portable_kernels__srcs})
258268
target_link_libraries(selected_portable_kernels PRIVATE executorch_core selected_kernels_util_all_deps)
259269
target_compile_options(selected_portable_kernels PUBLIC ${_common_compile_options})

0 commit comments

Comments
 (0)