Rename all imports

As title

numba_scfg/__init__.py

@@ -1,4 +1,4 @@
-from numba_rvsdg.core.datastructures.ast_transforms import (  # noqa
+from numba_scfg.core.datastructures.ast_transforms import (  # noqa
     AST2SCFG,
     SCFG2AST,
 )

numba_scfg/core/datastructures/ast_transforms.py

@@ -6,8 +6,8 @@
 from dataclasses import dataclass
 from collections import defaultdict
 
-from numba_rvsdg.core.datastructures.scfg import SCFG
-from numba_rvsdg.core.datastructures.basic_block import (
+from numba_scfg.core.datastructures.scfg import SCFG
+from numba_scfg.core.datastructures.basic_block import (
     PythonASTBlock,
     RegionBlock,
     SyntheticHead,

numba_scfg/core/datastructures/basic_block.py

@@ -3,8 +3,8 @@
 from typing import Tuple, Dict, List, Optional
 from dataclasses import dataclass, replace, field
 
-from numba_rvsdg.core.utils import _next_inst_offset
-from numba_rvsdg.core.datastructures import block_names
+from numba_scfg.core.utils import _next_inst_offset
+from numba_scfg.core.datastructures import block_names
 
 
 @dataclass(frozen=True)

numba_scfg/core/datastructures/byte_flow.py

@@ -2,9 +2,9 @@
 from dataclasses import dataclass
 from typing import Callable
 
-from numba_rvsdg.core.datastructures.scfg import SCFG
-from numba_rvsdg.core.datastructures.flow_info import FlowInfo
-from numba_rvsdg.core.utils import _logger, _LogWrap
+from numba_scfg.core.datastructures.scfg import SCFG
+from numba_scfg.core.datastructures.flow_info import FlowInfo
+from numba_scfg.core.utils import _logger, _LogWrap
 
 
 @dataclass(frozen=True)

numba_scfg/core/datastructures/flow_info.py

@@ -3,10 +3,10 @@
 from typing import Set, Tuple, Dict, Sequence, Optional
 from dataclasses import dataclass, field
 
-from numba_rvsdg.core.datastructures.basic_block import PythonBytecodeBlock
-from numba_rvsdg.core.datastructures import block_names
-from numba_rvsdg.core.datastructures.scfg import SCFG
-from numba_rvsdg.core.utils import (
+from numba_scfg.core.datastructures.basic_block import PythonBytecodeBlock
+from numba_scfg.core.datastructures import block_names
+from numba_scfg.core.datastructures.scfg import SCFG
+from numba_scfg.core.utils import (
     is_conditional_jump,
     _next_inst_offset,
     is_unconditional_jump,

numba_scfg/core/datastructures/scfg.py

@@ -17,7 +17,7 @@
 from dataclasses import dataclass, field
 from collections import deque
 
-from numba_rvsdg.core.datastructures.basic_block import (
+from numba_scfg.core.datastructures.basic_block import (
     BasicBlock,
     SyntheticBlock,
     SyntheticAssignment,
@@ -31,7 +31,7 @@
     SyntheticBranch,
     block_type_names,
 )
-from numba_rvsdg.core.datastructures.block_names import (
+from numba_scfg.core.datastructures.block_names import (
     block_types,
     SYNTH_TAIL,
     SYNTH_EXIT,
@@ -329,7 +329,7 @@ def compute_scc(self) -> List[Set[str]]:
 
         This method of SCFG computes the strongly connected components of
         the graph using Tarjan's algorithm. The implementation is at the
-        scc function from the numba_rvsdg.networkx_vendored.scc module.
+        scc function from the numba_scfg.networkx_vendored.scc module.
         It returns a list of sets, where each set represents an SCC in
         the graph. SCCs are useful for detecting loops in the graph.
 
@@ -338,7 +338,7 @@ def compute_scc(self) -> List[Set[str]]:
         components: List[Set[str]]
             A list of sets of strongly connected components/BasicBlocks.
         """
-        from numba_rvsdg.networkx_vendored.scc import scc
+        from numba_scfg.networkx_vendored.scc import scc
 
         class GraphWrap:
             def __init__(self, graph: Mapping[str, BasicBlock]) -> None:
@@ -563,7 +563,7 @@ def insert_SyntheticExit(
 
         See also
         --------
-        numba_rvsdg.core.datastructures.scfg.SCFG.insert_block
+        numba_scfg.core.datastructures.scfg.SCFG.insert_block
         """
         self.insert_block(new_name, predecessors, successors, SyntheticExit)
 
@@ -578,7 +578,7 @@ def insert_SyntheticTail(
 
         See also
         --------
-        numba_rvsdg.core.datastructures.scfg.SCFG.insert_block
+        numba_scfg.core.datastructures.scfg.SCFG.insert_block
         """
         self.insert_block(new_name, predecessors, successors, SyntheticTail)
 
@@ -593,7 +593,7 @@ def insert_SyntheticReturn(
 
         See also
         --------
-        numba_rvsdg.core.datastructures.scfg.SCFG.insert_block
+        numba_scfg.core.datastructures.scfg.SCFG.insert_block
         """
         self.insert_block(new_name, predecessors, successors, SyntheticReturn)
 
@@ -608,7 +608,7 @@ def insert_SyntheticFill(
 
         See also
         --------
-        numba_rvsdg.core.datastructures.scfg.SCFG.insert_block
+        numba_scfg.core.datastructures.scfg.SCFG.insert_block
         """
         self.insert_block(new_name, predecessors, successors, SyntheticFill)
 
@@ -621,7 +621,7 @@ def insert_block_and_control_blocks(
 
         See also
         --------
-        numba_rvsdg.core.datastructures.scfg.SCFG.insert_block
+        numba_scfg.core.datastructures.scfg.SCFG.insert_block
         """
         # TODO: needs a diagram and documentaion
         # name of the variable for this branching assignment
@@ -707,7 +707,7 @@ def restructure_loop(self) -> None:
 
         """
         # Avoid cyclic imports
-        from numba_rvsdg.core.transformations import restructure_loop
+        from numba_scfg.core.transformations import restructure_loop
 
         restructure_loop(self.region)
         for region in self.iter_subregions():
@@ -723,7 +723,7 @@ def restructure_branch(self) -> None:
 
         """
         # Avoid cyclic imports
-        from numba_rvsdg.core.transformations import restructure_branch
+        from numba_scfg.core.transformations import restructure_branch
 
         restructure_branch(self.region)
         for region in self.iter_subregions():
@@ -813,7 +813,7 @@ def view(self, name: Optional[str] = None) -> None:
         name: str
             Name to be given to the external graphviz generated PDF file.
         """
-        from numba_rvsdg.rendering.rendering import SCFGRenderer
+        from numba_scfg.rendering.rendering import SCFGRenderer
 
         SCFGRenderer(self).view(name)
 
@@ -849,7 +849,7 @@ def from_yaml(yaml_string: str) -> "Tuple[SCFG, Dict[str, str]]":
 
         See also
         --------
-        numba_rvsdg.core.datastructures.scfg.SCFGIO.from_yaml()
+        numba_scfg.core.datastructures.scfg.SCFGIO.from_yaml()
         """
         return SCFGIO.from_yaml(yaml_string)
 
@@ -884,7 +884,7 @@ def from_dict(
 
         See also
         --------
-        numba_rvsdg.core.datastructures.scfg.SCFGIO.from_dict()
+        numba_scfg.core.datastructures.scfg.SCFGIO.from_dict()
         """
         return SCFGIO.from_dict(graph_dict)
 
@@ -906,7 +906,7 @@ def to_yaml(self) -> str:
 
         See also
         --------
-        numba_rvsdg.core.datastructures.scfg.SCFGIO.to_yaml()
+        numba_scfg.core.datastructures.scfg.SCFGIO.to_yaml()
         """
         return SCFGIO.to_yaml(self)
 
@@ -928,7 +928,7 @@ def to_dict(self) -> Dict[str, Dict[str, Any]]:
 
         See also
         --------
-        numba_rvsdg.core.datastructures.scfg.SCFGIO.to_dict()
+        numba_scfg.core.datastructures.scfg.SCFGIO.to_dict()
         """
         return SCFGIO.to_dict(self)
 

numba_scfg/core/transformations.py

@@ -1,18 +1,18 @@
 from collections import defaultdict
 from typing import Set, Dict, List, Tuple, Optional, Mapping, Iterator
 
-from numba_rvsdg.core.datastructures.scfg import SCFG
-from numba_rvsdg.core.datastructures.basic_block import (
+from numba_scfg.core.datastructures.scfg import SCFG
+from numba_scfg.core.datastructures.basic_block import (
     BasicBlock,
     SyntheticAssignment,
     SyntheticBranch,
     SyntheticExitingLatch,
     SyntheticExitBranch,
     RegionBlock,
 )
-from numba_rvsdg.core.datastructures import block_names
+from numba_scfg.core.datastructures import block_names
 
-from numba_rvsdg.core.utils import _logger
+from numba_scfg.core.utils import _logger
 
 
 def loop_restructure_helper(scfg: SCFG, loop: Set[str]) -> None:

numba_scfg/rendering/rendering.py

@@ -1,7 +1,7 @@
 import ast
 import logging
 from abc import abstractmethod
-from numba_rvsdg.core.datastructures.basic_block import (
+from numba_scfg.core.datastructures.basic_block import (
     BasicBlock,
     RegionBlock,
     PythonBytecodeBlock,
@@ -10,8 +10,8 @@
     SyntheticBranch,
     SyntheticBlock,
 )
-from numba_rvsdg.core.datastructures.scfg import SCFG
-from numba_rvsdg.core.datastructures.byte_flow import ByteFlow
+from numba_scfg.core.datastructures.scfg import SCFG
+from numba_scfg.core.datastructures.byte_flow import ByteFlow
 import dis
 from typing import Dict, Optional
 from graphviz import Digraph

numba_scfg/tests/simulator.py

@@ -2,13 +2,13 @@
 
 from collections import ChainMap
 from dis import Instruction
-from numba_rvsdg.core.datastructures.byte_flow import ByteFlow
-from numba_rvsdg.core.datastructures.basic_block import (
+from numba_scfg.core.datastructures.byte_flow import ByteFlow
+from numba_scfg.core.datastructures.basic_block import (
     PythonBytecodeBlock,
     RegionBlock,
     SyntheticBlock,
 )
-from numba_rvsdg.core.utils import PYVERSION
+from numba_scfg.core.utils import PYVERSION
 
 import builtins
 

numba_scfg/tests/test_ast_transforms.py

@@ -5,7 +5,7 @@
 from unittest import main, TestCase
 from sys import monitoring as sm
 
-from numba_rvsdg.core.datastructures.ast_transforms import (
+from numba_scfg.core.datastructures.ast_transforms import (
     unparse_code,
     AST2SCFGTransformer,
     SCFG2ASTTransformer,

numba_scfg/tests/test_byteflow.py

@@ -1,11 +1,11 @@
 # mypy: ignore-errors
 from dis import Bytecode, Instruction, Positions
 import unittest
-from numba_rvsdg.core.datastructures.basic_block import PythonBytecodeBlock
-from numba_rvsdg.core.datastructures.byte_flow import ByteFlow
-from numba_rvsdg.core.datastructures.scfg import SCFG, NameGenerator
-from numba_rvsdg.core.datastructures.flow_info import FlowInfo
-from numba_rvsdg.core.datastructures import block_names
+from numba_scfg.core.datastructures.basic_block import PythonBytecodeBlock
+from numba_scfg.core.datastructures.byte_flow import ByteFlow
+from numba_scfg.core.datastructures.scfg import SCFG, NameGenerator
+from numba_scfg.core.datastructures.flow_info import FlowInfo
+from numba_scfg.core.datastructures import block_names
 
 
 def fun():

numba_scfg/tests/test_figures.py

@@ -1,8 +1,8 @@
 # mypy: ignore-errors
 
-from numba_rvsdg.core.datastructures.flow_info import FlowInfo
-from numba_rvsdg.core.datastructures.scfg import SCFG
-from numba_rvsdg.tests.test_utils import SCFGComparator
+from numba_scfg.core.datastructures.flow_info import FlowInfo
+from numba_scfg.core.datastructures.scfg import SCFG
+from numba_scfg.tests.test_utils import SCFGComparator
 import dis
 
 fig_3_yaml = """

numba_scfg/tests/test_rendering.py

@@ -4,8 +4,8 @@
 # Also ignore types, since we don't type annotate tests.
 # mypy: ignore-errors
 
-from numba_rvsdg.core.datastructures.scfg import SCFG
-from numba_rvsdg.rendering.rendering import SCFGRenderer
+from numba_scfg.core.datastructures.scfg import SCFG
+from numba_scfg.rendering.rendering import SCFGRenderer
 
 expected_original = r"""digraph {
 	0 [label="0\n

numba_scfg/tests/test_scc.py

@@ -1,7 +1,7 @@
 # mypy: ignore-errors
 
-from numba_rvsdg.core.datastructures.byte_flow import ByteFlow
-from numba_rvsdg.rendering.rendering import render_flow
+from numba_scfg.core.datastructures.byte_flow import ByteFlow
+from numba_scfg.rendering.rendering import render_flow
 
 
 def scc(G):

numba_scfg/tests/test_scfg.py

@@ -2,16 +2,16 @@
 
 from unittest import main, TestCase
 from textwrap import dedent
-from numba_rvsdg.core.datastructures.scfg import SCFG, NameGenerator
+from numba_scfg.core.datastructures.scfg import SCFG, NameGenerator
 
-from numba_rvsdg.tests.test_utils import SCFGComparator
-from numba_rvsdg.core.datastructures.basic_block import (
+from numba_scfg.tests.test_utils import SCFGComparator
+from numba_scfg.core.datastructures.basic_block import (
     BasicBlock,
     RegionBlock,
     PythonBytecodeBlock,
 )
-from numba_rvsdg.core.datastructures.byte_flow import ByteFlow
-from numba_rvsdg.core.datastructures import block_names
+from numba_scfg.core.datastructures.byte_flow import ByteFlow
+from numba_scfg.core.datastructures import block_names
 
 
 class TestSCFGConversion(SCFGComparator):

numba_scfg/tests/test_simulate.py

@@ -1,7 +1,7 @@
 # mypy: ignore-errors
 
-from numba_rvsdg.core.datastructures.byte_flow import ByteFlow
-from numba_rvsdg.tests.simulator import Simulator
+from numba_scfg.core.datastructures.byte_flow import ByteFlow
+from numba_scfg.tests.simulator import Simulator
 import unittest
 
 #    flow = ByteFlow.from_bytecode(foo)

numba_scfg/tests/test_transforms.py

@@ -2,11 +2,11 @@
 
 from unittest import main
 
-from numba_rvsdg.core.datastructures.scfg import SCFG
-from numba_rvsdg.core.datastructures.basic_block import BasicBlock
-from numba_rvsdg.core.transformations import loop_restructure_helper
-from numba_rvsdg.tests.test_utils import SCFGComparator
-from numba_rvsdg.core.datastructures import block_names
+from numba_scfg.core.datastructures.scfg import SCFG
+from numba_scfg.core.datastructures.basic_block import BasicBlock
+from numba_scfg.core.transformations import loop_restructure_helper
+from numba_scfg.tests.test_utils import SCFGComparator
+from numba_scfg.core.datastructures import block_names
 
 
 class TestInsertBlock(SCFGComparator):

numba_scfg/tests/test_utils.py

@@ -3,8 +3,8 @@
 from unittest import TestCase
 import yaml
 
-from numba_rvsdg.core.datastructures.scfg import SCFG
-from numba_rvsdg.core.datastructures.basic_block import (
+from numba_scfg.core.datastructures.scfg import SCFG
+from numba_scfg.core.datastructures.basic_block import (
     BasicBlock,
     RegionBlock,
     SyntheticBranch,