Skip to content

Commit 6597ccb

Browse files
authored
Merge pull request #15413 from luotao1/legacy_code
remove legacy code
2 parents 9f8f0fc + c102f42 commit 6597ccb

File tree

1,093 files changed

+9
-197066
lines changed

Some content is hidden

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

1,093 files changed

+9
-197066
lines changed

.travis.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ cache:
44
- $HOME/.ccache
55
- $HOME/.cache/pip
66
- $TRAVIS_BUILD_DIR/build/third_party
7-
- $TRAVIS_BUILD_DIR/build_android/third_party
87
sudo: required
98
dist: trusty
109
services:
@@ -13,7 +12,6 @@ os:
1312
- linux
1413
env:
1514
- JOB=check_style
16-
- JOB=build_android
1715
addons:
1816
ssh_known_hosts: 13.229.163.131
1917
before_install:

CMakeLists.txt

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -279,9 +279,6 @@ include(inference_lib) # add paddle fluid inference libraries
279279

280280

281281
include_directories("${PADDLE_SOURCE_DIR}")
282-
include_directories("${PADDLE_SOURCE_DIR}/paddle/legacy/cuda/include")
283-
include_directories("${CMAKE_CURRENT_BINARY_DIR}/proto")
284-
include_directories("${CMAKE_CURRENT_BINARY_DIR}/go/pserver/client/c")
285282

286283
set(EXTERNAL_LIBS
287284
gflags
@@ -320,21 +317,6 @@ if(USE_NNPACK)
320317
list(APPEND EXTERNAL_LIBS ${NNPACK_LIBS})
321318
endif(USE_NNPACK)
322319

323-
add_subdirectory(proto)
324-
325-
if(NOT MOBILE_INFERENCE AND NOT WITH_FLUID_ONLY)
326-
# "add_subdirectory(go)" should be placed after the following loine,
327-
# because it depends on paddle/optimizer.
328-
add_subdirectory(paddle/legacy/optimizer)
329-
endif()
330-
331-
# "add_subdirectory(paddle)" and "add_subdirectory(python)" should be
332-
# placed after this block, because they depends on it.
333-
if(WITH_GOLANG)
334-
enable_language(Go)
335-
add_subdirectory(go)
336-
endif(WITH_GOLANG)
337-
338320
set(PADDLE_PYTHON_BUILD_DIR "${CMAKE_CURRENT_BINARY_DIR}/python/build")
339321

340322
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 -g -DNDEBUG")

go/.gitignore

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

go/CMakeLists.txt

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

go/cmd/master/CMakeLists.txt

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

go/cmd/master/master.go

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

go/cmd/pserver/.gitignore

Lines changed: 0 additions & 1 deletion
This file was deleted.

go/cmd/pserver/CMakeLists.txt

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

go/cmd/pserver/pserver.go

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

0 commit comments

Comments
 (0)