Minor: rename compression/shared -> types.h

PiperOrigin-RevId: 758199851
2025-05-13 06:52:46 -07:00 · 2025-05-13 06:52:46 -07:00 · 2038dfd9cc
parent d538a6d6c6
commit 2038dfd9cc
36 changed files with 51 additions and 51 deletions
--- a/BUILD.bazel
+++ b/BUILD.bazel
@ -131,7 +131,7 @@ cc_library(
    hdrs = ["gemma/configs.h"],
    deps = [
        ":basics",
-        "//compression:shared",
+        "//compression:types",
        "//io:fields",
        "@highway//:hwy",  # base.h
    ],
@ -143,7 +143,7 @@ cc_test(
    deps = [
        ":configs",
        "@googletest//:gtest_main",  # buildcleaner: keep
-        "//compression:shared",
+        "//compression:types",
        "//io:fields",
    ],
 )
@ -155,7 +155,7 @@ cc_library(
    deps = [
        ":basics",
        ":configs",
-        "//compression:shared",
+        "//compression:types",
    ],
 )

@ -168,7 +168,7 @@ cc_library(
        ":basics",
        ":tensor_info",
        ":threading_context",
-        "//compression:shared",
+        "//compression:types",
        "//io:fields",
        "@highway//:hwy",
        "@highway//:profiler",
@ -200,7 +200,7 @@ cc_library(
        ":tensor_info",
        ":threading_context",
        ":tokenizer",
-        "//compression:shared",
+        "//compression:types",
        "//io",
        "//io:blob_store",
        "//io:fields",
@ -471,7 +471,7 @@ cc_library(
        # Placeholder for internal dep, do not remove.,
        "//io:blob_store",
        "//io",
-        "//compression:shared",
+        "//compression:types",
        "//paligemma:image",
        "@highway//:hwy",
        "@highway//:nanobenchmark",  # timer
@ -590,7 +590,7 @@ cc_binary(
        ":gemma_lib",
        ":ops",
        ":tokenizer",
-        "//compression:shared",
+        "//compression:types",
        "//paligemma:image",
        "@highway//:hwy",
        "@highway//:profiler",
@ -775,7 +775,7 @@ cc_test(
        ":tokenizer",
        ":weights",
        "@googletest//:gtest_main",  # buildcleaner: keep
-        "//compression:shared",
+        "//compression:types",
        "@highway//:thread_pool",
    ],
 )
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -58,7 +58,7 @@ set(SOURCES
  compression/compress.h
  compression/nuq-inl.h
  compression/sfp-inl.h
-  compression/shared.h
+  compression/types.h
  compression/test_util-inl.h
  evals/benchmark_helper.cc
  evals/benchmark_helper.h
--- a/backprop/optimize_test.cc
+++ b/backprop/optimize_test.cc
@ -27,7 +27,7 @@
 #include "backprop/optimizer.h"
 #include "backprop/prompt.h"
 #include "backprop/sampler.h"
-#include "compression/shared.h"
+#include "compression/types.h"
 #include "gemma/configs.h"
 #include "gemma/gemma.h"
 #include "gemma/tokenizer.h"
--- a/compression/BUILD.bazel
+++ b/compression/BUILD.bazel
@ -24,7 +24,7 @@ cc_library(
    name = "distortion",
    hdrs = [
        "distortion.h",
-        "shared.h",
+        "types.h",
    ],
    deps = [
        "//:basics",
@ -48,8 +48,8 @@ cc_test(
 )

 cc_library(
-    name = "shared",
-    hdrs = ["shared.h"],
+    name = "types",
+    hdrs = ["types.h"],
    deps = [
        "//:basics",
        "@highway//:hwy",
@ -60,7 +60,7 @@ cc_library(
    name = "sfp",
    textual_hdrs = ["sfp-inl.h"],
    deps = [
-        ":shared",
+        ":types",
        "@highway//:hwy",
    ],
 )
@ -70,7 +70,7 @@ cc_library(
    textual_hdrs = ["nuq-inl.h"],
    deps = [
        ":sfp",
-        ":shared",
+        ":types",
        "//:basics",
        "@highway//:hwy",
        "@highway//hwy/contrib/sort:vqsort",
@ -138,7 +138,7 @@ cc_library(
    srcs = ["compress.cc"],
    hdrs = [
        "compress.h",
-        "shared.h",
+        "types.h",
    ],
    textual_hdrs = ["compress-inl.h"],
    deps = [
@ -184,7 +184,7 @@ cc_library(
    deps = [
        ":nuq",
        ":sfp",
-        ":shared",
+        ":types",
        "@highway//:hwy",
        "@highway//:stats",
        "@highway//:thread_pool",
--- a/compression/analyze.h
+++ b/compression/analyze.h
@ -26,7 +26,7 @@
 #include <cstdlib>  // std::abs
 #include <vector>

-#include "compression/shared.h"
+#include "compression/types.h"
 #include "hwy/base.h"
 #include "hwy/contrib/thread_pool/thread_pool.h"
 #include "hwy/stats.h"
--- a/compression/compress.h
+++ b/compression/compress.h
@ -29,7 +29,7 @@
 #include <memory>
 #include <vector>

-#include "compression/shared.h"  // IWYU pragma: export
+#include "compression/types.h"  // IWYU pragma: export
 #if COMPRESS_STATS
 #include "compression/distortion.h"
 #include "hwy/stats.h"
--- a/compression/distortion_test.cc
+++ b/compression/distortion_test.cc
@ -17,7 +17,7 @@

 #include <stdio.h>

-#include "compression/shared.h"  // SfpStream::kMax
+#include "compression/types.h"  // SfpStream::kMax
 #include "util/test_util.h"
 #include "hwy/nanobenchmark.h"
 #include "hwy/tests/hwy_gtest.h"
--- a/compression/nuq-inl.h
+++ b/compression/nuq-inl.h
@ -23,7 +23,7 @@

 #include <cstdio>

-#include "compression/shared.h"
+#include "compression/types.h"
 #include "util/basics.h"
 #include "hwy/base.h"

--- a/compression/nuq_test.cc
+++ b/compression/nuq_test.cc
@ -27,7 +27,7 @@
 #include <random>

 #include "compression/distortion.h"
-#include "compression/shared.h"
+#include "compression/types.h"
 #include "util/test_util.h"
 #include "hwy/aligned_allocator.h"
 #include "hwy/base.h"
--- a/compression/python/BUILD.bazel
+++ b/compression/python/BUILD.bazel
@ -36,7 +36,7 @@ pybind_extension(
        ":compression_clif_aux",
        "//:mat",
        "//:tensor_info",
-        "//compression:shared",
+        "//compression:types",
    ],
 )

--- a/compression/python/compression_clif_aux.h
+++ b/compression/python/compression_clif_aux.h
@ -21,7 +21,7 @@
 #include <memory>
 #include <string>

-#include "compression/shared.h"  // Type
+#include "compression/types.h"  // Type
 #include "gemma/configs.h"
 #include "gemma/model_store.h"
 #include "gemma/tensor_info.h"
--- a/compression/python/compression_extension.cc
+++ b/compression/python/compression_extension.cc
@ -19,7 +19,7 @@
 #include <string>

 #include "compression/python/compression_clif_aux.h"
-#include "compression/shared.h"  // Type
+#include "compression/types.h"  // Type
 #include "gemma/tensor_info.h"
 #include "util/mat.h"

--- a/compression/sfp-inl.h
+++ b/compression/sfp-inl.h
@ -20,7 +20,7 @@
 #include <stddef.h>
 #include <stdint.h>

-#include "compression/shared.h"
+#include "compression/types.h"
 #include "hwy/base.h"

 #endif  // THIRD_PARTY_GEMMA_CPP_COMPRESSION_SFP_INL_H_
--- a/compression/sfp_test.cc
+++ b/compression/sfp_test.cc
@ -25,7 +25,7 @@
 #include <set>

 #include "compression/distortion.h"
-#include "compression/shared.h"
+#include "compression/types.h"
 #include "util/test_util.h"
 #include "hwy/aligned_allocator.h"
 #include "hwy/base.h"
--- a/compression/shared.h
+++ b/compression/shared.h
@ -15,8 +15,8 @@

 // Types shared between tensor definitions and `compress-inl.h`.

-#ifndef THIRD_PARTY_GEMMA_CPP_COMPRESSION_SHARED_H_
-#define THIRD_PARTY_GEMMA_CPP_COMPRESSION_SHARED_H_
+#ifndef THIRD_PARTY_GEMMA_CPP_COMPRESSION_TYPES_H_
+#define THIRD_PARTY_GEMMA_CPP_COMPRESSION_TYPES_H_

 #include <stddef.h>
 #include <stdint.h>
@ -281,4 +281,4 @@ HWY_INLINE PackedSpan<const Packed> MakeConst(PackedSpan<Packed> packed) {
 }

 }  // namespace gcpp
-#endif  // THIRD_PARTY_GEMMA_CPP_COMPRESSION_SHARED_H_
+#endif  // THIRD_PARTY_GEMMA_CPP_COMPRESSION_TYPES_H_
--- a/evals/benchmark_helper.cc
+++ b/evals/benchmark_helper.cc
@ -24,7 +24,7 @@
 #include <string>
 #include <vector>

-#include "compression/shared.h"  // TypeName
+#include "compression/types.h"  // TypeName
 #include "evals/cross_entropy.h"
 #include "gemma/gemma.h"
 #include "gemma/gemma_args.h"
--- a/gemma/configs.cc
+++ b/gemma/configs.cc
@ -21,7 +21,7 @@
 #include <string>
 #include <vector>

-#include "compression/shared.h"  // Type
+#include "compression/types.h"  // Type
 #include "io/fields.h"           // IFields
 #include "hwy/base.h"

--- a/gemma/configs.h
+++ b/gemma/configs.h
@ -25,7 +25,7 @@
 #include <string>
 #include <vector>

-#include "compression/shared.h"  // Type
+#include "compression/types.h"  // Type
 #include "io/fields.h"           // IFieldsVisitor
 #include "util/basics.h"

--- a/gemma/configs_test.cc
+++ b/gemma/configs_test.cc
@ -6,7 +6,7 @@
 #include <vector>

 #include "gtest/gtest.h"
-#include "compression/shared.h"  // Type
+#include "compression/types.h"  // Type
 #include "io/fields.h"           // Type

 namespace gcpp {
--- a/gemma/gemma.cc
+++ b/gemma/gemma.cc
@ -28,7 +28,7 @@
 #include <vector>

 // Placeholder for internal header, do not modify.
-#include "compression/shared.h"
+#include "compression/types.h"
 #include "gemma/configs.h"
 #include "gemma/model_store.h"
 #include "gemma/tokenizer.h"
--- a/gemma/model_store.cc
+++ b/gemma/model_store.cc
@ -24,7 +24,7 @@
 #include <cstring>  // strcmp
 #include <string>

-#include "compression/shared.h"
+#include "compression/types.h"
 #include "gemma/configs.h"  // ModelConfig
 #include "gemma/tensor_info.h"
 #include "gemma/tokenizer.h"
--- a/gemma/run.cc
+++ b/gemma/run.cc
@ -23,7 +23,7 @@
 #include <string_view>
 #include <vector>

-#include "compression/shared.h"  // PromptWrapping
+#include "compression/types.h"  // PromptWrapping
 #include "evals/benchmark_helper.h"
 #include "gemma/gemma.h"  // Gemma
 #include "gemma/gemma_args.h"
--- a/gemma/tensor_info.cc
+++ b/gemma/tensor_info.cc
@ -4,7 +4,7 @@

 #include <string>

-#include "compression/shared.h"
+#include "compression/types.h"
 #include "gemma/configs.h"

 namespace gcpp {
--- a/gemma/tensor_info.h
+++ b/gemma/tensor_info.h
@ -7,7 +7,7 @@
 #include <unordered_map>
 #include <vector>

-#include "compression/shared.h"  // Type
+#include "compression/types.h"  // Type
 #include "gemma/configs.h"
 #include "util/basics.h"  // Extents2D

--- a/gemma/tensor_info_test.cc
+++ b/gemma/tensor_info_test.cc
@ -3,7 +3,7 @@
 #include <stdio.h>

 #include "gtest/gtest.h"
-#include "compression/shared.h"  // SfpStream
+#include "compression/types.h"  // SfpStream
 #include "gemma/configs.h"
 #include "gemma/weights.h"
 #include "util/mat.h"
--- a/gemma/weights.cc
+++ b/gemma/weights.cc
@ -26,7 +26,7 @@
 #include <vector>

 #include "compression/compress.h"
-#include "compression/shared.h"
+#include "compression/types.h"
 #include "gemma/configs.h"
 #include "gemma/model_store.h"
 #include "io/blob_store.h"
--- a/gemma/weights.h
+++ b/gemma/weights.h
@ -25,7 +25,7 @@
 #include <string>
 #include <vector>

-#include "compression/shared.h"  // IsF32
+#include "compression/types.h"  // IsF32
 #include "gemma/configs.h"       // ModelConfig
 #include "gemma/model_store.h"   // ModelStore
 #include "gemma/tensor_info.h"   // TensorInfoRegistry
--- a/ops/bench_matmul.cc
+++ b/ops/bench_matmul.cc
@ -33,7 +33,7 @@
 #include <algorithm>
 #include <vector>

-#include "compression/shared.h"
+#include "compression/types.h"
 #include "ops/matmul.h"
 #include "util/basics.h"
 #include "util/threading_context.h"
--- a/ops/dot_test.cc
+++ b/ops/dot_test.cc
@ -27,7 +27,7 @@
 #include <random>

 #include "compression/compress.h"
-#include "compression/shared.h"
+#include "compression/types.h"
 #include "util/allocator.h"
 #include "util/test_util.h"
 #include "util/threading_context.h"
--- a/ops/matmul-inl.h
+++ b/ops/matmul-inl.h
@ -19,7 +19,7 @@

 #include <vector>

-#include "compression/shared.h"
+#include "compression/types.h"
 #include "ops/matmul.h"  // IWYU pragma: export
 #include "util/allocator.h"
 #include "util/basics.h"
--- a/ops/matmul_test.cc
+++ b/ops/matmul_test.cc
@ -29,7 +29,7 @@
 #include <stddef.h>
 #include <stdio.h>

-#include "compression/shared.h"
+#include "compression/types.h"
 #include "ops/matmul.h"
 #include "util/basics.h"
 #include "util/mat.h"
--- a/paligemma/BUILD.bazel
+++ b/paligemma/BUILD.bazel
@ -44,7 +44,7 @@ cc_test(
        "//:benchmark_helper",
        "//:configs",
        "//:gemma_lib",
-        "//compression:shared",
+        "//compression:types",
        "@highway//:hwy",
        "@highway//:hwy_test_util",
    ],
--- a/paligemma/paligemma_test.cc
+++ b/paligemma/paligemma_test.cc
@ -17,7 +17,7 @@
 #include <string>
 #include <vector>

-#include "compression/shared.h"
+#include "compression/types.h"
 #include "evals/benchmark_helper.h"
 #include "gemma/configs.h"
 #include "gemma/gemma.h"
--- a/python/BUILD.bazel
+++ b/python/BUILD.bazel
@ -15,7 +15,7 @@ pybind_extension(
    deps = [
        "//:configs",
        "//:tensor_info",
-        "//compression:shared",
+        "//compression:types",
    ],
 )

--- a/python/configs.cc
+++ b/python/configs.cc
@ -19,7 +19,7 @@
 #include <pybind11/pybind11.h>
 #include <pybind11/stl.h>

-#include "compression/shared.h"
+#include "compression/types.h"
 #include "gemma/tensor_info.h"

 using gcpp::ActivationType;
--- a/util/mat.h
+++ b/util/mat.h
@ -25,7 +25,7 @@
 #include <vector>

 // IWYU pragma: begin_exports
-#include "compression/shared.h"  // Type
+#include "compression/types.h"  // Type
 #include "gemma/tensor_info.h"
 #include "io/fields.h"
 #include "util/allocator.h"  // AlignedPtr