Resolve build conflicts with master

This commit is contained in:
Baiju Meswani 2022-07-05 19:51:47 +00:00
parent 4a335e979f
commit 1aa27e127c
2 changed files with 7 additions and 4 deletions

View file

@ -1632,11 +1632,14 @@ set(onnxruntime_DELAYLOAD_FLAGS "")
include_directories(
${ONNXRUNTIME_INCLUDE_DIR}
${REPO_ROOT}/include/onnxruntime/core/session
if (onnxruntime_ENABLE_TRAINING_ON_DEVICE)
${REPO_ROOT}/orttraining/orttraining/training_api/include/
endif()
)
if (onnxruntime_ENABLE_TRAINING_ON_DEVICE)
include_directories(
${REPO_ROOT}/orttraining/orttraining/training_api/include/
)
endif()
if (onnxruntime_USE_OPENVINO)
add_definitions(-DUSE_OPENVINO=1)

View file

@ -109,7 +109,7 @@ Module::Module(const std::string& train_model_path_or_bytes,
ORT_ENFORCE(params_iter != named_parameters_.end());
// Retrieve the target device for "param_name"
std::vector<SessionState::NodeInfo> node_info_vec;
InlinedVector<SessionState::NodeInfo> node_info_vec;
ORT_THROW_IF_ERROR(train_sess_state.GetInputNodeInfo(param_name, node_info_vec));
const auto& node_info = node_info_vec.front();
const auto target_device = *node_info.device;