.gitlab-ci.yml

@@ -139,7 +139,7 @@ pycodegen-integration:
     - cd ../pygrandchem
     - py.test -v -n $NUM_CORES .
     - cd ../walberla/build/
-    - make CodegenJacobiCPU CodegenJacobiGPU CodegenPoisson MicroBenchmarkGpuLbm LbCodeGenerationExample UniformGridBenchmarkGPU_trt UniformGridBenchmarkGPU_entropic_kbc_n4
+    - make CodegenJacobiCPU CodegenJacobiGPU CodegenPoissonCPU CodegenPoissonGPU MicroBenchmarkGpuLbm LbCodeGenerationExample UniformGridBenchmarkGPU_trt UniformGridBenchmarkGPU_entropic_kbc_n4
     - cd apps/benchmarks/UniformGridGPU
     - make -j $NUM_CORES
     - cd ../UniformGridGenerated

pystencils/backends/cbackend.py

@@ -20,7 +20,10 @@ from pystencils.integer_functions import (
 try:
     from sympy.printing.ccode import C99CodePrinter as CCodePrinter
 except ImportError:
-    from sympy.printing.ccode import CCodePrinter  # for sympy versions < 1.1
+    try:
+        from sympy.printing.ccode import CCodePrinter  # for sympy versions < 1.1
+    except ImportError:
+        from sympy.printing.cxx import CXX11CodePrinter as CCodePrinter  # for sympy versions > 1.6
 
 __all__ = ['generate_c', 'CustomCodeNode', 'PrintNode', 'get_headers', 'CustomSympyPrinter']
 

pystencils/field.py

@@ -676,6 +676,7 @@ class Field(AbstractField):
             >>> central_y_component.at_index(0)  # change component
             v_C^0
         """
+        _iterable = False  # see https://i10git.cs.fau.de/pycodegen/pystencils/-/merge_requests/166#note_10680
 
         def __new__(cls, name, *args, **kwargs):
             obj = Field.Access.__xnew_cached_(cls, name, *args, **kwargs)
@@ -756,11 +757,6 @@ class Field(AbstractField):
         def __getitem__(self, *idx):
             return self.__call__(*idx)
 
-        def __iter__(self):
-            """This is necessary to work with parts of sympy that test if an object is iterable (e.g. simplify).
-            The __getitem__ would make it iterable"""
-            raise TypeError("Field access is not iterable")
-
         @property
         def field(self) -> 'Field':
             """Field that the Access points to"""

pystencils/sympyextensions.py

@@ -10,7 +10,8 @@ from sympy.functions import Abs
 from sympy.core.numbers import Zero
 
 from pystencils.assignment import Assignment
-from pystencils.data_types import cast_func, get_base_type, get_type_of_expression
+from pystencils.data_types import cast_func, get_type_of_expression, PointerType
+from pystencils.kernelparameters import FieldPointerSymbol
 
 T = TypeVar('T')
 
@@ -445,7 +446,6 @@ def count_operations(term: Union[sp.Expr, List[sp.Expr]],
 
     result = {'adds': 0, 'muls': 0, 'divs': 0, 'sqrts': 0,
               'fast_sqrts': 0, 'fast_inv_sqrts': 0, 'fast_div': 0}
-
     if isinstance(term, Sequence):
         for element in term:
             r = count_operations(element, only_type)
@@ -455,16 +455,18 @@ def count_operations(term: Union[sp.Expr, List[sp.Expr]],
     elif isinstance(term, Assignment):
         term = term.rhs
 
-    if hasattr(term, 'evalf'):
-        term = term.evalf()
-
     def check_type(e):
         if only_type is None:
             return True
+        if isinstance(e, FieldPointerSymbol) and only_type == "real":
+            return only_type == "int"
+
         try:
-            base_type = get_base_type(get_type_of_expression(e))
+            base_type = get_type_of_expression(e)
         except ValueError:
             return False
+        if isinstance(base_type, PointerType):
+            return only_type == 'int'
         if only_type == 'int' and (base_type.is_int() or base_type.is_uint()):
             return True
         if only_type == 'real' and (base_type.is_float()):
@@ -515,6 +517,9 @@ def count_operations(term: Union[sp.Expr, List[sp.Expr]],
                         result['muls'] += (-int(t.exp)) - 1
                 elif sp.nsimplify(t.exp) == sp.Rational(1, 2):
                     result['sqrts'] += 1
+                elif sp.nsimplify(t.exp) == -sp.Rational(1, 2):
+                    result["sqrts"] += 1
+                    result["divs"] += 1
                 else:
                     warnings.warn(f"Cannot handle exponent {t.exp} of sp.Pow node")
             else:

pystencils_tests/test_field_access_poly.py

+#
+# Copyright © 2020 Stephan Seitz <stephan.seitz@fau.de>
+#
+# Distributed under terms of the GPLv3 license.
+
+"""
+
+"""
+
+
+from pystencils.session import *
+
+from sympy import poly
+
+
+def test_field_access_poly():
+    dh = ps.create_data_handling((20, 20))
+    ρ = dh.add_array('rho')
+    rho = ρ.center
+    a = poly(rho+0.5, rho)
+    print(a)
+
+
+def test_field_access_piecewise():
+    dh = ps.create_data_handling((20, 20))
+    ρ = dh.add_array('rho')
+    pw = sp.Piecewise((0, 1 < sp.Max(-0.5, ρ.center+0.5)), (1, True))
+    a = sp.simplify(pw)
+    print(a)

pystencils_tests/test_simplification_strategy.py

@@ -30,7 +30,7 @@ def test_simplification_strategy():
 
     result = strategy(ac)
     assert result.operation_count['adds'] == 7
-    assert result.operation_count['muls'] == 5
+    assert result.operation_count['muls'] == 4
     assert result.operation_count['divs'] == 0
 
     # Trigger display routines, such that they are at least executed

pystencils_tests/test_timeloop.py

@@ -59,4 +59,4 @@ def test_timeloop():
     timeloop.run_time_span(seconds=seconds)
     end = time.perf_counter()
 
-    np.testing.assert_almost_equal(seconds, end - start, decimal=3)
+    np.testing.assert_almost_equal(seconds, end - start, decimal=2)

setup.py

+import setuptools
 import distutils
 import io
 import os
@@ -5,8 +6,6 @@ import sys
 from contextlib import redirect_stdout
 from importlib import import_module
 
-from setuptools import find_packages, setup
-
 if '--use-cython' in sys.argv:
     USE_CYTHON = True
     sys.argv.remove('--use-cython')
@@ -77,58 +76,58 @@ try:
 except ImportError:
     version = open('RELEASE-VERSION', 'r').read()
 
-setup(name='pystencils',
-      description='Speeding up stencil computations on CPUs and GPUs',
-      version=version,
-      long_description=readme(),
-      long_description_content_type="text/markdown",
-      author='Martin Bauer',
-      license='AGPLv3',
-      author_email='martin.bauer@fau.de',
-      url='https://i10git.cs.fau.de/pycodegen/pystencils/',
-      packages=['pystencils'] + ['pystencils.' + s for s in find_packages('pystencils')],
-      install_requires=['sympy>=1.1', 'numpy', 'appdirs', 'joblib'],
-      package_data={'pystencils': ['include/*.h',
-                                   'backends/cuda_known_functions.txt',
-                                   'backends/opencl1.1_known_functions.txt']},
-
-      ext_modules=cython_extensions("pystencils.boundaries.createindexlistcython"),
-      classifiers=[
-          'Development Status :: 4 - Beta',
-          'Framework :: Jupyter',
-          'Topic :: Software Development :: Code Generators',
-          'Topic :: Scientific/Engineering :: Physics',
-          'Intended Audience :: Developers',
-          'Intended Audience :: Science/Research',
-          'License :: OSI Approved :: GNU Affero General Public License v3 or later (AGPLv3+)',
-      ],
-      project_urls={
-          "Bug Tracker": "https://i10git.cs.fau.de/pycodegen/pystencils/issues",
-          "Documentation": "http://pycodegen.pages.walberla.net/pystencils/",
-          "Source Code": "https://i10git.cs.fau.de/pycodegen/pystencils",
-      },
-      extras_require={
-          'gpu': ['pycuda'],
-          'opencl': ['pyopencl'],
-          'alltrafos': ['islpy', 'py-cpuinfo'],
-          'bench_db': ['blitzdb', 'pymongo', 'pandas'],
-          'interactive': ['matplotlib', 'ipy_table', 'imageio', 'jupyter', 'pyevtk', 'rich', 'graphviz'],
-          'autodiff': ['pystencils-autodiff'],
-          'doc': ['sphinx', 'sphinx_rtd_theme', 'nbsphinx',
-                  'sphinxcontrib-bibtex', 'sphinx_autodoc_typehints', 'pandoc'],
-      },
-      tests_require=['pytest',
-                     'pytest-cov',
-                     'pytest-html',
-                     'ansi2html',
-                     'pytest-xdist',
-                     'flake8',
-                     'nbformat',
-                     'nbconvert',
-                     'ipython'],
-
-      python_requires=">=3.6",
-      cmdclass={
-          'quicktest': SimpleTestRunner
-      },
-      )
+setuptools.setup(name='pystencils',
+                 description='Speeding up stencil computations on CPUs and GPUs',
+                 version=version,
+                 long_description=readme(),
+                 long_description_content_type="text/markdown",
+                 author='Martin Bauer',
+                 license='AGPLv3',
+                 author_email='martin.bauer@fau.de',
+                 url='https://i10git.cs.fau.de/pycodegen/pystencils/',
+                 packages=['pystencils'] + ['pystencils.' + s for s in setuptools.find_packages('pystencils')],
+                 install_requires=['sympy>=1.1', 'numpy', 'appdirs', 'joblib'],
+                 package_data={'pystencils': ['include/*.h',
+                                              'backends/cuda_known_functions.txt',
+                                              'backends/opencl1.1_known_functions.txt']},
+
+                 ext_modules=cython_extensions("pystencils.boundaries.createindexlistcython"),
+                 classifiers=[
+                     'Development Status :: 4 - Beta',
+                     'Framework :: Jupyter',
+                     'Topic :: Software Development :: Code Generators',
+                     'Topic :: Scientific/Engineering :: Physics',
+                     'Intended Audience :: Developers',
+                     'Intended Audience :: Science/Research',
+                     'License :: OSI Approved :: GNU Affero General Public License v3 or later (AGPLv3+)',
+                 ],
+                 project_urls={
+                     "Bug Tracker": "https://i10git.cs.fau.de/pycodegen/pystencils/issues",
+                     "Documentation": "http://pycodegen.pages.walberla.net/pystencils/",
+                     "Source Code": "https://i10git.cs.fau.de/pycodegen/pystencils",
+                 },
+                 extras_require={
+                     'gpu': ['pycuda'],
+                     'opencl': ['pyopencl'],
+                     'alltrafos': ['islpy', 'py-cpuinfo'],
+                     'bench_db': ['blitzdb', 'pymongo', 'pandas'],
+                     'interactive': ['matplotlib', 'ipy_table', 'imageio', 'jupyter', 'pyevtk', 'rich', 'graphviz'],
+                     'autodiff': ['pystencils-autodiff'],
+                     'doc': ['sphinx', 'sphinx_rtd_theme', 'nbsphinx',
+                             'sphinxcontrib-bibtex', 'sphinx_autodoc_typehints', 'pandoc'],
+                 },
+                 tests_require=['pytest',
+                                'pytest-cov',
+                                'pytest-html',
+                                'ansi2html',
+                                'pytest-xdist',
+                                'flake8',
+                                'nbformat',
+                                'nbconvert',
+                                'ipython'],
+
+                 python_requires=">=3.6",
+                 cmdclass={
+                     'quicktest': SimpleTestRunner
+                 },
+                 )