Port kernel to Python 3. In particular, Python3 does not do automatic relative imports.

kernel/modelverse_jit/cfg_ssa_construction.py

@@ -261,7 +261,7 @@ class SSAConstructionState(object):
             # Sort the pairs by block parameter index.
             sorted_pairs = sorted(
                 applicable_pairs,
-                key=lambda (phi_def, _): phi_def.block.parameters.index(phi_def))
+                key=lambda phi_def: phi_def[0].block.parameters.index(phi_def[0]))
 
             # Append arguments to the branch.
             for _, arg in sorted_pairs:

kernel/modelverse_jit/source_map.py

@@ -20,7 +20,7 @@ class SourceMap(object):
     def __str__(self):
         return '\n'.join(
             ['%d: %s' % pair
-             for pair in sorted(self.lines.items(), key=lambda (key, _): key)])
+             for pair in sorted(self.lines.items(), key=lambda key: key[0])])
 
 class SourceMapBuilder(object):
     """A type of object that makes it easy to build source maps for hierarchical instructions."""

kernel/test/instructions/test_instruction_access.py

@@ -1,6 +1,6 @@
 import unittest
 from modelverse_kernel.main import ModelverseKernel
-from utils import execute_until_finished, MvSWrapper, get_inst, get_phase, get_returnvalue, get_returnvalue_ref
+from test.instructions.utils import execute_until_finished, MvSWrapper, get_inst, get_phase, get_returnvalue, get_returnvalue_ref
 
 class Testaccess(unittest.TestCase):
     def setUp(self):

kernel/test/instructions/test_instruction_assign.py

@@ -1,6 +1,6 @@
 import unittest
 from modelverse_kernel.main import ModelverseKernel
-from utils import execute_until_finished, MvSWrapper, get_inst, get_phase, get_returnvalue, get_returnvalue_ref, get_inst_ref
+from test.utils import execute_until_finished, MvSWrapper, get_inst, get_phase, get_returnvalue, get_returnvalue_ref, get_inst_ref
 
 class TestAssign(unittest.TestCase):
     def setUp(self):

kernel/test/instructions/test_instruction_break.py

@@ -1,6 +1,6 @@
 import unittest
 from modelverse_kernel.main import ModelverseKernel
-from utils import execute_until_finished, MvSWrapper, get_inst, get_phase, get_returnvalue
+from test.utils import execute_until_finished, MvSWrapper, get_inst, get_phase, get_returnvalue
 
 class TestBreak(unittest.TestCase):
     def setUp(self):

kernel/test/instructions/test_instruction_call.py

@@ -1,6 +1,6 @@
 import unittest
 from modelverse_kernel.main import ModelverseKernel
-from utils import execute_until_finished, MvSWrapper, get_inst, get_phase, get_returnvalue, get_phase_ref
+from test.utils import execute_until_finished, MvSWrapper, get_inst, get_phase, get_returnvalue, get_phase_ref
 
 class Testcall(unittest.TestCase):
     def setUp(self):

kernel/test/instructions/test_instruction_continue.py

@@ -1,6 +1,6 @@
 import unittest
 from modelverse_kernel.main import ModelverseKernel
-from utils import execute_until_finished, MvSWrapper, get_inst, get_phase, get_returnvalue
+from test.utils import execute_until_finished, MvSWrapper, get_inst, get_phase, get_returnvalue
 
 class Testcontinue(unittest.TestCase):
     def setUp(self):

kernel/test/instructions/test_instruction_declare.py

@@ -1,6 +1,6 @@
 import unittest
 from modelverse_kernel.main import ModelverseKernel
-from utils import execute_until_finished, MvSWrapper, get_inst, get_phase, get_returnvalue
+from test.utils import execute_until_finished, MvSWrapper, get_inst, get_phase, get_returnvalue
 
 class TestDeclare(unittest.TestCase):
     def setUp(self):

kernel/test/instructions/test_instruction_if.py

@@ -1,6 +1,6 @@
 import unittest
 from modelverse_kernel.main import ModelverseKernel
-from utils import execute_until_finished, MvSWrapper, get_inst, get_phase, get_returnvalue
+from test.utils import execute_until_finished, MvSWrapper, get_inst, get_phase, get_returnvalue
 
 class Testif(unittest.TestCase):
     def setUp(self):

kernel/test/instructions/test_instruction_input.py

@@ -1,6 +1,6 @@
 import unittest
 from modelverse_kernel.main import ModelverseKernel
-from utils import execute_until_finished, MvSWrapper, get_inst, get_phase, get_returnvalue_ref
+from test.utils import execute_until_finished, MvSWrapper, get_inst, get_phase, get_returnvalue_ref
 
 class TestInput(unittest.TestCase):
     def setUp(self):

