diff --git a/.isort.cfg b/.isort.cfg new file mode 100644 index 0000000000000000000000000000000000000000..cbdece3111e9f53cddffe209dd5e1ac4930ad9c5 --- /dev/null +++ b/.isort.cfg @@ -0,0 +1,4 @@ +[settings] +line_length=100 +balanced_wrapping=True +multi_line_output=4 diff --git a/pystencils_walberla/__init__.py b/pystencils_walberla/__init__.py index 5d8aab2a4562ffd1c67cc69bda395f6875d38839..b8f06f38d4b81dc046593caea0870eaa2e648629 100644 --- a/pystencils_walberla/__init__.py +++ b/pystencils_walberla/__init__.py @@ -1,5 +1,7 @@ -from .codegen import generate_sweep, generate_pack_info_from_kernel, generate_pack_info_for_field, generate_pack_info from .cmake_integration import CodeGeneration +from .codegen import ( + generate_pack_info, generate_pack_info_for_field, generate_pack_info_from_kernel, + generate_sweep) __all__ = ['CodeGeneration', 'generate_sweep', 'generate_pack_info_from_kernel', 'generate_pack_info_for_field', 'generate_pack_info'] diff --git a/pystencils_walberla/cmake_integration.py b/pystencils_walberla/cmake_integration.py index 459c8a3bbce92ca44efbe610698f0a07104525db..b1265a2a0bab44427660c4cbcb5c9f2c3e20e163 100644 --- a/pystencils_walberla/cmake_integration.py +++ b/pystencils_walberla/cmake_integration.py @@ -10,8 +10,8 @@ Usage example: """ import json -import sys import os +import sys import warnings __all__ = ['CodeGeneration', 'ManualCodeGenerationContext'] diff --git a/pystencils_walberla/codegen.py b/pystencils_walberla/codegen.py index 60698babc3829304313b5446bc5821380e3d1e2e..4a70883af6566cbfec838b091fea4183d44ba6b4 100644 --- a/pystencils_walberla/codegen.py +++ b/pystencils_walberla/codegen.py @@ -1,15 +1,16 @@ -from jinja2 import Environment, PackageLoader from collections import OrderedDict, defaultdict from itertools import product -from typing import Dict, Sequence, Tuple, Optional +from typing import Dict, Optional, Sequence, Tuple + +from jinja2 import Environment, PackageLoader -from pystencils import create_staggered_kernel, Field, create_kernel, Assignment, FieldType, AssignmentCollection +from pystencils import ( + Assignment, AssignmentCollection, Field, FieldType, create_kernel, create_staggered_kernel) from pystencils.backends.cbackend import get_headers from pystencils.backends.simd_instruction_sets import get_supported_instruction_sets -from pystencils.stencil import offset_to_direction_string, inverse_direction +from pystencils.stencil import inverse_direction, offset_to_direction_string from pystencils_walberla.jinja_filters import add_pystencils_filters_to_jinja_env - __all__ = ['generate_sweep', 'generate_pack_info', 'generate_pack_info_for_field', 'generate_pack_info_from_kernel', 'default_create_kernel_parameters', 'KernelInfo'] diff --git a/pystencils_walberla/jinja_filters.py b/pystencils_walberla/jinja_filters.py index b7a578b9f63da94a79406c6ede00cfd93b78f457..9ce43a848b843d06d675c24cbb57fbf352a31817 100644 --- a/pystencils_walberla/jinja_filters.py +++ b/pystencils_walberla/jinja_filters.py @@ -1,8 +1,9 @@ -import sympy as sp import jinja2 +import sympy as sp + from pystencils import TypedSymbol +from pystencils.backends.cbackend import CustomSympyPrinter, generate_c from pystencils.data_types import get_base_type -from pystencils.backends.cbackend import generate_c, CustomSympyPrinter from pystencils.field import FieldType from pystencils.kernelparameters import SHAPE_DTYPE from pystencils.sympyextensions import prod diff --git a/pystencils_walberla_tests/test_packinfo_generation.py b/pystencils_walberla_tests/test_packinfo_generation.py index f0cf9a2acfe92427e9468f8295991f232f8819b2..dbe4810525e406e248724a9850ec72fa3c113e5e 100644 --- a/pystencils_walberla_tests/test_packinfo_generation.py +++ b/pystencils_walberla_tests/test_packinfo_generation.py @@ -1,7 +1,8 @@ +import unittest + import pystencils as ps from pystencils_walberla import generate_pack_info_for_field, generate_pack_info_from_kernel from pystencils_walberla.cmake_integration import ManualCodeGenerationContext -import unittest class PackinfoGenTest(unittest.TestCase): diff --git a/pystencils_walberla_tests/test_walberla_gen.py b/pystencils_walberla_tests/test_walberla_gen.py index e1caa37e1746f4544693d0942b5c2e6078f225e7..eb8037b704a42f3fce11ba1cc23908a351c7bab9 100644 --- a/pystencils_walberla_tests/test_walberla_gen.py +++ b/pystencils_walberla_tests/test_walberla_gen.py @@ -1,8 +1,10 @@ +import unittest + import sympy as sp + import pystencils as ps from pystencils_walberla import generate_sweep from pystencils_walberla.cmake_integration import ManualCodeGenerationContext -import unittest class CodegenTest(unittest.TestCase):