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

Fixing OrtEnvironment.getEnvironment() so it doesn't print a warning if the environment already exists with a non-default name. (#5973)

Browse source
This commit is contained in:
Adam Pocock 2020-12-01 18:21:06 -05:00 committed by GitHub
parent 30c7fffbab
commit 396074d2a8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
java/src/main/java/ai/onnxruntime/OrtEnvironment.java
View file

@ -40,18 +40,28 @@ public class OrtEnvironment implements AutoCloseable {
* Gets the OrtEnvironment. If there is not an environment currently created, it creates one using
* {@link OrtEnvironment#DEFAULT_NAME} and {@link OrtLoggingLevel#ORT_LOGGING_LEVEL_WARNING}.
*
* @return An onnxruntime environment.
* @return The OrtEnvironment singleton.
*/
public static OrtEnvironment getEnvironment() {
return getEnvironment(OrtLoggingLevel.ORT_LOGGING_LEVEL_WARNING, DEFAULT_NAME);
public static synchronized OrtEnvironment getEnvironment() {
if (INSTANCE == null) {
// If there's no instance, create one.
return getEnvironment(OrtLoggingLevel.ORT_LOGGING_LEVEL_WARNING, DEFAULT_NAME);
} else {
// else return the current one.
refCount.incrementAndGet();
return INSTANCE;
}
}
/**
* Gets the OrtEnvironment. If there is not an environment currently created, it creates one using
* the supplied name and {@link OrtLoggingLevel#ORT_LOGGING_LEVEL_WARNING}.
*
* <p>If the environment already exists then it returns the existing one and logs a warning if the
* name or log level is different from the requested one.
*
* @param name The logging id of the environment.
* @return An onnxruntime environment.
* @return The OrtEnvironment singleton.
*/
public static OrtEnvironment getEnvironment(String name) {
return getEnvironment(OrtLoggingLevel.ORT_LOGGING_LEVEL_WARNING, name);
@ -61,8 +71,11 @@ public class OrtEnvironment implements AutoCloseable {
* Gets the OrtEnvironment. If there is not an environment currently created, it creates one using
* the {@link OrtEnvironment#DEFAULT_NAME} and the supplied logging level.
*
* <p>If the environment already exists then it returns the existing one and logs a warning if the
* name or log level is different from the requested one.
*
* @param logLevel The logging level to use.
* @return An onnxruntime environment.
* @return The OrtEnvironment singleton.
*/
public static OrtEnvironment getEnvironment(OrtLoggingLevel logLevel) {
return getEnvironment(logLevel, DEFAULT_NAME);