Skip to content
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

cudaPackages.nsight_systems: fix crash #291471

Open
wants to merge 2 commits into
base: master
Choose a base branch
from

Conversation

mcwitt
Copy link
Contributor

@mcwitt mcwitt commented Feb 26, 2024

Description of changes

Fixes #232458

Fixes several issues causing breakage of nsys and nsys-ui binaries:

  1. Substitutes template variable with correct version in wrappers. This fixes Error: Nsight Systems #VERSION_RSPLIT# hasn't been installed with CUDA Toolkit #CUDA_MAJOR#.#CUDA_MINOR#
  2. Moves binaries and dependencies in host-linux-x64, target-linux-x64 to bin output
  3. Fixes issue with Qt plugin path (Could not find Qt platform plugin). Cherry-picked graham33@1ed0f5c.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.05 Release Notes (or backporting 23.05 and 23.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 labels Feb 26, 2024
@mcwitt mcwitt marked this pull request as ready for review March 18, 2024 15:54
@SomeoneSerge SomeoneSerge added the 6.topic: cuda Parallel computing platform and API label Mar 18, 2024
in
{
# An ad hoc replacement for
# https://github.com/ConnorBaker/cuda-redist-find-features/issues/11
env.rmPatterns = toString [
"nsight-systems/*/*/libQt*"
"nsight-systems/*/*/libQt6*"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are there any other matches to libQt* than libQt6*? If any, why would we not remove them?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note that the expression needs to be valid for other releases of cudaPackages too (cudaPackages_11_Y)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@SomeoneSerge this removed libQtPropertyBrowser.so, which I couldn't find anywhere in Nixpkgs. As far as I could tell is not a Qt6 library and I suspect might be an internal library to nsight-systems, hence I changed the wildcard to not remove it. I could be wrong though.

"nsight-systems/*/*/libstdc*"
"nsight-systems/*/*/libboost*"
"nsight-systems/*/*/lib{ssl,ssh,crypto}*"
"nsight-systems/*/*/lib{arrow,jpeg}*"
"nsight-systems/*/*/Mesa"
"nsight-systems/*/*/python/bin/python"
"nsight-systems/*/*/libexec"
"nsight-systems/*/*/Plugins"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same question. These are prebuilt binaries which means they are presumed broken, so we do want to replace them with the respective ones from Nixpkgs.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Agreed, but the additional code I added overwrites the Qt ones with links. These are the ones which remain:

/nix/store/k3vnvanjxvfr0jvkf0y6ijjka7nk2km3-nsight_systems-2023.2.3.1004-bin/nsight-systems/2023.2.3/host-linux-x64/Plugins/CorePlugin/libCorePlugin.so
/nix/store/k3vnvanjxvfr0jvkf0y6ijjka7nk2km3-nsight_systems-2023.2.3.1004-bin/nsight-systems/2023.2.3/host-linux-x64/Plugins/QuadDPlugin/libQuadDPlugin.so
/nix/store/k3vnvanjxvfr0jvkf0y6ijjka7nk2km3-nsight_systems-2023.2.3.1004-bin/nsight-systems/2023.2.3/host-linux-x64/Plugins/wayland-decoration-client/libbradient.so
/nix/store/k3vnvanjxvfr0jvkf0y6ijjka7nk2km3-nsight_systems-2023.2.3.1004-bin/nsight-systems/2023.2.3/host-linux-x64/Plugins/wayland-graphics-integration-client/libshm-emulation-server.so
/nix/store/k3vnvanjxvfr0jvkf0y6ijjka7nk2km3-nsight_systems-2023.2.3.1004-bin/nsight-systems/2023.2.3/host-linux-x64/Plugins/wayland-graphics-integration-client/libvulkan-server.so
/nix/store/k3vnvanjxvfr0jvkf0y6ijjka7nk2km3-nsight_systems-2023.2.3.1004-bin/nsight-systems/2023.2.3/host-linux-x64/Plugins/wayland-shell-integration/libwl-shell-plugin.so
/nix/store/k3vnvanjxvfr0jvkf0y6ijjka7nk2km3-nsight_systems-2023.2.3.1004-bin/nsight-systems/2023.2.3/host-linux-x64/Plugins/wayland-shell-integration/libxdg-shell.so
/nix/store/k3vnvanjxvfr0jvkf0y6ijjka7nk2km3-nsight_systems-2023.2.3.1004-bin/nsight-systems/2023.2.3/host-linux-x64/Plugins/wayland-shell-integration/libivi-shell.so
/nix/store/k3vnvanjxvfr0jvkf0y6ijjka7nk2km3-nsight_systems-2023.2.3.1004-bin/nsight-systems/2023.2.3/host-linux-x64/Plugins/wayland-shell-integration/libfullscreen-shell-v1.so

@wegank wegank added the 2.status: merge conflict This PR has merge conflicts with the target branch label May 3, 2024
ConnorBaker pushed a commit to ConnorBaker/nixpkgs that referenced this pull request Jun 14, 2024
ConnorBaker pushed a commit to ConnorBaker/nixpkgs that referenced this pull request Sep 13, 2024
@wegank wegank added the 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md label Jan 2, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
2.status: merge conflict This PR has merge conflicts with the target branch 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md 6.topic: cuda Parallel computing platform and API 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10
Projects
Status: New
Development

Successfully merging this pull request may close these issues.

cudaPackages.nsight_systems: nsys-ui binary fails to start
4 participants