eeva/tensorflow-haskell
1
0
Fork 0
mirror of https://github.com/tensorflow/haskell.git synced 2024-12-24 18:49:46 +01:00
Code Issues Releases Wiki Activity

Adapt to lts-8.6 and use proto-lens-0.2.0.0

Browse source
This commit is contained in:
Christian Berentsen 2017-04-03 14:48:28 +02:00
parent a11a417ad5
commit 719a715e90
12 changed files with 22 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
stack.yaml
View file

@ -1,4 +1,4 @@
resolver: lts-6.2
resolver: lts-8.6
packages:
- google-shim
@ -18,11 +18,12 @@ packages:
extra-deps:
# proto-lens is not yet in Stackage.
- proto-lens-0.1.0.5
- proto-lens-protoc-0.1.0.5
- proto-lens-descriptors-0.1.0.5
- proto-lens-0.2.0.0
- proto-lens-protoc-0.2.0.0
- proto-lens-descriptors-0.2.0.0
- snappy-framing-0.1.1
- snappy-0.2.0.2
- lens-labels-0.1.0.0
# Allow our custom Setup.hs scripts to import Data.ProtoLens.Setup from the version of
# `proto-lens-protoc` in stack's local DB. See:

2
tensorflow-core-ops/tensorflow-core-ops.cabal
View file

@ -16,7 +16,7 @@ library
build-depends: Cabal >= 1.22 && < 1.25
, bytestring
, directory
, proto-lens == 0.1.*
, proto-lens == 0.2.*
, tensorflow-opgen == 0.1.*
, tensorflow == 0.1.*
, base >= 4.7 && < 5

2
tensorflow-logging/tensorflow-logging.cabal
View file

@ -23,7 +23,7 @@ library
, filepath
, hostname
, lens-family
, proto-lens == 0.1.*
, proto-lens == 0.2.*
, resourcet
, stm
, stm-chans

4
tensorflow-logging/tests/LoggingTest.hs
View file

