update lampy

lampy/__init__.py

@@ -1,13 +1,13 @@
 # -*- coding: UTF-8 -*-
 
-from .lexeme        import *
-from .ast           import *
-from .datatypes     import *
-from .syntax        import *
-from .compatibility import *
-from .semantic      import *
-from .codegen       import *
-from .lambdify      import *
-from .utilities     import *
-from .printing      import *
-from .interface     import *
+from lampy.lexeme        import *
+from lampy.ast           import *
+from lampy.datatypes     import *
+from lampy.syntax        import *
+from lampy.compatibility import *
+from lampy.semantic      import *
+from lampy.codegen       import *
+from lampy.lambdify      import *
+from lampy.utilities     import *
+from lampy.printing      import *
+from lampy.interface     import *

lampy/ast.py

@@ -1,12 +1,17 @@
 # coding: utf-8
-
+import random
+import string
 from sympy import Symbol, Tuple, Dict, Lambda
 
 from pyccel.ast.basic import Basic
-from pyccel.ast.core  import FunctionCall, FunctionDef
-from pyccel.codegen.utilities import random_string
+from pyccel.ast.core import FunctionCall, FunctionDef
+
 
 #=========================================================================
+def random_string(length):
+   letters = string.ascii_lowercase
+   return ''.join(random.choice(letters) for i in range(length))
+
 class BasicMap(Basic):
     """."""
     _name = 'BasicMap'

lampy/codegen.py

@@ -2,7 +2,8 @@
 
 import os
 from os.path import join, dirname
-
+import string
+import random
 from sympy import Symbol, Lambda, Function, Dummy
 from sympy import Tuple, IndexedBase, Indexed
 from sympy.core.function import AppliedUndef
@@ -12,12 +13,13 @@
 from sympy import FunctionClass
 
 
-from pyccel.codegen.utilities import random_string
+#from pyccel.codegen.utilities import random_string
 from pyccel.ast.utilities import build_types_decorator
 from pyccel.ast.core import Slice
+from pyccel.ast.core import Block
 from pyccel.ast.core import Variable, FunctionDef, Assign, AugAssign
 from pyccel.ast.core import Return, Pass, Import, String
-from pyccel.ast.core  import For, Range, Len, Print
+from pyccel.ast.core import For, Range, Len, SymbolicPrint
 from pyccel.ast.datatypes import get_default_value
 from pyccel.ast.datatypes import NativeInteger, NativeReal, NativeComplex, NativeBool
 from pyccel.ast.basic import Basic
@@ -27,15 +29,19 @@
 from pyccel.ast.parallel.openmp import OMP_NumThread
 from pyccel.ast.parallel.openmp import OMP_Reduction
 
-from .datatypes import TypeVariable, TypeTuple, TypeList
-from .semantic import Parser as SemanticParser
-from .lexeme import _internal_applications
-from .lexeme import _math_functions
-from .lexeme import _internal_map_functors
-from .ast import Call
-from .ast import BasicMap
+from lampy.datatypes import TypeVariable, TypeTuple, TypeList
+from lampy.semantic import Parser as SemanticParser
+from lampy.lexeme import _internal_applications
+from lampy.lexeme import _math_functions
+from lampy.lexeme import _internal_map_functors
+from lampy.ast import Call
+from lampy.ast import BasicMap
 
 #========================================================================
+def random_string(length):
+   letters = string.ascii_lowercase
+   return ''.join(random.choice(letters) for i in range(length))
+
 # TODO improve or copy from pyccel.parser
 def _get_name(i):
     if isinstance(i, Symbol):
@@ -150,19 +156,29 @@ def _get_default_value(var, op=None):
     raise NotImplementedError('TODO')
 
 #=========================================================================
+
+class Types (Function):
+    def __new__(cls, *args):
+        return Basic.__new__(cls, *args)
+#=========================================================================
 class LambdaFunctionDef(FunctionDef):
 
     """."""
     def __new__( cls, name, arguments, results, body, **kwargs ):
         generators = kwargs.pop('generators', {})
         m_results  = kwargs.pop('m_results',   [])
