Skip to content

[Cherry-pick] Remove the deprecated implement of NVIDIA CUDA GPU、Edgeboard FPGA and Intel FPGA. #9626

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
csy0225 merged 3 commits into from
Nov 3, 2022
Merged

[Cherry-pick] Remove the deprecated implement of NVIDIA CUDA GPU、Edgeboard FPGA and Intel FPGA. #9626

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
87cf383
Remove the deprecated implement of Intel FPGA. (#9595)
csy0225 Oct 28, 2022
73ed5b0
Remove the deprecated implement of EdgeBoard FPGA. (#9605)
csy0225 Oct 31, 2022
30a04f5
Remove the deprecated implement of NVIDIA CUDA GPU. (#9616)
csy0225 Nov 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
9 changes: 0 additions & 9 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ lite_option(WITH_SYSTEM_BLAS "Use system blas library"
lite_option(LITE_WITH_JAVA "Enable Java JNI lib in lite mode" OFF)
lite_option(LITE_WITH_STATIC_LIB "Enable static cplus lib in lite mode" OFF)
lite_option(LITE_WITH_PYTHON "Enable Python api lib in lite mode" OFF)
lite_option(LITE_WITH_CUDA "Enable CUDA in lite mode" OFF)
lite_option(LITE_WITH_X86 "Enable X86 in lite mode" ON)
lite_option(LITE_WITH_ARM "Enable ARM in lite mode" OFF)
lite_option(LITE_WITH_SW "Enable SW in lite mode" OFF)
Expand All @@ -62,13 +61,10 @@ lite_option(LITE_WITH_TRAIN "Enable training operators and ke
lite_option(LITE_WITH_OPENMP "Enable OpenMP in lite framework" ON)
lite_option(LITE_WITH_OPENCL "Enable OpenCL support in lite" OFF)
lite_option(LITE_WITH_METAL "Enable Metal support in lite" OFF)
lite_option(LITE_WITH_FPGA "Enable FPGA support in lite" OFF)
lite_option(LITE_WITH_INTEL_FPGA "Enable Intel FPGA support in lite" OFF)
lite_option(LITE_WITH_PROFILE "Enable profile mode in lite framework" OFF)
lite_option(LITE_WITH_PRECISION_PROFILE "Enable precision profile in profile mode ON in lite" OFF)
lite_option(LITE_WITH_LOG "Enable log printing or not." ON)
lite_option(LITE_WITH_EXCEPTION "Enable throwing the exception when error occurs in lite" OFF)
lite_option(LITE_WITH_NVTX "Enable nvtx or not, please enable LITE_WITH_CUDA first." OFF)
lite_option(LITE_ON_TINY_PUBLISH "Publish tiny predictor lib." OFF)
lite_option(LITE_ON_MODEL_OPTIMIZE_TOOL "Build the model optimize tool" OFF)
lite_option(LITE_WITH_BENCHMARK_TEST "Build benchmark test cases" OFF)
Expand All @@ -78,8 +74,6 @@ lite_option(LITE_BUILD_EXTRA "Enable extra algorithm support i
lite_option(LITE_BUILD_TAILOR "Enable tailoring library according to model" OFF)
# cv build options
lite_option(LITE_WITH_CV "Enable build cv image in lite" OFF)
lite_option(LITE_WITH_STATIC_CUDA "Statically link cuda libraries." OFF)
lite_option(CUDA_WITH_FP16 "Compile with cuda half support" OFF)
lite_option(LITE_WITH_ARM_CLANG "when arm lang is clang, its ON." OFF)
lite_option(LITE_WITH_XCODE "when debug in xcode, its ON." OFF)
lite_option(LITE_WITH_ARM82_FP16 "when compile with arm v8.2 fp16, it's ON." OFF)
Expand All @@ -92,9 +86,6 @@ lite_option(WITH_NODE_RAW_FS "(Only available when compiling b
set(THIRD_PARTY_PATH "${PADDLE_BINARY_DIR}/third_party" CACHE STRING
"A path setting third party libraries download & build directories.")

if(NOT LITE_WITH_ARM)
find_package(CUDA QUIET)
endif()
find_package(Git REQUIRED)
find_package(Threads REQUIRED)

Expand Down
9 changes: 0 additions & 9 deletions cmake/backends/common.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,10 @@ if(LITE_WITH_OPENCL)
include(backends/opencl)
endif()

if(LITE_WITH_INTEL_FPGA)
include(backends/intel_fpga)
endif()

if(LITE_WITH_XPU)
include(backends/xpu)
endif()

if(LITE_WITH_CUDA)
include(cuda)
endif()

include(backends/x86)

# Add dependencies
Expand All @@ -50,7 +42,6 @@ else()
include(external/protobuf) # download, build, install protobuf
include(external/openblas) # download, build, install openblas
include(external/eigen) # download eigen3
include(cudnn)
include(ccache) # set ccache for compilation
include(util) # set unittest and link libs
include(version) # set PADDLE_VERSION
Expand Down
47 changes: 0 additions & 47 deletions cmake/backends/intel_fpga.cmake
View file
Open in desktop

This file was deleted.

36 changes: 1 addition & 35 deletions cmake/configure.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,32 +64,7 @@ if(WIN32)

endif(WIN32)

if(LITE_WITH_CUDA)
add_definitions(-DLITE_WITH_CUDA)
add_definitions(-DEIGEN_USE_GPU)

FIND_PACKAGE(CUDA REQUIRED)

if(${CUDA_VERSION_MAJOR} VERSION_LESS 7)
message(FATAL_ERROR "Paddle needs CUDA >= 7.0 to compile")
endif()

if(NOT CUDNN_FOUND)
message(FATAL_ERROR "Paddle needs cudnn to compile")
endif()
if(CUPTI_FOUND)
include_directories(${CUPTI_INCLUDE_DIR})
add_definitions(-DPADDLE_WITH_CUPTI)
else()
message(STATUS "Cannot find CUPTI, GPU Profiling is incorrect.")
endif()
set(CUDA_NVCC_FLAGS ${CUDA_NVCC_FLAGS} "-Xcompiler ${SIMD_FLAG}")

# Include cuda and cudnn
include_directories(${CUDNN_INCLUDE_DIR})
include_directories(${CUDA_TOOLKIT_INCLUDE})

elseif(WITH_AMD_GPU)
if(WITH_AMD_GPU)
add_definitions(-DPADDLE_WITH_HIP)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__HIP_PLATFORM_HCC__")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D__HIP_PLATFORM_HCC__")
Expand Down Expand Up @@ -186,15 +161,6 @@ if (LITE_WITH_METAL)
add_definitions("-DLITE_WITH_METAL")
endif()


if (LITE_WITH_FPGA)
add_definitions("-DLITE_WITH_FPGA")
endif()

if (LITE_WITH_INTEL_FPGA)
add_definitions("-DLITE_WITH_INTEL_FPGA")
endif()

if (LITE_WITH_NNADAPTER)
add_definitions(-DLITE_WITH_NNADAPTER)
# The following macros are only for unit test
Expand Down
6 changes: 1 addition & 5 deletions cmake/coveralls.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,11 +76,7 @@ if(WITH_COVERAGE)
".test_env/"
)

if(WITH_GPU)
file(GLOB_RECURSE PADDLE_SOURCES RELATIVE "${PROJECT_SOURCE_DIR}" "*.cpp" "*.cc" ".c" "*.cu")
else()
file(GLOB_RECURSE PADDLE_SOURCES RELATIVE "${PROJECT_SOURCE_DIR}" "*.cpp" "*.cc" "*.c")
endif()
file(GLOB_RECURSE PADDLE_SOURCES RELATIVE "${PROJECT_SOURCE_DIR}" "*.cpp" "*.cc" "*.c")

# exclude trivial files in PADDLE_SOURCES
foreach(EXCLUDE_DIR ${EXCLUDE_DIRS})
Expand Down
Loading