Merge pull request HIT-SCIR#81 from ruoshui1126/personal

test output directory
XiaoboYuan · Nov 12, 2014 · bb6d225 · bb6d225
2 parents 12ce192 + a0732ef
commit bb6d225
Show file tree

Hide file tree

Showing 17 changed files with 101 additions and 84 deletions.
diff --git a/examples/Makefile b/examples/Makefile
@@ -0,0 +1,45 @@
+#################################################
+# Example for call LTP libraries under UNIX     #
+#################################################
+cc=g++
+ccflags=-O2
+all: cws \
+	pos \
+	par \
+	ner \
+	srl 
+
+cws: cws.cpp
+	${cc} ${ccflags} -o cws cws.cpp -I./ \
+		-I../include/ \
+		-I../thirdparty/boost/include \
+		-L../lib/ -lsegmentor -lboost_regex
+
+pos: pos.cpp
+	${cc} ${ccflags} -o pos pos.cpp -I./ \
+		-I../include/ \
+		-L../lib/ -lpostagger
+
+ner: ner.cpp
+	${cc} ${ccflags} -o ner ner.cpp -I./ \
+		-I../include \
+		-L../lib/ -lner
+
+par: par.cpp
+	${cc} ${ccflags} -o par par.cpp -I./ \
+		-I../include \
+		-L../lib -lparser
+
+srl: srl.cpp
+	${cc} ${ccflags} -o srl srl.cpp -I./ \
+		-I../include \
+		-L../lib -lsrl
+
+.PHONY: clean
+
+clean:
+	rm cws
+	rm pos
+	rm ner
+	rm par
+	rm srl
diff --git a/examples/cws b/examples/cws
diff --git a/test/cws.cpp → examples/cws.cpp b/test/cws.cpp → examples/cws.cpp
@@ -1,6 +1,6 @@
 #include <iostream>
 #include <string>
