Link: https://code.alibaba-inc.com/Ali-MaaS/MaaS-lib/codereview/10039848 * add device usage when device is None or empty * update docker envmaster
| @@ -36,6 +36,7 @@ do | |||||
| -e TEST_ACCESS_TOKEN_SDKDEV=$TEST_ACCESS_TOKEN_SDKDEV \ | -e TEST_ACCESS_TOKEN_SDKDEV=$TEST_ACCESS_TOKEN_SDKDEV \ | ||||
| -e TEST_LEVEL=$TEST_LEVEL \ | -e TEST_LEVEL=$TEST_LEVEL \ | ||||
| -e TEST_UPLOAD_MS_TOKEN=$TEST_UPLOAD_MS_TOKEN \ | -e TEST_UPLOAD_MS_TOKEN=$TEST_UPLOAD_MS_TOKEN \ | ||||
| -e MODEL_TAG_URL=$MODEL_TAG_URL \ | |||||
| --workdir=$CODE_DIR_IN_CONTAINER \ | --workdir=$CODE_DIR_IN_CONTAINER \ | ||||
| --net host \ | --net host \ | ||||
| ${IMAGE_NAME}:${IMAGE_VERSION} \ | ${IMAGE_NAME}:${IMAGE_VERSION} \ | ||||
| @@ -19,9 +19,9 @@ def verify_device(device_name): | |||||
| Return: | Return: | ||||
| device info (tuple): device_type and device_id, if device_id is not set, will use 0 as default. | 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.' | 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 | assert device_name is not None and device_name != '', err_msg | ||||
| device_name = device_name.lower() | |||||
| eles = device_name.split(':') | eles = device_name.split(':') | ||||
| assert len(eles) <= 2, err_msg | assert len(eles) <= 2, err_msg | ||||
| assert device_name is not None | assert device_name is not None | ||||
| @@ -50,6 +50,12 @@ class DeviceTest(unittest.TestCase): | |||||
| with self.assertRaises(AssertionError): | with self.assertRaises(AssertionError): | ||||
| verify_device('xgu') | verify_device('xgu') | ||||
| with self.assertRaises(AssertionError): | |||||
| verify_device('') | |||||
| with self.assertRaises(AssertionError): | |||||
| verify_device(None) | |||||
| def test_create_device_torch(self): | def test_create_device_torch(self): | ||||
| if torch.cuda.is_available(): | if torch.cuda.is_available(): | ||||
| target_device_type = 'cuda' | target_device_type = 'cuda' | ||||