Moved serialization back to graphlab/serialization

moved logger back to graphlab/logger

apps/aapo_project/aapo_lassoapp.hpp

@@ -13,7 +13,7 @@
 #include <graphlab.hpp>
 #include <graphlab/macros_def.hpp>
 #include <graphlab/distributed/distributed_control.hpp>
-#include <graphlab/logger/assertions.hpp>
+#include <graphlab/graphlab/logger/assertions.hpp>
 
 using namespace graphlab;
 typedef graphlab::blob_types gl_types;

apps/coem/coem.cpp

@@ -4,7 +4,7 @@
  */
 
 #include <cstdio>
-#include <logger/logger.hpp>
+#include <graphlab/logger/logger.hpp>
 
 #include "coemapp.hpp"
 

apps/coem/distmulticoem.cpp

@@ -6,7 +6,7 @@
 #include <cstdio>
 #include <string>
 
-#include <logger/logger.hpp>
+#include <graphlab/logger/logger.hpp>
 
 #include "distmulticoemapp.hpp"
 

apps/coem/distmulticoem_pull.cpp

@@ -6,7 +6,7 @@
 #include <cstdio>
 #include <string>
 
-#include <logger/logger.hpp>
+#include <graphlab/logger/logger.hpp>
 
 #include "distmulticoemapp_pull.hpp"
 

apps/coem/multicoemlarge.cpp

@@ -6,7 +6,7 @@
 #include <cstdio>
 #include <string>
 
-#include <logger/logger.hpp>
+#include <graphlab/logger/logger.hpp>
 
 #include "multicoemapp.hpp"
 

apps/gabp/gabp_block.cpp

@@ -10,7 +10,7 @@
 //#include <cmath>
 #include <cstdio>
 #include <graphlab.hpp>
-#include <logger/logger.hpp>
+#include <graphlab/logger/logger.hpp>
 #include <graphlab/app_support/iapp.hpp>
 #include <graphlab/graph/graph.hpp>
 

apps/pmf/pmf3.cpp

@@ -6,8 +6,8 @@
 #include <cmath>
 #include <cstdio>
 #include <cfloat>
-#include <serialization/iarchive.hpp>
-#include <serialization/oarchive.hpp>
+#include <graphlab/serialization/iarchive.hpp>
+#include <graphlab/serialization/oarchive.hpp>
 
 
 #include <graphlab.hpp>

apps/pmf/pmf4.cpp

@@ -6,8 +6,8 @@
 #include <cmath>
 #include <cstdio>
 #include <cfloat>
-#include <serialization/iarchive.hpp>
-#include <serialization/oarchive.hpp>
+#include <graphlab/serialization/iarchive.hpp>
+#include <graphlab/serialization/oarchive.hpp>
 
 #include <graphlab.hpp>
 #include <graphlab/distributed/graph/distributed_graph.hpp>

apps/pmf/pmf5.cpp

@@ -6,8 +6,8 @@
 #include <cmath>
 #include <cstdio>
 #include <cfloat>
-#include <serialization/iarchive.hpp>
-#include <serialization/oarchive.hpp>
+#include <graphlab/serialization/iarchive.hpp>
+#include <graphlab/serialization/oarchive.hpp>
 
 #include <graphlab.hpp>
 #include <graphlab/distributed/graph/distributed_graph.hpp>

apps/pmf/pmf5push.cpp

@@ -6,8 +6,8 @@
 #include <cmath>
 #include <cstdio>
 #include <cfloat>
-#include <serialization/iarchive.hpp>
-#include <serialization/oarchive.hpp>
+#include <graphlab/serialization/iarchive.hpp>
+#include <graphlab/serialization/oarchive.hpp>
 
 #include <graphlab.hpp>
 #include <graphlab/distributed/graph/distributed_graph.hpp>

apps/videoseg/combinebins.cpp

@@ -3,7 +3,7 @@
 #include <vector>
 #include <string>
 #include <graphlab.hpp>
-#include <serialization/serialization_includes.hpp>
+#include <graphlab/serialization/serialization_includes.hpp>
 #include <boost/program_options.hpp>
 #define cimg_display 0
 #include "CImg.h"

apps/videoseg/makefeatures.cpp

