diff --git a/BUILD.bazel b/BUILD.bazel index 83671e4..94baef6 100644 --- 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", ], ) diff --git a/CMakeLists.txt b/CMakeLists.txt index 10ebecc..67ca93e 100644 --- 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 diff --git a/backprop/optimize_test.cc b/backprop/optimize_test.cc index be1723e..811aedf 100644 --- 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" diff --git a/compression/BUILD.bazel b/compression/BUILD.bazel index e6de279..00abf39 100644 --- 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", diff --git a/compression/analyze.h b/compression/analyze.h index 38537db..7d41633 100644 --- a/compression/analyze.h +++ b/compression/analyze.h @@ -26,7 +26,7 @@ #include // std::abs #include -#include "compression/shared.h" +#include "compression/types.h" #include "hwy/base.h" #include "hwy/contrib/thread_pool/thread_pool.h" #include "hwy/stats.h" diff --git a/compression/compress.h b/compression/compress.h index f6bb7a6..811f483 100644 --- a/compression/compress.h +++ b/compression/compress.h @@ -29,7 +29,7 @@ #include #include -#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" diff --git a/compression/distortion_test.cc b/compression/distortion_test.cc index 9350b5b..c52ecca 100644 --- a/compression/distortion_test.cc +++ b/compression/distortion_test.cc @@ -17,7 +17,7 @@ #include -#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" diff --git a/compression/nuq-inl.h b/compression/nuq-inl.h index 150ad79..997bb5b 100644 --- a/compression/nuq-inl.h +++ b/compression/nuq-inl.h @@ -23,7 +23,7 @@ #include -#include "compression/shared.h" +#include "compression/types.h" #include "util/basics.h" #include "hwy/base.h" diff --git a/compression/nuq_test.cc b/compression/nuq_test.cc index 8f1bf91..0c76b2d 100644 --- a/compression/nuq_test.cc +++ b/compression/nuq_test.cc @@ -27,7 +27,7 @@ #include #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" diff --git a/compression/python/BUILD.bazel b/compression/python/BUILD.bazel index fdd8736..474511c 100644 --- 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", ], ) diff --git a/compression/python/compression_clif_aux.h b/compression/python/compression_clif_aux.h index dfc0030..6f45eb3 100644 --- a/compression/python/compression_clif_aux.h +++ b/compression/python/compression_clif_aux.h @@ -21,7 +21,7 @@ #include #include -#include "compression/shared.h" // Type +#include "compression/types.h" // Type #include "gemma/configs.h" #include "gemma/model_store.h" #include "gemma/tensor_info.h" diff --git a/compression/python/compression_extension.cc b/compression/python/compression_extension.cc index f5b4a4c..8edbfd5 100644 --- a/compression/python/compression_extension.cc +++ b/compression/python/compression_extension.cc @@ -19,7 +19,7 @@ #include #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" diff --git a/compression/sfp-inl.h b/compression/sfp-inl.h index 1be84e9..dad6536 100644 --- a/compression/sfp-inl.h +++ b/compression/sfp-inl.h @@ -20,7 +20,7 @@ #include #include -#include "compression/shared.h" +#include "compression/types.h" #include "hwy/base.h" #endif // THIRD_PARTY_GEMMA_CPP_COMPRESSION_SFP_INL_H_ diff --git a/compression/sfp_test.cc b/compression/sfp_test.cc index f79e600..5d97caa 100644 --- a/compression/sfp_test.cc +++ b/compression/sfp_test.cc @@ -25,7 +25,7 @@ #include #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" diff --git a/compression/shared.h b/compression/types.h similarity index 98% rename from compression/shared.h rename to compression/types.h index 00cab4c..2865f8b 100644 --- a/compression/shared.h +++ b/compression/types.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 #include @@ -281,4 +281,4 @@ HWY_INLINE PackedSpan MakeConst(PackedSpan packed) { } } // namespace gcpp -#endif // THIRD_PARTY_GEMMA_CPP_COMPRESSION_SHARED_H_ +#endif // THIRD_PARTY_GEMMA_CPP_COMPRESSION_TYPES_H_ diff --git a/evals/benchmark_helper.cc b/evals/benchmark_helper.cc index 3ea3baf..949bf88 100644 --- a/evals/benchmark_helper.cc +++ b/evals/benchmark_helper.cc @@ -24,7 +24,7 @@ #include #include -#include "compression/shared.h" // TypeName +#include "compression/types.h" // TypeName #include "evals/cross_entropy.h" #include "gemma/gemma.h" #include "gemma/gemma_args.h" diff --git a/gemma/configs.cc b/gemma/configs.cc index ed42062..82a1fa9 100644 --- a/gemma/configs.cc +++ b/gemma/configs.cc @@ -21,7 +21,7 @@ #include #include -#include "compression/shared.h" // Type +#include "compression/types.h" // Type #include "io/fields.h" // IFields #include "hwy/base.h" diff --git a/gemma/configs.h b/gemma/configs.h index 4e9d5d9..0e3bb0a 100644 --- a/gemma/configs.h +++ b/gemma/configs.h @@ -25,7 +25,7 @@ #include #include -#include "compression/shared.h" // Type +#include "compression/types.h" // Type #include "io/fields.h" // IFieldsVisitor #include "util/basics.h" diff --git a/gemma/configs_test.cc b/gemma/configs_test.cc index 2ae9482..0ca4a84 100644 --- a/gemma/configs_test.cc +++ b/gemma/configs_test.cc @@ -6,7 +6,7 @@ #include #include "gtest/gtest.h" -#include "compression/shared.h" // Type +#include "compression/types.h" // Type #include "io/fields.h" // Type namespace gcpp { diff --git a/gemma/gemma.cc b/gemma/gemma.cc index 7715085..5222c00 100644 --- a/gemma/gemma.cc +++ b/gemma/gemma.cc @@ -28,7 +28,7 @@ #include // 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" diff --git a/gemma/model_store.cc b/gemma/model_store.cc index fca4674..ad8e3c2 100644 --- a/gemma/model_store.cc +++ b/gemma/model_store.cc @@ -24,7 +24,7 @@ #include // strcmp #include -#include "compression/shared.h" +#include "compression/types.h" #include "gemma/configs.h" // ModelConfig #include "gemma/tensor_info.h" #include "gemma/tokenizer.h" diff --git a/gemma/run.cc b/gemma/run.cc index 13c96c3..88c2dcf 100644 --- a/gemma/run.cc +++ b/gemma/run.cc @@ -23,7 +23,7 @@ #include #include -#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" diff --git a/gemma/tensor_info.cc b/gemma/tensor_info.cc index 1052bb9..4006a29 100644 --- a/gemma/tensor_info.cc +++ b/gemma/tensor_info.cc @@ -4,7 +4,7 @@ #include -#include "compression/shared.h" +#include "compression/types.h" #include "gemma/configs.h" namespace gcpp { diff --git a/gemma/tensor_info.h b/gemma/tensor_info.h index 4484d3b..c8252a4 100644 --- a/gemma/tensor_info.h +++ b/gemma/tensor_info.h @@ -7,7 +7,7 @@ #include #include -#include "compression/shared.h" // Type +#include "compression/types.h" // Type #include "gemma/configs.h" #include "util/basics.h" // Extents2D diff --git a/gemma/tensor_info_test.cc b/gemma/tensor_info_test.cc index 060e3fe..b336a94 100644 --- a/gemma/tensor_info_test.cc +++ b/gemma/tensor_info_test.cc @@ -3,7 +3,7 @@ #include #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" diff --git a/gemma/weights.cc b/gemma/weights.cc index eb9b24f..b766ad8 100644 --- a/gemma/weights.cc +++ b/gemma/weights.cc @@ -26,7 +26,7 @@ #include #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" diff --git a/gemma/weights.h b/gemma/weights.h index 28c0f38..5a5de9d 100644 --- a/gemma/weights.h +++ b/gemma/weights.h @@ -25,7 +25,7 @@ #include #include -#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 diff --git a/ops/bench_matmul.cc b/ops/bench_matmul.cc index c178a26..52f19ea 100644 --- a/ops/bench_matmul.cc +++ b/ops/bench_matmul.cc @@ -33,7 +33,7 @@ #include #include -#include "compression/shared.h" +#include "compression/types.h" #include "ops/matmul.h" #include "util/basics.h" #include "util/threading_context.h" diff --git a/ops/dot_test.cc b/ops/dot_test.cc index d4f8eab..731bb01 100644 --- a/ops/dot_test.cc +++ b/ops/dot_test.cc @@ -27,7 +27,7 @@ #include #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" diff --git a/ops/matmul-inl.h b/ops/matmul-inl.h index 062672c..4682855 100644 --- a/ops/matmul-inl.h +++ b/ops/matmul-inl.h @@ -19,7 +19,7 @@ #include -#include "compression/shared.h" +#include "compression/types.h" #include "ops/matmul.h" // IWYU pragma: export #include "util/allocator.h" #include "util/basics.h" diff --git a/ops/matmul_test.cc b/ops/matmul_test.cc index 5d3f4f1..0f5974b 100644 --- a/ops/matmul_test.cc +++ b/ops/matmul_test.cc @@ -29,7 +29,7 @@ #include #include -#include "compression/shared.h" +#include "compression/types.h" #include "ops/matmul.h" #include "util/basics.h" #include "util/mat.h" diff --git a/paligemma/BUILD.bazel b/paligemma/BUILD.bazel index 704df01..0a93bb0 100644 --- 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", ], diff --git a/paligemma/paligemma_test.cc b/paligemma/paligemma_test.cc index c2510a1..ba0653e 100644 --- a/paligemma/paligemma_test.cc +++ b/paligemma/paligemma_test.cc @@ -17,7 +17,7 @@ #include #include -#include "compression/shared.h" +#include "compression/types.h" #include "evals/benchmark_helper.h" #include "gemma/configs.h" #include "gemma/gemma.h" diff --git a/python/BUILD.bazel b/python/BUILD.bazel index 2cd6f5e..3ff733f 100644 --- a/python/BUILD.bazel +++ b/python/BUILD.bazel @@ -15,7 +15,7 @@ pybind_extension( deps = [ "//:configs", "//:tensor_info", - "//compression:shared", + "//compression:types", ], ) diff --git a/python/configs.cc b/python/configs.cc index 0bf69aa..db40bc0 100644 --- a/python/configs.cc +++ b/python/configs.cc @@ -19,7 +19,7 @@ #include #include -#include "compression/shared.h" +#include "compression/types.h" #include "gemma/tensor_info.h" using gcpp::ActivationType; diff --git a/util/mat.h b/util/mat.h index dd822f4..d039bdf 100644 --- a/util/mat.h +++ b/util/mat.h @@ -25,7 +25,7 @@ #include // 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