diff options
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | ANNC.spec | 31 | ||||
| -rw-r--r-- | sources | 8 | ||||
| -rw-r--r-- | x86_64_external_files.patch | 158 |
4 files changed, 28 insertions, 171 deletions
@@ -5,3 +5,5 @@ /XNNPACK.tar.gz /external.tar.gz.aa /external.tar.gz.ab +/external.tar.gz.ac +/v3.2.tar.gz @@ -20,7 +20,9 @@ URL: https://gitee.com/openeuler/ANNC Source0: %{pkg_version}.tar.gz Source1: external.tar.gz.aa Source2: external.tar.gz.ab -Source3: XNNPACK.tar.gz +Source3: external.tar.gz.ac +Source4: XNNPACK.tar.gz +Source5: v3.2.tar.gz %ifarch x86_64 Patch0: x86_64_external_files.patch %endif @@ -45,19 +47,20 @@ BuildRequires: bazel %{name} is is an AI compiler designed to optimize and compile ML model into high-performance executable code that can be executed on various targets. %prep -cat %{SOURCE1} %{SOURCE2} > external.tar.gz +cat %{SOURCE1} %{SOURCE2} %{SOURCE3} > external.tar.gz tar xf external.tar.gz -C . -tar xf %{SOURCE3} -C . %ifarch x86_64 -%patch 0 -p1 -d . +%patch0 -p1 -d . %endif - -%autosetup -S git -n %{pkg_version} +tar xf %{SOURCE4} -C . +mkdir proxy +mv %{SOURCE5} ./proxy +%setup -q -n %{pkg_version} %build export ANNC=%{build_dir} cd %{_builddir}/XNNPACK/build -CFLAGS="-fPIC" cmake .. -DXNNPACK_BUILD_BENCHMARKS=OFF \ +CFLAGS="-fPIC" CXXFLAGS="-fPIC" cmake .. -DXNNPACK_BUILD_BENCHMARKS=OFF \ -DXNNPACK_BUILD_TESTS=OFF \ -DXNNPACK_LIBRARY_TYPE=shared \ -DCMAKE_BUILD_TYPE=Release @@ -83,7 +86,8 @@ run_bazel_build() { --action_env="baila=548" \ --define tflite_with_xnnpack=false \ --jobs=%{max_jobs} \ - annc/service/cpu:libannc.so + --distdir=%{_builddir}/proxy \ + annc/service/cpu:libannc.so # --copt="-g" \ # --copt="-DNDBUG" \ # annc/service/cpu:libannc.so @@ -94,7 +98,7 @@ fix_action() { external_path=$(find . -name "external" | head -n 1) if [ -n "$external_path" ]; then rm -rf $external_path/* - cp -r %{_builddir}/external/* $external_path + cp -LR %{_builddir}/external/* $external_path else echo "Not find external directory." fi @@ -115,7 +119,8 @@ pushd %{build_dir}/python %install install -d %{install_includedir} install %{build_dir}/annc/service/cpu/kdnn_rewriter.h -t %{install_includedir} -install %{build_dir}/install/*.patch -t %{install_includedir} +install %{build_dir}/annc/service/cpu/annc_flags.h -t %{install_includedir} +cp -r %{build_dir}/install/* %{install_includedir} install %{build_dir}/python/tensorflow/kernels/* -t %{install_includedir} install -d %{install_libdir} output_path=$(find %{build_dir} -type f -name "libannc.so") @@ -133,6 +138,12 @@ pushd %{build_dir}/python /usr/bin/annc-apply-tf %changelog +* Fri Aug 22 2025 Chenhui Zheng <zhengchenhui1@huawei.com> - 0.0.2-1 +- Type:Update +- ID:NA +- SUG:NA +- DEC:Release v0.0.2 + * Mon May 12 2025 Chenhui Zheng <zhengchenhui1@huawei.com> - 0.0.1-1 - Type:Init - ID:NA @@ -1,4 +1,6 @@ -0313b1256cba759a7d2df869feb51d59 ANNC-v0.0.2.tar.gz +c727cf97cec102b5399d3f43bcf1dd5a ANNC-v0.0.2.tar.gz 20e5d643ae5e8981686f54d7838a959a XNNPACK.tar.gz -956fd7bc04940fa879bab6f5fa141b98 external.tar.gz.aa -ef0f2b2ac19f0e5037a60cc575ee896b external.tar.gz.ab +2851e140b6c1c07b44cd4db060f17fbd external.tar.gz.aa +8955b6806f170bbe9a5d6a864e75d2d3 external.tar.gz.ab +88966e263f2f840215f9df1ac34a0389 external.tar.gz.ac +19c62a338990388a31cd2ecb918af855 v3.2.tar.gz diff --git a/x86_64_external_files.patch b/x86_64_external_files.patch deleted file mode 100644 index 9ed178b..0000000 --- a/x86_64_external_files.patch +++ /dev/null @@ -1,158 +0,0 @@ -diff --git a/external/local_config_cc/BUILD b/external/local_config_cc/BUILD -index e5d697e..1558f6d 100755 ---- a/external/local_config_cc/BUILD -+++ b/external/local_config_cc/BUILD -@@ -47,15 +47,15 @@ filegroup( - cc_toolchain_suite( - name = "toolchain", - toolchains = { -- "aarch64|compiler": ":cc-compiler-aarch64", -- "aarch64": ":cc-compiler-aarch64", -+ "k8|compiler": ":cc-compiler-k8", -+ "k8": ":cc-compiler-k8", - "armeabi-v7a|compiler": ":cc-compiler-armeabi-v7a", - "armeabi-v7a": ":cc-compiler-armeabi-v7a", - }, - ) - - cc_toolchain( -- name = "cc-compiler-aarch64", -+ name = "cc-compiler-k8", - toolchain_identifier = "local", - toolchain_config = ":local", - all_files = ":compiler_deps", -@@ -72,7 +72,7 @@ cc_toolchain( - - cc_toolchain_config( - name = "local", -- cpu = "aarch64", -+ cpu = "k8", - compiler = "compiler", - toolchain_identifier = "local", - host_system_name = "local", -@@ -80,7 +80,7 @@ cc_toolchain_config( - target_libc = "local", - abi_version = "local", - abi_libc_version = "local", -- cxx_builtin_include_directories = ["/usr/lib/gcc/aarch64-linux-gnu/10.3.1/include", -+ cxx_builtin_include_directories = ["/usr/lib/gcc/x86_64-linux-gnu/10.3.1/include", - "/usr/local/include", - "/usr/include", - "/root/rpmbuild/BUILD/ANNC-v0.0.2/annc/service/cpu/xla", -@@ -91,7 +91,7 @@ cc_toolchain_config( - "/root/rpmbuild/BUILD/ANNC-v0.0.2/annc/service/cpu/xla/libs/XNNPACK/build/pthreadpool-source/include", - "/root/rpmbuild/BUILD/ANNC-v0.0.2/output/e7b069029cc648c50e1b8083cef52b4f/external/local_config_cc", - "/usr/include/c++/10.3.1", -- "/usr/include/c++/10.3.1/aarch64-linux-gnu", -+ "/usr/include/c++/10.3.1/x86_64-linux-gnu", - "/usr/include/c++/10.3.1/backward"], - tool_paths = {"ar": "/usr/bin/ar", - "ld": "/usr/bin/ld", -diff --git a/external/local_config_cc/builtin_include_directory_paths b/external/local_config_cc/builtin_include_directory_paths -index 9547846..57343c4 100755 ---- a/external/local_config_cc/builtin_include_directory_paths -+++ b/external/local_config_cc/builtin_include_directory_paths -@@ -4,7 +4,7 @@ changes to it will be reflected in the action cache key. When some of these - paths change, Bazel will make sure to rerun the action, even though none of - declared action inputs or the action commandline changes. - --/usr/lib/gcc/aarch64-linux-gnu/10.3.1/include -+/usr/lib/gcc/x86_64-linux-gnu/10.3.1/include - /usr/local/include - /usr/include - /root/rpmbuild/BUILD/ANNC-v0.0.2/annc/service/cpu/xla -@@ -15,5 +15,5 @@ declared action inputs or the action commandline changes. - /root/rpmbuild/BUILD/ANNC-v0.0.2/annc/service/cpu/xla/libs/XNNPACK/build/pthreadpool-source/include - /root/rpmbuild/BUILD/ANNC-v0.0.2/output/e7b069029cc648c50e1b8083cef52b4f/external/local_config_cc - /usr/include/c++/10.3.1 --/usr/include/c++/10.3.1/aarch64-linux-gnu -+/usr/include/c++/10.3.1/x86_64-linux-gnu - /usr/include/c++/10.3.1/backward -diff --git a/external/go_sdk/BUILD.bazel b/x86_64/external/go_sdk/BUILD.bazel -index 9cf6add..511ddbc 100644 ---- a/external/go_sdk/BUILD.bazel -+++ b/x86_64/external/go_sdk/BUILD.bazel -@@ -7,8 +7,8 @@ package(default_visibility = ["//visibility:public"]) - filegroup( - name = "libs", - srcs = glob( -- ["pkg/linux_arm64/**/*.a"], -- exclude = ["pkg/linux_arm64/**/cmd/**"], -+ ["pkg/linux_amd64/**/*.a"], -+ exclude = ["pkg/linux_amd64/**/cmd/**"], - ), - ) - -@@ -34,7 +34,7 @@ go_sdk( - name = "go_sdk", - srcs = [":srcs"], - go = "bin/go", -- goarch = "arm64", -+ goarch = "amd64", - goos = "linux", - headers = [":headers"], - libs = [":libs"], -@@ -60,7 +60,7 @@ package_list( - - declare_toolchains( - builder = ":builder", -- host = "linux_arm64", -+ host = "linux_amd64", - sdk = ":go_sdk", - ) - -diff --git a/external/go_sdk/src/internal/buildcfg/zbootstrap.go b/x86_64/external/go_sdk/src/internal/buildcfg/zbootstrap.go -index 81bd76b..560f94f 100644 ---- a/external/go_sdk/src/internal/buildcfg/zbootstrap.go -+++ b/x86_64/external/go_sdk/src/internal/buildcfg/zbootstrap.go -@@ -12,7 +12,7 @@ const defaultGOMIPS64 = `hardfloat` - const defaultGOPPC64 = `power8` - const defaultGOEXPERIMENT = `` - const defaultGO_EXTLINK_ENABLED = `` --const defaultGO_LDSO = `/lib/ld-linux-aarch64.so.1` -+const defaultGO_LDSO = `/lib64/ld-linux-x86-64.so.2` - const version = `go1.18.4` - const defaultGOOS = runtime.GOOS - const defaultGOARCH = runtime.GOARCH -diff --git a/external/local_config_cc_toolchains/BUILD b/x86_64/external/local_config_cc_toolchains/BUILD -index db5234f..f9c0875 100755 ---- a/external/local_config_cc_toolchains/BUILD -+++ b/x86_64/external/local_config_cc_toolchains/BUILD -@@ -1,10 +1,10 @@ - load("@local_config_platform//:constraints.bzl", "HOST_CONSTRAINTS") - - toolchain( -- name = "cc-toolchain-aarch64", -+ name = "cc-toolchain-k8", - exec_compatible_with = HOST_CONSTRAINTS, - target_compatible_with = HOST_CONSTRAINTS, -- toolchain = "@local_config_cc//:cc-compiler-aarch64", -+ toolchain = "@local_config_cc//:cc-compiler-k8", - toolchain_type = "@bazel_tools//tools/cpp:toolchain_type", - ) - -diff --git a/external/local_config_platform/constraints.bzl b/x86_64/external/local_config_platform/constraints.bzl -index 4b29ad7..6a7d8c3 100644 ---- a/external/local_config_platform/constraints.bzl -+++ b/x86_64/external/local_config_platform/constraints.bzl -@@ -1,6 +1,6 @@ - # DO NOT EDIT: automatically generated constraints list for local_config_platform - # Auto-detected host platform constraints. - HOST_CONSTRAINTS = [ -- '@platforms//cpu:aarch64', -+ '@platforms//cpu:x86_64', - '@platforms//os:linux', - ] -diff --git a/external/local_execution_config_platform/BUILD b/x86_64/external/local_execution_config_platform/BUILD -index b4d7fdf..7dfbc12 100755 ---- a/external/local_execution_config_platform/BUILD -+++ b/x86_64/external/local_execution_config_platform/BUILD -@@ -18,7 +18,7 @@ platform( - name = "platform", - visibility = ["//visibility:public"], - constraint_values = [ -- "@platforms//cpu:aarch64", -+ "@platforms//cpu:x86_64", - "@platforms//os:linux", - ":platform_constraint", - ], |