diff --git a/LICENSE b/LICENSE --- a/LICENSE +++ b/LICENSE @@ -1,24 +1,25 @@ -Copyright (c) 2010-2012, University of New South Wales. -All rights reserved. +Copyright (c) 2001-2014, The Data Parallel Haskell Team Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - * Neither the name of the University of New South Wales nor the - names of its contributors may be used to endorse or promote products - derived from this software without specific prior written permission. -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ''AS IS'' AND ANY -EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL COPYRIGHT HOLDERS BE LIABLE FOR ANY -DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +- Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + +- Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + +- The names of the copyright holders may not be used to endorse or promote + products derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, +INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND +FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, +OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE +OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/examples/Canny/src-repa/Main.hs b/examples/Canny/src-repa/Main.hs --- a/examples/Canny/src-repa/Main.hs +++ b/examples/Canny/src-repa/Main.hs @@ -1,4 +1,5 @@ -{-# LANGUAGE PackageImports, BangPatterns, QuasiQuotes, PatternGuards, MagicHash, ScopedTypeVariables #-} +{-# LANGUAGE PackageImports, BangPatterns, QuasiQuotes, PatternGuards, + MagicHash, ScopedTypeVariables #-} {-# OPTIONS -Wall -fno-warn-missing-signatures -fno-warn-incomplete-patterns #-} -- | Canny edge detector. @@ -25,7 +26,7 @@ import GHC.Exts import qualified Data.Vector.Unboxed.Mutable as VM import qualified Data.Vector.Unboxed as V -import Prelude as P +import qualified Prelude as P import Prelude hiding (compare) diff --git a/repa-examples.cabal b/repa-examples.cabal --- a/repa-examples.cabal +++ b/repa-examples.cabal @@ -1,5 +1,5 @@ Name: repa-examples -Version: 3.2.3.2 +Version: 3.2.5.1 License: BSD3 License-file: LICENSE Author: The DPH Team @@ -19,9 +19,9 @@ Executable repa-canny Build-depends: - base == 4.6.*, - repa == 3.2.*, - repa-algorithms == 3.2.* + base == 4.7.*, + repa == 3.2.5.*, + repa-algorithms == 3.2.5.* Main-is: examples/Canny/src-repa/Main.hs hs-source-dirs: examples/Canny/src-repa . @@ -35,11 +35,11 @@ Executable repa-mmult Build-depends: - base == 4.6.*, + base == 4.7.*, random == 1.0.*, - repa == 3.2.*, - repa-io == 3.2.*, - repa-algorithms == 3.2.* + repa == 3.2.5.*, + repa-io == 3.2.5.*, + repa-algorithms == 3.2.5.* Main-is: examples/MMult/src-repa/Main.hs other-modules: Solver @@ -56,10 +56,10 @@ Executable repa-laplace Build-depends: - base == 4.6.*, - repa == 3.2.*, - repa-io == 3.2.*, - template-haskell == 2.8.* + base == 4.7.*, + repa == 3.2.5.*, + repa-io == 3.2.5.*, + template-haskell == 2.9.* Main-is: examples/Laplace/src-repa/Main.hs other-modules: SolverGet SolverStencil @@ -74,10 +74,10 @@ Executable repa-fft2d Build-depends: - base == 4.6.*, - repa == 3.2.*, - repa-algorithms == 3.2.*, - repa-io == 3.2.* + base == 4.7.*, + repa == 3.2.5.*, + repa-algorithms == 3.2.5.*, + repa-io == 3.2.5.* Main-is: examples/FFT/FFT2d/src-repa/Main.hs hs-source-dirs: examples/FFT/FFT2d/src-repa . @@ -93,10 +93,10 @@ Executable repa-fft2d-highpass Build-depends: - base == 4.6.*, - repa == 3.2.*, - repa-algorithms == 3.2.*, - repa-io == 3.2.* + base == 4.7.*, + repa == 3.2.5.*, + repa-algorithms == 3.2.5.*, + repa-io == 3.2.5.* Main-is: examples/FFT/HighPass2d/src-repa/Main.hs hs-source-dirs: examples/FFT/HighPass2d/src-repa . @@ -113,9 +113,9 @@ Executable repa-fft3d-highpass Build-depends: - base == 4.6.*, - repa == 3.2.*, - repa-algorithms == 3.2.* + base == 4.7.*, + repa == 3.2.5.*, + repa-algorithms == 3.2.5.* Main-is: examples/FFT/HighPass3d/src-repa/Main.hs hs-source-dirs: examples/FFT/HighPass3d/src-repa . @@ -131,10 +131,10 @@ Executable repa-blur Build-depends: - base == 4.6.*, + base == 4.7.*, vector == 0.10.*, - repa == 3.2.*, - repa-algorithms == 3.2.* + repa == 3.2.5.*, + repa-algorithms == 3.2.5.* Main-is: examples/Blur/src-repa/Main.hs hs-source-dirs: examples/Blur/src-repa . @@ -150,9 +150,9 @@ Executable repa-sobel Build-depends: - base == 4.6.*, - repa == 3.2.*, - repa-algorithms == 3.2.* + base == 4.7.*, + repa == 3.2.5.*, + repa-algorithms == 3.2.5.* Main-is: examples/Sobel/src-repa/Main.hs other-modules: Solver @@ -169,9 +169,9 @@ Executable repa-volume Build-depends: - base == 4.6.*, - repa == 3.2.*, - repa-io == 3.2.* + base == 4.7.*, + repa == 3.2.5.*, + repa-io == 3.2.5.* Main-is: examples/Volume/Main.hs ghc-options: @@ -185,9 +185,9 @@ Executable repa-unit-test Build-depends: - base == 4.*, - repa == 3.2.*, - QuickCheck >= 2.3 && < 2.7 + base == 4.7.*, + repa == 3.2.5.*, + QuickCheck == 2.7.* Main-is: examples/UnitTesting/UnitTesting.hs hs-source-dirs: examples/UnitTesting .