@ -21,7 +21,7 @@ import Data.Default (def)
import Data.List ((\\))
import Data.ProtoLens (decodeMessageOrDie)
import Lens.Family2 ((^.), (.~), (&))
import Proto.Tensorflow.Core.Util.Event (fileVersion, step)
import Proto.Tensorflow.Core.Util.Event (Event, fileVersion, step)
import System.Directory (getDirectoryContents)
import System.FilePath ((</>))
import System.IO.Temp (withSystemTempDirectory)
@ -43,7 +43,7 @@ testEventWriter :: Test
testEventWriter = testCase "EventWriter" $
withSystemTempDirectory "event_writer_logs" $ \dir -> do
assertEqual "No file before" [] =<< listDirectory dir
let expected = [ def & step .~ 10
let expected = [ (def :: Event) & step .~ 10
, def & step .~ 222
, def & step .~ 8
]

2
tensorflow-mnist/tensorflow-mnist.cabal
View file

@ -19,7 +19,7 @@ library
exposed-modules: TensorFlow.Examples.MNIST.Parse
, TensorFlow.Examples.MNIST.TrainedGraph
other-modules: Paths_tensorflow_mnist
build-depends: proto-lens == 0.1.*
build-depends: proto-lens == 0.2.*
, base >= 4.7 && < 5
, binary
, bytestring

2
tensorflow-opgen/tensorflow-opgen.cabal
View file

@ -15,7 +15,7 @@ library
hs-source-dirs: src
exposed-modules: TensorFlow.OpGen.ParsedOp
, TensorFlow.OpGen
build-depends: proto-lens == 0.1.*
build-depends: proto-lens == 0.2.*
, tensorflow-proto == 0.1.*
, base >= 4.7 && < 5
, bytestring

2
tensorflow-ops/tensorflow-ops.cabal
View file

@ -16,7 +16,7 @@ library
exposed-modules: TensorFlow.Gradient
, TensorFlow.Ops
, TensorFlow.EmbeddingOps
build-depends: proto-lens == 0.1.*
build-depends: proto-lens == 0.2.*
, base >= 4.7 && < 5
, bytestring
, fgl

4
tensorflow-proto/tensorflow-proto.cabal
View file

@ -34,8 +34,8 @@ library
, Proto.Tensorflow.Core.Framework.TensorDescription
, Proto.Tensorflow.Core.Framework.Versions
, Proto.Tensorflow.Core.Protobuf.Debug
build-depends: proto-lens == 0.1.*
, proto-lens-protoc == 0.1.*
build-depends: proto-lens == 0.2.*
, proto-lens-protoc == 0.2.*
, base >= 4.7 && < 5
default-language: Haskell2010
include-dirs: .

2
tensorflow-queue/tensorflow-queue.cabal
View file

@ -14,7 +14,7 @@ cabal-version: >=1.22
library
hs-source-dirs: src
exposed-modules: TensorFlow.Queue
build-depends: proto-lens == 0.1.*
build-depends: proto-lens == 0.2.*
, base >= 4.7 && < 5
, bytestring
, lens-family

4
tensorflow/src/TensorFlow/Session.hs
View file

@ -49,7 +49,7 @@ import Data.Set (Set)
import Data.Text.Encoding (encodeUtf8)
import Lens.Family2 (Lens', (^.), (&), (.~))
import Lens.Family2.Unchecked (lens)
import Proto.Tensorflow.Core.Framework.Graph (node)
import Proto.Tensorflow.Core.Framework.Graph (GraphDef, node)
import Proto.Tensorflow.Core.Protobuf.Config (ConfigProto)
import TensorFlow.Build
import TensorFlow.Nodes
@ -135,7 +135,7 @@ extend = do
trace <- Session (asks tracer)
nodesToExtend <- build flushNodeBuffer
unless (null nodesToExtend) $ liftIO $ do
let graphDef = def & node .~ nodesToExtend
let graphDef = (def :: GraphDef) & node .~ nodesToExtend
trace ("Session.extend " <> Builder.string8 (showMessage graphDef))
FFI.extendGraph session graphDef
-- Now that all the nodes are created, run the initializers.

6
tensorflow/src/TensorFlow/Types.hs
View file

@ -262,7 +262,7 @@ instance TensorDataType S.Vector Bool where
where
fromBool x = if x then 1 else 0 :: Word8
instance {-# OVERLAPPABLE #-} (Storable a, TensorDataType S.Vector a)
instance {-# OVERLAPPABLE #-} (Storable a, TensorDataType S.Vector a, TensorType a)
=> TensorDataType V.Vector a where
decodeTensorData = (S.convert :: S.Vector a -> V.Vector a) . decodeTensorData
encodeTensorData x = encodeTensorData x . (S.convert :: V.Vector a -> S.Vector a)
@ -329,7 +329,7 @@ newtype Scalar a = Scalar {unScalar :: a}
deriving (Show, Eq, Ord, Num, Fractional, Floating, Real, RealFloat,
RealFrac, IsString)
instance TensorDataType V.Vector a => TensorDataType Scalar a where
instance (TensorDataType V.Vector a, TensorType a) => TensorDataType Scalar a where
decodeTensorData = Scalar . headFromSingleton . decodeTensorData
encodeTensorData x (Scalar y) = encodeTensorData x (V.fromList [y])
@ -353,7 +353,7 @@ protoShape :: Lens' TensorShapeProto Shape
protoShape = iso protoToShape shapeToProto
where
protoToShape = Shape . fmap (view size) . view dim
shapeToProto (Shape ds) = def & dim .~ fmap (\d -> def & size .~ d) ds
shapeToProto (Shape ds) = (def :: TensorShapeProto) & dim .~ fmap (\d -> def & size .~ d) ds
class Attribute a where

4
tensorflow/tensorflow.cabal
View file

@ -27,9 +27,9 @@ library
other-modules: TensorFlow.Internal.Raw
, TensorFlow.Orphans
build-tools: c2hs
build-depends: proto-lens == 0.1.*
build-depends: proto-lens == 0.2.*
-- Used by the custom Setup script (for the test-suite).
, proto-lens-protoc == 0.1.*
, proto-lens-protoc == 0.2.*
, tensorflow-proto == 0.1.*
, base >= 4.7 && < 5
, async