From fd8d29f8e1ebb51decaccee71aa6119275c11be1 Mon Sep 17 00:00:00 2001 From: Henning Baldersheim Date: Mon, 4 Sep 2023 11:40:48 +0000 Subject: Unify and modernize code and layout --- searchlib/src/vespa/searchlib/features/onnx_feature.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'searchlib') diff --git a/searchlib/src/vespa/searchlib/features/onnx_feature.cpp b/searchlib/src/vespa/searchlib/features/onnx_feature.cpp index cdeb0515659..61731a1c09a 100644 --- a/searchlib/src/vespa/searchlib/features/onnx_feature.cpp +++ b/searchlib/src/vespa/searchlib/features/onnx_feature.cpp @@ -35,7 +35,8 @@ namespace search::features { namespace { -vespalib::string normalize_name(const vespalib::string &name, const char *context) { +vespalib::string +normalize_name(const vespalib::string &name, const char *context) { vespalib::string result; for (char c: name) { if (isalnum(c)) { @@ -50,7 +51,8 @@ vespalib::string normalize_name(const vespalib::string &name, const char *contex return result; } -vespalib::string my_dry_run(const Onnx &model, const Onnx::WireInfo &wire) { +vespalib::string +my_dry_run(const Onnx &model, const Onnx::WireInfo &wire) { vespalib::string error_msg; try { Onnx::EvalContext context(model, wire); @@ -132,8 +134,7 @@ OnnxBlueprint::setup(const IIndexEnvironment &env, return fail("model setup failed: %s", ex.what()); } Onnx::WirePlanner planner; - for (size_t i = 0; i < _model->inputs().size(); ++i) { - const auto &model_input = _model->inputs()[i]; + for (const auto & model_input : _model->inputs()) { auto input_feature = model_cfg->input_feature(model_input.name); if (!input_feature.has_value()) { input_feature = fmt("rankingExpression(\"%s\")", normalize_name(model_input.name, "input").c_str()); @@ -151,8 +152,7 @@ OnnxBlueprint::setup(const IIndexEnvironment &env, } } planner.prepare_output_types(*_model); - for (size_t i = 0; i < _model->outputs().size(); ++i) { - const auto &model_output = _model->outputs()[i]; + for (const auto & model_output : _model->outputs()) { auto output_name = model_cfg->output_name(model_output.name); if (!output_name.has_value()) { output_name = normalize_name(model_output.name, "output"); -- cgit v1.2.3 From 56025c33579feab8bc93cfc10043f2f91257e8c4 Mon Sep 17 00:00:00 2001 From: Henning Baldersheim Date: Mon, 4 Sep 2023 13:40:43 +0000 Subject: Keep oneliners for free functions. --- eval/src/vespa/eval/onnx/onnx_wrapper.cpp | 12 ++++-------- searchlib/src/vespa/searchlib/features/onnx_feature.cpp | 6 ++---- 2 files changed, 6 insertions(+), 12 deletions(-) (limited to 'searchlib') diff --git a/eval/src/vespa/eval/onnx/onnx_wrapper.cpp b/eval/src/vespa/eval/onnx/onnx_wrapper.cpp index 2490457cb1d..89d88dcc32c 100644 --- a/eval/src/vespa/eval/onnx/onnx_wrapper.cpp +++ b/eval/src/vespa/eval/onnx/onnx_wrapper.cpp @@ -180,8 +180,7 @@ public: }; Ort::AllocatorWithDefaultOptions OnnxString::_alloc; -std::vector -make_dimensions(const Ort::ConstTensorTypeAndShapeInfo &tensor_info) { +std::vector make_dimensions(const Ort::ConstTensorTypeAndShapeInfo &tensor_info) { std::vector symbolic_sizes(tensor_info.GetDimensionsCount(), nullptr); tensor_info.GetSymbolicDimensions(symbolic_sizes.data(), symbolic_sizes.size()); auto shape = tensor_info.GetShape(); @@ -198,15 +197,13 @@ make_dimensions(const Ort::ConstTensorTypeAndShapeInfo &tensor_info) { return result; } -Onnx::TensorInfo -make_tensor_info(const OnnxString &name, const Ort::TypeInfo &type_info) { +Onnx::TensorInfo make_tensor_info(const OnnxString &name, const Ort::TypeInfo &type_info) { auto tensor_info = type_info.GetTensorTypeAndShapeInfo(); auto element_type = tensor_info.GetElementType(); return Onnx::TensorInfo{vespalib::string(name.get()), make_dimensions(tensor_info), make_element_type(element_type)}; } -Onnx::TensorType -get_type_of(const Ort::Value &value) { +Onnx::TensorType get_type_of(const Ort::Value &value) { auto tensor_info = value.GetTensorTypeAndShapeInfo(); auto element_type = tensor_info.GetElementType(); auto shape = tensor_info.GetShape(); @@ -218,8 +215,7 @@ get_type_of(const Ort::Value &value) { return {make_element_type(element_type), shape}; } -std::vector -extract_sizes(const ValueType &type) { +std::vector extract_sizes(const ValueType &type) { std::vector sizes; for (const auto &dim: type.dimensions()) { sizes.push_back(dim.size); diff --git a/searchlib/src/vespa/searchlib/features/onnx_feature.cpp b/searchlib/src/vespa/searchlib/features/onnx_feature.cpp index 61731a1c09a..a330a4ff325 100644 --- a/searchlib/src/vespa/searchlib/features/onnx_feature.cpp +++ b/searchlib/src/vespa/searchlib/features/onnx_feature.cpp @@ -35,8 +35,7 @@ namespace search::features { namespace { -vespalib::string -normalize_name(const vespalib::string &name, const char *context) { +vespalib::string normalize_name(const vespalib::string &name, const char *context) { vespalib::string result; for (char c: name) { if (isalnum(c)) { @@ -51,8 +50,7 @@ normalize_name(const vespalib::string &name, const char *context) { return result; } -vespalib::string -my_dry_run(const Onnx &model, const Onnx::WireInfo &wire) { +vespalib::string my_dry_run(const Onnx &model, const Onnx::WireInfo &wire) { vespalib::string error_msg; try { Onnx::EvalContext context(model, wire); -- cgit v1.2.3