Skip to content

llama-cpp: fix build due to openblas update; 1483 -> 1538#268449

Merged
Mic92 merged 2 commits intomasterfrom
unknown repository
Nov 19, 2023
Merged

llama-cpp: fix build due to openblas update; 1483 -> 1538#268449
Mic92 merged 2 commits intomasterfrom
unknown repository

Conversation

@ghost
Copy link

@ghost ghost commented Nov 19, 2023

pkg-confg file for openblas moved from openblas.pc -> openblas64.pc

add patch so build checks for openblas64 module. submitted patch upstream ggml-org/llama.cpp#4134

#255443 updated from openblas 0.3.21 -> 0.3.24. openblas 0.3.22 moved openblas.pc -> openblas64.pc

OpenMathLib/OpenBLAS#3790

updated the package as well.

https://hydra.nixos.org/build/241259310
ZHF: #265948

Result of nixpkgs-review pr 268449 run on x86_64-linux 1

2 packages built:
  • llama-cpp
  • ollama

Description of changes

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/)
  • 23.11 Release Notes (or backporting 23.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.

@ghost ghost added the 0.kind: ZHF Fixes Fixes during the Zero Hydra Failures (ZHF) campaign label Nov 19, 2023
@ofborg ofborg bot requested review from dit7ya and elohmeier November 19, 2023 06:36
@ofborg ofborg bot added 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Nov 19, 2023
@elohmeier
Copy link
Contributor

LGTM

@delroth delroth added 12.approvals: 1 This PR was reviewed and approved by one person. 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in any of the changed packages. labels Nov 19, 2023
annalee added 2 commits November 19, 2023 08:21
add patch so build checks for openblas64 module

#255443 updated from openblas
0.3.21 -> 0.3.24.  openblas 0.3.22 moved openblas.pc -> openblas64.pc

OpenMathLib/OpenBLAS#3790
@delroth delroth removed the 12.approvals: 1 This PR was reviewed and approved by one person. label Nov 19, 2023
@ofborg ofborg bot requested a review from elohmeier November 19, 2023 09:00
@Mic92 Mic92 merged commit 53aeb5c into NixOS:master Nov 19, 2023
@ghost
Copy link
Author

ghost commented Nov 19, 2023

thanks!

@ghost ghost deleted the llama-cpp-fix branch November 19, 2023 09:36
@pbsds pbsds mentioned this pull request Nov 19, 2023
13 tasks
@ghost
Copy link
Author

ghost commented Nov 20, 2023

@elohmeier I had mistakenly assumed that the 64 was revering to pointer size when i made this change -- it doesn't. the 64 refers to the integer size, so openblas64.pc is paired with the ILP64 openblas, and openblas.pc is paired with the LP64.

is this package trying to use the ILP64 openblas or the LP64 openblas?

the nix flake also uses the ILP64 openblas -- there was a comment
in my upstream PR which made me think that the LP64 was expected but I think i misunderstood.

@elohmeier
Copy link
Contributor

TBH I'm not using the OpenBLAS implementation personally and did not test it in depth. I don't really have an opinion on which one to use here, but would suggest to copy the upstream choice from their nix flake.

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

Labels

0.kind: ZHF Fixes Fixes during the Zero Hydra Failures (ZHF) campaign 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in any of the changed packages.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants