Use merged data map in module

[pytorchbot]

This PR was created by the merge bot to help merge the original PR into the main branch.
ghstack PR number: #14767 by @lucylq
^ Please use this as the source of truth for the PR details, comments, and reviews
ghstack PR base: https://github.com/pytorch/executorch/tree/gh/lucylq/119/base
ghstack PR head: https://github.com/pytorch/executorch/tree/gh/lucylq/119/head
Merge bot PR base: https://github.com/pytorch/executorch/tree/main
Merge bot PR head: https://github.com/pytorch/executorch/tree/gh/lucylq/119/orig
Differential Revision: D83799869
@diff-train-skip-merge

[pytorch-bot]

🔗 Helpful Links

🧪 See artifacts and rendered test results at hud.pytorch.org/pr/pytorch/executorch/14966

• 📄 Preview Python docs built from this PR

Note: Links to docs will display an error until the docs builds have been completed.

❌ 1 New Failure, 2 Cancelled Jobs, 29 Pending

As of commit 7b2b3aa with merge base 2eb8994 ():

NEW FAILURE - The following job has failed:

• Apple / build-demo-ios / macos-job (gh)
  RuntimeError: Command bash /Users/runner/work/_temp/exec_script failed with exit code 74

CANCELLED JOBS - The following jobs were cancelled. Please retry:

• Build Presets / linux (llm, linux.2xlarge, executorch-ubuntu-22.04-clang12) / build (gh)
  The runner has received a shutdown signal. This can happen when the runner service is stopped, or a manually started runner is canceled.
• pull / test-models-linux-basic (vit, xnnpack-quantization-delegation, buck2, linux.2xlarge, executorch-u... / linux-job (gh)

This comment was automatically generated by Dr. CI and updates every 15 minutes.

[github-actions]

This PR needs a release notes: label

If your change should be included in the release notes (i.e. would users of this library care about this change?), please use a label starting with release notes:. This helps us keep track and include your important work in the next release notes.

To add a label, you can comment to pytorchbot, for example
@pytorchbot label "release notes: none"

For more information, see
https://github.com/pytorch/pytorch/wiki/PyTorch-AutoLabel-Bot#why-categorize-for-release-notes-and-how-does-it-work.

[lucylq]

@pytorchbot cherry-pick --onto release/1.0 -c critical

[pytorchbot]

Cherry picking #14966

Command git -C /home/runner/work/executorch/executorch cherry-pick -x -X theirs d0827e51bc685312527387eac796cceca49e2e61 returned non-zero exit code 1

Auto-merging extension/module/CMakeLists.txt
Auto-merging extension/module/test/targets.bzl
CONFLICT (modify/delete): extension/named_data_map/merged_data_map.cpp deleted in HEAD and modified in d0827e51bc (Use merged data map in module (#14966)).  Version d0827e51bc (Use merged data map in module (#14966)) of extension/named_data_map/merged_data_map.cpp left in tree.
CONFLICT (modify/delete): extension/named_data_map/merged_data_map.h deleted in HEAD and modified in d0827e51bc (Use merged data map in module (#14966)).  Version d0827e51bc (Use merged data map in module (#14966)) of extension/named_data_map/merged_data_map.h left in tree.
CONFLICT (modify/delete): extension/named_data_map/test/merged_data_map_test.cpp deleted in HEAD and modified in d0827e51bc (Use merged data map in module (#14966)).  Version d0827e51bc (Use merged data map in module (#14966)) of extension/named_data_map/test/merged_data_map_test.cpp left in tree.
error: could not apply d0827e51bc... Use merged data map in module (#14966)
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config set advice.mergeConflict false"

Details for Dev Infra team

Raised by workflow job

[lucylq]

@pytorchbot cherry-pick --onto release/1.0 -c critical

[pytorchbot]

Cherry picking #14966

Command git -C /home/runner/work/executorch/executorch cherry-pick -x -X theirs d0827e51bc685312527387eac796cceca49e2e61 returned non-zero exit code 1

Auto-merging extension/module/CMakeLists.txt
Auto-merging extension/module/test/targets.bzl
CONFLICT (modify/delete): extension/named_data_map/merged_data_map.cpp deleted in HEAD and modified in d0827e51bc (Use merged data map in module (#14966)).  Version d0827e51bc (Use merged data map in module (#14966)) of extension/named_data_map/merged_data_map.cpp left in tree.
CONFLICT (modify/delete): extension/named_data_map/merged_data_map.h deleted in HEAD and modified in d0827e51bc (Use merged data map in module (#14966)).  Version d0827e51bc (Use merged data map in module (#14966)) of extension/named_data_map/merged_data_map.h left in tree.
CONFLICT (modify/delete): extension/named_data_map/test/merged_data_map_test.cpp deleted in HEAD and modified in d0827e51bc (Use merged data map in module (#14966)).  Version d0827e51bc (Use merged data map in module (#14966)) of extension/named_data_map/test/merged_data_map_test.cpp left in tree.
error: could not apply d0827e51bc... Use merged data map in module (#14966)
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config set advice.mergeConflict false"

Details for Dev Infra team

Raised by workflow job