-
Notifications
You must be signed in to change notification settings - Fork 196
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
Nix build #277
Open
sheepforce
wants to merge
1
commit into
tensorflow:master
Choose a base branch
from
sheepforce:nix
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Nix build #277
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,72 @@ | ||
{ | ||
description = "Haskell bindings for TensorFlow"; | ||
|
||
inputs = { | ||
nixpkgs.url = "nixpkgs/nixpkgs-unstable"; | ||
|
||
flake-utils.url = "github:numtide/flake-utils"; | ||
|
||
flake-compat = { | ||
url = "github:edolstra/flake-compat"; | ||
flake = false; | ||
}; | ||
|
||
tensorflowSubModule = { | ||
url = | ||
"github:tensorflow/tensorflow/b36436b087bd8e8701ef51718179037cccdfc26e"; | ||
flake = false; | ||
}; | ||
}; | ||
|
||
outputs = { self, nixpkgs, flake-utils, tensorflowSubModule, ... }: | ||
flake-utils.lib.eachSystem [ "x86_64-linux" ] (system: | ||
let | ||
pkgs = import nixpkgs { | ||
inherit system; | ||
overlays = [ (import ./nix/overlay.nix tensorflowSubModule) ]; | ||
}; | ||
|
||
tfPackages = [ | ||
"tensorflow" | ||
"tensorflow-core-ops" | ||
"tensorflow-logging" | ||
"tensorflow-opgen" | ||
"tensorflow-ops" | ||
"tensorflow-proto" | ||
"tensorflow-records" | ||
"tensorflow-records-conduit" | ||
"tensorflow-test" | ||
]; | ||
|
||
in { | ||
packages = builtins.listToAttrs (builtins.map (p: { | ||
name = p; | ||
value = pkgs.haskellPackages."${p}"; | ||
}) tfPackages); | ||
|
||
devShells = let | ||
devDeps = with pkgs; [ | ||
cabal-install | ||
haskell-language-server | ||
hlint | ||
ormolu | ||
]; | ||
|
||
devPkgs = builtins.listToAttrs (builtins.map (p: { | ||
name = p; | ||
value = pkgs.mkShell { | ||
buildInputs = let | ||
pkgEnv = pkgs.haskellPackages.ghcWithPackages (ghcPkgs: | ||
ghcPkgs."${p}".buildInputs | ||
++ ghcPkgs."${p}".propagatedBuildInputs | ||
++ ghcPkgs."${p}".propagatedNativeBuildInputs | ||
++ ghcPkgs."${p}".nativeBuildInputs ++ devDeps); | ||
in [ pkgEnv ]; | ||
}; | ||
}) tfPackages); | ||
|
||
in devPkgs // { default = devPkgs.tensorflow; }; | ||
}) // { | ||
overlays.default = import ./nix/overlay.nix tensorflowSubModule; | ||
}; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,78 @@ | ||
tensorflowSubModule: final: prev: | ||
|
||
let | ||
/* The tensorflow submodule in third_party/tensorflow and the symlinks in the | ||
Haskell-package directories will always be removed by Nix. | ||
Thus construct a source here where the submodule is a normal directory | ||
whenever required. | ||
*/ | ||
tfSrc = prev.runCommand "prepTensorflowSrc" { | ||
src = prev.nix-gitignore.gitignoreSource [ | ||
"nix/" | ||
"flake.nix" | ||
"flake.lock" | ||
"result" | ||
] ./..; | ||
} '' | ||
cp -r $src/* . | ||
|
||
chmod -R +rwx ./third_party | ||
cp -r ${tensorflowSubModule} ./third_party/tensorflow | ||
|
||
chmod -R +rwx tensorflow | ||
rm -rf tensorflow/third_party | ||
cp -r ${tensorflowSubModule} ./tensorflow/third_party | ||
|
||
for d in tensorflow-opgen tensorflow-proto; do | ||
chmod +rwx $d $d/third_party | ||
rm -rf $d/third_party | ||
mkdir $d/third_party | ||
cp -r ${tensorflowSubModule} $d/third_party/tensorflow | ||
done | ||
cp -r . $out | ||
''; | ||
|
||
haskellOverrides = final: prev: hfinal: hprev: { | ||
tensorflow = hfinal.callCabal2nix "tensorflow" "${tfSrc}/tensorflow" { }; | ||
|
||
tensorflow-core-ops = | ||
hfinal.callCabal2nix "tensorflow-core-ops" "${tfSrc}/tensorflow-core-ops" | ||
{ }; | ||
|
||
tensorflow-logging = | ||
hfinal.callCabal2nix "tensorflow-logging" "${tfSrc}/tensorflow-logging" | ||
{ }; | ||
|
||
tensorflow-opgen = | ||
hfinal.callCabal2nix "tensorflow-opgen" "${tfSrc}/tensorflow-opgen" { }; | ||
|
||
tensorflow-ops = | ||
hfinal.callCabal2nix "tensorflow-ops" "${tfSrc}/tensorflow-ops" { }; | ||
|
||
tensorflow-proto = let | ||
c2n = | ||
hfinal.callCabal2nix "tensorflow-proto" "${tfSrc}/tensorflow-proto" { }; | ||
in prev.haskell.lib.overrideCabal c2n (drv: { | ||
libraryToolDepends = drv.libraryToolDepends ++ [ prev.protobuf ]; | ||
}); | ||
|
||
tensorflow-records = | ||
hfinal.callCabal2nix "tensorflow-records" "${tfSrc}/tensorflow-records" | ||
{ }; | ||
|
||
tensorflow-records-conduit = | ||
hfinal.callCabal2nix "tensorflow-records-conduit" | ||
"${tfSrc}/tensorflow-records-conduit" { }; | ||
|
||
tensorflow-test = | ||
hfinal.callCabal2nix "tensorflow-test" "${tfSrc}/tensorflow-test" { }; | ||
}; | ||
|
||
in { | ||
haskell = prev.haskell // { | ||
packages = prev.haskell.packages // (builtins.mapAttrs | ||
(key: val: val.override { overrides = haskellOverrides final prev; }) { | ||
inherit (prev.haskell.packages) ghc8107 ghc902 ghc923; | ||
}); | ||
}; | ||
} |
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.
While I don't see a good option to get Nix accepting the submodules, it would be nice to use
prev.libtensorflow.src
insteadtensorflowSubModule
, so that the correct version also used in nixpkgs is provided. libtensorflow-2.9.1 from current nixpkgs gives compilation errors, however.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.
I have no opinion about this as I don't understand Nix enough and we have no CI around that. Fix it to your liking?