Fix merge conflict in export_llama_lib.py

jackzhxng · web-flow · commit c22236e0e3e6 · 2025-06-10T07:14:05.000-07:00
diff --git a/examples/models/llama/export_llama_lib.py b/examples/models/llama/export_llama_lib.py
@@ -52,7 +52,6 @@
     get_vulkan_quantizer,
 )
 from executorch.util.activation_memory_profiler import generate_memory_trace
-from omegaconf.dictconfig import DictConfig
 
 from ..model_factory import EagerModelFactory
 from .source_transformation.apply_spin_quant_r1_r2 import (

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,6 @@`
`52`	`52`	`get_vulkan_quantizer,`
`53`	`53`	`)`
`54`	`54`	`from executorch.util.activation_memory_profiler import generate_memory_trace`
`55`		`-from omegaconf.dictconfig import DictConfig`
`56`	`55`
`57`	`56`	`from ..model_factory import EagerModelFactory`
`58`	`57`	`from .source_transformation.apply_spin_quant_r1_r2 import (`