Skip to content

Commit c5dd39c

Browse files
committed
Change info logs to debug logs and update tests
1 parent 2434673 commit c5dd39c

File tree

2 files changed

+19
-46
lines changed

2 files changed

+19
-46
lines changed

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

+3-6
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ private void setupModelVenv(Model model)
259259
}
260260

261261
if (exitCode == 0) {
262-
logger.info(
262+
logger.debug(
263263
"Created virtual environment for model {}: {}",
264264
model.getModelName(),
265265
venvPath.toString());
@@ -311,7 +311,7 @@ private void setupModelVenv(Model model)
311311
}
312312

313313
if (exitCode == 0) {
314-
logger.info(
314+
logger.debug(
315315
"Inherited site-packages directories to venv {}:\n{}",
316316
venvPath.toString(),
317317
outputString.toString());
@@ -410,10 +410,7 @@ private void setupModelDependencies(Model model)
410410
}
411411

412412
if (exitCode == 0) {
413-
logger.info(
414-
"Installed custom pip packages for model {}:\n{}",
415-
model.getModelName(),
416-
outputString.toString());
413+
logger.info("Installed custom pip packages for model {}", model.getModelName());
417414
} else {
418415
logger.error(
419416
"Custom pip package installation failed for model {}:\n{}",

test/pytest/test_z_model_custom_dependencies.py

+16-40
Original file line numberDiff line numberDiff line change
@@ -141,9 +141,7 @@ def register_model_and_make_inference_request(expect_model_load_failure=False):
141141

142142

143143
def test_install_dependencies_to_target_directory_with_requirements():
144-
# Torchserve cleanup
145-
test_utils.stop_torchserve()
146-
test_utils.delete_all_snapshots()
144+
test_utils.torchserve_cleanup()
147145

148146
try:
149147
generate_model_archive(use_requirements=True, use_venv=False)
@@ -162,14 +160,11 @@ def test_install_dependencies_to_target_directory_with_requirements():
162160
)
163161
register_model_and_make_inference_request(expect_model_load_failure=False)
164162
finally:
165-
test_utils.stop_torchserve()
166-
test_utils.delete_all_snapshots()
163+
test_utils.torchserve_cleanup()
167164

168165

169166
def test_install_dependencies_to_target_directory_without_requirements():
170-
# Torchserve cleanup
171-
test_utils.stop_torchserve()
172-
test_utils.delete_all_snapshots()
167+
test_utils.torchserve_cleanup()
173168

174169
try:
175170
generate_model_archive(use_requirements=False, use_venv=False)
@@ -188,14 +183,11 @@ def test_install_dependencies_to_target_directory_without_requirements():
188183
)
189184
register_model_and_make_inference_request(expect_model_load_failure=True)
190185
finally:
191-
test_utils.stop_torchserve()
192-
test_utils.delete_all_snapshots()
186+
test_utils.torchserve_cleanup()
193187

194188

195189
def test_disable_install_dependencies_to_target_directory_with_requirements():
196-
# Torchserve cleanup
197-
test_utils.stop_torchserve()
198-
test_utils.delete_all_snapshots()
190+
test_utils.torchserve_cleanup()
199191

200192
try:
201193
generate_model_archive(use_requirements=True, use_venv=False)
@@ -207,14 +199,11 @@ def test_disable_install_dependencies_to_target_directory_with_requirements():
207199
)
208200
register_model_and_make_inference_request(expect_model_load_failure=True)
209201
finally:
210-
test_utils.stop_torchserve()
211-
test_utils.delete_all_snapshots()
202+
test_utils.torchserve_cleanup()
212203

213204

214205
def test_disable_install_dependencies_to_target_directory_without_requirements():
215-
# Torchserve cleanup
216-
test_utils.stop_torchserve()
217-
test_utils.delete_all_snapshots()
206+
test_utils.torchserve_cleanup()
218207

219208
try:
220209
generate_model_archive(use_requirements=False, use_venv=False)
@@ -226,14 +215,11 @@ def test_disable_install_dependencies_to_target_directory_without_requirements()
226215
)
227216
register_model_and_make_inference_request(expect_model_load_failure=True)
228217
finally:
229-
test_utils.stop_torchserve()
230-
test_utils.delete_all_snapshots()
218+
test_utils.torchserve_cleanup()
231219

232220

233221
def test_install_dependencies_to_venv_with_requirements():
234-
# Torchserve cleanup
235-
test_utils.stop_torchserve()
236-
test_utils.delete_all_snapshots()
222+
test_utils.torchserve_cleanup()
237223

238224
try:
239225
generate_model_archive(use_requirements=True, use_venv=True)
@@ -252,14 +238,11 @@ def test_install_dependencies_to_venv_with_requirements():
252238
)
253239
register_model_and_make_inference_request(expect_model_load_failure=False)
254240
finally:
255-
test_utils.stop_torchserve()
256-
test_utils.delete_all_snapshots()
241+
test_utils.torchserve_cleanup()
257242

258243

259244
def test_install_dependencies_to_venv_without_requirements():
260-
# Torchserve cleanup
261-
test_utils.stop_torchserve()
262-
test_utils.delete_all_snapshots()
245+
test_utils.torchserve_cleanup()
263246

264247
try:
265248
generate_model_archive(use_requirements=False, use_venv=True)
@@ -278,14 +261,11 @@ def test_install_dependencies_to_venv_without_requirements():
278261
)
279262
register_model_and_make_inference_request(expect_model_load_failure=True)
280263
finally:
281-
test_utils.stop_torchserve()
282-
test_utils.delete_all_snapshots()
264+
test_utils.torchserve_cleanup()
283265

284266

285267
def test_disable_install_dependencies_to_venv_with_requirements():
286-
# Torchserve cleanup
287-
test_utils.stop_torchserve()
288-
test_utils.delete_all_snapshots()
268+
test_utils.torchserve_cleanup()
289269

290270
try:
291271
generate_model_archive(use_requirements=True, use_venv=True)
@@ -297,14 +277,11 @@ def test_disable_install_dependencies_to_venv_with_requirements():
297277
)
298278
register_model_and_make_inference_request(expect_model_load_failure=True)
299279
finally:
300-
test_utils.stop_torchserve()
301-
test_utils.delete_all_snapshots()
280+
test_utils.torchserve_cleanup()
302281

303282

304283
def test_disable_install_dependencies_to_venv_without_requirements():
305-
# Torchserve cleanup
306-
test_utils.stop_torchserve()
307-
test_utils.delete_all_snapshots()
284+
test_utils.torchserve_cleanup()
308285

309286
try:
310287
generate_model_archive(use_requirements=False, use_venv=True)
@@ -316,5 +293,4 @@ def test_disable_install_dependencies_to_venv_without_requirements():
316293
)
317294
register_model_and_make_inference_request(expect_model_load_failure=True)
318295
finally:
319-
test_utils.stop_torchserve()
320-
test_utils.delete_all_snapshots()
296+
test_utils.torchserve_cleanup()

0 commit comments

Comments
 (0)