Update on "Pass one NDM to backend init"

lucylq · lucylq · commit d42f4ef90a8a · 2025-04-30T10:28:03.000-07:00
Take external NDM if it exists, otherwise internal. Note: by default, xnnpack uses the named_data_map. Constants are not stored with the delegated blob anymore. Differential Revision: [D73679710](https://our.internmc.facebook.com/intern/diff/D73679710/) [ghstack-poisoned]
diff --git a/runtime/executor/method.cpp b/runtime/executor/method.cpp
@@ -810,7 +810,7 @@ Error Method::init(
         NotSupported,
         "NamedDataMap merge not supported; both pte_data_map and named_data_map are non-empty. If you see this error please file an issue at https://github.com/pytorch/executorch/issues");
 
-    if (named_data_map && named_data_map->get_num_keys().get() > 0) {
+    if (!named_data_map || named_data_map->get_num_keys().get() == 0) {
       named_data_map = pte_data_map;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -810,7 +810,7 @@ Error Method::init(`
`810`	`810`	`NotSupported,`
`811`	`811`	`"NamedDataMap merge not supported; both pte_data_map and named_data_map are non-empty. If you see this error please file an issue at https://github.com/pytorch/executorch/issues");`
`812`	`812`
`813`		`- if (named_data_map && named_data_map->get_num_keys().get() > 0) {`
	`813`	`+ if (!named_data_map \|\| named_data_map->get_num_keys().get() == 0) {`
`814`	`814`	`named_data_map = pte_data_map;`
`815`	`815`	`}`
`816`	`816`