Commit e00c21d
Merge origin/main into smonga/fix-big-model-loading
Resolves conflicts in sdk/runanywhere-commons/src/backends/llamacpp/llamacpp_backend.cpp
by adopting the PR's llama_params_fit-based model loading while adapting to main's
current idioms:
- Replace LOGI(...)/LOGE(...) macro calls with RAC_LOG_INFO("LLM.LlamaCpp", ...)
and RAC_LOG_ERROR("LLM.LlamaCpp", ...), matching main's direct-call style.
- Drop the filename heuristic (is_model_size_marker, is_large_model) and the
post-load adaptive context ladder (kLargeModelContextSize et al.) since
llama_params_fit now queries actual device memory.
- Keep main's named-constant refactor (k* constants in anonymous namespace)
untouched; only the load_model() body changes.
Co-Authored-By: VyasGuru <71374747+VyasGuru@users.noreply.github.com>194 files changed
Lines changed: 36949 additions & 5531 deletions
File tree
- Playground
- linux-voice-assistant
- openclaw-hybrid-assistant
- examples
- flutter/RunAnywhereAI
- android/app/src/main/java/io/flutter/plugins
- ios/Runner
- lib
- app
- features/vision
- react-native/RunAnywhereAI
- android
- app
- src/main/java/com/runanywhereaI
- gradle/wrapper
- src
- hooks
- screens
- sdk
- runanywhere-commons
- exports
- include/rac
- core
- capabilities
- infrastructure
- download
- extraction
- file_management
- network
- scripts
- src
- backends
- llamacpp
- jni
- onnx
- jni
- whispercpp
- jni
- whisperkit_coreml
- core
- capabilities
- features
- diffusion
- llm
- platform
- rag
- jni
- stt
- tts
- vad
- vlm
- voice_agent
- wakeword
- infrastructure
- download
- events
- extraction
- file_management
- model_management
- network
- storage
- telemetry
- jni
- server
- utils
- tests
- tools
- runanywhere-flutter/packages
- runanywhere_onnx
- lib
- runanywhere
- android
- ios
- Classes
- lib
- infrastructure
- download
- file_management/services
- native
- public
- extensions
- types
- src
- third_party/nlohmann
- runanywhere-kotlin
- modules/runanywhere-core-onnx
- src
- androidMain/kotlin/com/runanywhere/sdk/features/tts
- jvmAndroidMain/kotlin/com/runanywhere/sdk
- foundation/bridge
- extensions
- native/bridge
- public/extensions
- runanywhere-react-native
- packages
- core
- android
- src/main
- cpp
- java/com/margelo/nitro/runanywhere
- cpp
- bridges
- ios
- src
- Public/Extensions
- services
- Network
- llamacpp/android
- runanywhere-swift
- Sources/RunAnywhere
- CRACommons/include
- Foundation/Bridge/Extensions
- Infrastructure
- Download
- Services
- Utilities
- FileManagement
- Services
- Utilities
- scripts
- runanywhere-web
- packages
- core/src/Infrastructure
- llamacpp/src/Foundation
- wasm
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
37 | 37 | | |
38 | 38 | | |
39 | 39 | | |
40 | | - | |
| 40 | + | |
41 | 41 | | |
42 | 42 | | |
43 | 43 | | |
44 | | - | |
| 44 | + | |
45 | 45 | | |
46 | 46 | | |
47 | 47 | | |
| |||
86 | 86 | | |
87 | 87 | | |
88 | 88 | | |
89 | | - | |
90 | 89 | | |
91 | | - | |
92 | 90 | | |
93 | 91 | | |
94 | 92 | | |
| |||
139 | 137 | | |
140 | 138 | | |
141 | 139 | | |
142 | | - | |
143 | 140 | | |
144 | | - | |
145 | 141 | | |
146 | 142 | | |
147 | 143 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
42 | 42 | | |
43 | 43 | | |
44 | 44 | | |
45 | | - | |
| 45 | + | |
46 | 46 | | |
47 | 47 | | |
48 | 48 | | |
| |||
94 | 94 | | |
95 | 95 | | |
96 | 96 | | |
97 | | - | |
| 97 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
31 | 31 | | |
32 | 32 | | |
33 | 33 | | |
34 | | - | |
| 34 | + | |
35 | 35 | | |
36 | 36 | | |
37 | 37 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
56 | 56 | | |
57 | 57 | | |
58 | 58 | | |
59 | | - | |
| 59 | + | |
60 | 60 | | |
61 | 61 | | |
62 | 62 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | 3 | | |
4 | | - | |
| 4 | + | |
5 | 5 | | |
6 | 6 | | |
7 | 7 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
140 | 140 | | |
141 | 141 | | |
142 | 142 | | |
143 | | - | |
144 | | - | |
| 143 | + | |
| 144 | + | |
145 | 145 | | |
146 | 146 | | |
147 | 147 | | |
| |||
161 | 161 | | |
162 | 162 | | |
163 | 163 | | |
164 | | - | |
| 164 | + | |
165 | 165 | | |
166 | 166 | | |
167 | 167 | | |
| |||
201 | 201 | | |
202 | 202 | | |
203 | 203 | | |
204 | | - | |
205 | | - | |
| 204 | + | |
| 205 | + | |
| 206 | + | |
206 | 207 | | |
207 | 208 | | |
208 | 209 | | |
| |||
Lines changed: 15 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
20 | 20 | | |
21 | 21 | | |
22 | 22 | | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
23 | 28 | | |
24 | 29 | | |
25 | 30 | | |
26 | 31 | | |
27 | 32 | | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
28 | 38 | | |
29 | 39 | | |
30 | 40 | | |
| |||
35 | 45 | | |
36 | 46 | | |
37 | 47 | | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
38 | 53 | | |
39 | 54 | | |
40 | 55 | | |
| |||
Lines changed: 14 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
12 | 12 | | |
13 | 13 | | |
14 | 14 | | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
15 | 21 | | |
16 | 22 | | |
17 | 23 | | |
| |||
30 | 36 | | |
31 | 37 | | |
32 | 38 | | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
33 | 45 | | |
34 | 46 | | |
35 | 47 | | |
| |||
94 | 106 | | |
95 | 107 | | |
96 | 108 | | |
| 109 | + | |
97 | 110 | | |
98 | 111 | | |
99 | 112 | | |
| 113 | + | |
100 | 114 | | |
101 | 115 | | |
102 | 116 | | |
| |||
Lines changed: 9 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
12 | 12 | | |
13 | 13 | | |
14 | 14 | | |
| 15 | + | |
15 | 16 | | |
16 | 17 | | |
17 | 18 | | |
| |||
286 | 287 | | |
287 | 288 | | |
288 | 289 | | |
| 290 | + | |
| 291 | + | |
| 292 | + | |
| 293 | + | |
| 294 | + | |
| 295 | + | |
| 296 | + | |
| 297 | + | |
289 | 298 | | |
290 | 299 | | |
291 | 300 | | |
| |||
0 commit comments