@@ -3,7 +3,7 @@
 #include <vector>
 #include <string>
 #include <graphlab.hpp>
-#include <serialization/serialization_includes.hpp>
+#include <graphlab/serialization/serialization_includes.hpp>
 #include <boost/program_options.hpp>
 #define cimg_display 0
 #define cimg_use_jpeg 1

apps/videoseg/makesuperpix.cpp

@@ -3,7 +3,7 @@
 #include <vector>
 #include <string>
 #include <graphlab.hpp>
-#include <serialization/serialization_includes.hpp>
+#include <graphlab/serialization/serialization_includes.hpp>
 #define cimg_display 0
 #include "CImg.h"
 // Include the macro for the for each operation

apps/videoseg/makesuperpix2.cpp

@@ -3,7 +3,7 @@
 #include <vector>
 #include <string>
 #include <graphlab.hpp>
-#include <serialization/serialization_includes.hpp>
+#include <graphlab/serialization/serialization_includes.hpp>
 #define cimg_display 0
 #include "CImg.h"
 // Include the macro for the for each operation

apps/videoseg/makesuperpix3.cpp

@@ -3,7 +3,7 @@
 #include <vector>
 #include <string>
 #include <graphlab.hpp>
-#include <serialization/serialization_includes.hpp>
+#include <graphlab/serialization/serialization_includes.hpp>
 #include <boost/program_options.hpp>
 #define cimg_display 0
 #define cimg_use_jpeg 1

src/CMakeLists.txt

@@ -1,6 +1,4 @@
 project(GraphLab)
 
-subdirs(graphlab
-        serialization
-        logger)
+subdirs(graphlab)
 

src/graphlab.hpp

@@ -35,12 +35,12 @@ key parts:
 #include <graphlab/engine/engine_includes.hpp>
 #include <graphlab/factors/factor_includes.hpp>
 #include <graphlab/graph/graph_includes.hpp>
-#include <logger/logger_includes.hpp>
+#include <graphlab/logger/logger_includes.hpp>
 #include <graphlab/monitoring/monitoring_includes.hpp>
 #include <graphlab/parallel/parallel_includes.hpp>
 #include <graphlab/schedulers/scheduler_includes.hpp>
 #include <graphlab/scope/scope_includes.hpp>
-#include <serialization/serialization_includes.hpp>
+#include <graphlab/serialization/serialization_includes.hpp>
 #include <graphlab/shared_data/shared_data_includes.hpp>
 #include <graphlab/tasks/task_includes.hpp>
 #include <graphlab/util/util_includes.hpp>

src/graphlab/CMakeLists.txt

@@ -12,7 +12,9 @@ subdirs(
  scope
  shared_data
  tasks
- util)
+ util
+ serialization
+ logger)
 
 
 add_library(graphlab STATIC
@@ -22,11 +24,12 @@ add_library(graphlab STATIC
   parallel/pthread_tools.cpp
   util/timer.cpp
   util/generics/any.cpp
-  util/command_line_options.cpp)
+  util/command_line_options.cpp
+  logger/logger.cpp)
 
 
 
-target_link_libraries(graphlab graphlab_metis logger)
+target_link_libraries(graphlab graphlab_metis)
 
 
 INSTALL(TARGETS graphlab ARCHIVE DESTINATION lib)

src/graphlab/distributed/distributed_control.hpp

@@ -3,7 +3,7 @@
 #include <vector>
 #include <mpi.h>
 #include <boost/typeof/typeof.hpp>
-#include <logger/logger.hpp>
+#include <graphlab/logger/logger.hpp>
 #include <graphlab/parallel/pthread_tools.hpp>
 #include <boost/static_assert.hpp>
 
@@ -12,8 +12,8 @@
 #include <graphlab/distributed/distributed_terminator.hpp>
 #include <graphlab/distributed/distributed_control_types.hpp>
 
-#include <serialization/oarchive.hpp>
-#include <serialization/iarchive.hpp>
+#include <graphlab/serialization/oarchive.hpp>
+#include <graphlab/serialization/iarchive.hpp>
 #include <graphlab/parallel/pthread_tools.hpp>
 #include <graphlab/util/blocking_queue.hpp>
 

src/graphlab/distributed/distributed_engine.hpp

