[to #44610931] fix: add device usage when device is None or empty

Link: https://code.alibaba-inc.com/Ali-MaaS/MaaS-lib/codereview/10039848

    * add device usage when device is None or empty

    * update docker env
This commit is contained in:
wenmeng.zwm
2022-09-06 21:47:59 +08:00
parent f7f29ed1ff
commit fabb4716d4
3 changed files with 8 additions and 1 deletions

View File

@@ -36,6 +36,7 @@ do
-e TEST_ACCESS_TOKEN_SDKDEV=$TEST_ACCESS_TOKEN_SDKDEV \
-e TEST_LEVEL=$TEST_LEVEL \
-e TEST_UPLOAD_MS_TOKEN=$TEST_UPLOAD_MS_TOKEN \
-e MODEL_TAG_URL=$MODEL_TAG_URL \
--workdir=$CODE_DIR_IN_CONTAINER \
--net host \
${IMAGE_NAME}:${IMAGE_VERSION} \

View File

@@ -19,9 +19,9 @@ def verify_device(device_name):
Return:
device info (tuple): device_type and device_id, if device_id is not set, will use 0 as default.
"""
device_name = device_name.lower()
err_msg = 'device should be either cpu, cuda, gpu, gpu:X or cuda:X where X is the ordinal for gpu device.'
assert device_name is not None and device_name != '', err_msg
device_name = device_name.lower()
eles = device_name.split(':')
assert len(eles) <= 2, err_msg
assert device_name is not None

View File

@@ -50,6 +50,12 @@ class DeviceTest(unittest.TestCase):
with self.assertRaises(AssertionError):
verify_device('xgu')
with self.assertRaises(AssertionError):
verify_device('')
with self.assertRaises(AssertionError):
verify_device(None)
def test_create_device_torch(self):
if torch.cuda.is_available():
target_device_type = 'cuda'