From: Antonio Valentino Date: Sun, 3 Dec 2023 12:28:04 +0000 Subject: Compatibility with cython v3.0.x --- ltfatpy/comp/comp_dct.pyx | 2 +- ltfatpy/comp/comp_dst.pyx | 2 +- ltfatpy/comp/comp_gabdual_long.pyx | 2 +- ltfatpy/comp/comp_gabtight_long.pyx | 2 +- ltfatpy/comp/comp_isepdgt.pyx | 2 +- ltfatpy/comp/comp_isepdgtreal.pyx | 2 +- ltfatpy/comp/comp_pgauss.pyx | 2 +- ltfatpy/comp/comp_sepdgt.pyx | 4 ++-- ltfatpy/comp/comp_sepdgtreal.pyx | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/ltfatpy/comp/comp_dct.pyx b/ltfatpy/comp/comp_dct.pyx index c433265..6ed7352 100644 --- a/ltfatpy/comp/comp_dct.pyx +++ b/ltfatpy/comp/comp_dct.pyx @@ -64,7 +64,7 @@ from __future__ import print_function, division import cython import numpy as np -from ltfat cimport ltfatInt, dct_kind, dct_cd, dct_d +from ltfatpy.comp.ltfat cimport ltfatInt, dct_kind, dct_cd, dct_d from ltfatpy.comp.ltfat cimport DCTI, DCTII, DCTIII, DCTIV diff --git a/ltfatpy/comp/comp_dst.pyx b/ltfatpy/comp/comp_dst.pyx index 6759160..c81b403 100644 --- a/ltfatpy/comp/comp_dst.pyx +++ b/ltfatpy/comp/comp_dst.pyx @@ -65,7 +65,7 @@ from __future__ import print_function, division import cython import numpy as np -from ltfat cimport ltfatInt, dst_kind, dst_cd, dst_d +from ltfatpy.comp.ltfat cimport ltfatInt, dst_kind, dst_cd, dst_d from ltfatpy.comp.ltfat cimport DSTI, DSTII, DSTIII, DSTIV diff --git a/ltfatpy/comp/comp_gabdual_long.pyx b/ltfatpy/comp/comp_gabdual_long.pyx index 50b1a89..5922b87 100644 --- a/ltfatpy/comp/comp_gabdual_long.pyx +++ b/ltfatpy/comp/comp_gabdual_long.pyx @@ -65,7 +65,7 @@ from __future__ import print_function, division import cython import numpy as np -from ltfat cimport ltfatInt, gabdual_long_d, gabdual_long_cd +from ltfatpy.comp.ltfat cimport ltfatInt, gabdual_long_d, gabdual_long_cd # don’t check for out-of-bounds indexing. @cython.boundscheck(False) diff --git a/ltfatpy/comp/comp_gabtight_long.pyx b/ltfatpy/comp/comp_gabtight_long.pyx index 2271816..7273fb6 100644 --- a/ltfatpy/comp/comp_gabtight_long.pyx +++ b/ltfatpy/comp/comp_gabtight_long.pyx @@ -65,7 +65,7 @@ from __future__ import print_function, division import cython import numpy as np -from ltfat cimport ltfatInt, gabtight_long_d, gabtight_long_cd +from ltfatpy.comp.ltfat cimport ltfatInt, gabtight_long_d, gabtight_long_cd # cython: profile=True diff --git a/ltfatpy/comp/comp_isepdgt.pyx b/ltfatpy/comp/comp_isepdgt.pyx index 26ad58f..5578095 100644 --- a/ltfatpy/comp/comp_isepdgt.pyx +++ b/ltfatpy/comp/comp_isepdgt.pyx @@ -65,7 +65,7 @@ from __future__ import print_function, division import cython import numpy as np -from ltfat cimport ltfatInt, dgt_phasetype, idgt_fb_d, idgt_long_d +from ltfatpy.comp.ltfat cimport ltfatInt, dgt_phasetype, idgt_fb_d, idgt_long_d from ltfatpy.comp.ltfat cimport TIMEINV, FREQINV # don’t check for out-of-bounds indexing. diff --git a/ltfatpy/comp/comp_isepdgtreal.pyx b/ltfatpy/comp/comp_isepdgtreal.pyx index 0669ca6..1af9137 100644 --- a/ltfatpy/comp/comp_isepdgtreal.pyx +++ b/ltfatpy/comp/comp_isepdgtreal.pyx @@ -65,7 +65,7 @@ from __future__ import print_function, division import cython import numpy as np -from ltfat cimport ltfatInt, dgt_phasetype, idgtreal_fb_d, idgtreal_long_d +from ltfatpy.comp.ltfat cimport ltfatInt, dgt_phasetype, idgtreal_fb_d, idgtreal_long_d from ltfatpy.comp.ltfat cimport TIMEINV, FREQINV # don’t check for out-of-bounds indexing. diff --git a/ltfatpy/comp/comp_pgauss.pyx b/ltfatpy/comp/comp_pgauss.pyx index 71f17b4..830162b 100644 --- a/ltfatpy/comp/comp_pgauss.pyx +++ b/ltfatpy/comp/comp_pgauss.pyx @@ -67,7 +67,7 @@ from cython.view cimport array as cvarray from libc.stdlib cimport malloc, free import numpy as np -from ltfat cimport ltfatInt, pgauss_d, pgauss_cmplx_d +from ltfatpy.comp.ltfat cimport ltfatInt, pgauss_d, pgauss_cmplx_d # don’t check for out-of-bounds indexing. @cython.boundscheck(False) diff --git a/ltfatpy/comp/comp_sepdgt.pyx b/ltfatpy/comp/comp_sepdgt.pyx index f344203..aa206f9 100644 --- a/ltfatpy/comp/comp_sepdgt.pyx +++ b/ltfatpy/comp/comp_sepdgt.pyx @@ -65,8 +65,8 @@ from __future__ import print_function, division import cython import numpy as np -from ltfat cimport ltfatInt, dgt_phasetype, dgt_long_cd, dgt_long_d -from ltfat cimport dgt_fb_cd, dgt_fb_d +from ltfatpy.comp.ltfat cimport ltfatInt, dgt_phasetype, dgt_long_cd, dgt_long_d +from ltfatpy.comp.ltfat cimport dgt_fb_cd, dgt_fb_d from ltfatpy.comp.ltfat cimport TIMEINV, FREQINV diff --git a/ltfatpy/comp/comp_sepdgtreal.pyx b/ltfatpy/comp/comp_sepdgtreal.pyx index 153e66f..93ce2e7 100644 --- a/ltfatpy/comp/comp_sepdgtreal.pyx +++ b/ltfatpy/comp/comp_sepdgtreal.pyx @@ -65,7 +65,7 @@ from __future__ import print_function, division import cython import numpy as np -from ltfat cimport ltfatInt, dgt_phasetype, dgtreal_fb_d, dgtreal_long_d +from ltfatpy.comp.ltfat cimport ltfatInt, dgt_phasetype, dgtreal_fb_d, dgtreal_long_d from ltfatpy.comp.ltfat cimport TIMEINV, FREQINV from numpy import int64