-
         obj = FunctionDef.__new__(cls, name, arguments, results, body, **kwargs)
-        obj._generators = generators
-        obj._m_results  = m_results
+
 
         return obj
 
+    def __init__(self, name, arguments, results, body, **kwargs):
+        generators = kwargs.pop('generators', {})
+        m_results = kwargs.pop('m_results', [])
+        super().__init__(name, arguments, results, body, **kwargs)
+        self._generators = generators
+        self._m_results = m_results
+
     @property
     def generators(self):
         return self._generators
@@ -422,7 +438,11 @@ def __new__( cls, block, **kwargs ):
             # ...
 
             # ...
-            body = [OMP_Parallel( clauses, variables, body )]
+
+            body = [Block( 'function' ,  variables, body )]
+
+
+
             # ...
 
             # TODO this is a hack to handle the last comment after a loop, so that
@@ -769,6 +789,7 @@ def __init__(self, parser, **kwargs):
         self._typed_functions = parser.typed_functions
         self._default_type    = parser.default_type
         self._generators      = {}
+
         # ...
 
         # ...
@@ -1386,9 +1407,7 @@ def _visit_LampyLambda(self, stmt):
 #        decorators = {'types':         build_types_decorator(args),
 #                      'external_call': []}
 
-        decorators = {'types':         build_types_decorator(args),
-                      'external': []}
-
+        decorators = {'types':   Types(*build_types_decorator(args))}
         tag         = random_string( 6 )
         name      = 'lambda_{}'.format( tag )
         # ...
@@ -1399,6 +1418,7 @@ def _visit_LampyLambda(self, stmt):
                                   generators      = self.generators,
                                   m_results       = m_results )
 
+
     def _visit_Integer(self, stmt):
         return stmt
 

lampy/datatypes.py

@@ -1,14 +1,18 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
-
+import random, string
 from sympy import Tuple, IndexedBase
 
 from pyccel.ast.basic import Basic
 from pyccel.ast.core  import Variable, For, Range, Assign, Len
-from pyccel.codegen.utilities import random_string
+#from pyccel.codegen.utilities import random_string
 
 
 #=========================================================================
+def random_string(length):
+   letters = string.ascii_lowercase
+   return ''.join(random.choice(letters) for i in range(length))
+
 class BasicTypeVariable(Basic):
     _tag  = None
 

lampy/interface.py

@@ -2,7 +2,8 @@
 
 import os
 from os.path import join, dirname
-
+import random
+import string
 from sympy import Symbol, Lambda, Function, Dummy
 from sympy import Tuple, IndexedBase
 from sympy.core.function import AppliedUndef
@@ -12,7 +13,7 @@
 from sympy import FunctionClass
 
 
-from pyccel.codegen.utilities import random_string
+#from pyccel.codegen.utilities import random_string
 from pyccel.ast.utilities import build_types_decorator
 from pyccel.ast.core import Slice
 from pyccel.ast.core import Variable, FunctionDef, Assign, AugAssign
@@ -23,14 +24,18 @@
 from pyccel.ast.numpyext  import Zeros
 from pyccel.ast.basic import Basic
 
-from .datatypes import TypeVariable, TypeTuple, TypeList
-from .semantic  import Parser as SemanticParser
-from .lexeme  import _internal_applications
-from .lexeme  import _math_functions
-from .lexeme  import _internal_map_functors
-from .codegen   import BasicGenerator, Shaping, LambdaFunctionDef
+from lampy.datatypes import TypeVariable, TypeTuple, TypeList
+from lampy.semantic  import Parser as SemanticParser
+from lampy.lexeme  import _internal_applications
+from lampy.lexeme  import _math_functions
+from lampy.lexeme  import _internal_map_functors
+from lampy.codegen   import BasicGenerator, Shaping, LambdaFunctionDef
 
 #=======================================================================================
+def random_string(length):
+   letters = string.ascii_lowercase
+   return ''.join(random.choice(letters) for i in range(length))
+
 def compute_shape( arg, generators ):
     if not( arg in generators.keys() ):
         raise ValueError('Could not find {}'.format( arg ))