experiments/STT-tensorflow
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove saved_model_import flag guard on pass config

Browse Source 
Since saved model passes are a no-op for graphdef import and safe to always be
included.

PiperOrigin-RevId: 299151617
Change-Id: If302d005b901ff3c5646784ac8f2a0ba9e372490
This commit is contained in:
Ashwin Murthy 2020-03-05 11:34:41 -08:00 committed by TensorFlower Gardener
parent 1f422c750c
commit 6506145ebb
3 changed files with 13 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tensorflow/compiler/mlir/lite/common/tfl_pass_config.h
View File

@ -36,8 +36,7 @@ struct PassConfig {
form_clusters(false),
inline_functions(true),
unfold_batch_matmul(true),
legalize_tf_while(true),
saved_model_import(false) {}
legalize_tf_while(true) {}
// If `emit_builtin_tflite_ops` is true, TF Lite legalization passes will be
// added, which produces TF Lite ops.
@ -67,10 +66,6 @@ struct PassConfig {
// Note: This is staging step and will be removed.
// TODO(b/137395003): Remove post switching legalization.
bool legalize_tf_while;
// This flag indicates whether the TF program to be converted is being
// imported into MLIR via saved model import.
bool saved_model_import;
};
} // namespace TFL

29
tensorflow/compiler/mlir/lite/tf_tfl_passes.cc
View File

@ -84,17 +84,15 @@ void AddTFToTFLConversionPasses(const mlir::TFL::PassConfig& pass_config,
pass_manager->addPass(mlir::TFL::CreateLowerStaticTensorListPass());
}
if (pass_config.saved_model_import) {
// This pass does resource analysis of saved model global tensors and marks
// those deemed read-only as immutable.
pass_manager->addPass(
mlir::tf_saved_model::CreateOptimizeGlobalTensorsPass());
// This pass marks non-exported functions as symbol visibility 'private'
// those deemed read-only as immutable.
pass_manager->addPass(
mlir::tf_saved_model::
CreateMarkFunctionVisibilityUsingSavedModelLinkagePass());
}
// This pass does resource analysis of saved model global tensors and marks
// those deemed read-only as immutable.
pass_manager->addPass(
mlir::tf_saved_model::CreateOptimizeGlobalTensorsPass());
// This pass marks non-exported functions as symbol visibility 'private'
// those deemed read-only as immutable.
pass_manager->addPass(
mlir::tf_saved_model::
CreateMarkFunctionVisibilityUsingSavedModelLinkagePass());
// Enable fusing composite ops that can be lowered to built-in TFLite ops.
if (pass_config.emit_builtin_tflite_ops) {
@ -139,12 +137,9 @@ void AddTFToTFLConversionPasses(const mlir::TFL::PassConfig& pass_config,
pass_manager->addNestedPass<mlir::FuncOp>(mlir::createCSEPass());
// This pass does dead code elimination based on symbol visibility.
pass_manager->addPass(mlir::createSymbolDCEPass());
if (pass_config.saved_model_import) {
// This pass 'freezes' immutable global tensors and inlines them as tf
// constant ops.
pass_manager->addPass(
mlir::tf_saved_model::CreateFreezeGlobalTensorsPass());
}
// This pass 'freezes' immutable global tensors and inlines them as tf
// constant ops.
pass_manager->addPass(mlir::tf_saved_model::CreateFreezeGlobalTensorsPass());
// The below passes only make sense if Builtin TFLite ops are enabled
// for emission.

2
tensorflow/compiler/mlir/lite/tf_tfl_translate.cc
View File

@ -195,8 +195,6 @@ int main(int argc, char **argv) {
pass_config.emit_builtin_tflite_ops = emit_builtin_tflite_ops;
pass_config.lower_tensor_list_ops = lower_tensor_list_ops;
pass_config.inline_functions = inline_functions;
if (import_saved_model || import_saved_model_v1)
pass_config.saved_model_import = true;
tensorflow::AddTFToTFLConversionPasses(pass_config, &pm);
pm.addPass(mlir::TFL::CreateRuntimeTypeVerifyPass());