From c184d8a82bdc05508c39572e5141802663433713 Mon Sep 17 00:00:00 2001 From: zhenyu--zhao_admin Date: Fri, 16 Aug 2024 17:30:34 +0800 Subject: [PATCH] Bugfix for missing models in AI4C. --- 0002-Bugfix-for-missing-models-in-AI4C.patch | 38 ++++++++++++++++++++ gcc-for-openEuler.spec | 6 +++- 2 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 0002-Bugfix-for-missing-models-in-AI4C.patch diff --git a/0002-Bugfix-for-missing-models-in-AI4C.patch b/0002-Bugfix-for-missing-models-in-AI4C.patch new file mode 100644 index 0000000..98b2469 --- /dev/null +++ b/0002-Bugfix-for-missing-models-in-AI4C.patch @@ -0,0 +1,38 @@ +From ab645f0aeac3546ebbd330bb875d56f139ce788e Mon Sep 17 00:00:00 2001 +From: zhenyu--zhao_admin +Date: Fri, 16 Aug 2024 21:27:17 +0800 +Subject: [PATCH] Bugfix for missing models in AI4C + +--- + build/hcc_arm64le_native/hcc_aarch64_native_final.sh | 1 + + build/hcc_arm64le_native/hcc_aarch64_native_release.sh | 2 +- + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/build/hcc_arm64le_native/hcc_aarch64_native_final.sh b/build/hcc_arm64le_native/hcc_aarch64_native_final.sh +index 3bb0859..d55f143 100644 +--- a/build/hcc_arm64le_native/hcc_aarch64_native_final.sh ++++ b/build/hcc_arm64le_native/hcc_aarch64_native_final.sh +@@ -76,6 +76,7 @@ make -j $PARALLEL && make install -j $PARAELLEL && popd + # Install aiframe required by AI4C. + echo "Building aiframe for AI4C..." && pushd $ROOT_NATIVE_DIR/obj/build-AI4C/aiframe + cp -r $ROOT_NATIVE_SRC/$AI4C/aiframe/* ./ ++cp -r $ROOT_NATIVE_SRC/$AI4C/models/* ../models + cmake -DCMAKE_INSTALL_PREFIX=$PREFIX_NATIVE -Donnxruntime_ROOTDIR=$PREFIX_NATIVE -DCMAKE_BUILD_TYPE=RelWithDebInfo ./ + make -j $PARALLEL && make install -j $PARALLEL && popd + +diff --git a/build/hcc_arm64le_native/hcc_aarch64_native_release.sh b/build/hcc_arm64le_native/hcc_aarch64_native_release.sh +index fd287b8..7092f70 100644 +--- a/build/hcc_arm64le_native/hcc_aarch64_native_release.sh ++++ b/build/hcc_arm64le_native/hcc_aarch64_native_release.sh +@@ -38,7 +38,7 @@ create_directory() { + done + } + +-create_directory $ROOT_NATIVE_DIR/obj $PREFIX_NATIVE $PREFIX_BOLT $PREFIX_OPENSSL $PREFIX_MLIR $PREFIX_AI4C $PREFIX_AI4C/include $PREFIX_AI4C/lib64 $OUTPUT $ROOT_NATIVE_DIR/obj/build-gmp $ROOT_NATIVE_DIR/obj/build-mpfr $ROOT_NATIVE_DIR/obj/build-isl $ROOT_NATIVE_DIR/obj/build-mpc $ROOT_NATIVE_DIR/obj/build-binutils $ROOT_NATIVE_DIR/obj/build-gcc-final $ROOT_NATIVE_DIR/obj/build-mathlib $ROOT_NATIVE_DIR/obj/build-jemalloc $ROOT_NATIVE_DIR/obj/build-autofdo $ROOT_NATIVE_DIR/obj/build-llvm-bolt $ROOT_NATIVE_DIR/obj/build-openssl $ROOT_NATIVE_DIR/obj/build-llvm-mlir $ROOT_NATIVE_DIR/obj/build-jsoncpp $ROOT_NATIVE_DIR/obj/build-grpc $ROOT_NATIVE_DIR/obj/build-protobuf $ROOT_NATIVE_DIR/obj/build-client $ROOT_NATIVE_DIR/obj/build-protobuf $ROOT_NATIVE_DIR/obj/build-ncurses $ROOT_NATIVE_DIR/obj/build-AI4C/third-party/cmake $ROOT_NATIVE_DIR/obj/build-AI4C/third-party/onnxruntime $ROOT_NATIVE_DIR/obj/build-AI4C/aiframe ++create_directory $ROOT_NATIVE_DIR/obj $PREFIX_NATIVE $PREFIX_BOLT $PREFIX_OPENSSL $PREFIX_MLIR $PREFIX_AI4C $PREFIX_AI4C/include $PREFIX_AI4C/lib64 $OUTPUT $ROOT_NATIVE_DIR/obj/build-gmp $ROOT_NATIVE_DIR/obj/build-mpfr $ROOT_NATIVE_DIR/obj/build-isl $ROOT_NATIVE_DIR/obj/build-mpc $ROOT_NATIVE_DIR/obj/build-binutils $ROOT_NATIVE_DIR/obj/build-gcc-final $ROOT_NATIVE_DIR/obj/build-mathlib $ROOT_NATIVE_DIR/obj/build-jemalloc $ROOT_NATIVE_DIR/obj/build-autofdo $ROOT_NATIVE_DIR/obj/build-llvm-bolt $ROOT_NATIVE_DIR/obj/build-openssl $ROOT_NATIVE_DIR/obj/build-llvm-mlir $ROOT_NATIVE_DIR/obj/build-jsoncpp $ROOT_NATIVE_DIR/obj/build-grpc $ROOT_NATIVE_DIR/obj/build-protobuf $ROOT_NATIVE_DIR/obj/build-client $ROOT_NATIVE_DIR/obj/build-protobuf $ROOT_NATIVE_DIR/obj/build-ncurses $ROOT_NATIVE_DIR/obj/build-AI4C/third-party/cmake $ROOT_NATIVE_DIR/obj/build-AI4C/third-party/onnxruntime $ROOT_NATIVE_DIR/obj/build-AI4C/aiframe $ROOT_NATIVE_DIR/obj/build-AI4C/models + + # Change libstdc++.so option. + sed -i "s#^\\t\$(OPT_LDFLAGS).*#\\t\$(OPT_LDFLAGS) \$(SECTION_LDFLAGS) \$(AM_CXXFLAGS) \$(LTLDFLAGS) -Wl,-z,relro,-z,now,-z,noexecstack -Wtrampolines -o \$\@#g" $ROOT_NATIVE_SRC/$GCC/libstdc++-v3/src/Makefile.in +-- +2.33.0 + diff --git a/gcc-for-openEuler.spec b/gcc-for-openEuler.spec index 8f361e2..e8cde96 100644 --- a/gcc-for-openEuler.spec +++ b/gcc-for-openEuler.spec @@ -1,6 +1,6 @@ Name: gcc-for-openEuler Version: 1.0.9 -Release: 14 +Release: 15 Summary: GCC released as a binary package for openEuler and other OSes. License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ with exceptions and LGPLv2 and BSD @@ -16,6 +16,7 @@ BuildRequires: git bison flex texinfo autoconf libtool elfutils-libelf-devel gl BuildRequires: chrpath python3 zlib-devel lksctp-tools-devel Patch1: 0001-Change-branch-name-for-jemalloc.patch +Patch2: 0002-Bugfix-for-missing-models-in-AI4C.patch %description GCC released as a binary package for openEuler and other OSes. @@ -43,6 +44,9 @@ sha256sum %{build_name}.tar.gz > %{build_name}.tar.gz.sha256 %attr(755, root, root) /%{build_name}.tar.gz.sha256 %changelog +* Fri Aug 9 2024 Zhao Zhenyu - 1.0.9-15 +- Bugfix for missing models in AI4C. + * Fri Aug 9 2024 Zhao Zhenyu - 1.0.9-14 - Add build option for AI4C. -- Gitee