77# pyre-strict
88
99import logging
10+ import warnings
1011from pathlib import Path
1112from typing import Optional
1213
4546from torch .export .exported_program import ExportedProgram
4647from torchao .quantization .pt2e .quantize_pt2e import convert_pt2e
4748
48- from .pass_utils import (
49- CompileMode ,
50- EdgePassesConfig ,
51- normalize_compile_mode ,
52- resolve_opt_level ,
53- )
49+ from .pass_utils import CompileMode , EdgePassesConfig
5450from .passes import apply_exir_ops_passes , apply_torch_ops_passes
5551from .utils import print_ops_info
5652
@@ -366,19 +362,47 @@ def quantize_and_export_to_edge(
366362 )
367363
368364
365+ _DEPRECATED_OPT_LEVEL_TO_MODE : dict [int , CompileMode ] = {
366+ 0 : CompileMode .MINIMAL ,
367+ 1 : CompileMode .DEFAULT ,
368+ 2 : CompileMode .DEFAULT ,
369+ 3 : CompileMode .DEFAULT ,
370+ 4 : CompileMode .SIZE ,
371+ }
372+
373+
374+ def _resolve_mode (mode : CompileMode , opt_level : Optional [int ]) -> CompileMode :
375+ if opt_level is None :
376+ return mode
377+ if opt_level not in _DEPRECATED_OPT_LEVEL_TO_MODE :
378+ raise ValueError (
379+ f"opt_level={ opt_level } is not a known optimization level; "
380+ f"use mode=CompileMode.{{MINIMAL,DEFAULT,SIZE}} instead."
381+ )
382+ resolved = _DEPRECATED_OPT_LEVEL_TO_MODE [opt_level ]
383+ warnings .warn (
384+ f"opt_level is deprecated; pass mode=CompileMode.{ resolved .name } instead. "
385+ f"Note that opt_level={ opt_level } now maps to CompileMode.{ resolved .name } , "
386+ "which runs every graph optimization (the former O3) rather than the "
387+ "former O1/O2 subsets." ,
388+ DeprecationWarning ,
389+ stacklevel = 3 ,
390+ )
391+ return resolved
392+
393+
369394def _lower_ep_to_cadence (
370395 program : ExportedProgram ,
371396 dump_graphs : bool = False ,
372- mode : CompileMode | int | None = None ,
397+ mode : CompileMode = CompileMode . DEFAULT ,
373398 edge_passes_config : Optional [EdgePassesConfig ] = None ,
374- opt_level : Optional [int ] = None ,
375399) -> EdgeProgramManager :
376400 """
377401 Lower an existing ExportedProgram to edge IR and apply frontend optimization passes.
378402 """
379403 edge_prog_manager = _lower_ep_to_edge (program , dump_graphs = dump_graphs )
380404 cadence_prog_manager = apply_exir_ops_passes (
381- resolve_opt_level ( mode , opt_level ) , edge_prog_manager , edge_passes_config
405+ mode , edge_prog_manager , edge_passes_config
382406 )
383407 return cadence_prog_manager
384408
@@ -387,13 +411,13 @@ def export_to_cadence(
387411 model : torch .nn .Module ,
388412 inputs : tuple [object , ...],
389413 dump_graphs : bool = False ,
390- mode : CompileMode | int | None = None ,
414+ mode : CompileMode = CompileMode . DEFAULT ,
391415 edge_passes_config : Optional [EdgePassesConfig ] = None ,
392416 opt_level : Optional [int ] = None ,
393417) -> EdgeProgramManager :
394418 edge_prog_manager = export_to_edge (model , inputs , dump_graphs = dump_graphs )
395419 cadence_prog_manager = apply_exir_ops_passes (
396- resolve_opt_level (mode , opt_level ), edge_prog_manager , edge_passes_config
420+ _resolve_mode (mode , opt_level ), edge_prog_manager , edge_passes_config
397421 )
398422 return cadence_prog_manager
399423
@@ -402,7 +426,7 @@ def quantize_and_export_to_cadence(
402426 model : torch .nn .Module ,
403427 inputs : tuple [object , ...],
404428 dump_graphs : bool = False ,
405- mode : CompileMode | int | None = None ,
429+ mode : CompileMode = CompileMode . DEFAULT ,
406430 edge_passes_config : Optional [EdgePassesConfig ] = None ,
407431 opt_level : Optional [int ] = None ,
408432) -> EdgeProgramManager :
@@ -414,8 +438,7 @@ def quantize_and_export_to_cadence(
414438
415439 return _lower_ep_to_cadence (
416440 quantized_model ,
417- mode = mode ,
418- opt_level = opt_level ,
441+ mode = _resolve_mode (mode , opt_level ),
419442 dump_graphs = dump_graphs ,
420443 edge_passes_config = edge_passes_config ,
421444 )
@@ -425,7 +448,7 @@ def export_to_executorch_gen_etrecord(
425448 model : torch .nn .Module ,
426449 inputs : tuple [object , ...],
427450 output_dir : Optional [str ] = None ,
428- mode : CompileMode | int | None = None ,
451+ mode : CompileMode = CompileMode . DEFAULT ,
429452 mem_algo : int = 0 ,
430453 alloc_graph_input : bool = True ,
431454 alloc_graph_output : bool = True ,
@@ -437,8 +460,7 @@ def export_to_executorch_gen_etrecord(
437460 return _lower_ep_to_cadence_gen_etrecord (
438461 ep ,
439462 output_dir = output_dir ,
440- mode = mode ,
441- opt_level = opt_level ,
463+ mode = _resolve_mode (mode , opt_level ),
442464 mem_algo = mem_algo ,
443465 alloc_graph_input = alloc_graph_input ,
444466 alloc_graph_output = alloc_graph_output ,
@@ -453,18 +475,15 @@ def export_to_executorch_gen_etrecord(
453475def _lower_ep_to_cadence_gen_etrecord (
454476 ep : ExportedProgram ,
455477 output_dir : Optional [str ] = None ,
456- mode : CompileMode | int | None = None ,
478+ mode : CompileMode = CompileMode . DEFAULT ,
457479 mem_algo : int = 0 ,
458480 alloc_graph_input : bool = True ,
459481 alloc_graph_output : bool = True ,
460482 memory_config : Optional [MemoryConfig ] = None ,
461483 dump_graphs : bool = False ,
462- opt_level : Optional [int ] = None ,
463484) -> ExecutorchProgramManager :
464- normalized_mode = normalize_compile_mode (mode , opt_level )
465- resolved_opt_level = resolve_opt_level (normalized_mode )
466485 edge_prog_manager = _lower_ep_to_edge (ep , dump_graphs )
467- cadence_prog_manager = apply_exir_ops_passes (resolved_opt_level , edge_prog_manager )
486+ cadence_prog_manager = apply_exir_ops_passes (mode , edge_prog_manager )
468487
469488 # Print some information to terminal
470489 print_ops_info (
@@ -477,7 +496,7 @@ def _lower_ep_to_cadence_gen_etrecord(
477496
478497 memory_planning_pass = CadenceMemoryPlanning (
479498 memory_config ,
480- mode = normalized_mode ,
499+ mode = mode ,
481500 mem_algo = mem_algo ,
482501 alloc_graph_input = alloc_graph_input ,
483502 alloc_graph_output = alloc_graph_output ,
@@ -497,7 +516,7 @@ def _lower_ep_to_cadence_gen_etrecord(
497516 print_memory_planning_info (
498517 exec_prog ,
499518 memory_config ,
500- normalized_mode ,
519+ mode ,
501520 alloc_graph_input ,
502521 alloc_graph_output ,
503522 )
0 commit comments