Skip to content

Commit

Permalink
Merge pull request PaddlePaddle#868 from emailweixu/fix_enable_virtua…
Browse files Browse the repository at this point in the history
…lenv

Fix enable_virtualenv
  • Loading branch information
reyoung authored Dec 14, 2016
2 parents bf47397 + aff8a0f commit 48128e5
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions cmake/util.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ function(link_paddle_exe TARGET_NAME)
${RDMA_LD_FLAGS}
${RDMA_LIBS})
endif()

if(WITH_PYTHON)
target_link_libraries(${TARGET_NAME}
${PYTHON_LIBRARIES})
Expand All @@ -136,10 +136,10 @@ function(link_paddle_exe TARGET_NAME)
endif()

if(WITH_GPU)
if(NOT WITH_DSO OR WITH_METRIC)
if(NOT WITH_DSO OR WITH_METRIC)
target_link_libraries(${TARGET_NAME}
${CUDNN_LIBRARY}
${CUDA_curand_LIBRARY})
${CUDA_curand_LIBRARY})
CUDA_ADD_CUBLAS_TO_TARGET(${TARGET_NAME})
endif()

Expand Down Expand Up @@ -206,5 +206,5 @@ function(create_resources res_file output)
# Convert hex data for C compatibility
string(REGEX REPLACE "([0-9a-f][0-9a-f])" "0x\\1," filedata ${filedata})
# Append data to output file
file(APPEND ${output} "const unsigned char ${filename}[] = {${filedata}};\nconst unsigned ${filename}_size = sizeof(${filename});\n")
file(APPEND ${output} "const unsigned char ${filename}[] = {${filedata}0};\nconst unsigned ${filename}_size = sizeof(${filename});\n")
endfunction()

0 comments on commit 48128e5

Please sign in to comment.