Merge pull request turi-code#361 from turi-code/nano-2

more nanomsg fixes

Author: Yucheng Low

CMakeLists.txt

@@ -96,19 +96,14 @@ endif()
 set(MINGW_ROOT "/mingw64/bin")
 # Separate variable so that cython's CMakeLists.txt can use it too
 if (WIN32)
-        set(INSTALLATION_SYSTEM_BINARY_FILES ${CMAKE_SOURCE_DIR}/deps/local/bin/libzmq.dll
-        ${CMAKE_SOURCE_DIR}/deps/local/bin/libsodium-13.dll
+        set(INSTALLATION_SYSTEM_BINARY_FILES 
         ${MINGW_ROOT}/libiconv-2.dll
         ${MINGW_ROOT}/libssh2-1.dll
         ${MINGW_ROOT}/zlib1.dll
         ${MINGW_ROOT}/libwinpthread-1.dll
         ${MINGW_ROOT}/libgcc_s_seh-1.dll
         ${MINGW_ROOT}/libstdc++-6.dll
         ${MINGW_ROOT}/libeay32.dll)
-else()
-        if (EXISTS ${CMAKE_SOURCE_DIR}/deps/local/lib64/libgomp.so.1)
-                list(APPEND INSTALLATION_SYSTEM_BINARY_FILES ${CMAKE_SOURCE_DIR}/deps/local/lib64/libgomp.so.1)
-        endif()
 endif()
 
 
@@ -131,27 +126,10 @@ add_definitions(-DFUSION_MAX_VECTOR_SIZE=20)
 #*                             Locate OpenMP                              */
 #*                                                                        */
 #**************************************************************************/
-if (EXISTS ${CMAKE_SOURCE_DIR}/deps/local/lib/libgomp.so)
-   add_library(libgomp.so SHARED IMPORTED)
-  set_property(TARGET libgomp.so PROPERTY IMPORTED_LOCATION ${CMAKE_SOURCE_DIR}/deps/local/lib/libgomp.so)
-  add_library(openmp INTERFACE)
-
-  target_compile_options(openmp INTERFACE "-fopenmp")
-  target_link_libraries(openmp INTERFACE libgomp.so)
-  message(STATUS "OpenMP Library Found")
-elseif (EXISTS ${CMAKE_SOURCE_DIR}/deps/local/lib64/libgomp.so)
-  add_library(libgomp.so SHARED IMPORTED)
-  set_property(TARGET libgomp.so PROPERTY IMPORTED_LOCATION ${CMAKE_SOURCE_DIR}/deps/local/lib64/libgomp.so)
-
-  add_library(openmp INTERFACE)
-  target_compile_options(openmp INTERFACE "-fopenmp")
-  target_link_libraries(openmp INTERFACE libgomp.so)
-  message(STATUS "OpenMP Library Found")
-else()
-  add_library(openmp INTERFACE)
-  target_compile_definitions(openmp INTERFACE __NO_OPENMP__)
-  message(WARNING "OpenMP Libraries were not found")
-endif()
+# disable openmp
+add_library(openmp INTERFACE)
+target_compile_definitions(openmp INTERFACE __NO_OPENMP__)
+message(WARNING "OpenMP Libraries were not found")
 
 #**************************************************************************/
 #*                                                                        */

configure

@@ -8,11 +8,11 @@ GRAPHLAB_HOME=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
 DEPS_PREFIX=$PWD/deps/local
 
 if [[ $OSTYPE == linux* ]]; then
-        DEFAULT_DATO_DEPS_VERSION=11
+        DEFAULT_DATO_DEPS_VERSION=12
 elif [[ $OSTYPE == darwin* ]]; then
-        DEFAULT_DATO_DEPS_VERSION=11
+        DEFAULT_DATO_DEPS_VERSION=12
 elif [[ $OSTYPE == msys ]]; then
-        DEFAULT_DATO_DEPS_VERSION=11
+        DEFAULT_DATO_DEPS_VERSION=12
 fi
 
 

oss_test/CMakeLists.txt

@@ -6,7 +6,7 @@ subdirs(
   logger
   timer
   random
-  fault
+  # fault
   nanosockets
   fileio
   graphlab

oss_test/lambda/dummy_worker.cpp

@@ -17,7 +17,7 @@
 #include <cppipc/cppipc.hpp>
 #include <process/process_util.hpp>
 #include "dummy_worker_interface.hpp"
-#include <fault/sockets/socket_config.hpp>
+#include <nanosockets/socket_config.hpp>
 #include <thread>
 
 using namespace graphlab;
@@ -44,7 +44,7 @@ int main(int argc, char** argv) {
   // Manually set this one.
   char* use_fallback = std::getenv("GRAPHLAB_FORCE_IPC_TO_TCP_FALLBACK");
   if(use_fallback != nullptr && std::string(use_fallback) == "1") {
-    libfault::FORCE_IPC_TO_TCP_FALLBACK = true;
+    nanosockets::FORCE_IPC_TO_TCP_FALLBACK = true;
   }
 
   size_t parent_pid = get_parent_pid();

oss_test/lambda/worker_pool_test.cxx

@@ -19,7 +19,7 @@
 #include <lambda/worker_pool.hpp>
 #include <parallel/lambda_omp.hpp>
 #include <fileio/fs_utils.hpp>
-#include <fault/sockets/socket_config.hpp>
+#include <nanosockets/socket_config.hpp>
 #include "dummy_worker_interface.hpp"
 
 using namespace graphlab;
@@ -32,7 +32,7 @@ class worker_pool_test: public CxxTest::TestSuite {
     // Manually set this one.
     char* use_fallback = std::getenv("GRAPHLAB_FORCE_IPC_TO_TCP_FALLBACK");
     if(use_fallback != nullptr && std::string(use_fallback) == "1") {
-      libfault::FORCE_IPC_TO_TCP_FALLBACK = true;
+      nanosockets::FORCE_IPC_TO_TCP_FALLBACK = true;
     }
   }
   void test_spawn_workers() {