Skip to content

Commit 9c826ad

Browse files
committed
adding default values for model
1 parent e2bec9a commit 9c826ad

File tree

2 files changed

+24
-10
lines changed

2 files changed

+24
-10
lines changed

frontend/archive/src/main/java/org/pytorch/serve/archive/model/ModelConfig.java

+1-4
Original file line numberDiff line numberDiff line change
@@ -127,12 +127,9 @@ public static ModelConfig build(Map<String, Object> yamlMap) {
127127
case "startupTimeout":
128128
if (v instanceof Integer) {
129129
modelConfig.setStartupTimeout((int) v);
130-
} else if {
130+
} else {
131131
logger.warn("Invalid startupTimeout: {}, should be integer", v);
132132
}
133-
else {
134-
modelConfig.setStartupTimeout(startupTimeout);
135-
}
136133
break;
137134
case "deviceType":
138135
if (v instanceof String) {

frontend/server/src/main/java/org/pytorch/serve/wlm/Model.java

+23-6
Original file line numberDiff line numberDiff line change
@@ -190,12 +190,29 @@ public JsonObject getModelState(boolean isDefaultVersion) {
190190
}
191191

192192
public void setModelState(JsonObject modelInfo) {
193-
minWorkers = modelInfo.get(MIN_WORKERS).getAsInt();
194-
maxWorkers = modelInfo.get(MAX_WORKERS).getAsInt();
195-
maxBatchDelay = modelInfo.get(MAX_BATCH_DELAY).getAsInt();
196-
responseTimeout = modelInfo.get(RESPONSE_TIMEOUT).getAsInt();
197-
startupTimeout = modelInfo.get(STARTUP_TIMEOUT).getAsInt();
198-
batchSize = modelInfo.get(BATCH_SIZE).getAsInt();
193+
minWorkers = modelInfo.has(MIN_WORKERS) && !modelInfo.get(MIN_WORKERS).isJsonNull()
194+
? modelInfo.get(MIN_WORKERS).getAsInt()
195+
: 1; // default value for minWorkers
196+
197+
maxWorkers = modelInfo.has(MAX_WORKERS) && !modelInfo.get(MAX_WORKERS).isJsonNull()
198+
? modelInfo.get(MAX_WORKERS).getAsInt()
199+
: 5; // default value for maxWorkers
200+
201+
maxBatchDelay = modelInfo.has(MAX_BATCH_DELAY) && !modelInfo.get(MAX_BATCH_DELAY).isJsonNull()
202+
? modelInfo.get(MAX_BATCH_DELAY).getAsInt()
203+
: 100; // default value for maxBatchDelay
204+
205+
responseTimeout = modelInfo.has(RESPONSE_TIMEOUT) && !modelInfo.get(RESPONSE_TIMEOUT).isJsonNull()
206+
? modelInfo.get(RESPONSE_TIMEOUT).getAsInt()
207+
: 120; // default value for responseTimeout
208+
209+
startupTimeout = modelInfo.has(STARTUP_TIMEOUT) && !modelInfo.get(STARTUP_TIMEOUT).isJsonNull()
210+
? modelInfo.get(STARTUP_TIMEOUT).getAsInt()
211+
: 120; // default value for startupTimeout
212+
213+
batchSize = modelInfo.has(BATCH_SIZE) && !modelInfo.get(BATCH_SIZE).isJsonNull()
214+
? modelInfo.get(BATCH_SIZE).getAsInt()
215+
: 1; // default value for batchSize
199216

200217
JsonElement runtime = modelInfo.get(RUNTIME_TYPE);
201218
String runtime_str = Manifest.RuntimeType.PYTHON.getValue();

0 commit comments

Comments
 (0)