Merge ../Marian.hieu

This commit is contained in:
Hieu Hoang 2016-09-14 19:58:14 +02:00
commit 84239de05f
2 changed files with 17 additions and 11 deletions

View File

@ -2,37 +2,43 @@
include_directories(.)
add_library(libcommon OBJECT
exception.cpp
cnpy/cnpy.cpp
exception.cpp
)
cuda_add_library(common_cuda
expressions.cu
test.cu
tensor.cu
tensor_operators.cu
)
target_link_libraries(common_cuda)
cuda_add_executable(
marian
test.cu
expressions.cu
tensor_operators.cu
tensor.cu
$<TARGET_OBJECTS:libcommon>
)
target_link_libraries(marian common_cuda)
cuda_add_executable(
train_mnist
train_mnist.cu
expressions.cu
tensor_operators.cu
tensor.cu
$<TARGET_OBJECTS:libcommon>
)
target_link_libraries(train_mnist common_cuda)
cuda_add_executable(
validate_mnist
validate_mnist.cu
expressions.cu
tensor_operators.cu
tensor.cu
$<TARGET_OBJECTS:libcommon>
)
target_link_libraries(validate_mnist common_cuda)
foreach(exec marian train_mnist validate_mnist)
target_link_libraries(${exec} ${EXT_LIBS} cuda cudnn)
cuda_add_cublas_to_target(${exec})

View File

@ -1,4 +1,4 @@
#include "common/npz_converter.h"
#include "npz_converter.h"