kernel/test/instructions/test_instruction_output.py

@@ -1,6 +1,6 @@
 import unittest
 from modelverse_kernel.main import ModelverseKernel
-from utils import execute_until_finished, MvSWrapper, get_inst, get_phase, get_returnvalue_ref
+from test.utils import execute_until_finished, MvSWrapper, get_inst, get_phase, get_returnvalue_ref
 
 class TestOutput(unittest.TestCase):
     def setUp(self):

kernel/test/instructions/test_instruction_resolve.py

@@ -1,6 +1,6 @@
 import unittest
 from modelverse_kernel.main import ModelverseKernel
-from utils import execute_until_finished, MvSWrapper, get_inst, get_phase, get_returnvalue, get_returnvalue_ref, get_inst_ref
+from test.utils import execute_until_finished, MvSWrapper, get_inst, get_phase, get_returnvalue, get_returnvalue_ref, get_inst_ref
 
 class Testresolve(unittest.TestCase):
     def setUp(self):

kernel/test/instructions/test_instruction_return.py

@@ -1,6 +1,6 @@
 import unittest
 from modelverse_kernel.main import ModelverseKernel
-from utils import execute_until_finished, MvSWrapper, get_inst, get_phase, get_returnvalue
+from test.utils import execute_until_finished, MvSWrapper, get_inst, get_phase, get_returnvalue
 
 class Testreturn(unittest.TestCase):
     def setUp(self):

kernel/test/instructions/test_instruction_while.py

@@ -1,6 +1,6 @@
 import unittest
 from modelverse_kernel.main import ModelverseKernel
-from utils import execute_until_finished, MvSWrapper, get_inst, get_phase, get_returnvalue
+from test.utils import execute_until_finished, MvSWrapper, get_inst, get_phase, get_returnvalue
 
 class Testwhile(unittest.TestCase):
     def setUp(self):

kernel/test/primitives/test_action.py

@@ -1,6 +1,6 @@
 import unittest
 from modelverse_kernel.main import ModelverseKernel
-from utils import execute_until_finished, MvSWrapper, get_inst, get_phase, get_returnvalue, get_phase_ref, read_primitive_interfaces
+from test.utils import execute_until_finished, MvSWrapper, get_inst, get_phase, get_returnvalue, get_phase_ref, read_primitive_interfaces
 
 class TestAction(unittest.TestCase):
     def setUp(self):

kernel/test/primitives/test_bool.py

@@ -1,6 +1,6 @@
 import unittest
 from modelverse_kernel.main import ModelverseKernel
-from utils import execute_until_finished, MvSWrapper, get_inst, get_phase, get_returnvalue, get_phase_ref, read_primitive_interfaces
+from test.utils import execute_until_finished, MvSWrapper, get_inst, get_phase, get_returnvalue, get_phase_ref, read_primitive_interfaces
 
 class TestBool(unittest.TestCase):
     def setUp(self):

kernel/test/primitives/test_cast.py

@@ -1,6 +1,6 @@
 import unittest
 from modelverse_kernel.main import ModelverseKernel
-from utils import execute_until_finished, MvSWrapper, get_inst, get_phase, get_returnvalue, get_phase_ref, read_primitive_interfaces
+from test.utils import execute_until_finished, MvSWrapper, get_inst, get_phase, get_returnvalue, get_phase_ref, read_primitive_interfaces
 
 class TestCast(unittest.TestCase):
     def setUp(self):

kernel/test/primitives/test_create.py

@@ -1,6 +1,6 @@
 import unittest
 from modelverse_kernel.main import ModelverseKernel
-from utils import execute_until_finished, MvSWrapper, get_inst, get_phase, get_returnvalue, get_phase_ref, read_primitive_interfaces, get_returnvalue_ref
+from test.utils import execute_until_finished, MvSWrapper, get_inst, get_phase, get_returnvalue, get_phase_ref, read_primitive_interfaces, get_returnvalue_ref
 
 class TestCreate(unittest.TestCase):
     def setUp(self):

kernel/test/primitives/test_delete.py

@@ -1,6 +1,6 @@
 import unittest
 from modelverse_kernel.main import ModelverseKernel
-from utils import execute_until_finished, MvSWrapper, get_inst, get_phase, get_returnvalue, get_phase_ref, read_primitive_interfaces, get_returnvalue_ref
+from test.utils import execute_until_finished, MvSWrapper, get_inst, get_phase, get_returnvalue, get_phase_ref, read_primitive_interfaces, get_returnvalue_ref
 
 class TestDelete(unittest.TestCase):
     def setUp(self):

