From 737b14c8eb3de7b79b519f48f399a903600aa4e6 Mon Sep 17 00:00:00 2001 From: Garrett Wright Date: Mon, 17 Jun 2024 09:11:43 -0400 Subject: [PATCH] support np1 and np2 ComplexWarning --- src/aspire/numeric/complex_pca/validation.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/aspire/numeric/complex_pca/validation.py b/src/aspire/numeric/complex_pca/validation.py index 4b1b6993e3..7fafedfe18 100644 --- a/src/aspire/numeric/complex_pca/validation.py +++ b/src/aspire/numeric/complex_pca/validation.py @@ -15,7 +15,14 @@ import numpy as np import scipy.sparse as sp -from numpy.core.numeric import ComplexWarning +from packaging.version import Version + +# Support both numpy 1 and 2 +if Version(np.__version__) >= Version("2.0.0"): + from numpy.exceptions import ComplexWarning +else: + from numpy.core.numeric import ComplexWarning + from sklearn.exceptions import DataConversionWarning from sklearn.utils.validation import _assert_all_finite