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

fix(optimization): handle empty file suffix #363

Merged
merged 6 commits into from
Aug 30, 2022
Merged

fix(optimization): handle empty file suffix #363

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
04f3a4a
fix(optimization): handle empty file suffix
ierezell Aug 26, 2022
6310dbc
fix(quantization): handle empty file suffix
ierezell Aug 26, 2022
07dedd5
use pathlibfor save_dir
ierezell Aug 26, 2022
234f3d2
run test again
ierezell Aug 26, 2022
7bc6699
Update optimum/onnxruntime/quantization.py
ierezell Aug 26, 2022
edb3607
ReRun test that failed because of cache (network)
ierezell Aug 26, 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
5 changes: 3 additions & 2 deletions optimum/onnxruntime/optimization.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ def optimize(
self,
optimization_config: OptimizationConfig,
save_dir: Union[str, os.PathLike],
file_suffix: str = "optimized",
file_suffix: Optional[str] = "optimized",
use_external_data_format: bool = False,
):
"""
Expand Down Expand Up @@ -144,7 +144,8 @@ def optimize(
# keep_io_types to keep inputs/outputs as float32
optimizer.convert_float_to_float16(keep_io_types=True)

output_path = save_dir.joinpath(f"{model_path.stem}_{file_suffix}").with_suffix(model_path.suffix)
suffix = f"_{file_suffix}" if file_suffix else ""
output_path = save_dir.joinpath(f"{model_path.stem}{suffix}").with_suffix(model_path.suffix)
optimizer.save_model_to_file(output_path.as_posix(), use_external_data_format)

LOGGER.info(f"Optimized model saved at: {save_dir} (external data format: " f"{use_external_data_format})")
Expand Down
6 changes: 4 additions & 2 deletions optimum/onnxruntime/quantization.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,8 +286,8 @@ def quantize(
The path of the resulting quantized model.
"""
use_qdq = quantization_config.is_static and quantization_config.format == QuantFormat.QDQ
os.makedirs(save_dir, exist_ok=True)
quantized_model_path = Path(save_dir).joinpath(f"{self.onnx_model_path.stem}_{file_suffix}.onnx")
save_dir = Path(save_dir)
save_dir.mkdir(parents=True, exist_ok=True)

if not quantization_config.is_static:
if quantization_config.mode != QuantizationMode.IntegerOps:
Expand Down Expand Up @@ -343,6 +343,8 @@ def quantize(
LOGGER.info("Quantizing model...")
quantizer.quantize_model()

suffix = f"_{file_suffix}" if file_suffix else ""
quantized_model_path = save_dir.joinpath(f"{self.onnx_model_path.stem}{suffix}").with_suffix(".onnx")
LOGGER.info(f"Saving quantized model at: {save_dir} (external data format: " f"{use_external_data_format})")
quantizer.model.save_model_to_file(quantized_model_path, use_external_data_format)

Expand Down