kernel/test/primitives/test_dict.py

@@ -1,6 +1,6 @@
 import unittest
 from modelverse_kernel.main import ModelverseKernel
-from utils import execute_until_finished, MvSWrapper, get_inst, get_phase, get_returnvalue, get_phase_ref, read_primitive_interfaces, get_returnvalue_ref
+from test.utils import execute_until_finished, MvSWrapper, get_inst, get_phase, get_returnvalue, get_phase_ref, read_primitive_interfaces, get_returnvalue_ref
 
 class TestDict(unittest.TestCase):
     def setUp(self):

kernel/test/primitives/test_dict_special.py

@@ -1,6 +1,6 @@
 import unittest
 from modelverse_kernel.main import ModelverseKernel
-from utils import execute_until_finished, MvSWrapper, get_inst, get_phase, get_returnvalue, get_phase_ref, read_primitive_interfaces, get_returnvalue_ref
+from test.utils import execute_until_finished, MvSWrapper, get_inst, get_phase, get_returnvalue, get_phase_ref, read_primitive_interfaces, get_returnvalue_ref
 
 class TestDictSpecials(unittest.TestCase):
     def setUp(self):

kernel/test/primitives/test_edge.py

@@ -1,6 +1,6 @@
 import unittest
 from modelverse_kernel.main import ModelverseKernel
-from utils import execute_until_finished, MvSWrapper, get_inst, get_phase, get_returnvalue, get_phase_ref, read_primitive_interfaces, get_returnvalue_ref
+from test.utils import execute_until_finished, MvSWrapper, get_inst, get_phase, get_returnvalue, get_phase_ref, read_primitive_interfaces, get_returnvalue_ref
 
 class TestEdge(unittest.TestCase):
     def setUp(self):

kernel/test/primitives/test_element.py

@@ -1,6 +1,6 @@
 import unittest
 from modelverse_kernel.main import ModelverseKernel
-from utils import execute_until_finished, MvSWrapper, get_inst, get_phase, get_returnvalue, get_phase_ref, read_primitive_interfaces
+from test.utils import execute_until_finished, MvSWrapper, get_inst, get_phase, get_returnvalue, get_phase_ref, read_primitive_interfaces
 
 class TestType(unittest.TestCase):
     def setUp(self):

kernel/test/primitives/test_float.py

@@ -1,6 +1,6 @@
 import unittest
 from modelverse_kernel.main import ModelverseKernel
-from utils import execute_until_finished, MvSWrapper, get_inst, get_phase, get_returnvalue, get_phase_ref, read_primitive_interfaces
+from test.utils import execute_until_finished, MvSWrapper, get_inst, get_phase, get_returnvalue, get_phase_ref, read_primitive_interfaces
 
 class TestInteger(unittest.TestCase):
     def setUp(self):

kernel/test/primitives/test_integer.py

@@ -1,6 +1,6 @@
 import unittest
 from modelverse_kernel.main import ModelverseKernel
-from utils import execute_until_finished, MvSWrapper, get_inst, get_phase, get_returnvalue, get_phase_ref, read_primitive_interfaces
+from test.utils import execute_until_finished, MvSWrapper, get_inst, get_phase, get_returnvalue, get_phase_ref, read_primitive_interfaces
 
 class TestInteger(unittest.TestCase):
     def setUp(self):

kernel/test/primitives/test_list.py

@@ -1,6 +1,6 @@
 import unittest
 from modelverse_kernel.main import ModelverseKernel
-from utils import execute_until_finished, MvSWrapper, get_inst, get_phase, get_returnvalue, get_phase_ref, read_primitive_interfaces, get_returnvalue_ref
+from test.utils import execute_until_finished, MvSWrapper, get_inst, get_phase, get_returnvalue, get_phase_ref, read_primitive_interfaces, get_returnvalue_ref
 
 class TestList(unittest.TestCase):
     def setUp(self):

kernel/test/primitives/test_read.py

@@ -1,6 +1,6 @@
 import unittest
 from modelverse_kernel.main import ModelverseKernel
-from utils import execute_until_finished, MvSWrapper, get_inst, get_phase, get_returnvalue, get_phase_ref, read_primitive_interfaces, get_returnvalue_ref
+from test.utils import execute_until_finished, MvSWrapper, get_inst, get_phase, get_returnvalue, get_phase_ref, read_primitive_interfaces, get_returnvalue_ref
 
 class TestRead(unittest.TestCase):
     def setUp(self):

kernel/test/primitives/test_string.py

