Skip to content

Upgraded to tensorflow 2.3 #265

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 9 commits into from
Closed

Upgraded to tensorflow 2.3 #265

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
28d8a93
Updated tensorflow-proto to proto-lens-0.7
noahmartinwilliams Aug 24, 2020
da491a5
Updated tensorflow to proto-lens 0.7
noahmartinwilliams Aug 24, 2020
ec6d9aa
Modified tensorflow so it will compile.
noahmartinwilliams Aug 24, 2020
b109bf0
Upgraded tensorflow-opgen to proto-lens 0.7
noahmartinwilliams Aug 24, 2020
13c0d98
Updated tensorflow-core-ops to proto-lens 0.7
noahmartinwilliams Aug 24, 2020
aa28354
Updated tensorflow-ops to proto-lens 0.7
noahmartinwilliams Aug 24, 2020
7210ff8
Added PureResult instances for tuples up to size twelve so that tenso…
noahmartinwilliams Aug 26, 2020
aee6d65
Upgraded tensorflow-logging to proto-lens 0.7 so it will compile.
noahmartinwilliams Aug 26, 2020
06c4f2a
Upgraded tensorflow-mnist to proto-lens 0.7 so it will compile.
noahmartinwilliams Aug 26, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions tensorflow-core-ops/Setup.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@ blackList =
, "ParallelInterleaveDatasetV2"
, "ParallelMapDataset"
, "ParseSequenceExample"
, "ParseSequenceExampleV2"
, "PartitionedCall"
, "ReduceDataset"
, "RemoteCall"
Expand Down
4 changes: 2 additions & 2 deletions tensorflow-core-ops/tensorflow-core-ops.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ library
exposed-modules: TensorFlow.GenOps.Core
autogen-modules: TensorFlow.GenOps.Core
build-depends: bytestring
, proto-lens == 0.6.*
, proto-lens == 0.7.*
, tensorflow == 0.2.*
, base >= 4.7 && < 5
, lens-family == 2.*
Expand All @@ -27,7 +27,7 @@ custom-setup
setup-depends: Cabal
, bytestring
, directory
, proto-lens == 0.6.*
, proto-lens == 0.7.*
, tensorflow-opgen == 0.2.*
, tensorflow == 0.2.*
, base >= 4.7 && < 5
Expand Down
1 change: 1 addition & 0 deletions tensorflow-core-ops/third_party
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../third_party/tensorflow/
2 changes: 1 addition & 1 deletion tensorflow-logging/tensorflow-logging.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ library
, filepath
, hostname
, lens-family == 2.*
, proto-lens == 0.6.*
, proto-lens == 0.7.*
, resourcet
, stm
, stm-chans
Expand Down
2 changes: 1 addition & 1 deletion tensorflow-mnist/tensorflow-mnist.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ library
exposed-modules: TensorFlow.Examples.MNIST.Parse
, TensorFlow.Examples.MNIST.TrainedGraph
other-modules: Paths_tensorflow_mnist
build-depends: proto-lens == 0.6.*
build-depends: proto-lens == 0.7.*
, base >= 4.7 && < 5
, binary
, bytestring
Expand Down
2 changes: 2 additions & 0 deletions tensorflow-opgen/src/TensorFlow/OpGen/ParsedOp.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ data Attr a = Attr
-- | The type of an attribute.
data AttrType = AttrSingle AttrBaseType
| AttrList AttrBaseType
| AttrFunc
deriving Eq

