Browse Source

!237 add MindSpore version check

From: @xu-yfei
Reviewed-by: @zhoufeng54,@linqingke
Signed-off-by: @xsmq
master
mindspore-ci-bot Gitee 5 years ago
parent
commit
559beee2b1
3 changed files with 33 additions and 2 deletions
  1. +30
    -0
      mindspore_serving/worker/_check_version.py
  2. +2
    -1
      mindspore_serving/worker/init_mindspore.py
  3. +1
    -1
      third_party/mindspore

+ 30
- 0
mindspore_serving/worker/_check_version.py View File

@@ -283,6 +283,36 @@ class GPUEnvChecker():
return self.v


def get_mindspore_version():
"""Get MindSpore whl package version number"""
prefix = "####version:"
ms_result = subprocess.run([f"python -c \"import mindspore as ms;print('{prefix}'+ str(ms.version.__version__))\""
f" | grep '{prefix}'"],
text=True, capture_output=True, check=False, shell=True)
if ms_result.returncode:
return ""
result = ms_result.stdout
for line in result.split('\n'):
if line[:len(prefix)] == prefix:
return line[len(prefix):]
return ""


def check_mindspore_version():
"""check MindSpore version number"""
try:
from mindspore_serving.version import __version__
except ModuleNotFoundError:
logger.warning(f"Get MindSpore Serving version failed")
return
ms_version = get_mindspore_version()
if not ms_version:
logger.warning(f"Get MindSpore version failed")
elif __version__ != ms_version:
logger.warning(f"MindSpore version {ms_version} and MindSpore Serving version {__version__} are expected "
f"to be consistent. If not, there may be compatibility problems.")


def check_version_and_env_config(device_type):
"""check version and env config"""
if device_type == "Ascend":


+ 2
- 1
mindspore_serving/worker/init_mindspore.py View File

@@ -17,7 +17,7 @@ import os
import importlib
from mindspore_serving import log as logger
from mindspore_serving._mindspore_serving import Worker_
from ._check_version import check_version_and_env_config, check_version_and_try_set_env_lib
from ._check_version import check_version_and_env_config, check_version_and_try_set_env_lib, check_mindspore_version

_flag_set_mindspore_cxx_env = False

@@ -51,6 +51,7 @@ def init_mindspore_cxx_env():
if _flag_set_mindspore_cxx_env:
return
_flag_set_mindspore_cxx_env = True
check_mindspore_version()
check_version_and_try_set_env_lib() # try set env LD_LIBRARY_PATH
_set_mindspore_cxx_env()
device_type = Worker_.get_device_type()


+ 1
- 1
third_party/mindspore

@@ -1 +1 @@
Subproject commit d5c6c09c6f30d68558e8d8ea9cf49a17eb8008b0
Subproject commit dc4815860b9a1e1e6499d08c2049050a9c68fb24

Loading…
Cancel
Save