fix the conflicts and pytest error

Signed-off-by: Bangtian Liu <[email protected]>

tuner/examples/test/tuner_test.py

@@ -91,7 +91,6 @@ def main():
 
     path_config = libtuner.PathConfig()
     path_config.base_dir.mkdir(parents=True, exist_ok=True)
-    path_config.output_unilog.touch()
     # TODO(Max191): Make candidate_trackers internal to TuningClient.
     candidate_trackers: list[libtuner.CandidateTracker] = []
     stop_after_phase: str = args.stop_after

tuner/tuner/common.py

@@ -10,12 +10,10 @@
 from types import TracebackType
 from typing import Optional
 from typing import Any
-from typing_extensions import Literal
 
 from iree.compiler import ir  # type: ignore
 
 from iree.compiler.dialects import iree_gpu  # type: ignore
-from iree.compiler.dialects import iree_codegen  # type: ignore
 
 
 class CommonTypes:

tuner/tuner/dispatch_parser_test.py

@@ -27,10 +27,7 @@ def tuner_ctx() -> Generator[common.TunerContext, None, None]:
     from logging import Logger
     from unittest.mock import MagicMock
 
-    # Mock the logger
     mock_logger = MagicMock(spec=Logger)
-
-    # Use TunerContext with the mocked logger
     with common.TunerContext(logger=mock_logger) as ctx:
         yield ctx
 

tuner/tuner/libtuner.py

@@ -18,15 +18,13 @@
 
 import math
 import signal
-import subprocess
 import sys
 import shutil
 import logging
 import argparse
 from datetime import datetime
 from enum import Enum
 from pathlib import Path
-import time
 import multiprocessing
 import queue
 from tqdm import tqdm
@@ -37,6 +35,7 @@
 import iree.runtime as ireert  # type: ignore
 import iree.compiler as ireec  # type: ignore
 from iree.compiler import ir  # type: ignore
+from iree.compiler.dialects import iree_codegen  # type: ignore
 from . import candidate_gen
 from . import dispatch_parser
 from .op_matchers import *