Removed unused languages and replaced sympy with ast_parser

brian2/codegen/languages/__init__.py

@@ -1,5 +1,3 @@
 from .base import *
 from .cpp import *
-from .cuda import *
 from .python import *
-from .python_numexpr import *

brian2/codegen/languages/cpp.py

@@ -3,15 +3,14 @@
 '''
 import re
 
-from sympy.printing.ccode import CCodePrinter
 import numpy
 
 from brian2.utils.stringtools import deindent
-from brian2.codegen.parsing import parse_to_sympy
 from brian2.codegen.functions.base import Function
 from brian2.utils.logger import get_logger
 
 from .base import Language, CodeObject
+from ..ast_parser import CPPNodeRenderer
 
 logger = get_logger(__name__)
 try:
@@ -111,12 +110,7 @@ def __init__(self, compiler='gcc', extra_compile_args=['-O3', '-ffast-math'],
         self.flush_denormals = flush_denormals
 
     def translate_expression(self, expr):
-        # temporary hack to make randn() pass through sympy
-        expr = re.sub(r'\brandn\b\s*\(\s*\)', '_temporary_randn_symbol', expr)
-        expr = parse_to_sympy(expr)
-        expr = CCodePrinter().doprint(expr)
-        expr = re.sub(r'\b_temporary_randn_symbol\b', 'randn()', expr)
-        return expr
+        return CPPNodeRenderer().render_expr(expr).strip()
 
     def translate_statement(self, statement):
         var, op, expr = statement.var, statement.op, statement.expr

brian2/codegen/languages/python.py

@@ -1,4 +1,5 @@
 from .base import Language, CodeObject
+from ..ast_parser import NumpyNodeRenderer
 
 __all__ = ['PythonLanguage', 'PythonCodeObject']
 
@@ -8,7 +9,7 @@ class PythonLanguage(Language):
     language_id = 'python'
 
     def translate_expression(self, expr):
-        return expr.strip()
+        return NumpyNodeRenderer().render_expr(expr).strip()
 
     def translate_statement(self, statement):
         # TODO: optimisation, translate arithmetic to a sequence of inplace

dev/tools/run_nose_tests.py

@@ -2,4 +2,4 @@
 Run all the tests using nose.
 '''
 import brian2
-brian2.test()
+brian2.test()