From fc852512463c8004753fd70217c88b3722f20e04 Mon Sep 17 00:00:00 2001 From: shupiaoyang Date: Mon, 21 Apr 2025 17:13:27 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E4=BC=98=E5=8C=96BoostKit-AccLib?= =?UTF-8?q?=E5=AE=89=E8=A3=85=E8=84=9A=E6=9C=AC=EF=BC=8C=E7=A7=BB=E9=99=A4?= =?UTF-8?q?QAT=E5=92=8CHCT=E7=9B=B8=E5=85=B3=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 主要变更： 1. 修改boost安装方式，从yum安装改为下载解压指定版本 2. 删除QAT和HCT相关的安装函数及配置 3. 更新version.xml中boost的下载源 4. 简化组件安装逻辑，仅保留KAE和KQMalloc功能 --- .../files/BoostKit-AccLib/scripts/install.py | 96 ++----------------- .../files/BoostKit-AccLib/scripts/version.xml | 13 +-- 2 files changed, 9 insertions(+), 100 deletions(-) diff --git a/plugins/boostkit/workspace/roles/AccLib/prepare/files/BoostKit-AccLib/scripts/install.py b/plugins/boostkit/workspace/roles/AccLib/prepare/files/BoostKit-AccLib/scripts/install.py index c6c0abb..1c74df6 100644 --- a/plugins/boostkit/workspace/roles/AccLib/prepare/files/BoostKit-AccLib/scripts/install.py +++ b/plugins/boostkit/workspace/roles/AccLib/prepare/files/BoostKit-AccLib/scripts/install.py @@ -159,7 +159,11 @@ class Installer(object): Runcmd.sendcmd(f"ragel -v") with self.__process("安装boost"): - Runcmd.sendcmd("yum install -y boost boost-devel") + download = info.get("boost") + bag = info.get("boost").split('/')[-1] + + Runcmd.sendcmd(f"wget {download} --no-check-certificate", workspace=f"{self.__ROOT_PATH}/Hyperscan") + Runcmd.sendcmd(f"tar -zxf {bag}", workspace=f"{self.__ROOT_PATH}/Hyperscan") with self.__process("安装pcre"): download = info.get("pcre") @@ -197,8 +201,8 @@ class Installer(object): else: Runcmd.sendcmd(f"git clone {download} -b {branch}", workspace=f"{self.__ROOT_PATH}/Hyperscan") - boost_path = "/usr/include" - Runcmd.sendcmd(f"ln -s {boost_path}/boost include/boost", workspace=f"{self.__ROOT_PATH}/Hyperscan/{dir}") + boost_path = Runcmd.sendcmd("ls | grep boost | grep -v tar", workspace=f"{self.__ROOT_PATH}/Hyperscan") + boost_path = f"{self.__ROOT_PATH}/Hyperscan/{boost_path}" pcre_path = Runcmd.sendcmd("ls | grep pcre | grep -v tar", workspace=f"{self.__ROOT_PATH}/Hyperscan") Runcmd.sendcmd(f"cp -rf ../{pcre_path} ./pcre", workspace=f"{self.__ROOT_PATH}/Hyperscan/{dir}") @@ -317,86 +321,6 @@ class Installer(object): if not self.__chech_env_in_profile("LD_LIBRARY_PATH", "/usr/local/lib"): Runcmd.sendcmd("echo 'export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH' >> /etc/profile") - def __install_qat_dep(self): - with self.__process("安装QAT依赖包"): - Runcmd.sendcmd("yum install -y systemd-devel pciutils libudev-devel readline-devel libxml2-devel " - "boost-devel elfutils-libelf-devel python3 libnl3-devel kernel-devel-$(uname -r) " - "gcc gcc-c++ yasm nasm zlib openssl-devel zlib-devel make") - - def __install_qat(self): - self.__install_qat_dep() - - Runcmd.sendcmd(f"rm -rf ./QAT", workspace=f"{self.__ROOT_PATH}") - Runcmd.sendcmd("mkdir -p QAT/qat_driver", workspace=f"{self.__ROOT_PATH}") - - info = self.__get_element_text("QAT") - - with self.__process("安装部署QAT驱动"): - download = info.get("driver") - bag = download.split('/')[-1] - decompresser = "unzip" if "zip" in bag else "tar -xf" - qat_hw_root = f"{self.__ROOT_PATH}/QAT/qat_driver" - - os.putenv("ICP_ROOT", qat_hw_root) - Runcmd.sendcmd(f"wget {download} --no-check-certificate", workspace=f"{self.__ROOT_PATH}/QAT/qat_driver") - Runcmd.sendcmd(f"{decompresser} {bag}", workspace=f"{self.__ROOT_PATH}/QAT/qat_driver") - Runcmd.sendcmd("./configure", workspace=f"{self.__ROOT_PATH}/QAT/qat_driver") - Runcmd.sendcmd("make && make install", workspace=f"{self.__ROOT_PATH}/QAT/qat_driver") - - Runcmd.sendcmd("service qat_service status && service qat_service restart") - - with self.__process("安装部署QAT引擎"): - download = info.get("code_engine") - branch = info.get("branch_engine") - dir = download.split('/')[-1].split('.')[0] - - Runcmd.sendcmd(f"git clone {download} -b {branch} --depth=1", workspace=f"{self.__ROOT_PATH}/QAT") - Runcmd.sendcmd(f"./autogen.sh && ./configure --with-qat_hw-dir={qat_hw_root}", - workspace=f"{self.__ROOT_PATH}/QAT/{dir}") - Runcmd.sendcmd(f"make && make install", workspace=f"{self.__ROOT_PATH}/QAT/{dir}") - - with self.__process("安装部署QATzip"): - download = info.get("code_zip") - branch = info.get("branch_zip") - dir = download.split('/')[-1].split('.')[0] - - Runcmd.sendcmd(f"git clone {download} -b {branch} --depth=1", workspace=f"{self.__ROOT_PATH}/QAT") - Runcmd.sendcmd(f"./autogen.sh && ./configure --with-ICP_ROOT={qat_hw_root}", - workspace=f"{self.__ROOT_PATH}/QAT/{dir}") - Runcmd.sendcmd("make clean && make all install", workspace=f"{self.__ROOT_PATH}/QAT/{dir}") - - res = Runcmd.sendcmd("ls /usr/local/lib") - assert "qatzip.so" in res, "没有找到qatzip动态库" - - self.__install_compress_decompress_tools() - - def __install_hct_dep(self): - with self.__process("安装HCT依赖"): - Runcmd.sendcmd( - "yum install -y numactl libuuid-devel kernel-`uname -r` kernel-devel-`uname -r` python3-unversioned-command") - - def __install_hct(self): - self.__install_hct_dep() - - info = self.__get_element_text("HCT") - Runcmd.sendcmd("rm -rf HCT", workspace=f"{self.__ROOT_PATH}") - Runcmd.sendcmd("mkdir -p HCT/build", workspace=f"{self.__ROOT_PATH}") - - with self.__process("安装HCT"): - download = info.get("devkit") - version = info.get("version") - dir = download.split('/')[-1].split('.')[0] - - Runcmd.sendcmd(f"git clone {download} -n --filter=blob:none", workspace=f"{self.__ROOT_PATH}/HCT") - Runcmd.sendcmd(f"git restore --staged hct/pkg/{version} && git restore hct/pkg/{version}", - workspace=f"{self.__ROOT_PATH}/HCT/{dir}") - Runcmd.sendcmd(f"rpm -ivh --nodeps hct-*.rpm", workspace=f"{self.__ROOT_PATH}/HCT/{dir}/hct/pkg/{version}", - check=False) - Runcmd.sendcmd(f"cp ./Makefile {self.__ROOT_PATH}/HCT/build", - workspace=f"{self.__ROOT_PATH}/HCT/{dir}/hct/pkg/{version}") - Runcmd.sendcmd("make && make install", workspace=f"{self.__ROOT_PATH}/HCT/build") - Runcmd.sendcmd("modprobe hct && /opt/hygon/hct/hct/script/hctconfig start") - def __install_kqmalloc_dep(self): with self.__process("安装kqmalloc编译依赖"): Runcmd.sendcmd("yum install -y autoconf gcc gcc-c++") @@ -420,10 +344,6 @@ class Installer(object): if "Kunpeng" in res: self.__function_dict["KAE"] = self.__install_kae self.__function_dict["KQMalloc"] = self.__install_kqmalloc - elif "INTEL" in res: - self.__function_dict["QAT"] = self.__install_qat - elif "Hygon" in res: - self.__function_dict["HCT"] = self.__install_hct else: self.__function_dict["SOFT_COMPRESS"] = self.__install_compress_decompress_tools @@ -442,7 +362,7 @@ class Installer(object): if not args.ignore: raise e else: - for component in components.split(','): + for component in components.split(): func = self.__function_dict.get(component) if func: try: diff --git a/plugins/boostkit/workspace/roles/AccLib/prepare/files/BoostKit-AccLib/scripts/version.xml b/plugins/boostkit/workspace/roles/AccLib/prepare/files/BoostKit-AccLib/scripts/version.xml index 7af9504..eb1841a 100644 --- a/plugins/boostkit/workspace/roles/AccLib/prepare/files/BoostKit-AccLib/scripts/version.xml +++ b/plugins/boostkit/workspace/roles/AccLib/prepare/files/BoostKit-AccLib/scripts/version.xml @@ -10,7 +10,7 @@ https://repo.oepkgs.net/openEuler/rpm/openEuler-24.03-LTS/contrib/oedp/files/ragel-6.10.tar.gz - https://archives.boost.io/release/1.87.0/source/boost_1_87_0.tar.gz + https://repo.oepkgs.net/openEuler/rpm/openEuler-24.03-LTS/contrib/oedp/files/boost_1_87_0.tar.gz https://repo.oepkgs.net/openEuler/rpm/openEuler-24.03-LTS/contrib/oedp/files/pcre-8.43.tar.gz https://gitee.com/kunpengcompute/hyperscan.git v5.4.2.aarch64 @@ -21,15 +21,4 @@ https://gitee.com/kunpengcompute/KAE.git kae2 - - https://downloadmirror.intel.com/843052/QAT20.L.1.2.30-00078.tar.gz - https://github.com/intel/QAT_Engine.git - v1.8.1 - https://github.com/intel/QATzip.git - v1.3.0 - - - https://gitee.com/anolis/hygon-devkit.git - hct_2.1.0.20241030_release - \ No newline at end of file -- Gitee From 11a152f5ca578b797b66b36c9739c706b3275af9 Mon Sep 17 00:00:00 2001 From: shupiaoyang Date: Tue, 22 Apr 2025 20:14:39 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E6=9B=B4=E6=96=B0BoostKit=E5=8A=A0?= =?UTF-8?q?=E9=80=9F=E5=BA=93=E9=85=8D=E7=BD=AE=E5=92=8C=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 主要变更： 1. 修改config.yaml中的install_list格式，并添加KSL/HMPP版本等变量 2. 更新version.xml中的组件版本和下载路径 3. 新增version.xml.j2模板文件用于动态生成版本配置 4. 在prepare任务中添加模板文件复制步骤 --- plugins/boostkit/config.yaml | 7 ++++-- .../files/BoostKit-AccLib/scripts/version.xml | 8 +++---- .../roles/AccLib/prepare/tasks/main.yml | 6 +++++ .../AccLib/prepare/templates/version.xml.j2 | 22 +++++++++++++++++++ 4 files changed, 36 insertions(+), 7 deletions(-) create mode 100644 plugins/boostkit/workspace/roles/AccLib/prepare/templates/version.xml.j2 diff --git a/plugins/boostkit/config.yaml b/plugins/boostkit/config.yaml index 575e390..c0f940e 100644 --- a/plugins/boostkit/config.yaml +++ b/plugins/boostkit/config.yaml @@ -18,8 +18,11 @@ all: host1: # 可在此包含更多主机 vars: - install_list: - - 'ALL' + install_list: 'ALL' # 支持使用列表，或者使用逗号分隔的字符串 + KSL_version: 2.5.0 + HMPP_version: 2.5.0 + hyperscan_branch: v5.4.2.aarch64 + KAE_tag: kae2 vars: # 跳过所有基本检查项 skip_check: false diff --git a/plugins/boostkit/workspace/roles/AccLib/prepare/files/BoostKit-AccLib/scripts/version.xml b/plugins/boostkit/workspace/roles/AccLib/prepare/files/BoostKit-AccLib/scripts/version.xml index eb1841a..c9f6095 100644 --- a/plugins/boostkit/workspace/roles/AccLib/prepare/files/BoostKit-AccLib/scripts/version.xml +++ b/plugins/boostkit/workspace/roles/AccLib/prepare/files/BoostKit-AccLib/scripts/version.xml @@ -1,12 +1,12 @@ - 2.4.0 - https://repo.oepkgs.net/openEuler/rpm/{}/extras/aarch64/Packages/b/boostkit-ksl-{}-1.aarch64.rpm + 2.5.0 + https://repo.oepkgs.net/openEuler/rpm/openEuler-24.03-LTS/contrib/oedp/files/boostkit-ksl-{}-1.aarch64.rpm 2.5.0 - https://repo.oepkgs.net/openEuler/rpm/{}/extras/aarch64/Packages/b/boostkit-hmpp-{}-1.aarch64.rpm + https://repo.oepkgs.net/openEuler/rpm/openEuler-24.03-LTS/contrib/oedp/files/boostkit-hmpp-{}-1.aarch64.rpm https://repo.oepkgs.net/openEuler/rpm/openEuler-24.03-LTS/contrib/oedp/files/ragel-6.10.tar.gz @@ -14,8 +14,6 @@ https://repo.oepkgs.net/openEuler/rpm/openEuler-24.03-LTS/contrib/oedp/files/pcre-8.43.tar.gz https://gitee.com/kunpengcompute/hyperscan.git v5.4.2.aarch64 - https://github.com/intel/hyperscan.git - v5.4.2 https://gitee.com/kunpengcompute/KAE.git diff --git a/plugins/boostkit/workspace/roles/AccLib/prepare/tasks/main.yml b/plugins/boostkit/workspace/roles/AccLib/prepare/tasks/main.yml index 9597ff1..7810627 100644 --- a/plugins/boostkit/workspace/roles/AccLib/prepare/tasks/main.yml +++ b/plugins/boostkit/workspace/roles/AccLib/prepare/tasks/main.yml @@ -15,3 +15,9 @@ src: "BoostKit-AccLib" dest: "{{ temp_path }}" tags: file_transfer + +- name: "[File] Copy version.xml to remote host" + template: + src: "version.xml.j2" + dest: "{{ temp_path }}/Boostkit-AccLib/scripts/version.xml" + tags: file_transfer diff --git a/plugins/boostkit/workspace/roles/AccLib/prepare/templates/version.xml.j2 b/plugins/boostkit/workspace/roles/AccLib/prepare/templates/version.xml.j2 new file mode 100644 index 0000000..eaa3e79 --- /dev/null +++ b/plugins/boostkit/workspace/roles/AccLib/prepare/templates/version.xml.j2 @@ -0,0 +1,22 @@ + + + + {{ KSL_version }} + https://repo.oepkgs.net/openEuler/rpm/openEuler-24.03-LTS/contrib/oedp/files/boostkit-ksl-{}-1.aarch64.rpm + + + {{ HMPP_version }} + https://repo.oepkgs.net/openEuler/rpm/openEuler-24.03-LTS/contrib/oedp/files/boostkit-hmpp-{}-1.aarch64.rpm + + + https://repo.oepkgs.net/openEuler/rpm/openEuler-24.03-LTS/contrib/oedp/files/ragel-6.10.tar.gz + https://repo.oepkgs.net/openEuler/rpm/openEuler-24.03-LTS/contrib/oedp/files/boost_1_87_0.tar.gz + https://repo.oepkgs.net/openEuler/rpm/openEuler-24.03-LTS/contrib/oedp/files/pcre-8.43.tar.gz + https://gitee.com/kunpengcompute/hyperscan.git + {{ hyperscan_branch }} + + + https://gitee.com/kunpengcompute/KAE.git + {{ KAE_tag }} + + \ No newline at end of file -- Gitee From 5c2937445f7bb3799a0e7f3ad62ab6626e1683ef Mon Sep 17 00:00:00 2001 From: shupiaoyang Date: Tue, 22 Apr 2025 20:24:41 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E4=BF=AE=E5=A4=8DAccLib=E5=87=86?= =?UTF-8?q?=E5=A4=87=E4=BB=BB=E5=8A=A1=E4=B8=AD=E7=89=88=E6=9C=AC=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E8=B7=AF=E5=BE=84=E7=9A=84=E5=A4=A7=E5=B0=8F=E5=86=99?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugins/boostkit/workspace/roles/AccLib/prepare/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/boostkit/workspace/roles/AccLib/prepare/tasks/main.yml b/plugins/boostkit/workspace/roles/AccLib/prepare/tasks/main.yml index 7810627..0bb0152 100644 --- a/plugins/boostkit/workspace/roles/AccLib/prepare/tasks/main.yml +++ b/plugins/boostkit/workspace/roles/AccLib/prepare/tasks/main.yml @@ -19,5 +19,5 @@ - name: "[File] Copy version.xml to remote host" template: src: "version.xml.j2" - dest: "{{ temp_path }}/Boostkit-AccLib/scripts/version.xml" + dest: "{{ temp_path }}/BoostKit-AccLib/scripts/version.xml" tags: file_transfer -- Gitee From 67752d046eec7558e5b23a0be95caa887251d0b8 Mon Sep 17 00:00:00 2001 From: shupiaoyang Date: Thu, 24 Apr 2025 17:12:05 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E4=BC=98=E5=8C=96AccLib=E5=AE=89?= =?UTF-8?q?=E8=A3=85=E8=84=9A=E6=9C=AC=EF=BC=8C=E7=AE=80=E5=8C=96URL?= =?UTF-8?q?=E7=94=9F=E6=88=90=E5=B9=B6=E4=BF=AE=E5=A4=8DHyperscan=E7=9A=84?= =?UTF-8?q?boost=E9=93=BE=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. 移除对openEuler系统版本号的依赖，直接使用KSL包版本号生成下载URL 2. 修复Hyperscan编译时的boost库软链接问题，确保正确链接到boost头文件目录 --- .../AccLib/prepare/files/BoostKit-AccLib/scripts/install.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/boostkit/workspace/roles/AccLib/prepare/files/BoostKit-AccLib/scripts/install.py b/plugins/boostkit/workspace/roles/AccLib/prepare/files/BoostKit-AccLib/scripts/install.py index 1c74df6..fe29138 100644 --- a/plugins/boostkit/workspace/roles/AccLib/prepare/files/BoostKit-AccLib/scripts/install.py +++ b/plugins/boostkit/workspace/roles/AccLib/prepare/files/BoostKit-AccLib/scripts/install.py @@ -130,9 +130,8 @@ class Installer(object): res = Runcmd.sendcmd("cat /etc/os-release") name = re.search("NAME=\"(.+)\"", res).group(1) assert name == "openEuler", "仅支持在openEuler上安装" - os_version = re.search("VERSION=\"(.+)\"", res).group(1).replace(' ', '').replace(')', '').replace('(', '-') pkg_version = ksl_info.get("version") - url = ksl_info.get('url').format(f"{name}-{os_version}", pkg_version) + url = ksl_info.get('url').format(pkg_version) Runcmd.sendcmd(f"wget {url} --no-check-certificate", workspace=f"{self.__ROOT_PATH}/KSL/rpm") Runcmd.sendcmd("rpm -e boostkit-ksl", check=False) @@ -203,6 +202,7 @@ class Installer(object): boost_path = Runcmd.sendcmd("ls | grep boost | grep -v tar", workspace=f"{self.__ROOT_PATH}/Hyperscan") boost_path = f"{self.__ROOT_PATH}/Hyperscan/{boost_path}" + Runcmd.sendcmd(f"ln -s {boost_path}/boost include/boost", workspace=f"{self.__ROOT_PATH}/Hyperscan/{dir}") pcre_path = Runcmd.sendcmd("ls | grep pcre | grep -v tar", workspace=f"{self.__ROOT_PATH}/Hyperscan") Runcmd.sendcmd(f"cp -rf ../{pcre_path} ./pcre", workspace=f"{self.__ROOT_PATH}/Hyperscan/{dir}") -- Gitee From 0796435c0fa9b072a240fab084023467b8e1e147 Mon Sep 17 00:00:00 2001 From: shupiaoyang Date: Thu, 8 May 2025 11:46:43 +0800 Subject: [PATCH 05/10] =?UTF-8?q?=E4=BC=98=E5=8C=96libgcrypt=E5=AE=89?= =?UTF-8?q?=E8=A3=85=E6=B5=81=E7=A8=8B=E5=B9=B6=E6=9B=B4=E6=96=B0=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 主要变更： 1. 修改install.py脚本，从直接解压zip改为通过wget下载tar.gz包并解压 2. 在version.xml和模板文件中添加libgcrypt的版本和下载URL配置 --- .../files/BoostKit-AccLib/scripts/install.py | 16 +++++++++++++++- .../files/BoostKit-AccLib/scripts/version.xml | 4 ++++ .../AccLib/prepare/templates/version.xml.j2 | 4 ++++ 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/plugins/boostkit/workspace/roles/AccLib/prepare/files/BoostKit-AccLib/scripts/install.py b/plugins/boostkit/workspace/roles/AccLib/prepare/files/BoostKit-AccLib/scripts/install.py index fe29138..9d48161 100644 --- a/plugins/boostkit/workspace/roles/AccLib/prepare/files/BoostKit-AccLib/scripts/install.py +++ b/plugins/boostkit/workspace/roles/AccLib/prepare/files/BoostKit-AccLib/scripts/install.py @@ -308,9 +308,23 @@ class Installer(object): print("已经安装了libgpg-error，不用再安装了") return + info = self.__get_element_text("libgcrypt") + version = info.get("version") + download = info.get('url').format(version) + name = download.split('/')[-1] + + Runcmd.sendcmd("rm -rf ./resources", workspace=f"{self.__ROOT_PATH}") + Runcmd.sendcmd("mkdir resources", workspace=f"{self.__ROOT_PATH}") + Runcmd.sendcmd("cd resources", workspace=f"{self.__ROOT_PATH}") + Runcmd.sendcmd("mkdir libgcrypt", workspace=f"{self.__ROOT_PATH}/resources") + Runcmd.sendcmd("rm -rf libgpg", workspace=f"{self.__ROOT_PATH}") + Runcmd.sendcmd("mkdir libgpg", workspace=f"{self.__ROOT_PATH}") + with self.__process("安装libgcrypt"): - Runcmd.sendcmd(f"unzip libgpg-error-1.51.zip -d {self.__ROOT_PATH}/libgpg", + Runcmd.sendcmd(f"wget {download} --no-check-certificate", + workspace=f"{self.__ROOT_PATH}/resources/libgcrypt") + Runcmd.sendcmd(f"tar -xvf {name} -C {self.__ROOT_PATH}/libgpg", workspace=f"{self.__ROOT_PATH}/resources/libgcrypt") Runcmd.sendcmd("chmod 777 autogen.sh; ./autogen.sh", workspace=f"{self.__ROOT_PATH}/libgpg/libgpg-error-1.51") diff --git a/plugins/boostkit/workspace/roles/AccLib/prepare/files/BoostKit-AccLib/scripts/version.xml b/plugins/boostkit/workspace/roles/AccLib/prepare/files/BoostKit-AccLib/scripts/version.xml index c9f6095..c6b19cf 100644 --- a/plugins/boostkit/workspace/roles/AccLib/prepare/files/BoostKit-AccLib/scripts/version.xml +++ b/plugins/boostkit/workspace/roles/AccLib/prepare/files/BoostKit-AccLib/scripts/version.xml @@ -19,4 +19,8 @@ https://gitee.com/kunpengcompute/KAE.git kae2 + + 1.51 + https://www.gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-{}.tar.gz + \ No newline at end of file diff --git a/plugins/boostkit/workspace/roles/AccLib/prepare/templates/version.xml.j2 b/plugins/boostkit/workspace/roles/AccLib/prepare/templates/version.xml.j2 index eaa3e79..07a8124 100644 --- a/plugins/boostkit/workspace/roles/AccLib/prepare/templates/version.xml.j2 +++ b/plugins/boostkit/workspace/roles/AccLib/prepare/templates/version.xml.j2 @@ -19,4 +19,8 @@ https://gitee.com/kunpengcompute/KAE.git {{ KAE_tag }} + + 1.51 + https://www.gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-{}.tar.gz + \ No newline at end of file -- Gitee From 54813a46ebfbc950aede198a61cb76680b40f723 Mon Sep 17 00:00:00 2001 From: shupiaoyang Date: Thu, 8 May 2025 15:19:31 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E4=BF=AE=E5=A4=8DAccLib=E5=AE=89?= =?UTF-8?q?=E8=A3=85=E8=84=9A=E6=9C=AC=E4=B8=AD=E7=BB=84=E4=BB=B6=E5=88=86?= =?UTF-8?q?=E9=9A=94=E7=AC=A6=E9=97=AE=E9=A2=98=EF=BC=8C=E5=B0=86=E7=A9=BA?= =?UTF-8?q?=E6=A0=BC=E5=88=86=E9=9A=94=E6=94=B9=E4=B8=BA=E9=80=97=E5=8F=B7?= =?UTF-8?q?=E5=88=86=E9=9A=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AccLib/prepare/files/BoostKit-AccLib/scripts/install.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/boostkit/workspace/roles/AccLib/prepare/files/BoostKit-AccLib/scripts/install.py b/plugins/boostkit/workspace/roles/AccLib/prepare/files/BoostKit-AccLib/scripts/install.py index 9d48161..3acf72a 100644 --- a/plugins/boostkit/workspace/roles/AccLib/prepare/files/BoostKit-AccLib/scripts/install.py +++ b/plugins/boostkit/workspace/roles/AccLib/prepare/files/BoostKit-AccLib/scripts/install.py @@ -376,7 +376,7 @@ class Installer(object): if not args.ignore: raise e else: - for component in components.split(): + for component in components.split(','): func = self.__function_dict.get(component) if func: try: -- Gitee From 4c5ee60f2b32628d7d7d55d5ee6f0590385c53a1 Mon Sep 17 00:00:00 2001 From: shupiaoyang Date: Thu, 8 May 2025 15:25:23 +0800 Subject: [PATCH 07/10] =?UTF-8?q?=E7=A7=BB=E9=99=A4HMPP=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 本次提交删除了BoostKit插件中与HMPP组件相关的配置项，包括： 1. 从version.xml模板文件中移除HMPP版本信息 2. 从config.yaml配置文件中移除HMPP版本变量 3. 从version.xml配置文件中移除HMPP节点 --- plugins/boostkit/config.yaml | 1 - .../AccLib/prepare/files/BoostKit-AccLib/scripts/version.xml | 4 ---- .../workspace/roles/AccLib/prepare/templates/version.xml.j2 | 4 ---- 3 files changed, 9 deletions(-) diff --git a/plugins/boostkit/config.yaml b/plugins/boostkit/config.yaml index c0f940e..f3cc05c 100644 --- a/plugins/boostkit/config.yaml +++ b/plugins/boostkit/config.yaml @@ -20,7 +20,6 @@ all: vars: install_list: 'ALL' # 支持使用列表，或者使用逗号分隔的字符串 KSL_version: 2.5.0 - HMPP_version: 2.5.0 hyperscan_branch: v5.4.2.aarch64 KAE_tag: kae2 vars: diff --git a/plugins/boostkit/workspace/roles/AccLib/prepare/files/BoostKit-AccLib/scripts/version.xml b/plugins/boostkit/workspace/roles/AccLib/prepare/files/BoostKit-AccLib/scripts/version.xml index c6b19cf..5ae6b38 100644 --- a/plugins/boostkit/workspace/roles/AccLib/prepare/files/BoostKit-AccLib/scripts/version.xml +++ b/plugins/boostkit/workspace/roles/AccLib/prepare/files/BoostKit-AccLib/scripts/version.xml @@ -4,10 +4,6 @@ 2.5.0 https://repo.oepkgs.net/openEuler/rpm/openEuler-24.03-LTS/contrib/oedp/files/boostkit-ksl-{}-1.aarch64.rpm - - 2.5.0 - https://repo.oepkgs.net/openEuler/rpm/openEuler-24.03-LTS/contrib/oedp/files/boostkit-hmpp-{}-1.aarch64.rpm - https://repo.oepkgs.net/openEuler/rpm/openEuler-24.03-LTS/contrib/oedp/files/ragel-6.10.tar.gz https://repo.oepkgs.net/openEuler/rpm/openEuler-24.03-LTS/contrib/oedp/files/boost_1_87_0.tar.gz diff --git a/plugins/boostkit/workspace/roles/AccLib/prepare/templates/version.xml.j2 b/plugins/boostkit/workspace/roles/AccLib/prepare/templates/version.xml.j2 index 07a8124..3e33e90 100644 --- a/plugins/boostkit/workspace/roles/AccLib/prepare/templates/version.xml.j2 +++ b/plugins/boostkit/workspace/roles/AccLib/prepare/templates/version.xml.j2 @@ -4,10 +4,6 @@ {{ KSL_version }} https://repo.oepkgs.net/openEuler/rpm/openEuler-24.03-LTS/contrib/oedp/files/boostkit-ksl-{}-1.aarch64.rpm - - {{ HMPP_version }} - https://repo.oepkgs.net/openEuler/rpm/openEuler-24.03-LTS/contrib/oedp/files/boostkit-hmpp-{}-1.aarch64.rpm - https://repo.oepkgs.net/openEuler/rpm/openEuler-24.03-LTS/contrib/oedp/files/ragel-6.10.tar.gz https://repo.oepkgs.net/openEuler/rpm/openEuler-24.03-LTS/contrib/oedp/files/boost_1_87_0.tar.gz -- Gitee From e2eb68b894af429dd306be88f5a3115c40df61a1 Mon Sep 17 00:00:00 2001 From: shupiaoyang Date: Thu, 8 May 2025 16:34:00 +0800 Subject: [PATCH 08/10] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E8=BD=AF=E7=AE=97?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E5=B7=A5=E5=85=B7=E5=AE=89=E8=A3=85=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E5=B9=B6=E4=BF=AE=E6=AD=A3KAE=E5=88=86=E6=94=AF?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. 删除__install_compress_decompress_tools方法及相关调用，该功能不再需要 2. 将config.yaml中的KAE_tag参数更名为KAE_branch以保持命名一致性 3. 同步更新version.xml.j2模板中的变量引用为KAE_branch --- plugins/boostkit/config.yaml | 2 +- .../files/BoostKit-AccLib/scripts/install.py | 19 ------------------- .../AccLib/prepare/templates/version.xml.j2 | 2 +- 3 files changed, 2 insertions(+), 21 deletions(-) diff --git a/plugins/boostkit/config.yaml b/plugins/boostkit/config.yaml index f3cc05c..23d7d81 100644 --- a/plugins/boostkit/config.yaml +++ b/plugins/boostkit/config.yaml @@ -21,7 +21,7 @@ all: install_list: 'ALL' # 支持使用列表，或者使用逗号分隔的字符串 KSL_version: 2.5.0 hyperscan_branch: v5.4.2.aarch64 - KAE_tag: kae2 + KAE_branch: kae2 vars: # 跳过所有基本检查项 skip_check: false diff --git a/plugins/boostkit/workspace/roles/AccLib/prepare/files/BoostKit-AccLib/scripts/install.py b/plugins/boostkit/workspace/roles/AccLib/prepare/files/BoostKit-AccLib/scripts/install.py index 3acf72a..535f608 100644 --- a/plugins/boostkit/workspace/roles/AccLib/prepare/files/BoostKit-AccLib/scripts/install.py +++ b/plugins/boostkit/workspace/roles/AccLib/prepare/files/BoostKit-AccLib/scripts/install.py @@ -217,23 +217,6 @@ class Installer(object): Runcmd.sendcmd("mkdir -p build", workspace=f"{self.__ROOT_PATH}/Hyperscan/{dir}") Runcmd.sendcmd("cmake .. && make -j", workspace=f"{self.__ROOT_PATH}/Hyperscan/{dir}/build") - def __install_compress_decompress_tools(self): - Runcmd.sendcmd("rm -rf ZIP", workspace=f"{self.__ROOT_PATH}") - Runcmd.sendcmd("mkdir ZIP", workspace=f"{self.__ROOT_PATH}") - - with self.__process("安装软算测试工具lzbench"): - Runcmd.sendcmd("git clone https://gitee.com/kunpeng_compute/lzbench.git --depth=1", - workspace=f"{self.__ROOT_PATH}/ZIP") - Runcmd.sendcmd("make -j", workspace=f"{self.__ROOT_PATH}/ZIP/lzbench") - - if "KAE" in str(self.__function_dict.keys()) or "QAT" in str(self.__function_dict.keys()): - with self.__process("安装带宽测试工具"): - Runcmd.sendcmd(f"make platform='{self.__platform}'", - workspace=f"{self.__ROOT_PATH}/resources/bandwidth") - Runcmd.sendcmd(f"cp ./bin/bandwidth {self.__ROOT_PATH}/ZIP", - workspace=f"{self.__ROOT_PATH}/resources/bandwidth") - Runcmd.sendcmd("make clean", workspace=f"{self.__ROOT_PATH}/resources/bandwidth") - def __install_kae_dep(self): with self.__process("安装KAE相关依赖"): Runcmd.sendcmd( @@ -358,8 +341,6 @@ class Installer(object): if "Kunpeng" in res: self.__function_dict["KAE"] = self.__install_kae self.__function_dict["KQMalloc"] = self.__install_kqmalloc - else: - self.__function_dict["SOFT_COMPRESS"] = self.__install_compress_decompress_tools def get_support(self): return ' '.join(self.__function_dict.keys()) diff --git a/plugins/boostkit/workspace/roles/AccLib/prepare/templates/version.xml.j2 b/plugins/boostkit/workspace/roles/AccLib/prepare/templates/version.xml.j2 index 3e33e90..ea35c44 100644 --- a/plugins/boostkit/workspace/roles/AccLib/prepare/templates/version.xml.j2 +++ b/plugins/boostkit/workspace/roles/AccLib/prepare/templates/version.xml.j2 @@ -13,7 +13,7 @@ https://gitee.com/kunpengcompute/KAE.git - {{ KAE_tag }} + {{ KAE_branch }} 1.51 -- Gitee From e6c277424b0a4d1fea1d117e984c6d18b6fc4f22 Mon Sep 17 00:00:00 2001 From: shupiaoyang Date: Thu, 8 May 2025 18:57:51 +0800 Subject: [PATCH 09/10] =?UTF-8?q?=E5=9C=A8AccLib=E5=AE=89=E8=A3=85?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E4=B8=AD=E6=B7=BB=E5=8A=A0=E8=B0=83=E8=AF=95?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E8=B7=AF=E5=BE=84=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 在execute_install.yml中添加调试信息，在执行安装脚本前显示日志文件路径，方便用户通过tail命令实时查看安装进度。 --- .../workspace/roles/AccLib/install/tasks/execute_install.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/plugins/boostkit/workspace/roles/AccLib/install/tasks/execute_install.yml b/plugins/boostkit/workspace/roles/AccLib/install/tasks/execute_install.yml index d2a4a00..48bff61 100644 --- a/plugins/boostkit/workspace/roles/AccLib/install/tasks/execute_install.yml +++ b/plugins/boostkit/workspace/roles/AccLib/install/tasks/execute_install.yml @@ -3,6 +3,11 @@ register: timestamp changed_when: false +- name: Show log file path + debug: + msg: "Start executing install script. Use 'tail -f {{ temp_path }}/BoostKit-AccLib/scripts/{{ timestamp.stdout }}.log' to watch process." + tags: install + - name: Execute install script for {{ item }} shell: | python3 install.py --component {{ item }} > {{ temp_path }}/BoostKit-AccLib/scripts/{{ timestamp.stdout }}.log 2>&1 -- Gitee From 9a5a9baae36f5679f4eb41910de85d43543a301a Mon Sep 17 00:00:00 2001 From: shupiaoyang Date: Fri, 9 May 2025 16:07:11 +0800 Subject: [PATCH 10/10] =?UTF-8?q?=E4=BC=98=E5=8C=96AccLib=E5=87=86?= =?UTF-8?q?=E5=A4=87=E4=BB=BB=E5=8A=A1=EF=BC=8C=E6=B7=BB=E5=8A=A0=E6=B8=85?= =?UTF-8?q?=E7=90=86=E4=B8=B4=E6=97=B6=E6=96=87=E4=BB=B6=E6=AD=A5=E9=AA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../boostkit/workspace/roles/AccLib/prepare/tasks/main.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/plugins/boostkit/workspace/roles/AccLib/prepare/tasks/main.yml b/plugins/boostkit/workspace/roles/AccLib/prepare/tasks/main.yml index 0bb0152..046bad7 100644 --- a/plugins/boostkit/workspace/roles/AccLib/prepare/tasks/main.yml +++ b/plugins/boostkit/workspace/roles/AccLib/prepare/tasks/main.yml @@ -4,6 +4,12 @@ state: present tags: dependency +- name: "[Cleanup] Remove temporary files and directories" + file: + path: "{{ temp_path }}/BoostKit-AccLib" + state: absent + tags: cleanup + - name: "[File] Ensure destination directory exists" file: path: "{{ temp_path }}" -- Gitee