Skip to content

Commit f7f7c4c

Browse files
alexfiklinducer
authored andcommitted
squash some more misc deprecations
1 parent 510dd18 commit f7f7c4c

File tree

6 files changed

+23
-16
lines changed

6 files changed

+23
-16
lines changed

pytential/linalg/skeletonization.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,9 @@ def prg():
132132
<> ioffset = starts[icluster]
133133
<> npoints = starts[icluster + 1] - ioffset
134134
result[icluster] = reduce(sum, i, waa[indices[i + ioffset]]) / npoints
135-
""")
135+
""",
136+
lang_version=lp.MOST_RECENT_LANGUAGE_VERSION,
137+
)
136138

137139
return knl
138140

pytential/symbolic/execution.py

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -193,11 +193,8 @@ def map_elementwise_max(self, expr):
193193
def map_ones(self, expr):
194194
discr = self.places.get_discretization(
195195
expr.dofdesc.geometry, expr.dofdesc.discr_stage)
196-
result = discr.empty(actx=self.array_context, dtype=discr.real_dtype)
197-
198-
for grp_ary in result:
199-
grp_ary.fill(1)
200-
return result
196+
return self.array_context.np.ones_like(
197+
self.array_context.thaw(discr.nodes()[0]))
201198

202199
def map_node_coordinate_component(self, expr):
203200
discr = self.places.get_discretization(
@@ -468,7 +465,7 @@ def flatten(self, ary):
468465
ary = [ary]
469466

470467
from arraycontext import flatten
471-
result = self.array_context.empty(self.total_dofs, self.dtype)
468+
result = self.array_context.zeros(self.total_dofs, self.dtype)
472469
for res_i, (start, end) in zip(ary, self.starts_and_ends):
473470
result[start:end] = flatten(res_i, self.array_context)
474471

pytential/symbolic/pde/scalar.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -411,7 +411,8 @@ def Sp(density):
411411
else:
412412
raise ValueError(f"no improved operator for '{self.kernel}' known")
413413
else:
414-
DpS0u = sym.Dp(self.kernel, laplace_s_inv_sqrt_w_u, **kwargs)
414+
DpS0u = sym.Dp(self.kernel, laplace_s_inv_sqrt_w_u,
415+
qbx_forced_limit=+1, **kwargs)
415416

416417
if self.is_unique_only_up_to_constant():
417418
# The interior Neumann operator in this representation

test/test_matrix.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,13 @@ def max_cluster_error(mat, clusters, mindex, p=None):
5252
error = -np.inf
5353
for i in range(mindex.nclusters):
5454
mat_i = mindex.cluster_take(mat, i, i)
55+
norm_mat_i = la.norm(mat_i, ord=p)
56+
if norm_mat_i < 1.0e-12:
57+
norm_mat_i = 1.0
58+
5559
error = max(
5660
error,
57-
la.norm(mat_i - clusters[i, i], ord=p) / la.norm(mat_i, ord=p)
61+
la.norm(mat_i - clusters[i, i], ord=p) / norm_mat_i
5862
)
5963

6064
return error

test/test_symbolic.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -533,20 +533,23 @@ def test_derivative_with_spatial_constant():
533533
ambient_dim = 3
534534

535535
from sumpy.kernel import LaplaceKernel
536+
knl = LaplaceKernel(ambient_dim)
537+
density = sym.var("sigma")
538+
536539
sym.d_dx(ambient_dim,
537540
sym.SpatialConstant("kappa")
538-
* sym.D(LaplaceKernel(ambient_dim), sym.Variable("sigma")))
541+
* sym.D(knl, density, qbx_forced_limit="avg"))
539542

540543
from sumpy.kernel import LaplaceKernel
541544
sym.d_dx(ambient_dim,
542545
(3+sym.SpatialConstant("kappa"))
543-
* sym.D(LaplaceKernel(ambient_dim), sym.Variable("sigma")))
546+
* sym.D(knl, density, qbx_forced_limit="avg"))
544547

545548
from pytential.symbolic.mappers import _DerivativeTakerUnsupoortedProductError
546549
with pytest.raises(_DerivativeTakerUnsupoortedProductError):
547550
sym.d_dx(ambient_dim,
548551
(3+sym.Variable("kappa"))
549-
* sym.D(LaplaceKernel(ambient_dim), sym.Variable("sigma")))
552+
* sym.D(knl, density, qbx_forced_limit="avg"))
550553

551554
# }}}
552555

test/test_tools.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,6 @@ def test_gmres():
6666
# {{{ test_interpolatory_error_reporting
6767

6868
def test_interpolatory_error_reporting(actx_factory):
69-
logging.basicConfig(level=logging.INFO)
70-
7169
actx = actx_factory()
7270

7371
h = 0.2
@@ -97,7 +95,9 @@ def test_interpolatory_error_reporting(actx_factory):
9795
one = 1 + 0*vol_x[0]
9896
from meshmode.discretization import NoninterpolatoryElementGroupError
9997
with pytest.raises(NoninterpolatoryElementGroupError):
100-
print("AREA", integral(vol_discr, one), 0.25**2*np.pi)
98+
logger.info("AREA integral %g exact %g",
99+
actx.to_numpy(integral(vol_discr, one)).item(),
100+
0.25**2*np.pi)
101101

102102
# }}}
103103

@@ -154,7 +154,7 @@ def test_geometry_collection_caching(actx_factory):
154154
# construct a geometry collection
155155
from pytential import GeometryCollection
156156
places = GeometryCollection(dict(zip(sources, lpots)), auto_where=sources[0])
157-
print(places.places)
157+
logger.info("%s", places.places)
158158

159159
# check on-demand refinement
160160
from pytential import bind, sym

0 commit comments

Comments
 (0)