From 44df10e6def0cd3241d8b5c2c3f13cd180dcb005 Mon Sep 17 00:00:00 2001 From: Tom Smeding Date: Mon, 13 Jan 2025 14:46:28 +0100 Subject: [PATCH 1/3] Clean up unused modules --- accelerate.cabal | 1 - {src/Data/Array/Accelerate => icebox}/Sugar/Stencil.hs | 0 {src/Data/Array/Accelerate => icebox}/Trafo/Normalise.hs | 0 {src/Data/Array/Accelerate => icebox}/Trafo/Vectorise.hs | 0 4 files changed, 1 deletion(-) rename {src/Data/Array/Accelerate => icebox}/Sugar/Stencil.hs (100%) rename {src/Data/Array/Accelerate => icebox}/Trafo/Normalise.hs (100%) rename {src/Data/Array/Accelerate => icebox}/Trafo/Vectorise.hs (100%) diff --git a/accelerate.cabal b/accelerate.cabal index af901494e..16fbbf206 100644 --- a/accelerate.cabal +++ b/accelerate.cabal @@ -481,7 +481,6 @@ library Data.Atomic -- Data.Array.Accelerate.Array.Lifted - -- Data.Array.Accelerate.Trafo.Vectorise -- nofib test suite Data.Array.Accelerate.Test.NoFib.Base diff --git a/src/Data/Array/Accelerate/Sugar/Stencil.hs b/icebox/Sugar/Stencil.hs similarity index 100% rename from src/Data/Array/Accelerate/Sugar/Stencil.hs rename to icebox/Sugar/Stencil.hs diff --git a/src/Data/Array/Accelerate/Trafo/Normalise.hs b/icebox/Trafo/Normalise.hs similarity index 100% rename from src/Data/Array/Accelerate/Trafo/Normalise.hs rename to icebox/Trafo/Normalise.hs diff --git a/src/Data/Array/Accelerate/Trafo/Vectorise.hs b/icebox/Trafo/Vectorise.hs similarity index 100% rename from src/Data/Array/Accelerate/Trafo/Vectorise.hs rename to icebox/Trafo/Vectorise.hs From ffc7b618c36b7a0c0d0de5c8855177cff3ab706a Mon Sep 17 00:00:00 2001 From: Tom Smeding Date: Mon, 13 Jan 2025 15:09:54 +0100 Subject: [PATCH 2/3] DAA.Sugar.Tag is listed but unused, also in -llvm --- accelerate.cabal | 1 - {src/Data/Array/Accelerate => icebox}/Sugar/Tag.hs | 0 2 files changed, 1 deletion(-) rename {src/Data/Array/Accelerate => icebox}/Sugar/Tag.hs (100%) diff --git a/accelerate.cabal b/accelerate.cabal index 16fbbf206..20890a53a 100644 --- a/accelerate.cabal +++ b/accelerate.cabal @@ -414,7 +414,6 @@ library Data.Array.Accelerate.Sugar.Elt Data.Array.Accelerate.Sugar.Foreign Data.Array.Accelerate.Sugar.Shape - Data.Array.Accelerate.Sugar.Tag Data.Array.Accelerate.Sugar.Vec Data.Array.Accelerate.Trafo Data.Array.Accelerate.Trafo.Config diff --git a/src/Data/Array/Accelerate/Sugar/Tag.hs b/icebox/Sugar/Tag.hs similarity index 100% rename from src/Data/Array/Accelerate/Sugar/Tag.hs rename to icebox/Sugar/Tag.hs From d089fc73dbfb6650caa86b1f84e5bb4e85caa342 Mon Sep 17 00:00:00 2001 From: Tom Smeding Date: Mon, 13 Jan 2025 16:37:40 +0100 Subject: [PATCH 3/3] Explicit imports to prepare for deepseq-1.5.1.0 --- src/Data/Array/Accelerate/AST.hs | 2 +- src/Data/Array/Accelerate/Interpreter.hs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Data/Array/Accelerate/AST.hs b/src/Data/Array/Accelerate/AST.hs index a6d0f75f7..5a4dd370d 100644 --- a/src/Data/Array/Accelerate/AST.hs +++ b/src/Data/Array/Accelerate/AST.hs @@ -149,7 +149,7 @@ import Data.Array.Accelerate.Sugar.Foreign import Data.Array.Accelerate.Type import Data.Primitive.Vec -import Control.DeepSeq +import Control.DeepSeq ( NFData(..) ) import Data.Kind import Data.Maybe import Data.Text ( Text ) diff --git a/src/Data/Array/Accelerate/Interpreter.hs b/src/Data/Array/Accelerate/Interpreter.hs index 5b8e6401a..9d3bfdfde 100644 --- a/src/Data/Array/Accelerate/Interpreter.hs +++ b/src/Data/Array/Accelerate/Interpreter.hs @@ -69,7 +69,7 @@ import qualified Data.Array.Accelerate.Sugar.Array as Sugar import qualified Data.Array.Accelerate.Sugar.Elt as Sugar import qualified Data.Array.Accelerate.Trafo.Delayed as AST -import Control.DeepSeq +import Control.DeepSeq ( ($!!) ) import Control.Exception import Control.Monad import Control.Monad.ST