Skip to content
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

Jump to bottom

Fix cudart bugs before initMain #1115

Merged
merged 2 commits into from
Jan 11, 2017
Merged

Fix cudart bugs before initMain #1115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
80c1679
Fix cudart bugs before initMain
gangliao Jan 10, 2017
eda4254
Remove hl_cudart_wrap.cc in CMake
gangliao Jan 11, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions cmake/util.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ function(link_paddle_exe TARGET_NAME)
endif()

if(WITH_GPU)
target_link_libraries(${TARGET_NAME} ${CUDA_CUDART_LIBRARY})
if(NOT WITH_DSO OR WITH_METRIC)
target_link_libraries(${TARGET_NAME}
${CUDNN_LIBRARY}
Expand Down
2 changes: 1 addition & 1 deletion paddle/api/paddle_api_config.py.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ GFLAGS_LIBRARIES="@GFLAGS_LIBRARIES@"
GFLAGS_LOCATION="@GFLAGS_LOCATION@"
CBLAS_LIBRARIES="@CBLAS_LIBRARIES@"

CUDA_LIBRARIES="@CUDA_cudart_shared_LIBRARY@"
CUDA_LIBRARIES="@CUDA_CUDART_LIBRARY@"
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

当时 我应该不小心改成了CUDA_cudart_shared_LIBRARY，而其实应该是没有这个环境变量的

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

不过另外一个PR也解决了CUDA和SWIG的问题 #1099

WITH_COVERALLS="@ON_COVERALLS@"
1 change: 0 additions & 1 deletion paddle/cuda/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ else()
endif()

set(CUDA_CXX_WITH_GPU_SOURCES
src/hl_cudart_wrap.cc
src/hl_cuda_cublas.cc
src/hl_cuda_cudnn.cc
src/hl_cuda_device.cc)
Expand Down
8 changes: 0 additions & 8 deletions paddle/cuda/include/hl_dso_loader.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,6 @@ void GetCublasDsoHandle(void** dso_handle);
*/
void GetCudnnDsoHandle(void** dso_handle);

/**
* @brief load the DSO of CUDA Run Time
*
* @param **dso_handle dso handler
*
*/
void GetCudartDsoHandle(void** dso_handle);

/**
* @brief load the DSO of CURAND
*
Expand Down
Loading