@@ -1,6 +1,6 @@
 import unittest
 from modelverse_kernel.main import ModelverseKernel
-from utils import execute_until_finished, MvSWrapper, get_inst, get_phase, get_returnvalue, get_phase_ref, read_primitive_interfaces, get_returnvalue_ref
+from test.utils import execute_until_finished, MvSWrapper, get_inst, get_phase, get_returnvalue, get_phase_ref, read_primitive_interfaces, get_returnvalue_ref
 
 class TestString(unittest.TestCase):
     def setUp(self):

kernel/test/rules/test_rules_access.py

@@ -1,6 +1,6 @@
 import unittest
 from modelverse_kernel.main import ModelverseKernel
-from utils import execute_until_finished, MvSWrapper
+from test.utils import execute_until_finished, MvSWrapper
 
 class Testaccess(unittest.TestCase):
     def setUp(self):

kernel/test/rules/test_rules_assign.py

@@ -1,6 +1,6 @@
 import unittest
 from modelverse_kernel.main import ModelverseKernel
-from utils import execute_until_finished, MvSWrapper
+from test.utils import execute_until_finished, MvSWrapper
 
 class TestAssign(unittest.TestCase):
     def setUp(self):

kernel/test/rules/test_rules_break.py

@@ -1,6 +1,6 @@
 import unittest
 from modelverse_kernel.main import ModelverseKernel
-from utils import execute_until_finished, MvSWrapper
+from test.utils import execute_until_finished, MvSWrapper
 
 class Testbreak(unittest.TestCase):
     def setUp(self):

kernel/test/rules/test_rules_call.py

@@ -1,6 +1,6 @@
 import unittest
 from modelverse_kernel.main import ModelverseKernel
-from utils import execute_until_finished, MvSWrapper
+from test.utils import execute_until_finished, MvSWrapper
 
 class Testcall(unittest.TestCase):
     def setUp(self):

kernel/test/rules/test_rules_constant.py

@@ -1,6 +1,6 @@
 import unittest
 from modelverse_kernel.main import ModelverseKernel
-from utils import execute_until_finished, MvSWrapper
+from test.utils import execute_until_finished, MvSWrapper
 
 class Testconstant(unittest.TestCase):
     def setUp(self):

kernel/test/rules/test_rules_continue.py

@@ -1,6 +1,6 @@
 import unittest
 from modelverse_kernel.main import ModelverseKernel
-from utils import execute_until_finished, MvSWrapper
+from test.utils import execute_until_finished, MvSWrapper
 
 class Testcontinue(unittest.TestCase):
     def setUp(self):

kernel/test/rules/test_rules_helper.py

@@ -1,6 +1,6 @@
 import unittest
 from modelverse_kernel.main import ModelverseKernel
-from utils import execute_until_finished, MvSWrapper
+from test.utils import execute_until_finished, MvSWrapper
 
 class TestHelper(unittest.TestCase):
     def setUp(self):

kernel/test/rules/test_rules_if.py

@@ -1,6 +1,6 @@
 import unittest
 from modelverse_kernel.main import ModelverseKernel
-from utils import execute_until_finished, MvSWrapper
+from test.utils import execute_until_finished, MvSWrapper
 
 class Testif(unittest.TestCase):
     def setUp(self):

kernel/test/rules/test_rules_input.py

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

kernel/test/rules/test_rules_output.py

@@ -1,6 +1,6 @@
 import unittest
 from modelverse_kernel.main import ModelverseKernel
-from utils import execute_until_finished, MvSWrapper
+from test.utils import execute_until_finished, MvSWrapper
 
 class TestOutput(unittest.TestCase):
     def setUp(self):

kernel/test/rules/test_rules_resolve.py

@@ -1,6 +1,6 @@
 import unittest
 from modelverse_kernel.main import ModelverseKernel
-from utils import execute_until_finished, MvSWrapper
+from test.utils import execute_until_finished, MvSWrapper
 
 class Testresolve(unittest.TestCase):
     def setUp(self):

kernel/test/rules/test_rules_return.py

@@ -1,6 +1,6 @@
 import unittest
 from modelverse_kernel.main import ModelverseKernel
-from utils import execute_until_finished, MvSWrapper
+from test.utils import execute_until_finished, MvSWrapper
 
 class Testreturn(unittest.TestCase):
     def setUp(self):

kernel/test/rules/test_rules_while.py

@@ -1,6 +1,6 @@
 import unittest
 from modelverse_kernel.main import ModelverseKernel
-from utils import execute_until_finished, MvSWrapper
+from test.utils import execute_until_finished, MvSWrapper
 
 class Testwhile(unittest.TestCase):
     def setUp(self):

