Skip to content
This repository was archived by the owner on Jun 18, 2022. It is now read-only.

Commit 1e2143c

Browse files
author
cerevra
committed
[^a-e] Switch to library/cpp/json (SUBBOTNIK-3995)
![review](https://codereview.common-int.yandex-team.ru/badges/review-in_progress-yellow.svg) [![vitvlkv](https://codereview.common-int.yandex-team.ru/badges/vitvlkv-...-yellow.svg)](https://staff.yandex-team.ru/vitvlkv) [![hromov--igor](https://codereview.common-int.yandex-team.ru/badges/hromov--igor-...-yellow.svg)](https://staff.yandex-team.ru/hromov-igor) ref:86f343cbaa4edee9838dd1f8bf8e5eae18aa2857
1 parent d04b79a commit 1e2143c

File tree

89 files changed

+95
-95
lines changed

Some content is hidden

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

89 files changed

+95
-95
lines changed

‎CPP_STYLE_GUIDE.md

+3-3

‎build/rules/contrib_deps.policy

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ ALLOW contrib/python/horovod/horovod/common/syms -> library/python/symbols/regis
4242
ALLOW contrib/python/opensfm -> library/vl_feat
4343
ALLOW contrib/python/pytest-mongodb -> devtools/swag/lib
4444
ALLOW contrib/python/wand/ImageMagick -> library/python/symbols/registry
45-
ALLOW contrib/nginx/modules/nginx-rtmp-module -> library/json
45+
ALLOW contrib/nginx/modules/nginx-rtmp-module -> library/cpp/json
4646
ALLOW contrib/python/psycopg2/tests -> mail/devpack
4747
ALLOW contrib/python/asn1crypto -> library/python/symbols/crypto
4848
ALLOW contrib/python/win_unicode_console -> library/python/symbols/win_unicode_console

‎catboost/app/bind_options.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
#include <library/cpp/getopt/small/last_getopt.h>
1616
#include <library/cpp/grid_creator/binarization.h>
17-
#include <library/json/json_reader.h>
17+
#include <library/cpp/json/json_reader.h>
1818
#include <library/logger/log.h>
1919
#include <library/cpp/text_processing/dictionary/options.h>
2020

‎catboost/app/bind_options.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
#include <catboost/private/libs/options/load_options.h>
44

5-
#include <library/json/json_value.h>
5+
#include <library/cpp/json/json_value.h>
66

77
#include <util/generic/string.h>
88

‎catboost/app/mode_eval_feature.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#include <catboost/libs/train_lib/eval_feature.h>
1111
#include <catboost/libs/data/feature_names_converter.h>
1212

13-
#include <library/json/json_reader.h>
13+
#include <library/cpp/json/json_reader.h>
1414

1515
#include <util/generic/ptr.h>
1616

‎catboost/app/mode_fit.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#include <catboost/libs/logging/logging.h>
2020
#endif
2121

22-
#include <library/json/json_reader.h>
22+
#include <library/cpp/json/json_reader.h>
2323

2424
#include <util/generic/ptr.h>
2525

‎catboost/app/mode_metadata.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
#include <library/cpp/getopt/small/modchooser.h>
1111
#include <library/cpp/getopt/small/last_getopt.h>
12-
#include <library/json/json_value.h>
12+
#include <library/cpp/json/json_value.h>
1313

1414
#include <util/stream/output.h>
1515
#include <util/string/join.h>

‎catboost/app/mode_model_based_eval.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#include <catboost/private/libs/options/plain_options_helper.h>
99
#include <catboost/libs/train_lib/train_model.h>
1010

11-
#include <library/json/json_reader.h>
11+
#include <library/cpp/json/json_reader.h>
1212

1313
#include <util/generic/ptr.h>
1414

‎catboost/app/mode_normalize_model.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#include <catboost/private/libs/data_util/path_with_scheme.h>
1616

1717
#include <library/cpp/getopt/small/last_getopt.h>
18-
#include <library/json/json_value.h>
18+
#include <library/cpp/json/json_value.h>
1919
#include <library/cpp/threading/local_executor/local_executor.h>
2020

2121
#include <util/generic/serialized_enum.h>

‎catboost/app/ya.make

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ PEERDIR(
4242
catboost/libs/train_lib
4343
library/cpp/getopt/small
4444
library/cpp/grid_creator
45-
library/json
45+
library/cpp/json
4646
library/logger
4747
library/svnversion
4848
library/cpp/text_processing/dictionary

‎catboost/cuda/train_lib/train.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
#include <catboost/libs/train_lib/options_helper.h>
2929
#include <catboost/libs/train_lib/train_model.h>
3030

31-
#include <library/json/json_prettifier.h>
32-
#include <library/json/json_value.h>
31+
#include <library/cpp/json/json_prettifier.h>
32+
#include <library/cpp/json/json_value.h>
3333
#include <library/cpp/threading/local_executor/local_executor.h>
3434

3535
#include <util/folder/path.h>

‎catboost/cuda/train_lib/ya.make

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ PEERDIR(
4242
catboost/libs/overfitting_detector
4343
catboost/private/libs/quantization
4444
catboost/libs/train_lib
45-
library/json
45+
library/cpp/json
4646
library/object_factory
4747
library/cpp/threading/local_executor
4848
)

‎catboost/libs/data/baseline.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#include <catboost/private/libs/data_util/exists_checker.h>
44
#include <catboost/private/libs/labels/helpers.h>
55

6-
#include <library/json/json_value.h>
6+
#include <library/cpp/json/json_value.h>
77

88
#include <util/generic/algorithm.h>
99
#include <util/generic/is_in.h>

‎catboost/libs/data/feature_names_converter.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#include <catboost/private/libs/options/load_options.h>
77
#include <catboost/private/libs/options/monotone_constraints.h>
88

9-
#include <library/json/json_reader.h>
9+
#include <library/cpp/json/json_reader.h>
1010

1111
TMap<TString, ui32> MakeIndicesFromNames(const NCatboostOptions::TPoolLoadParams& poolLoadParams);
1212
TMap<TString, ui32> MakeIndicesFromNames(const NCB::TDataMetaInfo& metaInfo);

‎catboost/libs/data/load_and_quantize_data.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#include "order.h"
66
#include "quantized_features_info.h"
77

8-
#include <library/json/json_value.h>
8+
#include <library/cpp/json/json_value.h>
99

1010
#include <util/generic/fwd.h>
1111
#include <util/generic/maybe.h>

‎catboost/libs/data/meta_info.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#include <catboost/libs/column_description/column.h>
77

88
#include <library/cpp/binsaver/bin_saver.h>
9-
#include <library/json/json_value.h>
9+
#include <library/cpp/json/json_value.h>
1010

1111
#include <util/generic/maybe.h>
1212
#include <util/generic/string.h>

‎catboost/libs/data/ya.make

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ SRCS(
4545
PEERDIR(
4646
library/cpp/pop_count
4747
library/dbg_output
48-
library/json
48+
library/cpp/json
4949
library/object_factory
5050
library/cpp/string_utils/csv
5151
library/cpp/threading/future

‎catboost/libs/helpers/serialization.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#include "serialization.h"
22
#include "exception.h"
33

4-
#include <library/json/json_value.h>
4+
#include <library/cpp/json/json_value.h>
55

66
#include <util/stream/str.h>
77

‎catboost/libs/helpers/ya.make

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ PEERDIR(
6060
library/dbg_output
6161
library/cpp/digest/crc32c
6262
library/cpp/digest/md5
63-
library/json
63+
library/cpp/json
6464
library/cpp/malloc/api
6565
library/cpp/threading/local_executor
6666
)

‎catboost/libs/loggers/logger.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#include <catboost/libs/logging/logging.h>
66
#include <catboost/libs/logging/profile_info.h>
77

8-
#include <library/json/writer/json_value.h>
8+
#include <library/cpp/json/writer/json_value.h>
99
#include <util/stream/format.h>
1010
#include <util/generic/hash.h>
1111
#include <util/generic/ymath.h>

‎catboost/libs/loggers/ya.make

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ PEERDIR(
1818
catboost/libs/metrics
1919
contrib/libs/tensorboard
2020
library/cpp/digest/crc32c
21-
library/json/writer
21+
library/cpp/json/writer
2222
)
2323

2424
END()

‎catboost/libs/model/ctr_provider.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#include "features.h"
66
#include "ctr_value_table.h"
77

8-
#include <library/json/json_value.h>
8+
#include <library/cpp/json/json_value.h>
99

1010
#include <util/generic/array_ref.h>
1111
#include <util/generic/ptr.h>

‎catboost/libs/model/model.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#include <catboost/private/libs/options/loss_description.h>
1717
#include <catboost/private/libs/options/class_label_options.h>
1818

19-
#include <library/json/json_reader.h>
19+
#include <library/cpp/json/json_reader.h>
2020
#include <library/dbg_output/dump.h>
2121
#include <library/dbg_output/auto.h>
2222

‎catboost/libs/model/model.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#include <catboost/private/libs/options/enums.h>
1313
#include <catboost/private/libs/text_features/text_processing_collection.h>
1414

15-
#include <library/json/json_value.h>
15+
#include <library/cpp/json/json_value.h>
1616

1717
#include <util/generic/array_ref.h>
1818
#include <util/generic/maybe.h>

‎catboost/libs/model/model_export/coreml_helpers.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#include <contrib/libs/coreml/TreeEnsemble.pb.h>
66
#include <contrib/libs/coreml/Model.pb.h>
77

8-
#include <library/json/json_value.h>
8+
#include <library/cpp/json/json_value.h>
99

1010
#include <util/generic/hash.h>
1111

‎catboost/libs/model/model_export/json_model_helpers.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55

66
#include <catboost/libs/model/flatbuffers/model.fbs.h>
77

8-
#include <library/json/json_reader.h>
9-
#include <library/json/json_writer.h>
8+
#include <library/cpp/json/json_reader.h>
9+
#include <library/cpp/json/json_writer.h>
1010

1111
#include <util/generic/set.h>
1212
#include <util/string/builder.h>

‎catboost/libs/model/model_export/json_model_helpers.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
#include <catboost/libs/model/model.h>
44

5-
#include <library/json/json_value.h>
5+
#include <library/cpp/json/json_value.h>
66

77
NJson::TJsonValue ConvertModelToJson(
88
const TFullModel& model,

‎catboost/libs/model/model_export/model_exporter.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
#include <catboost/private/libs/options/output_file_options.h>
1111

12-
#include <library/json/json_reader.h>
12+
#include <library/cpp/json/json_reader.h>
1313

1414
#include <contrib/libs/coreml/TreeEnsemble.pb.h>
1515
#include <contrib/libs/coreml/Model.pb.h>

‎catboost/libs/model/model_export/model_import.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#include <catboost/private/libs/options/json_helper.h>
66
#include <catboost/libs/model/model_export/onnx_helpers.h>
77

8-
#include <library/json/json_reader.h>
8+
#include <library/cpp/json/json_reader.h>
99

1010
#include <contrib/libs/coreml/TreeEnsemble.pb.h>
1111
#include <contrib/libs/coreml/Model.pb.h>

‎catboost/libs/model/model_export/onnx_helpers.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
#include <catboost/libs/model/model.h>
44

5-
#include <library/json/json_value.h>
5+
#include <library/cpp/json/json_value.h>
66

77
#include <contrib/libs/onnx/proto/onnx_ml.pb.h>
88

‎catboost/libs/model/model_export/pmml_helpers.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#include <catboost/libs/helpers/xml_output.h>
77
#include <catboost/private/libs/options/enum_helpers.h>
88

9-
#include <library/json/json_value.h>
9+
#include <library/cpp/json/json_value.h>
1010
#include <library/svnversion/svnversion.h>
1111

1212
#include <util/datetime/base.h>

‎catboost/libs/model/ut/lib/model_test_helpers.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#include <catboost/libs/data/ut/lib/for_loader.h>
77
#include <catboost/libs/train_lib/train_model.h>
88

9-
#include <library/json/json_value.h>
9+
#include <library/cpp/json/json_value.h>
1010

1111
#include <util/string/builder.h>
1212
#include <util/folder/tempdir.h>

‎catboost/libs/model/ut/lib/ya.make

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ PEERDIR(
1111
catboost/libs/data/ut/lib
1212
catboost/libs/model
1313
catboost/libs/train_lib
14-
library/json
14+
library/cpp/json
1515
)
1616

1717
END()

‎catboost/libs/model/ut/model_serialization_ut.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#include <catboost/private/libs/algo/apply.h>
99
#include <catboost/private/libs/algo/learn_context.h>
1010

11-
#include <library/json/json_writer.h>
11+
#include <library/cpp/json/json_writer.h>
1212

1313
#include <library/unittest/registar.h>
1414

‎catboost/libs/model/ut/ya.make

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ PEERDIR(
2222
catboost/libs/model/ut/lib
2323
catboost/libs/train_lib
2424
catboost/private/libs/text_features/ut/lib
25-
library/json
25+
library/cpp/json
2626
)
2727

2828
END()

‎catboost/libs/model/ya.make

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ PEERDIR(
3434
library/cpp/containers/dense_hash
3535
library/dbg_output
3636
library/fast_exp
37-
library/json
37+
library/cpp/json
3838
library/object_factory
3939
library/svnversion
4040
)

‎catboost/libs/train_interface/ya.make

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ PEERDIR(
2424
catboost/libs/train_lib
2525
library/cpp/grid_creator
2626
library/cpp/threading/local_executor
27-
library/json
27+
library/cpp/json
2828
library/logger
2929
)
3030

‎catboost/libs/train_lib/cross_validation.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#include <catboost/private/libs/options/output_file_options.h>
1313
#include <catboost/libs/train_lib/train_model.h>
1414

15-
#include <library/json/json_value.h>
15+
#include <library/cpp/json/json_value.h>
1616

1717
#include <util/folder/tempdir.h>
1818
#include <util/generic/array_ref.h>

‎catboost/libs/train_lib/eval_feature.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#include <catboost/private/libs/algo_helpers/custom_objective_descriptor.h>
77
#include <catboost/private/libs/options/feature_eval_options.h>
88

9-
#include <library/json/json_value.h>
9+
#include <library/cpp/json/json_value.h>
1010

1111
#include <util/generic/maybe.h>
1212
#include <util/generic/ptr.h>

‎catboost/libs/train_lib/train_model.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
#include <catboost/private/libs/target/classification_target_helper.h>
4141

4242
#include <library/cpp/grid_creator/binarization.h>
43-
#include <library/json/json_prettifier.h>
43+
#include <library/cpp/json/json_prettifier.h>
4444

4545
#include <util/generic/cast.h>
4646
#include <util/generic/mapfindptr.h>

‎catboost/libs/train_lib/train_model.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#include <catboost/private/libs/options/output_file_options.h>
1212
#include <catboost/private/libs/options/catboost_options.h>
1313

14-
#include <library/json/json_value.h>
14+
#include <library/cpp/json/json_value.h>
1515
#include <library/object_factory/object_factory.h>
1616

1717
#include <util/generic/maybe.h>

‎catboost/libs/train_lib/ya.make

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ PEERDIR(
3232
catboost/private/libs/pairs
3333
catboost/private/libs/target
3434
library/cpp/grid_creator
35-
library/json
35+
library/cpp/json
3636
library/object_factory
3737
library/cpp/threading/local_executor
3838
)

0 commit comments

Comments
 (0)