Skip to content

Commit 7212076

Browse files
charlesbeattietkoeppe
charlesbeattie
authored and
tkoeppe
committed
[dmlab, rl_api] Use absl/log instead of custom "support" library
1 parent 43f1ca8 commit 7212076

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+59
-264
lines changed

‎dmlab2d/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ pybind_extension(
1010
copts = ["-fexceptions"],
1111
deps = [
1212
"//dmlab2d/lib:dmlab2d",
13-
"//dmlab2d/lib/support:logging",
1413
"//third_party/rl_api:env_c_api",
1514
"@com_google_absl//absl/container:flat_hash_map",
15+
"@com_google_absl//absl/log:check",
1616
"@com_google_absl//absl/strings",
1717
"@com_google_absl//absl/types:span",
1818
],

‎dmlab2d/dmlab2d_pybind.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@
2323
#include <vector>
2424

2525
#include "absl/container/flat_hash_map.h"
26+
#include "absl/log/check.h"
2627
#include "absl/strings/str_cat.h"
2728
#include "absl/types/span.h"
2829
#include "dmlab2d/lib/dmlab2d.h"
29-
#include "dmlab2d/lib/support/logging.h"
3030
#include "include/pybind11/cast.h"
3131
#include "include/pybind11/detail/common.h"
3232
#include "include/pybind11/numpy.h"

‎dmlab2d/lib/env_lua_api/BUILD

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,11 @@ cc_library(
6161
"//dmlab2d/lib/lua:class",
6262
"//dmlab2d/lib/lua:n_results_or",
6363
"//dmlab2d/lib/lua:read",
64-
"//dmlab2d/lib/support:logging",
6564
"//dmlab2d/lib/system/tensor:tensor_view",
6665
"//dmlab2d/lib/system/tensor/lua:tensor",
6766
"//third_party/rl_api:env_c_api",
6867
"@com_google_absl//absl/container:node_hash_map",
68+
"@com_google_absl//absl/log",
6969
],
7070
)
7171

@@ -136,9 +136,9 @@ cc_library(
136136
"//dmlab2d/lib/lua:read",
137137
"//dmlab2d/lib/lua:stack_resetter",
138138
"//dmlab2d/lib/lua:table_ref",
139-
"//dmlab2d/lib/support:logging",
140139
"//dmlab2d/lib/system/tensor/lua:tensor",
141140
"//third_party/rl_api:env_c_api",
141+
"@com_google_absl//absl/log:check",
142142
"@com_google_absl//absl/strings",
143143
"@com_google_absl//absl/types:span",
144144
],
@@ -172,10 +172,11 @@ cc_library(
172172
"//dmlab2d/lib/lua:push",
173173
"//dmlab2d/lib/lua:read",
174174
"//dmlab2d/lib/lua:table_ref",
175-
"//dmlab2d/lib/support:logging",
176175
"//dmlab2d/lib/system/tensor:tensor_view",
177176
"//dmlab2d/lib/system/tensor/lua:tensor",
178177
"//third_party/rl_api:env_c_api",
178+
"@com_google_absl//absl/log",
179+
"@com_google_absl//absl/log:check",
179180
"@com_google_absl//absl/strings",
180181
],
181182
)
@@ -216,8 +217,9 @@ cc_library(
216217
"//dmlab2d/lib/lua:read",
217218
"//dmlab2d/lib/lua:stack_resetter",
218219
"//dmlab2d/lib/lua:table_ref",
219-
"//dmlab2d/lib/support:logging",
220220
"//third_party/rl_api:env_c_api",
221+
"@com_google_absl//absl/log",
222+
"@com_google_absl//absl/log:check",
221223
"@com_google_absl//absl/strings",
222224
],
223225
)

‎dmlab2d/lib/env_lua_api/actions.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@
2222
#include <utility>
2323
#include <vector>
2424

25+
#include "absl/log/check.h"
2526
#include "absl/strings/string_view.h"
2627
#include "absl/types/span.h"
2728
#include "dmlab2d/lib/lua/call.h"
2829
#include "dmlab2d/lib/lua/n_results_or.h"
2930
#include "dmlab2d/lib/lua/push.h"
3031
#include "dmlab2d/lib/lua/read.h"
3132
#include "dmlab2d/lib/lua/stack_resetter.h"
32-
#include "dmlab2d/lib/support/logging.h"
3333
#include "dmlab2d/lib/system/tensor/lua/tensor.h"
3434

