happyz
/
gemma.cpp
mirror of https://github.com/google/gemma.cpp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #460 from ericcurtin:common 

PiperOrigin-RevId: 704684454
This commit is contained in:
Copybara-Service 2024-12-10 06:33:37 -08:00
parent 5bbe814a53 a971088ac2
commit d8135e836f
1 changed files with 23 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
gemma/common.cc
View File

@ -73,29 +73,24 @@ constexpr ModelTraining kModelTraining[] = {
ModelTraining::PALIGEMMA, ModelTraining::PALIGEMMA, // PG2 10B 224 / 448 ModelTraining::PALIGEMMA, ModelTraining::PALIGEMMA, // PG2 10B 224 / 448
}; };
constexpr size_t kNumModelFlags = constexpr size_t kNumModelFlags = std::size(kModelFlags);
std::end(kModelFlags) - std::begin(kModelFlags); static_assert(kNumModelFlags == std::size(kModelTypes));
static_assert(kNumModelFlags == static_assert(kNumModelFlags == std::size(kModelTraining));
std::end(kModelTypes) - std::begin(kModelTypes));
static_assert(kNumModelFlags ==
std::end(kModelTraining) - std::begin(kModelTraining));
const char* ParseModelTypeAndTraining(const std::string& model_flag, const char* ParseModelTypeAndTraining(const std::string& model_flag,
Model& model, ModelTraining& training) { Model& model, ModelTraining& training) {
static char kErrorMessageBuffer[kNumModelFlags * 8 + 1024] = static std::string kErrorMessageBuffer =
"Invalid or missing model flag, need to specify one of "; "Invalid or missing model flag, need to specify one of ";
for (size_t i = 0; i + 1 < kNumModelFlags; i++) { for (size_t i = 0; i + 1 < kNumModelFlags; ++i) {
strcat(kErrorMessageBuffer, kModelFlags[i]); // NOLINT kErrorMessageBuffer.append(kModelFlags[i]);
strcat(kErrorMessageBuffer, ", "); // NOLINT kErrorMessageBuffer.append(", ");
} }
strcat(kErrorMessageBuffer, kModelFlags[kNumModelFlags - 1]); // NOLINT kErrorMessageBuffer.append(kModelFlags[kNumModelFlags - 1]);
strcat(kErrorMessageBuffer, "."); // NOLINT kErrorMessageBuffer.append(".");
std::string model_type_lc = model_flag; std::string model_type_lc = model_flag;
std::transform(begin(model_type_lc), end(model_type_lc), begin(model_type_lc), std::transform(model_type_lc.begin(), model_type_lc.end(),
[](unsigned char c) { return std::tolower(c); }); model_type_lc.begin(), ::tolower);
for (size_t i = 0; i < kNumModelFlags; ++i) {
for (size_t i = 0; i < kNumModelFlags; i++) {
if (kModelFlags[i] == model_type_lc) { if (kModelFlags[i] == model_type_lc) {
model = kModelTypes[i]; model = kModelTypes[i];
training = kModelTraining[i]; training = kModelTraining[i];
@ -103,7 +98,7 @@ const char* ParseModelTypeAndTraining(const std::string& model_flag,
return nullptr; return nullptr;
} }
} }
return kErrorMessageBuffer; return kErrorMessageBuffer.c_str();
} }
const char* ModelString(Model model, ModelTraining training) { const char* ModelString(Model model, ModelTraining training) {
@ -120,26 +115,25 @@ const char* StringFromType(Type type) {
} }
const char* ParseType(const std::string& type_string, Type& type) { const char* ParseType(const std::string& type_string, Type& type) {
constexpr size_t kNum = std::end(kTypeStrings) - std::begin(kTypeStrings); constexpr size_t kNum = std::size(kTypeStrings);
static char kErrorMessageBuffer[kNum * 8 + 100] = static std::string kErrorMessageBuffer =
"Invalid or missing type, need to specify one of "; "Invalid or missing type, need to specify one of ";
for (size_t i = 0; i + 1 < kNum; i++) { for (size_t i = 0; i + 1 < kNum; ++i) {
strcat(kErrorMessageBuffer, kTypeStrings[i]); // NOLINT kErrorMessageBuffer.append(kTypeStrings[i]);
strcat(kErrorMessageBuffer, ", "); // NOLINT kErrorMessageBuffer.append(", ");
} }
strcat(kErrorMessageBuffer, kTypeStrings[kNum - 1]); // NOLINT kErrorMessageBuffer.append(kTypeStrings[kNum - 1]);
strcat(kErrorMessageBuffer, "."); // NOLINT kErrorMessageBuffer.append(".");
std::string type_lc = type_string; std::string type_lc = type_string;
std::transform(begin(type_lc), end(type_lc), begin(type_lc), std::transform(type_lc.begin(), type_lc.end(), type_lc.begin(), ::tolower);
[](unsigned char c) { return std::tolower(c); }); for (size_t i = 0; i < kNum; ++i) {
for (size_t i = 0; i < kNum; i++) {
if (kTypeStrings[i] == type_lc) { if (kTypeStrings[i] == type_lc) {
type = static_cast<Type>(i); type = static_cast<Type>(i);
HWY_ASSERT(std::string(StringFromType(type)) == type_lc); HWY_ASSERT(std::string(StringFromType(type)) == type_lc);
return nullptr; return nullptr;
} }
} }
return kErrorMessageBuffer; return kErrorMessageBuffer.c_str();
} }
void Wrap(const ModelInfo& info, size_t pos, std::string& prompt) { void Wrap(const ModelInfo& info, size_t pos, std::string& prompt) {