kernel/test_generated/instructions/test_instruction_access.py

@@ -1,6 +1,6 @@
 import unittest
 from modelverse_kernel.generated import ModelverseKernel
-from utils import execute_until_finished, MvSWrapper, get_inst, get_phase, get_returnvalue, get_returnvalue_ref
+from test_generated.utils import execute_until_finished, MvSWrapper, get_inst, get_phase, get_returnvalue, get_returnvalue_ref
 
 class Testaccess(unittest.TestCase):
     def setUp(self):

kernel/test_generated/instructions/test_instruction_assign.py

@@ -1,6 +1,6 @@
 import unittest
 from modelverse_kernel.generated import ModelverseKernel
-from utils import execute_until_finished, MvSWrapper, get_inst, get_phase, get_returnvalue, get_returnvalue_ref, get_inst_ref
+from test_generated.utils import execute_until_finished, MvSWrapper, get_inst, get_phase, get_returnvalue, get_returnvalue_ref, get_inst_ref
 
 class TestAssign(unittest.TestCase):
     def setUp(self):

kernel/test_generated/instructions/test_instruction_break.py

@@ -1,6 +1,6 @@
 import unittest
 from modelverse_kernel.generated import ModelverseKernel
-from utils import execute_until_finished, MvSWrapper, get_inst, get_phase, get_returnvalue
+from test_generated.utils import execute_until_finished, MvSWrapper, get_inst, get_phase, get_returnvalue
 
 class TestBreak(unittest.TestCase):
     def setUp(self):

kernel/test_generated/instructions/test_instruction_call.py

@@ -1,6 +1,6 @@
 import unittest
 from modelverse_kernel.generated import ModelverseKernel
-from utils import execute_until_finished, MvSWrapper, get_inst, get_phase, get_returnvalue, get_phase_ref
+from test_generated.utils import execute_until_finished, MvSWrapper, get_inst, get_phase, get_returnvalue, get_phase_ref
 
 class Testcall(unittest.TestCase):
     def setUp(self):

kernel/test_generated/instructions/test_instruction_continue.py

@@ -1,6 +1,6 @@
 import unittest
 from modelverse_kernel.generated import ModelverseKernel
-from utils import execute_until_finished, MvSWrapper, get_inst, get_phase, get_returnvalue
+from test_generated.utils import execute_until_finished, MvSWrapper, get_inst, get_phase, get_returnvalue
 
 class Testcontinue(unittest.TestCase):
     def setUp(self):

kernel/test_generated/instructions/test_instruction_declare.py

@@ -1,6 +1,6 @@
 import unittest
 from modelverse_kernel.generated import ModelverseKernel
-from utils import execute_until_finished, MvSWrapper, get_inst, get_phase, get_returnvalue
+from test_generated.utils import execute_until_finished, MvSWrapper, get_inst, get_phase, get_returnvalue
 
 class TestDeclare(unittest.TestCase):
     def setUp(self):

kernel/test_generated/instructions/test_instruction_if.py

@@ -1,6 +1,6 @@
 import unittest
 from modelverse_kernel.generated import ModelverseKernel
-from utils import execute_until_finished, MvSWrapper, get_inst, get_phase, get_returnvalue
+from test_generated.utils import execute_until_finished, MvSWrapper, get_inst, get_phase, get_returnvalue
 
 class Testif(unittest.TestCase):
     def setUp(self):

kernel/test_generated/instructions/test_instruction_input.py

@@ -1,6 +1,6 @@
 import unittest
 from modelverse_kernel.generated import ModelverseKernel
-from utils import execute_until_finished, MvSWrapper, get_inst, get_phase, get_returnvalue_ref
+from test_generated.utils import execute_until_finished, MvSWrapper, get_inst, get_phase, get_returnvalue_ref
 
 class TestInput(unittest.TestCase):
     def setUp(self):

kernel/test_generated/instructions/test_instruction_output.py

@@ -1,6 +1,6 @@
 import unittest
 from modelverse_kernel.generated import ModelverseKernel
-from utils import execute_until_finished, MvSWrapper, get_inst, get_phase, get_returnvalue_ref
+from test_generated.utils import execute_until_finished, MvSWrapper, get_inst, get_phase, get_returnvalue_ref
 
 class TestOutput(unittest.TestCase):
     def setUp(self):

kernel/test_generated/instructions/test_instruction_resolve.py

@@ -1,6 +1,6 @@
 import unittest
 from modelverse_kernel.generated import ModelverseKernel
