saymrwulf/onnxruntime
1
0
Fork 0
mirror of https://github.com/saymrwulf/onnxruntime.git synced 2026-07-19 19:00:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix logger regression (#2011)

Browse source 
* Fix regression in creating default logger from custom function

* fix model naming issue in tests

* fix version in addition to model name
This commit is contained in:
Colin Versteeg 2019-10-04 16:39:40 -07:00 committed by George Wu
parent b322e072b9
commit bfa1b0e96e
3 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
onnxruntime/core/session/onnxruntime_c_api.cc
View file

@ -102,7 +102,7 @@ ORT_API_STATUS_IMPL(OrtApis::CreateEnvWithCustomLogger, OrtLoggingFunction loggi
std::unique_ptr<ISink> logger = onnxruntime::make_unique<LoggingWrapper>(logging_function, logger_param);
auto default_logging_manager = onnxruntime::make_unique<LoggingManager>(std::move(logger),
static_cast<Severity>(default_warning_level), false,
LoggingManager::InstanceType::Temporal,
LoggingManager::InstanceType::Default,
&name);
std::unique_ptr<Environment> env;
Status status = Environment::Create(env);

16
onnxruntime/test/server/integration_tests/function_tests.py
View file

@ -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)

2
onnxruntime/test/server/unit_tests/test_main.cc
View file

@ -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();