From bfa1b0e96e0196a7accc1ef168c9338fdeb335a3 Mon Sep 17 00:00:00 2001 From: Colin Versteeg Date: Fri, 4 Oct 2019 16:39:40 -0700 Subject: [PATCH] Fix logger regression (#2011) * Fix regression in creating default logger from custom function * fix model naming issue in tests * fix version in addition to model name --- onnxruntime/core/session/onnxruntime_c_api.cc | 2 +- .../server/integration_tests/function_tests.py | 16 ++++++++-------- onnxruntime/test/server/unit_tests/test_main.cc | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/onnxruntime/core/session/onnxruntime_c_api.cc b/onnxruntime/core/session/onnxruntime_c_api.cc index 8a0466064b..000e27638c 100644 --- a/onnxruntime/core/session/onnxruntime_c_api.cc +++ b/onnxruntime/core/session/onnxruntime_c_api.cc @@ -102,7 +102,7 @@ ORT_API_STATUS_IMPL(OrtApis::CreateEnvWithCustomLogger, OrtLoggingFunction loggi std::unique_ptr logger = onnxruntime::make_unique(logging_function, logger_param); auto default_logging_manager = onnxruntime::make_unique(std::move(logger), static_cast(default_warning_level), false, - LoggingManager::InstanceType::Temporal, + LoggingManager::InstanceType::Default, &name); std::unique_ptr env; Status status = Environment::Create(env); diff --git a/onnxruntime/test/server/integration_tests/function_tests.py b/onnxruntime/test/server/integration_tests/function_tests.py index e91a0a26df..99d5e9824f 100644 --- a/onnxruntime/test/server/integration_tests/function_tests.py +++ b/onnxruntime/test/server/integration_tests/function_tests.py @@ -62,7 +62,7 @@ class HttpJsonPayloadTests(unittest.TestCase): 'x-ms-client-request-id': 'This~is~my~id' } - url = self.url_pattern.format(self.server_ip, self.server_port, 'default_model', 12345) + url = self.url_pattern.format(self.server_ip, self.server_port, 'default', 1) test_util.test_log(url) r = requests.post(url, headers=request_headers, data=request_payload) self.assertEqual(r.status_code, 200) @@ -92,7 +92,7 @@ class HttpJsonPayloadTests(unittest.TestCase): def test_mnist_invalid_url(self): - url = self.url_pattern.format(self.server_ip, self.server_port, 'default_model', -1) + url = self.url_pattern.format(self.server_ip, self.server_port, 'default', -1) test_util.test_log(url) request_headers = { @@ -108,7 +108,7 @@ class HttpJsonPayloadTests(unittest.TestCase): def test_mnist_invalid_content_type(self): input_data_file = os.path.join(self.test_data_path, 'mnist_test_data_set_0_input.json') - url = self.url_pattern.format(self.server_ip, self.server_port, 'default_model', 12345) + url = self.url_pattern.format(self.server_ip, self.server_port, 'default', 1) test_util.test_log(url) request_headers = { @@ -130,7 +130,7 @@ class HttpJsonPayloadTests(unittest.TestCase): def test_mnist_missing_content_type(self): input_data_file = os.path.join(self.test_data_path, 'mnist_test_data_set_0_input.json') - url = self.url_pattern.format(self.server_ip, self.server_port, 'default_model', 12345) + url = self.url_pattern.format(self.server_ip, self.server_port, 'default', 1) test_util.test_log(url) request_headers = { @@ -238,7 +238,7 @@ class HttpProtobufPayloadTests(unittest.TestCase): 'Accept': 'application/x-protobuf' } - url = self.url_pattern.format(self.server_ip, self.server_port, 'default_model', 12345) + url = self.url_pattern.format(self.server_ip, self.server_port, 'default', 1) test_util.test_log(url) r = requests.post(url, headers=request_headers, data=request_payload) self.assertEqual(r.status_code, 200) @@ -282,7 +282,7 @@ class HttpProtobufPayloadTests(unittest.TestCase): 'Accept': h } - url = self.url_pattern.format(self.server_ip, self.server_port, 'default_model', 12345) + url = self.url_pattern.format(self.server_ip, self.server_port, 'default', 1) test_util.test_log(url) r = requests.post(url, headers=request_headers, data=request_payload) self.assertEqual(r.status_code, 200) @@ -299,7 +299,7 @@ class HttpProtobufPayloadTests(unittest.TestCase): 'Content-Type': 'application/x-protobuf', } - url = self.url_pattern.format(self.server_ip, self.server_port, 'default_model', 12345) + url = self.url_pattern.format(self.server_ip, self.server_port, 'default', 1) test_util.test_log(url) r = requests.post(url, headers=request_headers, data=request_payload) self.assertEqual(r.status_code, 200) @@ -317,7 +317,7 @@ class HttpProtobufPayloadTests(unittest.TestCase): 'Accept': '*/*' } - url = self.url_pattern.format(self.server_ip, self.server_port, 'default_model', 12345) + url = self.url_pattern.format(self.server_ip, self.server_port, 'default', 1) test_util.test_log(url) r = requests.post(url, headers=request_headers, data=request_payload) self.assertEqual(r.status_code, 200) diff --git a/onnxruntime/test/server/unit_tests/test_main.cc b/onnxruntime/test/server/unit_tests/test_main.cc index 64f20061cc..09a5304d5f 100644 --- a/onnxruntime/test/server/unit_tests/test_main.cc +++ b/onnxruntime/test/server/unit_tests/test_main.cc @@ -10,7 +10,7 @@ GTEST_API_ int main(int argc, char** argv) { try { onnxruntime::server::test::TestServerEnvironment server_env{}; - onnxruntime::test::TestEnvironment env{argc, argv, true}; + onnxruntime::test::TestEnvironment env{argc, argv, false}; status = RUN_ALL_TESTS(); } catch (const std::exception& ex) { std::cerr << ex.what();