Mirrors/llama.cpp
1
0
Fork 0
mirror of https://github.com/ggerganov/llama.cpp.git synced 2025-01-12 21:37:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1 from harvestingmoon/minicpm-v2.5

Browse Source 
Fixed Line
This commit is contained in:
tc-mb 2024-05-24 10:35:09 +08:00 committed by GitHub
commit b31f51f597
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
examples/minicpmv/minicpmv.cpp
View File

@ -392,13 +392,13 @@ std::pair<int, int> get_refine_size(std::pair<int, int> original_size, std::pair
int grid_width = refine_width / grid_x; int grid_width = refine_width / grid_x;
int grid_height = refine_height / grid_y; int grid_height = refine_height / grid_y;
auto best_grid_size = find_best_resize(std::make_tuple(grid_width, grid_height), scale_resolution, patch_size, allow_upscale); // auto best_grid_size = find_best_resize(std::make_tuple(grid_width, grid_height), scale_resolution, patch_size, allow_upscale); (old line)
auto best_grid_size = find_best_resize(std::make_pair(grid_width, grid_height), scale_resolution, patch_size, allow_upscale); // (new line) => fixes conversion for make_tuple to make_pair
int best_grid_width, best_grid_height; int best_grid_width, best_grid_height;
std::tie(best_grid_width, best_grid_height) = best_grid_size; std::tie(best_grid_width, best_grid_height) = best_grid_size;
std::pair<int, int> refine_size = std::make_tuple(best_grid_width * grid_x, best_grid_height * grid_y); // std::pair<int, int> refine_size = std::make_tuple(best_grid_width * grid_x, best_grid_height * grid_y); (old line)
std::pair<int, int> refine_size = std::make_pair(best_grid_width * grid_x, best_grid_height * grid_y); // (new line)
return refine_size; return refine_size;
} }