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

Jump to bottom

Mark tfdf ops as supported by tfjs-converter #7141

Merged
merged 3 commits into from
Dec 8, 2022
Merged

Mark tfdf ops as supported by tfjs-converter #7141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
106fd09
Add tfdf ops as supported by tfjs-converter
mattsoulanille Dec 6, 2022
c96db5f
Read tfdf ops for _is_assets_required from tfdf.json
mattsoulanille Dec 6, 2022
f2a79b5
Merge branch 'master' into tfdf_converter
mattsoulanille Dec 7, 2022
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
14 changes: 6 additions & 8 deletions tfjs-converter/python/tensorflowjs/converters/tf_saved_model_conversion_v2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -455,15 +455,13 @@ def _copy_assets(saved_model_dir, output_dir):
if gfile.isdir(tmp_dir):
gfile.rmtree(tmp_dir)

# TFDF stores the necessary files for its binary in the assets folder.
ASSET_REQUIRING_OPS = frozenset([
'SimpleMLCreateModelResource'
'SimpleMLLoadModelFromPathWithHandle',
'SimpleMLInferenceOpWithHandle',
])

def _is_assets_required(model_ops):
return not ASSET_REQUIRING_OPS.isdisjoint(model_ops)
# TFDF stores the necessary files for its binary in the assets folder.
# Check if any TFDF ops are used in the model.
with resource_loader.open_file('op_list/tfdf.json') as tfdf_json:
ops = json.load(tfdf_json)
opNames = frozenset([x['tfOpName'] for x in ops])
return not opNames.isdisjoint(model_ops)

def _get_frozen_graph_ops(frozen_graph):
if frozen_graph is None:
Expand Down
11 changes: 11 additions & 0 deletions tfjs-converter/python/tensorflowjs/op_list/tfdf.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
[
{
"tfOpName": "SimpleMLCreateModelResource"
},
{
"tfOpName": "SimpleMLLoadModelFromPathWithHandle"
},
{
"tfOpName": "SimpleMLInferenceOpWithHandle"
}
]