decoder -> common

amunmt/.project

@@ -80,6 +80,21 @@
 			<type>1</type>
 			<locationURI>PARENT-1-PROJECT_LOC/src/common/base_matrix.h</locationURI>
 		</link>
+		<link>
+			<name>common/config.cpp</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/src/common/config.cpp</locationURI>
+		</link>
+		<link>
+			<name>common/config.h</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/src/common/config.h</locationURI>
+		</link>
+		<link>
+			<name>common/decoder_main.cpp</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/src/common/decoder_main.cpp</locationURI>
+		</link>
 		<link>
 			<name>common/exception.cpp</name>
 			<type>1</type>
@@ -95,6 +110,31 @@
 			<type>1</type>
 			<locationURI>PARENT-1-PROJECT_LOC/src/common/file_stream.h</locationURI>
 		</link>
+		<link>
+			<name>common/god.cpp</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/src/common/god.cpp</locationURI>
+		</link>
+		<link>
+			<name>common/god.h</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/src/common/god.h</locationURI>
+		</link>
+		<link>
+			<name>common/history.cpp</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/src/common/history.cpp</locationURI>
+		</link>
+		<link>
+			<name>common/history.h</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/src/common/history.h</locationURI>
+		</link>
+		<link>
+			<name>common/hypothesis.h</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/src/common/hypothesis.h</locationURI>
+		</link>
 		<link>
 			<name>common/logging.cpp</name>
 			<type>1</type>
@@ -105,6 +145,36 @@
 			<type>1</type>
 			<locationURI>PARENT-1-PROJECT_LOC/src/common/logging.h</locationURI>
 		</link>
+		<link>
+			<name>common/scorer.cpp</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/src/common/scorer.cpp</locationURI>
+		</link>
+		<link>
+			<name>common/scorer.h</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/src/common/scorer.h</locationURI>
+		</link>
+		<link>
+			<name>common/search.cpp</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/src/common/search.cpp</locationURI>
+		</link>
+		<link>
+			<name>common/search.h</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/src/common/search.h</locationURI>
+		</link>
+		<link>
+			<name>common/sentence.cpp</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/src/common/sentence.cpp</locationURI>
+		</link>
+		<link>
+			<name>common/sentence.h</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/src/common/sentence.h</locationURI>
+		</link>
 		<link>
 			<name>common/threadpool.h</name>
 			<type>1</type>

src/CMakeLists.txt

@@ -22,22 +22,22 @@ add_library(libcommon OBJECT
 #)
 
 add_library(libamun OBJECT
-  decoder/config.cpp
+  common/config.cpp
 #  decoder/kenlm.cpp
 )
 
 cuda_add_executable(
   amun
   decoder/ape_penalty.cu
-  decoder/decoder_main.cpp
+  common/decoder_main.cpp
   decoder/encoder_decoder.cu
-  decoder/god.cpp
-  decoder/history.cpp
+  common/god.cpp
+  common/history.cpp
   #decoder/language_model.cu
   decoder/loader_factory.cu
-  decoder/scorer.cpp
-  decoder/search.cpp
-  decoder/sentence.cpp
+  common/scorer.cpp
+  common/search.cpp
+  common/sentence.cpp
   mblas/matrix.cu
   dl4mt/gru.cu
   $<TARGET_OBJECTS:libamun>

src/mblas/matrix.h

@@ -21,7 +21,7 @@
   
 
 #include "thrust_functions.h"
-#include "decoder/god.h"
+#include "common/god.h"
 #include "gpu/types-gpu.h"
 
 namespace lib = thrust;