From 48da03e65228dfcdbfcc9604ec21c9939d021677 Mon Sep 17 00:00:00 2001
From: Thomas Gibson <gibsonthomas1120@hotmail.com>
Date: Mon, 5 Apr 2021 18:23:30 -0500
Subject: [PATCH] Remove deprecated np.bool and np.object aliasing
---
grudge/eager.py | 2 +-
grudge/execution.py | 2 +-
grudge/symbolic/primitives.py | 10 +++++-----
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/grudge/eager.py b/grudge/eager.py
index 7d9eb1d8..3314c942 100644
--- a/grudge/eager.py
+++ b/grudge/eager.py
@@ -144,7 +144,7 @@ class EagerDGDiscretization(DGDiscretizationWithBoundaries):
def _div_helper(self, diff_func, vecs):
if not isinstance(vecs, np.ndarray):
raise TypeError("argument must be an object array")
- assert vecs.dtype == np.object
+ assert vecs.dtype == object
if vecs.shape[-1] != self.ambient_dim:
raise ValueError("last dimension of *vecs* argument must match "
diff --git a/grudge/execution.py b/grudge/execution.py
index 3cd9aade..3e99556b 100644
--- a/grudge/execution.py
+++ b/grudge/execution.py
@@ -179,7 +179,7 @@ class ExecutionMapper(mappers.Evaluator,
if isinstance(bool_crit, DOFArray):
# continues below
pass
- elif isinstance(bool_crit, (np.bool_, np.bool, np.number)):
+ elif isinstance(bool_crit, (bool, np.bool_, np.number)):
if bool_crit:
return self.rec(expr.then)
else:
diff --git a/grudge/symbolic/primitives.py b/grudge/symbolic/primitives.py
index 6e57bcf4..fd3fefc2 100644
--- a/grudge/symbolic/primitives.py
+++ b/grudge/symbolic/primitives.py
@@ -649,7 +649,7 @@ def forward_metric_derivative_mat(ambient_dim, dim=None, dd=None):
if dim is None:
dim = ambient_dim
- result = np.zeros((ambient_dim, dim), dtype=np.object)
+ result = np.zeros((ambient_dim, dim), dtype=object)
for j in range(dim):
result[:, j] = forward_metric_derivative_vector(ambient_dim, j, dd=dd)
@@ -660,7 +660,7 @@ def inverse_metric_derivative_mat(ambient_dim, dim=None, dd=None):
if dim is None:
dim = ambient_dim
- result = np.zeros((ambient_dim, dim), dtype=np.object)
+ result = np.zeros((ambient_dim, dim), dtype=object)
for i in range(dim):
for j in range(ambient_dim):
result[i, j] = inverse_metric_derivative(
@@ -688,12 +688,12 @@ def inverse_first_fundamental_form(ambient_dim, dim=None, dd=None):
form1 = first_fundamental_form(ambient_dim, dim, dd)
if dim == 1:
- inv_form1 = np.array([[1.0/form1[0, 0]]], dtype=np.object)
+ inv_form1 = np.array([[1.0/form1[0, 0]]], dtype=object)
elif dim == 2:
(E, F), (_, G) = form1 # noqa: N806
inv_form1 = 1.0 / (E * G - F * F) * np.array([
[G, -F], [-F, E]
- ], dtype=np.object)
+ ], dtype=object)
else:
raise ValueError("%dD surfaces not supported" % dim)
@@ -732,7 +732,7 @@ def second_fundamental_form(ambient_dim, dim=None, dd=None):
raise ValueError("%dD surfaces not supported" % dim)
from pytools import flatten
- form2 = np.empty((dim, dim), dtype=np.object)
+ form2 = np.empty((dim, dim), dtype=object)
for ref_axes in second_ref_axes:
i, j = flatten([rst_axis] * n for rst_axis, n in ref_axes)
--
GitLab