Update on "Introduce public MergedDataMap"

Add public merged data map. Module can use this to resolve multiple named data maps.

Differential Revision: [D83527299](https://our.internmc.facebook.com/intern/diff/D83527299/)

[ghstack-poisoned]

Author: lucylq

extension/named_data_map/CMakeLists.txt

@@ -21,17 +21,15 @@ list(TRANSFORM _extension_named_data_map__srcs PREPEND "${EXECUTORCH_ROOT}/")
 add_library(extension_named_data_map ${_extension_named_data_map__srcs})
 
 # Link dependencies
-target_link_libraries(
-  extension_named_data_map
-  PUBLIC
-    executorch_core
-)
+target_link_libraries(extension_named_data_map PUBLIC executorch_core)
 
 target_include_directories(
   extension_named_data_map PUBLIC ${_common_include_directories}
 )
 
-target_compile_options(extension_named_data_map PUBLIC ${_common_compile_options})
+target_compile_options(
+  extension_named_data_map PUBLIC ${_common_compile_options}
+)
 
 # Install libraries
 install(

extension/named_data_map/merged_data_map.cpp

@@ -9,8 +9,8 @@
 #include <executorch/extension/named_data_map/merged_data_map.h>
 #include <executorch/runtime/core/data_loader.h>
 
-#include <vector>
 #include <unordered_map>
+#include <vector>
 
 using executorch::aten::string_view;
 using executorch::ET_RUNTIME_NAMESPACE::NamedDataMap;

extension/named_data_map/merged_data_map.h

@@ -10,6 +10,7 @@
 
 #include <executorch/runtime/core/named_data_map.h>
 
+#include <unordered_map>
 #include <vector>
 
 namespace executorch {

extension/named_data_map/test/CMakeLists.txt

@@ -26,8 +26,9 @@ add_custom_command(
          "${CMAKE_CURRENT_BINARY_DIR}/ModuleSimpleTrainProgram.pte"
          "${CMAKE_CURRENT_BINARY_DIR}/ModuleSimpleTrainProgram.ptd"
   COMMAND
-    ${PYTHON_EXECUTABLE} -m test.models.export_program --modules "ModuleAddMul,ModuleLinear,ModuleSimpleTrain"
-    --external-constants --outdir "${CMAKE_CURRENT_BINARY_DIR}"
+    ${PYTHON_EXECUTABLE} -m test.models.export_program --modules
+    "ModuleAddMul,ModuleLinear,ModuleSimpleTrain" --external-constants --outdir
+    "${CMAKE_CURRENT_BINARY_DIR}"
   WORKING_DIRECTORY ${EXECUTORCH_ROOT}
 )
 
@@ -53,11 +54,19 @@ set(test_env
 set(_test_srcs merged_data_map_test.cpp)
 
 et_cxx_test(
-  extension_named_data_map_test SOURCES ${_test_srcs} EXTRA_LIBS
-  extension_named_data_map extension_flat_tensor extension_data_loader
+  extension_named_data_map_test
+  SOURCES
+  ${_test_srcs}
+  EXTRA_LIBS
+  extension_named_data_map
+  extension_flat_tensor
+  extension_data_loader
 )
 
 add_dependencies(
-  extension_named_data_map_test extension_named_data_map extension_named_data_map_test_resources
+  extension_named_data_map_test extension_named_data_map
+  extension_named_data_map_test_resources
+)
+set_property(
+  TEST extension_named_data_map_test PROPERTY ENVIRONMENT ${test_env}
 )
-set_property(TEST extension_named_data_map_test PROPERTY ENVIRONMENT ${test_env})

extension/named_data_map/test/merged_data_map_test.cpp

@@ -16,6 +16,9 @@
 
 #include <gtest/gtest.h>
 
+#include <unordered_map>
+#include <vector>
+
 using namespace ::testing;
 using executorch::extension::FileDataLoader;
 using executorch::extension::FlatTensorDataMap;

tools/cmake/preset/default.cmake

@@ -87,7 +87,8 @@ define_overridable_option(
   EXECUTORCH_BUILD_EXTENSION_MODULE "Build the Module extension" BOOL OFF
 )
 define_overridable_option(
-  EXECUTORCH_BUILD_EXTENSION_NAMED_DATA_MAP "Build the Named Data Map extension" BOOL OFF
+  EXECUTORCH_BUILD_EXTENSION_NAMED_DATA_MAP
+  "Build the Named Data Map extension" BOOL OFF
 )
 define_overridable_option(
   EXECUTORCH_BUILD_EXTENSION_TENSOR "Build the Tensor extension" BOOL OFF
@@ -279,8 +280,7 @@ check_required_options_on(
 
 check_required_options_on(
   IF_ON EXECUTORCH_BUILD_EXTENSION_MODULE REQUIRES
-  EXECUTORCH_BUILD_EXTENSION_DATA_LOADER
-  EXECUTORCH_BUILD_EXTENSION_FLAT_TENSOR
+  EXECUTORCH_BUILD_EXTENSION_DATA_LOADER EXECUTORCH_BUILD_EXTENSION_FLAT_TENSOR
   EXECUTORCH_BUILD_EXTENSION_NAMED_DATA_MAP
 )