milvus-io
/
milvus
mirror of https://github.com/milvus-io/milvus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

23 Add unittest to improve code coverage 

Former-commit-id: 5d5629da7cad9503816f63917425bcde3c5b6a90
pull/191/head
Yu Kun 2019-10-16 20:55:55 +08:00
parent e7dd603dba
commit e819c96777
8 changed files with 100 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -190,6 +190,7 @@ Please mark all change in change log and use the ticket from JIRA.
- MS-570 - Add prometheus docker-compose file
- MS-576 - Scheduler refactor
- MS-592 - Change showtables stream transport to unary
#23 Add unittest to improve code coverage
## New Feature
- MS-343 - Implement ResourceMgr

112
core/src/scheduler/optimizer/LargeSQ8HPass.cpp
View File

@ -15,59 +15,59 @@
// specific language governing permissions and limitations
// under the License.
//#include "scheduler/optimizer/LargeSQ8HPass.h"
//#include "cache/GpuCacheMgr.h"
//#include "scheduler/SchedInst.h"
//#include "scheduler/Utils.h"
//#include "scheduler/task/SearchTask.h"
//#include "scheduler/tasklabel/SpecResLabel.h"
//#include "utils/Log.h"
//
//namespace milvus {
//namespace scheduler {
//
//bool
//LargeSQ8HPass::Run(const TaskPtr& task) {
// if (task->Type() != TaskType::SearchTask) {
// return false;
// }
//
// auto search_task = std::static_pointer_cast<XSearchTask>(task);
// if (search_task->file_->engine_type_ != (int)engine::EngineType::FAISS_IVFSQ8H) {
// return false;
// }
//
// auto search_job = std::static_pointer_cast<SearchJob>(search_task->job_.lock());
//
// // TODO: future, Index::IVFSQ8H, if nq < threshold set cpu, else set gpu
// if (search_job->nq() < 100) {
// return false;
// }
//
// std::vector<uint64_t> gpus = scheduler::get_gpu_pool();
// std::vector<int64_t> all_free_mem;
// for (auto& gpu : gpus) {
// auto cache = cache::GpuCacheMgr::GetInstance(gpu);
// auto free_mem = cache->CacheCapacity() - cache->CacheUsage();
// all_free_mem.push_back(free_mem);
// }
//
// auto max_e = std::max_element(all_free_mem.begin(), all_free_mem.end());
// auto best_index = std::distance(all_free_mem.begin(), max_e);
// auto best_device_id = gpus[best_index];
//
// ResourcePtr res_ptr = ResMgrInst::GetInstance()->GetResource(ResourceType::GPU, best_device_id);
// if (not res_ptr) {
// SERVER_LOG_ERROR << "GpuResource " << best_device_id << " invalid.";
// // TODO: throw critical error and exit
// return false;
// }
//
// auto label = std::make_shared<SpecResLabel>(std::weak_ptr<Resource>(res_ptr));
// task->label() = label;
//
// return true;
//}
//
//} // namespace scheduler
//} // namespace milvus
#include "scheduler/optimizer/LargeSQ8HPass.h"
#include "cache/GpuCacheMgr.h"
#include "scheduler/SchedInst.h"
#include "scheduler/Utils.h"
#include "scheduler/task/SearchTask.h"
#include "scheduler/tasklabel/SpecResLabel.h"
#include "utils/Log.h"
namespace milvus {
namespace scheduler {
bool
LargeSQ8HPass::Run(const TaskPtr& task) {
// if (task->Type() != TaskType::SearchTask) {
// return false;
// }
//
// auto search_task = std::static_pointer_cast<XSearchTask>(task);
// if (search_task->file_->engine_type_ != (int)engine::EngineType::FAISS_IVFSQ8H) {
// return false;
// }
//
// auto search_job = std::static_pointer_cast<SearchJob>(search_task->job_.lock());
//
// // TODO: future, Index::IVFSQ8H, if nq < threshold set cpu, else set gpu
// if (search_job->nq() < 100) {
// return false;
// }
//
// std::vector<uint64_t> gpus = scheduler::get_gpu_pool();
// std::vector<int64_t> all_free_mem;
// for (auto& gpu : gpus) {
// auto cache = cache::GpuCacheMgr::GetInstance(gpu);
// auto free_mem = cache->CacheCapacity() - cache->CacheUsage();
// all_free_mem.push_back(free_mem);
// }
//
// auto max_e = std::max_element(all_free_mem.begin(), all_free_mem.end());
// auto best_index = std::distance(all_free_mem.begin(), max_e);
// auto best_device_id = gpus[best_index];
//
// ResourcePtr res_ptr = ResMgrInst::GetInstance()->GetResource(ResourceType::GPU, best_device_id);
// if (not res_ptr) {
// SERVER_LOG_ERROR << "GpuResource " << best_device_id << " invalid.";
// // TODO: throw critical error and exit
// return false;
// }
//
// auto label = std::make_shared<SpecResLabel>(std::weak_ptr<Resource>(res_ptr));
// task->label() = label;
//
// return true;
}
} // namespace scheduler
} // namespace milvus

