update to fix compatibility with backprop-0.2.5.0, and travis bumps

.travis.yml

@@ -33,6 +33,10 @@ matrix:
     compiler: ": #GHC 8.2.2"
     addons: {apt: {packages: [cabal-install-2.0,ghc-8.2.2,happy-1.19.5,alex-3.1.7,libblas-dev,liblapack-dev], sources: [hvr-ghc]}}
 
+  - env: BUILD=cabal GHCVER=8.4.3 CABALVER=2.2 HAPPYVER=1.19.5 ALEXVER=3.1.7
+    compiler: ": #GHC 8.4.3"
+    addons: {apt: {packages: [cabal-install-2.2,ghc-8.4.3,happy-1.19.5,alex-3.1.7,libblas-dev,liblapack-dev], sources: [hvr-ghc]}}
+
   # Build with the newest GHC and cabal-install. This is an accepted failure,
   # see below.
   - env: BUILD=cabal GHCVER=head  CABALVER=head HAPPYVER=1.19.5 ALEXVER=3.1.7
@@ -45,6 +49,14 @@ matrix:
     compiler: ": #stack default"
     addons: {apt: {packages: [ghc-8.2.2,libblas-dev,liblapack-dev], sources: [hvr-ghc]}}
 
+  - env: BUILD=stack ARGS="--resolver lts-8"
+    compiler: ": #stack 8.0.2"
+    addons: {apt: {packages: [ghc-8.0.2,libblas-dev,liblapack-dev], sources: [hvr-ghc]}}
+
+  - env: BUILD=stack ARGS="--resolver lts-9"
+    compiler: ": #stack 8.0.2"
+    addons: {apt: {packages: [ghc-8.0.2,libblas-dev,liblapack-dev], sources: [hvr-ghc]}}
+
   - env: BUILD=stack ARGS="--resolver lts-10"
     compiler: ": #stack 8.2.2"
     addons: {apt: {packages: [ghc-8.2.2,libblas-dev,liblapack-dev], sources: [hvr-ghc]}}
@@ -63,6 +75,14 @@ matrix:
     compiler: ": #stack default osx"
     os: osx
 
+  - env: BUILD=stack ARGS="--resolver lts-8"
+    compiler: ": #stack 8.0.2 osx"
+    os: osx
+
+  - env: BUILD=stack ARGS="--resolver lts-9"
+    compiler: ": #stack 8.0.2 osx"
+    os: osx
+
   - env: BUILD=stack ARGS="--resolver lts-10"
     compiler: ": #stack 8.2.2 osx"
     os: osx
@@ -156,4 +176,3 @@ script:
   set +ex
 
 
-

CHANGELOG.md

@@ -1,6 +1,15 @@
 Changelog
 =========
 
+Version 0.1.2.3
+---------------
+
+*June 19, 2018*
+
+<https://github.com/mstksg/hmatrix-backprop/releases/tag/v0.1.2.3>
+
+*   Fix compatibility with *backprop-0.2.5.0*
+
 Version 0.1.2.2
 ---------------
 

package.yaml

@@ -1,5 +1,5 @@
 name:                hmatrix-backprop
-version:             0.1.2.2
+version:             0.1.2.3
 github:              "mstksg/hmatrix-backprop"
 license:             BSD3
 author:              "Justin Le"
@@ -33,7 +33,7 @@ ghc-options:
 - -Wredundant-constraints
 
 dependencies:
-- backprop >= 0.2.4
+- backprop >= 0.2.5
 - base >= 4.7 && < 5
 - hmatrix >= 0.18
 - hmatrix-vector-sized >= 0.1.1

src/Numeric/LinearAlgebra/Static/Backprop.hs

@@ -195,6 +195,7 @@ module Numeric.LinearAlgebra.Static.Backprop (
 
 import           Data.Bifunctor
 import           Data.Coerce
+import           Data.Functor.Identity
 import           Data.Maybe
 import           Data.Proxy
 import           Foreign.Storable
@@ -268,9 +269,14 @@ vec4
     -> BVar s H.ℝ
     -> BVar s (H.R 4)
 vec4 vX vY vZ vW = isoVarN
-    (\(x ::< y ::< z ::< w ::< Ø) -> H.vec4 x y z w)
-    (\(H.rVec->v) -> SVS.index v 0 ::< SVS.index v 1 ::< SVS.index v 2 ::< SVS.index v 3 ::< Ø)
-    (vX :< vY :< vZ :< vW :< Ø)
+    (\(Identity x :& Identity y :& Identity z :& Identity w :& RNil) -> H.vec4 x y z w)
+    (\(H.rVec->v) -> Identity (SVS.index v 0)
+                  :& Identity (SVS.index v 1)
+                  :& Identity (SVS.index v 2)
+                  :& Identity (SVS.index v 3)
+                  :& RNil
+    )
+    (vX :& vY :& vZ :& vW :& RNil)
 {-# INLINE vec4 #-}
 
 (&) :: (KnownNat n, 1 <= n, KnownNat (n + 1), Reifies s W)

stack.yaml

@@ -16,7 +16,7 @@
 #  name: custom-snapshot
 #  location: "./custom-snapshot.yaml"
 # resolver: nightly-2018-03-25
-resolver: lts-11.0
+resolver: nightly-2018-06-19
 
 # User packages to be built.
 # Various formats can be used as shown in the example below.
@@ -38,21 +38,16 @@ resolver: lts-11.0
 # will not be run. This is useful for tweaking upstream packages.
 packages:
 - .
-# - location:
-#     git: https://github.com/mstksg/backprop.git
-#     commit: 1d0875a72cf903e574430ccfdffc505e7958f311
-#   extra-dep: true
-# - location:
-#     git: https://github.com/mstksg/type-combinators.git
-#     commit: 13e7d4bd99b1a80b5fdb436a85ee52cfa0ff799f
-#   extra-dep: true
 
 # Dependency packages to be pulled from upstream that are not in the resolver
 # (e.g., acme-missiles-0.3)
 extra-deps:
-- backprop-0.2.4.0
+- backprop-0.2.5.0
 - hmatrix-vector-sized-0.1.1.0
-# - type-combinators-0.2.4.3
+- vector-sized-1.0.2.0
+- indexed-list-literals-0.2.1.1
+- vinyl-0.8.1.1
+- hedgehog-0.6
 
 # Override default flag values for local packages and extra-deps
 # flags: {}