Skip to content

Commit 96b37a7

Browse files
authored
Merge branch 'main' into bhamehta/fix-telemetry-deadlock
2 parents 2b63059 + af26cc0 commit 96b37a7

15 files changed

Lines changed: 2502 additions & 365 deletions

docs/source/how-to/extending/custom-scripts.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class MyDataLoader:
3636

3737
@Registry.register_dataloader()
3838
def my_dataloader(dataset, batch_size):
39-
return MyDataloader(dataset, batch_size)
39+
return MyDataLoader(dataset, batch_size)
4040

4141
@Registry.register_post_process()
4242
def my_post_process(output):

mcp/uv.lock

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

olive/cache.py

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -439,13 +439,19 @@ def save_model(
439439
else:
440440
from olive.passes.onnx.common import resave_model
441441

442+
component_output_name = (
443+
component_name
444+
if Path(component_name).suffix == ".onnx"
445+
else f"{component_name}.onnx"
446+
)
447+
442448
resave_model(
443449
ModelConfig.model_validate(component_model_json).create_model().model_path,
444-
actual_output_dir / f"{component_name}.onnx",
450+
actual_output_dir / component_output_name,
445451
saved_external_files=saved_external_files,
446452
)
447453
component_model_json["config"][resource_name] = str(actual_output_dir)
448-
component_model_json["config"]["onnx_file_name"] = f"{component_name}.onnx"
454+
component_model_json["config"]["onnx_file_name"] = component_output_name
449455

450456
copied_components.append(component_model_json)
451457

olive/cli/auto_opt.py

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
# Copyright (c) Microsoft Corporation. All rights reserved.
33
# Licensed under the MIT License.
44
# --------------------------------------------------------------------------
5+
import logging
56
from argparse import ArgumentParser
67
from collections import OrderedDict
78
from copy import deepcopy
@@ -25,13 +26,19 @@
2526
from olive.package_config import OlivePackageConfig
2627
from olive.telemetry import action
2728

29+
logger = logging.getLogger(__name__)
30+
2831

2932
class AutoOptCommand(BaseOliveCLICommand):
3033
@staticmethod
3134
def register_subcommand(parser: ArgumentParser):
3235
sub_parser = parser.add_parser(
3336
"auto-opt",
34-
help="Automatically optimize the performance of the input model.",
37+
help=(
38+
"Automatically optimize the performance of the input model.\n"
39+
"**** DEPRECATION WARNING ****\n"
40+
'"auto-opt" command is deprecated in favor of "optimize".'
41+
),
3542
)
3643

3744
# Model options
@@ -174,6 +181,11 @@ def register_subcommand(parser: ArgumentParser):
174181

175182
@action
176183
def run(self):
184+
logger.warning(
185+
"**** DEPRECATION WARNING ****\n"
186+
'"auto-opt" command is deprecated in favor of "optimize". Please switch to using "optimize".\n'
187+
"Deprecated commands will be removed entirely in future release."
188+
)
177189
return self._run_workflow()
178190

179191
def _get_run_config(self, tempdir) -> dict:

0 commit comments

Comments
 (0)