Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MIGraphX EP] Set External Data Path #21598

Merged
merged 3 commits into from
Aug 2, 2024
Merged

[MIGraphX EP] Set External Data Path #21598

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9310768
[MIGraphX EP] Set external data path option
jeffdaily Jul 10, 2024
54362d7
fix compilation for v1.19+
apwojcik Jul 24, 2024
c31472d
Handle case with missing parent path so we use current path
Aug 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions onnxruntime/core/providers/migraphx/migraphx_execution_provider.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
#include <iterator>
#include <unordered_map>
#include <set>
#include <filesystem>

#include "core/providers/shared_library/provider_api.h"
#define ORT_API_MANUAL_INIT
Expand Down Expand Up @@ -990,6 +991,7 @@
model_proto->set_ir_version(ONNX_NAMESPACE::Version::IR_VERSION);
std::string onnx_string_buffer;
model_proto->SerializeToString(onnx_string_buffer);
model_path_ = graph_viewer.ModelPath();

// dump onnx file if environment var is set
if (dump_model_ops_) {
Expand Down Expand Up @@ -1168,7 +1170,7 @@
auto param_shapes = prog.get_parameter_shapes();

// Add all calibration data read in from int8 table
for (auto& [cal_key, cal_val] : dynamic_range_map) {
for (auto& [cal_key, cal_val] : dynamic_range_map_) {
auto cal_val_shape = migraphx::shape(migraphx_shape_float_type);
quant_params.add(cal_key.c_str(), migraphx::argument(cal_val_shape, static_cast<void*>(std::move(&cal_val))));
}
Expand Down Expand Up @@ -1217,7 +1219,7 @@
*p = {context->allocate_func, context->release_func, context->allocator_handle, map_progs_[context->node_name],
map_onnx_string_[context->node_name], options, t_, map_input_index_[context->node_name], &mgx_mu_,
map_no_input_shape_[context->node_name], fp16_enable_, int8_enable_,
int8_calibration_cache_available_, dynamic_range_map,
int8_calibration_cache_available_, dynamic_range_map_,
save_compiled_model_, save_compiled_path_,
load_compiled_model_, load_compiled_path_, dump_model_ops_};
*state = p.release();
Expand Down Expand Up @@ -1297,6 +1299,7 @@
if (!input_shape_match) {
if (!load_precompiled_model(prog, load_compiled_model_, std::string{load_compiled_path_})) {
LOGS_DEFAULT(VERBOSE) << "No Input shapes mismatch detected. Recompiling" << std::endl;
cmp_options.set_external_data_path(model_path_.has_parent_path() ? model_path_.parent_path().string() : std::filesystem::current_path().string());

Check warning on line 1302 in onnxruntime/core/providers/migraphx/migraphx_execution_provider.cc

View workflow job for this annotation

GitHub Actions / Optional Lint C++ 

[cpplint] reported by reviewdog 🐶
 Lines should be <= 120 characters long  [whitespace/line_length] [2]

Raw Output:
onnxruntime/core/providers/migraphx/migraphx_execution_provider.cc:1302:  Lines should be <= 120 characters long  [whitespace/line_length] [2]
prog = migraphx::parse_onnx_buffer(onnx_string, cmp_options);

// Read in the calibration data and map it to an migraphx paramater map for the calibration ops
Expand Down
4 changes: 3 additions & 1 deletion onnxruntime/core/providers/migraphx/migraphx_execution_provider.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

#include <map>
#include <unordered_map>
#include <filesystem>

Check warning on line 14 in onnxruntime/core/providers/migraphx/migraphx_execution_provider.h

View workflow job for this annotation

GitHub Actions / Optional Lint C++ 

[cpplint] reported by reviewdog 🐶
 Found C++ system header after other header. Should be: migraphx_execution_provider.h, c system, c++ system, other.  [build/include_order] [4]

Raw Output:
onnxruntime/core/providers/migraphx/migraphx_execution_provider.h:14:  Found C++ system header after other header. Should be: migraphx_execution_provider.h, c system, c++ system, other.  [build/include_order] [4]

namespace onnxruntime {

Expand Down Expand Up @@ -91,7 +92,7 @@
bool int8_calibration_cache_available_ = false;
bool int8_use_native_migraphx_calibration_table_ = false;
std::string calibration_cache_path_;
std::unordered_map<std::string, float> dynamic_range_map;
std::unordered_map<std::string, float> dynamic_range_map_;
bool save_compiled_model_ = false;
std::string save_compiled_path_;
bool load_compiled_model_ = false;
Expand All @@ -100,6 +101,7 @@
migraphx::target t_;
OrtMutex mgx_mu_;
hipStream_t stream_ = nullptr;
mutable std::filesystem::path model_path_;

std::unordered_map<std::string, migraphx::program> map_progs_;
std::unordered_map<std::string, std::string> map_onnx_string_;
Expand Down
Loading