From a2f0fa4fa684666df4b9e6d417bae326839fd483 Mon Sep 17 00:00:00 2001
From: Andreas Kloeckner <inform@tiker.net>
Date: Thu, 5 Feb 2015 12:55:58 -0600
Subject: [PATCH] Complete absorbing floopy into loopy

---
 bin/loopy                            | 2 +-
 examples/fortran/run-floopy.sh       | 2 +-
 examples/fortran/run-loopy.sh        | 2 +-
 loopy/frontend/fortran/__init__.py   | 2 +-
 loopy/frontend/fortran/expression.py | 2 +-
 loopy/frontend/fortran/translator.py | 4 ++--
 loopy/frontend/fortran/tree.py       | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/bin/loopy b/bin/loopy
index 830673165..78e2b86d6 100644
--- a/bin/loopy
+++ b/bin/loopy
@@ -150,7 +150,7 @@ def main():
                         defines_to_python_code(defines_fd.read())
                         + pre_transform_code)
 
-        from floopy.fortran import f2loopy
+        from loopy.frontend.fortran import f2loopy
         kernels = f2loopy(target, infile_content,
                 pre_transform_code=pre_transform_code)
 
diff --git a/examples/fortran/run-floopy.sh b/examples/fortran/run-floopy.sh
index a56c4bdff..77c141d40 100755
--- a/examples/fortran/run-floopy.sh
+++ b/examples/fortran/run-floopy.sh
@@ -3,4 +3,4 @@
 NAME="$1"
 shift
 
-python $(which floopy) --target=cl:0,0 --lang=floopy "$NAME" - "$@"
+python $(which loopy) --target=cl:0,0 --lang=floopy "$NAME" - "$@"
diff --git a/examples/fortran/run-loopy.sh b/examples/fortran/run-loopy.sh
index 55f4a8756..d4fb7c2a2 100755
--- a/examples/fortran/run-loopy.sh
+++ b/examples/fortran/run-loopy.sh
@@ -1,3 +1,3 @@
 #! /bin/sh
 
-floopy --target=cl:0,0 --lang=loopy "$1" -
+python $(which loopy) --target=cl:0,0 --lang=loopy "$NAME" - "$@"
diff --git a/loopy/frontend/fortran/__init__.py b/loopy/frontend/fortran/__init__.py
index 20a6d19e6..f09c224d5 100644
--- a/loopy/frontend/fortran/__init__.py
+++ b/loopy/frontend/fortran/__init__.py
@@ -29,7 +29,7 @@ def f2loopy(target, source, free_form=True, strict=True,
     tree = api.parse(source, isfree=free_form, isstrict=strict,
             analyze=False, ignore_comments=False)
 
-    from floopy.fortran.translator import F2LoopyTranslator
+    from loopy.frontend.fortran.translator import F2LoopyTranslator
     f2loopy = F2LoopyTranslator()
     f2loopy(tree)
 
diff --git a/loopy/frontend/fortran/expression.py b/loopy/frontend/fortran/expression.py
index e5a67193d..b2dddd6a8 100644
--- a/loopy/frontend/fortran/expression.py
+++ b/loopy/frontend/fortran/expression.py
@@ -23,7 +23,7 @@ THE SOFTWARE.
 """
 
 from pymbolic.parser import Parser as ExpressionParserBase
-from floopy.fortran.diagnostic import TranslationError
+from loopy.frontend.fortran.diagnostic import TranslationError
 
 import pymbolic.primitives as prim
 import numpy as np
diff --git a/loopy/frontend/fortran/translator.py b/loopy/frontend/fortran/translator.py
index 5a55cf921..316c02ff7 100644
--- a/loopy/frontend/fortran/translator.py
+++ b/loopy/frontend/fortran/translator.py
@@ -27,8 +27,8 @@ import re
 import loopy as lp
 import numpy as np
 from warnings import warn
-from floopy.fortran.tree import FTreeWalkerBase
-from floopy.fortran.diagnostic import (
+from loopy.frontend.fortran.tree import FTreeWalkerBase
+from loopy.frontend.fortran.diagnostic import (
         TranslationError, TranslatorWarning)
 import islpy as isl
 from islpy import dim_type
diff --git a/loopy/frontend/fortran/tree.py b/loopy/frontend/fortran/tree.py
index 102b9cc3c..fe25435b7 100644
--- a/loopy/frontend/fortran/tree.py
+++ b/loopy/frontend/fortran/tree.py
@@ -27,7 +27,7 @@ import re
 
 class FTreeWalkerBase(object):
     def __init__(self):
-        from floopy.fortran.expression import FortranExpressionParser
+        from loopy.frontend.fortran.expression import FortranExpressionParser
         self.expr_parser = FortranExpressionParser(self)
 
     def rec(self, expr, *args, **kwargs):
-- 
GitLab