提交 fce24315 编写于 作者: Z zhouwei25 提交者: Kaipeng Deng

fix cub/threadpool include_dir to match setup.py.in,test=develop (#21436)

上级 e0c9d856
...@@ -23,7 +23,8 @@ cache_third_party(extern_cub ...@@ -23,7 +23,8 @@ cache_third_party(extern_cub
TAG ${CUB_TAG} TAG ${CUB_TAG}
DIR ${CUB_PREFIX_DIR}) DIR ${CUB_PREFIX_DIR})
include_directories(${CUB_SOURCE_DIR}) SET(CUB_INCLUDE_DIR ${CUB_SOURCE_DIR})
include_directories(${CUB_INCLUDE_DIR})
ExternalProject_Add( ExternalProject_Add(
extern_cub extern_cub
......
...@@ -43,7 +43,7 @@ if(WITH_AMD_GPU) ...@@ -43,7 +43,7 @@ if(WITH_AMD_GPU)
extern_eigen3 extern_eigen3
${EXTERNAL_PROJECT_LOG_ARGS} ${EXTERNAL_PROJECT_LOG_ARGS}
${SHALLOW_CLONE} ${SHALLOW_CLONE}
"${DOWNLOAD_CMD}" "${EIGEN_DOWNLOAD_CMD}"
PREFIX ${EIGEN_PREFIX_DIR} PREFIX ${EIGEN_PREFIX_DIR}
SOURCE_DIR ${EIGEN_SOURCE_DIR} SOURCE_DIR ${EIGEN_SOURCE_DIR}
UPDATE_COMMAND "" UPDATE_COMMAND ""
......
...@@ -64,7 +64,6 @@ ExternalProject_Add( ...@@ -64,7 +64,6 @@ ExternalProject_Add(
${CMAKE_COMMAND} -E copy_directory ${MKLML_SOURCE_DIR}/lib ${MKLML_LIB_DIR} ${CMAKE_COMMAND} -E copy_directory ${MKLML_SOURCE_DIR}/lib ${MKLML_LIB_DIR}
) )
INCLUDE_DIRECTORIES(${MKLML_INC_DIR}) INCLUDE_DIRECTORIES(${MKLML_INC_DIR})
ADD_LIBRARY(mklml SHARED IMPORTED GLOBAL) ADD_LIBRARY(mklml SHARED IMPORTED GLOBAL)
......
...@@ -15,17 +15,16 @@ ...@@ -15,17 +15,16 @@
INCLUDE(ExternalProject) INCLUDE(ExternalProject)
SET(THREADPOOL_PREFIX_DIR ${THIRD_PARTY_PATH}/threadpool) SET(THREADPOOL_PREFIX_DIR ${THIRD_PARTY_PATH}/threadpool)
set(THREADPOOL_REPOSITORY https://github.com/progschj/ThreadPool.git) SET(THREADPOOL_REPOSITORY https://github.com/progschj/ThreadPool.git)
set(THREADPOOL_TAG 9a42ec1329f259a5f4881a291db1dcb8f2ad9040) SET(THREADPOOL_TAG 9a42ec1329f259a5f4881a291db1dcb8f2ad9040)
INCLUDE_DIRECTORIES(${THREADPOOL_INCLUDE_DIR})
cache_third_party(extern_threadpool cache_third_party(extern_threadpool
REPOSITORY ${THREADPOOL_REPOSITORY} REPOSITORY ${THREADPOOL_REPOSITORY}
TAG ${THREADPOOL_TAG} TAG ${THREADPOOL_TAG}
DIR ${THREADPOOL_PREFIX_DIR}) DIR ${THREADPOOL_PREFIX_DIR})
include_directories(${THREADPOOL_SOURCE_DIR}) SET(THREADPOOL_INCLUDE_DIR ${THREADPOOL_SOURCE_DIR})
INCLUDE_DIRECTORIES(${THREADPOOL_INCLUDE_DIR})
ExternalProject_Add( ExternalProject_Add(
extern_threadpool extern_threadpool
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册