From 87f5cfddde88a9d21e3ff774e1e5ebfd6fb12454 Mon Sep 17 00:00:00 2001
From: markus <markus.holzer@fau.de>
Date: Fri, 19 Jun 2020 17:29:02 +0200
Subject: [PATCH] Replaced all format strings with f-strings in test cases
---
pystencils_tests/test_blocking.py | 2 +-
pystencils_tests/test_interpolation.py | 4 ++--
pystencils_tests/test_loop_cutting.py | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/pystencils_tests/test_blocking.py b/pystencils_tests/test_blocking.py
index 579ba4199..b2b815b1a 100644
--- a/pystencils_tests/test_blocking.py
+++ b/pystencils_tests/test_blocking.py
@@ -19,7 +19,7 @@ def check_equivalence(assignments, src_arr):
with_blocking = ps.create_kernel(assignments, cpu_blocking=(8, 16, 4), cpu_openmp=openmp,
cpu_vectorize_info=vectorization).compile()
without_blocking = ps.create_kernel(assignments).compile()
- print(" openmp {}, vectorization {}".format(openmp, vectorization))
+ print(f" openmp {openmp}, vectorization {vectorization}")
dst_arr = np.zeros_like(src_arr)
ref_arr = np.zeros_like(src_arr)
np.copyto(src_arr, np.random.rand(*src_arr.shape))
diff --git a/pystencils_tests/test_interpolation.py b/pystencils_tests/test_interpolation.py
index 477765bb3..19201c7c9 100644
--- a/pystencils_tests/test_interpolation.py
+++ b/pystencils_tests/test_interpolation.py
@@ -125,7 +125,7 @@ def test_rotate_interpolation_gpu(dtype, address_mode, use_textures):
else:
lenna_gpu = gpuarray.to_gpu(
np.ascontiguousarray(lenna, dtype))
- x_f, y_f = pystencils.fields('x,y: %s [2d]' % type_map[dtype], ghost_layers=0)
+ x_f, y_f = pystencils.fields(f'x,y: {type_map[dtype]} [2d]', ghost_layers=0)
transformed = scale * \
sympy.rot_axis3(rotation_angle)[:2, :2] * sympy.Matrix((x_, y_)) - sympy.Matrix([2, 2])
@@ -173,7 +173,7 @@ def test_shift_interpolation_gpu(address_mode, dtype, use_textures):
lenna_gpu = gpuarray.to_gpu(
np.ascontiguousarray(lenna, dtype))
- x_f, y_f = pystencils.fields('x,y: %s [2d]' % type_map[dtype], ghost_layers=0)
+ x_f, y_f = pystencils.fields(f'x,y: {type_map[dtype]} [2d]', ghost_layers=0)
if use_textures:
transformed = scale * sympy.rot_axis3(rotation_angle)[:2, :2] * sympy.Matrix((x_, y_)) + shift
diff --git a/pystencils_tests/test_loop_cutting.py b/pystencils_tests/test_loop_cutting.py
index 0291074b8..daf803cbd 100644
--- a/pystencils_tests/test_loop_cutting.py
+++ b/pystencils_tests/test_loop_cutting.py
@@ -112,7 +112,7 @@ def test_staggered_iteration_manual():
def test_staggered_gpu():
dim = 2
- f = ps.fields("f: double[{dim}D]".format(dim=dim))
+ f = ps.fields(f"f: double[{dim}D]")
s = ps.fields("s({dim}): double[{dim}D]".format(dim=dim), field_type=FieldType.STAGGERED)
expressions = [(f[0, 0] + f[-1, 0]) / 2,
(f[0, 0] + f[0, -1]) / 2]
--
GitLab