Skip to content

Commit cb403a4

Browse files
committed
fix comments
1 parent c63e6f3 commit cb403a4

7 files changed

Lines changed: 38 additions & 13 deletions

File tree

scripts/e2e_eval/datasets/build_ai4privacy.py

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,16 @@ def build_dataset(output_dir: Path) -> None:
5959
print("Done.")
6060

6161

62+
_DEFAULT_CACHE_DIR = Path.home() / ".cache" / "winml" / "eval_datasets" / "build_ai4privacy"
63+
64+
6265
def main() -> None:
6366
parser = argparse.ArgumentParser(description="Build ai4privacy PII dataset")
64-
parser.add_argument("--output", type=Path, required=True, help="Output directory")
67+
parser.add_argument("--output", type=Path, default=None, help="Output directory (default: ~/.cache/winml/eval_datasets/build_ai4privacy)")
6568
args = parser.parse_args()
66-
build_dataset(args.output)
69+
output_dir = args.output or _DEFAULT_CACHE_DIR
70+
build_dataset(output_dir)
71+
print(output_dir)
6772

6873

6974
if __name__ == "__main__":

scripts/e2e_eval/datasets/build_fairface.py

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,11 +95,16 @@ def build_dataset(output_dir: Path) -> None:
9595
print("Done.")
9696

9797

98+
_DEFAULT_CACHE_DIR = Path.home() / ".cache" / "winml" / "eval_datasets" / "build_fairface"
99+
100+
98101
def main() -> None:
99102
parser = argparse.ArgumentParser(description="Build fairface validation dataset")
100-
parser.add_argument("--output", type=Path, required=True, help="Output directory")
103+
parser.add_argument("--output", type=Path, default=None, help="Output directory (default: ~/.cache/winml/eval_datasets/build_fairface)")
101104
args = parser.parse_args()
102-
build_dataset(args.output)
105+
output_dir = args.output or _DEFAULT_CACHE_DIR
106+
build_dataset(output_dir)
107+
print(output_dir)
103108

104109

105110
if __name__ == "__main__":

scripts/e2e_eval/datasets/build_indonlu_posp.py

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,16 @@ def build_dataset(output_dir: Path) -> None:
4444
print("Done.")
4545

4646

47+
_DEFAULT_CACHE_DIR = Path.home() / ".cache" / "winml" / "eval_datasets" / "build_indonlu_posp"
48+
49+
4750
def main() -> None:
4851
parser = argparse.ArgumentParser(description="Build indonlu posp dataset")
49-
parser.add_argument("--output", type=Path, required=True, help="Output directory")
52+
parser.add_argument("--output", type=Path, default=None, help="Output directory (default: ~/.cache/winml/eval_datasets/build_indonlu_posp)")
5053
args = parser.parse_args()
51-
build_dataset(args.output)
54+
output_dir = args.output or _DEFAULT_CACHE_DIR
55+
build_dataset(output_dir)
56+
print(output_dir)
5257

5358

5459
if __name__ == "__main__":

scripts/e2e_eval/datasets/build_pubtables1m_detection.py

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -198,11 +198,16 @@ def build_dataset(output_dir: Path) -> None:
198198
print("Done.")
199199

200200

201+
_DEFAULT_CACHE_DIR = Path.home() / ".cache" / "winml" / "eval_datasets" / "build_pubtables1m_detection"
202+
203+
201204
def main() -> None:
202205
parser = argparse.ArgumentParser(description="Build PubTables-1M detection dataset")
203-
parser.add_argument("--output", type=Path, required=True, help="Output directory")
206+
parser.add_argument("--output", type=Path, default=None, help="Output directory (default: ~/.cache/winml/eval_datasets/build_pubtables1m_detection)")
204207
args = parser.parse_args()
205-
build_dataset(args.output)
208+
output_dir = args.output or _DEFAULT_CACHE_DIR
209+
build_dataset(output_dir)
210+
print(output_dir)
206211

207212

208213
if __name__ == "__main__":

scripts/e2e_eval/datasets/build_pubtables1m_structure.py

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -206,11 +206,16 @@ def build_dataset(output_dir: Path) -> None:
206206
print("Done.")
207207

208208

209+
_DEFAULT_CACHE_DIR = Path.home() / ".cache" / "winml" / "eval_datasets" / "build_pubtables1m_structure"
210+
211+
209212
def main() -> None:
210213
parser = argparse.ArgumentParser(description="Build PubTables-1M structure recognition dataset")
211-
parser.add_argument("--output", type=Path, required=True, help="Output directory")
214+
parser.add_argument("--output", type=Path, default=None, help="Output directory (default: ~/.cache/winml/eval_datasets/build_pubtables1m_structure)")
212215
args = parser.parse_args()
213-
build_dataset(args.output)
216+
output_dir = args.output or _DEFAULT_CACHE_DIR
217+
build_dataset(output_dir)
218+
print(output_dir)
214219

215220

216221
if __name__ == "__main__":

src/winml/modelkit/commands/eval.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -226,9 +226,8 @@ def eval(
226226
raise click.ClickException(
227227
f"Dataset script failed: {result.stderr.strip()[-200:]}"
228228
)
229-
# Use script output (stdout) as dataset path if not already set
230229
script_output = result.stdout.strip()
231-
if script_output and not cli_utils.is_cli_provided(ctx, "dataset_path"):
230+
if script_output:
232231
dataset_path = script_output
233232

234233
if show_schema:

src/winml/modelkit/config/build.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
from typing import TYPE_CHECKING, Any, overload
5151

5252
from ..compiler.configs import WinMLCompileConfig
53+
from ..eval.config import WinMLEvaluationConfig
5354
from ..export.config import (
5455
InputTensorSpec,
5556
OutputTensorSpec,
@@ -58,7 +59,6 @@
5859
)
5960
from ..loader.config import WinMLLoaderConfig, resolve_loader_config
6061
from ..optim.config import WinMLOptimizationConfig
61-
from ..eval.config import WinMLEvaluationConfig
6262
from ..quant.config import WinMLQuantizationConfig
6363
from ..utils.config_utils import merge_config
6464

@@ -884,6 +884,7 @@ def _merge_export_config(
884884
dynamic_axes=(
885885
override.dynamic_axes if override.dynamic_axes is not None else base.dynamic_axes
886886
),
887+
dynamo=override.dynamo if override.dynamo else base.dynamo,
887888
)
888889

889890

0 commit comments

Comments
 (0)