diff --git a/onnxruntime/test/onnx/vstest_logger.cc b/onnxruntime/test/onnx/vstest_logger.cc deleted file mode 100644 index 8f8e54e36bf33..0000000000000 --- a/onnxruntime/test/onnx/vstest_logger.cc +++ /dev/null @@ -1,32 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -#include "vstest_logger.h" -#include -#include -#include -#include - -#include "date/date.h" - -#include "core/common/logging/capture.h" -#include "core/common/logging/isink.h" - -void VsTestSink::SendImpl(const ::onnxruntime::logging::Timestamp& timestamp, const std::string& logger_id_, const ::onnxruntime::logging::Capture& message) { - // operator for formatting of timestamp in ISO8601 format including microseconds - using date::operator<<; - - // Two options as there may be multiple calls attempting to write to the same sink at once: - // 1) Use mutex to synchronize access to the stream. - // 2) Create the message in an ostringstream and output in one call. - // - // Going with #2 as it should scale better at the cost of creating the message in memory first - // before sending to the stream. - - std::ostringstream msg; - - msg << timestamp << " [" << message.SeverityPrefix() << ":" << message.Category() << ":" << logger_id_ << ", " - << message.Location().ToString() << "] " << message.Message(); - std::string s = msg.str(); - Microsoft::VisualStudio::CppUnitTestFramework::Logger::WriteMessage(s.c_str()); -} diff --git a/onnxruntime/test/onnx/vstest_logger.h b/onnxruntime/test/onnx/vstest_logger.h deleted file mode 100644 index 569d8ae473554..0000000000000 --- a/onnxruntime/test/onnx/vstest_logger.h +++ /dev/null @@ -1,49 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -#include -#include "core/common/logging/isink.h" -#include "TestCaseResult.h" -#include - -class VsTestSink : public onnxruntime::logging::ISink { - public: - void SendImpl(const onnxruntime::logging::Timestamp& timestamp, const std::string& logger_id_, const onnxruntime::logging::Capture& message) override; -}; - -namespace Microsoft { -namespace VisualStudio { -namespace CppUnitTestFramework { -template <> -std::wstring ToString<>(const EXECUTE_RESULT& q) { - switch (q) { - case EXECUTE_RESULT::SUCCESS: - return L"SUCCESS"; - case EXECUTE_RESULT::UNKNOWN_ERROR: - return L"UNKNOWN_ERROR"; - case EXECUTE_RESULT::WITH_EXCEPTION: - return L"WITH_EXCEPTION"; - case EXECUTE_RESULT::RESULT_DIFFERS: - return L"RESULT_DIFFERS"; - case EXECUTE_RESULT::SHAPE_MISMATCH: - return L"SHAPE_MISMATCH"; - case EXECUTE_RESULT::TYPE_MISMATCH: - return L"TYPE_MISMATCH"; - case EXECUTE_RESULT::NOT_SUPPORT: - return L"NOT_SUPPORT"; - case EXECUTE_RESULT::LOAD_MODEL_FAILED: - return L"LOAD_MODEL_FAILED"; - case EXECUTE_RESULT::INVALID_GRAPH: - return L"INVALID_GRAPH"; - case EXECUTE_RESULT::INVALID_ARGUMENT: - return L"INVALID_ARGUMENT"; - case EXECUTE_RESULT::MODEL_SHAPE_MISMATCH: - return L"MODEL_SHAPE_MISMATCH"; - case EXECUTE_RESULT::MODEL_TYPE_MISMATCH: - return L"MODEL_TYPE_MISMATCH"; - } - return L"UNKNOWN_RETURN_CODE"; -} -} // namespace CppUnitTestFramework -} // namespace VisualStudio -} // namespace Microsoft diff --git a/onnxruntime/test/onnx/vstest_main.cc b/onnxruntime/test/onnx/vstest_main.cc deleted file mode 100644 index 1ea68ede1fa43..0000000000000 --- a/onnxruntime/test/onnx/vstest_main.cc +++ /dev/null @@ -1,110 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -#include -#include -#include -#include -#include -#include "core/session/onnxruntime_cxx_api.h" -#include "runner.h" -#include "test_allocator.h" -#include -#include -//#include "vstest_logger.h" -using onnxruntime::SessionOptionsWrapper; -using namespace Microsoft::VisualStudio::CppUnitTestFramework; -using std::experimental::filesystem::v1::path; -namespace Microsoft { -namespace VisualStudio { -namespace CppUnitTestFramework { -template <> -std::wstring ToString<>(const EXECUTE_RESULT& q) { - switch (q) { - case EXECUTE_RESULT::SUCCESS: - return L"SUCCESS"; - case EXECUTE_RESULT::UNKNOWN_ERROR: - return L"UNKNOWN_ERROR"; - case EXECUTE_RESULT::WITH_EXCEPTION: - return L"WITH_EXCEPTION"; - case EXECUTE_RESULT::RESULT_DIFFERS: - return L"RESULT_DIFFERS"; - case EXECUTE_RESULT::SHAPE_MISMATCH: - return L"SHAPE_MISMATCH"; - case EXECUTE_RESULT::TYPE_MISMATCH: - return L"TYPE_MISMATCH"; - case EXECUTE_RESULT::NOT_SUPPORT: - return L"NOT_SUPPORT"; - case EXECUTE_RESULT::LOAD_MODEL_FAILED: - return L"LOAD_MODEL_FAILED"; - case EXECUTE_RESULT::INVALID_GRAPH: - return L"INVALID_GRAPH"; - case EXECUTE_RESULT::INVALID_ARGUMENT: - return L"INVALID_ARGUMENT"; - case EXECUTE_RESULT::MODEL_SHAPE_MISMATCH: - return L"MODEL_SHAPE_MISMATCH"; - case EXECUTE_RESULT::MODEL_TYPE_MISMATCH: - return L"MODEL_TYPE_MISMATCH"; - } - return L"UNKNOWN_RETURN_CODE"; -} -} // namespace CppUnitTestFramework -} // namespace VisualStudio -} // namespace Microsoft - -static void run(ONNXEnv* env, SessionOptionsWrapper& sf, const wchar_t* test_folder) { - char buf[1024]; - std::vector res; - { - //Current working directory is the one who contains 'onnx_test_runner_vstest.dll' - //We want debug build and release build share the same test data files, so it should - //be one level up. - std::wstring test_folder_full_path(L"..\\models\\"); - test_folder_full_path.append(test_folder); - path p1(test_folder_full_path); - std::unique_ptr default_allocator(MockedONNXRuntimeAllocator::Create()); - std::vector tests = LoadTests({p1.c_str()}, {}, default_allocator.get()); - Assert::AreEqual((size_t)1, tests.size()); - int p_models = ::onnxruntime::Env::Default().GetNumCpuCores(); - if (tests[0]->GetTestCaseName() == "coreml_FNS-Candy_ImageNet") { - p_models = 2; - } - snprintf(buf, sizeof(buf), "running test %s with %d cores", tests[0]->GetTestCaseName().c_str(), p_models); - Logger::WriteMessage(buf); - ONNXRUNTIME_EVENT finish_event; - ::onnxruntime::Status status = CreateOnnxRuntimeEvent(&finish_event); - Assert::IsTrue(status.IsOK()); - Assert::IsNotNull(finish_event); - RunSingleTestCase(tests[0], sf, p_models, 1, GetDefaultThreadPool(::onnxruntime::Env::Default()), nullptr, [finish_event, &res](std::shared_ptr result, PTP_CALLBACK_INSTANCE pci) { - res = result->GetExcutionResult(); - return OnnxRuntimeSetEventWhenCallbackReturns(pci, finish_event); - }); - status = WaitAndCloseEvent(finish_event); - Assert::IsTrue(status.IsOK()); - Assert::AreEqual(tests[0]->GetDataCount(), res.size()); - delete tests[0]; - } - for (EXECUTE_RESULT r : res) { - Assert::AreEqual(EXECUTE_RESULT::SUCCESS, r); - } -} - -static ONNXEnv* env; - -TEST_MODULE_INITIALIZE(ModuleInitialize) { - ONNXStatus* ost = ONNXRuntimeInitialize(ONNXRUNTIME_LOGGING_LEVEL_kWARNING, "Default", &env); - if (ost != nullptr) { - Logger::WriteMessage(ONNXRuntimeGetErrorMessage(ost)); - ReleaseONNXStatus(ost); - Assert::Fail(L"create onnx env failed"); - } -} - -TEST_MODULE_CLEANUP(ModuleCleanup) { - ReleaseONNXEnv(env); -} -// clang-format off -TEST_CLASS(ONNX_TEST){ -public : -#include "vsts/tests.inc" -};