data AttrBaseType = AttrBytes | AttrInt64 | AttrFloat | AttrBool
Expand Down Expand Up @@ -341,5 +342,6 @@ parseAttrType o = \case
"list(type)" -> AttrList AttrType
"list(shape)" -> AttrList AttrShape
"list(tensor)" -> AttrList AttrTensor
"func" -> AttrFunc
t -> error $ "parseAttrType: unrecognized type " ++ show t
++ " for op " ++ show (o ^. name)
2 changes: 1 addition & 1 deletion tensorflow-opgen/tensorflow-opgen.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ library
hs-source-dirs: src
exposed-modules: TensorFlow.OpGen.ParsedOp
, TensorFlow.OpGen
build-depends: proto-lens == 0.6.*
build-depends: proto-lens == 0.7.*
, tensorflow-proto == 0.2.*
, base >= 4.7 && < 5
, bytestring
Expand Down
2 changes: 1 addition & 1 deletion tensorflow-ops/tensorflow-ops.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ library
, TensorFlow.NN
, TensorFlow.Queue
, TensorFlow.Variable
build-depends: proto-lens == 0.6.*
build-depends: proto-lens == 0.7.*
, base >= 4.7 && < 5
, bytestring
, fgl
Expand Down
6 changes: 3 additions & 3 deletions tensorflow-proto/tensorflow-proto.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,9 +176,9 @@ library
, Proto.Tensorflow.Core.Util.SavedTensorSlice_Fields
, Proto.Tensorflow.Core.Util.TestLog
, Proto.Tensorflow.Core.Util.TestLog_Fields
build-depends: proto-lens == 0.6.*
, proto-lens-runtime == 0.6.*
, proto-lens-protobuf-types == 0.6.*
build-depends: proto-lens == 0.7.*
, proto-lens-runtime == 0.7.*
, proto-lens-protobuf-types == 0.7.*
, base >= 4.7 && < 5
default-language: Haskell2010
include-dirs: .
Expand Down
1 change: 1 addition & 0 deletions tensorflow/src/TensorFlow/Build.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ module TensorFlow.Build
import Data.ProtoLens.Message(defMessage)
import Control.Monad.Catch (MonadThrow, MonadCatch, MonadMask)
import Control.Monad.Fix (MonadFix(..))
import Control.Monad.Fail (MonadFail(..))
import Control.Monad.IO.Class (MonadIO(..))
import Control.Monad.Trans.Class (MonadTrans(..))
import Control.Monad.Trans.State.Strict(StateT(..), mapStateT, evalStateT)
Expand Down
100 changes: 100 additions & 0 deletions tensorflow/src/TensorFlow/BuildOp.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,6 +257,106 @@ instance ( PureResult a1
<*> pureResult
<*> pureResult

instance ( PureResult a1
, PureResult a2
, PureResult a3
, PureResult a4
, PureResult a5
, PureResult a6
, PureResult a7
, PureResult a8
, PureResult a9
)
=> PureResult (a1, a2, a3, a4, a5, a6, a7, a8, a9) where
pureResult = (,,,,,,,,)
<$> pureResult
<*> pureResult
<*> pureResult
<*> pureResult
<*> pureResult
<*> pureResult
<*> pureResult
<*> pureResult
<*> pureResult

instance ( PureResult a1
, PureResult a2
, PureResult a3
, PureResult a4
, PureResult a5
, PureResult a6
, PureResult a7
, PureResult a8
, PureResult a9
, PureResult a10
)
=> PureResult (a1, a2, a3, a4, a5, a6, a7, a8, a9, a10) where
pureResult = (,,,,,,,,,)
<$> pureResult
<*> pureResult
<*> pureResult
<*> pureResult
<*> pureResult
<*> pureResult
<*> pureResult
<*> pureResult
<*> pureResult
<*> pureResult

instance ( PureResult a1
, PureResult a2
, PureResult a3
, PureResult a4
, PureResult a5
, PureResult a6
, PureResult a7
, PureResult a8
, PureResult a9
, PureResult a10
, PureResult a11
)
=> PureResult (a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11) where
pureResult = (,,,,,,,,,,)
<$> pureResult
<*> pureResult
<*> pureResult
<*> pureResult
<*> pureResult
<*> pureResult
<*> pureResult
<*> pureResult
<*> pureResult
<*> pureResult
<*> pureResult

instance ( PureResult a1
, PureResult a2
, PureResult a3
, PureResult a4
, PureResult a5
, PureResult a6
, PureResult a7
, PureResult a8
, PureResult a9
, PureResult a10
, PureResult a11
, PureResult a12
)
=> PureResult (a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12) where
pureResult = (,,,,,,,,,,,)
<$> pureResult
<*> pureResult
<*> pureResult
<*> pureResult
<*> pureResult
<*> pureResult
<*> pureResult
<*> pureResult
<*> pureResult
<*> pureResult
<*> pureResult
<*> pureResult

instance PureResult a => PureResult [a] where
pureResult = do
ResultState i ns <- get
Expand Down
1 change: 1 addition & 0 deletions tensorflow/src/TensorFlow/Session.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ module TensorFlow.Session (
import Data.ProtoLens.Message(defMessage)
import Control.Monad (forever, unless, void)
import Control.Monad.Catch (MonadThrow, MonadCatch, MonadMask)
import Control.Monad.Fail (MonadFail(..))
import Control.Monad.IO.Class (MonadIO, liftIO)
import Control.Monad.Trans.Class (MonadTrans, lift)
import Control.Monad.Trans.Reader (ReaderT(..), ask, asks)
Expand Down
2 changes: 1 addition & 1 deletion tensorflow/tensorflow.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ library
, TensorFlow.Types
other-modules: TensorFlow.Internal.Raw
build-tools: c2hs
build-depends: proto-lens == 0.6.*
build-depends: proto-lens == 0.7.*
, tensorflow-proto == 0.2.*
, base >= 4.7 && < 5
, async
Expand Down