Skip to content

Commit

Permalink
Fixes cases where the getEngine method in the EngineProvider class re…
Browse files Browse the repository at this point in the history 
…turns null when called concurrently.
  • Loading branch information
@frankfliu
王旭 authored and frankfliu committed Feb 26, 2024
1 parent 7959c27 commit 4ae2dd1
Show file tree
Hide file tree
Showing 9 changed files with 18 additions and 36 deletions.
6 changes: 2 additions & 4 deletions engines/ml/lightgbm/src/main/java/ai/djl/ml/lightgbm/LgbmEngineProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
public class LgbmEngineProvider implements EngineProvider {

private volatile Engine engine; // NOPMD
private volatile boolean initialized; // NOPMD

/** {@inheritDoc} */
@Override
Expand All @@ -36,10 +35,9 @@ public int getEngineRank() {
/** {@inheritDoc} */
@Override
public Engine getEngine() {
if (!initialized) {
if (engine == null) {
synchronized (LgbmEngineProvider.class) {
if (!initialized) {
initialized = true;
if (engine == null) {
engine = LgbmEngine.newInstance();
}
}
Expand Down
6 changes: 2 additions & 4 deletions engines/ml/xgboost/src/main/java/ai/djl/ml/xgboost/XgbEngineProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
public class XgbEngineProvider implements EngineProvider {

private volatile Engine engine; // NOPMD
private volatile boolean initialized; // NOPMD

/** {@inheritDoc} */
@Override
Expand All @@ -36,10 +35,9 @@ public int getEngineRank() {
/** {@inheritDoc} */
@Override
public Engine getEngine() {
if (!initialized) {
if (engine == null) {
synchronized (XgbEngineProvider.class) {
if (!initialized) {
initialized = true;
if (engine == null) {
engine = XgbEngine.newInstance();
}
}
Expand Down
6 changes: 2 additions & 4 deletions engines/mxnet/mxnet-engine/src/main/java/ai/djl/mxnet/engine/MxEngineProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
public class MxEngineProvider implements EngineProvider {

private volatile Engine engine; // NOPMD
private volatile boolean initialized; // NOPMD

/** {@inheritDoc} */
@Override
Expand All @@ -36,10 +35,9 @@ public int getEngineRank() {
/** {@inheritDoc} */
@Override
public Engine getEngine() {
if (!initialized) {
if (engine == null) {
synchronized (MxEngineProvider.class) {
if (!initialized) {
initialized = true;
if (engine == null) {
engine = MxEngine.newInstance();
}
}
Expand Down
6 changes: 2 additions & 4 deletions ...runtime/onnxruntime-engine/src/main/java/ai/djl/onnxruntime/engine/OrtEngineProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
public class OrtEngineProvider implements EngineProvider {

private volatile Engine engine; // NOPMD
private volatile boolean initialized; // NOPMD

/** {@inheritDoc} */
@Override
Expand All @@ -36,10 +35,9 @@ public int getEngineRank() {
/** {@inheritDoc} */
@Override
public Engine getEngine() {
if (!initialized) {
if (engine == null) {
synchronized (OrtEngineProvider.class) {
if (!initialized) {
initialized = true;
if (engine == null) {
engine = OrtEngine.newInstance();
}
}
Expand Down
6 changes: 2 additions & 4 deletions ...paddle/paddlepaddle-engine/src/main/java/ai/djl/paddlepaddle/engine/PpEngineProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
public class PpEngineProvider implements EngineProvider {

private volatile Engine engine; // NOPMD
private volatile boolean initialized; // NOPMD

/** {@inheritDoc} */
@Override
Expand All @@ -36,10 +35,9 @@ public int getEngineRank() {
/** {@inheritDoc} */
@Override
public Engine getEngine() {
if (!initialized) {
if (engine == null) {
synchronized (PpEngineProvider.class) {
if (!initialized) {
initialized = true;
if (engine == null) {
engine = PpEngine.newInstance();
}
}
Expand Down
6 changes: 2 additions & 4 deletions engines/pytorch/pytorch-engine/src/main/java/ai/djl/pytorch/engine/PtEngineProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
public class PtEngineProvider implements EngineProvider {

private volatile Engine engine; // NOPMD
private volatile boolean initialized; // NOPMD

/** {@inheritDoc} */
@Override
Expand All @@ -36,10 +35,9 @@ public int getEngineRank() {
/** {@inheritDoc} */
@Override
public Engine getEngine() {
if (!initialized) {
if (engine == null) {
synchronized (PtEngineProvider.class) {
if (!initialized) {
initialized = true;
if (engine == null) {
engine = PtEngine.newInstance();
}
}
Expand Down
6 changes: 2 additions & 4 deletions ...tensorflow/tensorflow-engine/src/main/java/ai/djl/tensorflow/engine/TfEngineProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
public class TfEngineProvider implements EngineProvider {

private volatile Engine engine; // NOPMD
private volatile boolean initialized; // NOPMD

/** {@inheritDoc} */
@Override
Expand All @@ -36,10 +35,9 @@ public int getEngineRank() {
/** {@inheritDoc} */
@Override
public Engine getEngine() {
if (!initialized) {
if (engine == null) {
synchronized (TfEngineProvider.class) {
if (!initialized) {
initialized = true;
if (engine == null) {
engine = TfEngine.newInstance();
}
}
Expand Down
6 changes: 2 additions & 4 deletions engines/tensorrt/src/main/java/ai/djl/tensorrt/engine/TrtEngineProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
public class TrtEngineProvider implements EngineProvider {

private volatile Engine engine; // NOPMD
private volatile boolean initialized; // NOPMD

/** {@inheritDoc} */
@Override
Expand All @@ -36,10 +35,9 @@ public int getEngineRank() {
/** {@inheritDoc} */
@Override
public Engine getEngine() {
if (!initialized) {
if (engine == null) {
synchronized (TrtEngineProvider.class) {
if (!initialized) {
initialized = true;
if (engine == null) {
engine = TrtEngine.newInstance();
}
}
Expand Down
6 changes: 2 additions & 4 deletions engines/tflite/tflite-engine/src/main/java/ai/djl/tflite/engine/TfLiteEngineProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
public class TfLiteEngineProvider implements EngineProvider {

private volatile Engine engine; // NOPMD
private volatile boolean initialized; // NOPMD

/** {@inheritDoc} */
@Override
Expand All @@ -36,10 +35,9 @@ public int getEngineRank() {
/** {@inheritDoc} */
@Override
public Engine getEngine() {
if (!initialized) {
if (engine == null) {
synchronized (TfLiteEngineProvider.class) {
if (!initialized) {
initialized = true;
if (engine == null) {
engine = TfLiteEngine.newInstance();
}
}
Expand Down

0 comments on commit 4ae2dd1

Please sign in to comment.