Skip to content
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.

Sign up for GitHub

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

Refactor gemma/common.cc to improve readability and safety #458

Closed
wants to merge 1 commit into from
Closed

Refactor gemma/common.cc to improve readability and safety #458

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
52 changes: 23 additions & 29 deletions gemma/common.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,37 +67,32 @@ constexpr ModelTraining kModelTraining[] = {
ModelTraining::PALIGEMMA, // PaliGemma2 10B 224
};

constexpr size_t kNumModelFlags =
std::end(kModelFlags) - std::begin(kModelFlags);
static_assert(kNumModelFlags ==
std::end(kModelTypes) - std::begin(kModelTypes));
static_assert(kNumModelFlags ==
std::end(kModelTraining) - std::begin(kModelTraining));
constexpr size_t kNumModelFlags = std::size(kModelFlags);
static_assert(kNumModelFlags == std::size(kModelTypes));
static_assert(kNumModelFlags == std::size(kModelTraining));

const char* ParseModelTypeAndTraining(const std::string& model_flag,
Model& model, ModelTraining& training) {
static char kErrorMessageBuffer[kNumModelFlags * 8 + 1024] =
static std::string kErrorMessageBuffer =
"Invalid or missing model flag, need to specify one of ";
for (size_t i = 0; i + 1 < kNumModelFlags; i++) {
strcat(kErrorMessageBuffer, kModelFlags[i]); // NOLINT
strcat(kErrorMessageBuffer, ", "); // NOLINT
for (size_t i = 0; i + 1 < kNumModelFlags; ++i) {
kErrorMessageBuffer.append(kModelFlags[i]);
kErrorMessageBuffer.append(", ");
}
strcat(kErrorMessageBuffer, kModelFlags[kNumModelFlags - 1]); // NOLINT
strcat(kErrorMessageBuffer, "."); // NOLINT

kErrorMessageBuffer.append(kModelFlags[kNumModelFlags - 1]);
kErrorMessageBuffer.append(".");
std::string model_type_lc = model_flag;
std::transform(begin(model_type_lc), end(model_type_lc), begin(model_type_lc),
[](unsigned char c) { return std::tolower(c); });

for (size_t i = 0; i < kNumModelFlags; i++) {
std::transform(model_type_lc.begin(), model_type_lc.end(),
model_type_lc.begin(), ::tolower);
for (size_t i = 0; i < kNumModelFlags; ++i) {
if (kModelFlags[i] == model_type_lc) {
model = kModelTypes[i];
training = kModelTraining[i];
HWY_ASSERT(std::string(ModelString(model, training)) == model_type_lc);
return nullptr;
}
}
return kErrorMessageBuffer;
return kErrorMessageBuffer.c_str();
}

const char* ModelString(Model model, ModelTraining training) {
Expand All @@ -114,26 +109,25 @@ const char* StringFromType(Type type) {
}

const char* ParseType(const std::string& type_string, Type& type) {
constexpr size_t kNum = std::end(kTypeStrings) - std::begin(kTypeStrings);
static char kErrorMessageBuffer[kNum * 8 + 100] =
constexpr size_t kNum = std::size(kTypeStrings);
static std::string kErrorMessageBuffer =
"Invalid or missing type, need to specify one of ";
for (size_t i = 0; i + 1 < kNum; i++) {
strcat(kErrorMessageBuffer, kTypeStrings[i]); // NOLINT
strcat(kErrorMessageBuffer, ", "); // NOLINT
for (size_t i = 0; i + 1 < kNum; ++i) {
kErrorMessageBuffer.append(kTypeStrings[i]);
kErrorMessageBuffer.append(", ");
}
strcat(kErrorMessageBuffer, kTypeStrings[kNum - 1]); // NOLINT
strcat(kErrorMessageBuffer, "."); // NOLINT
kErrorMessageBuffer.append(kTypeStrings[kNum - 1]);
kErrorMessageBuffer.append(".");
std::string type_lc = type_string;
std::transform(begin(type_lc), end(type_lc), begin(type_lc),
[](unsigned char c) { return std::tolower(c); });
for (size_t i = 0; i < kNum; i++) {
std::transform(type_lc.begin(), type_lc.end(), type_lc.begin(), ::tolower);
for (size_t i = 0; i < kNum; ++i) {
if (kTypeStrings[i] == type_lc) {
type = static_cast<Type>(i);
HWY_ASSERT(std::string(StringFromType(type)) == type_lc);
return nullptr;
}
}
return kErrorMessageBuffer;
return kErrorMessageBuffer.c_str();
}

void Wrap(const ModelInfo& info, size_t pos, std::string& prompt) {
Expand Down
Loading