Skip to content

Commit 95b4b06

Browse files
gchateletgchatelet
committed
[bazel] Fix visibility and target name mismatch
1 parent 026501a commit 95b4b06

File tree

11 files changed

+35
-38
lines changed

11 files changed

+35
-38
lines changed

‎ortools/java/com/google/ortools/modelbuilder/BUILD.bazel‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ load("@rules_java//java:java_library.bzl", "java_library")
1515

1616
package(default_visibility = ["//visibility:public"])
1717

18-
# Utilities to load native libraries in java or-tools.
18+
# Additional dependency to use when using the wrapped model_builder library.
1919
java_library(
2020
name = "modelbuilder",
2121
srcs = [
@@ -31,7 +31,6 @@ java_library(
3131
"Variable.java",
3232
"WeightedSumExpression.java",
3333
],
34-
visibility = ["//visibility:public"],
3534
deps = [
3635
"//ortools/java/com/google/ortools:Loader",
3736
"//ortools/linear_solver/java:modelbuilder",

‎ortools/java/com/google/ortools/sat/BUILD.bazel‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ load("@rules_java//java:java_library.bzl", "java_library")
1515

1616
package(default_visibility = ["//visibility:public"])
1717

18-
# Utilities to load native libraries in java or-tools.
18+
# Additional dependency to use when using the wrapped sat solver library.
1919
java_library(
2020
name = "sat",
2121
srcs = [
@@ -43,7 +43,6 @@ java_library(
4343
"TableConstraint.java",
4444
"WeightedSumExpression.java",
4545
],
46-
visibility = ["//visibility:public"],
4746
deps = [
4847
"//ortools/java/com/google/ortools:Loader",
4948
"//ortools/sat:cp_model_java_proto",

‎ortools/math_opt/solvers/BUILD.bazel‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -394,7 +394,6 @@ cc_library(
394394
"pdlp_solver.cc",
395395
"pdlp_solver.h",
396396
],
397-
visibility = ["//visibility:public"],
398397
deps = [
399398
":pdlp_bridge",
400399
"//ortools/base:protoutil",

‎ortools/math_opt/testing/BUILD.bazel‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
load("@rules_cc//cc:cc_library.bzl", "cc_library")
1515

16-
package(default_visibility = ["//ortools:__subpackages__"])
16+
package(default_visibility = ["//visibility:public"])
1717

1818
cc_library(
1919
name = "param_name",

‎ortools/math_opt/validators/BUILD.bazel‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
load("@rules_cc//cc:cc_library.bzl", "cc_library")
1515

16-
package(default_visibility = ["//ortools:__subpackages__"])
16+
package(default_visibility = ["//visibility:public"])
1717

1818
cc_library(
1919
name = "ids_validator",

‎ortools/routing/BUILD.bazel‎

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,26 +17,28 @@ load("@protobuf//bazel:proto_library.bzl", "proto_library")
1717
load("@protobuf//bazel:py_proto_library.bzl", "py_proto_library")
1818
load("@rules_cc//cc:cc_library.bzl", "cc_library")
1919

20-
package(default_visibility = ["//visibility:public"])
21-
2220
proto_library(
2321
name = "enums_proto",
2422
srcs = ["enums.proto"],
23+
visibility = ["//visibility:public"],
2524
)
2625

2726
cc_proto_library(
2827
name = "enums_cc_proto",
28+
visibility = ["//visibility:public"],
2929
deps = [":enums_proto"],
3030
)
3131

3232
java_proto_library(
3333
name = "enums_java_proto",
34+
visibility = ["//visibility:public"],
3435
deps = [":enums_proto"],
3536
)
3637

3738
proto_library(
3839
name = "ils_proto",
3940
srcs = ["ils.proto"],
41+
visibility = ["//visibility:public"],
4042
deps = [
4143
":enums_proto",
4244
":heuristic_parameters_proto",
@@ -45,6 +47,7 @@ proto_library(
4547

4648
cc_proto_library(
4749
name = "ils_cc_proto",
50+
visibility = ["//visibility:public"],
4851
deps = [":ils_proto"],
4952
)
5053

@@ -55,12 +58,14 @@ py_proto_library(
5558

5659
java_proto_library(
5760
name = "ils_java_proto",
61+
visibility = ["//visibility:public"],
5862
deps = [":ils_proto"],
5963
)
6064

6165
proto_library(
6266
name = "parameters_proto",
6367
srcs = ["parameters.proto"],
68+
visibility = ["//visibility:public"],
6469
deps = [
6570
":enums_proto",
6671
":heuristic_parameters_proto",
@@ -74,28 +79,33 @@ proto_library(
7479

7580
cc_proto_library(
7681
name = "parameters_cc_proto",
82+
visibility = ["//visibility:public"],
7783
deps = [":parameters_proto"],
7884
)
7985

8086
java_proto_library(
8187
name = "parameters_java_proto",
88+
visibility = ["//visibility:public"],
8289
deps = [":parameters_proto"],
8390
)
8491

8592
py_proto_library(
8693
name = "parameters_py_pb2",
94+
visibility = ["//visibility:public"],
8795
deps = [":parameters_proto"],
8896
)
8997

9098
py_proto_library(
9199
name = "enums_py_pb2",
100+
visibility = ["//visibility:public"],
92101
deps = [":enums_proto"],
93102
)
94103

95104
cc_library(
96105
name = "parameters",
97106
srcs = ["parameters.cc"],
98107
hdrs = ["parameters.h"],
108+
visibility = ["//visibility:public"],
99109
deps = [
100110
":enums_cc_proto",
101111
":heuristic_parameters_cc_proto",
@@ -124,6 +134,7 @@ cc_library(
124134
name = "parameters_utils",
125135
srcs = ["parameters_utils.cc"],
126136
hdrs = ["parameters_utils.h"],
137+
visibility = ["//visibility:public"],
127138
deps = [
128139
":heuristic_parameters_cc_proto",
129140
":parameters_cc_proto",
@@ -135,6 +146,7 @@ cc_library(
135146
cc_library(
136147
name = "types",
137148
hdrs = ["types.h"],
149+
visibility = ["//visibility:public"],
138150
deps = [
139151
"//ortools/util:piecewise_linear_function",
140152
"//ortools/util:strong_integers",
@@ -145,6 +157,7 @@ cc_library(
145157
name = "utils",
146158
srcs = ["utils.cc"],
147159
hdrs = ["utils.h"],
160+
visibility = ["//visibility:public"],
148161
deps = [
149162
"//ortools/util:saturated_arithmetic",
150163
"@abseil-cpp//absl/log:check",
@@ -156,6 +169,7 @@ cc_library(
156169
name = "neighborhoods",
157170
srcs = ["neighborhoods.cc"],
158171
hdrs = ["neighborhoods.h"],
172+
visibility = ["//visibility:public"],
159173
deps = [
160174
":types",
161175
":utils",
@@ -172,6 +186,7 @@ cc_library(
172186
name = "index_manager",
173187
srcs = ["index_manager.cc"],
174188
hdrs = ["index_manager.h"],
189+
visibility = ["//visibility:public"],
175190
deps = [
176191
":types",
177192
"//ortools/base",
@@ -224,6 +239,7 @@ cc_library(
224239
"@platforms//os:windows": ["/Zc:preprocessor"],
225240
"//conditions:default": [],
226241
}),
242+
visibility = ["//visibility:public"],
227243
deps = [
228244
":breaks",
229245
":enums_cc_proto",

‎ortools/sat/BUILD.bazel‎

Lines changed: 7 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -965,9 +965,8 @@ proto_library(
965965
cc_proto_library(
966966
name = "boolean_problem_cc_proto",
967967
visibility = [
968-
"//ops/netarch/wand/transport:__subpackages__",
969-
"//ortools:__subpackages__",
970968
"//ortools/bop:__pkg__",
969+
"//visibility:public",
971970
],
972971
deps = [":boolean_problem_proto"],
973972
)
@@ -1816,10 +1815,7 @@ cc_library(
18161815
name = "integer_base",
18171816
srcs = ["integer_base.cc"],
18181817
hdrs = ["integer_base.h"],
1819-
visibility = [
1820-
"//learning/brain/experimental/telamon:__pkg__",
1821-
"//ortools:__subpackages__",
1822-
],
1818+
visibility = ["//visibility:public"],
18231819
deps = [
18241820
":sat_base",
18251821
"//ortools/base",
@@ -1850,10 +1846,7 @@ cc_library(
18501846
name = "integer",
18511847
srcs = ["integer.cc"],
18521848
hdrs = ["integer.h"],
1853-
visibility = [
1854-
"//learning/brain/experimental/telamon:__pkg__",
1855-
"//ortools:__subpackages__",
1856-
],
1849+
visibility = ["//visibility:public"],
18571850
deps = [
18581851
":integer_base",
18591852
":model",
@@ -2131,10 +2124,7 @@ cc_library(
21312124
name = "precedences",
21322125
srcs = ["precedences.cc"],
21332126
hdrs = ["precedences.h"],
2134-
visibility = [
2135-
"//learning/brain/experimental/telamon:__pkg__",
2136-
"//ortools:__subpackages__",
2137-
],
2127+
visibility = ["//visibility:public"],
21382128
deps = [
21392129
":clause",
21402130
":cp_constraints",
@@ -2214,10 +2204,7 @@ cc_library(
22142204
name = "integer_expr",
22152205
srcs = ["integer_expr.cc"],
22162206
hdrs = ["integer_expr.h"],
2217-
visibility = [
2218-
"//learning/brain/experimental/telamon:__pkg__",
2219-
"//ortools:__subpackages__",
2220-
],
2207+
visibility = ["//visibility:public"],
22212208
deps = [
22222209
":cp_constraints",
22232210
":integer",
@@ -2701,10 +2688,7 @@ cc_library(
27012688
name = "linear_constraint",
27022689
srcs = ["linear_constraint.cc"],
27032690
hdrs = ["linear_constraint.h"],
2704-
visibility = [
2705-
"//learning/brain/experimental/telamon:__pkg__",
2706-
"//ortools:__subpackages__",
2707-
],
2691+
visibility = ["//visibility:public"],
27082692
deps = [
27092693
":integer",
27102694
":integer_base",
@@ -3375,10 +3359,7 @@ cc_library(
33753359
name = "cp_constraints",
33763360
srcs = ["cp_constraints.cc"],
33773361
hdrs = ["cp_constraints.h"],
3378-
visibility = [
3379-
"//learning/brain/experimental/telamon:__pkg__",
3380-
"//ortools:__subpackages__",
3381-
],
3362+
visibility = ["//visibility:public"],
33823363
deps = [
33833364
":integer",
33843365
":integer_base",

‎ortools/sat/java/BUILD.bazel‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ java_wrap_cc(
2323
java_deps = [
2424
"//ortools/sat:cp_model_java_proto",
2525
"//ortools/sat:sat_parameters_java_proto",
26-
"//ortools/util/java:sorted_interval_list_swig",
26+
"//ortools/util/java:sorted_interval_list",
2727
"@protobuf//java/core",
2828
],
2929
package = "com.google.ortools.sat",

‎ortools/set_cover/BUILD.bazel‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ cc_proto_library(
3838

3939
py_proto_library(
4040
name = "set_cover_py_pb2",
41+
visibility = ["//visibility:public"],
4142
deps = [":set_cover_proto"],
4243
)
4344

@@ -261,6 +262,7 @@ cc_proto_library(
261262

262263
py_proto_library(
263264
name = "capacity_py_pb2",
265+
visibility = ["//visibility:public"],
264266
deps = [":capacity_proto"],
265267
)
266268

‎ortools/util/java/BUILD.bazel‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ exports_files(
2929
)
3030

3131
java_wrap_cc(
32-
name = "sorted_interval_list_swig",
32+
name = "sorted_interval_list",
3333
srcs = ["sorted_interval_list.swig"],
3434
package = "com.google.ortools.util",
3535
swig_includes = [

0 commit comments

Comments
 (0)