From ee80313a2530286610d9582eaacec986dc4cfb9c Mon Sep 17 00:00:00 2001 From: denizberkin Date: Mon, 24 Feb 2025 11:35:26 +0300 Subject: [PATCH 1/2] for numpy>2.0 loat_ is removed. updated to float64 --- abydos/distance/_aline.py | 2 +- abydos/distance/_bisim.py | 2 +- abydos/distance/_editex.py | 2 +- abydos/distance/_flexmetric.py | 2 +- abydos/distance/_gotoh.py | 2 +- abydos/distance/_meta_levenshtein.py | 2 +- abydos/distance/_needleman_wunsch.py | 2 +- abydos/distance/_smith_waterman.py | 2 +- abydos/distance/_typo.py | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/abydos/distance/_aline.py b/abydos/distance/_aline.py index aa57a7460..4ccfde73a 100644 --- a/abydos/distance/_aline.py +++ b/abydos/distance/_aline.py @@ -22,7 +22,7 @@ from copy import deepcopy from typing import Any, Callable, Dict, List, Tuple, Union, cast -from numpy import float_, inf, zeros +from numpy import float16, inf, zeros from ._distance import _Distance diff --git a/abydos/distance/_bisim.py b/abydos/distance/_bisim.py index f2f162b60..83abc45bd 100644 --- a/abydos/distance/_bisim.py +++ b/abydos/distance/_bisim.py @@ -21,7 +21,7 @@ from typing import Any, cast -from numpy import float_ as np_float +from numpy import float64 as np_float from numpy import zeros as np_zeros from ._distance import _Distance diff --git a/abydos/distance/_editex.py b/abydos/distance/_editex.py index fa1b66006..d34dd28d7 100644 --- a/abydos/distance/_editex.py +++ b/abydos/distance/_editex.py @@ -23,7 +23,7 @@ from typing import Any, Tuple, cast from unicodedata import normalize as unicode_normalize -from numpy import float_ as np_float +from numpy import float64 as np_float from numpy import zeros as np_zeros from ._distance import _Distance diff --git a/abydos/distance/_flexmetric.py b/abydos/distance/_flexmetric.py index 25b3506c8..3fe34ce62 100644 --- a/abydos/distance/_flexmetric.py +++ b/abydos/distance/_flexmetric.py @@ -32,7 +32,7 @@ cast, ) -from numpy import float_ as np_float +from numpy import float64 as np_float from numpy import zeros as np_zeros from ._distance import _Distance diff --git a/abydos/distance/_gotoh.py b/abydos/distance/_gotoh.py index af10fa6fe..6ff71762f 100644 --- a/abydos/distance/_gotoh.py +++ b/abydos/distance/_gotoh.py @@ -20,7 +20,7 @@ """ from typing import Any, Callable, Optional, cast -from numpy import float_ as np_float +from numpy import float64 as np_float from numpy import zeros as np_zeros from ._needleman_wunsch import NeedlemanWunsch diff --git a/abydos/distance/_meta_levenshtein.py b/abydos/distance/_meta_levenshtein.py index 5c30ead2a..899b065b3 100644 --- a/abydos/distance/_meta_levenshtein.py +++ b/abydos/distance/_meta_levenshtein.py @@ -31,7 +31,7 @@ cast, ) -from numpy import float_ as np_float +from numpy import float64 as np_float from numpy import zeros as np_zeros from ._distance import _Distance diff --git a/abydos/distance/_needleman_wunsch.py b/abydos/distance/_needleman_wunsch.py index 46a83160e..c18ff9a10 100644 --- a/abydos/distance/_needleman_wunsch.py +++ b/abydos/distance/_needleman_wunsch.py @@ -21,7 +21,7 @@ from typing import Any, Callable, Dict, Optional, Tuple, cast -from numpy import float_ as np_float +from numpy import float64 as np_float from numpy import zeros as np_zeros from ._distance import _Distance diff --git a/abydos/distance/_smith_waterman.py b/abydos/distance/_smith_waterman.py index 5e1f2b1ee..7bbd32e53 100644 --- a/abydos/distance/_smith_waterman.py +++ b/abydos/distance/_smith_waterman.py @@ -21,7 +21,7 @@ from typing import Any, Callable, Optional, cast -from numpy import float_ as np_float +from numpy import float64 as np_float from numpy import zeros as np_zeros from ._needleman_wunsch import NeedlemanWunsch diff --git a/abydos/distance/_typo.py b/abydos/distance/_typo.py index b7ea7d9e7..2b29db0e9 100644 --- a/abydos/distance/_typo.py +++ b/abydos/distance/_typo.py @@ -23,7 +23,7 @@ from math import log from typing import Any, Dict, Tuple, cast -from numpy import float_ as np_float +from numpy import float64 as np_float from numpy import zeros as np_zeros from ._distance import _Distance From 30417580a3e686613c186e9023666909710a10e8 Mon Sep 17 00:00:00 2001 From: denizberkin Date: Mon, 24 Feb 2025 11:42:47 +0300 Subject: [PATCH 2/2] convert remaining p.float_ to np.float64 --- abydos/distance/_aline.py | 4 ++-- abydos/distance/_discounted_levenshtein.py | 2 +- abydos/distance/_levenshtein.py | 2 +- abydos/distance/_phonetic_edit_distance.py | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/abydos/distance/_aline.py b/abydos/distance/_aline.py index 4ccfde73a..e6ff6d559 100644 --- a/abydos/distance/_aline.py +++ b/abydos/distance/_aline.py @@ -22,7 +22,7 @@ from copy import deepcopy from typing import Any, Callable, Dict, List, Tuple, Union, cast -from numpy import float16, inf, zeros +from numpy import float64, inf, zeros from ._distance import _Distance @@ -1593,7 +1593,7 @@ def _record(score: float, out: List[Tuple[str, str]]) -> None: tar_len = len(tar_tok) - s_mat = zeros((src_len + 1, tar_len + 1), dtype=float_) + s_mat = zeros((src_len + 1, tar_len + 1), dtype=float64) if self._mode == 'global': for i in range(1, src_len + 1): diff --git a/abydos/distance/_discounted_levenshtein.py b/abydos/distance/_discounted_levenshtein.py index d2d5ed363..62603fc58 100644 --- a/abydos/distance/_discounted_levenshtein.py +++ b/abydos/distance/_discounted_levenshtein.py @@ -175,7 +175,7 @@ def _alignment_matrix( else: discount_from = [1, 1] - d_mat = np.zeros((src_len + 1, tar_len + 1), dtype=np.float_) + d_mat = np.zeros((src_len + 1, tar_len + 1), dtype=np.float64) if backtrace: trace_mat = np.zeros((src_len + 1, tar_len + 1), dtype=np.int8) for i in range(1, src_len + 1): diff --git a/abydos/distance/_levenshtein.py b/abydos/distance/_levenshtein.py index c35f47d4d..42ee2bcb1 100644 --- a/abydos/distance/_levenshtein.py +++ b/abydos/distance/_levenshtein.py @@ -138,7 +138,7 @@ def _alignment_matrix( tar_len = len(tar) max_len = max(src_len, tar_len) - d_mat = np.zeros((src_len + 1, tar_len + 1), dtype=np.float_) + d_mat = np.zeros((src_len + 1, tar_len + 1), dtype=np.float64) if backtrace: trace_mat = np.zeros((src_len + 1, tar_len + 1), dtype=np.int8) for i in range(src_len + 1): diff --git a/abydos/distance/_phonetic_edit_distance.py b/abydos/distance/_phonetic_edit_distance.py index 04be5bdbc..a047cfdcc 100644 --- a/abydos/distance/_phonetic_edit_distance.py +++ b/abydos/distance/_phonetic_edit_distance.py @@ -147,7 +147,7 @@ def _alignment_matrix( src_list = ipa_to_features(src) tar_list = ipa_to_features(tar) - d_mat = np.zeros((src_len + 1, tar_len + 1), dtype=np.float_) + d_mat = np.zeros((src_len + 1, tar_len + 1), dtype=np.float64) if backtrace: trace_mat = np.zeros((src_len + 1, tar_len + 1), dtype=np.int8) for i in range(1, src_len + 1):