From 25684aff546d5b0e05847461b91b99c5334554f1 Mon Sep 17 00:00:00 2001 From: "Trevor L. McDonell" Date: Mon, 8 Sep 2014 17:52:29 -0400 Subject: [PATCH] fallout of Data.Complex move AccelerateHS/accelerate#197 --- accelerate-examples.cabal | 1 - examples/fft/src-acc/FFT.hs | 2 +- examples/fft/src-acc/HighPass.hs | 2 +- examples/mandelbrot/Mandel.hs | 2 +- examples/nofib/Test/FFT.hs | 2 +- examples/smoothlife/Config.hs | 2 +- examples/smoothlife/SmoothLife.hs | 2 +- 7 files changed, 6 insertions(+), 7 deletions(-) diff --git a/accelerate-examples.cabal b/accelerate-examples.cabal index 7319bba..4f7f6db 100644 --- a/accelerate-examples.cabal +++ b/accelerate-examples.cabal @@ -352,7 +352,6 @@ Executable accelerate-mandelbrot buildable: False else build-depends: accelerate == 0.15.*, - accelerate-fft == 0.15.*, accelerate-io == 0.15.*, base == 4.7.*, criterion >= 0.5 && <1, diff --git a/examples/fft/src-acc/FFT.hs b/examples/fft/src-acc/FFT.hs index ff00753..6e0b0f9 100644 --- a/examples/fft/src-acc/FFT.hs +++ b/examples/fft/src-acc/FFT.hs @@ -5,8 +5,8 @@ module FFT import Prelude as P import Data.Array.Accelerate as A import Data.Array.Accelerate.IO as A +import Data.Array.Accelerate.Data.Complex as A import Data.Array.Accelerate.Math.FFT as A -import Data.Array.Accelerate.Math.Complex as A import Data.Array.Accelerate.Math.DFT.Centre as A diff --git a/examples/fft/src-acc/HighPass.hs b/examples/fft/src-acc/HighPass.hs index 13250d9..62930aa 100644 --- a/examples/fft/src-acc/HighPass.hs +++ b/examples/fft/src-acc/HighPass.hs @@ -6,8 +6,8 @@ import Prelude as P import Data.Array.Accelerate as A import Data.Array.Accelerate.IO as A import Data.Array.Accelerate.Math.FFT as A -import Data.Array.Accelerate.Math.Complex as A import Data.Array.Accelerate.Math.DFT.Centre as A +import Data.Array.Accelerate.Data.Complex as A highpassFFT :: Int -> Int -> Int -> Acc (Array DIM2 RGBA32) -> Acc (Array DIM2 RGBA32) diff --git a/examples/mandelbrot/Mandel.hs b/examples/mandelbrot/Mandel.hs index f889ea3..1dda825 100644 --- a/examples/mandelbrot/Mandel.hs +++ b/examples/mandelbrot/Mandel.hs @@ -16,7 +16,7 @@ module Mandel ( import Prelude as P import Data.Array.Accelerate as A import Data.Array.Accelerate.IO as A -import Data.Array.Accelerate.Math.Complex +import Data.Array.Accelerate.Data.Complex -- Types ----------------------------------------------------------------------- diff --git a/examples/nofib/Test/FFT.hs b/examples/nofib/Test/FFT.hs index 0d676a5..d4e057e 100644 --- a/examples/nofib/Test/FFT.hs +++ b/examples/nofib/Test/FFT.hs @@ -27,7 +27,7 @@ import QuickCheck.Arbitrary.Array import Data.Array.Accelerate.Math.FFT as FFT import Data.Array.Accelerate as A hiding ( (!) ) import Data.Array.Accelerate.Array.Sugar ( (!) ) -import Data.Array.Accelerate.Math.Complex +import Data.Array.Accelerate.Data.Complex newtype PowerOf2Array a = PowerOf2Array (Array DIM2 a) deriving Show diff --git a/examples/smoothlife/Config.hs b/examples/smoothlife/Config.hs index 9ce8ad5..43319d0 100644 --- a/examples/smoothlife/Config.hs +++ b/examples/smoothlife/Config.hs @@ -11,7 +11,7 @@ import Data.Label import Control.Category import Data.Array.Accelerate ( Array, DIM2 ) -import Data.Array.Accelerate.Math.Complex ( Complex ) +import Data.Array.Accelerate.Data.Complex ( Complex ) -- | Types diff --git a/examples/smoothlife/SmoothLife.hs b/examples/smoothlife/SmoothLife.hs index 19fbe6e..8cd6ab3 100644 --- a/examples/smoothlife/SmoothLife.hs +++ b/examples/smoothlife/SmoothLife.hs @@ -19,7 +19,7 @@ import Data.Label import Data.Array.Accelerate as A hiding ( size ) import Data.Array.Accelerate.Math.FFT import Data.Array.Accelerate.Math.DFT.Centre -import Data.Array.Accelerate.Math.Complex +import Data.Array.Accelerate.Data.Complex #ifdef ACCELERATE_CUDA_BACKEND import Data.Array.Accelerate.CUDA.Foreign