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

fix(make): allow to parallelize jobs #1845

Merged
merged 7 commits into from
Mar 17, 2024
Merged

Conversation

cryptk
Copy link
Collaborator

@cryptk cryptk commented Mar 15, 2024

Description

Fix a lot of missing dependency items in the Makefile to allow for parallel builds to succeed

Notes for Reviewers

There is also a little bit of general cleanup in the Makfile, most things fall into one of a few categories of changes:

  • All of the sources/ targets are now grouped together at the top and placed in alphabetical order
  • All of the backend/ and backend-artifact/ targets are now grouped together and placed in alphabetical order
  • The deprecated backend-assets/grpc/llama backend was removed, it has been replaced by llama-cpp for quite a while
  • Added support for a MAKEFLAGS arg/env to the Dockerfile which can be used to cause the make steps in the Docker build to run in parallel by passing something like --build-arg MAKEFLAGS="-j10" into the docker build command

Signed commits

  • Yes, I signed my commits.

Copy link

netlify bot commented Mar 15, 2024

Deploy Preview for localai canceled.

Name Link
🔨 Latest commit 5d55e82
🔍 Latest deploy log https://app.netlify.com/sites/localai/deploys/65f63a2f306d720008b49e65

@cryptk cryptk marked this pull request as draft March 15, 2024 23:53
@cryptk cryptk force-pushed the fix_parallel_make branch 2 times, most recently from 986272a to cf8aeb0 Compare March 16, 2024 00:30
@cryptk cryptk marked this pull request as ready for review March 16, 2024 00:30
go.mod Outdated Show resolved Hide resolved
@@ -148,7 +145,6 @@ endif

ALL_GRPC_BACKENDS=backend-assets/grpc/langchain-huggingface
ALL_GRPC_BACKENDS+=backend-assets/grpc/bert-embeddings
ALL_GRPC_BACKENDS+=backend-assets/grpc/llama
Copy link
Owner

Choose a reason for hiding this comment

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

as we are dropping the old backend here, we should also delete it from

GoLlamaBackend = "llama"

@mudler mudler changed the title Fix parallel make fix(make): allow to parallelize jobs Mar 17, 2024
Copy link
Owner

@mudler mudler left a comment

Choose a reason for hiding this comment

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

looking good, thanks!

@mudler mudler merged commit 020ce29 into mudler:master Mar 17, 2024
20 checks passed
truecharts-admin referenced this pull request in truecharts/public Mar 19, 2024
…0.1 by renovate (#19487)

This PR contains the following updates:

| Package | Update | Change |
|---|---|---|
| [docker.io/localai/localai](https://togithub.com/mudler/LocalAI) |
patch | `v2.10.0-cublas-cuda11-ffmpeg-core` ->
`v2.10.1-cublas-cuda11-ffmpeg-core` |
| [docker.io/localai/localai](https://togithub.com/mudler/LocalAI) |
patch | `v2.10.0-cublas-cuda11-core` -> `v2.10.1-cublas-cuda11-core` |
| [docker.io/localai/localai](https://togithub.com/mudler/LocalAI) |
patch | `v2.10.0-cublas-cuda12-ffmpeg-core` ->
`v2.10.1-cublas-cuda12-ffmpeg-core` |
| [docker.io/localai/localai](https://togithub.com/mudler/LocalAI) |
patch | `v2.10.0-cublas-cuda12-core` -> `v2.10.1-cublas-cuda12-core` |
| [docker.io/localai/localai](https://togithub.com/mudler/LocalAI) |
patch | `v2.10.0-ffmpeg-core` -> `v2.10.1-ffmpeg-core` |
| [docker.io/localai/localai](https://togithub.com/mudler/LocalAI) |
patch | `v2.10.0` -> `v2.10.1` |

---

> [!WARNING]
> Some dependencies could not be looked up. Check the Dependency
Dashboard for more information.

---

### Release Notes

<details>
<summary>mudler/LocalAI (docker.io/localai/localai)</summary>

###
[`v2.10.1`](https://togithub.com/mudler/LocalAI/releases/tag/v2.10.1)

[Compare
Source](https://togithub.com/mudler/LocalAI/compare/v2.10.0...v2.10.1)

<!-- Release notes generated using configuration in .github/release.yml
at master -->

##### What's Changed

##### Bug fixes 🐛

- fix(llama.cpp): fix eos without cache by
[@&#8203;mudler](https://togithub.com/mudler) in
[https://github.com/mudler/LocalAI/pull/1852](https://togithub.com/mudler/LocalAI/pull/1852)
- fix(config): default to debug=false if not set by
[@&#8203;mudler](https://togithub.com/mudler) in
[https://github.com/mudler/LocalAI/pull/1853](https://togithub.com/mudler/LocalAI/pull/1853)
- fix(config-watcher): start only if config-directory exists by
[@&#8203;mudler](https://togithub.com/mudler) in
[https://github.com/mudler/LocalAI/pull/1854](https://togithub.com/mudler/LocalAI/pull/1854)

##### Exciting New Features 🎉

- deps(whisper.cpp): update, fix cublas build by
[@&#8203;mudler](https://togithub.com/mudler) in
[https://github.com/mudler/LocalAI/pull/1846](https://togithub.com/mudler/LocalAI/pull/1846)

##### Other Changes

- fixes [#&#8203;1051](https://togithub.com/mudler/LocalAI/issues/1051):
handle openai presence and request penalty parameters by
[@&#8203;blob42](https://togithub.com/blob42) in
[https://github.com/mudler/LocalAI/pull/1817](https://togithub.com/mudler/LocalAI/pull/1817)
- fix(make): allow to parallelize jobs by
[@&#8203;cryptk](https://togithub.com/cryptk) in
[https://github.com/mudler/LocalAI/pull/1845](https://togithub.com/mudler/LocalAI/pull/1845)
- fix(go-llama): use llama-cpp as default by
[@&#8203;mudler](https://togithub.com/mudler) in
[https://github.com/mudler/LocalAI/pull/1849](https://togithub.com/mudler/LocalAI/pull/1849)
- ⬆️ Update docs version mudler/LocalAI by
[@&#8203;localai-bot](https://togithub.com/localai-bot) in
[https://github.com/mudler/LocalAI/pull/1847](https://togithub.com/mudler/LocalAI/pull/1847)
- ⬆️ Update ggerganov/llama.cpp by
[@&#8203;localai-bot](https://togithub.com/localai-bot) in
[https://github.com/mudler/LocalAI/pull/1848](https://togithub.com/mudler/LocalAI/pull/1848)
- test/fix: OSX Test Repair by
[@&#8203;dave-gray101](https://togithub.com/dave-gray101) in
[https://github.com/mudler/LocalAI/pull/1843](https://togithub.com/mudler/LocalAI/pull/1843)

**Full Changelog**:
mudler/LocalAI@v2.10.0...v2.10.1

</details>

---

### Configuration

📅 **Schedule**: Branch creation - At any time (no schedule defined),
Automerge - At any time (no schedule defined).

🚦 **Automerge**: Enabled.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about these
updates again.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR has been generated by [Renovate
Bot](https://togithub.com/renovatebot/renovate).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4yNTYuMCIsInVwZGF0ZWRJblZlciI6IjM3LjI1Ni4wIiwidGFyZ2V0QnJhbmNoIjoibWFzdGVyIn0=-->
@cryptk cryptk mentioned this pull request Mar 26, 2024
@cryptk cryptk deleted the fix_parallel_make branch March 26, 2024 18:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants