1
0
Fork 0
mirror of https://github.com/tensorflow/haskell.git synced 2024-11-26 21:09:44 +01:00

Fix the build on ghc-8.0.1 (#38). (#40)

Two issues:
- The definition of `\\` was missing parentheses.  It was probably a bug
  that this used to worked in ghc-7.10.
- Set `-fconstraint-solver-iterations=0` to work around
  https://ghc.haskell.org/trac/ghc/ticket/12175.  It looks like we can
  trigger that bug when defining a significantly complicated op.  Specifically,
  our type shenanigans ("OneOf") along with lens setters (for OpDef) seem
  to confuse GHC.

Still TODO: automate testing of different ghc versions to prevent a regression.
This commit is contained in:
Judah Jacobson 2016-11-21 22:20:08 -08:00 committed by Greg Steuck
parent cec666e135
commit 5b4017e31b
4 changed files with 18 additions and 1 deletions

View file

@ -24,6 +24,10 @@ library
, lens-family , lens-family
, text , text
default-language: Haskell2010 default-language: Haskell2010
-- Work around https://ghc.haskell.org/trac/ghc/ticket/12175.
if impl(ghc >= 8) {
ghc-options: -fconstraint-solver-iterations=0
}
source-repository head source-repository head
type: git type: git

View file

@ -19,6 +19,10 @@ library
, tensorflow == 0.1.* , tensorflow == 0.1.*
, tensorflow-ops == 0.1.* , tensorflow-ops == 0.1.*
default-language: Haskell2010 default-language: Haskell2010
-- Work around https://ghc.haskell.org/trac/ghc/ticket/12175.
if impl(ghc >= 8) {
ghc-options: -fconstraint-solver-iterations=0
}
Test-Suite NNTest Test-Suite NNTest

View file

@ -29,6 +29,10 @@ library
, tensorflow-core-ops == 0.1.* , tensorflow-core-ops == 0.1.*
, text , text
default-language: Haskell2010 default-language: Haskell2010
-- Work around https://ghc.haskell.org/trac/ghc/ticket/12175.
if impl(ghc >= 8) {
ghc-options: -fconstraint-solver-iterations=0
}
Test-Suite BuildTest Test-Suite BuildTest
default-language: Haskell2010 default-language: Haskell2010
@ -202,6 +206,11 @@ Test-Suite TypesTest
, test-framework-hunit , test-framework-hunit
, test-framework-quickcheck2 , test-framework-quickcheck2
, vector , vector
-- Work around https://ghc.haskell.org/trac/ghc/ticket/12175,
-- since this test defines its own ops.
if impl(ghc >= 8) {
ghc-options: -fconstraint-solver-iterations=0
}
Benchmark FeedFetchBench Benchmark FeedFetchBench
default-language: Haskell2010 default-language: Haskell2010

View file

@ -373,7 +373,7 @@ type family Delete a as where
-- | Takes the difference of two lists of types. -- | Takes the difference of two lists of types.
type family as \\ bs where type family as \\ bs where
as \\ '[] = as as \\ '[] = as
as \\ b ': bs = Delete b as \\ bs as \\ (b ': bs) = Delete b as \\ bs
-- | A constraint that the type @a@ doesn't appear in the type list @ts@. -- | A constraint that the type @a@ doesn't appear in the type list @ts@.
-- Assumes that @a@ and each of the elements of @ts@ are 'TensorType's. -- Assumes that @a@ and each of the elements of @ts@ are 'TensorType's.