@@ -9,7 +9,7 @@
 #include <graphlab/scope/iscope.hpp>
 #include <graphlab/engine/iengine.hpp>
 #include <graphlab/tasks/update_task.hpp>
-#include <logger/logger.hpp>
+#include <graphlab/logger/logger.hpp>
 #include <graphlab/parallel/pthread_tools.hpp>
 #include <graphlab/parallel/atomic.hpp>
 #include <graphlab/util/timer.hpp>

src/graphlab/distributed/distributed_hash_table.cpp

@@ -1,8 +1,8 @@
 #include <vector>
 #include <boost/iostreams/stream.hpp>
 #include <graphlab/distributed/distributed_hash_table.hpp>
-#include <serialization/serialization_includes.hpp>
-#include <logger/logger.hpp>
+#include <graphlab/serialization/serialization_includes.hpp>
+#include <graphlab/logger/logger.hpp>
 #include <graphlab/util/timer.hpp>
 namespace graphlab {
 

src/graphlab/distributed/distributed_round_robin_scheduler.hpp

@@ -12,7 +12,7 @@
 #include <climits>
 
 
-#include <logger/logger.hpp>
+#include <graphlab/logger/logger.hpp>
 #include <graphlab/graph/graph.hpp>
 #include <graphlab/scope/iscope.hpp>
 #include <graphlab/tasks/update_task.hpp>

src/graphlab/distributed/distributed_round_robin_scheduler2.hpp

@@ -12,7 +12,7 @@
 #include <climits>
 
 
-#include <logger/logger.hpp>
+#include <graphlab/logger/logger.hpp>
 #include <graphlab/graph/graph.hpp>
 #include <graphlab/scope/iscope.hpp>
 #include <graphlab/tasks/update_task.hpp>

src/graphlab/distributed/graph/cloned_graph.hpp

@@ -4,10 +4,10 @@
 #include <cmath>
 #include <vector>
 
-#include <logger/logger.hpp>
+#include <graphlab/logger/logger.hpp>
 #include <graphlab/graph/graph.hpp>
 #include <graphlab/util/generics/blob.hpp>
-#include <serialization/serialization_includes.hpp>
+#include <graphlab/serialization/serialization_includes.hpp>
 #include <graphlab/distributed/distributed_control.hpp>
 
 

src/graphlab/distributed/graph/distributed_graph.hpp

@@ -4,10 +4,10 @@
 #include <cmath>
 #include <vector>
 
-#include <logger/logger.hpp>
+#include <graphlab/logger/logger.hpp>
 #include <graphlab/graph/graph.hpp>
 #include <graphlab/util/generics/blob.hpp>
-#include <serialization/serialization_includes.hpp>
+#include <graphlab/serialization/serialization_includes.hpp>
 #include <graphlab/distributed/distributed_control.hpp>
 
 #include <graphlab/macros_def.hpp>

src/graphlab/distributed/graph_lock_manager.hpp

@@ -3,10 +3,10 @@
 #include <vector>
 #include <queue>
 #include <boost/unordered_map.hpp>
-#include <logger/assertions.hpp>
+#include <graphlab/logger/assertions.hpp>
 #include <graphlab/graph/graph.hpp>
 #include <graphlab/scope/iscope_factory.hpp>
-#include <serialization/serialization_includes.hpp>
+#include <graphlab/serialization/serialization_includes.hpp>
 #include <graphlab/distributed/distributed_control.hpp>
 #include <graphlab/distributed/lock_manager.hpp>
 #include <graphlab/parallel/pthread_tools.hpp>

src/graphlab/distributed/lock_manager.hpp

@@ -3,9 +3,9 @@
 #include <vector>
 #include <queue>
 #include <map>
-#include <logger/assertions.hpp>
+#include <graphlab/logger/assertions.hpp>
 #include <graphlab/graph/graph.hpp>
-#include <serialization/serialization_includes.hpp>
+#include <graphlab/serialization/serialization_includes.hpp>
 #include <graphlab/distributed/distributed_control.hpp>
 #include <graphlab/parallel/pthread_tools.hpp>
 #include <graphlab/parallel/atomic.hpp>

src/graphlab/distributed/metrics/distributed_metrics.hpp

@@ -12,7 +12,7 @@
 #include <climits>
 
 
-#include <logger/logger.hpp> 
+#include <graphlab/logger/logger.hpp> 
 #include <graphlab/parallel/pthread_tools.hpp> 
 #include <graphlab/distributed/distributed_control.hpp> 
 

src/graphlab/distributed/pushy_distributed_engine.hpp

@@ -14,7 +14,7 @@
 #include <graphlab/scope/iscope.hpp>
 #include <graphlab/engine/iengine.hpp>
 #include <graphlab/tasks/update_task.hpp>
-#include <logger/logger.hpp>
+#include <graphlab/logger/logger.hpp>
 #include <graphlab/parallel/pthread_tools.hpp>
 #include <graphlab/parallel/atomic.hpp>
 #include <graphlab/util/timer.hpp>

src/graphlab/distributed/serialize_dispatch.hpp

@@ -4,7 +4,7 @@
 #include <boost/type_traits/decay.hpp>
 #include <boost/type_traits/remove_pointer.hpp>
 #include <boost/type_traits/function_traits.hpp>
-#include <serialization/serialization_includes.hpp>
+#include <graphlab/serialization/serialization_includes.hpp>
 namespace graphlab {
 class distributed_control;
 

src/graphlab/engine/asynchronous_engine.hpp

@@ -14,7 +14,7 @@
 #include <graphlab/scope/iscope.hpp>
 #include <graphlab/engine/iengine.hpp>
 #include <graphlab/tasks/update_task.hpp>
-#include <logger/logger.hpp>
+#include <graphlab/logger/logger.hpp>
 #include <graphlab/monitoring/imonitor.hpp>
 
 #include <graphlab/macros_def.hpp>

src/graphlab/engine/sim_thread_engine.hpp

@@ -11,7 +11,7 @@
 #include <graphlab/scope/iscope.hpp>
 #include <graphlab/engine/iengine.hpp>
 #include <graphlab/tasks/update_task.hpp>
-#include <logger/logger.hpp>
+#include <graphlab/logger/logger.hpp>
 #include <graphlab/parallel/pthread_tools.hpp>
 #include <graphlab/parallel/atomic.hpp>
 #include <graphlab/util/timer.hpp>

src/graphlab/engine/synchronous_engine.hpp

@@ -12,7 +12,7 @@
 #include <graphlab/schedulers/support/binary_scheduler_callback.hpp>
 #include <graphlab/engine/iengine.hpp>
 #include <graphlab/tasks/update_task.hpp>
-#include <logger/logger.hpp>
+#include <graphlab/logger/logger.hpp>
 #include <graphlab/parallel/pthread_tools.hpp>
 #include <graphlab/parallel/atomic.hpp>
 #include <graphlab/util/timer.hpp>

src/graphlab/engine/threaded_engine.hpp

@@ -11,7 +11,7 @@
 #include <graphlab/scope/iscope.hpp>
 #include <graphlab/engine/iengine.hpp>
 #include <graphlab/tasks/update_task.hpp>
-#include <logger/logger.hpp>
+#include <graphlab/logger/logger.hpp>
 #include <graphlab/parallel/pthread_tools.hpp>
 #include <graphlab/parallel/atomic.hpp>
 #include <graphlab/util/timer.hpp>

src/graphlab/factors/binary_factor.hpp

@@ -22,7 +22,7 @@
 // Random number generation
 #include <graphlab/parallel/pthread_tools.hpp>
 
-#include <serialization/serialization_includes.hpp>
+#include <graphlab/serialization/serialization_includes.hpp>
 
 // Include the macro for the for each operation
 #include <graphlab/macros_def.hpp>

src/graphlab/factors/table_factor.hpp

@@ -27,8 +27,8 @@
 // Random number generation
 #include <graphlab/util/random.hpp>
 
-#include <serialization/iarchive.hpp>
-#include <serialization/oarchive.hpp>
+#include <graphlab/serialization/iarchive.hpp>
+#include <graphlab/serialization/oarchive.hpp>
 
 
 

src/graphlab/factors/unary_factor.hpp

@@ -20,7 +20,7 @@
 
 // Random number generation
 #include <graphlab/util/random.hpp>
-#include <serialization/serialization_includes.hpp>
+#include <graphlab/serialization/serialization_includes.hpp>
 
 
 #include <graphlab/factors/binary_factor.hpp>