3535
namespace deepmind::lab2d {

‎dmlab2d/lib/env_lua_api/events.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818

1919
#include <utility>
2020

21+
#include "absl/log/log.h"
2122
#include "dmlab2d/lib/lua/class.h"
2223
#include "dmlab2d/lib/lua/lua.h"
2324
#include "dmlab2d/lib/lua/read.h"
24-
#include "dmlab2d/lib/support/logging.h"
2525
#include "dmlab2d/lib/system/tensor/lua/tensor.h"
2626
#include "dmlab2d/lib/system/tensor/tensor_view.h"
2727

‎dmlab2d/lib/env_lua_api/observations.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,14 @@
2222
#include <iostream>
2323
#include <utility>
2424

25+
#include "absl/log/check.h"
26+
#include "absl/log/log.h"
2527
#include "absl/strings/string_view.h"
2628
#include "dmlab2d/lib/lua/call.h"
2729
#include "dmlab2d/lib/lua/class.h"
2830
#include "dmlab2d/lib/lua/n_results_or.h"
2931
#include "dmlab2d/lib/lua/push.h"
3032
#include "dmlab2d/lib/lua/read.h"
31-
#include "dmlab2d/lib/support/logging.h"
3233
#include "dmlab2d/lib/system/tensor/lua/tensor.h"
3334
#include "dmlab2d/lib/system/tensor/tensor_view.h"
3435

‎dmlab2d/lib/env_lua_api/properties.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818

1919
#include <string>
2020

21+
#include "absl/log/check.h"
22+
#include "absl/log/log.h"
2123
#include "absl/strings/match.h"
2224
#include "absl/strings/string_view.h"
2325
#include "dmlab2d/lib/lua/bind.h"
@@ -28,7 +30,6 @@
2830
#include "dmlab2d/lib/lua/read.h"
2931
#include "dmlab2d/lib/lua/stack_resetter.h"
3032
#include "dmlab2d/lib/lua/table_ref.h"
31-
#include "dmlab2d/lib/support/logging.h"
3233
#include "third_party/rl_api/env_c_api.h"
3334

3435
namespace deepmind::lab2d {

‎dmlab2d/lib/lua/BUILD

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ cc_library(
6565
deps = [
6666
":lua",
6767
":vm",
68-
"//dmlab2d/lib/support:logging",
68+
"@com_google_absl//absl/log:check",
6969
"@com_google_googletest//:gtest",
7070
],
7171
)
@@ -138,7 +138,7 @@ cc_library(
138138
":n_results_or",
139139
":push",
140140
":read",
141-
"//dmlab2d/lib/support:logging",
141+
"@com_google_absl//absl/log:check",
142142
],
143143
)
144144

@@ -247,7 +247,7 @@ cc_library(
247247
":lua",
248248
":push",
249249
":read",
250-
"//dmlab2d/lib/support:logging",
250+
"@com_google_absl//absl/log:check",
251251
],
252252
)
253253

@@ -279,7 +279,7 @@ cc_library(
279279
":n_results_or",
280280
":push",
281281
":read",
282-
"//dmlab2d/lib/support:logging",
282+
"@com_google_absl//absl/log:check",
283283
"@com_google_absl//absl/utility",
284284
],
285285
)
@@ -308,7 +308,7 @@ cc_library(
308308
":n_results_or",
309309
":push",
310310
":read",
311-
"//dmlab2d/lib/support:logging",
311+
"@com_google_absl//absl/log:check",
312312
"@com_google_absl//absl/strings",
313313
],
314314
)

‎dmlab2d/lib/lua/call.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
#include <string>
2020
#include <utility>
2121

22+
#include "absl/log/check.h"
2223
#include "dmlab2d/lib/lua/push.h"
2324
#include "dmlab2d/lib/lua/read.h"
24-
#include "dmlab2d/lib/support/logging.h"
2525

2626
namespace deepmind::lab2d::lua {
2727

‎dmlab2d/lib/lua/class.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@
2121
#include <string>
2222
#include <utility>
2323

24+
#include "absl/log/check.h"
2425
#include "absl/strings/str_cat.h"
2526
#include "dmlab2d/lib/lua/lua.h"
2627
#include "dmlab2d/lib/lua/n_results_or.h"
2728
#include "dmlab2d/lib/lua/push.h"
2829
#include "dmlab2d/lib/lua/read.h"
29-
#include "dmlab2d/lib/support/logging.h"
3030

3131
namespace deepmind::lab2d::lua {
3232

‎dmlab2d/lib/lua/ref.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616

1717
#include "dmlab2d/lib/lua/ref.h"
1818

19+
#include "absl/log/check.h"
1920
#include "absl/utility/utility.h"
2021
#include "dmlab2d/lib/lua/lua.h"
21-
#include "dmlab2d/lib/support/logging.h"
2222

2323
namespace deepmind::lab2d::lua {
2424

‎dmlab2d/lib/lua/ref.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@
1919

2020
#include <utility>
2121

22+
#include "absl/log/check.h"
2223
#include "dmlab2d/lib/lua/call.h"
2324
#include "dmlab2d/lib/lua/n_results_or.h"
2425
#include "dmlab2d/lib/lua/push.h"
2526
#include "dmlab2d/lib/lua/read.h"
26-
#include "dmlab2d/lib/support/logging.h"
2727

2828
namespace deepmind::lab2d::lua {
2929

‎dmlab2d/lib/lua/table_ref.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616

1717
#include "dmlab2d/lib/lua/table_ref.h"
1818

19+
#include "absl/log/check.h"
1920
#include "dmlab2d/lib/lua/lua.h"
20-
#include "dmlab2d/lib/support/logging.h"
2121

2222
namespace deepmind::lab2d::lua {
2323

‎dmlab2d/lib/lua/vm_test_util.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@
2727
#ifndef DMLAB2D_LIB_LUA_VM_TEST_UTIL_H_
2828
#define DMLAB2D_LIB_LUA_VM_TEST_UTIL_H_
2929

30+
#include "absl/log/check.h"
3031
#include "dmlab2d/lib/lua/lua.h"
3132
#include "dmlab2d/lib/lua/vm.h"
32-
#include "dmlab2d/lib/support/logging.h"
3333
#include "gtest/gtest.h"
3434

3535
namespace deepmind::lab2d::lua {

‎dmlab2d/lib/support/BUILD

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

0 commit comments

Comments
 (0)