Skip to content

Commit c662ca9

Browse files
schoppmpdpf-team-bot
authored andcommitted
Remove deprecated WORKSPACE and update dependencies
PiperOrigin-RevId: 711808404
1 parent 7e5c87a commit c662ca9

File tree

11 files changed

+3848
-124
lines changed

11 files changed

+3848
-124
lines changed

.bazelrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
build --cxxopt=-std=c++17 --host_cxxopt=-std=c++17
1+
build --cxxopt=-std=c++17 --host_cxxopt=-std=c++17 --java_runtime_version=21

MODULE.bazel

Lines changed: 65 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -9,61 +9,109 @@ module(
99

1010
bazel_dep(
1111
name = "rules_license",
12-
version = "0.0.7",
12+
version = "1.0.0",
1313
)
14-
1514
bazel_dep(
1615
name = "rules_proto",
17-
version = "6.0.0-rc2",
16+
version = "7.1.0",
1817
)
19-
2018
bazel_dep(
2119
name = "rules_go",
2220
version = "0.46.0",
2321
repo_name = "io_bazel_rules_go",
2422
)
25-
2623
bazel_dep(
2724
name = "rules_cc",
28-
version = "0.0.9",
25+
version = "0.1.0",
2926
)
30-
3127
bazel_dep(
3228
name = "protobuf",
33-
version = "27.0",
29+
version = "29.1",
3430
repo_name = "com_google_protobuf",
3531
)
36-
3732
bazel_dep(
3833
name = "abseil-cpp",
39-
version = "20230802.1",
34+
version = "20240722.0",
35+
repo_name = "com_google_absl",
4036
)
41-
4237
bazel_dep(
4338
name = "boringssl",
44-
version = "0.0.0-20240126-22d349c",
39+
version = "0.20240930.0",
4540
)
46-
4741
bazel_dep(
4842
name = "googletest",
49-
version = "1.14.0",
43+
version = "1.15.2",
5044
repo_name = "com_github_google_googletest",
5145
)
52-
5346
bazel_dep(
5447
name = "google_benchmark",
5548
version = "1.8.3",
5649
repo_name = "com_github_google_benchmark",
5750
)
58-
5951
bazel_dep(
6052
name = "gflags",
6153
version = "2.2.2",
6254
repo_name = "com_github_gflags_gflags",
6355
)
64-
6556
bazel_dep(
6657
name = "glog",
6758
version = "0.7.0",
6859
repo_name = "com_github_google_glog",
6960
)
61+
bazel_dep(
62+
name = "rapidjson",
63+
version = "1.1.0.bcr.20241007",
64+
)
65+
bazel_dep(
66+
name = "tink_cc",
67+
version = "2.3.0",
68+
)
69+
bazel_dep(
70+
name = "cppitertools",
71+
version = "2.1",
72+
)
73+
bazel_dep(
74+
name = "riegeli",
75+
version = "0.0.0-20240927-cdfb25a",
76+
)
77+
bazel_dep(
78+
name = "highway",
79+
version = "1.2.0",
80+
)
81+
82+
http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
83+
84+
# IREE for cc_embed_data.
85+
# https://github.com/google/iree
86+
http_archive(
87+
name = "com_github_google_iree",
88+
sha256 = "aa369b29a5c45ae9d7aa8bf49ea1308221d1711277222f0755df6e0a575f6879",
89+
strip_prefix = "iree-7e6012468cbaafaaf30302748a2943771b40e2c3",
90+
urls = [
91+
"https://github.com/google/iree/archive/7e6012468cbaafaaf30302748a2943771b40e2c3.zip",
92+
],
93+
)
94+
95+
# Farmhash.
96+
# https://github.com/google/farmhash
97+
http_archive(
98+
name = "com_github_google_farmhash",
99+
add_prefix = "farmhash",
100+
build_file = "@//:bazel/farmhash.BUILD",
101+
sha256 = "470e87745d1393cc2793f49e9bfbd2c2cf282feeeb0c367f697996fa7e664fc5",
102+
strip_prefix = "farmhash-0d859a811870d10f53a594927d0d0b97573ad06d/src",
103+
urls = [
104+
"https://github.com/google/farmhash/archive/0d859a811870d10f53a594927d0d0b97573ad06d.zip",
105+
],
106+
)
107+
108+
# SHELL for uint256.
109+
# https://github.com/google/shell-encryption
110+
http_archive(
111+
name = "com_github_google_shell-encryption",
112+
sha256 = "e4db301b036879fe422da7b5f0f6c6bdc5b15c5cec2a3817c2561ddc2cfa1046",
113+
strip_prefix = "shell-encryption-b381c4ef6b6c3c11f9da3a39c75f0cb835ee296a",
114+
urls = [
115+
"https://github.com/google/shell-encryption/archive/b381c4ef6b6c3c11f9da3a39c75f0cb835ee296a.zip",
116+
],
117+
)

MODULE.bazel.lock

Lines changed: 3760 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

WORKSPACE.bzlmod

Lines changed: 0 additions & 86 deletions
This file was deleted.

dcf/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,13 @@ cc_library(
3333
"//dpf:distributed_point_function_cc_proto",
3434
"//dpf:status_macros",
3535
"//dpf/internal:maybe_deref_span",
36-
"@com_github_google_highway//:hwy",
3736
"@com_google_absl//absl/memory",
3837
"@com_google_absl//absl/meta:type_traits",
3938
"@com_google_absl//absl/numeric:int128",
4039
"@com_google_absl//absl/status",
4140
"@com_google_absl//absl/status:statusor",
4241
"@com_google_absl//absl/types:span",
42+
"@highway//:hwy",
4343
],
4444
)
4545

