From b98decd50e1a3ed67fa851cdb8d4b5b88193e028 Mon Sep 17 00:00:00 2001
From: Martin Bauer <martin.bauer@fau.de>
Date: Wed, 14 Nov 2018 11:11:38 +0100
Subject: [PATCH] PEP8 compliance
---
astnodes.py | 2 +-
boundaries/boundaryhandling.py | 2 +-
cpu/cpujit.py | 1 -
cpu/kernelcreation.py | 2 +-
field.py | 2 +-
gpucuda/cudajit.py | 4 ++--
gpucuda/kernelcreation.py | 3 +--
llvm/llvmjit.py | 2 +-
sympyextensions.py | 2 +-
9 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/astnodes.py b/astnodes.py
index 6a7026c6a..3548afae4 100644
--- a/astnodes.py
+++ b/astnodes.py
@@ -198,7 +198,7 @@ class KernelFunction(Node):
This function is expensive, cache the result where possible!
"""
- field_map = {f.name: f for f in self.fields_accessed}
+ field_map = {symbol_name_to_variable_name(f.name): f for f in self.fields_accessed}
def get_fields(symbol):
if hasattr(symbol, 'field_name'):
diff --git a/boundaries/boundaryhandling.py b/boundaries/boundaryhandling.py
index d60209d11..a440fd211 100644
--- a/boundaries/boundaryhandling.py
+++ b/boundaries/boundaryhandling.py
@@ -223,7 +223,7 @@ class BoundaryHandling:
arguments['indexField'] = idx_arr
data_used_in_kernel = (p.fields[0].name
for p in self._boundary_object_to_boundary_info[b_obj].kernel.parameters
- if isinstance(p.symbol, FieldPointerSymbol) and p.fields[0].name not in arguments)
+ if isinstance(p.symbol, FieldPointerSymbol) and p.field_name not in arguments)
arguments.update({name: b[name] for name in data_used_in_kernel if name not in arguments})
kernel = self._boundary_object_to_boundary_info[b_obj].kernel
diff --git a/cpu/cpujit.py b/cpu/cpujit.py
index cfcd4fef3..807004825 100644
--- a/cpu/cpujit.py
+++ b/cpu/cpujit.py
@@ -56,7 +56,6 @@ import subprocess
from appdirs import user_config_dir, user_cache_dir
from collections import OrderedDict
-from pystencils.kernelparameters import FieldPointerSymbol, FieldStrideSymbol, FieldShapeSymbol
from pystencils.utils import recursive_dict_update
from sysconfig import get_paths
from pystencils import FieldType
diff --git a/cpu/kernelcreation.py b/cpu/kernelcreation.py
index d3db5d978..136cd7f87 100644
--- a/cpu/kernelcreation.py
+++ b/cpu/kernelcreation.py
@@ -3,7 +3,7 @@ from functools import partial
from pystencils.astnodes import SympyAssignment, Block, LoopOverCoordinate, KernelFunction
from pystencils.transformations import resolve_buffer_accesses, resolve_field_accesses, make_loop_over_domain, \
add_types, get_optimal_loop_ordering, parse_base_pointer_info, move_constants_before_loop, \
- split_inner_loop, substitute_array_accesses_with_constants, get_base_buffer_index
+ split_inner_loop, get_base_buffer_index
from pystencils.data_types import TypedSymbol, BasicType, StructType, create_type
from pystencils.field import Field, FieldType
import pystencils.astnodes as ast
diff --git a/field.py b/field.py
index 088c2f9fc..8cc5ee0f6 100644
--- a/field.py
+++ b/field.py
@@ -5,7 +5,7 @@ import numpy as np
import sympy as sp
from sympy.core.cache import cacheit
from pystencils.alignedarray import aligned_empty
-from pystencils.data_types import create_type, create_composite_type_from_string, StructType
+from pystencils.data_types import create_type, StructType
from pystencils.kernelparameters import FieldShapeSymbol, FieldStrideSymbol
from pystencils.stencils import offset_to_direction_string, direction_string_to_offset
from pystencils.sympyextensions import is_integer_sequence
diff --git a/gpucuda/cudajit.py b/gpucuda/cudajit.py
index f5077defb..ef10184b5 100644
--- a/gpucuda/cudajit.py
+++ b/gpucuda/cudajit.py
@@ -1,8 +1,8 @@
import numpy as np
from pystencils.backends.cbackend import generate_c
-from pystencils.kernelparameters import FieldPointerSymbol, FieldStrideSymbol, FieldShapeSymbol
+from pystencils.kernelparameters import FieldPointerSymbol
from pystencils.sympyextensions import symbol_name_to_variable_name
-from pystencils.data_types import StructType, get_base_type
+from pystencils.data_types import StructType
from pystencils.field import FieldType
diff --git a/gpucuda/kernelcreation.py b/gpucuda/kernelcreation.py
index 3fa8efddf..0e5d2939b 100644
--- a/gpucuda/kernelcreation.py
+++ b/gpucuda/kernelcreation.py
@@ -2,8 +2,7 @@ from functools import partial
from pystencils.gpucuda.indexing import BlockIndexing
from pystencils.transformations import resolve_field_accesses, add_types, parse_base_pointer_info, \
- get_common_shape, substitute_array_accesses_with_constants, resolve_buffer_accesses, unify_shape_symbols, \
- get_base_buffer_index
+ get_common_shape, resolve_buffer_accesses, unify_shape_symbols, get_base_buffer_index
from pystencils.astnodes import Block, KernelFunction, SympyAssignment, LoopOverCoordinate
from pystencils.data_types import TypedSymbol, BasicType, StructType
from pystencils import Field, FieldType
diff --git a/llvm/llvmjit.py b/llvm/llvmjit.py
index 9312693d9..e33d97d99 100644
--- a/llvm/llvmjit.py
+++ b/llvm/llvmjit.py
@@ -3,7 +3,7 @@ import llvmlite.binding as llvm
import numpy as np
import ctypes as ct
from pystencils.data_types import create_composite_type_from_string
-from ..data_types import to_ctypes, ctypes_from_llvm, StructType, get_base_type
+from ..data_types import to_ctypes, ctypes_from_llvm, StructType
from .llvm import generate_llvm
from pystencils.sympyextensions import symbol_name_to_variable_name
from pystencils.field import FieldType
diff --git a/sympyextensions.py b/sympyextensions.py
index df236f5c8..400f55d66 100644
--- a/sympyextensions.py
+++ b/sympyextensions.py
@@ -553,4 +553,4 @@ class SymbolCreator:
def symbol_name_to_variable_name(symbol_name):
"""Replaces characters which are allowed in sympy symbol names but not in C/C++ variable names"""
- return symbol_name.replace("^", "_")
\ No newline at end of file
+ return symbol_name.replace("^", "_")
--
GitLab