Skip to content
Snippets Groups Projects
Commit 36737eb4 authored by Frederik Hennig's avatar Frederik Hennig
Browse files

Minor fixes of index-dtypes

parent 9329657b
No related branches found
No related tags found
1 merge request!408Refactor Field Indexing Symbols
Pipeline #67838 passed
...@@ -309,7 +309,7 @@ class KernelCreationContext: ...@@ -309,7 +309,7 @@ class KernelCreationContext:
f"Multiple incompatible types found in index symbols of field {field}: " f"Multiple incompatible types found in index symbols of field {field}: "
f"{idx_types}" f"{idx_types}"
) )
idx_type = idx_types.pop() if len(idx_types) > 0 else DEFAULTS.index_dtype idx_type = idx_types.pop() if len(idx_types) > 0 else self.index_dtype
arr_shape = [ arr_shape = [
(s.name if isinstance(s, TypedSymbol) else s) for s in field.shape (s.name if isinstance(s, TypedSymbol) else s) for s in field.shape
......
...@@ -8,8 +8,8 @@ import waLBerla as wlb ...@@ -8,8 +8,8 @@ import waLBerla as wlb
from pystencils.datahandling.blockiteration import block_iteration, sliced_block_iteration from pystencils.datahandling.blockiteration import block_iteration, sliced_block_iteration
from pystencils.datahandling.datahandling_interface import DataHandling from pystencils.datahandling.datahandling_interface import DataHandling
from pystencils.field import Field, FieldType from pystencils.field import Field, FieldType
from pystencils.sympyextensions.typed_sympy import FieldPointerSymbol
from pystencils.utils import DotDict from pystencils.utils import DotDict
from pystencils.backend.kernelfunction import FieldPointerParam
from pystencils import Target from pystencils import Target
...@@ -258,9 +258,9 @@ class ParallelDataHandling(DataHandling): ...@@ -258,9 +258,9 @@ class ParallelDataHandling(DataHandling):
else: else:
name_map = self._field_name_to_cpu_data_name name_map = self._field_name_to_cpu_data_name
to_array = wlb.field.toArray to_array = wlb.field.toArray
data_used_in_kernel = [(name_map[p.symbol.field_name], self.fields[p.symbol.field_name]) data_used_in_kernel = [(name_map[p.field_name], self.fields[p.field_name])
for p in kernel_function.parameters if for p in kernel_function.parameters if
isinstance(p.symbol, FieldPointerSymbol) and p.symbol.field_name not in kwargs] isinstance(p, FieldPointerParam) and p.field_name not in kwargs]
result = [] result = []
for block in self.blocks: for block in self.blocks:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment