diff --git a/gemma/configs.cc b/gemma/configs.cc index 82a1fa9..873ef5c 100644 --- a/gemma/configs.cc +++ b/gemma/configs.cc @@ -574,7 +574,7 @@ ModelConfig::ModelConfig(const Model model, Type weight, static Model FindModel(const std::string& specifier) { Model found_model = Model::UNKNOWN; ForEachModel([&](Model model) { - const char* prefix = ModelPrefix(model); + const std::string prefix = std::string(ModelPrefix(model)) + "-"; if (specifier.rfind(prefix, 0) == 0) { // Starts with prefix. // We only expect one match. HWY_ASSERT_M(found_model == Model::UNKNOWN, specifier.c_str()); diff --git a/gemma/weights.h b/gemma/weights.h index 80341d0..92a4b42 100644 --- a/gemma/weights.h +++ b/gemma/weights.h @@ -136,7 +136,8 @@ struct LayerWeightsPtrs { key_norm_scale(Concat("key_norm", suffix_), tensors), query_norm_scale(Concat("query_norm", suffix_), tensors), - layer_config(config) {} + layer_config(config) { + } ~LayerWeightsPtrs() = default; const std::string suffix_; @@ -261,7 +262,7 @@ struct LayerWeightsPtrs { func(TENSOR_ARGS(gating_einsum_w, kMaybeRead)); func(TENSOR_ARGS(gating_einsum_w1, kMaybeRead)); func(TENSOR_ARGS(gating_einsum_w2, kMaybeRead)); - func(TENSOR_ARGS(linear_w, kMustRead)); + func(TENSOR_ARGS(linear_w, kMaybeRead)); func(TENSOR_ARGS(pre_attention_norm_scale, kMustRead)); func(TENSOR_ARGS(pre_ffw_norm_scale, kMustRead)); }