Code update

PiperOrigin-RevId: 609394329

Author: The gemma_cpp Authors

compression/stats.cc

@@ -23,6 +23,8 @@
 
 #include "hwy/base.h"  // HWY_ASSERT
 
+namespace gcpp {
+
 void Stats::Assimilate(const Stats& other) {
   const int64_t total_n = n_ + other.n_;
   if (total_n == 0) return;  // Nothing to do; prevents div by zero.
@@ -115,3 +117,5 @@ std::string Stats::ToString(int exclude) const {
   HWY_ASSERT(pos < sizeof(buf));
   return buf;
 }
+
+}  // namespace gcpp

compression/stats.h

@@ -25,6 +25,8 @@
 
 #include "hwy/base.h"  // HWY_ASSERT
 
+namespace gcpp {
+
 // Thread-compatible.
 template <size_t N>
 class Bins {
@@ -187,4 +189,6 @@ class Stats {
   double m4_;
 };
 
+}  // namespace gcpp
+
 #endif  // THIRD_PARTY_GEMMA_CPP_COMPRESSION_STATS_H_

configs.h

@@ -18,38 +18,34 @@
 #ifndef THIRD_PARTY_GEMMA_CPP_CONFIGS_H_
 #define THIRD_PARTY_GEMMA_CPP_CONFIGS_H_
 
-#include <cstddef>
+#include <stddef.h>
 
 namespace gcpp {
 
 static constexpr size_t kSeqLen = 7168;
 
 struct ConfigGemma7B {
-  // NOLINTBEGIN(google3-readability-class-member-naming)
-  static constexpr int seq_len = kSeqLen;
-  static constexpr int vocab_size = 256128;
-  static constexpr int n_layers = 28;
-  static constexpr int dim_model = 3072;
-  static constexpr int dim_ffw_hidden = 16 * 3072 / 2;  // = 24576
-  static constexpr int n_heads = 16;
-  static constexpr int n_kv_heads = 16;  // standard MHA, no GQA or MQA
-  static constexpr int dim_qkv = 256;    // query size == key size == value size
-  static constexpr int top_k = 1;
-  // NOLINTEND(google3-readability-class-member-naming)
+  static constexpr int kSeqLen = gcpp::kSeqLen;
+  static constexpr int kVocabSize = 256128;
+  static constexpr int kLayers = 28;
+  static constexpr int kModelDim = 3072;
+  static constexpr int kFFHiddenDim = 16 * 3072 / 2;  // = 24576
+  static constexpr int kHeads = 16;
+  static constexpr int kKVHeads = 16;  // standard MHA, no GQA or MQA
+  static constexpr int kQKVDim = 256;    // query size == key size == value size
+  static constexpr int kTopK = 1;
 };
 
 struct ConfigGemma2B {
-  // NOLINTBEGIN(google3-readability-class-member-naming)
-  static constexpr int seq_len = kSeqLen;
-  static constexpr int vocab_size = 256128;
-  static constexpr int n_layers = 18;
-  static constexpr int dim_model = 2048;
-  static constexpr int dim_ffw_hidden = 16 * 2048 / 2;  // = 16384
-  static constexpr int n_heads = 8;
-  static constexpr int n_kv_heads = 8;  // TODO(austinvhuang): add MQA support
-  static constexpr int dim_qkv = 256;   // query size == key size == value size
-  static constexpr int top_k = 1;
-  // NOLINTEND(google3-readability-class-member-naming)
+  static constexpr int kSeqLen = gcpp::kSeqLen;
+  static constexpr int kVocabSize = 256128;
+  static constexpr int kLayers = 18;
+  static constexpr int kModelDim = 2048;
+  static constexpr int kFFHiddenDim = 16 * 2048 / 2;  // = 16384
+  static constexpr int kHeads = 8;
+  static constexpr int kKVHeads = 8;  // TODO(austinvhuang): add MQA support
+  static constexpr int kQKVDim = 256;   // query size == key size == value size
+  static constexpr int kTopK = 1;
 };
 
 }  // namespace gcpp