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.

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

fix(optimization): handle empty file suffix #363

Merged
merged 6 commits into from
Aug 30, 2022
Merged

fix(optimization): handle empty file suffix #363

merged 6 commits into from
Aug 30, 2022

Conversation

ierezell
Copy link
Contributor

@ierezell ierezell commented Aug 26, 2022

What does this PR do?

Fixes #364

Problem :

Optimize or quantize a model but the user does not want a suffix so the user tries to use :

file_suffix=None => RuntimeError (for optimization)
file_suffix="" => saved file name is like encoder_model_.onnx

Solution :

Little logic to handle optional or empty file_suffix

Doc :

The doc was already saying the parameter could be optional (even if not with the current code)

@HuggingFaceDocBuilderDev
Copy link

HuggingFaceDocBuilderDev commented Aug 26, 2022

The documentation is not available anymore as the PR was closed or merged.

@ierezell
Copy link
Contributor Author

ierezell commented Aug 26, 2022

Note that for quantization I used pathlib to be more consistent with "optimization.py" code and I moved the suffix path close to the place it's used.
It's just a personal preference so I can for sure revert it if you don't like that.

Copy link
Collaborator

@echarlaix echarlaix left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the fix @ierezell !

ierezell and others added 2 commits August 26, 2022 13:35
Co-authored-by: Ella Charlaix <80481427+echarlaix@users.noreply.github.com>
Copy link
Collaborator

@echarlaix echarlaix left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM ! 🔥

@echarlaix echarlaix merged commit cc5bb35 into huggingface:main Aug 30, 2022
@ierezell ierezell deleted the ps_fix_empty_suffix branch August 30, 2022 13:36
JingyaHuang added a commit that referenced this pull request Sep 7, 2022
* Override export of ORTSeq2SeqTrainer

* Do not force download by default in ORTModel (#356)

* Update OnnxConfigWithLoss wrapper

* ORT optimizer refactorization (#294)

* Refactorization of ORTOptimizer

* Refactorization of ORTModel

* Adapt examples according to refactorization

* Adapt tests

* Fix style

* Remove quantizer modification

* Fix style

* Apply modifications from #270 for quantizer and optimizer to have same behavior

* Add test for optimization of Seq2Seq models

* Fix style

* Add ort config saving when optimizing a model

* Add ort config saving when quantizing a model

* Add tests

* Fix style

* Adapt optimization examples

* Fix readme

* Remove unused parameter

* Adapt quantization examples

* Fix quantized model and ort config saving

* Add documentation

* Add model configuration saving to simplify loading of optimized model

* Fix style

* Fix description

* Fix quantization tests

* Remove opset argument which is onnx config default opset when exporting with ORTModels

* Fix import (#360)

* Fix export of decoders

* Add flag to export only decoders

* Fix ORTTrainer inference ort subclass parsing

* Fix filenames when empty suffix given (#363)

* fix(optimization): handle empty file suffix

* fix(quantization): handle empty file suffix

* use pathlibfor save_dir

* run test again

* Update optimum/onnxruntime/quantization.py

Co-authored-by: Ella Charlaix <80481427+echarlaix@users.noreply.github.com>

* ReRun test that failed because of cache (network)

Co-authored-by: Ella Charlaix <80481427+echarlaix@users.noreply.github.com>

* Override the evaluation and prediction loop in ORTSeq2SeqTrainer

* Fix documentation (#369)

* fix class

* Update optimization.mdx

* Fix label smoother device prob

* Fix lm_logits and labels dimension mismatch

* Clean up

Co-authored-by: fxmarty <9808326+fxmarty@users.noreply.github.com>
Co-authored-by: Ella Charlaix <80481427+echarlaix@users.noreply.github.com>
Co-authored-by: Pierre Snell <ierezell@gmail.com>
Co-authored-by: Pierre Snell <pierre.snell@botpress.com>
Co-authored-by: Philipp Schmid <32632186+philschmid@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Empty file suffix when optimizing or quantizing is not handled
3 participants