Merge remote-tracking branch 'ivo/new-pipeline' into inferencebasedast

# Conflicts: # .github/workflows/ci.yml # src/Data/Array/Accelerate/AST/Idx.hs # src/Data/Array/Accelerate/AST/Schedule/Sequential.hs # src/Data/Array/Accelerate/Representation/Type.hs # src/Data/Array/Accelerate/Trafo/Operation/LiveVars.hs # src/Data/Array/Accelerate/Trafo/Partitioning/ILP/Labels.hs # stack.yaml
dpvanbalen · Oct 6, 2023 · 8e5b9d1 · 8e5b9d1
2 parents 96aa695 + c67daa0
commit 8e5b9d1
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 35 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,4 +1,4 @@
-name: ci
+name: CI
 
 # Trigger the workflow on push or pull request
 on:
@@ -21,8 +21,8 @@ on:
     - cron: '0 0 * * 0'
 
 jobs:
-  build:
-    name: ${{ matrix.os }} ghc-${{ matrix.ghc }} ${{ matrix.mode }}
+  cabal:
+    name: cabal | ${{ matrix.os }}-${{ matrix.arch }} ghc-${{ matrix.ghc }} ${{ matrix.mode }}
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
@@ -47,10 +47,7 @@ jobs:
         exclude:
           - os: 'windows-latest'
             mode: 'debug'
-          - os: 'windows-latest'
-            arch: "ARM64"
-          - os: 'ubuntu-latest'
-            arch: "ARM64"
+          - arch: "ARM64"
 
     steps:
       - uses: actions/checkout@v3
@@ -103,10 +100,10 @@ jobs:
           path: |
             ${{ steps.setup-haskell.outputs.cabal-store }}
             dist-newstyle
-          key: ${{ runner.os }}-${{ matrix.ghc }}-${{ matrix.mode }}-${{ hashFiles('cabal.project.freeze') }}
+          key: ${{ runner.os }}-${{ matrix.arch }}-${{ matrix.ghc }}-${{ matrix.mode }}-cabal-${{ hashFiles('cabal.project.freeze') }}
           restore-keys: |
-            ${{ runner.os }}-${{ matrix.ghc }}-${{ matrix.mode }}-${{ hashFiles('cabal.project.freeze') }}
-            ${{ runner.os }}-${{ matrix.ghc }}-${{ matrix.mode }}-
+            ${{ runner.os }}-${{ matrix.arch }}-${{ matrix.ghc }}-${{ matrix.mode }}-cabal-${{ hashFiles('cabal.project.freeze') }}
+            ${{ runner.os }}-${{ matrix.arch }}-${{ matrix.ghc }}-${{ matrix.mode }}-cabal-
 
       - name: Build dependencies
         run: cabal build --only-dependencies

diff --git a/.gitignore b/.gitignore
@@ -10,7 +10,6 @@
 /accelerate-io/dist/
 /.stack-work
 /cabal.project.local*
-/stack.yaml
 /stack.yaml.lock
 .DS_Store
 *.lock

diff --git a/cbits/tracy b/cbits/tracy
diff --git a/src/Data/Array/Accelerate/AST/Idx.hs b/src/Data/Array/Accelerate/AST/Idx.hs
@@ -48,22 +48,7 @@ import Unsafe.Coerce                                                ( unsafeCoer
 data Idx env t where
   ZeroIdx ::              Idx (env, t) t
   SuccIdx :: Idx env t -> Idx (env, s) t
-
-instance Eq (Idx env t) where
-  ZeroIdx    == ZeroIdx     = True
-  SuccIdx ix == SuccIdx ix' = ix == ix'
-  _          == _           = False
-
-instance Ord (Idx env t) where
-  ZeroIdx    < SuccIdx _   = True
-  SuccIdx ix < SuccIdx ix' = ix < ix'
-  _          < _           = False
-
-  ZeroIdx    <= _           = True
-  SuccIdx ix <= SuccIdx ix' = ix <= ix'
-  _          <= _           = False
-
-
+  deriving (Eq, Ord)
 
 idxToInt :: Idx env t -> Int
 idxToInt ZeroIdx       = 0

diff --git a/src/Data/Array/Accelerate/AST/Schedule/Sequential.hs b/src/Data/Array/Accelerate/AST/Schedule/Sequential.hs
@@ -33,6 +33,7 @@ import Data.Array.Accelerate.Type
 import Data.Array.Accelerate.Representation.Array
 import Data.Array.Accelerate.Representation.Shape
 import Data.Array.Accelerate.Representation.Type
+import Data.Array.Accelerate.AST.Var
 import Data.Array.Accelerate.AST.LeftHandSide
 import Data.Array.Accelerate.AST.Operation                          hiding (PreOpenAcc(..), PreOpenAfun(..))
 import qualified Data.Array.Accelerate.AST.Operation as Operation
@@ -41,7 +42,7 @@ import qualified Data.Array.Accelerate.AST.Partitioned as Partition
 import Data.Array.Accelerate.AST.Kernel
 import Data.Array.Accelerate.AST.Schedule
 import Data.Array.Accelerate.AST.Schedule.Uniform ( SArg(..), SArgs )
-import Data.Array.Accelerate.Trafo.Schedule.Uniform ( compileKernel', CompiledKernel(..), rnfSArgs )
+import Data.Array.Accelerate.Trafo.Schedule.Uniform ( compileKernel', CompiledKernel(..), rnfSArg, rnfSArgs )
 import Data.Array.Accelerate.AST.Execute
 import Control.Concurrent.MVar
 import Data.Typeable                                                ( (:~:)(..) )

diff --git a/src/Data/Array/Accelerate/Trafo/Partitioning/ILP/Labels.hs b/src/Data/Array/Accelerate/Trafo/Partitioning/ILP/Labels.hs
@@ -85,8 +85,6 @@ data ALabel t where
   NotArr :: ALabel (t e) -- matches on `Var' e`, `Exp' e` and `Fun' e` (is typecorrect on arrays, but wish it wasn't)
 deriving instance Show (ALabel t)
 
-
-
 matchALabel :: ALabel (m sh s) -> ALabel (m' sh' t) -> Maybe ((sh,s) :~: (sh',t))
 matchALabel (Arr e1) (Arr e2)
   | Just Refl <- matchELabelTup e1 e2

diff --git a/stack.yaml b/stack.yaml
@@ -2,18 +2,17 @@
 # For advanced use and comprehensive documentation of the format, please see:
 # https://docs.haskellstack.org/en/stable/yaml_configuration/
 
-resolver: lts-21.12
-
-allow-newer: true
+resolver: lts-21.7
 
 packages:
 - .
 
 extra-deps:
-- MIP-0.1.1.0
 - OptDir-0.0.4
 - bytestring-encoding-0.1.2.0
 - fclabels-2.0.5.1
+- MIP-0.1.1.0
+
 
 # Override default flag values for local packages and extra-deps
 # flags: {}
@@ -40,3 +39,4 @@ extra-deps:
 # compiler-check: newer-minor
 #
 # vim: nospell
+