Add NVIDIA DCGM and DCGM-exporter (prometheus)#235024
Merged
samuela merged 7 commits intoNixOS:masterfrom Jul 26, 2023
Merged
Conversation
de11n
changed the title
Author
Kiskae
reviewed
Jun 8, 2023
Contributor
Kiskae
left a comment
Kiskae
left a comment
There was a problem hiding this comment.
In addition to the comments I'd like to see a nixpkgs-review result to see if this would cause unrelated rebuilds due to jsoncpp/libevent package changes. It shouldn't because the changes are all gated by parameters but its best to check.
Author
|
Noting that plog was added before this got merged: #238806 |
ofborg
bot
requested review from
ConnorBaker,
SomeoneSerge,
limeytexan and
samuela
ofborg
bot
added
10.rebuild-darwin: 11-100
Author
All the tensorrt failures are due to the fact that... |
Kiskae
approved these changes
Jul 12, 2023
Kiskae
reviewed
Jul 13, 2023
Kiskae
approved these changes
Jul 13, 2023
Author
|
@Kiskae Thank you for the review. What's left to get this merged? |
Contributor
|
@de11n I don't actually have merge permissions, but @NixOS/cuda-maintainers do and they are probably the ones most affected by any changes so they should take a look. |
samuela
reviewed
Jul 18, 2023
Comment on lines
51
to
56
Member
Author
There was a problem hiding this comment.
I don't understand the comment so I didn't change it. Whatever it meant, the static build is incorrect without this change.
Member
There was a problem hiding this comment.
yeah unfortunately I find the comment quite tricky to understand past "this is fixed and no longer necessary in 1.9.5" as well... perhaps author @tfc can shed some light here?
Contributor
There was a problem hiding this comment.
Ok, i understand why the comment seems incomprehensible now, as i have a bit timely distance to it myself. :D
Looking at the latest version of jsoncpp, they are no longer giving the static version of jsoncpp a _static filename suffix. This was a very bad idea anyway, so they stopped doing that. (It's only done for MSVC builds).
I think in the current version, you don't need this cp/ln dance any longer and static linking will just work out of the box.
So please just drop these lines. I am sure we were on an earlier version of jsoncpp when i wrote them.
Author
There was a problem hiding this comment.
You are right. We can drop the postInstall entirely. Thank you!
Member
There was a problem hiding this comment.
Suggested change
| version = "1.4-3feeb7b"; | |
| version = "1.4.0-rc1"; |
Author
There was a problem hiding this comment.
The official 1.4.0-rc1 tag doesn't have unit tests and is missing pkgconfig files. That is why I went with this slightly more recent version. If I use 1.4.0-rc1 I will have to apply patches similar to what this commit is providing. See here: https://github.com/mirror/tclap/compare/1.4.0-rc1..1.4
I will add a comment to that effect.
Member
There was a problem hiding this comment.
Suggested change
| rev = "3feeb7b2499b37d9cb80890cadaf7c905a9a50c6"; | |
| rev = "refs/tags/${version}"; |
Comment on lines
22
to
30
Member
There was a problem hiding this comment.
why are these build flags necessary? if at all possible, it is preferable to just use dependencies as they are default packaged
Author
There was a problem hiding this comment.
DCGM is very particular about its build. Its entire build system is actually deterministic, but it uses Docker to achieve that. This makes it extremely particular about the exact build flags used for every dependency. These dependencies are built with these specific flags and I ran into build failures in other configurations. While it might be theoretically possible to find a different configuration that succeeds, this one exactly matches what upstream does in its build system so it is the most likely to succeed and have matching behavior.
de11n
force-pushed
the
upstream-dcgm
branch
3 times, most recently
from
b7e7a0a to
bfa5bcf
Compare
ofborg
bot
added
10.rebuild-darwin: 101-500
Author
|
@samuela I've made many of the suggested changes. I'm not sure why this PR is now causing a rebuild of so many packages. |
Contributor
|
CUDA changes look good to me as well -- thank you for the CUDA Toolkit fix. |
ConnorBaker
approved these changes
Jul 20, 2023
Author
|
I have one follow-up task on this, but it shouldn't block merge. Is there anything else needed to get this merged? |
Member
Author
|
Result of 112 packages failed to build:
486 packages built:
|
Member
|
nixpkgs-review looks reasonable to me. I'll go ahead and merge tomorrow unless anyone objects? |
added 7 commits
July 26, 2023 16:11
The workaround is no longer needed for static builds.
libnvrtc.so is not found in the same location in all versions of cudatoolkit.
Many Qt dependencies were added only for 12.1 and above, but 12.0.1 also needs them.
Author
|
@samuela Pushed a change to one of my commit messages which had leftover cruft from a rebase. (The comparison shows no code differences.) |
12 tasks
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
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.
Description of changes
Add NVIDIA DCGM and dcgm-exporter to Nixpkgs.
In order for the build to work, I had to also add
plogandtclap_1_4which is a long-lived branch oftclap. I also fixed some minor errors in a couple other packages.Things done
sandbox = trueset innix.conf? (See Nix manual)nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)