Merge branch 'ltp-neo-parser'

- Fix HIT-SCIR#69, postag lexicon is support via --postagger-lexicon option
- Fix HIT-SCIR#101, by adding --threads option to ltp_server and ltp_test
- Fix HIT-SCIR#102, by adding --evaluate option to training suite
- For HIT-SCIR#103, current version drop all the multi-root dependency trees
- For HIT-SCIR#107, current version convert on input but not on embedding/cluster

.gitignore

@@ -21,16 +21,16 @@ config.h
 ###############
 # output      #
 ###############
-include/
+#include/
 lib/
 bin/
 tools/train/lgdpj
 tools/train/lgsrl
 tools/train/otcws
-tools/train/otcws-customized
 tools/train/otpos
 tools/train/otner
 tools/train/maxent
+tools/train/nndepparser
 
 ###############
 # data file   #

.travis.yml

@@ -7,6 +7,8 @@ compiler:
 before_install:
     - sudo apt-get install gfortran
     - sudo apt-get install cmake
+    - sudo apt-get install libopenblas-dev
+    - sudo ln -s /usr/lib/openblas-base/libopenblas.so /usr/lib/
 
 script:
     - ./configure

CMakeLists.txt

@@ -38,9 +38,3 @@ add_subdirectory (src)
 
 # testing section
 # -- generate configure file for ltp_test
-
-# enable test
-enable_testing()
-
-# compile testing
-add_subdirectory (test)

src/CMakeLists.txt

@@ -1,29 +1,30 @@
-set (util_DIR            ${SOURCE_DIR}/__util/)
-set (utils_DIR           ${SOURCE_DIR}/utils)
-set (xml4nlp_DIR         ${SOURCE_DIR}/__xml4nlp/)
-set (segmentor_DIR       ${SOURCE_DIR}/segmentor)
-set (postagger_DIR       ${SOURCE_DIR}/postagger)
-set (parser_DIR          ${SOURCE_DIR}/parser)
-set (splitsnt_DIR        ${SOURCE_DIR}/splitsnt)
-set (ner_DIR             ${SOURCE_DIR}/ner/)
-set (srl_DIR             ${SOURCE_DIR}/srl/)
-set (ltp_dll_DIR         ${SOURCE_DIR}/__ltp_dll/)
-set (server_DIR          ${SOURCE_DIR}/server/)
+set (utils_DIR          ${SOURCE_DIR}/utils)
+set (xml4nlp_DIR        ${SOURCE_DIR}/xml4nlp/)
+set (segmentor_DIR      ${SOURCE_DIR}/segmentor)
+set (postagger_DIR      ${SOURCE_DIR}/postagger)
+set (parser_DIR         ${SOURCE_DIR}/parser)
+set (parser_n_DIR       ${SOURCE_DIR}/parser_n)
+set (splitsnt_DIR       ${SOURCE_DIR}/splitsnt)
+set (ner_DIR            ${SOURCE_DIR}/ner/)
+set (srl_DIR            ${SOURCE_DIR}/srl/)
+set (ltp_DIR            ${SOURCE_DIR}/ltp/)
+set (server_DIR         ${SOURCE_DIR}/server/)
 
-add_subdirectory ("__util")
-add_subdirectory ("__xml4nlp")
+add_subdirectory ("xml4nlp")
 add_subdirectory ("splitsnt")
 add_subdirectory ("segmentor")
 add_subdirectory ("postagger")
 add_subdirectory ("ner")
-add_subdirectory ("parser")
+#add_subdirectory ("parser")
+add_subdirectory ("parser.n")
 add_subdirectory ("srl")
-add_subdirectory ("__ltp_dll")
+add_subdirectory ("ltp")
+add_subdirectory ("console")
 
 # mongoose server is not supported in windows
 if (UNIX)
-add_subdirectory ("unittest")
-add_subdirectory ("server")
+    add_subdirectory ("unittest")
+    add_subdirectory ("server")
 endif()