From a4491745bfefe5186c48fc56f08f2ab7f58b4794 Mon Sep 17 00:00:00 2001
From: Matthias Diener <mdiener@illinois.edu>
Date: Mon, 14 Jun 2021 13:53:34 -0500
Subject: [PATCH] move norm special case to pyopencl
---
arraycontext/fake_numpy.py | 18 ------------------
arraycontext/impl/pyopencl.py | 26 +++++++++++++++++++++++++-
2 files changed, 25 insertions(+), 19 deletions(-)
diff --git a/arraycontext/fake_numpy.py b/arraycontext/fake_numpy.py
index 97ee9ef..04f66e0 100644
--- a/arraycontext/fake_numpy.py
+++ b/arraycontext/fake_numpy.py
@@ -182,24 +182,6 @@ class BaseFakeNumpyLinalgNamespace:
if ord is None:
ord = 2
- from arraycontext.impl import _is_meshmode_dofarray
- from arraycontext.impl.pyopencl import _flatten_array
-
- if _is_meshmode_dofarray(ary):
- from warnings import warn
- warn("Taking an actx.np.linalg.norm of a DOFArray is deprecated. "
- "(DOFArrays use 2D arrays internally, and "
- "actx.np.linalg.norm should compute matrix norms of those.) "
- "This will stop working in 2022. "
- "Use meshmode.dof_array.flat_norm instead.",
- DeprecationWarning, stacklevel=2)
-
- import numpy.linalg as la
- return la.norm(
- [self.norm(_flatten_array(subary), ord=ord)
- for _, subary in serialize_container(ary)],
- ord=ord)
-
if is_array_container(ary):
import numpy.linalg as la
return la.norm(
diff --git a/arraycontext/impl/pyopencl.py b/arraycontext/impl/pyopencl.py
index d11abd1..3cbf985 100644
--- a/arraycontext/impl/pyopencl.py
+++ b/arraycontext/impl/pyopencl.py
@@ -186,7 +186,31 @@ def _flatten_array(ary):
class _PyOpenCLFakeNumpyLinalgNamespace(BaseFakeNumpyLinalgNamespace):
- pass
+ def norm(self, ary, ord=None):
+ try:
+ from meshmode.dof_array import DOFArray
+ except ImportError:
+ pass
+ else:
+ if isinstance(ary, DOFArray):
+ if ord is None:
+ ord = 2
+
+ from warnings import warn
+ warn("Taking an actx.np.linalg.norm of a DOFArray is deprecated. "
+ "(DOFArrays use 2D arrays internally, and "
+ "actx.np.linalg.norm should compute matrix norms of those.) "
+ "This will stop working in 2022. "
+ "Use meshmode.dof_array.flat_norm instead.",
+ DeprecationWarning, stacklevel=2)
+
+ import numpy.linalg as la
+ return la.norm(
+ [self.norm(_flatten_array(subary), ord=ord)
+ for _, subary in serialize_container(ary)],
+ ord=ord)
+
+ return super().norm(ary, ord)
# }}}
--
GitLab