-from utils import execute_until_finished, MvSWrapper, get_inst, get_phase, get_returnvalue, get_returnvalue_ref, get_inst_ref
+from test_generated.utils import execute_until_finished, MvSWrapper, get_inst, get_phase, get_returnvalue, get_returnvalue_ref, get_inst_ref
 
 class Testresolve(unittest.TestCase):
     def setUp(self):

kernel/test_generated/instructions/test_instruction_return.py

@@ -1,6 +1,6 @@
 import unittest
 from modelverse_kernel.generated import ModelverseKernel
-from utils import execute_until_finished, MvSWrapper, get_inst, get_phase, get_returnvalue
+from test_generated.utils import execute_until_finished, MvSWrapper, get_inst, get_phase, get_returnvalue
 
 class Testreturn(unittest.TestCase):
     def setUp(self):

kernel/test_generated/instructions/test_instruction_while.py

@@ -1,6 +1,6 @@
 import unittest
 from modelverse_kernel.generated import ModelverseKernel
-from utils import execute_until_finished, MvSWrapper, get_inst, get_phase, get_returnvalue
+from test_generated.utils import execute_until_finished, MvSWrapper, get_inst, get_phase, get_returnvalue
 
 class Testwhile(unittest.TestCase):
     def setUp(self):

kernel/test_generated/primitives/test_action.py

@@ -1,6 +1,6 @@
 import unittest
 from modelverse_kernel.generated import ModelverseKernel
-from utils import execute_until_finished, MvSWrapper, get_inst, get_phase, get_returnvalue, get_phase_ref, read_primitive_interfaces
+from test_generated.utils import execute_until_finished, MvSWrapper, get_inst, get_phase, get_returnvalue, get_phase_ref, read_primitive_interfaces
 
 class TestAction(unittest.TestCase):
     def setUp(self):

kernel/test_generated/primitives/test_bool.py

@@ -1,6 +1,6 @@
 import unittest
 from modelverse_kernel.generated import ModelverseKernel
-from utils import execute_until_finished, MvSWrapper, get_inst, get_phase, get_returnvalue, get_phase_ref, read_primitive_interfaces
+from test_generated.utils import execute_until_finished, MvSWrapper, get_inst, get_phase, get_returnvalue, get_phase_ref, read_primitive_interfaces
 
 class TestBool(unittest.TestCase):
     def setUp(self):

kernel/test_generated/primitives/test_cast.py

@@ -1,6 +1,6 @@
 import unittest
 from modelverse_kernel.generated import ModelverseKernel
-from utils import execute_until_finished, MvSWrapper, get_inst, get_phase, get_returnvalue, get_phase_ref, read_primitive_interfaces
+from test_generated.utils import execute_until_finished, MvSWrapper, get_inst, get_phase, get_returnvalue, get_phase_ref, read_primitive_interfaces
 
 class TestCast(unittest.TestCase):
     def setUp(self):

kernel/test_generated/primitives/test_create.py

@@ -1,6 +1,6 @@
 import unittest
 from modelverse_kernel.generated import ModelverseKernel
-from utils import execute_until_finished, MvSWrapper, get_inst, get_phase, get_returnvalue, get_phase_ref, read_primitive_interfaces, get_returnvalue_ref
+from test_generated.utils import execute_until_finished, MvSWrapper, get_inst, get_phase, get_returnvalue, get_phase_ref, read_primitive_interfaces, get_returnvalue_ref
 
 class TestCreate(unittest.TestCase):
     def setUp(self):

kernel/test_generated/primitives/test_delete.py

@@ -1,6 +1,6 @@
 import unittest
 from modelverse_kernel.generated import ModelverseKernel
-from utils import execute_until_finished, MvSWrapper, get_inst, get_phase, get_returnvalue, get_phase_ref, read_primitive_interfaces, get_returnvalue_ref
+from test_generated.utils import execute_until_finished, MvSWrapper, get_inst, get_phase, get_returnvalue, get_phase_ref, read_primitive_interfaces, get_returnvalue_ref
 
 class TestDelete(unittest.TestCase):
     def setUp(self):

kernel/test_generated/primitives/test_dict.py

@@ -1,6 +1,6 @@
 import unittest
 from modelverse_kernel.generated import ModelverseKernel
-from utils import execute_until_finished, MvSWrapper, get_inst, get_phase, get_returnvalue, get_phase_ref, read_primitive_interfaces, get_returnvalue_ref
+from test_generated.utils import execute_until_finished, MvSWrapper, get_inst, get_phase, get_returnvalue, get_phase_ref, read_primitive_interfaces, get_returnvalue_ref
 
 class TestDict(unittest.TestCase):
     def setUp(self):

kernel/test_generated/primitives/test_dict_special.py

