From 027fa6391bc7b21a8aecbdc577ad485aee274333 Mon Sep 17 00:00:00 2001 From: Mike Ledger Date: Mon, 24 Jun 2013 23:17:39 +1000 Subject: Revert "add CDouble/CFloat instances for Element" This reverts commit d302e91710db7cccb32853cfd861b9f869eb4e31. --- lib/Data/Packed/Internal/Matrix.hs | 28 ---------------------------- 1 file changed, 28 deletions(-) (limited to 'lib/Data') diff --git a/lib/Data/Packed/Internal/Matrix.hs b/lib/Data/Packed/Internal/Matrix.hs index 8158679..255009c 100644 --- a/lib/Data/Packed/Internal/Matrix.hs +++ b/lib/Data/Packed/Internal/Matrix.hs @@ -260,34 +260,18 @@ instance Element Float where transdata = transdataAux ctransF constantD = constantAux cconstantF -instance Element CFloat where - transdata = transdataAux ctransCF - constantD = constantAux cconstantCF - instance Element Double where transdata = transdataAux ctransR constantD = constantAux cconstantR -instance Element CDouble where - transdata = transdataAux ctransCR - constantD = constantAux cconstantCR - instance Element (Complex Float) where transdata = transdataAux ctransQ constantD = constantAux cconstantQ -instance Element (Complex CFloat) where - transdata = transdataAux ctransCQ - constantD = constantAux cconstantCQ - instance Element (Complex Double) where transdata = transdataAux ctransC constantD = constantAux cconstantC -instance Element (Complex CDouble) where - transdata = transdataAux ctransCC - constantD = constantAux cconstantCC - ------------------------------------------------------------------- transdata' :: Storable a => Int -> Vector a -> Int -> Vector a @@ -347,17 +331,9 @@ transdataP c1 d c2 = noneed = r1 == 1 || c1 == 1 foreign import ccall unsafe "transF" ctransF :: TFMFM -foreign import ccall unsafe "transF" ctransCF :: CInt -> CInt -> Ptr CFloat -> CInt -> CInt -> Ptr CFloat -> IO CInt - foreign import ccall unsafe "transR" ctransR :: TMM -foreign import ccall unsafe "transR" ctransCR :: CInt -> CInt -> Ptr CDouble -> CInt -> CInt -> Ptr CDouble -> IO CInt - foreign import ccall unsafe "transQ" ctransQ :: TQMQM -foreign import ccall unsafe "transQ" ctransCQ :: CInt -> CInt -> Ptr (Complex CFloat) -> CInt -> CInt -> Ptr (Complex CFloat) -> IO CInt - foreign import ccall unsafe "transC" ctransC :: TCMCM -foreign import ccall unsafe "transC" ctransCC :: CInt -> CInt -> Ptr (Complex CDouble) -> CInt -> CInt -> Ptr (Complex CDouble) -> IO CInt - foreign import ccall unsafe "transP" ctransP :: CInt -> CInt -> Ptr () -> CInt -> CInt -> CInt -> Ptr () -> CInt -> IO CInt ---------------------------------------------------------------------- @@ -382,22 +358,18 @@ constantAux fun x n = unsafePerformIO $ do constantF :: Float -> Int -> Vector Float constantF = constantAux cconstantF foreign import ccall unsafe "constantF" cconstantF :: Ptr Float -> TF -foreign import ccall unsafe "constantF" cconstantCF :: Ptr CFloat -> CInt -> Ptr CFloat -> IO CInt constantR :: Double -> Int -> Vector Double constantR = constantAux cconstantR foreign import ccall unsafe "constantR" cconstantR :: Ptr Double -> TV -foreign import ccall unsafe "constantR" cconstantCR :: Ptr CDouble -> CInt -> Ptr CDouble -> IO CInt constantQ :: Complex Float -> Int -> Vector (Complex Float) constantQ = constantAux cconstantQ foreign import ccall unsafe "constantQ" cconstantQ :: Ptr (Complex Float) -> TQV -foreign import ccall unsafe "constantQ" cconstantCQ :: Ptr (Complex CFloat) -> CInt -> Ptr (Complex CFloat) -> IO CInt constantC :: Complex Double -> Int -> Vector (Complex Double) constantC = constantAux cconstantC foreign import ccall unsafe "constantC" cconstantC :: Ptr (Complex Double) -> TCV -foreign import ccall unsafe "constantC" cconstantCC :: Ptr (Complex CDouble) -> CInt -> Ptr (Complex CDouble) -> IO CInt constantP :: Storable a => a -> Int -> Vector a constantP a n = unsafePerformIO $ do -- cgit v1.2.3