dnnl: run tests, fix install tree #79790
Merged
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
With the new update to 1.2 in NixOS#79426, some the install tree coming out of cmake seems to have produced a duplicate copy of the nix tree.
bhipple
commented
Feb 11, 2020
| # addition to the correct install; clean it up. | ||
| postInstall = '' | ||
| rm -r $out/nix | ||
| ''; |
There was a problem hiding this comment.
On master, we seem to have gained a superfluous install tree:
$ nix build -f . dnnl.{out,dev,doc}; tree result*
result
├── lib
│ ├── libdnnl.so -> libdnnl.so.1
│ ├── libdnnl.so.1 -> libdnnl.so.1.2
│ └── libdnnl.so.1.2
└── nix
└── store
└── wmf3lp0bxz8r0vnyfx2zrg9ynhhrn9al-dnnl-1.2
└── lib
├── cmake
│ └── mkldnn
├── libmkldnn.so -> libdnnl.so
├── libmkldnn.so.1 -> libdnnl.so.1
└── libmkldnn.so.1.2 -> libdnnl.so.1.2
result-1-dev
├── include
│ ├── dnnl_config.h
│ ├── dnnl_debug.h
│ ├── dnnl.h
│ ├── dnnl.hpp
│ ├── dnnl_types.h
│ ├── dnnl_version.h
│ ├── mkldnn_config.h
│ ├── mkldnn_debug.h
│ ├── mkldnn_dnnl_mangling.h
│ ├── mkldnn.h
│ ├── mkldnn.hpp
│ ├── mkldnn_types.h
│ └── mkldnn_version.h
├── lib
│ └── cmake
│ └── dnnl
│ ├── dnnl-config.cmake
│ ├── dnnl-config-version.cmake
│ ├── dnnl-targets.cmake
│ └── dnnl-targets-release.cmake
└── nix-support
└── propagated-build-inputs
result-2-doc
└── share
└── doc
└── dnnl
├── LICENSE
└── README
15 directories, 26 files
On this PR:
$ nix build -f . dnnl.{out,dev,doc}; tree result*
result
└── lib
├── libdnnl.so -> libdnnl.so.1
├── libdnnl.so.1 -> libdnnl.so.1.2
└── libdnnl.so.1.2
result-1-dev
├── include
│ ├── dnnl_config.h
│ ├── dnnl_debug.h
│ ├── dnnl.h
│ ├── dnnl.hpp
│ ├── dnnl_types.h
│ ├── dnnl_version.h
│ ├── mkldnn_config.h
│ ├── mkldnn_debug.h
│ ├── mkldnn_dnnl_mangling.h
│ ├── mkldnn.h
│ ├── mkldnn.hpp
│ ├── mkldnn_types.h
│ └── mkldnn_version.h
├── lib
│ └── cmake
│ └── dnnl
│ ├── dnnl-config.cmake
│ ├── dnnl-config-version.cmake
│ ├── dnnl-targets.cmake
│ └── dnnl-targets-release.cmake
└── nix-support
└── propagated-build-inputs
result-2-doc
└── share
└── doc
└── dnnl
├── LICENSE
└── README
9 directories, 23 files
There was a problem hiding this comment.
Likely an upstream bug. Perhaps some files are installed assuming a relative path.
A similar issue we had with also a cmake build in #76855.
jonringer
approved these changes
Feb 12, 2020
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.
With the new update to 1.2 in #79426, some
the install tree coming out of cmake seems to have produced a duplicate copy of
the nix tree.
Motivation for this change
Things done
sandboxinnix.confon non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"./result/bin/)nix path-info -Sbefore and after)