Revert "Merge remote-tracking branch 'bingyu/develop' into lqchen"

This reverts commit 3f1b765, reversing changes made to f2541b5.
uwsampl · Apr 18, 2019 · c623092 · c623092
1 parent 3f1b765
commit c623092
Show file tree

Hide file tree

Showing 28 changed files with 23 additions and 1,524 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -93,7 +93,6 @@ set_target_properties(common PROPERTIES POSITION_INDEPENDENT_CODE ON)
 ###### scheduler ######
 add_executable(scheduler
         src/nexus/scheduler/backend_delegate.cpp
-        src/nexus/scheduler/complex_query.cpp
         src/nexus/scheduler/frontend_delegate.cpp
         src/nexus/scheduler/sch_info.cpp
         src/nexus/scheduler/scheduler.cpp

diff --git a/apps/traffic_app_simple/Dockerfile b/apps/traffic_app_simple/Dockerfile
diff --git a/apps/traffic_app_simple/Makefile b/apps/traffic_app_simple/Makefile
diff --git a/apps/traffic_app_simple/src/main.cpp b/apps/traffic_app_simple/src/main.cpp
diff --git a/src/nexus/app/ complex_query_app.cpp b/src/nexus/app/ complex_query_app.cpp
diff --git a/src/nexus/app/app_base.cpp b/src/nexus/app/app_base.cpp
@@ -21,26 +21,17 @@ void AppBase::Start() {
   Run(qp_, nthreads_);
 }
 
-std::shared_ptr<ModelHandler> AppBase::GetModelHandler(bool complex_query,
+std::shared_ptr<ModelHandler> AppBase::GetModelHandler(
     const std::string& framework, const std::string& model_name,
     uint32_t version, uint64_t latency_sla, float estimate_workload,
     std::vector<uint32_t> image_size, LoadBalancePolicy lb_policy) {
   LoadModelRequest req;
   req.set_node_id(node_id());
-  req.set_complex_query(complex_query);
   auto model_sess = req.mutable_model_session();
   model_sess->set_framework(framework);
   model_sess->set_model_name(model_name);
   model_sess->set_version(version);
-  if(complex_query) {
-    model_sess->set_latency_sla(0);
-  } else {
-    model_sess->set_latency_sla(latency_sla);
-  }
-  model_sess->set_estimate_latency(latency_sla);
-  LOG(INFO) << "[---LoadModelRequest---latency]" << latency_sla;
-  LOG(INFO) << "[---LoadModelRequest---latency & est_lat]" <<model_sess->latency_sla()<< model_sess->estimate_latency();
-
+  model_sess->set_latency_sla(latency_sla);
   if (image_size.size() > 0) {
     if (image_size.size() != 2) {
       LOG(ERROR) << "Image size is not 2";

diff --git a/src/nexus/app/app_base.h b/src/nexus/app/app_base.h
@@ -23,7 +23,7 @@ class AppBase : public Frontend {
   //virtual void Process(const RequestProto& request, ReplyProto* reply) {}
 
  protected:
-  std::shared_ptr<ModelHandler> GetModelHandler(const bool complex_query,
+  std::shared_ptr<ModelHandler> GetModelHandler(
       const std::string& framework, const std::string& model_name,
       uint32_t version, uint64_t latency_sla, float estimate_workload=0.,
       std::vector<uint32_t> image_size={},

diff --git a/src/nexus/app/complex_query_app.h b/src/nexus/app/complex_query_app.h