From 7d5364bb802e91c9e7c770266592f79c53d1267a Mon Sep 17 00:00:00 2001
From: Jan Wassenberg <janwas@google.com>
Date: Wed, 20 Mar 2024 11:31:23 -0700
Subject: [PATCH] Remove obsolete copybara tags, faster bazel builds (debug)

PiperOrigin-RevId: 617576799
---
 .github/workflows/build.yml | 2 +-
 BUILD.bazel                 | 4 +++-
 bazel/BUILD                 | 1 +
 compression/BUILD           | 8 +++++---
 examples/hello_world/run.cc | 7 ++-----
 gemma.cc                    | 2 ++
 gemma.h                     | 8 +-------
 run.cc                      | 7 +++----
 util/app.h                  | 5 -----
 9 files changed, 18 insertions(+), 26 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a0e9dc2..6fa432c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -72,4 +72,4 @@ jobs:
         with:
           path: ~/.cache/bazel
           key: bazel-${{ runner.os }}
-      - run: bazel build -c opt --cxxopt=-std=c++20 //...
\ No newline at end of file
+      - run: bazel build --cxxopt=-std=c++20 //...
diff --git a/BUILD.bazel b/BUILD.bazel
index 7f9dfce..319421f 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -4,7 +4,9 @@
 load("@rules_license//rules:license.bzl", "license")
 
 package(
-    default_applicable_licenses = ["//:license"],
+    default_applicable_licenses = [
+        "//:license",  # Placeholder comment, do not modify
+    ],
     default_visibility = ["//visibility:public"],
 )
 
diff --git a/bazel/BUILD b/bazel/BUILD
index 952624f..194a082 100644
--- a/bazel/BUILD
+++ b/bazel/BUILD
@@ -1,3 +1,4 @@
+# Required for referencing bazel:com_google_sentencepiece.patch
 package(
     default_applicable_licenses = ["//:license"],
     default_visibility = ["//:__subpackages__"],
diff --git a/compression/BUILD b/compression/BUILD
index 6c7e9a0..cfbeb99 100644
--- a/compression/BUILD
+++ b/compression/BUILD
@@ -1,10 +1,12 @@
 # Weight compression, I/O and analysis
 
 package(
-    default_applicable_licenses = ["//:license"],
+    default_applicable_licenses = [
+        "//:license",  # Placeholder comment, do not modify
+    ],
     default_visibility = [
-        "//learning/gemini/prod/contrib/gemini_cpp:__subpackages__",
-        "//:__subpackages__",
+        # Placeholder for internal visibility,
+        "//:__subpackages__",  # Placeholder, do not modify
     ],
 )
 
diff --git a/examples/hello_world/run.cc b/examples/hello_world/run.cc
index a994f31..a352250 100644
--- a/examples/hello_world/run.cc
+++ b/examples/hello_world/run.cc
@@ -17,13 +17,10 @@
 
 // copybara:import_next_line:gemma_cpp
 #include "gemma.h"
-// copybara:end
+// copybara:import_next_line:gemma_cpp
+#include "util/app.h"  // LoaderArgs
 // copybara:import_next_line:gemma_cpp
 #include "util/args.h"
-// copybara:end
-// copybara:import_next_line:gemma_cpp
-#include "util/app.h" // LoaderArgs
-// copybara:end
 #include "hwy/contrib/thread_pool/thread_pool.h"
 
 std::vector<int> tokenize(
diff --git a/gemma.cc b/gemma.cc
index 7c9d187..a230bea 100644
--- a/gemma.cc
+++ b/gemma.cc
@@ -52,6 +52,8 @@
 #include <string>
 #include <vector>
 
+// Placeholder for internal header, do not modify.
+
 // copybara:import_next_line:gemma_cpp
 #include "compression/compress.h"
 // copybara:import_next_line:gemma_cpp
diff --git a/gemma.h b/gemma.h
index d52356e..8c4cab8 100644
--- a/gemma.h
+++ b/gemma.h
@@ -23,19 +23,13 @@
 
 // copybara:import_next_line:gemma_cpp
 #include "compression/compress.h"  // SfpStream/NuqStream
-// copybara:end
 // copybara:import_next_line:gemma_cpp
-#include "configs.h"  // kSeqLen
-// copybara:end
-// copybara:import_next_line:gemma_cpp
-#include "util/args.h"  // Path
-// copybara:end
+#include "util/args.h"             // Path
 #include "hwy/aligned_allocator.h"
 #include "hwy/base.h"  // hwy::bfloat16_t
 #include "hwy/contrib/thread_pool/thread_pool.h"
 // copybara:import_next_line:sentencepiece
 #include "src/sentencepiece_processor.h"
-// copybara:end
 
 namespace gcpp {
 
diff --git a/run.cc b/run.cc
index ce9de93..3f38031 100644
--- a/run.cc
+++ b/run.cc
@@ -22,18 +22,15 @@
 #include <thread>  // NOLINT
 #include <vector>
 
+// Placeholder for internal header, do not modify.
 // copybara:import_next_line:gemma_cpp
 #include "compression/compress.h"
-// copybara:end
 // copybara:import_next_line:gemma_cpp
 #include "gemma.h"  // Gemma
-// copybara:end
 // copybara:import_next_line:gemma_cpp
 #include "util/app.h"
-// copybara:end
 // copybara:import_next_line:gemma_cpp
 #include "util/args.h"  // HasHelp
-// copybara:end
 #include "hwy/base.h"
 #include "hwy/contrib/thread_pool/thread_pool.h"
 #include "hwy/highway.h"
@@ -277,6 +274,8 @@ int main(int argc, char** argv) {
   {
     PROFILER_ZONE("Startup.misc");
 
+    // Placeholder for internal init, do not modify.
+
     gcpp::LoaderArgs loader(argc, argv);
     gcpp::InferenceArgs inference(argc, argv);
     gcpp::AppArgs app(argc, argv);
diff --git a/util/app.h b/util/app.h
index cd6cb6c..ac37971 100644
--- a/util/app.h
+++ b/util/app.h
@@ -34,15 +34,10 @@
 
 // copybara:import_next_line:gemma_cpp
 #include "configs.h"
-// copybara:end
-
 // copybara:import_next_line:gemma_cpp
 #include "gemma.h"
-// copybara:end
-
 // copybara:import_next_line:gemma_cpp
 #include "util/args.h"
-// copybara:end
 #include "hwy/base.h"  // HWY_ASSERT
 
 namespace gcpp {