dpf/BUILD

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,6 @@ cc_library(
8484
"//dpf/internal:proto_validator",
8585
"//dpf/internal:value_type_helpers",
8686
"@boringssl//:crypto",
87-
"@com_github_google_highway//:hwy",
8887
"@com_google_absl//absl/container:btree",
8988
"@com_google_absl//absl/container:flat_hash_map",
9089
"@com_google_absl//absl/container:inlined_vector",
@@ -100,6 +99,7 @@ cc_library(
10099
"@com_google_absl//absl/types:span",
101100
"@com_google_protobuf//:protobuf",
102101
"@com_google_protobuf//:protobuf_lite",
102+
"@highway//:hwy",
103103
],
104104
)
105105

@@ -154,7 +154,6 @@ cc_test(
154154
":distributed_point_function",
155155
"@com_github_google_benchmark//:benchmark",
156156
"@com_github_google_googletest//:gtest_main",
157-
"@com_github_google_highway//:hwy",
158157
"@com_google_absl//absl/container:btree",
159158
"@com_google_absl//absl/log:absl_check",
160159
"@com_google_absl//absl/numeric:int128",
@@ -165,6 +164,7 @@ cc_test(
165164
"@com_google_absl//absl/strings",
166165
"@com_google_absl//absl/types:span",
167166
"@com_google_protobuf//:protobuf",
167+
"@highway//:hwy",
168168
],
169169
)
170170

@@ -182,6 +182,7 @@ cc_library(
182182
"@com_google_absl//absl/numeric:int128",
183183
"@com_google_absl//absl/status",
184184
"@com_google_absl//absl/status:statusor",
185+
"@com_google_absl//absl/strings",
185186
"@com_google_absl//absl/types:span",
186187
],
187188
)

dpf/aes_128_fixed_key_hash.cc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
#include "absl/numeric/int128.h"
2727
#include "absl/status/status.h"
2828
#include "absl/status/statusor.h"
29+
#include "absl/strings/str_cat.h"
2930
#include "absl/types/span.h"
3031
#include "openssl/err.h"
3132

