From f5cfb437b91a40c013fb14d311d2dee20c45f7a7 Mon Sep 17 00:00:00 2001 From: yuncliu Date: Sat, 5 Dec 2020 18:38:46 +0800 Subject: [PATCH] fix bclinux, fix local install --- .../config/BigCloud_7.6_aarch64/pkg_info.json | 21 +++++++++++++++++++ .../config/BigCloud_7.6_aarch64/source.repo | 3 +++ .../config/BigCloud_7.6_x86_64/pkg_info.json | 6 ++++++ downloader/other_resources.json | 10 --------- install.sh | 7 +------ playbooks/gather_npu_fact.yml | 2 +- playbooks/install_nnae.yml | 3 +++ scene/scene_auto.yml | 4 ++++ 8 files changed, 39 insertions(+), 17 deletions(-) diff --git a/downloader/config/BigCloud_7.6_aarch64/pkg_info.json b/downloader/config/BigCloud_7.6_aarch64/pkg_info.json index 98727875..2a5b2244 100644 --- a/downloader/config/BigCloud_7.6_aarch64/pkg_info.json +++ b/downloader/config/BigCloud_7.6_aarch64/pkg_info.json @@ -62,6 +62,18 @@ { "name": "libffi-devel", "used_by": [ "driver", "cann", "framework" ] }, + { + "name": "libaec-devel", "used_by": [ "driver", "cann", "framework" ] + }, + { + "name": "libaec", "used_by": [ "driver", "cann", "framework" ] + }, + { + "name": "hdf5", "used_by": [ "driver", "cann", "framework" ] + }, + { + "name": "hdf5-devel", "used_by": [ "driver", "cann", "framework" ] + }, { "name": "keyutils-libs", "used_by": [ "driver", "cann", "framework" ] }, @@ -116,6 +128,9 @@ { "name": "pciutils", "used_by": [ "driver", "cann", "framework" ] }, + { + "name": "pciutils-libs", "used_by": [ "driver", "cann", "framework" ] + }, { "name": "net-tools", "used_by": [ "driver", "cann", "framework" ] }, @@ -166,5 +181,11 @@ }, { "name": "bzip2-devel", "used_by": [ "driver", "cann", "framework" ] + }, + { + "name": "kernel-bek-headers", "used_by": [ "driver", "cann", "framework" ] + }, + { + "name": "kernel-bek-devel", "used_by": [ "driver", "cann", "framework" ] } ] diff --git a/downloader/config/BigCloud_7.6_aarch64/source.repo b/downloader/config/BigCloud_7.6_aarch64/source.repo index f6f6915b..6cc03a07 100644 --- a/downloader/config/BigCloud_7.6_aarch64/source.repo +++ b/downloader/config/BigCloud_7.6_aarch64/source.repo @@ -6,3 +6,6 @@ baseurl=http://mirrors.bclinux.org/bclinux/el7.6/updates/aarch64 [extras] baseurl=http://mirrors.bclinux.org/bclinux/el7.6/extras/aarch64 + +[epel] +baseurl=http://mirrors.huaweicloud.com/epel/7/aarch64 diff --git a/downloader/config/BigCloud_7.6_x86_64/pkg_info.json b/downloader/config/BigCloud_7.6_x86_64/pkg_info.json index f16f5517..9719ddfe 100644 --- a/downloader/config/BigCloud_7.6_x86_64/pkg_info.json +++ b/downloader/config/BigCloud_7.6_x86_64/pkg_info.json @@ -160,5 +160,11 @@ }, { "name": "libselinux-python", "used_by": [ "driver", "cann", "framework" ] + }, + { + "name": "kernel-headers", "used_by": [ "driver", "cann", "framework" ] + }, + { + "name": "kernel-devel", "used_by": [ "driver", "cann", "framework" ] } ] diff --git a/downloader/other_resources.json b/downloader/other_resources.json index 5eb310dd..e5cf0094 100644 --- a/downloader/other_resources.json +++ b/downloader/other_resources.json @@ -1,14 +1,4 @@ [ - { - "filename":"kernel-headers-4.14.0-115.el7a.0.1.aarch64.rpm", - "url":"https://vault.centos.org/altarch/7.6.1810/os/aarch64/Packages/kernel-headers-4.14.0-115.el7a.0.1.aarch64.rpm", - "dest":"resources/BigCloud_7.6_aarch64" - }, - { - "filename":"kernel-headers-3.10.0-957.el7.x86_64.rpm", - "url":"https://vault.centos.org/7.6.1810/os/x86_64/Packages/kernel-headers-3.10.0-957.el7.x86_64.rpm", - "dest":"resources/BigCloud_7.6_x86_64" - }, { "filename":"kernel-headers-4.14.0-115.el7a.0.1.aarch64.rpm", "url":"https://vault.centos.org/altarch/7.6.1810/os/aarch64/Packages/kernel-headers-4.14.0-115.el7a.0.1.aarch64.rpm", diff --git a/install.sh b/install.sh index a71b0eed..12ac4872 100755 --- a/install.sh +++ b/install.sh @@ -60,11 +60,6 @@ function install_python375() return fi echo "installing Python 3.7.5" - pyinstall_path="/usr/local/python3.7.5" - if [ -d ${pyinstall_path} ];then - echo "python 3.7.5 already installed" - return - fi mkdir -p ~/build tar -xvf ./resources/Python-3.7.5.tar.xz -C ~/build cd ~/build/Python-3.7.5 @@ -127,7 +122,7 @@ function process_scene() if [ "x${debug_flag}" == "xy" ];then debug_cmd="-v" fi - echo "ansible-playbook -i ./inventory_file scene/scene_${install_scene}.yml -e hosts_name=ascendi ${debug_cmd}" + echo "ansible-playbook -i ./inventory_file scene/scene_${install_scene}.yml -e hosts_name=ascend ${debug_cmd}" ansible-playbook -i ./inventory_file scene/scene_${install_scene}.yml -e "hosts_name=ascend" ${debug_cmd} } diff --git a/playbooks/gather_npu_fact.yml b/playbooks/gather_npu_fact.yml index 9e71bd37..8bb1b150 100644 --- a/playbooks/gather_npu_fact.yml +++ b/playbooks/gather_npu_fact.yml @@ -20,7 +20,7 @@ - name: set resources_dir local set_fact: - resources_dir: "../resources" + resources_dir: "{{ inventory_dir }}/resources" cacheable: yes when: ansible_connection == "local" diff --git a/playbooks/install_nnae.yml b/playbooks/install_nnae.yml index 2ed88a19..cd83b111 100644 --- a/playbooks/install_nnae.yml +++ b/playbooks/install_nnae.yml @@ -17,6 +17,9 @@ - name: install nnae shell: "{{ nnae.files[0].path }} --install --quiet --install-username={{ user }} --install-usergroup={{ group }}" + environment: + PATH: /usr/local/python3.7.5/bin:{{ansible_env.PATH}} + LD_LIBRARY_PATH: /usr/local/python3.7.5/lib register: nnae_result when: nnae.matched > 0 failed_when: "'install success' not in nnae_result.stdout and 'already installed' not in nnae_result.stdout" diff --git a/scene/scene_auto.yml b/scene/scene_auto.yml index c6353dc0..a98246af 100644 --- a/scene/scene_auto.yml +++ b/scene/scene_auto.yml @@ -19,6 +19,10 @@ import_playbook: ../playbooks/install_nnae.yml when: ansible_local.npu_info.scene == 'train' +- name: install tfplugin + import_playbook: ../playbooks/install_tfplugin.yml + when: ansible_local.npu_info.scene == 'train' + - name: install toolbox import_playbook: ../playbooks/install_toolbox.yml -- Gitee