Update on "Use c10 version of half/bfloat16 in executorch"

swolchok · swolchok · commit 4b91ca93d3ef · 2024-11-22T16:27:58.000-08:00
Accomplished by importing relevant files from c10 into executorch/runtime/core/portable_type/c10, and then using `using` in the top-level ExecuTorch headers. This approach should keep the ExecuTorch build hermetic for embedded use cases. In the future, we should add a CI job to ensure the c10 files stay identical to the PyTorch ones. Differential Revision: [D66106969](https://our.internmc.facebook.com/intern/diff/D66106969/) [ghstack-poisoned]
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -337,7 +337,9 @@ if(NOT "${_repo_dir_name}" STREQUAL "executorch")
       "fix for this restriction."
   )
 endif()
-set(_common_include_directories ${CMAKE_CURRENT_SOURCE_DIR}/..)
+set(_common_include_directories ${CMAKE_CURRENT_SOURCE_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/runtime/core/portable_type)
+# We don't need any of C10's CMake macros.
+add_definitions(-DC10_USING_CUSTOM_GENERATED_MACROS)
 
 #
 # The `_<target>_srcs` lists are defined by including ${EXECUTORCH_SRCS_FILE}.

Original file line number	Diff line number	Diff line change
`@@ -337,7 +337,9 @@ if(NOT "${_repo_dir_name}" STREQUAL "executorch")`
`337`	`337`	`"fix for this restriction."`
`338`	`338`	`)`
`339`	`339`	`endif()`
`340`		`-set(_common_include_directories ${CMAKE_CURRENT_SOURCE_DIR}/..)`
	`340`	`+set(_common_include_directories ${CMAKE_CURRENT_SOURCE_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/runtime/core/portable_type)`
	`341`	`+# We don't need any of C10's CMake macros.`
	`342`	`+add_definitions(-DC10_USING_CUSTOM_GENERATED_MACROS)`
`341`	`343`
`342`	`344`	`#`
`343`	`345`	# The `_<target>_srcs` lists are defined by including ${EXECUTORCH_SRCS_FILE}.