diff --git a/examples/curve-pot.py b/examples/curve-pot.py index 85de64eb64834d8f3300fd31ff2b284bb24bb870..c52799d37430c5defdc033ff88bdce3e54f31d71 100644 --- a/examples/curve-pot.py +++ b/examples/curve-pot.py @@ -187,7 +187,7 @@ def draw_pot_figure(aspect_ratio, def apply_lpot(x): xovsmp = np.dot(fim, x) - evt, (y,) = lpot(actx.queue, + _evt, (y,) = lpot(actx.queue, sources, ovsmp_sources, actx.from_numpy(centers), @@ -199,7 +199,7 @@ def draw_pot_figure(aspect_ratio, op = LinearOperator((nsrc, nsrc), apply_lpot) mat = build_matrix(op, dtype=np.complex128) - w, v = la.eig(mat) + w, _v = la.eig(mat) plt.plot(w.real, "o-") #import sys; sys.exit(0) return @@ -212,7 +212,7 @@ def draw_pot_figure(aspect_ratio, density = np.cos(mode_nr*2*np.pi*native_t).astype(np.complex128) strength = actx.from_numpy(native_curve.speed * native_weights * density) - evt, (vol_pot,) = p2p(actx.queue, + _evt, (vol_pot,) = p2p(actx.queue, targets, sources, [strength], **volpot_kwargs) @@ -222,7 +222,7 @@ def draw_pot_figure(aspect_ratio, ovsmp_strength = actx.from_numpy( ovsmp_curve.speed * ovsmp_weights * ovsmp_density) - evt, (curve_pot,) = lpot(actx.queue, + _evt, (curve_pot,) = lpot(actx.queue, sources, ovsmp_sources, actx.from_numpy(centers), diff --git a/examples/expansion-toys.py b/examples/expansion-toys.py index 395929e7c9d7f2c1ee2da814ed75c5def54f839d..c7052fe362168fe2824d4eafd17ef0d4d5721855 100644 --- a/examples/expansion-toys.py +++ b/examples/expansion-toys.py @@ -41,7 +41,7 @@ def main(): plt.show() mexp = t.multipole_expand(pt_src, [0, 0], 5) - mexp2 = t.multipole_expand(mexp, [0, 0.25]) + mexp2 = t.multipole_expand(mexp, [0, 0.25]) # noqa: F841 lexp = t.local_expand(mexp, [3, 0]) lexp2 = t.local_expand(lexp, [3, 1], 3) diff --git a/pyproject.toml b/pyproject.toml index 7f65a49f207b7641336e04920f9b818aadf5fe34..c39191d71777ab982b0db0dd5180cf7f833ff129 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -29,7 +29,6 @@ extend-ignore = [ # TODO "E265", # comment format - "F841", # unused local ] [tool.ruff.lint.flake8-quotes] diff --git a/sumpy/expansion/m2l.py b/sumpy/expansion/m2l.py index 951b76ab3fc750a5d9bb7e42daadfe30f2ff26ae..2dc5f8e9d199bed5cf23d8f93f6b190a4d22e752 100644 --- a/sumpy/expansion/m2l.py +++ b/sumpy/expansion/m2l.py @@ -449,7 +449,7 @@ class VolumeTaylorM2LTranslation(M2LTranslationBase): def loopy_preprocess_multipole(self, tgt_expansion, src_expansion, result_dtype): - circulant_matrix_mis, _, max_mi = \ + _circulant_matrix_mis, _, max_mi = \ self._translation_classes_dependent_data_mis(tgt_expansion, src_expansion) @@ -564,7 +564,7 @@ class VolumeTaylorM2LTranslation(M2LTranslationBase): def loopy_postprocess_local(self, tgt_expansion, src_expansion, result_dtype): - circulant_matrix_mis, needed_vector_terms, _ = \ + circulant_matrix_mis, _needed_vector_terms, _ = \ self._translation_classes_dependent_data_mis(tgt_expansion, src_expansion) circulant_matrix_ident_to_index = {ident: i for i, ident in diff --git a/sumpy/p2p.py b/sumpy/p2p.py index d89c85e8539d097c9c917806628f4612bdbe7d6d..6298da349366dd71ddb4edc634f316bd4b223e17 100644 --- a/sumpy/p2p.py +++ b/sumpy/p2p.py @@ -213,7 +213,7 @@ class P2P(P2PBase): return "p2p_apply" def get_kernel(self): - loopy_insns, result_names = self.get_loopy_insns_and_result_names() + loopy_insns, _result_names = self.get_loopy_insns_and_result_names() arguments = [ *self.get_default_src_tgt_arguments(), lp.GlobalArg("strength", None, @@ -282,7 +282,7 @@ class P2PMatrixGenerator(P2PBase): return 1 def get_kernel(self): - loopy_insns, result_names = self.get_loopy_insns_and_result_names() + loopy_insns, _result_names = self.get_loopy_insns_and_result_names() arguments = ( self.get_default_src_tgt_arguments() + [ @@ -349,7 +349,7 @@ class P2PMatrixSubsetGenerator(P2PBase): return 1 def get_kernel(self): - loopy_insns, result_names = self.get_loopy_insns_and_result_names() + loopy_insns, _result_names = self.get_loopy_insns_and_result_names() arguments = ( self.get_default_src_tgt_arguments() + [ @@ -456,7 +456,7 @@ class P2PFromCSR(P2PBase): def get_kernel(self, max_nsources_in_one_box, max_ntargets_in_one_box, work_items_per_group=32): - loopy_insns, result_names = self.get_loopy_insns_and_result_names() + loopy_insns, _result_names = self.get_loopy_insns_and_result_names() arguments = [ *self.get_default_src_tgt_arguments(), lp.GlobalArg("box_target_starts", diff --git a/sumpy/tools.py b/sumpy/tools.py index 68c7627ec7e758fed9b761a36da705549a674a0c..c9d9d0a4cd9824bdf59467f4031b5408d58124ce 100644 --- a/sumpy/tools.py +++ b/sumpy/tools.py @@ -188,7 +188,7 @@ def build_matrix(op, dtype=None, shape=None): dtype = dtype or op.dtype from pytools import ProgressBar shape = shape or op.shape - rows, cols = shape + _rows, cols = shape pb = ProgressBar("matrix", cols) mat = np.zeros(shape, dtype) diff --git a/sumpy/toys.py b/sumpy/toys.py index 02e4e214bed478cc4655d111c43d7424e94115ba..5834d63f12fce4aa130dee448da28f280b2e5ba9 100644 --- a/sumpy/toys.py +++ b/sumpy/toys.py @@ -273,7 +273,7 @@ def _p2e(psource, center, rscale, order, p2e, expn_class, expn_kwargs): queue, np.array(center, dtype=np.float64).reshape(toy_ctx.kernel.dim, 1)) - evt, (coeffs,) = p2e(toy_ctx.queue, + _evt, (coeffs,) = p2e(toy_ctx.queue, source_boxes=source_boxes, box_source_starts=box_source_starts, box_source_counts_nonchild=box_source_counts_nonchild, @@ -310,7 +310,7 @@ def _e2p(psource, targets, e2p): from sumpy.tools import vector_to_device coeffs = cl.array.to_device(queue, np.array([psource.coeffs])) - evt, (pot,) = e2p( + _evt, (pot,) = e2p( toy_ctx.queue, src_expansions=coeffs, src_base_ibox=0, @@ -367,7 +367,7 @@ def _e2e(psource, to_center, to_rscale, to_order, e2e, expn_class, expn_kwargs, **toy_ctx.extra_kernel_kwargs, } - evt, (to_coeffs,) = e2e(**args) + _evt, (to_coeffs,) = e2e(**args) return expn_class( toy_ctx, to_center, to_rscale, to_order, to_coeffs[1].get(queue), @@ -617,7 +617,7 @@ class PointSources(PotentialSource): def eval(self, targets: np.ndarray) -> np.ndarray: queue = self.toy_ctx.queue - evt, (potential,) = self.toy_ctx.get_p2p()( + _evt, (potential,) = self.toy_ctx.get_p2p()( queue, cl.array.to_device(queue, targets), cl.array.to_device(queue, self.points), diff --git a/test/test_cse.py b/test/test_cse.py index a1d913a67a04196a59ffeefe5feeb73dcad63d39..e28bf8e4661aa92b11e5efcc01ef26f49fd2a8c9 100644 --- a/test/test_cse.py +++ b/test/test_cse.py @@ -239,7 +239,7 @@ def test_dont_cse_subs(): f = sym.Function("f") g = sym.Function("g") - name_val, (expr,) = cse(f(x+y).diff(x) + g(x+y).diff(x)) + name_val, (_expr,) = cse(f(x+y).diff(x) + g(x+y).diff(x)) assert name_val == [] @@ -353,7 +353,7 @@ def test_cse_indexed(): expr1 = (y[i+1]-y[i])/(x[i+1]-x[i]) expr2 = 1/(x[i+1]-x[i]) - replacements, reduced_exprs = cse([expr1, expr2]) + replacements, _reduced_exprs = cse([expr1, expr2]) assert len(replacements) > 0 # }}} diff --git a/test/test_fmm.py b/test/test_fmm.py index 21d312ac5b77428d13a4c59f3557895a4f07a691..433fca8a0ef9a70c13ee2a7ff554ed489e4a38bd 100644 --- a/test/test_fmm.py +++ b/test/test_fmm.py @@ -241,7 +241,7 @@ def _test_sumpy_fmm(actx_factory, knl, local_expn_class, mpole_expn_class, from sumpy import P2P p2p = P2P(actx.context, target_kernels, exclude_self=False) - evt, (ref_pot,) = p2p(actx.queue, targets, sources, (weights,), + _evt, (ref_pot,) = p2p(actx.queue, targets, sources, (weights,), **extra_kwargs) pot = actx.to_numpy(pot) @@ -495,7 +495,7 @@ def test_sumpy_fmm_timing_data_collection(ctx_factory, use_fft, visualize=False) from boxtree.fmm import drive_fmm timing_data = {} - pot, = drive_fmm(wrangler, (weights,), timing_data=timing_data) + _pot, = drive_fmm(wrangler, (weights,), timing_data=timing_data) logger.info("timing_data:\n%s", timing_data) assert timing_data @@ -553,7 +553,7 @@ def test_sumpy_fmm_exclude_self(actx_factory, visualize=False): from sumpy import P2P p2p = P2P(actx.context, target_kernels, exclude_self=True) - evt, (ref_pot,) = p2p(actx.queue, sources, sources, (weights,), + _evt, (ref_pot,) = p2p(actx.queue, sources, sources, (weights,), **self_extra_kwargs) pot = actx.to_numpy(pot) diff --git a/test/test_kernels.py b/test/test_kernels.py index 8be53ec7984557e26b457bcfc9680cbaf6dcaf32..6edb07f3593cc568d3810de12586cef57256efb8 100644 --- a/test/test_kernels.py +++ b/test/test_kernels.py @@ -93,7 +93,7 @@ def test_p2p(actx_factory, exclude_self): extra_kwargs["target_to_source"] = ( actx.from_numpy(np.arange(n, dtype=np.int32))) - evt, (potential, x_derivative) = knl( + _evt, (potential, _x_derivative) = knl( actx.queue, actx.from_numpy(targets), actx.from_numpy(sources), @@ -192,7 +192,7 @@ def test_p2e_multiple(actx_factory, base_knl, expn_class): kernels=source_kernels, strength_usage=[0, 1]) - evt, (mpoles,) = p2e(actx.queue, + _evt, (mpoles,) = p2e(actx.queue, source_boxes=source_boxes, box_source_starts=box_source_starts, box_source_counts_nonchild=box_source_counts_nonchild, @@ -217,7 +217,7 @@ def test_p2e_multiple(actx_factory, base_knl, expn_class): p2e = P2EFromSingleBox(actx.context, expn, kernels=[source_kernel], strength_usage=[i]) - evt, (mpoles,) = p2e(actx.queue, + _evt, (mpoles,) = p2e(actx.queue, source_boxes=source_boxes, box_source_starts=box_source_starts, box_source_counts_nonchild=box_source_counts_nonchild, @@ -353,7 +353,7 @@ def test_p2e2p(actx_factory, base_knl, expn_class, order, with_source_derivative # {{{ apply p2e - evt, (mpoles,) = p2e(actx.queue, + _evt, (mpoles,) = p2e(actx.queue, source_boxes=source_boxes, box_source_starts=box_source_starts, box_source_counts_nonchild=box_source_counts_nonchild, @@ -375,7 +375,7 @@ def test_p2e2p(actx_factory, base_knl, expn_class, order, with_source_derivative box_target_counts_nonchild = ( actx.from_numpy(np.array([ntargets], dtype=np.int32))) - evt, (pot, grad_x, ) = e2p( + _evt, (pot, grad_x, ) = e2p( actx.queue, src_expansions=mpoles, src_base_ibox=0, @@ -393,7 +393,7 @@ def test_p2e2p(actx_factory, base_knl, expn_class, order, with_source_derivative # {{{ compute (direct) reference solution - evt, (pot_direct, grad_x_direct, ) = p2p( + _evt, (pot_direct, grad_x_direct, ) = p2p( actx.queue, targets, sources, (strengths,), **extra_source_kwargs) diff --git a/test/test_qbx.py b/test/test_qbx.py index fa7f6044cdb408d8aebcbf454b4c511274802751..4b9870c4e342c1faf9746b0f4b3e236e296733ec 100644 --- a/test/test_qbx.py +++ b/test/test_qbx.py @@ -92,7 +92,7 @@ def test_direct_qbx_vs_eigval(actx_factory, expn_class, visualize=False): expansion_radii = actx.from_numpy(radius * np.ones(n)) strengths = (actx.from_numpy(sigma * h),) - evt, (result_qbx,) = lpot( + _evt, (result_qbx,) = lpot( actx.queue, targets, sources, centers, strengths, expansion_radii=expansion_radii) @@ -163,11 +163,11 @@ def test_direct_qbx_vs_eigval_with_tgt_deriv( expansion_radii = actx.from_numpy(radius * np.ones(n)) strengths = (actx.from_numpy(sigma * h),) - evt, (result_qbx_dx,) = lpot_dx( + _evt, (result_qbx_dx,) = lpot_dx( actx.queue, targets, sources, centers, strengths, expansion_radii=expansion_radii) - evt, (result_qbx_dy,) = lpot_dy( + _evt, (result_qbx_dy,) = lpot_dy( actx.queue, targets, sources, centers, strengths, expansion_radii=expansion_radii) diff --git a/test/test_tools.py b/test/test_tools.py index 2043fce9778d9eb67de64116001ad83528980500..309121c54b305e6c5e7cb33595a78624b1d80769 100644 --- a/test/test_tools.py +++ b/test/test_tools.py @@ -91,7 +91,7 @@ def test_fft(actx_factory, size): out = fft(inp) fft_func = loopy_fft(inp.shape, inverse=False, complex_dtype=inp.dtype.type) - evt, (out_dev,) = fft_func(actx.queue, y=inp_dev) + _evt, (out_dev,) = fft_func(actx.queue, y=inp_dev) assert np.allclose(actx.to_numpy(out_dev), out)