@@ -1,6 +1,6 @@
 import unittest
 from modelverse_kernel.generated import ModelverseKernel
-from utils import execute_until_finished, MvSWrapper, get_inst, get_phase, get_returnvalue, get_phase_ref, read_primitive_interfaces, get_returnvalue_ref
+from test_generated.utils import execute_until_finished, MvSWrapper, get_inst, get_phase, get_returnvalue, get_phase_ref, read_primitive_interfaces, get_returnvalue_ref
 
 class TestDictSpecials(unittest.TestCase):
     def setUp(self):

kernel/test_generated/primitives/test_edge.py

@@ -1,6 +1,6 @@
 import unittest
 from modelverse_kernel.generated import ModelverseKernel
-from utils import execute_until_finished, MvSWrapper, get_inst, get_phase, get_returnvalue, get_phase_ref, read_primitive_interfaces, get_returnvalue_ref
+from test_generated.utils import execute_until_finished, MvSWrapper, get_inst, get_phase, get_returnvalue, get_phase_ref, read_primitive_interfaces, get_returnvalue_ref
 
 class TestEdge(unittest.TestCase):
     def setUp(self):

kernel/test_generated/primitives/test_element.py

@@ -1,6 +1,6 @@
 import unittest
 from modelverse_kernel.generated import ModelverseKernel
-from utils import execute_until_finished, MvSWrapper, get_inst, get_phase, get_returnvalue, get_phase_ref, read_primitive_interfaces
+from test_generated.utils import execute_until_finished, MvSWrapper, get_inst, get_phase, get_returnvalue, get_phase_ref, read_primitive_interfaces
 
 class TestType(unittest.TestCase):
     def setUp(self):

kernel/test_generated/primitives/test_float.py

@@ -1,6 +1,6 @@
 import unittest
 from modelverse_kernel.generated import ModelverseKernel
-from utils import execute_until_finished, MvSWrapper, get_inst, get_phase, get_returnvalue, get_phase_ref, read_primitive_interfaces
+from test_generated.utils import execute_until_finished, MvSWrapper, get_inst, get_phase, get_returnvalue, get_phase_ref, read_primitive_interfaces
 
 class TestInteger(unittest.TestCase):
     def setUp(self):

kernel/test_generated/primitives/test_integer.py

@@ -1,6 +1,6 @@
 import unittest
 from modelverse_kernel.generated import ModelverseKernel
-from utils import execute_until_finished, MvSWrapper, get_inst, get_phase, get_returnvalue, get_phase_ref, read_primitive_interfaces
+from test_generated.utils import execute_until_finished, MvSWrapper, get_inst, get_phase, get_returnvalue, get_phase_ref, read_primitive_interfaces
 
 class TestInteger(unittest.TestCase):
     def setUp(self):

kernel/test_generated/primitives/test_list.py

@@ -1,6 +1,6 @@
 import unittest
 from modelverse_kernel.generated import ModelverseKernel
-from utils import execute_until_finished, MvSWrapper, get_inst, get_phase, get_returnvalue, get_phase_ref, read_primitive_interfaces, get_returnvalue_ref
+from test_generated.utils import execute_until_finished, MvSWrapper, get_inst, get_phase, get_returnvalue, get_phase_ref, read_primitive_interfaces, get_returnvalue_ref
 
 class TestList(unittest.TestCase):
     def setUp(self):

kernel/test_generated/primitives/test_read.py

@@ -1,6 +1,6 @@
 import unittest
 from modelverse_kernel.generated import ModelverseKernel
-from utils import execute_until_finished, MvSWrapper, get_inst, get_phase, get_returnvalue, get_phase_ref, read_primitive_interfaces, get_returnvalue_ref
+from test_generated.utils import execute_until_finished, MvSWrapper, get_inst, get_phase, get_returnvalue, get_phase_ref, read_primitive_interfaces, get_returnvalue_ref
 
 class TestRead(unittest.TestCase):
     def setUp(self):

kernel/test_generated/primitives/test_string.py

@@ -1,6 +1,6 @@
 import unittest
 from modelverse_kernel.generated import ModelverseKernel
-from utils import execute_until_finished, MvSWrapper, get_inst, get_phase, get_returnvalue, get_phase_ref, read_primitive_interfaces, get_returnvalue_ref
+from test_generated.utils import execute_until_finished, MvSWrapper, get_inst, get_phase, get_returnvalue, get_phase_ref, read_primitive_interfaces, get_returnvalue_ref
 
 class TestString(unittest.TestCase):
     def setUp(self):

kernel/test_generated/rules/test_rules_access.py

