mtmd: fix mtmd_get_memory_usage (#24867)
This commit is contained in:
+7
-3
@@ -2796,7 +2796,7 @@ struct clip_model_loader {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// load data
|
// load data
|
||||||
if (!ctx_clip.no_alloc) {
|
{
|
||||||
std::vector<uint8_t> read_buf;
|
std::vector<uint8_t> read_buf;
|
||||||
|
|
||||||
// start loading event
|
// start loading event
|
||||||
@@ -2814,6 +2814,8 @@ struct clip_model_loader {
|
|||||||
ggml_backend_buffer_type_t buft = ggml_backend_get_default_buffer_type(ctx_clip.backend);
|
ggml_backend_buffer_type_t buft = ggml_backend_get_default_buffer_type(ctx_clip.backend);
|
||||||
ctx_clip.buf.reset(ggml_backend_alloc_ctx_tensors_from_buft(ctx_clip.ctx_data.get(), buft));
|
ctx_clip.buf.reset(ggml_backend_alloc_ctx_tensors_from_buft(ctx_clip.ctx_data.get(), buft));
|
||||||
ggml_backend_buffer_set_usage(ctx_clip.buf.get(), GGML_BACKEND_BUFFER_USAGE_WEIGHTS);
|
ggml_backend_buffer_set_usage(ctx_clip.buf.get(), GGML_BACKEND_BUFFER_USAGE_WEIGHTS);
|
||||||
|
// read the weight from file
|
||||||
|
if (!ctx_clip.no_alloc) {
|
||||||
size_t data_loaded = 0;
|
size_t data_loaded = 0;
|
||||||
for (auto & t : tensors_to_load) {
|
for (auto & t : tensors_to_load) {
|
||||||
ggml_tensor * cur = ggml_get_tensor(ctx_clip.ctx_data.get(), t->name);
|
ggml_tensor * cur = ggml_get_tensor(ctx_clip.ctx_data.get(), t->name);
|
||||||
@@ -2843,9 +2845,11 @@ struct clip_model_loader {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
fin.close();
|
|
||||||
|
|
||||||
LOG_DBG("%s: loaded %zu tensors from %s\n", __func__, tensors_to_load.size(), fname.c_str());
|
LOG_DBG("%s: loaded %zu tensors from %s\n", __func__, tensors_to_load.size(), fname.c_str());
|
||||||
|
} else {
|
||||||
|
LOG_DBG("%s: no_alloc is set, skipping tensor data loading (%zu tensors)\n", __func__, tensors_to_load.size());
|
||||||
|
}
|
||||||
|
fin.close();
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-2
@@ -2142,8 +2142,7 @@ std::map<ggml_backend_dev_t, size_t> mtmd_get_memory_usage(const char * mmproj_f
|
|||||||
|
|
||||||
try {
|
try {
|
||||||
mtmd_log_set(stub_log_callback, nullptr); // suppress logging
|
mtmd_log_set(stub_log_callback, nullptr); // suppress logging
|
||||||
// TODO @ngxson : fix no_alloc here
|
ctx.reset(new mtmd_context(mmproj_fname, nullptr, ctx_params, true));
|
||||||
ctx.reset(new mtmd_context(mmproj_fname, nullptr, ctx_params));
|
|
||||||
mtmd_log_set(saved_log_callback, saved_log_user_data); // restore log callback
|
mtmd_log_set(saved_log_callback, saved_log_user_data); // restore log callback
|
||||||
std::map<ggml_backend_dev_t, size_t> total_mem;
|
std::map<ggml_backend_dev_t, size_t> total_mem;
|
||||||
auto merge = [&](const struct clip_ctx * c) {
|
auto merge = [&](const struct clip_ctx * c) {
|
||||||
|
|||||||
@@ -926,13 +926,15 @@ private:
|
|||||||
|
|
||||||
// optionally get the memory usage of mmproj
|
// optionally get the memory usage of mmproj
|
||||||
if (has_mmproj && params_base.fit_params) {
|
if (has_mmproj && params_base.fit_params) {
|
||||||
|
int64_t t_start = ggml_time_us();
|
||||||
auto mmproj_mem = mtmd_get_memory_usage(mmproj_path.c_str(), mparams);
|
auto mmproj_mem = mtmd_get_memory_usage(mmproj_path.c_str(), mparams);
|
||||||
|
int64_t t_elapsed = ggml_time_us() - t_start;
|
||||||
if (!mmproj_mem.empty()) {
|
if (!mmproj_mem.empty()) {
|
||||||
size_t total = 0;
|
size_t total = 0;
|
||||||
for (auto & [dev, size] : mmproj_mem) {
|
for (auto & [dev, size] : mmproj_mem) {
|
||||||
total += size;
|
total += size;
|
||||||
}
|
}
|
||||||
SRV_INF("[mtmd] estimated worst-case memory usage of mmproj is %.2f MiB\n", total / (1024.0 * 1024.0));
|
SRV_INF("[mtmd] estimated worst-case memory usage of mmproj is %.2f MiB (took %.2f ms)\n", total / (1024.0 * 1024.0), t_elapsed / 1000.0);
|
||||||
GGML_ASSERT(!params_base.fit_params_target.empty());
|
GGML_ASSERT(!params_base.fit_params_target.empty());
|
||||||
for (auto & [dev, size] : mmproj_mem) {
|
for (auto & [dev, size] : mmproj_mem) {
|
||||||
for (size_t i = 0; i < ggml_backend_dev_count(); i++) {
|
for (size_t i = 0; i < ggml_backend_dev_count(); i++) {
|
||||||
|
|||||||
Reference in New Issue
Block a user