-#include "segment_dll.h"
+#include "ltp/segment_dll.h"
 
 int main(int argc, char * argv[]) {
   if (argc < 2) {

diff --git a/examples/ner b/examples/ner
diff --git a/test/ner.cpp → examples/ner.cpp b/test/ner.cpp → examples/ner.cpp
@@ -1,7 +1,7 @@
 #include <iostream>
 #include <vector>
 
-#include "ner_dll.h"
+#include "ltp/ner_dll.h"
 
 int main(int argc, char * argv[]) {
   if (argc < 2) {

diff --git a/examples/par b/examples/par
diff --git a/test/par.cpp → examples/par.cpp b/test/par.cpp → examples/par.cpp
@@ -1,7 +1,7 @@
 #include <iostream>
 #include <vector>
 
-#include "parser_dll.h"
+#include "ltp/parser_dll.h"
 
 int main(int argc, char * argv[]) {
   if (argc < 2) {

diff --git a/examples/pos b/examples/pos
diff --git a/test/pos.cpp → examples/pos.cpp b/test/pos.cpp → examples/pos.cpp
@@ -1,7 +1,7 @@
 #include <iostream>
 #include <vector>
 
-#include "postag_dll.h"
+#include "ltp/postag_dll.h"
 
 int main(int argc, char * argv[]) {
     if (argc < 2) {

diff --git a/examples/srl b/examples/srl
diff --git a/test/srl.cpp → examples/srl.cpp b/test/srl.cpp → examples/srl.cpp
@@ -1,7 +1,7 @@
 #include <iostream>
 #include <vector>
 
-#include "SRL_DLL.h"
+#include "ltp/SRL_DLL.h"
 
 int main(int argc, char * argv[]) {
   if (argc < 2) {

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -1,5 +1,6 @@
 include_directories (./
     ${SOURCE_DIR}/__util
+    ${SOURCE_DIR}/utils
     ${SOURCE_DIR}/__xml4nlp
     ${SOURCE_DIR}/_split_sentence
     ${SOURCE_DIR}/segmentor
@@ -21,21 +22,6 @@ set (multi_ltp_test_SRC     multi_ltp_test.cpp
 
 link_directories ( ${LIBRARY_OUTPUT_PATH} )
 
-add_executable (ltp_test ${ltp_test_SRC})
-add_executable (cws cws.cpp)
-add_executable (cws_cmdline cws_cmdline.cpp)
-add_executable (multi_cws_cmdline multi_cws_cmdline.cpp
-    ${THIRDPARTY_DIR}/tinythreadpp/tinythread.cpp)
-add_executable (pos pos.cpp)
-add_executable (pos_cmdline pos.cpp)
-add_executable (multi_pos_cmdline multi_pos_cmdline.cpp
-    ${THIRDPARTY_DIR}/tinythreadpp/tinythread.cpp)
-add_executable (ner ner.cpp)
-add_executable (par par.cpp)
-add_executable (srl srl.cpp)
-#add_executable (ltp_test_xml ${ltp_test_xml_SRC})
-#add_executable (ltp_test2    ${ltp_test2_SRC})
-
 set (ltp_test_LIBS 
 maxent_static_lib
 util_static_lib
@@ -48,27 +34,47 @@ ner_static_lib
 srl_static_lib
 xml4nlp
 boost_regex_static_lib)
+add_executable (ltp_test ${ltp_test_SRC})
+target_link_libraries (ltp_test ${ltp_test_LIBS})
 
-if (NOT WIN32) 
-set (ltp_test_LIBS ${ltp_test_LIBS} pthread)
-endif()
+add_executable (cws_cmdline cws_cmdline.cpp)
+target_link_libraries (cws_cmdline segmentor_static_lib 
+    boost_regex_static_lib)
+set_target_properties(cws_cmdline PROPERTIES
+    RUNTIME_OUTPUT_DIRECTORY ${EXECUTABLE_OUTPUT_PATH}/exmaples/)
 
-target_link_libraries (ltp_test ${ltp_test_LIBS})
-target_link_libraries (cws segmentor_static_lib boost_regex_static_lib)
-target_link_libraries (cws_cmdline segmentor_static_lib boost_regex_static_lib)
-target_link_libraries (multi_cws_cmdline segmentor_static_lib boost_regex_static_lib pthread)
-target_link_libraries (pos postagger_static_lib)
+add_executable (pos_cmdline pos_cmdline.cpp)
 target_link_libraries (pos_cmdline postagger_static_lib)
-target_link_libraries (multi_pos_cmdline postagger_static_lib pthread)
-target_link_libraries (ner ner_static_lib)
-target_link_libraries (par parser_static_lib)
-target_link_libraries (srl srl_static_lib)
+set_target_properties(pos_cmdline PROPERTIES
+    RUNTIME_OUTPUT_DIRECTORY ${EXECUTABLE_OUTPUT_PATH}/exmaples/)
+
+add_executable (par_cmdline par_cmdline.cpp)
+target_link_libraries (par_cmdline parser_static_lib)
+set_target_properties(par_cmdline PROPERTIES
+    RUNTIME_OUTPUT_DIRECTORY ${EXECUTABLE_OUTPUT_PATH}/exmaples/)
+#add_executable (ltp_test_xml ${ltp_test_xml_SRC})
+#add_executable (ltp_test2    ${ltp_test2_SRC})
+
 #
 # multithreaded ltp test is not supported in Windows
 # 
-if (NOT WIN32) 
+if (UNIX) 
 add_executable (multi_ltp_test ${multi_ltp_test_SRC})
 target_link_libraries (multi_ltp_test ${ltp_test_LIBS} pthread)
+
+add_executable (multi_cws_cmdline multi_cws_cmdline.cpp
+    ${THIRDPARTY_DIR}/tinythreadpp/tinythread.cpp)
+target_link_libraries (multi_cws_cmdline segmentor_static_lib
+    boost_regex_static_lib
+    pthread)
+set_target_properties(multi_cws_cmdline PROPERTIES
+    RUNTIME_OUTPUT_DIRECTORY ${EXECUTABLE_OUTPUT_PATH}/exmaples/)
+
+add_executable (multi_pos_cmdline multi_pos_cmdline.cpp
+    ${THIRDPARTY_DIR}/tinythreadpp/tinythread.cpp)
+target_link_libraries (multi_pos_cmdline postagger_static_lib pthread)
+set_target_properties(multi_pos_cmdline PROPERTIES
+    RUNTIME_OUTPUT_DIRECTORY ${EXECUTABLE_OUTPUT_PATH}/exmaples/)
 endif()
 
 #target_link_libraries (ltp_test2

diff --git a/test/cws_cmdline.cpp b/test/cws_cmdline.cpp
@@ -14,16 +14,9 @@
 #include <iostream>
 #include <ctime>
 #include <string>
-#include <sys/time.h>
-#include <sys/types.h>
+#include "time.hpp"
 #include "segment_dll.h"
 
-double get_time(void) {
-  struct timeval tv;
-  gettimeofday(&tv, NULL);
-  return tv.tv_sec + (tv.tv_usec / 1000000.0);
-}
-
 int main(int argc, char * argv[]) {
   if (argc < 2) {
     std::cerr << "cws [model path] [lexicon_file]" << std::endl;
@@ -44,7 +37,7 @@ int main(int argc, char * argv[]) {
   std::string sentence;
 
   std::cerr << "TRACE: Model is loaded" << std::endl;
-  double tm = get_time();
+  double tm = ltp::utility::get_time();
 
   while (std::getline(std::cin, sentence, '\n')) {
     words.clear();
@@ -59,7 +52,7 @@ int main(int argc, char * argv[]) {
 
   segmentor_release_segmentor(engine);
 
-  tm = get_time() - tm;
+  tm = ltp::utility::get_time() - tm;
   std::cerr << "TRACE: cws-tm-consume "
             << tm
             << " seconds."

diff --git a/test/multi_cws_cmdline.cpp b/test/multi_cws_cmdline.cpp
@@ -15,10 +15,10 @@
 #include <cstdlib>
 #include <cstring>
 #include <ctime>
+#include <string>
 #include <vector>
 #include <list>
-#include <sys/time.h>
-#include <sys/types.h>
+#include "time.hpp"
 #include <cstdlib>
 
 #include "tinythread.h"
@@ -30,12 +30,6 @@ using namespace tthread;
 
 const int MAX_LEN = 1024;
 
-double get_time(void) {
-  struct timeval tv;
-  gettimeofday(&tv, NULL);
-  return tv.tv_sec + (tv.tv_usec / 1000000.0);
-}
-
 class Dispatcher {
 public:
   Dispatcher( void * model ) {
@@ -124,7 +118,7 @@ int main(int argc, char ** argv) {
 
   Dispatcher* dispatcher = new Dispatcher( engine );
 
-  double tm = get_time();
+  double tm = ltp::utility::get_time();
   list<thread *> thread_list;
   for (int i = 0; i < num_threads; ++ i) {
     thread* t = new thread( multithreaded_segment, (void *)dispatcher );
@@ -138,7 +132,7 @@ int main(int argc, char ** argv) {
     delete t;
   }
 
-  tm = get_time() - tm;
+  tm = ltp::utility::get_time() - tm;
   std::cerr << "TRACE: consume "
             << tm 
             << " seconds."

diff --git a/test/multi_pos_cmdline.cpp b/test/multi_pos_cmdline.cpp
@@ -17,8 +17,7 @@
 #include <ctime>
 #include <vector>
 #include <list>
-#include <sys/time.h>
-#include <sys/types.h>
+#include "time.hpp"
 
 #include "tinythread.h"
 #include "fast_mutex.h"
@@ -29,12 +28,6 @@ using namespace tthread;
 
 const int MAX_LEN = 1024;
 
-double get_time(void) {
-    struct timeval tv;
-    gettimeofday(&tv, NULL);
-    return tv.tv_sec + (tv.tv_usec / 1000000.0);
-}
-
 class Dispatcher {
 public:
     Dispatcher( void * model ) {
@@ -121,7 +114,7 @@ int main(int argc, char ** argv) {
 
     Dispatcher * dispatcher = new Dispatcher( engine );
 
-    double tm = get_time();
+    double tm = ltp::utility::get_time();
     list<thread *> thread_list;
     for (int i = 0; i < num_threads; ++ i) {
         thread * t = new thread( multithreaded_postag, (void *)dispatcher );
@@ -135,7 +128,7 @@ int main(int argc, char ** argv) {
         delete t;
     }
 
-    tm = get_time() - tm;
+    tm = ltp::utility::get_time() - tm;
     std::cerr << "TRACE: consume "
         << tm 
         << " seconds."

diff --git a/test/par_cmdline.cpp b/test/par_cmdline.cpp
@@ -4,15 +4,8 @@
 #include <ctime>
 #include <cstring>
 #include <string>
-#include <sys/time.h>
-#include <sys/types.h>
-#include "ltp/parser_dll.h"
-
-double get_time(void) {
-  struct timeval tv;
-  gettimeofday(&tv, NULL);
-  return tv.tv_sec + (tv.tv_usec / 1000000.0);
-}
+#include "time.hpp"
+#include "parser_dll.h"
 
 int main(int argc, char * argv[]) {
   if (argc < 2) {
@@ -32,7 +25,7 @@ int main(int argc, char * argv[]) {
   std::vector<std::string> deprels;
 
   std::cerr << "TRACE: Model is loaded" << std::endl;
-  double tm = get_time();
+  double tm = ltp::utility::get_time();
 
   while (std::getline(std::cin, line, '\n')) {
     if (line.size() == 0) { continue; }
@@ -58,7 +51,7 @@ int main(int argc, char * argv[]) {
 
   parser_release_parser(engine);
 
-  tm = get_time() - tm;
+  tm = ltp::utility::get_time() - tm;
   std::cerr << "TRACE: par-tm-consume "
             << tm
             << " seconds."

diff --git a/test/pos_cmdline.cpp b/test/pos_cmdline.cpp
@@ -16,16 +16,9 @@
 #include <ctime>
 #include <cstring>
 #include <string>
-#include <sys/time.h>
-#include <sys/types.h>
+#include "time.hpp"
 #include "postag_dll.h"
 
-double get_time(void) {
-  struct timeval tv;
-  gettimeofday(&tv, NULL);
-  return tv.tv_sec + (tv.tv_usec / 1000000.0);
-}
-
 int main(int argc, char * argv[]) {
   if (argc < 2 || (0 == strcmp(argv[1], "-h"))) {
     std::cerr << "Example: ./pos_cmdline [model path]" << std::endl;
@@ -48,7 +41,7 @@ int main(int argc, char * argv[]) {
   std::vector<std::string> postags;
 
   std::cerr << "TRACE: Model is loaded" << std::endl;
-  double tm = get_time();
+  double tm = ltp::utility::get_time();
 
   while (std::getline(std::cin, line, '\n')) {
     std::stringstream S(line);
@@ -71,7 +64,7 @@ int main(int argc, char * argv[]) {
 
   postagger_release_postagger(engine);
 
-  tm = get_time() - tm;
+  tm = ltp::utility::get_time() - tm;
   std::cerr << "TRACE: pos-tm-consume "
     << tm 
     << " seconds."