vbatts/llama.cpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

llama : better replace_all

Browse source
This commit is contained in:
Georgi Gerganov 2024-08-04 13:42:08 +03:00
parent 01aae2b497
commit bddcc5f985
No known key found for this signature in database
GPG key ID: 449E073F9DC10735
1 changed files with 7 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/llama.cpp
View file

@ -122,17 +122,14 @@ static std::string trim(const std::string & str) {
} }
static void replace_all(std::string & s, const std::string & search, const std::string & replace) { static void replace_all(std::string & s, const std::string & search, const std::string & replace) {
std::string result; if (search.empty()) {
for (size_t pos = 0; ; pos += search.length()) { return; // Avoid infinite loop if 'search' is an empty string
auto new_pos = s.find(search, pos);
if (new_pos == std::string::npos) {
result += s.substr(pos, s.size() - pos);
break;
} }
result += s.substr(pos, new_pos - pos) + replace; size_t pos = 0;
pos = new_pos; while ((pos = s.find(search, pos)) != std::string::npos) {
s.replace(pos, search.length(), replace);
pos += replace.length();
} }
s = std::move(result);
} }
static bool is_float_close(float a, float b, float abs_tol) { static bool is_float_close(float a, float b, float abs_tol) {