Merge remote-tracking branch 'upstream/master'

2020-07-01 12:04:10 +02:00
parent d60ddb6227 04602f3952
commit 9c6122a456
32 changed files with 834 additions and 328 deletions
@@ -10,6 +10,7 @@ if(DEBUG)
    add_definitions(-DDEBUG)
 endif()

+add_definitions(-DTKDNN_PATH="${CMAKE_CURRENT_SOURCE_DIR}")

 #-------------------------------------------------------------------------------
 # CUDA