62
core/src/scheduler/optimizer/LargeSQ8HPass.h
View File

@ -14,34 +14,34 @@
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.
//#pragma once
//
//#include <condition_variable>
//#include <deque>
//#include <list>
//#include <memory>
//#include <mutex>
//#include <queue>
//#include <string>
//#include <thread>
//#include <unordered_map>
//#include <vector>
//
//#include "Pass.h"
//
//namespace milvus {
//namespace scheduler {
//
//class LargeSQ8HPass : public Pass {
// public:
// LargeSQ8HPass() = default;
//
// public:
// bool
// Run(const TaskPtr& task) override;
//};
//
//using LargeSQ8HPassPtr = std::shared_ptr<LargeSQ8HPass>;
//
//} // namespace scheduler
//} // namespace milvus
#pragma once
#include <condition_variable>
#include <deque>
#include <list>
#include <memory>
#include <mutex>
#include <queue>
#include <string>
#include <thread>
#include <unordered_map>
#include <vector>
#include "Pass.h"
namespace milvus {
namespace scheduler {
class LargeSQ8HPass : public Pass {
public:
LargeSQ8HPass() = default;
public:
bool
Run(const TaskPtr& task) override;
};
using LargeSQ8HPassPtr = std::shared_ptr<LargeSQ8HPass>;
} // namespace scheduler
} // namespace milvus

12
core/src/scheduler/optimizer/Optimizer.cpp
View File

@ -20,12 +20,12 @@
namespace milvus {
namespace scheduler {
//void
//Optimizer::Init() {
// for (auto& pass : pass_list_) {
// pass->Init();
// }
//}
void
Optimizer::Init() {
// for (auto& pass : pass_list_) {
// pass->Init();
// }
}
bool
Optimizer::Run(const TaskPtr& task) {

4
core/src/scheduler/optimizer/Optimizer.h
View File

@ -38,8 +38,8 @@ class Optimizer {
explicit Optimizer(std::vector<PassPtr> pass_list) : pass_list_(std::move(pass_list)) {
}
// void
// Init();
void
Init();
bool
Run(const TaskPtr& task);

6
core/src/scheduler/optimizer/Pass.h
View File

@ -34,9 +34,9 @@ namespace scheduler {
class Pass {
public:
// virtual void
// Init() {
// }
virtual void
Init() {
}
virtual bool
Run(const TaskPtr& task) = 0;

4
core/src/scheduler/task/TestTask.cpp
View File

@ -44,9 +44,7 @@ TestTask::Execute() {
void
TestTask::Wait() {
std::unique_lock<std::mutex> lock(mutex_);
cv_.wait(lock, [&] {
return done_;
});
cv_.wait(lock, [&] { return done_; });
}
} // namespace scheduler

1
core/unittest/scheduler/task_test.cpp
View File

@ -32,7 +32,6 @@ TEST(TaskTest, INVALID_INDEX) {
build_task->Load(LoadType::TEST, 10);
build_task->Execute();
}
} // namespace scheduler