Skip to content

Update Package Version Numbers #268

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

Merged
merged 15 commits into from
Nov 11, 2020
Merged

Update Package Version Numbers #268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
9cc48c3
Tensorflow 2.3.0 building and passing tests.
jcmartin Aug 28, 2020
b30d9a5
Added einsum and test.
jcmartin Aug 28, 2020
43eebd2
Added ByteString as a possible argument to a function.
jcmartin Sep 4, 2020
0c95543
Support more data types for Adam.
jcmartin Nov 5, 2020
92bf575
Move to later version of LTS on stackage.
jcmartin Nov 5, 2020
03164c0
Revert Dockerfile debugging.
jcmartin Nov 5, 2020
550ed59
Addresses blackgnezdo nitpicks related to comments.
jcmartin Nov 5, 2020
4bca19d
Added a wrapper module for convolution functions.
jcmartin Nov 5, 2020
f947768
Update Dockerfile for ci.
jcmartin Nov 5, 2020
5258303
Further nitpicks by blackgnezdo addressed.
jcmartin Nov 5, 2020
ad9ae14
Update ci build to use a later version of stack.
jcmartin Nov 6, 2020
4824ca9
Removed a deprecated import in GradientTest.
jcmartin Nov 6, 2020
d7da5e5
Increment tensorflow packages' version numbers.
jcmartin Nov 10, 2020
02304bb
Merge conflict for some cabal files.
jcmartin Nov 10, 2020
096ad32
Fixed conflict marker in tensorflow-opgen.cabal
jcmartin Nov 10, 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
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ fit xData yData = TF.runSession $ do

# Installation Instructions

Note: building this repository with `stack` requires version `2.1.3` or newer.
Note: building this repository with `stack` requires version `2.3.1` or newer.
Check your stack version with `stack --version` in a terminal.

## Build with Docker on Linux
Expand Down
8 changes: 4 additions & 4 deletions tensorflow-core-ops/tensorflow-core-ops.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: tensorflow-core-ops
version: 0.2.0.1
version: 0.3.0.0
synopsis: Haskell wrappers for Core Tensorflow Ops.
description: Code generated signatures for the Ops in libtensorflow.
homepage: https://github.com/tensorflow/haskell#readme
Expand All @@ -17,7 +17,7 @@ library
autogen-modules: TensorFlow.GenOps.Core
build-depends: bytestring
, proto-lens == 0.7.*
, tensorflow == 0.2.*
, tensorflow == 0.3.*
, base >= 4.7 && < 5
, lens-family == 2.*
, text
Expand All @@ -28,8 +28,8 @@ custom-setup
, bytestring
, directory
, proto-lens == 0.7.*
, tensorflow-opgen == 0.2.*
, tensorflow == 0.2.*
, tensorflow-opgen == 0.3.*
, tensorflow == 0.3.*
, base >= 4.7 && < 5
, filepath
, mainland-pretty
Expand Down
10 changes: 5 additions & 5 deletions tensorflow-logging/tensorflow-logging.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@ library
, stm
, stm-chans
, stm-conduit
, tensorflow == 0.2.*
, tensorflow-core-ops == 0.2.*
, tensorflow-ops == 0.2.*
, tensorflow-proto == 0.2.*
, tensorflow-records-conduit == 0.1.*
, tensorflow >= 0.2.0
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think we tested the combinations, so it's probably safer to just change all the versions together and keep them at the same 0.3 value. WDYT?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since the haskell files (*.hs) were not altered when I patched for TF 2.3, it is safe to say that they are compatible with both the old and new version. However, the proto-lens dependency update (in order to move to a newer version of LTS) did cause a problem in terms of dependency conflict.

Doing this ensures that if someone wanted to patch an older version of the libraries with the new proto-lens package, they would be able to. However, I will admit that this is a pretty fringe case.

Thoughts?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's probably inconsequential either way. I'll merge as is.

, tensorflow-core-ops >= 0.2.0
, tensorflow-ops >= 0.2.0
, tensorflow-proto >= 0.2.0
, tensorflow-records-conduit >= 0.1.0
, text
, time
, transformers
Expand Down
8 changes: 4 additions & 4 deletions tensorflow-mnist/tensorflow-mnist.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: tensorflow-mnist
version: 0.1.0.0
version: 0.1.0.1
synopsis: TensorFlow demo application for learning MNIST model.
description: Please see README.md
homepage: https://github.com/tensorflow/haskell#readme
Expand Down Expand Up @@ -28,9 +28,9 @@ library
, lens-family >= 2.0
, containers
, split
, tensorflow-proto == 0.2.*
, tensorflow-core-ops == 0.2.*
, tensorflow == 0.2.*
, tensorflow-proto >= 0.2.0
, tensorflow-core-ops >= 0.2.0
, tensorflow >= 0.2.0
, text
, vector
, zlib
Expand Down
4 changes: 2 additions & 2 deletions tensorflow-opgen/tensorflow-opgen.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: tensorflow-opgen
version: 0.2.0.1
version: 0.3.0.0
synopsis: Code generation for TensorFlow operations.
description: Please see README.md
homepage: https://github.com/tensorflow/haskell#readme
Expand All @@ -17,7 +17,7 @@ library
exposed-modules: TensorFlow.OpGen.ParsedOp
, TensorFlow.OpGen
build-depends: proto-lens == 0.7.*
, tensorflow-proto == 0.2.*
, tensorflow-proto == 0.3.*
, base >= 4.7 && < 5
, bytestring
, containers
Expand Down
8 changes: 4 additions & 4 deletions tensorflow-ops/tensorflow-ops.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: tensorflow-ops
version: 0.2.0.1
version: 0.3.0.0
synopsis: Friendly layer around TensorFlow bindings.
description: Please see README.md
homepage: https://github.com/tensorflow/haskell#readme
Expand Down Expand Up @@ -30,9 +30,9 @@ library
, data-default
, lens-family == 2.*
, containers
, tensorflow == 0.2.*
, tensorflow-proto == 0.2.*
, tensorflow-core-ops == 0.2.*
, tensorflow == 0.3.*
, tensorflow-proto == 0.3.*
, tensorflow-core-ops == 0.3.*
, text
default-language: Haskell2010

Expand Down
2 changes: 1 addition & 1 deletion tensorflow-proto/tensorflow-proto.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: tensorflow-proto
version: 0.2.0.1
version: 0.3.0.0
synopsis: TensorFlow protocol buffers.
description: Please see README.md
homepage: https://github.com/tensorflow/haskell#readme
Expand Down
4 changes: 2 additions & 2 deletions tensorflow/tensorflow.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: tensorflow
version: 0.2.0.1
version: 0.3.0.0
synopsis: TensorFlow bindings.
description:
This library provides an interface to the TensorFlow
Expand Down Expand Up @@ -37,7 +37,7 @@ library
other-modules: TensorFlow.Internal.Raw
build-tools: c2hs
build-depends: proto-lens == 0.7.*
, tensorflow-proto == 0.2.*
, tensorflow-proto == 0.3.*
, base >= 4.7 && < 5
, async
, attoparsec
Expand Down