Remove all the code that constructs metadata.pkl file (#61760)

chloeyutianyi · facebook-github-bot · commit 6b8ac15d19b7 · 2021-07-15T22:28:07.000-07:00
Summary: Pull Request resolved: #61760 Remove all code that related to metadata.pkl creation including creating metadata.pkl, converting data from extra/mobile_info.json and extra/producer_info.json to metadata.pkl file. Test Plan: ## Run buck commands: - `cd` into `fbcode` then `buck build //caffe2/caffe2/fb/init:init` - `cd` into `fbcode` then `buck build //caffe2/torch/fb/init:init` - `buck build //xplat/caffe2:torch_mobile_core` ## Export a PyTorch lite/mobile model - Run: `flow-cli canary users.xcheng16.pytorch_trainer.TestWorkflow --run-as-secure-group ai_mobile_platform --buck-target //fblearner/flow/projects/users/xcheng16:workflow` under `fbcode` on devserver. - Resulted Model: metadata.pkl no longer exist {F632063134} Reviewed By: guangy10 Differential Revision: D29702943 fbshipit-source-id: 57b9198f04e1e50830b8756bacfa2e650325739e
diff --git a/torch/csrc/jit/serialization/export.h b/torch/csrc/jit/serialization/export.h
@@ -180,13 +180,6 @@ TORCH_API void writeArchiveAndTensors(
 using ExportModuleExtraFilesHook = std::function<ExtraFilesMap(const Module&)>;
 TORCH_API void SetExportModuleExtraFilesHook(ExportModuleExtraFilesHook hook);
 
-using ExportModuleMobileInfoConverter =
-    std::function<c10::Dict<std::string, std::string>(
-        const Module&,
-        const std::unordered_map<std::string, std::string>&)>;
-TORCH_API void SetExportModuleMobileInfoConverter(
-    ExportModuleMobileInfoConverter converter);
-
 /**
  * Generates new bytecode for a Script module and returns what the op list
  * would be for a LiteScriptModule based off the current code base. If you
diff --git a/torch/csrc/jit/serialization/export_module.cpp b/torch/csrc/jit/serialization/export_module.cpp
@@ -43,11 +43,6 @@ ExportModuleExtraFilesHook& GetExtraFilesHook() {
   return func;
 }
 
-ExportModuleMobileInfoConverter& GetMobileInfoConverter() {
-  static ExportModuleMobileInfoConverter func = nullptr;
-  return func;
-}
-
 static IValue Tup(std::vector<IValue> ivalues) {
   return c10::ivalue::Tuple::create(std::move(ivalues));
 }
@@ -412,11 +407,6 @@ void SetExportModuleExtraFilesHook(ExportModuleExtraFilesHook hook) {
   GetExtraFilesHook() = std::move(hook);
 }
 
-void SetExportModuleMobileInfoConverter(
-    ExportModuleMobileInfoConverter converter) {
-  GetMobileInfoConverter() = std::move(converter);
-}
-
 void ScriptModuleSerializer::serialize(
     const Module& module,
     const ExtraFilesMap& extra_files,
@@ -446,7 +436,6 @@ void ScriptModuleSerializer::serialize(
         /*use_storage_context=*/true);
 
     writeByteCode(module, save_mobile_debug_info);
-    writeMobileMetadata(module, extra_files);
   } else {
     writeArchive(
         c10::ivalue::Tuple::create(ivalue_constants),
@@ -561,31 +550,6 @@ void ScriptModuleSerializer::writeExtraFiles(
   }
 }
 
-void ScriptModuleSerializer::writeMobileMetadata(
-    const Module& module,
-    const ExtraFilesMap& extra_files) {
-  auto hook = GetExtraFilesHook();
-  auto converter = GetMobileInfoConverter();
-  if (!converter) {
-    return;
-  }
-  ExtraFilesMap files_to_write = extra_files;
-  // merge hook files and extra files
-  if (hook) {
-    ExtraFilesMap hook_files = hook(module);
-    files_to_write.insert(hook_files.begin(), hook_files.end());
-  }
-  auto content_to_write = converter(module, files_to_write);
-  if (!content_to_write.empty()) {
-    writeArchive(
-        content_to_write,
-        /*archive_name=*/"metadata",
-        /*archive_dir=*/"",
-        /*tensor_dir=*/"metadata/");
-    ;
-  }
-}
-
 void ScriptModuleSerializer::updateSourceRangeTags(
     const SourceRangeRecords& ranges) {
   for (const auto& range : ranges) {
