move io folder inside gemma directory

gemma/configs.cc

@@ -22,8 +22,8 @@
 #include <vector>
 
 #include "compression/types.h"  // Type
-#include "io/fields.h"          // IFields
-#include "io/io.h"              // Path
+#include "gemma/io/fields.h"          // IFields
+#include "gemma/io/io.h"              // Path
 #include "hwy/base.h"
 
 namespace gcpp {

gemma/configs.h

@@ -26,8 +26,8 @@
 #include <vector>
 
 #include "compression/types.h"  // Type
-#include "io/fields.h"          // IFieldsVisitor
-#include "io/io.h"              // Path
+#include "gemma/io/fields.h"          // IFieldsVisitor
+#include "gemma/io/io.h"              // Path
 #include "util/basics.h"
 
 namespace gcpp {

gemma/configs_test.cc

@@ -7,7 +7,7 @@
 
 #include "gtest/gtest.h"
 #include "compression/types.h"  // Type
-#include "io/fields.h"           // Type
+#include "gemma/io/fields.h"           // Type
 
 namespace gcpp {
 

gemma/gemma.cc

@@ -58,8 +58,8 @@
 #include "gemma/configs.h"
 #include "gemma/model_store.h"
 #include "gemma/weights.h"
-#include "io/blob_store.h"
-#include "io/io.h"  // Path
+#include "gemma/io/blob_store.h"
+#include "gemma/io/io.h"  // Path
 #include "ops/matmul.h"
 #include "paligemma/image.h"
 #include "util/basics.h"

gemma/gemma.h

@@ -29,8 +29,8 @@
 #include "gemma/model_store.h"
 #include "gemma/query.h"
 #include "gemma/weights.h"
-#include "io/blob_store.h"
-#include "io/io.h"       // Path
+#include "gemma/io/blob_store.h"
+#include "gemma/io/io.h"       // Path
 #include "ops/matmul.h"  // MatMulEnv
 #include "paligemma/image.h"
 #include "util/basics.h"  // TokenAndProb

gemma/gemma_args.h

@@ -27,7 +27,7 @@
 
 #include "compression/types.h"
 #include "gemma/configs.h"
-#include "io/io.h"        // Path
+#include "gemma/io/io.h"        // Path
 #include "util/args.h"    // IWYU pragma: export
 #include "util/basics.h"  // Tristate
 #include "util/mat.h"

gemma/model_store.cc

@@ -30,9 +30,9 @@
 #include "gemma/configs.h"  // ModelConfig, kMaxQKVDim
 #include "gemma/tensor_info.h"
 #include "gemma/tokenizer.h"
-#include "io/blob_store.h"
-#include "io/fields.h"
-#include "io/io.h"  // Path
+#include "gemma/io/blob_store.h"
+#include "gemma/io/fields.h"
+#include "gemma/io/io.h"  // Path
 #include "util/basics.h"
 #include "util/threading_context.h"
 #include "hwy/base.h"

gemma/model_store.h

@@ -28,11 +28,12 @@
 
 // IWYU pragma: begin_exports
 #include "gemma/configs.h"  // ModelConfig
+#include "gemma/io/blob_store.h"
 #include "gemma/tokenizer.h"
-#include "io/blob_store.h"
-#include "io/io.h"        // Path
+#include "gemma/io/io.h"        // Path
 #include "util/basics.h"  // Tristate
 #include "util/mat.h"     // MatPtr
+
 // IWYU pragma: end_exports
 
 #include "util/allocator.h"

gemma/tensor_stats.cc

@@ -24,7 +24,7 @@
 #include <cmath>
 #include <memory>
 
-#include "io/io.h"
+#include "gemma/io/io.h"
 #include "util/mat.h"
 #include "util/threading_context.h"
 #include "util/zones.h"

gemma/weights.cc

@@ -29,7 +29,7 @@
 #include "gemma/configs.h"
 #include "gemma/gemma_args.h"
 #include "gemma/model_store.h"
-#include "io/blob_store.h"
+#include "gemma/io/blob_store.h"
 #include "util/mat.h"
 #include "util/threading_context.h"
 #include "util/zones.h"

gemma/weights.h

@@ -27,7 +27,7 @@
 #include "gemma/gemma_args.h"   // InferenceArgs
 #include "gemma/model_store.h"  // ModelStore
 #include "gemma/tensor_info.h"  // TensorInfoRegistry
-#include "io/blob_store.h"      // BlobWriter
+#include "gemma/io/blob_store.h"      // BlobWriter
 #include "util/mat.h"           // MatPtr
 #include "util/threading_context.h"