Skip to content
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Prev Previous commit
Fixed linking to TBB library.
  • Loading branch information
Simon Pfreundschuh committed Sep 1, 2016
commit 48d0417809d206d6c09eff7f3382092164fbcf71
2 changes: 1 addition & 1 deletion tmva/tmva/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ ENDIF(CUDA_FOUND)
FIND_PACKAGE(BLAS)
IF (BLAS_FOUND AND imt)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DDNNCPU")
SET(DNN_CPU_LIBRARIES MathCore Matrix ${BLAS_LIBRARIES} tbb
SET(DNN_CPU_LIBRARIES MathCore Matrix ${TBB_LIBRARIES} ${BLAS_LIBRARIES}
${CMAKE_THREAD_LIBS_INIT})
ELSE (BLAS_FOUND AND imt)
SET(DNN_CPU_LIBRARIES)
Expand Down
16 changes: 9 additions & 7 deletions tmva/tmva/test/DNN/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -54,39 +54,41 @@ endif (CUDA_FOUND)
find_package(BLAS)
if (BLAS_FOUND AND imt)

SET(DNN_CPU_LIBRARIES ${TBB_LIBRARIES} ${BLAS_LIBRARIES})

# DNN - Arithmetic Functions CPU
ROOT_EXECUTABLE(testArithmeticCpu TestMatrixArithmeticCpu.cxx
LIBRARIES ${Libraries})
LIBRARIES ${Libraries} ${DNN_CPU_LIBRARIES})
ROOT_ADD_TEST(TMVA-DNN-Arithmetic-Cpu COMMAND testArithmeticCpu)

# DNN - Activation Functions CPU
ROOT_EXECUTABLE(testActivationFunctionsCpu TestActivationFunctionsCpu.cxx
LIBRARIES ${Libraries})
LIBRARIES ${Libraries} ${DNN_CPU_LIBRARIES})
ROOT_ADD_TEST(TMVA-DNN-Activation-Functions-Cpu COMMAND testActivationFunctionsCpu)

# DNN - Loss Functions CPU
ROOT_EXECUTABLE(testLossFunctionsCpu TestLossFunctionsCpu.cxx
LIBRARIES ${Libraries})
LIBRARIES ${Libraries} ${DNN_CPU_LIBRARIES})
ROOT_ADD_TEST(TMVA-DNN-Loss-Functions-Cpu COMMAND testLossFunctionsCpu)

# DNN - Derivatives CPU
ROOT_EXECUTABLE(testDerivativesCpu TestDerivativesCpu.cxx
LIBRARIES ${Libraries})
LIBRARIES ${Libraries} ${DNN_CPU_LIBRARIES})
ROOT_ADD_TEST(TMVA-DNN-Derivatives-Cpu COMMAND testDerivativesCpu)

# DNN - Backpropagation CPU
ROOT_EXECUTABLE(testBackpropagationCpu TestBackpropagationCpu.cxx
LIBRARIES ${Libraries})
LIBRARIES ${Libraries} ${DNN_CPU_LIBRARIES})
ROOT_ADD_TEST(TMVA-DNN-Backpropagation-Cpu COMMAND testBackpropagationCpu)

# DNN - DataLoader CPU
ROOT_EXECUTABLE(testDataLoaderCpu TestDataLoaderCpu.cxx
LIBRARIES ${Libraries})
LIBRARIES ${Libraries} ${DNN_CPU_LIBRARIES})
ROOT_ADD_TEST(TMVA-DNN-Data-Loader-Cpu COMMAND testDataLoaderCpu)

# DNN - Minimization CPU
ROOT_EXECUTABLE(testMinimizationCpu TestMinimizationCpu.cxx
LIBRARIES ${Libraries} ${BLAS_openblas_LIBRARY} tbb)
LIBRARIES ${Libraries} ${DNN_CPU_LIBRARIES})
ROOT_ADD_TEST(TMVA-DNN-Minimization-Cpu COMMAND testMinimizationCpu)

endif (BLAS_FOUND AND imt)