From 9c3cd582a8fe0cdd9c0f52012459e640d9b3539e Mon Sep 17 00:00:00 2001 From: David Johnson Date: Tue, 5 Nov 2019 16:56:53 -0500 Subject: [PATCH] Remove unused functions. --- include/image.h | 2 -- include/lapack.h | 1 - include/signal.h | 2 -- src/ArrayFire/Internal/Image.hsc | 4 ---- src/ArrayFire/Internal/LAPACK.hsc | 2 -- src/ArrayFire/Internal/Signal.hsc | 4 ---- src/ArrayFire/LAPACK.hs | 16 ++++++++-------- 7 files changed, 8 insertions(+), 23 deletions(-) diff --git a/include/image.h b/include/image.h index f5cfaae..6c86961 100644 --- a/include/image.h +++ b/include/image.h @@ -43,5 +43,3 @@ af_err af_moments(af_array *out, const af_array in, const af_moment_type moment) af_err af_moments_all(double* out, const af_array in, const af_moment_type moment); af_err af_canny(af_array* out, const af_array in, const af_canny_threshold threshold_type, const float low_threshold_ratio, const float high_threshold_ratio, const unsigned sobel_window, const bool is_fast); af_err af_anisotropic_diffusion(af_array* out, const af_array in, const float timestep, const float conductance, const unsigned iterations, const af_flux_function fftype,const af_diffusion_eq diffusion_kind); -af_err af_iterative_deconv(af_array* out, const af_array in, const af_array ker,const unsigned iterations, const float relax_factor, const af_iterative_deconv_algo algo); -af_err af_inverse_deconv(af_array* out, const af_array in, const af_array psf, const float gamma, const af_inverse_deconv_algo algo); diff --git a/include/lapack.h b/include/lapack.h index 519cd05..7e8e6be 100644 --- a/include/lapack.h +++ b/include/lapack.h @@ -11,7 +11,6 @@ af_err af_cholesky_inplace(int *info, af_array in, const bool is_upper); af_err af_solve(af_array *x, const af_array a, const af_array b, const af_mat_prop options); af_err af_solve_lu(af_array *x, const af_array a, const af_array piv, const af_array b, const af_mat_prop options); af_err af_inverse(af_array *out, const af_array in, const af_mat_prop options); -af_err af_pinverse(af_array *out, const af_array in, const double tol, const af_mat_prop options); af_err af_rank(unsigned *rank, const af_array in, const double tol); af_err af_det(double *det_real, double *det_imag, const af_array in); af_err af_norm(double *out, const af_array in, const af_norm_type type, const double p, const double q); diff --git a/include/signal.h b/include/signal.h index 924f9f0..eb4ed3d 100644 --- a/include/signal.h +++ b/include/signal.h @@ -2,8 +2,6 @@ af_err af_approx1(af_array *out, const af_array in, const af_array pos, const af_interp_type method, const float off_grid); af_err af_approx2(af_array *out, const af_array in, const af_array pos0, const af_array pos1, const af_interp_type method, const float off_grid); -af_err af_approx1_uniform(af_array *out, const af_array in,const af_array pos, const int interp_dim, const double idx_start, const double idx_step, const af_interp_type method, const float off_grid); -af_err af_approx2_uniform(af_array *out, const af_array in,const af_array pos0, const int interp_dim0, const double idx_start_dim0, const double idx_step_dim0, const af_array pos1, const int interp_dim1, const double idx_start_dim1, const double idx_step_dim1, const af_interp_type method, const float off_grid); af_err af_fft(af_array *out, const af_array in, const double norm_factor, const dim_t odim0); af_err af_fft_inplace(af_array in, const double norm_factor); af_err af_fft2(af_array *out, const af_array in, const double norm_factor, const dim_t odim0, const dim_t odim1); diff --git a/src/ArrayFire/Internal/Image.hsc b/src/ArrayFire/Internal/Image.hsc index a1a081b..0401448 100644 --- a/src/ArrayFire/Internal/Image.hsc +++ b/src/ArrayFire/Internal/Image.hsc @@ -93,7 +93,3 @@ foreign import ccall unsafe "af_canny" af_canny :: Ptr AFArray -> AFArray -> AFCannyThreshold -> Float -> Float -> CUInt -> CBool -> IO AFErr foreign import ccall unsafe "af_anisotropic_diffusion" af_anisotropic_diffusion :: Ptr AFArray -> AFArray -> Float -> Float -> CUInt -> AFFluxFunction -> AFDiffusionEq -> IO AFErr -foreign import ccall unsafe "af_iterative_deconv" - af_iterative_deconv :: Ptr AFArray -> AFArray -> AFArray -> CUInt -> Float -> AFIterativeDeconvAlgo -> IO AFErr -foreign import ccall unsafe "af_inverse_deconv" - af_inverse_deconv :: Ptr AFArray -> AFArray -> AFArray -> Float -> AFInverseDeconvAlgo -> IO AFErr diff --git a/src/ArrayFire/Internal/LAPACK.hsc b/src/ArrayFire/Internal/LAPACK.hsc index e28ff9d..52ca518 100644 --- a/src/ArrayFire/Internal/LAPACK.hsc +++ b/src/ArrayFire/Internal/LAPACK.hsc @@ -29,8 +29,6 @@ foreign import ccall unsafe "af_solve_lu" af_solve_lu :: Ptr AFArray -> AFArray -> AFArray -> AFArray -> AFMatProp -> IO AFErr foreign import ccall unsafe "af_inverse" af_inverse :: Ptr AFArray -> AFArray -> AFMatProp -> IO AFErr -foreign import ccall unsafe "af_pinverse" - af_pinverse :: Ptr AFArray -> AFArray -> Double -> AFMatProp -> IO AFErr foreign import ccall unsafe "af_rank" af_rank :: Ptr CUInt -> AFArray -> Double -> IO AFErr foreign import ccall unsafe "af_det" diff --git a/src/ArrayFire/Internal/Signal.hsc b/src/ArrayFire/Internal/Signal.hsc index 16f8d81..1740ebf 100644 --- a/src/ArrayFire/Internal/Signal.hsc +++ b/src/ArrayFire/Internal/Signal.hsc @@ -10,10 +10,6 @@ foreign import ccall unsafe "af_approx1" af_approx1 :: Ptr AFArray -> AFArray -> AFArray -> AFInterpType -> Float -> IO AFErr foreign import ccall unsafe "af_approx2" af_approx2 :: Ptr AFArray -> AFArray -> AFArray -> AFArray -> AFInterpType -> Float -> IO AFErr -foreign import ccall unsafe "af_approx1_uniform" - af_approx1_uniform :: Ptr AFArray -> AFArray -> AFArray -> CInt -> Double -> Double -> AFInterpType -> Float -> IO AFErr -foreign import ccall unsafe "af_approx2_uniform" - af_approx2_uniform :: Ptr AFArray -> AFArray -> AFArray -> CInt -> Double -> Double -> AFArray -> CInt -> Double -> Double -> AFInterpType -> Float -> IO AFErr foreign import ccall unsafe "af_fft" af_fft :: Ptr AFArray -> AFArray -> Double -> DimT -> IO AFErr foreign import ccall unsafe "af_fft_inplace" diff --git a/src/ArrayFire/LAPACK.hs b/src/ArrayFire/LAPACK.hs index 3ea4b02..4c7af2b 100644 --- a/src/ArrayFire/LAPACK.hs +++ b/src/ArrayFire/LAPACK.hs @@ -199,14 +199,14 @@ inverse a m = -- -- [ArrayFire Docs](http://arrayfire.org/docs/group__lapack__factor__func__p_inv.htm) -- -pinverse - :: AFType a - => Array a - -> Double - -> MatProp - -> Array a -pinverse a d m = - a `op1` (\x y -> af_pinverse x y d (toMatProp m)) +-- pinverse +-- :: AFType a +-- => Array a +-- -> Double +-- -> MatProp +-- -> Array a +-- pinverse a d m = +-- a `op1` (\x y -> af_pinverse x y d (toMatProp m)) -- | Find the rank of the input matrix --