PredictorWrapperWPtr PredictorWrapper::instance;
-const static std::string PREDICTOR_PY_DIR = "./python";
const static std::string TAG = "PredictorWrapper";
static std::string parse_python_exception();
return list;
}
-PredictorWrapperPtr PredictorWrapper::create(const std::string& fname)
+PredictorWrapperPtr PredictorWrapper::create(const std::string& python_dir, const std::string& model_path)
{
if (instance.lock()){
return PredictorWrapperPtr();
}
- PredictorWrapperPtr ins (new PredictorWrapper(fname));
+ PredictorWrapperPtr ins (new PredictorWrapper(python_dir, model_path));
instance = ins;
return ins;
}
return rr;
}
-PredictorWrapper::PredictorWrapper(const std::string& fname)
+PredictorWrapper::PredictorWrapper(const std::string& py_dir, const std::string& model_path)
{
Py_Initialize();
try{
py::object main_module = py::import("__main__");
py::object main_namespace = main_module.attr("__dict__");
py::exec("import sys", main_namespace);
- std::string cmd = "sys.path.insert(0, '" + PREDICTOR_PY_DIR + "')";
+ std::string cmd = "sys.path.insert(0, '" + py_dir + "')";
py::exec(cmd.c_str(), main_namespace);
py::exec("import signal", main_namespace);
py::exec("signal.signal(signal.SIGINT, signal.SIG_DFL)", main_namespace);
py::object predictor_init = predictor_mod.attr("init");
dump_func = predictor_mod.attr("dump");
predict_func = predictor_mod.attr("predict");
- predictor_init(fname.c_str());
+ predictor_init(model_path.c_str());
} catch (boost::python::error_already_set const &){
std::string perror_str = parse_python_exception();
LOG_ERROR(TAG, "Error in Python: " + perror_str)