From ab1300291e740c0850521b91fef6a09a8f43276c Mon Sep 17 00:00:00 2001 From: Hieu Hoang Date: Wed, 14 Sep 2016 18:40:39 +0200 Subject: [PATCH 1/6] compile error --- src/CMakeLists.txt | 15 ++++++++------- src/npz_converter.cpp | 2 +- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 2aa3fdc9..11b36053 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -2,34 +2,35 @@ include_directories(.) add_library(libcommon OBJECT - exception.cpp cnpy/cnpy.cpp + exception.cpp + #npz_converter.cpp ) cuda_add_executable( marian - test.cu expressions.cu - tensor_operators.cu + test.cu tensor.cu + tensor_operators.cu $ ) cuda_add_executable( train_mnist - train_mnist.cu expressions.cu - tensor_operators.cu + train_mnist.cu tensor.cu + tensor_operators.cu $ ) cuda_add_executable( validate_mnist - validate_mnist.cu expressions.cu - tensor_operators.cu + validate_mnist.cu tensor.cu + tensor_operators.cu $ ) diff --git a/src/npz_converter.cpp b/src/npz_converter.cpp index 1ecbc11c..771ff11c 100644 --- a/src/npz_converter.cpp +++ b/src/npz_converter.cpp @@ -1,4 +1,4 @@ -#include "common/npz_converter.h" +#include "npz_converter.h" From e7ea44c689d39075d50d64c912b910ad4f81c756 Mon Sep 17 00:00:00 2001 From: Hieu Hoang Date: Wed, 14 Sep 2016 19:06:50 +0200 Subject: [PATCH 2/6] compile error --- src/CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 11b36053..9d6e8bf4 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -4,7 +4,6 @@ include_directories(.) add_library(libcommon OBJECT cnpy/cnpy.cpp exception.cpp - #npz_converter.cpp ) cuda_add_executable( From 41bab63f70df6e0708fb29c75a1762995a9d4291 Mon Sep 17 00:00:00 2001 From: Hieu Hoang Date: Wed, 14 Sep 2016 19:56:08 +0200 Subject: [PATCH 3/6] cmake. Compiles -j without errors --- src/CMakeLists.txt | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 9d6e8bf4..306b15c3 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -6,33 +6,39 @@ add_library(libcommon OBJECT 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 - expressions.cu - test.cu - tensor.cu tensor_operators.cu $ ) +target_link_libraries(marian common_cuda) + cuda_add_executable( train_mnist - expressions.cu train_mnist.cu - tensor.cu - tensor_operators.cu $ ) +target_link_libraries(train_mnist common_cuda) + cuda_add_executable( validate_mnist - expressions.cu validate_mnist.cu - tensor.cu - tensor_operators.cu $ ) +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}) From ab8bef8a03d075493dd7b72f5d250fed38ca2edc Mon Sep 17 00:00:00 2001 From: Hieu Hoang Date: Wed, 14 Sep 2016 22:37:27 +0200 Subject: [PATCH 4/6] create marian lib --- src/CMakeLists.txt | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 306b15c3..d837834d 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,43 +1,37 @@ include_directories(.) -add_library(libcommon OBJECT +cuda_add_library(marian_lib cnpy/cnpy.cpp exception.cpp -) - -cuda_add_library(common_cuda expressions.cu test.cu tensor.cu tensor_operators.cu ) -target_link_libraries(common_cuda) +target_link_libraries(marian_lib) cuda_add_executable( marian tensor_operators.cu - $ ) -target_link_libraries(marian common_cuda) +target_link_libraries(marian marian_lib) cuda_add_executable( train_mnist train_mnist.cu - $ ) -target_link_libraries(train_mnist common_cuda) +target_link_libraries(train_mnist marian_lib) cuda_add_executable( validate_mnist validate_mnist.cu - $ ) -target_link_libraries(validate_mnist common_cuda) +target_link_libraries(validate_mnist marian_lib) foreach(exec marian train_mnist validate_mnist) target_link_libraries(${exec} ${EXT_LIBS} cuda cudnn) From 9d4bc1d1fdc9066ec21a75426be4b1cb9befc0e8 Mon Sep 17 00:00:00 2001 From: Hieu Hoang Date: Wed, 14 Sep 2016 22:42:51 +0200 Subject: [PATCH 5/6] create marian lib --- src/CMakeLists.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index d837834d..365df389 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -5,7 +5,6 @@ cuda_add_library(marian_lib cnpy/cnpy.cpp exception.cpp expressions.cu - test.cu tensor.cu tensor_operators.cu ) @@ -14,7 +13,7 @@ target_link_libraries(marian_lib) cuda_add_executable( marian - tensor_operators.cu + test.cu ) target_link_libraries(marian marian_lib) From 5b9e6c05c5357f1ffd67e39acab81c453bf1a3f0 Mon Sep 17 00:00:00 2001 From: Hieu Hoang Date: Wed, 14 Sep 2016 23:00:02 +0200 Subject: [PATCH 6/6] eclipse --- marian/.cproject | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/marian/.cproject b/marian/.cproject index 195ef668..2d8c666b 100644 --- a/marian/.cproject +++ b/marian/.cproject @@ -56,11 +56,11 @@ - - + + - +