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

koboldcpp: fix CUDA_DOCKER_ARCH make flag #329426

Closed

Conversation

DontEatOreo
Copy link
Member

Description of changes

  • Previously, the value was "assembled" using additional logic, but when switching to a different method, an oversight was made, and sm_ was forgotten to be removed

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.11 Release Notes (or backporting 23.11 and 24.05 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.

- Previously, the value was "assembled" using additional logic, but
  when switching to a different method, an oversight was made, and
  `sm_` was forgotten to be removed
@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 Jul 23, 2024
@infinisil
Copy link
Member

The pkgs/by-name check failure was a problem on master, a rebase should fix it :)

@DontEatOreo DontEatOreo force-pushed the fix-cuda-docker-koboldcpp branch from 95d5959 to 1b8d42d Compare July 23, 2024 16:27
Comment on lines 132 to 133
(lib.optionals cublasSupport "CUDA_DOCKER_ARCH=${builtins.head cudaArches}")
];
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
(lib.optionals cublasSupport "CUDA_DOCKER_ARCH=${builtins.head cudaArches}")
];
] ++ lib.optionals cublasSupport [ "CUDA_DOCKER_ARCH=${builtins.head cudaArches}" ];

I guess...

Copy link
Member Author

Choose a reason for hiding this comment

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

Done

@DontEatOreo DontEatOreo force-pushed the fix-cuda-docker-koboldcpp branch from 1b8d42d to db9fe54 Compare July 23, 2024 19:41
@ofborg ofborg bot added 11.by: package-maintainer This PR was created by the maintainer of the package it changes 10.rebuild-darwin: 1-10 10.rebuild-darwin: 1 10.rebuild-linux: 1-10 10.rebuild-linux: 1 and removed 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 Jul 23, 2024
@SomeoneSerge
Copy link
Contributor

Result of nixpkgs-review pr 329426 --extra-nixpkgs-config '{ cudaSupport = true; cudaCapabilities = [ "7.0" "8.0" "8.6" ]; cudaEnableForwardCompat = false; allowUnfreePredicate = p: builtins.all ( license: license.free || builtins.elem license.shortName [ "CUDA EULA" "cuDNN EULA" "cuTENSOR EULA" "NVidia OptiX EULA" ] ) (if builtins.isList p.meta.license then p.meta.license else [ p.meta.license ]); permittedInsecurePackages = [ "electron-24.8.6" "zotero-6.0.27" ]; }' run on x86_64-linux 1

1 package failed to build:
  • koboldcpp

@DontEatOreo
Copy link
Member Author

Closed in favor of #330038

@DontEatOreo DontEatOreo deleted the fix-cuda-docker-koboldcpp branch August 6, 2024 09:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants