pystencils_walberla/codegen.py

@@ -2,7 +2,7 @@ from collections import OrderedDict, defaultdict
 from itertools import product
 from typing import Dict, Optional, Sequence, Tuple
 
-from jinja2 import Environment, PackageLoader
+from jinja2 import Environment, PackageLoader, StrictUndefined
 
 from pystencils import (
     Assignment, AssignmentCollection, Field, FieldType, create_kernel, create_staggered_kernel)
@@ -65,7 +65,7 @@ def generate_sweep(generation_context, class_name, assignments,
 
     ast.function_name = class_name.lower()
 
-    env = Environment(loader=PackageLoader('pystencils_walberla'))
+    env = Environment(loader=PackageLoader('pystencils_walberla'), undefined=StrictUndefined)
     add_pystencils_filters_to_jinja_env(env)
 
     if inner_outer_split is False:
@@ -244,7 +244,7 @@ def generate_pack_info(generation_context, class_name: str,
         'field_name': field_names.pop(),
         'namespace': namespace,
     }
-    env = Environment(loader=PackageLoader('pystencils_walberla'))
+    env = Environment(loader=PackageLoader('pystencils_walberla'), undefined=StrictUndefined)
     add_pystencils_filters_to_jinja_env(env)
     header = env.get_template(template_name + ".h").render(**jinja_context)
     source = env.get_template(template_name + ".cpp").render(**jinja_context)
@@ -305,7 +305,7 @@ def generate_mpidtype_info_from_kernel(generation_context, class_name: str,
         'f_size': field.index_shape[0],
         'spec': spec,
     }
-    env = Environment(loader=PackageLoader('pystencils_walberla'))
+    env = Environment(loader=PackageLoader('pystencils_walberla'), undefined=StrictUndefined)
     header = env.get_template("MpiDtypeInfo.tmpl.h").render(**jinja_context)
     generation_context.write_file("{}.h".format(class_name), header)
 

pystencils_walberla/templates/Sweep.tmpl.cpp

@@ -13,7 +13,7 @@
 //  You should have received a copy of the GNU General Public License along
 //  with waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
 //
-//! \\file {{className}}.cpp
+//! \\file {{class_name}}.cpp
 //! \\ingroup lbm
 //! \\author lbmpy
 //======================================================================================================================

pystencils_walberla/templates/SweepInnerOuter.tmpl.cpp

@@ -13,7 +13,7 @@
 //  You should have received a copy of the GNU General Public License along
 //  with waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
 //
-//! \\file {{className}}.cpp
+//! \\file {{class_name}}.cpp
 //! \\ingroup lbm
 //! \\author lbmpy
 //======================================================================================================================

setup.py

 from setuptools import setup
 import subprocess
+from distutils.version import StrictVersion
 
 
 def version_number_from_git(tag_prefix='release/', sha_length=10, version_format="{version}.dev{commits}+{sha}"):
@@ -17,7 +18,9 @@ def version_number_from_git(tag_prefix='release/', sha_length=10, version_format
         return '.'.join(str(i) for i in parsed_version)
 
     try:
-        latest_release = get_released_versions()[-1]
+        version_strings = get_released_versions()
+        version_strings.sort(key=StrictVersion)
+        latest_release = version_strings[-1]
     except subprocess.CalledProcessError:
         return open('RELEASE-VERSION', 'r').read()
 
@@ -40,9 +43,15 @@ def version_number_from_git(tag_prefix='release/', sha_length=10, version_format
     return version_string
 
 
+def readme():
+    with open('README.md') as f:
+        return f.read()
+
+
 setup(name='pystencils_walberla',
       version=version_number_from_git(),
       description='pystencils code generation for waLBerla apps',
+      long_description=readme(),
       author='Martin Bauer',
       license='AGPLv3',
       author_email='martin.bauer@fau.de',