Skip to content

Commit 0a4848d

Browse files
committed
Removed default precompiled=False in set_backend. Added precompiled=True where needed in test_stencil_matrix.py
1 parent 221b92b commit 0a4848d

File tree

2 files changed

+12
-10
lines changed

2 files changed

+12
-10
lines changed

psydac/linalg/stencil.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -945,8 +945,10 @@ def __init__( self, V, W, pads=None , backend=None, precompiled=False):
945945
self._transpose_args = self._prepare_transpose_args()
946946
self._transpose_func = kernels['transpose'][self._ndim]
947947

948-
# if backend is None:
949-
# backend = PSYDAC_BACKENDS.get(os.environ.get('PSYDAC_BACKEND')) or PSYDAC_BACKENDS['python']
948+
if backend is None:
949+
backend = PSYDAC_BACKENDS.get(os.environ.get('PSYDAC_BACKEND')) or PSYDAC_BACKENDS['python']
950+
print(backend)
951+
print(precompiled)
950952
self.set_backend(backend, precompiled)
951953

952954
#--------------------------------------
@@ -1764,7 +1766,7 @@ def _prepare_transpose_args(self):
17641766
return args
17651767

17661768
# ...
1767-
def set_backend(self, backend, precompiled=False):
1769+
def set_backend(self, backend, precompiled):
17681770
'''
17691771
Define which kernels are called when using .dot() and .transpose()
17701772
@@ -1774,7 +1776,7 @@ def set_backend(self, backend, precompiled=False):
17741776
Psydac backend option.
17751777
17761778
precompiled : bool
1777-
Whether to use precompiled kernels. Default: False.
1779+
Whether to use precompiled kernels.
17781780
'''
17791781
from psydac.api.ast.linalg import LinearOperatorDot
17801782
self._backend = backend

psydac/linalg/tests/test_stencil_matrix.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,14 @@ def test_stencil_matrix_1d_serial_init(dtype, n1, p1, s1, P1=True):
5959

6060
# Create a vector space V and a matrix M from V to V
6161
V = StencilVectorSpace(cart, dtype=dtype)
62-
M = StencilMatrix(V, V)
62+
M = StencilMatrix(V, V, precompiled=True)
6363

6464
# Check properties of this matrix
6565
assert M.domain == V
6666
assert M.codomain == V
6767
assert M.dtype == dtype
6868
assert M.pads == (p1,)
69-
assert M.backend == None
69+
assert M.backend == PSYDAC_BACKEND_PYTHON
7070
assert M._data.shape == (n1 + 2 * p1 * s1, 1 + 2 * p1)
7171
assert M.shape == (n1 , n1 )
7272

@@ -89,14 +89,14 @@ def test_stencil_matrix_2d_serial_init(dtype, n1, n2, p1, p2, s1, s2, P1=True, P
8989

9090
# Create a vector space V and a matrix M from V to V
9191
V = StencilVectorSpace(cart, dtype=dtype)
92-
M = StencilMatrix(V, V)
92+
M = StencilMatrix(V, V, precompiled=True)
9393

9494
# Check properties of this matrix
9595
assert M.domain == V
9696
assert M.codomain == V
9797
assert M.dtype == dtype
9898
assert M.pads == (p1, p2)
99-
assert M.backend == None
99+
assert M.backend == PSYDAC_BACKEND_PYTHON
100100
assert M._data.shape == (n1 + 2 * p1 * s1, n2 + 2 * p2 * s2, 1 + 2 * p1, 1 + 2 * p2)
101101
assert M.shape == (n1 * n2, n1 * n2)
102102

@@ -129,7 +129,7 @@ def test_stencil_matrix_3d_serial_init(dtype, n1, n2, n3, p1, p2, p3, s1, s2, s3
129129
assert M.codomain == V
130130
assert M.dtype == dtype
131131
assert M.pads == (p1, p2, p3)
132-
assert M.backend == None
132+
assert M.backend == PSYDAC_BACKEND_PYTHON
133133
assert M._data.shape == (n1 + 2 * p1 * s1, n2 + 2 * p2 * s2, n3+2*p3*s3, 1 + 2 * p1, 1 + 2 * p2, 1+2*p3)
134134
assert M.shape == (n1 * n2 * n3, n1 * n2 * n3)
135135

@@ -302,7 +302,7 @@ def test_stencil_matrix_2d_math(dtype, n1, n2, p1, p2, s1, s2, P1=True, P2=False
302302
assert m.codomain == V
303303
assert m.dtype == dtype
304304
assert m.pads == (p1, p2)
305-
assert m.backend == None
305+
assert M.backend == PSYDAC_BACKEND_PYTHON
306306
assert m._data.shape == (n1 + 2 * p1 * s1, n2 + 2 * p2 * s2, 1 + 2 * p1, 1 + 2 * p2)
307307
assert m.shape == (n1 * n2, n1 * n2)
308308
assert np.allclose(m._data, m_exa)

0 commit comments

Comments
 (0)