Skip to content
Snippets Groups Projects
Commit ff05f9d8 authored by Markus Holzer's avatar Markus Holzer
Browse files

Merge branch 'master' into 'master'

Fixes for Vector Testcase to Work

See merge request !200
parents e20f82a3 40af81fe
Branches
Tags
1 merge request!200Fixes for Vector Testcase to Work
Pipeline #28821 failed
...@@ -342,7 +342,7 @@ class PyStencilsKerncraftKernel(KernelCode): ...@@ -342,7 +342,7 @@ class PyStencilsKerncraftKernel(KernelCode):
class KerncraftParameters(DotDict): class KerncraftParameters(DotDict):
def __init__(self, **kwargs): def __init__(self, **kwargs):
super(KerncraftParameters, self).__init__(**kwargs) super(KerncraftParameters, self).__init__()
self['asm_block'] = 'auto' self['asm_block'] = 'auto'
self['asm_increment'] = 0 self['asm_increment'] = 0
self['cores'] = 1 self['cores'] = 1
...@@ -353,6 +353,7 @@ class KerncraftParameters(DotDict): ...@@ -353,6 +353,7 @@ class KerncraftParameters(DotDict):
self['unit'] = 'cy/CL' self['unit'] = 'cy/CL'
self['ignore_warnings'] = True self['ignore_warnings'] = True
self['incore_model'] = 'OSACA' self['incore_model'] = 'OSACA'
self.update(**kwargs)
# ------------------------------------------- Helper functions --------------------------------------------------------- # ------------------------------------------- Helper functions ---------------------------------------------------------
......
...@@ -10,7 +10,7 @@ from sympy.functions import Abs ...@@ -10,7 +10,7 @@ from sympy.functions import Abs
from sympy.core.numbers import Zero from sympy.core.numbers import Zero
from pystencils.assignment import Assignment from pystencils.assignment import Assignment
from pystencils.data_types import cast_func, get_type_of_expression, PointerType from pystencils.data_types import cast_func, get_type_of_expression, PointerType, VectorType
from pystencils.kernelparameters import FieldPointerSymbol from pystencils.kernelparameters import FieldPointerSymbol
T = TypeVar('T') T = TypeVar('T')
...@@ -465,6 +465,8 @@ def count_operations(term: Union[sp.Expr, List[sp.Expr]], ...@@ -465,6 +465,8 @@ def count_operations(term: Union[sp.Expr, List[sp.Expr]],
base_type = get_type_of_expression(e) base_type = get_type_of_expression(e)
except ValueError: except ValueError:
return False return False
if isinstance(base_type, VectorType):
return False
if isinstance(base_type, PointerType): if isinstance(base_type, PointerType):
return only_type == 'int' return only_type == 'int'
if only_type == 'int' and (base_type.is_int() or base_type.is_uint()): if only_type == 'int' and (base_type.is_int() or base_type.is_uint()):
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment