2nd commit

NeurboParser/CMakeLists.txt

@@ -2,50 +2,30 @@ project(neurboparser)
 cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
 
 set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
-set(CMAKE_CXX_FLAGS "-Wall -std=c++11 -O3 -g")
-
+set(CMAKE_CXX_FLAGS "-Wall -std=c++11 -Ofast -march=native -g")
 enable_testing()
 
-#include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/util 
-					${CMAKE_CURRENT_SOURCE_DIR}/src/sequence
-					${CMAKE_CURRENT_SOURCE_DIR}/src/classifier
-					${CMAKE_CURRENT_SOURCE_DIR}/src/dependency_labeler
-					${CMAKE_CURRENT_SOURCE_DIR}/src/parser
-					${CMAKE_CURRENT_SOURCE_DIR}/../dynet 
-					${CMAKE_CURRENT_SOURCE_DIR}/../deps/local/include
-                    ${CMAKE_CURRENT_SOURCE_DIR}/../deps/local/include/eigen3)
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/util
+        ${CMAKE_CURRENT_SOURCE_DIR}/src/sequence
+        ${CMAKE_CURRENT_SOURCE_DIR}/src/classifier
+        ${CMAKE_CURRENT_SOURCE_DIR}/src/dependency_labeler
+        ${CMAKE_CURRENT_SOURCE_DIR}/src/parser
+        ${CMAKE_CURRENT_SOURCE_DIR}/../dynet
+        ${CMAKE_CURRENT_SOURCE_DIR}/../deps/local/include
+        ${CMAKE_CURRENT_SOURCE_DIR}/../deps/local/include/eigen3)
 link_directories(${CMAKE_CURRENT_SOURCE_DIR}/../deps/local/lib)
 set(WITH_EIGEN_BACKEND 1)
 set(EXCUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_SOURCE_DIR})
 
-# look for Boost
-if(DEFINED ENV{BOOST_ROOT})
-      set(Boost_NO_SYSTEM_PATHS ON)
-  endif()
-  set(Boost_REALPATH ON)
-  set(BOOST_ROOT /usr/local)
-  find_package(Boost 1.61.0 COMPONENTS program_options serialization REQUIRED)
-  include_directories(${Boost_INCLUDE_DIR})
-  set(LIBS ${LIBS} ${Boost_LIBRARIES})
-
-  # look for Eigen
-  #find_package(Eigen3 REQUIRED)
-  #include_directories(${EIGEN3_INCLUDE_DIR})
+add_subdirectory(../dynet/dynet dynet)
+add_subdirectory(src/util)
+add_subdirectory(src/sequence)
 
-  #configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h)
+add_subdirectory(src/classifier)
+add_subdirectory(src/parser)
+add_subdirectory(src/semantic_parser)
 
-  add_subdirectory(../dynet/dynet dynet)
-  add_subdirectory(src/util)
-  add_subdirectory(src/sequence)
-
-  add_subdirectory(src/classifier)
-  add_subdirectory(src/parser)
-  add_subdirectory(src/neural_semantic_parser)
-
-  ADD_EXECUTABLE(neurboparser src/neural_semantic_parser/NeuralTurboSemanticParser.cpp)
+ADD_EXECUTABLE(neurboparser src/semantic_parser/NeurboParser.cpp)
 
-
-
-  target_link_libraries(neurboparser dynet ${Boost_LIBRARIES} pthread gflags ad3 glog
-	classifier util sequence parser semantic_parser)
+target_link_libraries(neurboparser dynet pthread gflags ad3 glog
+        classifier util sequence parser semantic_parser)

NeurboParser/src/classifier/CMakeLists.txt

@@ -1,19 +1,10 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
 PROJECT(classifier)
 
+ADD_LIBRARY(classifier Alphabet.cpp Pipe.cpp
+        Dictionary.cpp Options.cpp
+        Reader.cpp Writer.cpp Parameters.cpp)
 
-#ADD_LIBRARY(Alphabet Alphabet.cpp)
-#ADD_LIBRARY(Pipe Pipe.cpp)
-#ADD_LIBRARY(Dictionary Dictionary.cpp)
-#ADD_LIBRARY(Reader Reader.cpp)
-#ADD_LIBRARY(Writer Writer.cpp)
-#ADD_LIBRARY(Options Options.cpp)
-
-ADD_LIBRARY(classifier Alphabet.cpp Pipe.cpp  
-	Dictionary.cpp Options.cpp
-	Reader.cpp Writer.cpp Parameters.cpp)
-
-#set(CMAKE_C_FLAGS "-g SemanticDecoder.o NeuralSemanticPipe.o SemanticOptions.o NueralTurboSemanticParser.o SemanticDictionary.o SemanticInstance.o SemanticReader.o SemanticPart.o SemanticFeatures.o SemanticInstanceNumeric.o SemanticWriter.o DependencyInstanceNumeric.o DependencyWriter.o DependencyDictionary.o DependencyInstance.o DependencyReader.o TokenDictionary.o SequenceInstance.o  AlgUtils.o SerializationUtils.o StringUtils.o TimeUtils.o")
 target_link_libraries(classifier pthread gflags ad3 glog)