Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[onnxruntime] Adds disablePerSessionThreads option to model loading #2104

Merged
merged 1 commit into from
Oct 26, 2022
Merged

[onnxruntime] Adds disablePerSessionThreads option to model loading #2104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 23 additions & 3 deletions ...nes/onnxruntime/onnxruntime-engine/src/main/java/ai/djl/onnxruntime/engine/OrtEngine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import ai.djl.training.GradientCollector;
import ai.onnxruntime.OrtEnvironment;
import ai.onnxruntime.OrtException;
import ai.onnxruntime.OrtLoggingLevel;
import ai.onnxruntime.OrtSession;

/**
Expand All @@ -42,13 +43,33 @@ public final class OrtEngine extends Engine {

private OrtEngine() {
// init OrtRuntime
this.env = OrtEnvironment.getEnvironment();
OrtEnvironment.ThreadingOptions options = new OrtEnvironment.ThreadingOptions();
try {
Integer interOpThreads = Integer.getInteger("ai.djl.onnxruntime.num_interop_threads");
Integer intraOpsThreads = Integer.getInteger("ai.djl.onnxruntime.num_threads");
if (interOpThreads != null) {
options.setGlobalInterOpNumThreads(interOpThreads);
}
if (intraOpsThreads != null) {
options.setGlobalIntraOpNumThreads(intraOpsThreads);
}
OrtLoggingLevel logging = OrtLoggingLevel.ORT_LOGGING_LEVEL_WARNING;
String name = OrtEnvironment.DEFAULT_NAME;
this.env = OrtEnvironment.getEnvironment(logging, name, options);
} catch (OrtException e) {
options.close();
throw new AssertionError("Failed to config OrtEnvironment", e);
}
}

static Engine newInstance() {
return new OrtEngine();
}

OrtEnvironment getEnv() {
return env;
}

/** {@inheritDoc} */
@Override
public Engine getAlternativeEngine() {
Expand Down Expand Up @@ -87,8 +108,7 @@ public boolean hasCapability(String capability) {
if (StandardCapabilities.MKL.equals(capability)) {
return true;
} else if (StandardCapabilities.CUDA.equals(capability)) {
try {
OrtSession.SessionOptions sessionOptions = new OrtSession.SessionOptions();
try (OrtSession.SessionOptions sessionOptions = new OrtSession.SessionOptions()) {
sessionOptions.addCUDA();
return true;
} catch (OrtException e) {
Expand Down
5 changes: 5 additions & 0 deletions engines/onnxruntime/onnxruntime-engine/src/main/java/ai/djl/onnxruntime/engine/OrtModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,11 @@ private SessionOptions getSessionOptions(Map<String, ?> options) throws OrtExcep
ortSession.setCPUArenaAllocator(true);
}

String disablePerSessionThreads = (String) options.get("disablePerSessionThreads");
if (Boolean.parseBoolean(disablePerSessionThreads)) {
ortSession.disablePerSessionThreads();
}

String customOpLibrary = (String) options.get("customOpLibrary");
if (customOpLibrary != null) {
ortSession.registerCustomOpLibrary(customOpLibrary);
Expand Down
2 changes: 1 addition & 1 deletion .../onnxruntime/onnxruntime-engine/src/main/java/ai/djl/onnxruntime/engine/OrtNDManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ public void close() {
private static final class SystemManager extends OrtNDManager implements SystemNDManager {

SystemManager() {
super(null, null, OrtEnvironment.getEnvironment());
super(null, null, ((OrtEngine) Engine.getEngine(OrtEngine.ENGINE_NAME)).getEnv());
}

/** {@inheritDoc} */
Expand Down
8 changes: 8 additions & 0 deletions engines/onnxruntime/onnxruntime-engine/src/test/java/ai/djl/onnxruntime/engine/OrtTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@

import org.testng.Assert;
import org.testng.SkipException;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;

import java.io.IOException;
Expand All @@ -39,6 +40,12 @@

public class OrtTest {

@BeforeClass
public void setUp() {
System.setProperty("ai.djl.onnxruntime.num_threads", "1");
System.setProperty("ai.djl.onnxruntime.num_interop_threads", "1");
}

@Test
public void testOrt() throws TranslateException, ModelException, IOException {
try {
Expand All @@ -52,6 +59,7 @@ public void testOrt() throws TranslateException, ModelException, IOException {
.optOption("optLevel", "NO_OPT")
.optOption("memoryPatternOptimization", "true")
.optOption("cpuArenaAllocator", "true")
.optOption("disablePerSessionThreads", "true")
.build();

IrisFlower virginica = new IrisFlower(1.0f, 2.0f, 3.0f, 4.0f);
Expand Down