From 72ba61c7bdcef77f4a8adbb81fd1ed1e38492d25 Mon Sep 17 00:00:00 2001 From: Stephan Seitz <stephan.seitz@fau.de> Date: Wed, 24 Jul 2019 12:53:11 +0200 Subject: [PATCH] Adapt test test_address_of to use create_type --- pystencils_tests/test_address_of.py | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/pystencils_tests/test_address_of.py b/pystencils_tests/test_address_of.py index 8de48e2b..5b297fc6 100644 --- a/pystencils_tests/test_address_of.py +++ b/pystencils_tests/test_address_of.py @@ -3,19 +3,18 @@ Test of pystencils.data_types.address_of """ -from pystencils.data_types import address_of, cast_func, PointerType import pystencils +from pystencils.data_types import PointerType, address_of, cast_func, create_type from pystencils.simp.simplifications import sympy_cse -import sympy def test_address_of(): x, y = pystencils.fields('x,y: int64[2d]') - s = pystencils.TypedSymbol('s', PointerType('int64')) + s = pystencils.TypedSymbol('s', PointerType(create_type('int64'))) assignments = pystencils.AssignmentCollection({ s: address_of(x[0, 0]), - y[0, 0]: cast_func(s, 'int64') + y[0, 0]: cast_func(s, create_type('int64')) }, {}) ast = pystencils.create_kernel(assignments) @@ -23,7 +22,7 @@ def test_address_of(): print(code) assignments = pystencils.AssignmentCollection({ - y[0, 0]: cast_func(address_of(x[0, 0]), 'int64') + y[0, 0]: cast_func(address_of(x[0, 0]), create_type('int64')) }, {}) ast = pystencils.create_kernel(assignments) @@ -33,11 +32,11 @@ def test_address_of(): def test_address_of_with_cse(): x, y = pystencils.fields('x,y: int64[2d]') - s = pystencils.TypedSymbol('s', PointerType('int64')) + s = pystencils.TypedSymbol('s', PointerType(create_type('int64'))) assignments = pystencils.AssignmentCollection({ - y[0, 0]: cast_func(address_of(x[0, 0]), 'int64'), - x[0, 0]: cast_func(address_of(x[0, 0]), 'int64') + 1 + y[0, 0]: cast_func(address_of(x[0, 0]), create_type('int64')) + s, + x[0, 0]: cast_func(address_of(x[0, 0]), create_type('int64')) + 1 }, {}) ast = pystencils.create_kernel(assignments) -- GitLab