Fix up imports in kernel dir.

kernel/modelverse_jit/bytecode_interpreter.py

@@ -1,8 +1,8 @@
 """Interprets parsed bytecode graphs."""
 
-import kernel.modelverse_jit.bytecode_ir as bytecode_ir
-import kernel.modelverse_jit.runtime as jit_runtime
-import kernel.modelverse_kernel.primitives as primitive_functions
+import modelverse_jit.bytecode_ir as bytecode_ir
+import modelverse_jit.runtime as jit_runtime
+import modelverse_kernel.primitives as primitive_functions
 
 class BreakException(Exception):
     """A type of exception that is used to interpret 'break' instructions:

kernel/modelverse_jit/bytecode_parser.py

@@ -1,8 +1,8 @@
 """Parses Modelverse bytecode graphs into bytecode ir."""
 
-import kernel.modelverse_jit.bytecode_ir as bytecode_ir
-import kernel.modelverse_jit.runtime as jit_runtime
-import kernel.modelverse_kernel.primitives as primitive_functions
+import modelverse_jit.bytecode_ir as bytecode_ir
+import modelverse_jit.runtime as jit_runtime
+import modelverse_kernel.primitives as primitive_functions
 
 class BytecodeParser(object):
     """Parses bytecode graphs."""

kernel/modelverse_jit/bytecode_to_cfg.py

@@ -1,8 +1,8 @@
 """Converts bytecode IR to CFG IR."""
 
-import kernel.modelverse_jit.bytecode_ir as bytecode_ir
-import kernel.modelverse_jit.cfg_ir as cfg_ir
-import kernel.modelverse_jit.runtime as jit_runtime
+import modelverse_jit.bytecode_ir as bytecode_ir
+import modelverse_jit.cfg_ir as cfg_ir
+import modelverse_jit.runtime as jit_runtime
 
 def emit_debug_info_trace(block, debug_info, function_name):
     """Appends a tracing instruction to the given block that prints

kernel/modelverse_jit/bytecode_to_tree.py

@@ -1,9 +1,9 @@
 """Naively converts bytecode IR to tree IR."""
 
-import kernel.modelverse_jit.bytecode_ir as bytecode_ir
-import kernel.modelverse_jit.tree_ir as tree_ir
-import kernel.modelverse_jit.runtime as jit_runtime
-import kernel.modelverse_kernel.primitives as primitive_functions
+import modelverse_jit.bytecode_ir as bytecode_ir
+import modelverse_jit.tree_ir as tree_ir
+import modelverse_jit.runtime as jit_runtime
+import modelverse_kernel.primitives as primitive_functions
 
 def get_parameter_names(compiled_function):
     """Gets the given compiled function's parameter names."""

kernel/modelverse_jit/cfg_data_structures.py

@@ -1,6 +1,6 @@
 """Defines optimizations that replace Modelverse data structures by Python data structures."""
 
