Skip to content

pcl: fix configurePhase with withCuda=true#275092

Merged
SomeoneSerge merged 1 commit intoNixOS:masterfrom
al3xtjames:pcl-cudaPackages-update
Dec 18, 2023
Merged

pcl: fix configurePhase with withCuda=true#275092
SomeoneSerge merged 1 commit intoNixOS:masterfrom
al3xtjames:pcl-cudaPackages-update

Conversation

@al3xtjames
Copy link
Contributor

@al3xtjames al3xtjames commented Dec 17, 2023

Description of changes

#271078 caused the configurePhase of pcl to fail when
withCuda is set to true. Fix #275090 by replacing
cudatoolkit with cudaPackages.cuda_nvcc.

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.

@SomeoneSerge

This comment was marked as outdated.

@SomeoneSerge
Copy link
Contributor

Hi, and thanks! The build probably broke because #271078 made cuda-related setup hooks more strict about when they're active, and it also had a regression addressed in #273048.

Note that it's not evaluation that's broken, it's the configurePhase of the build (we'll want to update the commit message)

@SomeoneSerge SomeoneSerge added 6.topic: cuda Parallel computing platform and API backport release-23.11 labels Dec 17, 2023
@SomeoneSerge
Copy link
Contributor

SomeoneSerge commented Dec 17, 2023

Marking for backporting because 1) using cudaPackages.cudatoolkit is more or less a bug, 2) this might be broken now on release-23.11 as well

@al3xtjames al3xtjames force-pushed the pcl-cudaPackages-update branch from ed310d7 to ce74ed5 Compare December 18, 2023 00:20
NixOS#271078 caused the configurePhase of pcl to fail when
withCuda is set to true. Fix NixOS#275090 by replacing
cudatoolkit with cudaPackages.cuda_nvcc.
@al3xtjames al3xtjames force-pushed the pcl-cudaPackages-update branch from ce74ed5 to 8db5a1a Compare December 18, 2023 00:25
@al3xtjames al3xtjames changed the title pcl: fix evaluation with withCuda=true pcl: fix configurePhase with withCuda=true Dec 18, 2023
@al3xtjames
Copy link
Contributor Author

Thanks for the suggestions. I've updated the PR (including the commit message).

Copy link
Contributor

@SomeoneSerge SomeoneSerge left a comment

Choose a reason for hiding this comment

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

❯ NIX_PATH= nix build --refresh -I nixpkgs=flake:github:al3xtjames/nixpkgs/pcl-cudaPackages-update -f '<nixpkgs>' --arg config '{ cudaSupport = true; cudaCapabilities = [ "8.6" ]; enableForwardCompat = false; allowUnfree = true; }' -L pcl --print-out-paths 
/nix/store/wdrpmnri6inqlh615gzsc1jf6ldhf26y-pcl-1.13.0

LGTM. Waiting for ofborg an merging

@delroth delroth added the 12.approvals: 1 This PR was reviewed and approved by one person. label Dec 18, 2023
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. labels Dec 18, 2023
@SomeoneSerge SomeoneSerge merged commit 15bbf88 into NixOS:master Dec 18, 2023
@github-actions
Copy link
Contributor

Successfully created backport PR for release-23.11:

@SomeoneSerge
Copy link
Contributor

Thanks @al3xtjames!

Unrelated to this PR, but we should probably mark the x86_64-darwin build as broken (ofborg, hydra)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

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: 0 This PR does not cause any packages to rebuild on Linux. 12.approvals: 1 This PR was reviewed and approved by one person.

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

Build failure: pcl with CUDA enabled on x86_64-linux

3 participants