From 96709c81212ad35ca13f0daca97ec5d1baeb9d0d Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Thu, 3 Jan 2019 16:20:15 -0500 Subject: [PATCH] ai algo sample --- CMakeLists.txt | 3 +- externals | 2 +- src/client/spark/Spark.csproj | 2 +- src/client/spark_api/spark_api.csproj | 2 +- src/client/spark_excel/spark_excel.csproj | 2 +- src/client/spark_sdk/spark_sdk.csproj | 2 +- src/lib/config/ConfigValueQueue.cpp | 1 + src/lib/config/text_format/strutil.h | 1 + src/lib/config/text_format/text_format.cpp | 3 +- src/sdk/CMakeLists.txt | 4 + src/sdk/examples/ai_order_plugin_example.cpp | 84 ++++++-------------- src/sdk/examples/build_examples.sh | 46 ++++++----- src/sdk/make_sdk.sh | 9 +-- src/sdk/tensorflow/tfexecute.cpp | 27 +++++++ src/sdk/tensorflow/tfexecute.h | 24 ++++++ src/sdk/tensorflow/tfloader.cpp | 29 +++++++ src/sdk/tensorflow/tfloader.h | 21 +++++ 17 files changed, 164 insertions(+), 98 deletions(-) create mode 100644 src/sdk/tensorflow/tfexecute.cpp create mode 100644 src/sdk/tensorflow/tfexecute.h create mode 100644 src/sdk/tensorflow/tfloader.cpp create mode 100644 src/sdk/tensorflow/tfloader.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 1acc808b9..f40f0dcf1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -34,7 +34,7 @@ if (WIN32) else () # so that sparkd looks for libspark.so in its directory set (CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) - set (CMAKE_INSTALL_RPATH ".:./lib") + set (CMAKE_INSTALL_RPATH ".") set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} \ -fPIC -Wall -pedantic -Wextra -Werror \ @@ -58,7 +58,6 @@ else () COMMAND mkdir ARGS -p ${CMAKE_BINARY_DIR}/server/plugins COMMAND ln ARGS -sf ${CMAKE_BINARY_DIR}/sdk/examples/order_plugin_example.so ${CMAKE_BINARY_DIR}/server/plugins/ COMMAND ln ARGS -sf ${CMAKE_BINARY_DIR}/sdk/examples/ai_order_plugin_example.so ${CMAKE_BINARY_DIR}/server/plugins/ - COMMAND ln ARGS -sf ${CMAKE_BINARY_DIR}/sdk/torch/lib ${CMAKE_BINARY_DIR}/server/lib COMMENT "Creating server runtime layout" DEPENDS sparkd data_files_dir) diff --git a/externals b/externals index 9d9046fac..e23695418 160000 --- a/externals +++ b/externals @@ -1 +1 @@ -Subproject commit 9d9046fac4e7ca746062f2f891dc3ef91a9d3b97 +Subproject commit e2369541811cb67504d4543889feccebbe58a4f3 diff --git a/src/client/spark/Spark.csproj b/src/client/spark/Spark.csproj index f3579dcd9..dc7895180 100644 --- a/src/client/spark/Spark.csproj +++ b/src/client/spark/Spark.csproj @@ -31,7 +31,7 @@ - + diff --git a/src/client/spark_api/spark_api.csproj b/src/client/spark_api/spark_api.csproj index 5a555f48a..8dad27ee0 100644 --- a/src/client/spark_api/spark_api.csproj +++ b/src/client/spark_api/spark_api.csproj @@ -15,7 +15,7 @@ - + diff --git a/src/client/spark_excel/spark_excel.csproj b/src/client/spark_excel/spark_excel.csproj index 37fe13f5a..22f3099e7 100644 --- a/src/client/spark_excel/spark_excel.csproj +++ b/src/client/spark_excel/spark_excel.csproj @@ -21,7 +21,7 @@ - + diff --git a/src/client/spark_sdk/spark_sdk.csproj b/src/client/spark_sdk/spark_sdk.csproj index bf27ddb55..6165b7a9d 100644 --- a/src/client/spark_sdk/spark_sdk.csproj +++ b/src/client/spark_sdk/spark_sdk.csproj @@ -22,7 +22,7 @@ - + diff --git a/src/lib/config/ConfigValueQueue.cpp b/src/lib/config/ConfigValueQueue.cpp index 1195eac08..2d65a5ee8 100755 --- a/src/lib/config/ConfigValueQueue.cpp +++ b/src/lib/config/ConfigValueQueue.cpp @@ -14,6 +14,7 @@ namespace internal { using namespace ::google::protobuf; using namespace bts::expression; using namespace bts::util::proto; +using std::vector; ConfigValueQueue::ConfigValueQueue(IPropertyEvaluator& evaluator) : _eval(evaluator), diff --git a/src/lib/config/text_format/strutil.h b/src/lib/config/text_format/strutil.h index df28c94da..ab8c8b53e 100644 --- a/src/lib/config/text_format/strutil.h +++ b/src/lib/config/text_format/strutil.h @@ -35,6 +35,7 @@ #include #include +using std::vector; #include #include diff --git a/src/lib/config/text_format/text_format.cpp b/src/lib/config/text_format/text_format.cpp index 36a447f9e..99f352cbf 100755 --- a/src/lib/config/text_format/text_format.cpp +++ b/src/lib/config/text_format/text_format.cpp @@ -33,10 +33,9 @@ // Sanjay Ghemawat, Jeff Dean, and others. // Forked from LibProtobuf for BTS Config by Eric Harding on 5/29/2013 -// KD disabled warning 4146 on 12/28/2018 to upgrade to proto 3.5 #ifdef _WIN32 -#pragma warning (disable: 4273 4800 4018 4146) +#pragma warning (disable: 4273 4800 4018) #endif #ifdef __GNUC__ diff --git a/src/sdk/CMakeLists.txt b/src/sdk/CMakeLists.txt index bb4174201..11051ba93 100644 --- a/src/sdk/CMakeLists.txt +++ b/src/sdk/CMakeLists.txt @@ -13,6 +13,10 @@ add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/sdk ${CMAKE_CURRENT_SOURCE_DIR}/examples/md_publisher_example.cpp ${CMAKE_CURRENT_SOURCE_DIR}/examples/order_plugin_example.cpp ${CMAKE_CURRENT_SOURCE_DIR}/examples/ai_order_plugin_example.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/tensorflow/tfexecute.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/tensorflow/tfexecute.h + ${CMAKE_CURRENT_SOURCE_DIR}/tensorflow/tfloader.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/tensorflow/tfloader.h server_layout) add_custom_target(sdk_dir ALL DEPENDS ${CMAKE_BINARY_DIR}/sdk) diff --git a/src/sdk/examples/ai_order_plugin_example.cpp b/src/sdk/examples/ai_order_plugin_example.cpp index be57e3441..73544d429 100644 --- a/src/sdk/examples/ai_order_plugin_example.cpp +++ b/src/sdk/examples/ai_order_plugin_example.cpp @@ -1,11 +1,6 @@ -//the pytorch guys were kind enough to #define LOG... -//#include "torch/script.h" -//https://github.com/leonardvandriel/caffe2_cpp_tutorial/blob/master/src/caffe2/binaries/pretrained.cc -#include "caffe2/core/init.h" -#include "caffe2/core/net.h" -#include "caffe2/utils/proto_utils.h" +#include "../tensorflow/tfloader.h" +#include "../tensorflow/tfexecute.h" #undef LOG -using namespace caffe2; #include "spark/lib/logging/logging.h" #include "spark/lib/orderman/orders/DynamicOrder.h" @@ -24,10 +19,10 @@ using namespace bts::orderman; namespace bts { namespace order_example { -class AILeanOrder : public DynamicOrder { +class AISampleOrder : public DynamicOrder { public: - AILeanOrder(); - ~AILeanOrder(); + AISampleOrder(); + ~AISampleOrder(); OrderDefinition const &definition() const override; void on_init_new(OrderDefinition const &, const PreActivationOrderServices &) override; @@ -55,14 +50,14 @@ class AILeanOrder : public DynamicOrder { std::unique_ptr me; }; -struct AILeanOrder::ActiveChild { +struct AISampleOrder::ActiveChild { ActiveChild() {} ChildOrder order; api::orderman::OrderState state; void clear() { state = api::orderman::OrderState(); } }; -struct AILeanOrder::PImpl { +struct AISampleOrder::PImpl { PImpl() : services(nullptr), child() {} OrderServices *services; @@ -73,47 +68,16 @@ struct AILeanOrder::PImpl { Quantity show_quantity; }; -AILeanOrder::AILeanOrder() : me(new PImpl()) {} -AILeanOrder::~AILeanOrder() {} -api::orderman::OrderDefinition const &AILeanOrder::definition() const { +AISampleOrder::AISampleOrder() : me(new PImpl()) {} +AISampleOrder::~AISampleOrder() {} +api::orderman::OrderDefinition const &AISampleOrder::definition() const { return me->def; } -void AILeanOrder::on_init_new( +void AISampleOrder::on_init_new( api::orderman::OrderDefinition const &def, const PreActivationOrderServices &services) { - { - std::vector data; - //caffe2::GlobalInit(&argc, &argv); - caffe2::GlobalInit(); - std::vector dims({1, /*image.channels(), image.rows, image.cols*/ 2, 4, 4}); - //TensorCPU tensor(dims, data, NULL); - Tensor tensor(dims, DeviceType::CPU); - - // Load Squeezenet model - NetDef init_net, predict_net; - - // >>> with open(path_to_INIT_NET) as f: - CAFFE_ENFORCE(ReadProtoFromFile("", &init_net)); - - // >>> with open(path_to_PREDICT_NET) as f: - CAFFE_ENFORCE(ReadProtoFromFile("", &predict_net)); - - // >>> p = workspace.Predictor(init_net, predict_net) - Workspace workspace("tmp"); - CAFFE_ENFORCE(workspace.RunNetOnce(init_net)); - auto input = workspace.CreateBlob("data")->GetMutable(); - input->ResizeLike(tensor); - input->ShareData(tensor); - CAFFE_ENFORCE(workspace.RunNetOnce(predict_net)); - - // >>> results = p.run([img]) - auto &output_name = predict_net.external_output(0); - auto output = workspace.GetBlob(output_name)->Get(); - - } - me->def = def; me->state.mutable_dynamic(); @@ -136,7 +100,7 @@ void AILeanOrder::on_init_new( } } -void AILeanOrder::on_init_recovered( +void AISampleOrder::on_init_recovered( api::orderman::OrderRecord const &rec, const PreActivationOrderServices &) { auto const &def = rec.def(); me->def = def; @@ -167,7 +131,7 @@ void AILeanOrder::on_init_recovered( } } -void AILeanOrder::on_activate(Price p, Quantity q, +void AISampleOrder::on_activate(Price p, Quantity q, OrderServices &services, trace::CorID const &) { bts_assert(!me->services); @@ -206,7 +170,7 @@ void AILeanOrder::on_activate(Price p, Quantity q, report_state(); } -void AILeanOrder::on_update(Price p, Quantity q, trace::CorID const &) { +void AISampleOrder::on_update(Price p, Quantity q, trace::CorID const &) { switch (me->state.status()) { case ORDER_STATUS_WORKING: case ORDER_STATUS_PENDING_WORKING: @@ -233,9 +197,9 @@ void AILeanOrder::on_update(Price p, Quantity q, trace::CorID const &) { report_state(); } -void AILeanOrder::on_crack(trace::CorID const &) {} +void AISampleOrder::on_crack(trace::CorID const &) {} -void AILeanOrder::on_cancel(trace::CorID const &) { +void AISampleOrder::on_cancel(trace::CorID const &) { switch (me->state.status()) { case ORDER_STATUS_WORKING: LOG(Plugin, Info, "Canceling DynamicIceberg Order {}", key().value()); @@ -260,7 +224,7 @@ void AILeanOrder::on_cancel(trace::CorID const &) { report_state(); } -void AILeanOrder::report_state() { +void AISampleOrder::report_state() { if (me->child.state.filled_quantity()) { api::orderman::OrderState merged_state; merge_states(me->state, me->child.state, &merged_state); @@ -269,7 +233,7 @@ void AILeanOrder::report_state() { me->services->report_state(me->state); } -void AILeanOrder::merge_states( +void AISampleOrder::merge_states( api::orderman::OrderState const &iceberg_state, api::orderman::OrderState const &child_state, api::orderman::OrderState *merged) { @@ -288,7 +252,7 @@ void AILeanOrder::merge_states( (child_order_fills + iceberg_fills)); } -void AILeanOrder::send_next_child_order() { +void AISampleOrder::send_next_child_order() { bts_assert(me->state.quantity() > me->state.filled_quantity()); auto remaining = me->state.quantity() - me->state.filled_quantity(); @@ -303,7 +267,7 @@ void AILeanOrder::send_next_child_order() { me->child.order.activate(Price(me->state.price()), Quantity(to_send)); } -void AILeanOrder::on_child_order_update( +void AISampleOrder::on_child_order_update( OrderStateUpdateEvent const &ev) { switch (me->state.status()) { case ORDER_STATUS_WORKING: @@ -377,7 +341,7 @@ void AILeanOrder::on_child_order_update( report_state(); } -void AILeanOrder::transition(api::orderman::OrderStatus new_status, +void AISampleOrder::transition(api::orderman::OrderStatus new_status, std::string const &msg) { auto const &from = OrderStatus_Name(me->state.status()); auto const &to = OrderStatus_Name(new_status); @@ -388,7 +352,7 @@ void AILeanOrder::transition(api::orderman::OrderStatus new_status, me->state.set_status(new_status); } -void AILeanOrder::transition(api::orderman::OrderStatus new_status) { +void AISampleOrder::transition(api::orderman::OrderStatus new_status) { auto const &from = OrderStatus_Name(me->state.status()); auto const &to = OrderStatus_Name(new_status); LOG(OrderMan, Info, "Transitioning dynamic iceberg order {} from {} to {}", @@ -405,7 +369,7 @@ DynamicOrderDescriptor get_order_desc() DynamicOrderDescriptor desc; // order type name - desc.set_dynamic_order_type("AILeanOrder"); + desc.set_dynamic_order_type("AISampleOrder"); // show size auto param = desc.add_param_desc(); @@ -425,7 +389,7 @@ extern "C" void init_spark_plugin(bts::SparkServices &serv) { if (config::get().type() == "dev") { serv.register_dynamic_order(get_order_desc(), - []() { return std::make_unique(); }); + []() { return std::make_unique(); }); LOG(Plugin,Info, "Initialized ai_order_plugin_example.so"); } } diff --git a/src/sdk/examples/build_examples.sh b/src/sdk/examples/build_examples.sh index 0a3ca08b9..1c2a4a415 100755 --- a/src/sdk/examples/build_examples.sh +++ b/src/sdk/examples/build_examples.sh @@ -13,28 +13,6 @@ g++ -isystem ../externals/include \ -ldl - -if [ -d "./../../../../../torch/" ]; then - -g++ -isystem ../externals/include \ - -I ../include \ - -I ../include/spark \ - -I ../torch/include \ - -std=c++1z \ - -fPIC \ - -g \ - -shared \ - -o ai_order_plugin_example.so \ - ai_order_plugin_example.cpp \ - -Wl,-rpath,.. \ - -Wl,-rpath,./lib \ - -Wl,-rpath,../lib \ - -L ../lib \ - -l spark \ - -L ../torch/lib \ - -l caffe2 -else - g++ -isystem ../externals/include \ -I ../include \ -I ../include/spark \ @@ -48,5 +26,29 @@ g++ -isystem ../externals/include \ -L ../lib \ -l spark + +g++ -isystem ../externals/include \ + -I ../include \ + -I ../include/spark \ + -I ../externals/include \ + -std=c++1z \ + -fPIC \ + -g \ + -shared \ + -o ai_order_plugin_example.so \ + ai_order_plugin_example.cpp \ + ../tensorflow/tfexecute.cpp \ + ../tensorflow/tfloader.cpp \ + -Wl,-rpath,. \ + -Wl,-rpath,.. \ + -Wl,-rpath,../lib \ + -L ../lib \ + -l spark \ + -L ../externals/lib \ + -l tensorflow_cc + +if [ -f "../../server/libtensorflow_cc.so" ]; then + rm ../../server/libtensorflow_cc.so fi +ln -s ../../../externals/linux/lib/Release/libtensorflow_cc.so ../../server/ diff --git a/src/sdk/make_sdk.sh b/src/sdk/make_sdk.sh index 2a87e408f..c07e8a93f 100755 --- a/src/sdk/make_sdk.sh +++ b/src/sdk/make_sdk.sh @@ -26,18 +26,13 @@ ln -sf $1/server $1/sdk/lib mkdir $1/sdk/examples cp $2/examples/* $1/sdk/examples -#torch is outside the spark repo, I didn't want to force a subrepo just yet -if [ -d "$2/../../../torch/" ]; then - mkdir -p $1/sdk/torch/ - ln -sf $2/../../../torch/linux/include $1/sdk/torch/include - ln -sf $2/../../../torch/linux/lib $1/sdk/torch/lib -fi +mkdir $1/sdk/tensorflow +cp $2/tensorflow/* $1/sdk/tensorflow cp $2/sdk_shell.sh $1/sdk/sdk_shell.sh cp $2/update_github.sh $1/sdk/update_github.sh cp $2/README.md $1/sdk/README.md -# ln -sf $1/sdk/lib/defaults $1/sdk/examples/defaults chmod +x $1/sdk/examples/build_examples.sh chmod +x $1/sdk/sdk_shell.sh chmod +x $1/sdk/update_github.sh diff --git a/src/sdk/tensorflow/tfexecute.cpp b/src/sdk/tensorflow/tfexecute.cpp new file mode 100644 index 000000000..c1f1f88af --- /dev/null +++ b/src/sdk/tensorflow/tfexecute.cpp @@ -0,0 +1,27 @@ +#include "tfexecute.h" + +#include "tensorflow/core/public/session.h" +#include "tensorflow/cc/saved_model/loader.h" + +using namespace tensorflow; + +namespace bts +{ +namespace ml +{ + +tensorflow::Status execute(const tensorflow::SavedModelBundle& bundle, + const std::vector >& inputs, + const std::vector& output_tensor_names, + const std::vector& target_node_names, + std::vector* outputs) +{ + tensorflow::RunMetadata* run_metadata = nullptr; + tensorflow::RunOptions run_options; + Status status = bundle.session->Run(run_options, inputs, output_tensor_names, target_node_names, outputs, run_metadata); + return status; +} + + +} +} \ No newline at end of file diff --git a/src/sdk/tensorflow/tfexecute.h b/src/sdk/tensorflow/tfexecute.h new file mode 100644 index 000000000..43eeb0c77 --- /dev/null +++ b/src/sdk/tensorflow/tfexecute.h @@ -0,0 +1,24 @@ +#pragma once + +#include +#include +#include "tensorflow/core/platform/env.h" + +namespace tensorflow +{ + class Tensor; + struct SavedModelBundle; +} + +namespace bts +{ +namespace ml +{ + + tensorflow::Status execute(const tensorflow::SavedModelBundle& bundle, + const std::vector >& inputs, + const std::vector& output_tensor_names, + const std::vector& target_node_names, + std::vector* outputs); +} +} diff --git a/src/sdk/tensorflow/tfloader.cpp b/src/sdk/tensorflow/tfloader.cpp new file mode 100644 index 000000000..69698b56d --- /dev/null +++ b/src/sdk/tensorflow/tfloader.cpp @@ -0,0 +1,29 @@ +#include "tfloader.h" + +#include "tensorflow/cc/saved_model/loader.h" +#include "lib/utils/helper_macros.h" + +using namespace tensorflow; + +namespace bts +{ +namespace ml +{ + +tensorflow::Status load_tf_model(const std::string& export_dir, const std::unordered_set& tags, SavedModelBundle* const bundle) +{ + tensorflow::SessionOptions session_options; //defaults + tensorflow::RunOptions run_options; + UNUSED(export_dir); + UNUSED(tags); + UNUSED(bundle); + + Status status = LoadSavedModel(session_options, run_options, export_dir, tags, bundle); + return status; + + //return tensorflow::Status(); +} + + +} +} \ No newline at end of file diff --git a/src/sdk/tensorflow/tfloader.h b/src/sdk/tensorflow/tfloader.h new file mode 100644 index 000000000..3870d3d40 --- /dev/null +++ b/src/sdk/tensorflow/tfloader.h @@ -0,0 +1,21 @@ +#pragma once + +#include +#include +#include "tensorflow/core/platform/env.h" + +namespace tensorflow +{ + struct SavedModelBundle; +} + +namespace bts +{ +namespace ml +{ + ///call Status.ok() for a boolean + tensorflow::Status load_tf_model(const std::string& export_dir, const std::unordered_set& tags, + tensorflow::SavedModelBundle* const bundle); + +} +}