Commit 04a91a7d authored by Stanislav Bohm's avatar Stanislav Bohm

RF: libloom moved to libloomw

parent b4bec0df
add_subdirectory(libloomnet)
add_subdirectory(libloom)
add_subdirectory(libloomw)
add_subdirectory(worker)
add_subdirectory(server)
#include "pbutils.h"
#include "libloom/loomcomm.pb.h"
#include "libloomw/loomcomm.pb.h"
#include "compat.h"
......
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -g -Wall")
add_library(libloom
add_library(libloomw
data/externfile.cpp
data/externfile.h
data/rawdata.h
......@@ -53,10 +53,10 @@ add_library(libloom
utils.h
utils.cpp)
target_include_directories(libloom PUBLIC ${PROJECT_SOURCE_DIR}/src)
install(TARGETS libloom
target_include_directories(libloomw PUBLIC ${PROJECT_SOURCE_DIR}/src)
install(TARGETS libloomw
ARCHIVE DESTINATION lib)
install(
DIRECTORY ${CMAKE_SOURCE_DIR}/src/libloom
DIRECTORY ${CMAKE_SOURCE_DIR}/src/libloomw
DESTINATION include
FILES_MATCHING PATTERN "*.h*")
#include "arraytasks.h"
#include "libloomnet/compat.h"
#include "libloom/data/array.h"
#include "libloomw/data/array.h"
using namespace loom;
......
#ifndef LIBLOOM_TASKS_ARRAYTASKS_H
#define LIBLOOM_TASKS_ARRAYTASKS_H
#include "libloom/taskinstance.h"
#include "libloomw/taskinstance.h"
namespace loom {
......
#ifndef LIBLOOM_TASKS_BASICTASKS_H
#define LIBLOOM_TASKS_BASICTASKS_H
#include "libloom/taskinstance.h"
#include "libloomw/taskinstance.h"
namespace loom {
......
#ifndef LIBLOOM_TASKS_PYTHON_H
#define LIBLOOM_TASKS_PYTHON_H
#include "libloom/threadjob.h"
#include "libloomw/threadjob.h"
namespace loom {
......
#include "rawdatatasks.h"
#include "libloomnet/compat.h"
#include "libloom/data/rawdata.h"
#include "libloom/data/index.h"
#include "libloom/data/externfile.h"
#include "libloom/log.h"
#include "libloom/worker.h"
#include "libloomw/data/rawdata.h"
#include "libloomw/data/index.h"
#include "libloomw/data/externfile.h"
#include "libloomw/log.h"
#include "libloomw/worker.h"
#include <string.h>
......
#ifndef LIBLOOM_TASKS_RAWDATATASKS_H
#define LIBLOOM_TASKS_RAWDATATASKS_H
#include "libloom/ttinstance.h"
#include "libloom/threadjob.h"
#include "libloomw/ttinstance.h"
#include "libloomw/threadjob.h"
namespace loom {
......
#include "runtask.h"
#include "libloom/worker.h"
#include "libloom/data/rawdata.h"
#include "libloom/data/array.h"
#include "libloom/log.h"
#include "libloomw/worker.h"
#include "libloomw/data/rawdata.h"
#include "libloomw/data/array.h"
#include "libloomw/log.h"
#include "loomrun.pb.h"
#include "libloom/utils.h"
#include "libloomw/utils.h"
#include <sstream>
#include <fstream>
......
#ifndef LIBLOOM_TASKS_RUNTASK_H
#define LIBLOOM_TASKS_RUNTASK_H
#include "libloom/taskinstance.h"
#include "libloomw/taskinstance.h"
namespace loom {
......
......@@ -29,7 +29,7 @@ add_executable(loom-server
$<TARGET_OBJECTS:loom-server-lib>
main.cpp)
target_link_libraries(loom-server libloomnet libloom ${LIBUV_LIBRARY} pthread)
target_link_libraries(loom-server libloomnet libloomw ${LIBUV_LIBRARY} pthread)
target_link_libraries(loom-server ${PROTOBUF_LIBRARIES})
install (TARGETS loom-server DESTINATION bin)
......@@ -3,11 +3,12 @@
#include "libloom/loomplan.pb.h"
#include "libloom/loomcomm.pb.h"
#include "libloomw/loomplan.pb.h"
#include "libloomw/loomcomm.pb.h"
#include "libloomw/log.h"
#include "libloomnet/compat.h"
#include "libloomnet/pbutils.h"
#include "libloom/log.h"
using namespace loom;
......
......@@ -3,7 +3,7 @@
#include "workerconn.h"
#include "server.h"
#include "libloom/log.h"
#include "libloomw/log.h"
constexpr static double TRANSFER_COST_COEF = 1.0 / (1024 * 1024); // 1MB = 1cost
......
......@@ -5,9 +5,9 @@
#include <libloomnet/compat.h>
#include <libloomnet/pbutils.h>
#include <libloom/utils.h>
#include <libloom/log.h>
#include <libloom/loomcomm.pb.h>
#include <libloomw/utils.h>
#include <libloomw/log.h>
#include <libloomw/loomcomm.pb.h>
#include <sstream>
......
......@@ -9,7 +9,7 @@
#include <libloomnet/listener.h>
#include <libloomnet/socket.h>
#include <libloomnet/sendbuffer.h>
#include <libloom/types.h>
#include <libloomw/types.h>
class Server;
class DWConnection;
......
......@@ -4,8 +4,8 @@
#include "server.h"
#include "libloomnet/compat.h"
#include "libloom/log.h"
#include "libloom/loomcomm.pb.h"
#include "libloomw/log.h"
#include "libloomw/loomcomm.pb.h"
#include <sstream>
......
......@@ -2,8 +2,8 @@
#include <algorithm>
#include "libloom/loomplan.pb.h"
#include "libloom/log.h"
#include "libloomw/loomplan.pb.h"
#include "libloomw/log.h"
static PlanNode::Policy read_task_policy(loomplan::Task_Policy policy) {
switch(policy) {
......
......@@ -3,7 +3,7 @@
#include "plannode.h"
#include <libloom/dictionary.h>
#include <libloomw/dictionary.h>
#include <unordered_map>
#include <unordered_set>
......
#ifndef LOOM_SERVER_TASKNODE_H
#define LOOM_SERVER_TASKNODE_H
#include <libloom/types.h>
#include <libloomw/types.h>
#include <vector>
#include <string>
......
......@@ -3,7 +3,7 @@
#include "workerconn.h"
#include "libloomnet/compat.h"
#include "libloom/log.h"
#include "libloomw/log.h"
#include <sstream>
......
......@@ -2,9 +2,9 @@
#include "libloomnet/pbutils.h"
#include "libloomnet/compat.h"
#include "libloom/utils.h"
#include "libloom/log.h"
#include "libloom/loomcomm.pb.h"
#include "libloomw/utils.h"
#include "libloomw/log.h"
#include "libloomw/loomcomm.pb.h"
#include <sstream>
......
......@@ -8,7 +8,7 @@
#include "dummyworker.h"
#include "libloom/dictionary.h"
#include "libloomw/dictionary.h"
#include "libloomnet/listener.h"
#include <vector>
......
......@@ -2,9 +2,9 @@
#include "server.h"
#include "libloomnet/compat.h"
#include "libloom/loomplan.pb.h"
#include "libloom/loomcomm.pb.h"
#include "libloom/log.h"
#include "libloomw/loomplan.pb.h"
#include "libloomw/loomcomm.pb.h"
#include "libloomw/log.h"
#include <algorithm>
#include <limits.h>
......
......@@ -3,7 +3,7 @@
#include <unordered_map>
#include "libloom/types.h"
#include "libloomw/types.h"
class WorkerConnection;
template<typename T> using WorkerMap = std::unordered_map<WorkerConnection*, T>;
......
#include "workerconn.h"
#include "server.h"
#include "libloom/log.h"
#include "libloom/loomcomm.pb.h"
#include "libloomw/log.h"
#include "libloomw/loomcomm.pb.h"
#include "taskmanager.h"
......
......@@ -2,7 +2,7 @@
#define LOOM_SERVER_WORKERCONN
#include "libloomnet/socket.h"
#include "libloom/types.h"
#include "libloomw/types.h"
class Server;
class PlanNode;
......
......@@ -2,7 +2,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -g -Wall")
add_executable(loom-worker
main.cpp)
target_include_directories(loom-worker PUBLIC ${PROJECT_SOURCE_DIR})
target_link_libraries(loom-worker libloom libloomnet ${LIBUV_LIBRARY} pthread)
target_link_libraries(loom-worker libloomw libloomnet ${LIBUV_LIBRARY} pthread)
target_link_libraries(loom-worker ${PROTOBUF_LIBRARIES})
target_link_libraries(loom-worker ${PYTHON_LIBRARIES})
install (TARGETS loom-worker DESTINATION bin)
#include "libloom/worker.h"
#include "libloom/log.h"
#include "libloom/config.h"
#include "libloomw/worker.h"
#include "libloomw/log.h"
#include "libloomw/config.h"
#include <memory>
......
......@@ -8,7 +8,7 @@ add_executable(server-test
test_scheduler.cpp
main.cpp)
target_link_libraries(server-test Catch libloomnet libloom ${LIBUV_LIBRARY} pthread)
target_link_libraries(server-test Catch libloomnet libloomw ${LIBUV_LIBRARY} pthread)
target_link_libraries(server-test ${LPSOLVE_LIBRARY} ${COLAMD_LIBRARY} dl)
target_link_libraries(server-test ${PROTOBUF_LIBRARIES})
......
......@@ -3,7 +3,7 @@
#include "src/server/server.h"
#include "libloomnet/compat.h"
#include "libloom/loomplan.pb.h"
#include "libloomw/loomplan.pb.h"
#include <set>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment