Remove obsolete copybara tags, faster bazel builds (debug)

PiperOrigin-RevId: 617576799
This commit is contained in:
Jan Wassenberg 2024-03-20 19:31:23 +01:00
parent edaafe335f
commit 06cea2bcdb
9 changed files with 21 additions and 25 deletions

View File

@ -72,4 +72,4 @@ jobs:
with: with:
path: ~/.cache/bazel path: ~/.cache/bazel
key: bazel-${{ runner.os }} key: bazel-${{ runner.os }}
- run: bazel build -c opt --cxxopt=-std=c++20 //... - run: bazel build --cxxopt=-std=c++20 //...

View File

@ -4,7 +4,9 @@
load("@rules_license//rules:license.bzl", "license") load("@rules_license//rules:license.bzl", "license")
package( package(
default_applicable_licenses = ["//:license"], default_applicable_licenses = [
"//:license", # Placeholder comment, do not modify
],
default_visibility = ["//visibility:public"], default_visibility = ["//visibility:public"],
) )

View File

@ -1,3 +1,4 @@
# Required for referencing bazel:com_google_sentencepiece.patch
package( package(
default_applicable_licenses = ["//:license"], default_applicable_licenses = ["//:license"],
default_visibility = ["//:__subpackages__"], default_visibility = ["//:__subpackages__"],

View File

@ -1,10 +1,12 @@
# Weight compression, I/O and analysis # Weight compression, I/O and analysis
package( package(
default_applicable_licenses = ["//:license"], default_applicable_licenses = [
"//:license", # Placeholder comment, do not modify
],
default_visibility = [ default_visibility = [
"//learning/gemini/prod/contrib/gemini_cpp:__subpackages__", "//learning/gemini/prod/contrib/gemini_cpp:__subpackages__",
"//:__subpackages__", "//:__subpackages__", # Placeholder, do not modify
], ],
) )

View File

@ -17,13 +17,10 @@
// copybara:import_next_line:gemma_cpp // copybara:import_next_line:gemma_cpp
#include "gemma.h" #include "gemma.h"
// copybara:end
// copybara:import_next_line:gemma_cpp
#include "util/args.h"
// copybara:end
// copybara:import_next_line:gemma_cpp // copybara:import_next_line:gemma_cpp
#include "util/app.h" // LoaderArgs #include "util/app.h" // LoaderArgs
// copybara:end // copybara:import_next_line:gemma_cpp
#include "util/args.h"
#include "hwy/contrib/thread_pool/thread_pool.h" #include "hwy/contrib/thread_pool/thread_pool.h"
std::vector<int> tokenize( std::vector<int> tokenize(

View File

@ -52,6 +52,8 @@
#include <string> #include <string>
#include <vector> #include <vector>
#include "base/init_google.h"
// copybara:import_next_line:gemma_cpp // copybara:import_next_line:gemma_cpp
#include "compression/compress.h" #include "compression/compress.h"
// copybara:import_next_line:gemma_cpp // copybara:import_next_line:gemma_cpp

View File

@ -23,19 +23,13 @@
// copybara:import_next_line:gemma_cpp // copybara:import_next_line:gemma_cpp
#include "compression/compress.h" // SfpStream/NuqStream #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 // copybara:import_next_line:gemma_cpp
#include "util/args.h" // Path #include "util/args.h" // Path
// copybara:end
#include "hwy/aligned_allocator.h" #include "hwy/aligned_allocator.h"
#include "hwy/base.h" // hwy::bfloat16_t #include "hwy/base.h" // hwy::bfloat16_t
#include "hwy/contrib/thread_pool/thread_pool.h" #include "hwy/contrib/thread_pool/thread_pool.h"
// copybara:import_next_line:sentencepiece // copybara:import_next_line:sentencepiece
#include "src/sentencepiece_processor.h" #include "src/sentencepiece_processor.h"
// copybara:end
namespace gcpp { namespace gcpp {

11
run.cc
View File

@ -22,18 +22,15 @@
#include <thread> // NOLINT #include <thread> // NOLINT
#include <vector> #include <vector>
#include "base/init_google.h"
// copybara:import_next_line:gemma_cpp // copybara:import_next_line:gemma_cpp
#include "compression/compress.h" #include "compression/compress.h"
// copybara:end
// copybara:import_next_line:gemma_cpp // copybara:import_next_line:gemma_cpp
#include "gemma.h" // Gemma #include "gemma.h" // Gemma
// copybara:end
// copybara:import_next_line:gemma_cpp // copybara:import_next_line:gemma_cpp
#include "util/app.h" #include "util/app.h"
// copybara:end
// copybara:import_next_line:gemma_cpp // copybara:import_next_line:gemma_cpp
#include "util/args.h" // HasHelp #include "util/args.h" // HasHelp
// copybara:end
#include "hwy/base.h" #include "hwy/base.h"
#include "hwy/contrib/thread_pool/thread_pool.h" #include "hwy/contrib/thread_pool/thread_pool.h"
#include "hwy/highway.h" #include "hwy/highway.h"
@ -277,6 +274,12 @@ int main(int argc, char** argv) {
{ {
PROFILER_ZONE("Startup.misc"); PROFILER_ZONE("Startup.misc");
int argc_dummy = 1;
// Required because sentencepiece uses Google I/O which requires InitGoogle.
// argc_dummy = 1 avoids sentencepiece absl flags attempting to parse
// arguments
InitGoogle("usage", &argc_dummy, &argv, false);
gcpp::LoaderArgs loader(argc, argv); gcpp::LoaderArgs loader(argc, argv);
gcpp::InferenceArgs inference(argc, argv); gcpp::InferenceArgs inference(argc, argv);
gcpp::AppArgs app(argc, argv); gcpp::AppArgs app(argc, argv);

View File

@ -34,15 +34,10 @@
// copybara:import_next_line:gemma_cpp // copybara:import_next_line:gemma_cpp
#include "configs.h" #include "configs.h"
// copybara:end
// copybara:import_next_line:gemma_cpp // copybara:import_next_line:gemma_cpp
#include "gemma.h" #include "gemma.h"
// copybara:end
// copybara:import_next_line:gemma_cpp // copybara:import_next_line:gemma_cpp
#include "util/args.h" #include "util/args.h"
// copybara:end
#include "hwy/base.h" // HWY_ASSERT #include "hwy/base.h" // HWY_ASSERT
namespace gcpp { namespace gcpp {