dpf/internal/BUILD

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -145,14 +145,14 @@ cc_library(
145145
"//dpf:aes_128_fixed_key_hash",
146146
"//dpf:status_macros",
147147
"@boringssl//:crypto",
148-
"@com_github_google_highway//:hwy",
149148
"@com_google_absl//absl/base:config",
150149
"@com_google_absl//absl/base:core_headers",
151150
"@com_google_absl//absl/container:inlined_vector",
152151
"@com_google_absl//absl/log:absl_check",
153152
"@com_google_absl//absl/numeric:int128",
154153
"@com_google_absl//absl/status",
155154
"@com_google_absl//absl/types:span",
155+
"@highway//:hwy",
156156
],
157157
)
158158

@@ -166,11 +166,11 @@ cc_test(
166166
":status_matchers",
167167
"//dpf:aes_128_fixed_key_hash",
168168
"@com_github_google_googletest//:gtest_main",
169-
"@com_github_google_highway//:hwy",
170-
"@com_github_google_highway//:hwy_test_util",
171169
"@com_google_absl//absl/numeric:int128",
172170
"@com_google_absl//absl/status",
173171
"@com_google_absl//absl/status:statusor",
172+
"@highway//:hwy",
173+
"@highway//:hwy_test_util",
174174
],
175175
)
176176

@@ -179,8 +179,8 @@ cc_library(
179179
srcs = ["get_hwy_mode.cc"],
180180
hdrs = ["get_hwy_mode.h"],
181181
deps = [
182-
"@com_github_google_highway//:hwy",
183182
"@com_google_absl//absl/strings",
183+
"@highway//:hwy",
184184
],
185185
)
186186

@@ -190,8 +190,8 @@ cc_library(
190190
"aes_128_fixed_key_hash_hwy.h",
191191
],
192192
deps = [
193-
"@com_github_google_highway//:hwy",
194193
"@com_google_absl//absl/numeric:int128",
194+
"@highway//:hwy",
195195
],
196196
)
197197

@@ -217,14 +217,14 @@ cc_test(
217217
"//dpf:aes_128_fixed_key_hash",
218218
"@boringssl//:crypto",
219219
"@com_github_google_googletest//:gtest_main",
220-
"@com_github_google_highway//:hwy",
221-
"@com_github_google_highway//:hwy_test_util",
222220
"@com_google_absl//absl/flags:parse",
223221
"@com_google_absl//absl/log:absl_log",
224222
"@com_google_absl//absl/numeric:int128",
225223
"@com_google_absl//absl/status",
226224
"@com_google_absl//absl/status:statusor",
227225
"@com_google_absl//absl/types:span",
226+
"@highway//:hwy",
227+
"@highway//:hwy_test_util",
228228
],
229229
)
230230

experiments/BUILD

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,6 @@ cc_binary(
2727
"//dpf:distributed_point_function",
2828
"//dpf:distributed_point_function_cc_proto",
2929
"@com_github_google_benchmark//:benchmark",
30-
"@com_github_google_riegeli//riegeli/bytes:fd_reader",
31-
"@com_github_google_riegeli//riegeli/lines:line_reading",
32-
"@com_github_ryanhaining_cppitertools//cppitertools",
3330
"@com_google_absl//absl/container:btree",
3431
"@com_google_absl//absl/flags:flag",
3532
"@com_google_absl//absl/flags:parse",
@@ -41,5 +38,8 @@ cc_binary(
4138
"@com_google_absl//absl/strings",
4239
"@com_google_absl//absl/time",
4340
"@com_google_absl//absl/types:span",
41+
"@cppitertools",
42+
"@riegeli//riegeli/bytes:fd_reader",
43+
"@riegeli//riegeli/lines:line_reading",
4444
],
4545
)

experiments/synthetic_data_benchmarks.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@
3636
#include "absl/time/time.h"
3737
#include "absl/types/span.h"
3838
#include "benchmark/benchmark.h" // third_party/benchmark
39-
#include "cppitertools/imap.hpp"
4039
#include "dpf/distributed_point_function.h"
4140
#include "dpf/distributed_point_function.pb.h"
41+
#include "imap.hpp" // cppitertools
4242
#include "riegeli/bytes/fd_reader.h"
4343
#include "riegeli/lines/line_reading.h"
4444

0 commit comments

Comments
 (0)