@@ -1,6 +1,6 @@
 import unittest
 from modelverse_kernel.generated import ModelverseKernel
-from utils import execute_until_finished, MvSWrapper
+from test_generated.utils import execute_until_finished, MvSWrapper
 
 class Testaccess(unittest.TestCase):
     def setUp(self):

kernel/test_generated/rules/test_rules_assign.py

@@ -1,6 +1,6 @@
 import unittest
 from modelverse_kernel.generated import ModelverseKernel
-from utils import execute_until_finished, MvSWrapper
+from test_generated.utils import execute_until_finished, MvSWrapper
 
 class TestAssign(unittest.TestCase):
     def setUp(self):

kernel/test_generated/rules/test_rules_break.py

@@ -1,6 +1,6 @@
 import unittest
 from modelverse_kernel.generated import ModelverseKernel
-from utils import execute_until_finished, MvSWrapper
+from test_generated.utils import execute_until_finished, MvSWrapper
 
 class Testbreak(unittest.TestCase):
     def setUp(self):

kernel/test_generated/rules/test_rules_call.py

@@ -1,6 +1,6 @@
 import unittest
 from modelverse_kernel.generated import ModelverseKernel
-from utils import execute_until_finished, MvSWrapper
+from test_generated.utils import execute_until_finished, MvSWrapper
 
 class Testcall(unittest.TestCase):
     def setUp(self):

kernel/test_generated/rules/test_rules_constant.py

@@ -1,6 +1,6 @@
 import unittest
 from modelverse_kernel.generated import ModelverseKernel
-from utils import execute_until_finished, MvSWrapper
+from test_generated.utils import execute_until_finished, MvSWrapper
 
 class Testconstant(unittest.TestCase):
     def setUp(self):

kernel/test_generated/rules/test_rules_continue.py

@@ -1,6 +1,6 @@
 import unittest
 from modelverse_kernel.generated import ModelverseKernel
-from utils import execute_until_finished, MvSWrapper
+from test_generated.utils import execute_until_finished, MvSWrapper
 
 class Testcontinue(unittest.TestCase):
     def setUp(self):

kernel/test_generated/rules/test_rules_helper.py

@@ -1,6 +1,6 @@
 import unittest
 from modelverse_kernel.generated import ModelverseKernel
-from utils import execute_until_finished, MvSWrapper
+from test_generated.utils import execute_until_finished, MvSWrapper
 
 class TestHelper(unittest.TestCase):
     def setUp(self):

kernel/test_generated/rules/test_rules_if.py

@@ -1,6 +1,6 @@
 import unittest
 from modelverse_kernel.generated import ModelverseKernel
-from utils import execute_until_finished, MvSWrapper
+from test_generated.utils import execute_until_finished, MvSWrapper
 
 class Testif(unittest.TestCase):
     def setUp(self):

kernel/test_generated/rules/test_rules_input.py

@@ -1,7 +1,7 @@
 import unittest
 from modelverse_kernel.generated import ModelverseKernel
 from modelverse_kernel.primitives import SleepKernel
-from utils import execute_until_finished, MvSWrapper
+from test_generated.utils import execute_until_finished, MvSWrapper
 
 class TestInput(unittest.TestCase):
     def setUp(self):

kernel/test_generated/rules/test_rules_output.py

@@ -1,6 +1,6 @@
 import unittest
 from modelverse_kernel.generated import ModelverseKernel
-from utils import execute_until_finished, MvSWrapper
+from test_generated.utils import execute_until_finished, MvSWrapper
 
 class TestOutput(unittest.TestCase):
     def setUp(self):

kernel/test_generated/rules/test_rules_resolve.py

@@ -1,6 +1,6 @@
 import unittest
 from modelverse_kernel.generated import ModelverseKernel
-from utils import execute_until_finished, MvSWrapper
+from test_generated.utils import execute_until_finished, MvSWrapper
 
 class Testresolve(unittest.TestCase):
     def setUp(self):

kernel/test_generated/rules/test_rules_return.py

@@ -1,6 +1,6 @@
 import unittest
 from modelverse_kernel.generated import ModelverseKernel
-from utils import execute_until_finished, MvSWrapper
+from test_generated.utils import execute_until_finished, MvSWrapper
 
 class Testreturn(unittest.TestCase):
     def setUp(self):

kernel/test_generated/rules/test_rules_while.py

@@ -1,6 +1,6 @@
 import unittest
 from modelverse_kernel.generated import ModelverseKernel
-from utils import execute_until_finished, MvSWrapper
+from test_generated.utils import execute_until_finished, MvSWrapper
 
 class Testwhile(unittest.TestCase):
     def setUp(self):