Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Optimize the Workflow of Parsing Keras Model #1623

Merged
merged 5 commits into from
Feb 23, 2024
Merged

Optimize the Workflow of Parsing Keras Model #1623

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
503a181
Optimize the Workflow of Parsing Keras Model
zehao-intel Feb 22, 2024
e09400b
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Feb 22, 2024
6037b8c
fix pargma
zehao-intel Feb 22, 2024
aafae5e
Merge branch 'zehao/keras_model' of https://github.com/intel/neural-c…
zehao-intel Feb 22, 2024
125d06f
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Feb 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 11 additions & 9 deletions neural_compressor/model/tensorflow_model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,17 +313,10 @@ def load_saved_model(model, saved_model_tags, input_tensor_names, output_tensor_
def _get_graph_from_saved_model_v2(saved_model_dir, input_tensor_names, output_tensor_names):
from tensorflow.python.saved_model import signature_constants, tag_constants

from neural_compressor.adaptor.tf_utils.util import parse_saved_model

saved_model_exported_names = [signature_constants.DEFAULT_SERVING_SIGNATURE_DEF_KEY]
saved_model_tags = set([tag_constants.SERVING])
try:
graph_def, _saved_model, _, _, input_names, output_names = parse_saved_model(
saved_model_dir, True, input_tensor_names, output_tensor_names
)
except:
return load_saved_model(saved_model_dir, saved_model_tags, input_tensor_names, output_tensor_names)
return graph_def, input_names, output_names

return load_saved_model(saved_model_dir, saved_model_tags, input_tensor_names, output_tensor_names)


def _get_graph_from_original_keras_v2(model, output_dir):
Expand Down Expand Up @@ -467,6 +460,15 @@ def keras_session(model, input_tensor_names, output_tensor_names, **kwargs):
try:
tf.keras.backend.set_learning_phase(0)
graph_def, input_names, output_names = _get_graph_from_saved_model_v1(model)
except:
keras_format = "saved_model_general"
if keras_format == "saved_model_general": # pargma: no cover
try:
from neural_compressor.adaptor.tf_utils.util import parse_saved_model

graph_def, _saved_model, _, _, input_names, output_names = parse_saved_model(
temp_dir, True, input_tensor_names, output_tensor_names
)
except:
raise ValueError("Not supported keras model type...")

Expand Down