-import kernel.modelverse_jit.cfg_ir as cfg_ir
+import modelverse_jit.cfg_ir as cfg_ir
 
 SET_DEF_REWRITE_RULES = {
     'dict_keys':

kernel/modelverse_jit/cfg_dominators.py

@@ -1,7 +1,7 @@
 """Computes dominator trees for control-flow graphs."""
 
 from collections import defaultdict
-import kernel.modelverse_jit.cfg_ir as cfg_ir
+import modelverse_jit.cfg_ir as cfg_ir
 
 def sort_postorder(entry_point):
     """Produces a postorder traversal of the graph with the given block as entry point."""

kernel/modelverse_jit/cfg_optimization.py

@@ -1,11 +1,11 @@
 """Optimizes and analyzes CFG-IR."""
 
 from collections import defaultdict
-import kernel.modelverse_jit.cfg_ir as cfg_ir
-import kernel.modelverse_jit.cfg_dominators as cfg_dominators
-import kernel.modelverse_jit.cfg_ssa_construction as cfg_ssa_construction
-import kernel.modelverse_jit.cfg_data_structures as cfg_data_structures
-import kernel.modelverse_kernel.primitives as primitive_functions
+import modelverse_jit.cfg_ir as cfg_ir
+import modelverse_jit.cfg_dominators as cfg_dominators
+import modelverse_jit.cfg_ssa_construction as cfg_ssa_construction
+import modelverse_jit.cfg_data_structures as cfg_data_structures
+import modelverse_kernel.primitives as primitive_functions
 
 def is_empty_block(block):
     """Tests if the given block contains no parameters or definitions."""

kernel/modelverse_jit/cfg_ssa_construction.py

@@ -1,7 +1,7 @@
 """Converts 'declare-local', 'load' and 'store' instructions into SSA form."""
 
 from collections import defaultdict
-import kernel.modelverse_jit.cfg_ir as cfg_ir
+import modelverse_jit.cfg_ir as cfg_ir
 
 def get_local_id(def_or_value):
     """Gets the node of the local resolved or declared by the given definition or value.

kernel/modelverse_jit/cfg_to_tree.py

@@ -1,9 +1,9 @@
 """Lowers CFG-IR to tree-IR."""
 
-import kernel.modelverse_jit.cfg_ir as cfg_ir
-import kernel.modelverse_jit.tree_ir as tree_ir
-import kernel.modelverse_jit.runtime as jit_runtime
-import kernel.modelverse_jit.bytecode_to_tree as bytecode_to_tree
+import modelverse_jit.cfg_ir as cfg_ir
+import modelverse_jit.tree_ir as tree_ir
+import modelverse_jit.runtime as jit_runtime
+import modelverse_jit.bytecode_to_tree as bytecode_to_tree
 
 # The CFG deconstruction code here is based on the relooper algorithm
 # as detailed in https://github.com/kripken/Relooper/blob/master/paper.pdf

kernel/modelverse_jit/intrinsics.py

@@ -1,8 +1,8 @@
 import time
-import kernel.modelverse_jit.jit as jit
-import kernel.modelverse_jit.tree_ir as tree_ir
-import kernel.modelverse_jit.cfg_ir as cfg_ir
-import kernel.modelverse_jit.runtime as jit_runtime
+import modelverse_jit.jit as jit
+import modelverse_jit.tree_ir as tree_ir
+import modelverse_jit.cfg_ir as cfg_ir
+import modelverse_jit.runtime as jit_runtime
 
 BINARY_INTRINSICS = {
     'value_eq' : '==',

kernel/modelverse_jit/jit.py

@@ -1,17 +1,17 @@
 import math
 import keyword
 from collections import defaultdict
-import kernel.modelverse_kernel.primitives as primitive_functions
-import kernel.modelverse_jit.bytecode_parser as bytecode_parser
-import kernel.modelverse_jit.bytecode_to_tree as bytecode_to_tree
-import kernel.modelverse_jit.bytecode_to_cfg as bytecode_to_cfg
-import kernel.modelverse_jit.bytecode_ir as bytecode_ir
-import kernel.modelverse_jit.bytecode_interpreter as bytecode_interpreter
-import kernel.modelverse_jit.cfg_optimization as cfg_optimization
-import kernel.modelverse_jit.cfg_to_tree as cfg_to_tree
-import kernel.modelverse_jit.cfg_ir as cfg_ir
-import kernel.modelverse_jit.tree_ir as tree_ir
-import kernel.modelverse_jit.runtime as jit_runtime
+import modelverse_kernel.primitives as primitive_functions
+import modelverse_jit.bytecode_parser as bytecode_parser
+import modelverse_jit.bytecode_to_tree as bytecode_to_tree
+import modelverse_jit.bytecode_to_cfg as bytecode_to_cfg
+import modelverse_jit.bytecode_ir as bytecode_ir
+import modelverse_jit.bytecode_interpreter as bytecode_interpreter
+import modelverse_jit.cfg_optimization as cfg_optimization
+import modelverse_jit.cfg_to_tree as cfg_to_tree
+import modelverse_jit.cfg_ir as cfg_ir
+import modelverse_jit.tree_ir as tree_ir
+import modelverse_jit.runtime as jit_runtime
 
 # Import JitCompilationFailedException because it used to be defined
 # in this module.

kernel/modelverse_jit/jit_primitives.py

@@ -1,6 +1,6 @@
 """Primitive functions that interface with the Modelverse JIT."""
 
-import kernel.modelverse_kernel.primitives as primitive_functions
+import modelverse_kernel.primitives as primitive_functions
 
 # pylint: disable=I0011,C0103
 

kernel/modelverse_jit/runtime.py

@@ -1,4 +1,4 @@
-import kernel.modelverse_kernel.primitives as primitive_functions
+import modelverse_kernel.primitives as primitive_functions
 
 class JitCompilationFailedException(Exception):
     """A type of exception that is raised when the jit fails to compile a function."""

kernel/modelverse_jit/tree_ir.py

@@ -28,7 +28,7 @@
 # Let's just agree to disagree on map vs list comprehensions, pylint.
 # pylint: disable=I0011,W0141
 
-import kernel.modelverse_jit.source_map as source_map
+import modelverse_jit.source_map as source_map
 import sys
 
 PROFILING = False

kernel/modelverse_kernel/compiled.py

@@ -1,5 +1,5 @@
-from kernel.modelverse_kernel.primitives import PrimitiveFinished
-import kernel.modelverse_jit.runtime as jit_runtime
+from modelverse_kernel.primitives import PrimitiveFinished
+import modelverse_jit.runtime as jit_runtime
 import time
 
 def get_superclasses(a, b, **remainder):

kernel/modelverse_kernel/legacy.py

@@ -1,8 +1,8 @@
 """A legacy version of the Modelverse kernel. This kernel can be used as a baseline for the
 performance of newer kernels."""
 
-import kernel.modelverse_kernel.primitives as primitive_functions
-import kernel.modelverse_kernel.compiled as compiled_functions
+import modelverse_kernel.primitives as primitive_functions
+import modelverse_kernel.compiled as compiled_functions
 from collections import defaultdict
 import sys
 import time

kernel/modelverse_kernel/main.py

@@ -1,10 +1,10 @@
-import kernel.modelverse_kernel.primitives as primitive_functions
-import kernel.modelverse_kernel.compiled as compiled_functions
-from kernel.modelverse_kernel.request_handler import RequestHandler
-import kernel.modelverse_jit.jit as jit
-import kernel.modelverse_jit.intrinsics as jit_intrinsics
-import kernel.modelverse_jit.jit_primitives as jit_primitives
-import kernel.modelverse_jit.runtime as jit_runtime
+import modelverse_kernel.primitives as primitive_functions
+import modelverse_kernel.compiled as compiled_functions
+from modelverse_kernel.request_handler import RequestHandler
+import modelverse_jit.jit as jit
+import modelverse_jit.intrinsics as jit_intrinsics
+import modelverse_jit.jit_primitives as jit_primitives
+import modelverse_jit.runtime as jit_runtime
 from collections import defaultdict
 import sys
 import time

kernel/modelverse_kernel/request_handler.py

@@ -1,6 +1,6 @@
 import sys
-import kernel.modelverse_kernel.primitives as primitive_functions
-import kernel.modelverse_jit.runtime as jit_runtime
+import modelverse_kernel.primitives as primitive_functions
+import modelverse_jit.runtime as jit_runtime
 from collections import defaultdict
 
 class KnownRequestHandled(Exception):

kernel/test/rules/test_rules_input.py

@@ -1,6 +1,6 @@
 import unittest
-from kernel.modelverse_kernel.primitives import SleepKernel
-from kernel.modelverse_kernel.main import ModelverseKernel
+from modelverse_kernel.primitives import SleepKernel
+from modelverse_kernel.main import ModelverseKernel
 from test.utils import execute_until_finished, MvSWrapper
 
 class TestInput(unittest.TestCase):