Skip to content

Commit a8a048a

Browse files
cyyevercyyever
committed
Remove Caffe2 db and distributed from build system and remove related binaries
1 parent d6052a3 commit a8a048a

43 files changed

Lines changed: 0 additions & 4268 deletions

Some content is hidden

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

‎.ci/docker/common/install_base.sh‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,6 @@ install_centos() {
113113
glibc-devel \
114114
glibc-headers \
115115
glog-devel \
116-
hiredis-devel \
117116
libstdc++-devel \
118117
libsndfile-devel \
119118
make \

‎.ci/docker/common/install_db.sh‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,6 @@ set -ex
44

55
install_ubuntu() {
66
apt-get update
7-
apt-get install -y --no-install-recommends \
8-
libhiredis-dev \
9-
libleveldb-dev \
10-
liblmdb-dev \
11-
libsnappy-dev
127

138
# Cleanup
149
apt-get autoclean && apt-get clean
@@ -20,12 +15,6 @@ install_centos() {
2015
# See http://fedoraproject.org/wiki/EPEL
2116
yum --enablerepo=extras install -y epel-release
2217

23-
yum install -y \
24-
hiredis-devel \
25-
leveldb-devel \
26-
lmdb-devel \
27-
snappy-devel
28-
2918
# Cleanup
3019
yum clean all
3120
rm -rf /var/cache/yum

‎BUILD.bazel‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -503,16 +503,6 @@ filegroup(
503503
],
504504
)
505505

506-
filegroup(
507-
name = "caffe2_distributed_srcs",
508-
srcs = [
509-
"caffe2/distributed/file_store_handler.cc",
510-
"caffe2/distributed/file_store_handler_op.cc",
511-
"caffe2/distributed/store_handler.cc",
512-
"caffe2/distributed/store_ops.cc",
513-
],
514-
)
515-
516506
filegroup(
517507
name = "caffe2_ideep_srcs",
518508
srcs = [
@@ -1011,8 +1001,6 @@ filegroup(
10111001
"caffe2/core/common_cudnn.cc",
10121002
"caffe2/core/common_gpu.cc",
10131003
"caffe2/core/event_gpu.cc",
1014-
"caffe2/db/create_db_op_gpu.cc",
1015-
"caffe2/distributed/file_store_handler_op_gpu.cc",
10161004
"caffe2/operators/communicator_op_gpu.cc",
10171005
"caffe2/operators/concat_split_op_gpu.cc",
10181006
"caffe2/operators/conv_op_cache_cudnn.cc",
@@ -1262,8 +1250,6 @@ cc_library(
12621250
"caffe2/core/nomnigraph/include/nomnigraph/Support/*.h",
12631251
"caffe2/core/nomnigraph/include/nomnigraph/Transformations/*.h",
12641252
"caffe2/core/nomnigraph/tests/*.h",
1265-
"caffe2/db/*.h",
1266-
"caffe2/distributed/*.h",
12671253
"caffe2/ideep/*.h",
12681254
"caffe2/ideep/operators/*.h",
12691255
"caffe2/ideep/operators/quantization/*.h",
@@ -1335,11 +1321,8 @@ cc_library(
13351321
cc_library(
13361322
name = "caffe2",
13371323
srcs = [
1338-
"caffe2/db/create_db_op.cc",
1339-
"caffe2/db/protodb.cc",
13401324
"caffe2/share/contrib/depthwise/depthwise3x3_conv_op.cc",
13411325
":caffe2_core_srcs",
1342-
":caffe2_distributed_srcs",
13431326
":caffe2_ideep_srcs",
13441327
":caffe2_onnx_srcs",
13451328
":caffe2_operators_srcs",

‎CMakeLists.txt‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -230,9 +230,7 @@ option(USE_CUPTI_SO "Use CUPTI as a shared library" ON)
230230
option(USE_FAKELOWP "Use FakeLowp operators" OFF)
231231
option(USE_GFLAGS "Use GFLAGS" OFF)
232232
option(USE_GLOG "Use GLOG" OFF)
233-
option(USE_LEVELDB "Use LEVELDB" OFF)
234233
option(USE_LITE_PROTO "Use lite protobuf instead of full." OFF)
235-
option(USE_LMDB "Use LMDB" OFF)
236234
option(USE_MAGMA "Use MAGMA" ON)
237235
option(USE_METAL "Use Metal for Caffe2 iOS build" ON)
238236
option(USE_PYTORCH_METAL "Use Metal for PyTorch iOS build" OFF)
@@ -269,8 +267,6 @@ option(USE_PRECOMPILED_HEADERS "Use pre-compiled headers to accelerate build." O
269267
option(USE_PROF "Use profiling" OFF)
270268
option(USE_QNNPACK "Use QNNPACK (quantized 8-bit operators)" ON)
271269
option(USE_PYTORCH_QNNPACK "Use ATen/QNNPACK (quantized 8-bit operators)" ON)
272-
option(USE_REDIS "Use Redis" OFF)
273-
option(USE_ROCKSDB "Use RocksDB" OFF)
274270
option(USE_SNPE "Use Qualcomm's SNPE library" OFF)
275271
option(USE_SYSTEM_EIGEN_INSTALL
276272
"Use system Eigen instead of the one under third_party" OFF)
@@ -292,7 +288,6 @@ option(USE_VULKAN_FP16_INFERENCE "Vulkan - Use fp16 inference" OFF)
292288
option(USE_VULKAN_RELAXED_PRECISION "Vulkan - Use relaxed precision math in the kernels (mediump)" OFF)
293289
# option USE_XNNPACK: try to enable xnnpack by default.
294290
option(USE_XNNPACK "Use XNNPACK" ON)
295-
option(USE_ZMQ "Use ZMQ" OFF)
296291
option(USE_ZSTD "Use ZSTD" OFF)
297292
option(USE_ROCM_KERNEL_ASSERT "Use Kernel Assert for ROCm" OFF)
298293
# Ensure that an ITT build is the default for x86 CPUs

‎binaries/CMakeLists.txt‎

Lines changed: 0 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -8,33 +8,13 @@ if(INTERN_BUILD_MOBILE)
88
endif()
99

1010
if(BUILD_CAFFE2)
11-
caffe2_binary_target("convert_caffe_image_db.cc")
12-
caffe2_binary_target("convert_db.cc")
13-
caffe2_binary_target("make_cifar_db.cc")
14-
caffe2_binary_target("make_mnist_db.cc")
15-
caffe2_binary_target("predictor_verifier.cc")
16-
caffe2_binary_target("speed_benchmark.cc")
17-
caffe2_binary_target("split_db.cc")
18-
caffe2_binary_target("print_registered_core_operators.cc")
19-
20-
if(USE_OBSERVERS)
21-
caffe2_binary_target(caffe2_benchmark "caffe2_benchmark.cc" "benchmark_helper.cc")
22-
target_include_directories(caffe2_benchmark PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../modules)
23-
endif()
24-
2511
caffe2_binary_target("at_launch_benchmark.cc")
2612
target_include_directories(at_launch_benchmark PUBLIC
2713
${CMAKE_BINARY_DIR}/aten/src)
2814

2915
caffe2_binary_target("intra_inter_benchmark.cc")
3016
target_include_directories(intra_inter_benchmark PUBLIC
3117
${CMAKE_BINARY_DIR}/aten/src)
32-
33-
caffe2_binary_target("run_plan.cc")
34-
caffe2_binary_target("db_throughput.cc")
35-
36-
# ---[ tutorials
37-
caffe2_binary_target("tutorial_blob.cc")
3818
endif()
3919

4020
caffe2_binary_target("parallel_info.cc")
@@ -77,34 +57,11 @@ if(USE_ROCM)
7757
endif()
7858
endif()
7959

80-
if(USE_ZMQ)
81-
caffe2_binary_target("zmq_feeder.cc")
82-
target_link_libraries(zmq_feeder ${ZMQ_LIBRARIES})
83-
endif()
84-
8560
if(USE_MPI)
8661
caffe2_binary_target("run_plan_mpi.cc")
8762
target_link_libraries(run_plan_mpi ${MPI_CXX_LIBRARIES})
8863
endif()
8964

90-
if(USE_OPENCV AND USE_LEVELDB)
91-
caffe2_binary_target("convert_encoded_to_raw_leveldb.cc")
92-
target_link_libraries(
93-
convert_encoded_to_raw_leveldb
94-
${OpenCV_LIBS} ${LevelDB_LIBRARIES} ${Snappy_LIBRARIES})
95-
endif()
96-
97-
if(USE_OPENCV)
98-
caffe2_binary_target("make_image_db.cc")
99-
target_link_libraries(make_image_db ${OpenCV_LIBS})
100-
caffe2_binary_target("convert_image_to_tensor.cc")
101-
target_link_libraries(convert_image_to_tensor ${OpenCV_LIBS})
102-
endif()
103-
104-
if(USE_OBSERVERS AND USE_OPENCV)
105-
caffe2_binary_target("convert_and_benchmark.cc")
106-
target_link_libraries(convert_and_benchmark ${OpenCV_LIBS})
107-
endif()
10865

10966
caffe2_binary_target("dump_operator_names.cc")
11067
caffe2_binary_target("optimize_for_mobile.cc")

0 commit comments

Comments
 (0)