Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Comments

Close side panel

Update llama_cpp_python version to 0.2.75 (backport #1161)#1203

Merged
mergify[bot] merged 1 commit intorelease-v0.15instructlab/instructlab:release-v0.15from
mergify/bp/release-v0.15/pr-1161instructlab/instructlab:mergify/bp/release-v0.15/pr-1161Copy head branch name to clipboard
May 23, 2024
Merged

Update llama_cpp_python version to 0.2.75 (backport #1161)#1203
mergify[bot] merged 1 commit intorelease-v0.15instructlab/instructlab:release-v0.15from
mergify/bp/release-v0.15/pr-1161instructlab/instructlab:mergify/bp/release-v0.15/pr-1161Copy head branch name to clipboard

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented May 23, 2024

Changes

Which issue is resolved by this Pull Request:
Resolves # https://github.com/instructlab/instructlab/security/dependabot/1

Description of your changes:

Testing needs to be done on M3 Macs to ensure abetlen/llama-cpp-python#1286 doesn't still occur.

This is an automatic backport of pull request #1161 done by Mergify.

@mergify mergify bot added the conflicts This Pull Request has merge conflicts label May 23, 2024
@mergify
Copy link
Contributor Author

mergify bot commented May 23, 2024

Cherry-pick of f24d0d7 has failed:

On branch mergify/bp/release-v0.15/pr-1161
Your branch is up to date with 'origin/release-v0.15'.

You are currently cherry-picking commit f24d0d7.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   requirements.txt
	modified:   scripts/functional-tests.sh

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/instructlab/chat/chat.py

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot mentioned this pull request May 23, 2024
Merged
@mergify mergify bot added testing Relates to testing release-branch Pull Request directly to a release branch ci-failure PR has at least one CI failure labels May 23, 2024
@alimaredia
Update llama_cpp_python version to 0.2.75
bd2aca4 
- Adjust test_ctx_size()
- handlle openai.InternalServerError when chatting

Signed-off-by: Ali Maredia <amaredia@redhat.com>
(cherry picked from commit f24d0d7)
@alimaredia alimaredia force-pushed the mergify/bp/release-v0.15/pr-1161 branch from b7221e9 to bd2aca4 Compare May 23, 2024 15:18
@mergify mergify bot added ci-failure PR has at least one CI failure and removed ci-failure PR has at least one CI failure labels May 23, 2024
@nathan-weinberg nathan-weinberg removed the conflicts This Pull Request has merge conflicts label May 23, 2024
@mergify mergify bot removed the ci-failure PR has at least one CI failure label May 23, 2024
@nathan-weinberg
Copy link
Member

nathan-weinberg commented May 23, 2024

E2E run: https://github.com/instructlab/instructlab/actions/runs/9211429489

nathan-weinberg
nathan-weinberg approved these changes May 23, 2024
View reviewed changes
Copy link
Member

@nathan-weinberg nathan-weinberg left a comment

Choose a reason for hiding this comment

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

E2E seems to have passed so adding my approval

@mergify mergify bot added the one-approval PR has one approval from a maintainer label May 23, 2024
@mergify mergify bot removed the one-approval PR has one approval from a maintainer label May 23, 2024
@nathan-weinberg nathan-weinberg removed the request for review from russellb May 23, 2024 17:09
@mergify mergify bot merged commit 125420d into release-v0.15 May 23, 2024
@mergify mergify bot deleted the mergify/bp/release-v0.15/pr-1161 branch May 23, 2024 17:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

2 more reviewers

@alimaredia alimaredia alimaredia approved these changes

@nathan-weinberg nathan-weinberg nathan-weinberg approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

release-branch Pull Request directly to a release branch testing Relates to testing

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@nathan-weinberg @alimaredia
Morty Proxy This is a proxified and sanitized view of the page, visit original site.