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.

Sign up for GitHub

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

Jump to bottom

[Backport 368702 to release 24.11] koboldcpp: 1.79.1 -> 1.81 #369092

Merged
merged 9 commits into from
Jan 8, 2025
Merged

[Backport 368702 to release 24.11] koboldcpp: 1.79.1 -> 1.81 #369092

merged 9 commits into from
Jan 8, 2025

Conversation

DontEatOreo
Copy link
Member

Backports:
#366837
#368702

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/)
  • 25.05 Release Notes (or backporting 24.11 and 25.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.

@DontEatOreo
koboldcpp: update cudaArches example
f5e31ea 
(cherry picked from commit eb01892)
@DontEatOreo
koboldcpp: remove gitUpdater
0f86a47 
(cherry picked from commit 4bd5e1d)
@DontEatOreo
koboldcpp: drop openblas
e9c1162 
Upstream dropped `openblass` since v1.75

(cherry picked from commit 415fe80)
@DontEatOreo
koboldcpp: 1.79.1 -> 1.80
e96527c 
Changelog: https://github.com/LostRuins/koboldcpp/releases/tag/v1.80
Diff: LostRuins/koboldcpp@v1.79.1...v1.80
(cherry picked from commit 0dae157)
@DontEatOreo
koboldcpp: add (darwinMinVersionHook "10.15")
362a854 
Bump up minimum version, so no APIs are missing

(cherry picked from commit e62a47c)
@DontEatOreo
koboldcpp: disable vulkan for darwin
2129cff 
It's causing build failure

(cherry picked from commit 1ccd253)
@DontEatOreo
koboldcpp: 1.80 -> 1.80.1
9a24cae 
Changelog: https://github.com/LostRuins/koboldcpp/releases/tag/v1.80.1
Diff: LostRuins/koboldcpp@v1.80...v1.80.1
(cherry picked from commit e57e423)
@DontEatOreo
koboldcpp: 1.80.1 -> 1.80.3
5d1542a 
Changelog: https://github.com/LostRuins/koboldcpp/releases/tag/v1.80.3
Diff: LostRuins/koboldcpp@v1.80.1...v1.80.3
(cherry picked from commit b814f3f)
@DontEatOreo DontEatOreo mentioned this pull request Dec 29, 2024
Closed
1 task
@DontEatOreo
Copy link
Member Author

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 369092 --extra-nixpkgs-config '{ allowAliases = false; allowBroken = false; allowUnfree = true; checkMeta = true; cudaSupport = true; cudaCapabilities = [ "7.5" ]; cudaArches = [ "sm_75" ]; }'

x86_64-linux

✅ 1 package built:
  • koboldcpp

@DontEatOreo
Copy link
Member Author

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 369092

x86_64-darwin

✅ 1 package built:
  • koboldcpp

aarch64-darwin

✅ 1 package built:
  • koboldcpp

@DontEatOreo
Copy link
Member Author

https://gist.github.com/GrahamcOfBorg/6cb2d2c372e4f7c10fd9c8b07e8bcbb0

ofborg is unhappy about Mono? This package doesn't use Mono at all, so it seems like it's a CI/CD issue...

@JohnRTitor
Copy link
Contributor

It's a target branch issue, unrelated to this PR, but should still be fixed, perhaps we/someone else forgot to backport a particular commit or broke the eval somehow.

JohnRTitor
JohnRTitor reviewed Dec 30, 2024
View reviewed changes
Copy link
Contributor

@JohnRTitor JohnRTitor left a comment

Choose a reason for hiding this comment

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

You sure you want to include this commit? d2cddf9

According to #366837 (comment), darwin sdk on release-24.11 is still 10.12.

@DontEatOreo DontEatOreo force-pushed the backport-368702-to-release-24.11 branch from 4619c34 to 5d1542a Compare January 1, 2025 12:12
@DontEatOreo
Copy link
Member Author

@JohnRTitor Thanks for catching this! Yea you're right I removed the revert for Darwin SDK

@DontEatOreo
Copy link
Member Author

@ofborg eval

@JohnRTitor
Copy link
Contributor

@ofborg build koboldcpp

@DontEatOreo DontEatOreo changed the title [Backport 368702 to release 24.11] koboldcpp: 1.79.1 -> 1.80.3 [Backport 368702 to release 24.11] koboldcpp: 1.79.1 -> 1.81 Jan 7, 2025
@DontEatOreo
Copy link
Member Author

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 369092 --extra-nixpkgs-config '{ allowAliases = false; allowBroken = false; allowUnfree = true; checkMeta = true; cudaSupport = true; cudaCapabilities = [ "7.5" ]; cudaArches = [ "sm_75" ]; }'

x86_64-linux

✅ 1 package built:
  • koboldcpp

@DontEatOreo
Copy link
Member Author

https://github.com/NixOS/nixpkgs/actions/runs/12652279354/job/35254578314?pr=369092 can be ignored it's complaining that I didn't backport the treewide change

@JohnRTitor JohnRTitor merged commit 0d07e09 into NixOS:release-24.11 Jan 8, 2025
27 of 32 checks passed
@DontEatOreo DontEatOreo deleted the backport-368702-to-release-24.11 branch January 8, 2025 21:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@JohnRTitor JohnRTitor JohnRTitor left review comments

Assignees
No one assigned
Labels
10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@DontEatOreo @JohnRTitor