fix basic import errors

src/exo/API.py

@@ -17,8 +17,8 @@
 from .frontend.parse_fragment import parse_fragment
 from .frontend.pattern_match import match_pattern
 from .core.prelude import *
-from .rewrite.new_eff import Check_Aliasing
-from .dataflow import dataflow_analysis
+from .rewrite.analysis import Check_Aliasing
+from .rewrite.dataflow import dataflow_analysis
 
 # Moved to new file
 from .core.proc_eqv import decl_new_proc, derive_proc, assert_eqv_proc, check_eqv_proc

src/exo/backend/parallel_analysis.py

@@ -1,6 +1,6 @@
 from ..core.LoopIR import LoopIR, LoopIR_Rewrite
 
-from ..rewrite.new_eff import Check_ParallelizeLoop
+from ..rewrite.analysis import Check_ParallelizeLoop
 
 
 class ParallelAnalysis(LoopIR_Rewrite):

src/exo/rewrite/LoopIR_unification.py

@@ -18,7 +18,7 @@
 )
 from .LoopIR_scheduling import SchedulingError
 from ..core.prelude import *
-from .new_eff import Check_Aliasing
+from .analysis import Check_Aliasing
 import exo.core.internal_cursors as ic
 
 

src/exo/dataflow.py → src/exo/rewrite/dataflow.py

@@ -5,11 +5,11 @@
 from typing import Mapping, Any
 from asdl_adt import ADT, validators
 
-from .builtins import BuiltIn
-from .configs import Config
-from .memory import Memory
-from .prelude import Sym, SrcInfo, extclass
-from .LoopIR import (
+from ..core.extern import Extern
+from ..core.configs import Config
+from ..core.memory import Memory
+from ..core.prelude import Sym, SrcInfo, extclass
+from ..core.LoopIR import (
     LoopIR,
     Alpha_Rename,
     SubstArgs,
@@ -70,7 +70,7 @@ def validateAbsEnv(obj):
          | Const( object val )
          | USub( expr arg )  -- i.e.  -(...)
          | BinOp( binop op, expr lhs, expr rhs )
-         | BuiltIn( builtin f, expr* args )
+         | Extern( extern f, expr* args )
          | StrideExpr( sym name, int dim )
          attributes( type type, srcinfo srcinfo )
 
@@ -91,7 +91,7 @@ def validateAbsEnv(obj):
     ext_types={
         "name": validators.instance_of(Identifier, convert=True),
         "sym": Sym,
-        "builtin": BuiltIn,
+        "extern": Extern,
         "binop": validators.instance_of(Operator, convert=True),
         "absenv": validateAbsEnv,
         "srcinfo": SrcInfo,
@@ -481,9 +481,9 @@ def map_e(self, e):
             df_rhs = self.map_e(e.rhs)
             return DataflowIR.BinOp(e.op, df_lhs, df_rhs, self.map_t(e.type), e.srcinfo)
 
-        elif isinstance(e, LoopIR.BuiltIn):
+        elif isinstance(e, LoopIR.Extern):
             df_args = self.map_exprs(e.args)
-            return DataflowIR.BuiltIn(e.f, df_args, self.map_t(e.type), e.srcinfo)
+            return DataflowIR.Extern(e.f, df_args, self.map_t(e.type), e.srcinfo)
 
         elif isinstance(e, LoopIR.USub):
             df_arg = self.map_e(e.arg)
@@ -1608,8 +1608,8 @@ def fix_expr(self, e: DataflowIR.expr) -> D.val:
             return self.abs_usub(e)
         elif isinstance(e, DataflowIR.BinOp):
             return self.abs_binop(e)
-        elif isinstance(e, DataflowIR.BuiltIn):
-            return self.abs_builtin(e)
+        elif isinstance(e, DataflowIR.Extern):
+            return self.abs_extern(e)
         elif isinstance(e, DataflowIR.StrideExpr):
             return self.abs_stride_expr(e)
         else:
@@ -1666,7 +1666,7 @@ def abs_usub(self, e):
         pass
 
     @abstractmethod
-    def abs_builtin(self, e):
+    def abs_extern(self, e):
         # Implement transfer function abstraction for built-ins
         pass
 
@@ -1718,5 +1718,5 @@ def abs_binop(self, e) -> D:
     def abs_usub(self, e) -> D:
         return D.SubVal(V.Top())
 
-    def abs_builtin(self, e):
+    def abs_extern(self, e):
         return D.SubVal(V.Top())

src/exo/dataflow_pprint.py → src/exo/rewrite/dataflow_pprint.py

@@ -1,6 +1,6 @@
 from .dataflow import DataflowIR, D, V
-from .LoopIR_pprint import op_prec
-from .prelude import Sym, SrcInfo, extclass
+from ..core.LoopIR_pprint import op_prec
+from ..core.prelude import Sym, SrcInfo, extclass
 from collections import ChainMap
 from dataclasses import dataclass, field