version check

pull/5955/head
liubuyu 4 years ago committed by zhoufeng
parent 4cb190d414
commit c5f8849d03

2
.gitignore vendored

@ -94,6 +94,8 @@ test_temp_summary_event_file/
.clangd
mindspore/version.py
mindspore/default_config.py
mindspore/device_target.py
mindspore/package_name.py
mindspore/.commit_id
# lite test file

@ -11,18 +11,23 @@ set(CPACK_TEMPORARY_PACKAGE_FILE_NAME ${CMAKE_SOURCE_DIR}/build/package/mindspor
set(CPACK_TEMPORARY_INSTALL_DIRECTORY ${CMAKE_SOURCE_DIR}/build/package/mindspore)
if (ENABLE_GE)
set(CPACK_MS_BACKEND "ge")
set(CPACK_MS_TARGET "ascend-cpu")
set(CPACK_MS_PACKAGE_NAME "mindspore")
elseif (ENABLE_GPU)
set(CPACK_MS_BACKEND "ms")
set(CPACK_MS_TARGET "gpu-cpu")
set(CPACK_MS_PACKAGE_NAME "mindspore-gpu")
elseif (ENABLE_D)
set(CPACK_MS_BACKEND "ms")
set(CPACK_MS_TARGET "ascend-cpu")
set(CPACK_MS_PACKAGE_NAME "mindspore-ascend")
elseif (ENABLE_CPU)
set(CPACK_MS_BACKEND "ms")
set(CPACK_MS_TARGET "cpu")
set(CPACK_MS_PACKAGE_NAME "mindspore")
else ()
set(CPACK_MS_BACKEND "debug")
set(CPACK_MS_TARGET "ascend-gpu-cpu")
set(CPACK_MS_PACKAGE_NAME "mindspore")
endif ()
include(CPack)

@ -61,6 +61,7 @@ execute_process(
string(REPLACE " " "" GIT_COMMIT_ID ${GIT_COMMIT_ID})
set(ENV{BACKEND_POLICY} ${CPACK_MS_BACKEND})
set(ENV{BACKEND_TARGET} ${CPACK_MS_TARGET})
set(ENV{MS_PACKAGE_NAME} ${CPACK_MS_PACKAGE_NAME})
set(ENV{COMMIT_ID} ${GIT_COMMIT_ID})

@ -14,6 +14,7 @@
# ============================================================================
"""MindSpore package."""
from ._version_check import check_version_and_env_config
from . import common, train
from .common import *
from .ops import _op_impl

File diff suppressed because it is too large Load Diff

@ -255,9 +255,16 @@ elseif (CMAKE_SYSTEM_NAME MATCHES "Windows")
else ()
MESSAGE(FATAL_ERROR "other platform: ${CMAKE_SYSTEM_NAME}")
endif ()
set(MINDSPORE_RPATH ${ORIGIN_PATH}/lib)
if (ENABLE_D)
set(MINDSPORE_RPATH ${MINDSPORE_RPATH}:/usr/local/Ascend/nnae/latest/fwkacllib/lib64)
set(MINDSPORE_RPATH ${MINDSPORE_RPATH}:/usr/local/Ascend/fwkacllib/lib64)
set(MINDSPORE_RPATH ${MINDSPORE_RPATH}:/usr/local/Ascend/add-ons)
elseif (ENABLE_GPU)
set(MINDSPORE_RPATH ${MINDSPORE_RPATH}:/usr/local/cuda/lib64)
endif ()
set(ORIGIN_PATH ${ORIGIN_PATH}/lib)
set_target_properties(_c_expression PROPERTIES INSTALL_RPATH ${ORIGIN_PATH})
set_target_properties(_c_expression PROPERTIES INSTALL_RPATH ${MINDSPORE_RPATH})
if (CMAKE_SYSTEM_NAME MATCHES "Windows")
target_link_libraries(mindspore mindspore::pybind11_module)
@ -293,7 +300,7 @@ if (ENABLE_GPU)
${CUDA_PATH}/lib64/stubs/libcuda.so
${CUDA_PATH}/lib64/libcusolver.so)
if (ENABLE_MPI)
set_target_properties(_ms_mpi PROPERTIES INSTALL_RPATH ${ORIGIN_PATH})
set_target_properties(_ms_mpi PROPERTIES INSTALL_RPATH ${MINDSPORE_RPATH})
endif()
endif ()

@ -27,6 +27,8 @@ from mindspore._checkparam import args_type_check
from mindspore.parallel._auto_parallel_context import _set_auto_parallel_context, _get_auto_parallel_context, \
_reset_auto_parallel_context
from mindspore.parallel._ps_context import _set_ps_context, _get_ps_context, _reset_ps_context
from .device_target import __device_target__
from .package_name import __package_name__
__all__ = ['GRAPH_MODE', 'PYNATIVE_MODE', 'set_context', 'get_context', 'set_auto_parallel_context',
'get_auto_parallel_context', 'reset_auto_parallel_context', 'ParallelMode', 'set_ps_context',
@ -560,6 +562,10 @@ def set_context(**kwargs):
# set device target first
if 'device_target' in kwargs:
ctx.set_device_target(kwargs['device_target'])
device = kwargs['device_target']
if not device.lower() in __device_target__:
raise ValueError(f"Error, package type {__package_name__} support device type {__device_target__}, "
f"but got device target {device}")
device = ctx.get_param(ms_ctx_param.device_target)
for key, value in kwargs.items():
if not _check_target_specific_cfgs(device, key):

@ -15,3 +15,4 @@ sklearn >= 0.0 # for st test
pandas >= 1.0.2 # for ut test
bs4
astunparse
packaging

@ -26,6 +26,7 @@ from setuptools.command.build_py import build_py
version = '0.7.0'
backend_policy = os.getenv('BACKEND_POLICY')
device_target = os.getenv('BACKEND_TARGET')
commit_id = os.getenv('COMMIT_ID').replace("\n", "")
package_name = os.getenv('MS_PACKAGE_NAME').replace("\n", "")
@ -54,8 +55,32 @@ def _write_commit_file(file):
file.write("__commit_id__ = '{}'\n".format(commit_id))
def _write_package_name(file):
file.write("__package_name__ = '{}'\n".format(package_name))
def _write_device_target(file):
file.write("__device_target__ = '{}'\n".format(device_target))
def build_dependencies():
"""generate python file"""
target = os.path.join(pkg_dir, 'mindspore', 'device_target.py')
with open(target, 'w') as f:
_write_device_target(f)
target = os.path.join(pwd, 'mindspore', 'device_target.py')
with open(target, 'w') as f:
_write_device_target(f)
package_info = os.path.join(pkg_dir, 'mindspore', 'package_name.py')
with open(package_info, 'w') as f:
_write_package_name(f)
package_info = os.path.join(pwd, 'mindspore', 'package_name.py')
with open(package_info, 'w') as f:
_write_package_name(f)
version_file = os.path.join(pkg_dir, 'mindspore', 'version.py')
with open(version_file, 'w') as f:
_write_version(f)
@ -93,7 +118,8 @@ required_package = [
'sympy >= 1.4',
'cffi >= 1.13.2',
'decorator >= 4.4.0',
'astunparse >= 1.6.3'
'astunparse >= 1.6.3',
'packaging'
]
package_data = {

Loading…
Cancel
Save