diff --git a/docs/lite/api/source_en/conf.py b/docs/lite/api/source_en/conf.py index 83bdf83e5b041f3c2e263576fabe261d086b0442..bdf8033844994bf7ac47d4717c3793e44a92b70e 100644 --- a/docs/lite/api/source_en/conf.py +++ b/docs/lite/api/source_en/conf.py @@ -286,7 +286,7 @@ import tarfile from sphinx.util import logging import shutil logger = logging.getLogger(__name__) -src_dir = os.path.join(os.getenv("MS_PATH"), 'docs/api/lite_api_python_en') +src_dir = os.path.join(os.getenv("MSL_PATH"), 'docs/api/lite_api_python_en') for i in os.listdir(src_dir): if os.path.isfile(os.path.join(src_dir,i)): @@ -334,15 +334,15 @@ elif os.path.exists('../../../../tools/generate_html/daily.json'): with open('../../../../tools/generate_html/daily.json', 'r+', encoding='utf-8') as f: version_inf = json.load(f) -if os.getenv("MS_PATH").split('/')[-1]: - copy_repo = os.getenv("MS_PATH").split('/')[-1] +if os.getenv("MSL_PATH").split('/')[-1]: + copy_repo = os.getenv("MSL_PATH").split('/')[-1] else: - copy_repo = os.getenv("MS_PATH").split('/')[-2] + copy_repo = os.getenv("MSL_PATH").split('/')[-2] -branch = [version_inf[i]['branch'] for i in range(len(version_inf)) if version_inf[i]['name'] == copy_repo][0] +branch = [version_inf[i]['branch'] for i in range(len(version_inf)) if version_inf[i]['name'] == 'lite'][0] docs_branch = [version_inf[i]['branch'] for i in range(len(version_inf)) if version_inf[i]['name'] == 'tutorials'][0] cst_module_name = 'mindspore_lite' -repo_whl = 'mindspore/lite/python/api' +repo_whl = 'mindspore-lite/python/api' giturl = 'https://gitee.com/mindspore/' import mindspore_lite diff --git a/docs/lite/api/source_zh_cn/conf.py b/docs/lite/api/source_zh_cn/conf.py index ec3c7c207d9efc760101f0e49b3e628d722142c3..5bfbf2eb4bffa00d638c0f6ecbbc86e4281a9512 100644 --- a/docs/lite/api/source_zh_cn/conf.py +++ b/docs/lite/api/source_zh_cn/conf.py @@ -191,7 +191,7 @@ import shutil logger = logging.getLogger(__name__) copy_path = 'docs/api/lite_api_python' -src_dir = os.path.join(os.getenv("MS_PATH"), copy_path) +src_dir = os.path.join(os.getenv("MSL_PATH"), copy_path) copy_list = [] @@ -222,12 +222,12 @@ elif os.path.exists('../../../../tools/generate_html/daily.json'): with open('../../../../tools/generate_html/daily.json', 'r+', encoding='utf-8') as f: version_inf = json.load(f) -if os.getenv("MS_PATH").split('/')[-1]: - copy_repo = os.getenv("MS_PATH").split('/')[-1] +if os.getenv("MSL_PATH").split('/')[-1]: + copy_repo = os.getenv("MSL_PATH").split('/')[-1] else: - copy_repo = os.getenv("MS_PATH").split('/')[-2] + copy_repo = os.getenv("MSL_PATH").split('/')[-2] -branch = [version_inf[i]['branch'] for i in range(len(version_inf)) if version_inf[i]['name'] == copy_repo][0] +branch = [version_inf[i]['branch'] for i in range(len(version_inf)) if version_inf[i]['name'] == 'lite'][0] docs_branch = [version_inf[i]['branch'] for i in range(len(version_inf)) if version_inf[i]['name'] == 'tutorials'][0] re_view = f"\n.. image:: https://mindspore-website.obs.cn-north-4.myhuaweicloud.com/website-images/{docs_branch}/" + \ diff --git a/docs/lite/docs/source_en/conf.py b/docs/lite/docs/source_en/conf.py index cd3e2e46c38df1f0da351bb4a3a43d8737b6eed9..9b13c4b40f703f1749c4c9dc708551f6a84c40b4 100644 --- a/docs/lite/docs/source_en/conf.py +++ b/docs/lite/docs/source_en/conf.py @@ -91,7 +91,7 @@ sys.path.append(os.path.abspath('../../../../resource/search')) import search_code try: - src_release = os.path.join(os.getenv("MS_PATH"), 'RELEASE.md') + src_release = os.path.join(os.getenv("MSL_PATH"), 'RELEASE.md') des_release = "./RELEASE.md" with open(src_release, "r", encoding="utf-8") as f: data = f.read() diff --git a/docs/lite/docs/source_zh_cn/conf.py b/docs/lite/docs/source_zh_cn/conf.py index 9a0d8783e435ada0aab0c4357d94642301b87530..bae6befd6ce560a3b980e38c8c9c85af8bdca7b2 100644 --- a/docs/lite/docs/source_zh_cn/conf.py +++ b/docs/lite/docs/source_zh_cn/conf.py @@ -100,7 +100,7 @@ sys.path.append(os.path.abspath('../../../../resource/search')) import search_code try: - src_release = os.path.join(os.getenv("MS_PATH"), 'RELEASE_CN.md') + src_release = os.path.join(os.getenv("MSL_PATH"), 'RELEASE_CN.md') des_release = "./RELEASE.md" with open(src_release, "r", encoding="utf-8") as f: data = f.read() diff --git a/docs/msadapter/docs/source_zh_cn/index.rst b/docs/msadapter/docs/source_zh_cn/index.rst index 029c480a79c3698a031997c5bf427f5a49cb01ac..6d117f1a38e04a87ec9b96589049736e91dc330d 100644 --- a/docs/msadapter/docs/source_zh_cn/index.rst +++ b/docs/msadapter/docs/source_zh_cn/index.rst @@ -46,6 +46,7 @@ MSAdapter使用核心与目标 :glob: :maxdepth: 1 :caption: 使用指南 + :titlesonly: :hidden: msadapter_user_guide/install diff --git a/tools/ci_pipeline_gate_APIView/generate_pr_html.py b/tools/ci_pipeline_gate_APIView/generate_pr_html.py index 8c51aec5fc490af2acd085e7452f83a29b081994..94bde7aa84612a4172a77c84fa004a59d5c19c65 100644 --- a/tools/ci_pipeline_gate_APIView/generate_pr_html.py +++ b/tools/ci_pipeline_gate_APIView/generate_pr_html.py @@ -340,6 +340,7 @@ def en_file_handle(py_file_list, repo_path, dict1): # 接口模块分类 module_path_name = [ + ['mindspore/python/mindspore/profiler', 'mindspore.profiler'], ['mindspore/python/mindspore/parallel/nn', 'mindspore.parallel.nn'], ['mindspore/python/mindspore/parallel/auto_parallel', 'mindspore.parallel.auto_parallel'], ['mindspore/python/mindspore/parallel', 'mindspore.parallel'], diff --git a/tools/generate_html/daily.json b/tools/generate_html/daily.json index c634f1992ea919d219b3247be6e8b0128c0675a7..c61192d8a055ed059922d397e84d76046102a2cd 100644 --- a/tools/generate_html/daily.json +++ b/tools/generate_html/daily.json @@ -3,11 +3,11 @@ "id" : 1 , "name" : "lite", "branch" : "master", - "whl_path" : "/mindspore/website/master/lite/centos_x86/cloud_fusion/python39", + "whl_path" : "/mindspore-lite/newest/lite/centos_x86/cloud_fusion/python39", "whl_name" : "mindspore_lite-.*-cp39-cp39-linux_x86_64.whl$", - "environ" : "MS_PATH", + "environ" : "MSL_PATH", "uninstall_name" : "mindspore_lite", - "tar_path" : "/mindspore/website/master/lite/centos_x86/cloud_fusion/python39", + "tar_path" : "/mindspore-lite/newest/lite/centos_x86/cloud_fusion/python39", "tar_name" : "mindspore-lite-.*-linux-x64.tar.gz$", "extra_whl_path" : "/mindspore/website/master/cpu/x86_64", "extra_whl_name" : "mindspore-.*-cp39-cp39-linux_x86_64.whl$" diff --git a/tools/generate_html/run.py b/tools/generate_html/run.py index 8be1d4f9dd992be76fb767c6e7c5d2d50f890eb7..015236561fd3eb047d26552475d1644c988b102e 100644 --- a/tools/generate_html/run.py +++ b/tools/generate_html/run.py @@ -148,6 +148,9 @@ def main(version, user, pd, WGETDIR, release_url, generate_list): if data[i]['environ'] == "MS_PATH": repo_url = "https://gitee.com/mindspore/mindspore.git" repo_path = f"{REPODIR}/mindspore" + elif data[i]['environ'] == "MSL_PATH": + repo_url = "https://gitee.com/mindspore/mindspore-lite.git" + repo_path = f"{REPODIR}/mindspore-lite" elif data[i]['environ'] == "MSC_PATH": repo_url = "https://gitee.com/mindspore/mindscience.git" repo_path = f"{REPODIR}/mindscience" @@ -485,12 +488,10 @@ def main(version, user, pd, WGETDIR, release_url, generate_list): else: if i == "mindspore": TARGET = f"{OUTPUTDIR}/docs/en/{ArraySource[i]}" - os.makedirs(os.path.dirname(TARGET), exist_ok=True) - shutil.copytree("build_en/html", TARGET) else: TARGET = f"{OUTPUTDIR}/{i}/en/{ArraySource[i]}" - os.makedirs(os.path.dirname(TARGET), exist_ok=True) - shutil.copytree("build_en/html", TARGET) + os.makedirs(os.path.dirname(TARGET), exist_ok=True) + shutil.copytree("build_en/html", TARGET) # pylint: disable=W0702 except: print(f"{i} 的 英文版本运行失败") @@ -523,12 +524,10 @@ def main(version, user, pd, WGETDIR, release_url, generate_list): else: if i == "mindspore": TARGET = f"{OUTPUTDIR}/docs/zh-CN/{ArraySource[i]}" - os.makedirs(os.path.dirname(TARGET), exist_ok=True) - shutil.copytree("build_zh_cn/html", TARGET) else: TARGET = f"{OUTPUTDIR}/{i}/zh-CN/{ArraySource[i]}" - os.makedirs(os.path.dirname(TARGET), exist_ok=True) - shutil.copytree("build_zh_cn/html", TARGET) + os.makedirs(os.path.dirname(TARGET), exist_ok=True) + shutil.copytree("build_zh_cn/html", TARGET) # pylint: disable=W0702 except: print(f"{i} 的 中文版本运行失败")