Skip to content

fix: add default cpu_threads #1948

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

Merged
merged 7 commits into from
Feb 27, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions engine/services/model_service.cc
Original file line number Diff line number Diff line change
Expand Up @@ -946,6 +946,11 @@ cpp::result<StartModelResult, std::string> ModelService::StartModel(

json_helper::MergeJson(json_data, params_override);

// Set default cpu_threads if it is not configured
if (!json_data.isMember("cpu_threads")) {
json_data["cpu_threads"] = GetCpuThreads();
}

// Set the latest ctx_len
if (ctx_len) {
json_data["ctx_len"] =
Expand Down Expand Up @@ -1330,6 +1335,10 @@ ModelService::MayFallbackToCpu(const std::string& model_path, int ngl,
return warning;
}

int ModelService::GetCpuThreads() const {
return std::max(std::thread::hardware_concurrency() / 2, 1u);
}

cpp::result<std::shared_ptr<ModelMetadata>, std::string>
ModelService::GetModelMetadata(const std::string& model_id) const {
if (model_id.empty()) {
Expand Down
2 changes: 2 additions & 0 deletions engine/services/model_service.h
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,8 @@ class ModelService {
const std::string& model_path, int ngl, int ctx_len, int n_batch = 2048,
int n_ubatch = 2048, const std::string& kv_cache_type = "f16");

int GetCpuThreads() const;

std::shared_ptr<DatabaseService> db_service_;
std::shared_ptr<HardwareService> hw_service_;
std::shared_ptr<DownloadService> download_service_;
Expand Down
12 changes: 8 additions & 4 deletions engine/utils/hardware/gguf/gguf_file.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
#include <filesystem>
#include <iostream>
#include <memory>
#include <optional>
#include <string>
#include <unordered_set>
#include <variant>
#include <vector>
#include <optional>

#ifdef _WIN32
#include <io.h>
Expand All @@ -23,8 +23,8 @@
#endif

#include "ggml.h"
#include "utils/string_utils.h"
#include "utils/logging_utils.h"
#include "utils/string_utils.h"

// #define GGUF_LOG(msg) \
// do { \
Expand Down Expand Up @@ -246,11 +246,15 @@ struct GGUFHelper {
file_size = std::filesystem::file_size(file_path);

int fd = open(file_path.c_str(), O_RDONLY);
if (fd == -1) {
CTL_INF("Failed to open file: " << file_path << ", error: " << errno);
return false;
}
// Memory-map the file
data = static_cast<uint8_t*>(
mmap(nullptr, file_size, PROT_READ, MAP_PRIVATE, fd, 0));
if (data == MAP_FAILED) {
perror("Error mapping file");
CTL_INF("Error mapping file");
close(fd);
return false;
}
Expand Down Expand Up @@ -482,7 +486,7 @@ struct GGUFFile {
inline std::optional<GGUFFile> ParseGgufFile(const std::string& path) {
GGUFFile gf;
GGUFHelper h;
if(!h.OpenAndMMap(path)) {
if (!h.OpenAndMMap(path)) {
return std::nullopt;
}

Expand Down
2 changes: 1 addition & 1 deletion engine/utils/hardware/gguf/gguf_file_estimate.h
Original file line number Diff line number Diff line change
Expand Up @@ -64,14 +64,14 @@ inline float GetQuantBit(const std::string& kv_cache_t) {

inline std::optional<Estimation> EstimateLLaMACppRun(
const std::string& file_path, const RunConfig& rc) {
Estimation res;
// token_embeddings_size = n_vocab * embedding_length * 2 * quant_bit/16 bytes
//RAM = token_embeddings_size + ((total_ngl-ngl) >=1 ? Output_layer_size + (total_ngl - ngl - 1 ) / (total_ngl-1) * (total_file_size - token_embeddings_size - Output_layer_size) : 0 ) (bytes)

// VRAM = total_file_size - RAM (bytes)
auto gf = ParseGgufFile(file_path);
if (!gf)
return std::nullopt;
Estimation res;
int32_t embedding_length = 0;
int64_t n_vocab = 0;
int32_t num_block = 0;
Expand Down
Loading