From fccbd786554b31959ff303f94391da7d55021638 Mon Sep 17 00:00:00 2001
From: Alexandru Fikl <alexfikl@gmail.com>
Date: Tue, 2 Jun 2026 15:33:47 +0300
Subject: [PATCH 1/2] feat: use OneKernel directly when possible

---
 examples/layerpot-3d.py       | 2 +-
 examples/layerpot.py          | 2 +-
 experiments/maxwell.py        | 2 +-
 experiments/maxwell_sphere.py | 2 +-
 test/test_layer_pot.py        | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/examples/layerpot-3d.py b/examples/layerpot-3d.py
index 008e54193..ebe456bd9 100644
--- a/examples/layerpot-3d.py
+++ b/examples/layerpot-3d.py
@@ -1,6 +1,6 @@
 import numpy as np
 
-from sumpy.kernel import HelmholtzKernel, LaplaceKernel, one_kernel_2d  # noqa
+from sumpy.kernel import HelmholtzKernel, LaplaceKernel, OneKernel  # noqa
 from sumpy.visualization import FieldPlotter
 
 from pytential import bind, sym
diff --git a/examples/layerpot.py b/examples/layerpot.py
index fdbe1197c..647479490 100644
--- a/examples/layerpot.py
+++ b/examples/layerpot.py
@@ -1,7 +1,7 @@
 import numpy as np
 
 from meshmode.mesh.generation import drop, ellipse, starfish  # noqa: F401
-from sumpy.kernel import HelmholtzKernel, LaplaceKernel, one_kernel_2d  # noqa: F401
+from sumpy.kernel import HelmholtzKernel, LaplaceKernel, OneKernel  # noqa: F401
 from sumpy.visualization import FieldPlotter
 
 from pytential import bind, sym
diff --git a/experiments/maxwell.py b/experiments/maxwell.py
index 8a0d0145e..27f315957 100644
--- a/experiments/maxwell.py
+++ b/experiments/maxwell.py
@@ -5,7 +5,7 @@
 import pyopencl as cl
 from sumpy.visualization import FieldPlotter
 #from mayavi import mlab
-from sumpy.kernel import one_kernel_2d, LaplaceKernel, HelmholtzKernel  # noqa
+from sumpy.kernel import OneKernel, LaplaceKernel, HelmholtzKernel  # noqa
 
 import faulthandler
 faulthandler.enable()
diff --git a/experiments/maxwell_sphere.py b/experiments/maxwell_sphere.py
index 54f0d8744..0b9f14e5b 100644
--- a/experiments/maxwell_sphere.py
+++ b/experiments/maxwell_sphere.py
@@ -2,7 +2,7 @@
 import pyopencl as cl
 from sumpy.visualization import FieldPlotter
 #from mayavi import mlab
-from sumpy.kernel import one_kernel_2d, LaplaceKernel, HelmholtzKernel  # noqa
+from sumpy.kernel import OneKernel, LaplaceKernel, HelmholtzKernel  # noqa
 
 import faulthandler
 faulthandler.enable()
diff --git a/test/test_layer_pot.py b/test/test_layer_pot.py
index 166c205de..6d6120979 100644
--- a/test/test_layer_pot.py
+++ b/test/test_layer_pot.py
@@ -364,9 +364,9 @@ def test_unregularized_with_ones_kernel(actx_factory: ArrayContextFactory):
         auto_where=("source", "target"),
     )
 
-    from sumpy.kernel import one_kernel_2d
+    from sumpy.kernel import OneKernel
     sigma_sym = sym.var("sigma")
-    op = sym.int_g_vec(one_kernel_2d, sigma_sym, qbx_forced_limit=None)
+    op = sym.int_g_vec(OneKernel(discr.ambient_dim), sigma_sym, qbx_forced_limit=None)
 
     sigma = discr.zeros(actx) + 1
 

From 02d620f4e4274dede88a3fa355650b4f32fc9734 Mon Sep 17 00:00:00 2001
From: Alexandru Fikl <alexfikl@gmail.com>
Date: Tue, 2 Jun 2026 16:14:29 +0300
Subject: [PATCH 2/2] chore: update baseline

---
 .basedpyright/baseline.json | 52 +++++++++++++------------------------
 1 file changed, 18 insertions(+), 34 deletions(-)

diff --git a/.basedpyright/baseline.json b/.basedpyright/baseline.json
index fa6e5b40f..4c962b81b 100644
--- a/.basedpyright/baseline.json
+++ b/.basedpyright/baseline.json
@@ -781,7 +781,7 @@
                 "code": "reportUnusedImport",
                 "range": {
                     "startColumn": 57,
-                    "endColumn": 70,
+                    "endColumn": 66,
                     "lineCount": 1
                 }
             },
@@ -855,7 +855,7 @@
                 "code": "reportUnusedImport",
                 "range": {
                     "startColumn": 57,
-                    "endColumn": 70,
+                    "endColumn": 66,
                     "lineCount": 1
                 }
             },
@@ -29145,6 +29145,14 @@
                     "lineCount": 1
                 }
             },
+            {
+                "code": "reportAbstractUsage",
+                "range": {
+                    "startColumn": 19,
+                    "endColumn": 18,
+                    "lineCount": 4
+                }
+            },
             {
                 "code": "reportCallIssue",
                 "range": {
@@ -29273,6 +29281,14 @@
                     "lineCount": 1
                 }
             },
+            {
+                "code": "reportAbstractUsage",
+                "range": {
+                    "startColumn": 19,
+                    "endColumn": 18,
+                    "lineCount": 4
+                }
+            },
             {
                 "code": "reportCallIssue",
                 "range": {
@@ -44517,38 +44533,6 @@
                     "lineCount": 1
                 }
             },
-            {
-                "code": "reportUnknownVariableType",
-                "range": {
-                    "startColumn": 12,
-                    "endColumn": 18,
-                    "lineCount": 1
-                }
-            },
-            {
-                "code": "reportOptionalSubscript",
-                "range": {
-                    "startColumn": 21,
-                    "endColumn": 48,
-                    "lineCount": 1
-                }
-            },
-            {
-                "code": "reportUnknownMemberType",
-                "range": {
-                    "startColumn": 49,
-                    "endColumn": 70,
-                    "lineCount": 1
-                }
-            },
-            {
-                "code": "reportUnknownArgumentType",
-                "range": {
-                    "startColumn": 49,
-                    "endColumn": 55,
-                    "lineCount": 1
-                }
-            },
             {
                 "code": "reportUnknownMemberType",
                 "range": {