-
-
Notifications
You must be signed in to change notification settings - Fork 15.4k
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.
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
Unbreak Tensorflow Haskell bindings #2 #85433
Unbreak Tensorflow Haskell bindings #2 #85433
Conversation
|
||
tensorflow-proto = super.tensorflow-proto.override { | ||
inherit proto-lens proto-lens-protobuf-types; | ||
tensorflow-proto = (setSourceRoot "tensorflow-proto" (overrideCabal super.tensorflow-proto (drv: { src = tensorflow-haskell; }))).override { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
These lines might be a little simpler if you moved the overrideCabal
part into the setSourceRoot
function.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good idea. Done.
@@ -0,0 +1,23 @@ | |||
diff --git a/src/Data/ProtoLens/Encoding/Parser/Internal.hs b/src/Data/ProtoLens/Encoding/Parser/Internal.hs |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is there anyway you could pull these patches from upstream? Normally we don't like to carry around patches here in nixpkgs if at all possible to get them from upstream.
You could always just use a PR you've opened upstream as well and pull them in with fetchPatch
.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No. I agree with you and I tried, but nothing applied cleanly.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Okay thanks. In that case, let's keep it like it currently is.
@mikesperber How do you recommend that I test this is actually working? |
@cdepillabout |
- get the current Git head of haskell-tensorflow - adjust dependencies
bb8071e
to
b044d44
Compare
I'm testing this with the following command line: $ nix-build -A haskellPackages.tensorflow-ops -A haskellPackages.tensorflow-opgen -A haskellPackages.tensorflow-mnist-input-data -A haskellPackages.tensorflow-mnist -A haskellPackages.tensorflow-logging -A haskellPackages.tensorflow-core-ops -A haskellPackages.tensorflow -A haskellPackages.tensorflow-proto --arg config '{allowBroken=true;}' |
Everything built correctly. Thanks! Looking forward to the PR marking these all as unbroken. |
Oh, you also might want to add all the proto-lens libraries to
|
@cdepillabout I'm not sure I understand: I did that, and they're listed right there. But since they're old, they need patching and will continue to need patching. (My ultimate goal is to bump the dependencies to the current version, which will take care of the problem, but one thing at a time.) |
@mikesperber Oh, I'm sorry! I completely forgot about that first PR! Okay, please ignore that message then :-) |
Motivation for this change
This is the second part of the patches to unbreak the Tensorflow bindings for Haskell. (Nr. 3 will be to remove the "broken" annotation once thing settle down.)
Things done
sandbox
innix.conf
on non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
./result/bin/
)nix path-info -S
before and after)