Fast comms (WIP)

CMakeLists.txt

@@ -9,7 +9,7 @@
 # CMAKE SETUP
 ##############################################################################
 
-CMAKE_MINIMUM_REQUIRED(VERSION 3.0)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.1)
 PROJECT(STATELINE LANGUAGES CXX)
 
 # Use folders
@@ -42,7 +42,10 @@ ENDIF(LOCAL_INSTALL)
 # COMPILATION
 ##############################################################################
 
-SET(sl_flags     "-D_GLIBCXX_USE_NANOSLEEP -std=c++11 -fPIC")
+SET(CMAKE_CXX_STANDARD_REQUIRED ON)
+SET(CMAKE_CXX_STANDARD 14)
+
+SET(sl_flags     "-D_GLIBCXX_USE_NANOSLEEP")
 SET(sl_warnings  "-Wall -Wno-unused-local-typedefs -Wextra -pedantic")
 SET(sl_debug     "-ggdb -g")
 SET(sl_release   "-DNDEBUG -O2")
@@ -75,17 +78,21 @@ FIND_PACKAGE(ZMQ REQUIRED)
 # Eigen
 FIND_PACKAGE(Eigen3 3.2.0 REQUIRED)
 
+# HDF5
+FIND_PACKAGE(HDF5 REQUIRED COMPONENTS CXX)
+
 ##############################################################################
 # INCLUDE DIRECTORIES
 ##############################################################################
 
 INCLUDE_DIRECTORIES("${STATELINE_SOURCE_DIR}/src"
+                    SYSTEM "${CMAKE_CURRENT_BINARY_DIR}"
                     SYSTEM "${STATELINE_SOURCE_DIR}/external"
                     SYSTEM "${STATELINE_SOURCE_DIR}/external/cppzmq"
                     SYSTEM "${STATELINE_SOURCE_DIR}/external/json"
-                    SYSTEM "${STATELINE_SOURCE_DIR}/external/simple-web-server"
                     SYSTEM "${ZMQ_INCLUDE_DIR}"
-                    SYSTEM "${EIGEN3_INCLUDE_DIR}")
+                    SYSTEM "${EIGEN3_INCLUDE_DIR}"
+                    SYSTEM "${HDF5_INCLUDE_DIRS}")
 
 ADD_SUBDIRECTORY(src/test)
 
@@ -125,30 +132,26 @@ ADD_SUBPROJECT(src/bin)
 ##############################################################################
 # Build final libraries for server and client
 ##############################################################################
-ADD_LIBRARY(statelineserver STATIC #SHARED
+
+ADD_LIBRARY(stateline-server STATIC
   $<TARGET_OBJECTS:commonwrapper> $<TARGET_OBJECTS:serverwrapper>
   $<TARGET_OBJECTS:commoncomms> $<TARGET_OBJECTS:servercomms>
   $<TARGET_OBJECTS:db> $<TARGET_OBJECTS:mcmc>)
-TARGET_LINK_LIBRARIES(statelineserver ${Boost_LIBRARIES} ${ZMQ_LIBRARY})
-SET_TARGET_PROPERTIES(statelineserver PROPERTIES LINKER_LANGUAGE CXX)
+TARGET_LINK_LIBRARIES(stateline-server)
+SET_TARGET_PROPERTIES(stateline-server PROPERTIES LINKER_LANGUAGE CXX)
 
-ADD_LIBRARY(statelineclient STATIC #SHARED
-  $<TARGET_OBJECTS:commonwrapper> $<TARGET_OBJECTS:workerwrapper>
+ADD_LIBRARY(stateline-client STATIC
+  $<TARGET_OBJECTS:commonwrapper>
   $<TARGET_OBJECTS:commoncomms> $<TARGET_OBJECTS:clientcomms>)
-TARGET_LINK_LIBRARIES(statelineclient ${ZMQ_LIBRARY})
-SET_TARGET_PROPERTIES(statelineclient PROPERTIES LINKER_LANGUAGE CXX)
-
-##############################################################################
-# Move the frontend code to the build folder
-##############################################################################
-FILE(COPY frontend DESTINATION ${STATELINE_BINARY_DIR})
+TARGET_LINK_LIBRARIES(stateline-client)
+SET_TARGET_PROPERTIES(stateline-client PROPERTIES LINKER_LANGUAGE CXX)
 
 ##############################################################################
 # Install binaries
 ##############################################################################
-install (TARGETS statelineserver
+install (TARGETS stateline-server
          ARCHIVE DESTINATION lib
          LIBRARY DESTINATION lib)
-install (TARGETS statelineclient
+install (TARGETS stateline-client
          ARCHIVE DESTINATION lib
          LIBRARY DESTINATION lib)

Dockerfile

@@ -6,15 +6,7 @@ RUN apt-get update && apt-get install -y \
   cmake \
   libeigen3-dev \
   libzmq3-dev \
-  libboost-program-options-dev \
-  libboost-system-dev \
-  libboost-filesystem-dev \
-  libboost-regex-dev \
-  libboost-coroutine-dev \
-  libboost-thread-dev \
-  libboost-date-time-dev \
-  libboost-context-dev \
-  libgtest-dev
+  libhdf5-dev
 
 ENV BUILD_DIR=/tmp/stateline LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib
 

README.md

@@ -151,9 +151,7 @@ To build stateline, you will need the following:
 
 You will need install the following libraries through your operating system's package manager:
 
-* Boost 1.58+
 * Eigen 3.2.0+
-* google-test 1.7.0+
 * zeromq 4.0+
 
 To run the python demos, you will also need: