From b10a2d05273b2f78a30b295163f2039033609d10 Mon Sep 17 00:00:00 2001 From: Ranjit Ranjan Date: Tue, 18 Apr 2023 02:05:01 -0500 Subject: [PATCH 4/7] merge fixed --- onnxruntime/core/mlas/lib/platform.cpp | 1 - onnxruntime/test/contrib_ops/function_test_util.h | 2 +- tools/ci_build/gen_def.py | 4 ++-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/onnxruntime/core/mlas/lib/platform.cpp b/onnxruntime/core/mlas/lib/platform.cpp index 84846e2f8..46370c27b 100644 --- a/onnxruntime/core/mlas/lib/platform.cpp +++ b/onnxruntime/core/mlas/lib/platform.cpp @@ -492,7 +492,6 @@ Return Value: #endif #endif -#endif // __linux__ #endif // MLAS_TARGET_POWER } diff --git a/onnxruntime/test/contrib_ops/function_test_util.h b/onnxruntime/test/contrib_ops/function_test_util.h index f2b8eed25..9ed79d0f2 100644 --- a/onnxruntime/test/contrib_ops/function_test_util.h +++ b/onnxruntime/test/contrib_ops/function_test_util.h @@ -128,7 +128,7 @@ struct FunctionTestCase { input_args.emplace_back(input_name, &arg_type); if (GenData) { - std::vector data = random(shapeforrandom); + std::vector data = random(shape); OrtValue ort_value; CreateMLValue(provider->GetAllocator(0, OrtMemTypeDefault), shape, data, &ort_value); input_values.push_back(std::make_pair(input_name, ort_value)); diff --git a/tools/ci_build/gen_def.py b/tools/ci_build/gen_def.py index 5fc8a5fb3..1e0f824e0 100755 --- a/tools/ci_build/gen_def.py +++ b/tools/ci_build/gen_def.py @@ -41,7 +41,7 @@ with open(args.output, "w") as file: elif args.style == "xcode": pass # xcode compile don't has any header. else: - pass + pass #file.write("VERS_%s {\n" % VERSION_STRING) #file.write(" global:\n") @@ -55,7 +55,7 @@ with open(args.output, "w") as file: symbol_index += 1 if args.style == "gcc": - pass + pass #file.write(" local:\n") #file.write(" *;\n") #file.write("}; \n") -- 2.38.3