Replace duplicate utilities with flutes

Author: huzecong

analyze_fails.py

@@ -6,6 +6,7 @@
 from collections import defaultdict
 from typing import Dict, List, Tuple
 
+import flutes
 import numpy as np
 from IPython import embed
 from tqdm import tqdm
@@ -58,7 +59,7 @@ def analyze_logs(path: str) -> Dict[str, InfoDict]:
 
 
 def main():
-    ghcc.utils.register_ipython_excepthook()
+    flutes.register_ipython_excepthook()
     random.seed(ghcc.__MAGIC__)
     np.random.seed(ghcc.__MAGIC__)
 

compare_logs.py

@@ -4,7 +4,7 @@
 from collections import defaultdict
 from typing import Dict, Tuple
 
-import ghcc
+import flutes
 
 DiffDict = Dict[str, Tuple[int, int]]
 
@@ -45,11 +45,11 @@ def parse_logs(path: str) -> Dict[str, Dict[str, int]]:
 def compare_logs(info_old: Dict[str, Dict[str, int]], info_new: Dict[str, Dict[str, int]]) -> Dict[str, DiffDict]:
     for repo_name in info_new:
         if repo_name not in info_old:
-            ghcc.log(f"{repo_name} missing in OLD log", "error")
+            flutes.log(f"{repo_name} missing in OLD log", "error")
     repo_diff: Dict[str, DiffDict] = defaultdict(dict)
     for repo_name in info_old:
         if repo_name not in info_new:
-            ghcc.log(f"{repo_name} missing in NEW", "error")
+            flutes.log(f"{repo_name} missing in NEW", "error")
             continue
         old_repo_info = info_old[repo_name]
         new_repo_info = info_new[repo_name]
@@ -61,7 +61,7 @@ def compare_logs(info_old: Dict[str, Dict[str, int]], info_new: Dict[str, Dict[s
                 difference.append(f"{tag} {old_val}->{new_val}")
                 repo_diff[repo_name][tag] = (old_val, new_val)
         if len(difference) > 0:
-            ghcc.log(f"{repo_name}: {', '.join(difference)}")
+            flutes.log(f"{repo_name}: {', '.join(difference)}")
     return repo_diff
 
 

ghcc/__init__.py

@@ -1,6 +1,5 @@
 from .compile import *
 from .database import *
-from .log import *
 from .repo import *
 from . import parse
 from . import utils

ghcc/compile.py

@@ -7,10 +7,11 @@
 from enum import Enum, auto
 from typing import Callable, Dict, Iterator, List, NamedTuple, Optional
 
+from flutes.run import run_command
+
 from .database import RepoDB
 from .repo import clean
 from .utils.docker import run_docker_command
-from .utils.run import run_command
 
 MOCK_PATH = os.path.abspath(os.path.join(os.path.split(__file__)[0], "..", "..", "scripts", "mock_path"))
 

ghcc/log.py

@@ -1,4 +1,4 @@
-from typing import Iterator, List, NamedTuple, Tuple
+from typing import Iterator, List, NamedTuple
 
 from pycparser.c_lexer import CLexer
 

ghcc/parse/lexer.py

@@ -5,14 +5,14 @@
 from typing import Dict, Optional, Set, Tuple
 
 import pycparser
+from flutes.fs import remove_prefix
+from flutes.run import run_command
 from pycparser import c_ast
 from pycparser.c_ast import Node as ASTNode
 from pycparser.c_generator import CGenerator
 from pycparser.c_parser import CParser
 
 from .lexer import LexerWrapper
-from ..utils.fs import remove_prefix
-from ..utils.run import run_command
 
 __all__ = [
     "FAKE_LIBC_PATH",

ghcc/parse/parser.py

@@ -5,7 +5,7 @@
 from enum import Enum, auto
 from typing import NamedTuple, Optional
 
-from .utils.run import run_command
+from flutes.run import run_command
 
 __all__ = [
     "CloneErrorType",

ghcc/repo.py

@@ -1,6 +1 @@
 from .docker import *
-from .exception import *
-from .fs import *
-from .functional import *
-from .multiproc import *
-from .run import *

ghcc/utils/__init__.py

@@ -4,8 +4,8 @@
 from pathlib import Path
 from typing import Dict, List, Optional, Tuple, Union
 
-from .run import CommandResult, error_wrapper, run_command
-from ..log import log
+from flutes.log import log
+from flutes.run import CommandResult, error_wrapper, run_command
 
 __all__ = [
     "run_docker_command",