Darwin caffe #44616
Merged
Darwin caffe #44616
+90
−9
Conversation
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
the sub-frameworks are not reacheable without that extension
matthewbauer
reviewed
Aug 7, 2018
| propagatedBuildInputs = [ Accelerate ]; | ||
| } '' | ||
| mkdir -p $out/lib | ||
| ln -s /System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libBLAS.dylib $out/lib/libblas.dylib |
There was a problem hiding this comment.
This should link to the Accelerate derivation, not /System.
There was a problem hiding this comment.
How do you solve an empty ${Accelerate}/Library/Frameworks/Accelerate.framework/Versions/A ?
There was a problem hiding this comment.
Yes that's right there are no libraries in that derivation. But this will break when we reintroduce sandboxing.
Have you tried to just use Openblas here? It should work on darwin.
There was a problem hiding this comment.
It was using openblas but cmake decided to use Accelerate even when it's not provided. Maybe the best option is to patch the build system.
GrahamcOfBorg
added
8.has: package (new)
|
Failure on x86_64-darwin (full log) Attempted: caffe Partial log (click to expand)
|
|
Failure on x86_64-linux (full log) Attempted: caffe Partial log (click to expand)
|
|
@GrahamcOfBorg build caffe |
|
Success on aarch64-linux (full log) Attempted: caffe Partial log (click to expand)
|
|
Success on x86_64-darwin (full log) Attempted: caffe Partial log (click to expand)
|
|
Success on x86_64-linux (full log) Attempted: caffe Partial log (click to expand)
|
|
Success on aarch64-linux (full log) Attempted: caffe Partial log (click to expand)
|
|
Success on x86_64-linux (full log) Attempted: caffe Partial log (click to expand)
|
|
Failure on aarch64-linux (full log) Attempted: caffe Partial log (click to expand)
|
|
Failure on x86_64-darwin (full log) Attempted: caffe Partial log (click to expand)
|
|
Success on x86_64-darwin (full log) Attempted: caffe Partial log (click to expand)
|
|
Failure on x86_64-linux (full log) Attempted: caffe Partial log (click to expand)
|
LnL7
reviewed
Aug 7, 2018
| @@ -201,6 +201,13 @@ in rec { | |||
| }; | |||
|
|
|||
| overrides = super: { | |||
| Accelerate = stdenv.lib.overrideDerivation super.Accelerate (drv: { | |||
| __propagatedImpureHostDeps = drv.__propagatedImpureHostDeps ++ [ | |||
There was a problem hiding this comment.
I don't think this is necessary since these paths are part of the Accelerate framework itself.
| }; | ||
|
|
||
| # work around /usr/lib having different lib names than the framework | ||
| macblas = runCommand "macblas" { |
There was a problem hiding this comment.
I'd move this to darwin-packages.nix instead of hiding it here.
There was a problem hiding this comment.
I think we want everyone to be using openblas though - not Apple's version.
There was a problem hiding this comment.
Yeah, ideally this wouldn't be necessary.
|
Failure on aarch64-linux (full log) Attempted: caffe Partial log (click to expand)
|
|
I don't have a lot of experience in the *blas sphere. Here is my understanding:
Roads that I see could be tried:
What should I do next? |
|
I think it's generally best to avoid frameworks since they are impure, but while not ideal this is reasonable if the build system is too hard to configure. |
|
@zimbatm I just pushed two commits that are working for me. This adds a patch to get rid of the special cases for macOS. Hope that works! |
|
Success on aarch64-linux (full log) Attempted: caffe Partial log (click to expand)
|
|
Success on x86_64-darwin (full log) Attempted: caffe Partial log (click to expand)
|
|
Success on x86_64-linux (full log) Attempted: caffe Partial log (click to expand)
|
|
hey, thanks @matthewbauer! Testing with the postInstallCheck phase enabled. If this passes I will merge the PR. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Motivation for this change
Compile
caffeon macOS. In the process I added a postInstallCheck to improve the chances that the package is working properly and made some more features configurable.I had to poke bigger holes in the Darwin sandbox in the process.
Things done
sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)nix path-info -Sbefore and after)