diff --git a/buildroot b/buildroot index 5a586768..5385cac2 160000 --- a/buildroot +++ b/buildroot @@ -1 +1 @@ -Subproject commit 5a5867681b5709859f2eebf24e9576451e9a7c0f +Subproject commit 5385cac22324ab3209ffe919c1c283989baf3951 diff --git a/buildroot-external/Config.in b/buildroot-external/Config.in index e91975db..83b9300a 100644 --- a/buildroot-external/Config.in +++ b/buildroot-external/Config.in @@ -6,15 +6,10 @@ menu "Additional drivers, libraries and/or applications" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/ck/Config.in" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/clog/Config.in" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/compute-library/Config.in" - source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/cpuinfo/Config.in" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/deepfilternet-ladspa/Config.in" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/docbook-xml/Config.in" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/docbook-xsl/Config.in" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/fann/Config.in" - source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/farmhash/Config.in" - source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/fft2d/Config.in" - source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/fp16/Config.in" - source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/gemmlowp/Config.in" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/growdisk-service/Config.in" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/hdf5/Config.in" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/hostname-service/Config.in" @@ -111,8 +106,6 @@ endmenu source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/ovos-splash/Config.in" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/pa-volume/Config.in" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/picotts/Config.in" - source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/psimd/Config.in" - source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/pthreadpool/Config.in" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/qt5ct/Config.in" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/qtav/Config.in" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/respeaker/Config.in" @@ -120,11 +113,9 @@ endmenu source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/roc-toolkit/Config.in" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/rpi-bluetooth/Config.in" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/rpi-eeprom/Config.in" - source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/ruy/Config.in" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/snapcast/Config.in" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/spotifyd/Config.in" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/sysbench/Config.in" - source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/tensorflow-lite/Config.in" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/userland-tools/Config.in" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/virtual-touch/Config.in" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/vnc-eglfs/Config.in" @@ -134,7 +125,6 @@ endmenu source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/whispercpp/Config.in" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/wifi-connect/Config.in" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/wiringpi2/Config.in" - source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/xnnpack/Config.in" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/xorgproto-mesafix/Config.in" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/xvf3510/Config.in" endmenu diff --git a/buildroot-external/board/ovos/raspberrypi/grub-efi.cfg b/buildroot-external/board/ovos/raspberrypi/grub-efi.cfg index 26c66bd2..e98184bb 100644 --- a/buildroot-external/board/ovos/raspberrypi/grub-efi.cfg +++ b/buildroot-external/board/ovos/raspberrypi/grub-efi.cfg @@ -65,7 +65,8 @@ else fi fi -default_cmdline="rd.shell console=tty0 console=serial0,115200 fsck.repair=yes zram.enabled=1 zram.num_devices=3 logo.nologo systemd.unified_cgroup_hierarchy=1 cgroup_enable=cpuset cgroup_memory=1 $boot_condition rootwait" +#default_cmdline="rd.shell console=tty0 console=serial0,115200 fsck.repair=yes zram.enabled=1 zram.num_devices=3 logo.nologo systemd.unified_cgroup_hierarchy=1 cgroup_enable=cpuset cgroup_memory=1 $boot_condition rootwait" +default_cmdline="console=tty0 console=serial0,115200 fsck.repair=yes zram.enabled=1 zram.num_devices=3 logo.nologo systemd.unified_cgroup_hierarchy=1 cgroup_enable=cpuset cgroup_memory=1 $boot_condition rootwait" file_env -f ($root)/cmdline.txt cmdline regexp --set 1:boothd (.+),.+ ${root} @@ -74,13 +75,13 @@ regexp --set 1:boothd (.+),.+ ${root} save_env -f /EFI/BOOT/grub.env ustate boot_counter rootfs menuentry "OpenVoiceOS - UUID" { - linux (${boothd},gpt2)/boot/kernel root=live:UUID=c0932a41-44cf-463b-8152-d43188553ed4 rd.live.overlay=UUID=f1326040-5236-40eb-b683-aaa100a9afcf $default_cmdline $cmdline + linux (${boothd},gpt2)/boot/kernel root=UUID=c0932a41-44cf-463b-8152-d43188553ed4 $default_cmdline $cmdline } menuentry "OpenVoiceOS - PARTUUID" { - linux (${boothd},gpt3)/boot/kernel root=live:PARTUUID=c0932a41-44cf-463b-8152-d43188553ed4 rd.live.overlay=PARTUUID=f1326040-5236-40eb-b683-aaa100a9afcf $default_cmdline $cmdline + linux (${boothd},gpt3)/boot/kernel root=PARTUUID=c0932a41-44cf-463b-8152-d43188553ed4 $default_cmdline $cmdline } menuentry "OpenVoiceOS - SDA2" { - linux (${boothd},gpt2)/boot/kernel root=live:/dev/sda2 rd.live.overlay=/dev/sda2 $default_cmdline $cmdline + linux (${boothd},gpt2)/boot/kernel root=/dev/sda2 $default_cmdline $cmdline } diff --git a/buildroot-external/configs/rpi4_64_defconfig b/buildroot-external/configs/rpi4_64_defconfig index ec981069..a7a92f0d 100644 --- a/buildroot-external/configs/rpi4_64_defconfig +++ b/buildroot-external/configs/rpi4_64_defconfig @@ -30,7 +30,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL)/scripts/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL)/board/ovos/raspberrypi/rpi4" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,236f36133619216a5c8faea1a8c2c93c83efc2f4)/linux-236f36133619216a5c8faea1a8c2c93c83efc2f4.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,1f193661c9a0eb916b3c64c7a5d5dba31948b0c3)/linux-1f193661c9a0eb916b3c64c7a5d5dba31948b0c3.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2711" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL)/kernel/ovos.config $(BR2_EXTERNAL)/kernel/device-drivers.config $(BR2_EXTERNAL)/kernel/docker.config $(BR2_EXTERNAL)/board/ovos/raspberrypi/kernel.config" BR2_LINUX_KERNEL_LZ4=y @@ -61,26 +61,60 @@ BR2_PACKAGE_ALSA_UTILS_ASEQNET=y BR2_PACKAGE_ALSA_UTILS_BAT=y BR2_PACKAGE_ALSA_UTILS_IECSET=y BR2_PACKAGE_ALSA_UTILS_SPEAKER_TEST=y -BR2_PACKAGE_FFMPEG=y BR2_PACKAGE_FFMPEG_GPL=y BR2_PACKAGE_FFMPEG_NONFREE=y -# BR2_PACKAGE_FFMPEG_FFMPEG is not set +BR2_PACKAGE_FFMPEG_FFPLAY=y +BR2_PACKAGE_FFMPEG_FFPROBE=y BR2_PACKAGE_FFMPEG_POSTPROC=y -BR2_PACKAGE_FFMPEG_SWSCALE=y # BR2_PACKAGE_GSTREAMER1_PARSE is not set # BR2_PACKAGE_GSTREAMER1_TRACE is not set # BR2_PACKAGE_GSTREAMER1_GST_DEBUG is not set # BR2_PACKAGE_GSTREAMER1_PLUGIN_REGISTRY is not set # BR2_PACKAGE_GSTREAMER1_INSTALL_TOOLS is not set +BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIOMIXER=y +BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_ENCODING=y +BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL=y +BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_OGG=y +BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_OPUS=y +BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_THEORA=y +BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VORBIS=y +BR2_PACKAGE_GST1_PLUGINS_GOOD_JPEG=y +BR2_PACKAGE_GST1_PLUGINS_GOOD_PNG=y +BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_FLV=y +BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_FLX=y +BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_RTP=y +BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_UDP=y +BR2_PACKAGE_GST1_PLUGINS_GOOD_ADAPTIVEMUX2=y +BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_LAME=y +BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_MPG123=y +BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_V4L2=y +BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_V4L2_PROBE=y +BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_CAIRO=y +BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_FLAC=y +BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_SPEEX=y +BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_WAVPACK=y +BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_CAMERABIN2=y +BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MPEGDEMUX=y +BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MPEGTSMUX=y +BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MPEGPSMUX=y +BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FBDEV=y +BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPUS=y +BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_WEBP=y +BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_WEBRTC=y +BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_WEBRTCDSP=y +BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_V4L2CODECS=y +BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_X265=y +BR2_PACKAGE_GST1_PYTHON=y BR2_PACKAGE_PIPEWIRE=y BR2_PACKAGE_PIPEWIRE_EXAMPLES=y BR2_PACKAGE_PIPEWIRE_GSTREAMER=y BR2_PACKAGE_PIPEWIRE_V4L2=y -BR2_PACKAGE_PULSEAUDIO=y BR2_PACKAGE_TINYCOMPRESS=y +BR2_PACKAGE_V4L2GRAB=y BR2_PACKAGE_WIREPLUMBER=y BR2_PACKAGE_UNRAR=y BR2_PACKAGE_UNZIP=y +BR2_PACKAGE_SYSPROF=y BR2_PACKAGE_BINUTILS=y BR2_PACKAGE_DIFFUTILS=y BR2_PACKAGE_FINDUTILS=y @@ -88,6 +122,7 @@ BR2_PACKAGE_GIT=y BR2_PACKAGE_GREP=y BR2_PACKAGE_JO=y BR2_PACKAGE_JQ=y +BR2_PACKAGE_LIBTOOL=y BR2_PACKAGE_PKGCONF=y BR2_PACKAGE_SED=y BR2_PACKAGE_CPIO=y @@ -103,10 +138,15 @@ BR2_PACKAGE_EROFS_UTILS_LZMA=y BR2_PACKAGE_EROFS_UTILS_EROFSFUSE=y BR2_PACKAGE_FUSE_OVERLAYFS=y BR2_PACKAGE_NTFS_3G=y +BR2_PACKAGE_COG=y +BR2_PACKAGE_COG_PROGRAMS_HOME_URI="https://openvoiceos.org" +BR2_PACKAGE_COG_PLATFORM_DRM=y BR2_PACKAGE_MESA3D=y +BR2_PACKAGE_MESA3D_LLVM=y BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_V3D=y BR2_PACKAGE_MESA3D_VULKAN_DRIVER_BROADCOM=y BR2_PACKAGE_MESA3D_OPENGL_ES=y +BR2_PACKAGE_VULKAN_HEADERS=y BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI=y BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_BT=y BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_WIFI=y @@ -134,7 +174,7 @@ BR2_PACKAGE_PYTHON_SPIDEV=y BR2_PACKAGE_ALSA_LIB_PYTHON=y BR2_PACKAGE_ALSA_PLUGINS=y BR2_PACKAGE_LIBSAMPLERATE=y -BR2_PACKAGE_WEBRTC_AUDIO_PROCESSING=y +BR2_PACKAGE_LIBSNDFILE=y BR2_PACKAGE_LIBARCHIVE=y BR2_PACKAGE_LIBDEFLATE=y BR2_PACKAGE_LZO=y @@ -144,7 +184,6 @@ BR2_PACKAGE_LIBSSH2=y BR2_PACKAGE_LIBSSH2_OPENSSL=y BR2_PACKAGE_LIBOPENSSL_BIN=y BR2_PACKAGE_LIBOPENSSL_ENGINES=y -BR2_PACKAGE_SQLITE=y BR2_PACKAGE_LIBCONFIG=y BR2_PACKAGE_LIBCONFUSE=y BR2_PACKAGE_LIBLOCKFILE=y @@ -152,25 +191,29 @@ BR2_PACKAGE_LIBNFS=y BR2_PACKAGE_LIBSYSFS=y BR2_PACKAGE_LOCKDEV=y BR2_PACKAGE_PHYSFS=y +BR2_PACKAGE_LIBEXIF=y +BR2_PACKAGE_TIFF=y +BR2_PACKAGE_WPEWEBKIT=y +BR2_PACKAGE_WPEWEBKIT_MULTIMEDIA=y +BR2_PACKAGE_WPEWEBKIT_MEDIA_STREAM=y +BR2_PACKAGE_WPEWEBKIT_WEBDRIVER=y BR2_PACKAGE_LIBGPIOD2=y BR2_PACKAGE_LIBGPIOD2_TOOLS=y -BR2_PACKAGE_LIBINPUT=y BR2_PACKAGE_LIBINPUT_PYTHON_TOOLS=y -BR2_PACKAGE_JSON_GLIB=y BR2_PACKAGE_LIBFASTJSON=y -BR2_PACKAGE_LIBXML2=y BR2_PACKAGE_SORD=y +BR2_PACKAGE_LIBCAMERA=y BR2_PACKAGE_LIBCAMERA_PYTHON=y BR2_PACKAGE_LIBCAMERA_V4L2=y BR2_PACKAGE_LIBCAMERA_PIPELINE_RPI_VC4=y BR2_PACKAGE_LIBCAMERA_PIPELINE_SIMPLE=y BR2_PACKAGE_LIBCAMERA_PIPELINE_UVCVIDEO=y BR2_PACKAGE_LIBCAMERA_PIPELINE_VIMC=y -BR2_PACKAGE_LIBCAMERA_APPS=y BR2_PACKAGE_LIBCURL=y BR2_PACKAGE_LIBCURL_CURL=y BR2_PACKAGE_LIBIDN2=y BR2_PACKAGE_SLIRP4NETNS=y +BR2_PACKAGE_BOOST_PROGRAM_OPTIONS=y BR2_PACKAGE_FFTW=y BR2_PACKAGE_LIBDAEMON=y BR2_PACKAGE_LIBUV=y @@ -282,13 +325,10 @@ BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y BR2_PACKAGE_NANO=y BR2_PACKAGE_VIM=y # BR2_PACKAGE_VIM_RUNTIME is not set -BR2_TARGET_ROOTFS_CPIO_DRACUT=y -BR2_TARGET_ROOTFS_CPIO_DRACUT_CONF_FILES="$(BR2_EXTERNAL)/dracut/conf/dracut.conf" BR2_TARGET_ROOTFS_EROFS=y BR2_TARGET_ROOTFS_EROFS_FRAGMENTS=y BR2_TARGET_ROOTFS_EROFS_ZTAILPACKING=y BR2_TARGET_ROOTFS_EROFS_PCLUSTERSIZE=262144 -BR2_TARGET_ROOTFS_INITRAMFS=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_GRUB2=y BR2_TARGET_GRUB2_BUILTIN_MODULES_EFI="boot linux ext2 fat erofs part_msdos part_gpt normal efi_gop regexp loadenv echo cat test configfile search search_fs_uuid all_video video font gfxmenu gfxterm gzio xzio lz4_decompress" @@ -301,7 +341,6 @@ BR2_PACKAGE_HOST_GO_BIN=y BR2_PACKAGE_HOST_MKPASSWD=y BR2_PACKAGE_HOST_MTOOLS=y BR2_PACKAGE_HOST_PKGCONF=y -BR2_PACKAGE_HOST_QEMU=y BR2_PACKAGE_ALSA_UCM_CONF=y BR2_PACKAGE_BTSPEAKER=y BR2_PACKAGE_NCPAMIXER=y diff --git a/buildroot-external/package/cpuinfo/0001-Enable-CXX-only-when-needed-for-tests-benchmarks.patch b/buildroot-external/package/cpuinfo/0001-Enable-CXX-only-when-needed-for-tests-benchmarks.patch deleted file mode 100644 index 30afd3d7..00000000 --- a/buildroot-external/package/cpuinfo/0001-Enable-CXX-only-when-needed-for-tests-benchmarks.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 66dbf4fbe202318860caeab3b1ef9c2fe70e2c4c Mon Sep 17 00:00:00 2001 -From: James Hilliard -Date: Sun, 29 Jan 2023 16:55:08 -0700 -Subject: [PATCH] Enable CXX only when needed for tests/benchmarks - -Signed-off-by: James Hilliard -[Upstream status: -https://github.com/pytorch/cpuinfo/pull/133] ---- - CMakeLists.txt | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9f4d1d1..9e1c153 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -3,7 +3,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 3.5 FATAL_ERROR) - # ---[ Setup project - PROJECT( - cpuinfo -- LANGUAGES C CXX -+ LANGUAGES C - ) - - # ---[ Options. -@@ -103,6 +103,12 @@ ELSEIF(NOT CMAKE_SYSTEM_NAME MATCHES "^(Windows|WindowsStore|CYGWIN|MSYS|Darwin| - ENDIF() - ENDIF() - -+IF(CPUINFO_SUPPORTED_PLATFORM) -+ IF(CPUINFO_BUILD_MOCK_TESTS OR CPUINFO_BUILD_UNIT_TESTS OR CPUINFO_BUILD_BENCHMARKS) -+ ENABLE_LANGUAGE(CXX) -+ ENDIF() -+ENDIF() -+ - # ---[ Download deps - SET(CONFU_DEPENDENCIES_SOURCE_DIR ${CMAKE_SOURCE_DIR}/deps - CACHE PATH "Confu-style dependencies source directory") --- -2.34.1 diff --git a/buildroot-external/package/cpuinfo/Config.in b/buildroot-external/package/cpuinfo/Config.in deleted file mode 100644 index 257480f0..00000000 --- a/buildroot-external/package/cpuinfo/Config.in +++ /dev/null @@ -1,17 +0,0 @@ -config BR2_PACKAGE_CPUINFO_ARCH_SUPPORTS - bool - default y if BR2_aarch64 - default y if BR2_arm - default y if BR2_i386 - default y if BR2_x86_64 - -config BR2_PACKAGE_CPUINFO - bool "cpuinfo" - depends on BR2_PACKAGE_CPUINFO_ARCH_SUPPORTS - depends on BR2_TOOLCHAIN_HAS_THREADS - help - CPU INFOrmation library, cpuinfo is a library to detect - essential for performance optimization information about - host CPU. - - https://github.com/pytorch/cpuinfo diff --git a/buildroot-external/package/cpuinfo/cpuinfo.hash b/buildroot-external/package/cpuinfo/cpuinfo.hash deleted file mode 100644 index 7dd0d571..00000000 --- a/buildroot-external/package/cpuinfo/cpuinfo.hash +++ /dev/null @@ -1,4 +0,0 @@ -# Locally calculated -sha256 cf243e7ac07cd5e2ac58dcb29f8a9047b7887452212aead2ddf1ceda45cc66dd cpuinfo-eb4a6674bfe9cf91b63b9817412ae5f6862c8432.tar.gz -# License files, locally calculated -sha256 8e7e60636c3aa0cb03571a1a841ce5697f9551ff92b3c426c2561613d15ade70 LICENSE diff --git a/buildroot-external/package/cpuinfo/cpuinfo.mk b/buildroot-external/package/cpuinfo/cpuinfo.mk deleted file mode 100644 index 11b34656..00000000 --- a/buildroot-external/package/cpuinfo/cpuinfo.mk +++ /dev/null @@ -1,19 +0,0 @@ -################################################################################ -# -# cpuinfo -# -################################################################################ - -CPUINFO_VERSION = eb4a6674bfe9cf91b63b9817412ae5f6862c8432 -CPUINFO_SITE = $(call github,pytorch,cpuinfo,$(CPUINFO_VERSION)) -CPUINFO_LICENSE = BSD-2-Clause -CPUINFO_LICENSE_FILES = LICENSE -CPUINFO_INSTALL_STAGING = YES -CPUINFO_CONF_OPTS = \ - -DCMAKE_POSITION_INDEPENDENT_CODE=ON \ - -DCPUINFO_LIBRARY_TYPE:STRING=shared \ - -DCPUINFO_BUILD_UNIT_TESTS=OFF \ - -DCPUINFO_BUILD_MOCK_TESTS=OFF \ - -DCPUINFO_BUILD_BENCHMARKS=OFF - -$(eval $(cmake-package)) diff --git a/buildroot-external/package/farmhash/Config.in b/buildroot-external/package/farmhash/Config.in deleted file mode 100644 index ef228987..00000000 --- a/buildroot-external/package/farmhash/Config.in +++ /dev/null @@ -1,12 +0,0 @@ -config BR2_PACKAGE_FARMHASH - bool "farmhash" - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 - help - FarmHash, a family of hash functions. - - https://github.com/google/farmhash - -comment "farmhash needs a toolchain w/ C++11" - depends on !BR2_INSTALL_LIBSTDCPP || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 diff --git a/buildroot-external/package/farmhash/farmhash.hash b/buildroot-external/package/farmhash/farmhash.hash deleted file mode 100644 index afdfc0f9..00000000 --- a/buildroot-external/package/farmhash/farmhash.hash +++ /dev/null @@ -1,4 +0,0 @@ -# Locally calculated -sha256 18392cf0736e1d62ecbb8d695c31496b6507859e8c75541d7ad0ba092dc52115 farmhash-0d859a811870d10f53a594927d0d0b97573ad06d.tar.gz -# License files, locally calculated -sha256 4162dd091caae234f72d3b57e138174f733e736b2430a4c51b098b17d866fcb6 COPYING diff --git a/buildroot-external/package/farmhash/farmhash.mk b/buildroot-external/package/farmhash/farmhash.mk deleted file mode 100644 index 6ab7d1a8..00000000 --- a/buildroot-external/package/farmhash/farmhash.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# farmhash -# -################################################################################ - -FARMHASH_VERSION = 0d859a811870d10f53a594927d0d0b97573ad06d -FARMHASH_SITE = $(call github,google,farmhash,$(FARMHASH_VERSION)) -FARMHASH_LICENSE = MIT -FARMHASH_LICENSE_FILES = COPYING -FARMHASH_INSTALL_STAGING = YES -FARMHASH_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11" - -$(eval $(autotools-package)) diff --git a/buildroot-external/package/fft2d/Config.in b/buildroot-external/package/fft2d/Config.in deleted file mode 100644 index 38394f61..00000000 --- a/buildroot-external/package/fft2d/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_FFT2D - bool "fft2d" - help - This is a package to calculate Discrete Fourier/Cosine/Sine - Transforms of 2,3-dimensional sequences of length 2^N. - - http://www.kurims.kyoto-u.ac.jp/~ooura/fft.html diff --git a/buildroot-external/package/fft2d/fft2d.hash b/buildroot-external/package/fft2d/fft2d.hash deleted file mode 100644 index a1b1a326..00000000 --- a/buildroot-external/package/fft2d/fft2d.hash +++ /dev/null @@ -1,4 +0,0 @@ -# Locally calculated -sha256 ada7e99087c4ed477bfdf11413f2ba8db8a840ba9bbf8ac94f4f3972e2a7cec9 fft2d.tgz -# License files, locally calculated -sha256 0b2a2082537735a2a576dbec2e8f9c1a09812eac6df6a389502a6ba860072906 readme2d.txt diff --git a/buildroot-external/package/fft2d/fft2d.mk b/buildroot-external/package/fft2d/fft2d.mk deleted file mode 100644 index 6263b1af..00000000 --- a/buildroot-external/package/fft2d/fft2d.mk +++ /dev/null @@ -1,22 +0,0 @@ -################################################################################ -# -# fft2d -# -################################################################################ - -FFT2D_VERSION = 2006.12.28 -FFT2D_SITE = https://www.kurims.kyoto-u.ac.jp/~ooura -FFT2D_SOURCE = fft2d.tgz -FFT2D_LICENSE = readme2d.txt -FFT2D_LICENSE_FILES = readme2d.txt -FFT2D_INSTALL_STAGING = YES -FFT2D_INSTALL_TARGET = NO - -define FFT2D_INSTALL_STAGING_CMDS - mkdir -p $(STAGING_DIR)/usr/include/fft2d - $(INSTALL) -m 0644 $(@D)/*.c $(STAGING_DIR)/usr/include/fft2d - $(INSTALL) -m 0644 $(@D)/*.f $(STAGING_DIR)/usr/include/fft2d - $(INSTALL) -m 0644 $(@D)/*.h $(STAGING_DIR)/usr/include/fft2d -endef - -$(eval $(generic-package)) diff --git a/buildroot-external/package/fp16/0001-CMake-don-t-enable-CXX-unless-building-tests-benchma.patch b/buildroot-external/package/fp16/0001-CMake-don-t-enable-CXX-unless-building-tests-benchma.patch deleted file mode 100644 index b3c5219d..00000000 --- a/buildroot-external/package/fp16/0001-CMake-don-t-enable-CXX-unless-building-tests-benchma.patch +++ /dev/null @@ -1,48 +0,0 @@ -From eba14b5277ed8f155eb333f4bbe9f99366e3dece Mon Sep 17 00:00:00 2001 -From: James Hilliard -Date: Sun, 29 Jan 2023 21:43:50 -0700 -Subject: [PATCH] CMake: don't enable CXX unless building tests/benchmarks - -We only need CXX support when building tests/benchmarks. - -Fixes: -CMake Error at CMakeLists.txt:6 (PROJECT): - No CMAKE_CXX_COMPILER could be found. - - Tell CMake where to find the compiler by setting either the environment - variable "CXX" or the CMake cache entry CMAKE_CXX_COMPILER to the full path - to the compiler, or to the compiler name if it is in the PATH. - -Signed-off-by: James Hilliard -[Upstream status: -https://github.com/Maratyszcza/FP16/pull/22] ---- - CMakeLists.txt | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5e7d127..8028c07 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -3,13 +3,17 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12 FATAL_ERROR) - INCLUDE(GNUInstallDirs) - - # ---[ Project --PROJECT(FP16 C CXX) -+PROJECT(FP16 C) - - # ---[ Options. - OPTION(FP16_BUILD_TESTS "Build FP16 unit tests" ON) - OPTION(FP16_BUILD_BENCHMARKS "Build FP16 micro-benchmarks" ON) - - # ---[ CMake options -+IF(FP16_BUILD_TESTS OR FP16_BUILD_BENCHMARKS) -+ ENABLE_LANGUAGE(CXX) -+ENDIF() -+ - IF(FP16_BUILD_TESTS) - ENABLE_TESTING() - ENDIF() --- -2.34.1 - diff --git a/buildroot-external/package/fp16/Config.in b/buildroot-external/package/fp16/Config.in deleted file mode 100644 index 283cd972..00000000 --- a/buildroot-external/package/fp16/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_FP16 - bool "fp16" - select BR2_PACKAGE_PSIMD - help - Header-only library for conversion to/from - half-precision floating point formats. - - https://github.com/Maratyszcza/FP16/ diff --git a/buildroot-external/package/fp16/fp16.hash b/buildroot-external/package/fp16/fp16.hash deleted file mode 100644 index 63634eb2..00000000 --- a/buildroot-external/package/fp16/fp16.hash +++ /dev/null @@ -1,4 +0,0 @@ -# Locally calculated -sha256 a91f4770ff9c39f4d72e339c379f566b3bbb359fa66122d85fc0bae3dde7abc7 fp16-0a92994d729ff76a58f692d3028ca1b64b145d91.tar.gz -# License files, locally calculated -sha256 17e4f539024be2749ee729d1e2f01d24cef12ece8c9bf18e91a4349be29c80bf LICENSE diff --git a/buildroot-external/package/fp16/fp16.mk b/buildroot-external/package/fp16/fp16.mk deleted file mode 100644 index 80710523..00000000 --- a/buildroot-external/package/fp16/fp16.mk +++ /dev/null @@ -1,20 +0,0 @@ -################################################################################ -# -# fp16 -# -################################################################################ - -FP16_VERSION = 0a92994d729ff76a58f692d3028ca1b64b145d91 -FP16_SITE = $(call github,Maratyszcza,FP16,$(FP16_VERSION)) -FP16_LICENSE = MIT -FP16_LICENSE_FILES = LICENSE -FP16_INSTALL_STAGING = YES -# Only installs a header -FP16_INSTALL_TARGET = NO -FP16_DEPENDENCIES = psimd -FP16_CONF_OPTS = \ - -DFP16_BUILD_TESTS=OFF \ - -DFP16_BUILD_BENCHMARKS=OFF \ - -DPSIMD_SOURCE_DIR="$(PSIMD_DIR)" - -$(eval $(cmake-package)) diff --git a/buildroot-external/package/gemmlowp/Config.in b/buildroot-external/package/gemmlowp/Config.in deleted file mode 100644 index 379450d1..00000000 --- a/buildroot-external/package/gemmlowp/Config.in +++ /dev/null @@ -1,12 +0,0 @@ -config BR2_PACKAGE_GEMMLOWP - bool "gemmlowp" - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 - help - Low-precision matrix multiplication. - - https://github.com/google/gemmlowp - -comment "gemmlowp needs a toolchain w/ C++11" - depends on !BR2_INSTALL_LIBSTDCPP || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 diff --git a/buildroot-external/package/gemmlowp/gemmlowp.hash b/buildroot-external/package/gemmlowp/gemmlowp.hash deleted file mode 100644 index 7c56a18b..00000000 --- a/buildroot-external/package/gemmlowp/gemmlowp.hash +++ /dev/null @@ -1,4 +0,0 @@ -# Locally calculated -sha256 cc8a22b6f071c3781e6b4b72654c89b1cdc198e72ebadebb17638eac205344c1 gemmlowp-08e4bb339e34017a0835269d4a37c4ea04d15a69.tar.gz -# License files, locally calculated -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/buildroot-external/package/gemmlowp/gemmlowp.mk b/buildroot-external/package/gemmlowp/gemmlowp.mk deleted file mode 100644 index 9489dccb..00000000 --- a/buildroot-external/package/gemmlowp/gemmlowp.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# gemmlowp -# -################################################################################ - -GEMMLOWP_VERSION = 08e4bb339e34017a0835269d4a37c4ea04d15a69 -GEMMLOWP_SITE = $(call github,google,gemmlowp,$(GEMMLOWP_VERSION)) -GEMMLOWP_LICENSE = Apache-2.0 -GEMMLOWP_LICENSE_FILES = LICENSE -GEMMLOWP_INSTALL_STAGING = YES -# Only installs a header -GEMMLOWP_INSTALL_TARGET = NO -GEMMLOWP_SUBDIR = contrib - -$(eval $(cmake-package)) diff --git a/buildroot-external/package/psimd/Config.in b/buildroot-external/package/psimd/Config.in deleted file mode 100644 index bd9cb66b..00000000 --- a/buildroot-external/package/psimd/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_PSIMD - bool "psimd" - help - Portable 128-bit SIMD intrinsics - - https://github.com/Maratyszcza/psimd/ diff --git a/buildroot-external/package/psimd/psimd.hash b/buildroot-external/package/psimd/psimd.hash deleted file mode 100644 index 5692e79b..00000000 --- a/buildroot-external/package/psimd/psimd.hash +++ /dev/null @@ -1,4 +0,0 @@ -# Locally calculated -sha256 f6c4dab91ae9a03b3019e7cab0572743afd0e1b6e75b97fcca50259c737c924e psimd-072586a71b55b7f8c584153d223e95687148a900.tar.gz -# License files, locally calculated -sha256 984ce1e0b8ee89d234e28b960381f240e03a07a8031f35012f9c3256f56964e2 LICENSE diff --git a/buildroot-external/package/psimd/psimd.mk b/buildroot-external/package/psimd/psimd.mk deleted file mode 100644 index be0090a3..00000000 --- a/buildroot-external/package/psimd/psimd.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# psimd -# -################################################################################ - -PSIMD_VERSION = 072586a71b55b7f8c584153d223e95687148a900 -PSIMD_SITE = $(call github,Maratyszcza,psimd,$(PSIMD_VERSION)) -PSIMD_LICENSE = MIT -PSIMD_LICENSE_FILES = LICENSE -PSIMD_INSTALL_STAGING = YES -# Only installs a header -PSIMD_INSTALL_TARGET = NO - -$(eval $(cmake-package)) diff --git a/buildroot-external/package/pthreadpool/Config.in b/buildroot-external/package/pthreadpool/Config.in deleted file mode 100644 index dc8040ce..00000000 --- a/buildroot-external/package/pthreadpool/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_PTHREADPOOL - bool "pthreadpool" - select BR2_PACKAGE_FXDIV - help - Portable (POSIX/Windows/Emscripten) thread pool for C/C++ - - https://github.com/Maratyszcza/pthreadpool/ diff --git a/buildroot-external/package/pthreadpool/pthreadpool.hash b/buildroot-external/package/pthreadpool/pthreadpool.hash deleted file mode 100644 index 8f151325..00000000 --- a/buildroot-external/package/pthreadpool/pthreadpool.hash +++ /dev/null @@ -1,4 +0,0 @@ -# Locally calculated -sha256 6b0018ce7c926b718ed3ecbed1e48c8a083df60529b33ef2c7232260d3c32f61 pthreadpool-edeb5d6b967bef092ff195ab40e216fa5ac11f61.tar.gz -# License files, locally calculated -sha256 57814a606b4d0fb087d9a534919084b6c11b58a4174cb5a4aef200187780dc3a LICENSE diff --git a/buildroot-external/package/pthreadpool/pthreadpool.mk b/buildroot-external/package/pthreadpool/pthreadpool.mk deleted file mode 100644 index 75327951..00000000 --- a/buildroot-external/package/pthreadpool/pthreadpool.mk +++ /dev/null @@ -1,33 +0,0 @@ -################################################################################ -# -# pthreadpool -# -################################################################################ - -PTHREADPOOL_VERSION = edeb5d6b967bef092ff195ab40e216fa5ac11f61 -PTHREADPOOL_SITE = $(call github,Maratyszcza,pthreadpool,$(PTHREADPOOL_VERSION)) -PTHREADPOOL_LICENSE = BSD-2-Clause -PTHREADPOOL_LICENSE_FILES = LICENSE -PTHREADPOOL_INSTALL_STAGING = YES -PTHREADPOOL_DEPENDENCIES = fxdiv - -PTHREADPOOL_CFLAGS = $(TARGET_CFLAGS) -PTHREADPOOL_CXXFLAGS = $(TARGET_CXXFLAGS) - -ifeq ($(BR2_PACKAGE_CPUINFO),y) -PTHREADPOOL_DEPENDENCIES += cpuinfo -PTHREADPOOL_CFLAGS += -DPTHREADPOOL_USE_CPUINFO=1 -PTHREADPOOL_CXXFLAGS += -DPTHREADPOOL_USE_CPUINFO=1 -else -PTHREADPOOL_CFLAGS += -DPTHREADPOOL_USE_CPUINFO=0 -PTHREADPOOL_CXXFLAGS += -DPTHREADPOOL_USE_CPUINFO=0 -endif - -PTHREADPOOL_CONF_OPTS = \ - -DCMAKE_C_FLAGS="$(PTHREADPOOL_CFLAGS)" \ - -DCMAKE_CXX_FLAGS="$(PTHREADPOOL_CXXFLAGS)" \ - -DFXDIV_SOURCE_DIR="$(FXDIV_DIR)" \ - -DPTHREADPOOL_BUILD_TESTS=OFF \ - -DPTHREADPOOL_BUILD_BENCHMARKS=OFF - -$(eval $(cmake-package)) diff --git a/buildroot-external/package/ruy/Config.in b/buildroot-external/package/ruy/Config.in deleted file mode 100644 index cc137a40..00000000 --- a/buildroot-external/package/ruy/Config.in +++ /dev/null @@ -1,22 +0,0 @@ -config BR2_PACKAGE_RUY_ARCH_SUPPORTS - bool - default y if BR2_PACKAGE_CPUINFO_ARCH_SUPPORTS - -config BR2_PACKAGE_RUY - bool "ruy" - depends on BR2_PACKAGE_CPUINFO_ARCH_SUPPORTS - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++14 - depends on BR2_TOOLCHAIN_HAS_THREADS # cpuinfo - select BR2_PACKAGE_CPUINFO - help - Ruy is a matrix multiplication library. Its focus is to cover - the matrix multiplication needs of neural network inference - engines. Its initial user has been TensorFlow Lite, where it - is used by default on the ARM CPU architecture. - - https://github.com/google/ruy - -comment "ruy needs a toolchain w/ C++14, threads" - depends on !BR2_INSTALL_LIBSTDCPP || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/buildroot-external/package/ruy/ruy.hash b/buildroot-external/package/ruy/ruy.hash deleted file mode 100644 index 675b457b..00000000 --- a/buildroot-external/package/ruy/ruy.hash +++ /dev/null @@ -1,4 +0,0 @@ -# Locally calculated -sha256 e151a5b55059a6e83ded001787e1a8889ba1e5e4eaa5bc836b9b660e7e1cb519 ruy-21a85fef159f9942f636a43b14c64b481c2a05b2.tar.gz -# License files, locally calculated -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/buildroot-external/package/ruy/ruy.mk b/buildroot-external/package/ruy/ruy.mk deleted file mode 100644 index e73c3693..00000000 --- a/buildroot-external/package/ruy/ruy.mk +++ /dev/null @@ -1,17 +0,0 @@ -################################################################################ -# -# ruy -# -################################################################################ - -RUY_VERSION = 21a85fef159f9942f636a43b14c64b481c2a05b2 -RUY_SITE = $(call github,google,ruy,$(RUY_VERSION)) -RUY_LICENSE = Apache-2 -RUY_LICENSE_FILES = LICENSE -RUY_INSTALL_STAGING = YES -RUY_DEPENDENCIES = cpuinfo -RUY_CONF_OPTS = -DCMAKE_POSITION_INDEPENDENT_CODE=ON \ - -DRUY_FIND_CPUINFO=ON \ - -DRUY_MINIMAL_BUILD=ON - -$(eval $(cmake-package)) diff --git a/buildroot-external/package/tensorflow-lite/0001-lite-Update-CMakeLists.txt.patch b/buildroot-external/package/tensorflow-lite/0001-lite-Update-CMakeLists.txt.patch deleted file mode 100644 index 53b51706..00000000 --- a/buildroot-external/package/tensorflow-lite/0001-lite-Update-CMakeLists.txt.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 081c2e4e3cf021efb2853a485a18b563e88f6117 Mon Sep 17 00:00:00 2001 -From: Terry Heo -Date: Tue, 1 Nov 2022 15:55:30 -0700 -Subject: [PATCH] lite: Update CMakeLists.txt - -This changes are needed to build kernel tests. - -PiperOrigin-RevId: 485439972 - -Signed-off-by: James Hilliard -[james.hilliard1@gmail.com: backport from upstream commit -081c2e4e3cf021efb2853a485a18b563e88f6117] ---- - tensorflow/lite/CMakeLists.txt | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/tensorflow/lite/CMakeLists.txt b/tensorflow/lite/CMakeLists.txt -index 9dfbb4b72f3..fd8b3faf1e2 100644 ---- a/tensorflow/lite/CMakeLists.txt -+++ b/tensorflow/lite/CMakeLists.txt -@@ -209,6 +209,9 @@ list(FILTER TFLITE_SRCS EXCLUDE REGEX ".*tflite_with_xnnpack\\.cc$") - # Exclude Flex related files. - list(FILTER TFLITE_SRCS EXCLUDE REGEX ".*with_selected_ops\\.cc$") - -+# Exclude tensorflow_profiler_logger files. -+list(FILTER TFLITE_SRCS EXCLUDE REGEX ".*tensorflow_profiler_logger\\.cc$") -+ - if(_TFLITE_ENABLE_MMAP) - list(FILTER TFLITE_SRCS EXCLUDE REGEX ".*mmap_allocation_disabled\\.cc$") - else() -@@ -222,6 +225,7 @@ if(NOT "${CMAKE_SYSTEM_NAME}" STREQUAL "iOS") - endif() - populate_tflite_source_vars("core" TFLITE_CORE_SRCS) - populate_tflite_source_vars("core/api" TFLITE_CORE_API_SRCS) -+populate_tflite_source_vars("core/c" TFLITE_CORE_C_SRCS) - populate_tflite_source_vars("c" TFLITE_C_SRCS) - populate_tflite_source_vars("delegates" TFLITE_DELEGATES_SRCS) - if(TFLITE_ENABLE_GPU) -@@ -483,6 +487,7 @@ endif() - # TFLite library - set(_ALL_TFLITE_SRCS - ${TFLITE_CORE_API_SRCS} -+ ${TFLITE_CORE_C_SRCS} - ${TFLITE_CORE_SRCS} - ${TFLITE_C_SRCS} - ${TFLITE_DELEGATES_FLEX_SRCS} --- -2.34.1 - diff --git a/buildroot-external/package/tensorflow-lite/0002-Add-SYSTEM_FARMHASH-cmake-config-flag.patch b/buildroot-external/package/tensorflow-lite/0002-Add-SYSTEM_FARMHASH-cmake-config-flag.patch deleted file mode 100644 index 99db29e3..00000000 --- a/buildroot-external/package/tensorflow-lite/0002-Add-SYSTEM_FARMHASH-cmake-config-flag.patch +++ /dev/null @@ -1,74 +0,0 @@ -From d8451a9048d09692994c40a6f9bc928e70ed79b5 Mon Sep 17 00:00:00 2001 -From: James Hilliard -Date: Mon, 28 Nov 2022 21:36:34 -0700 -Subject: [PATCH] Add SYSTEM_FARMHASH cmake config flag - -Since farmhash does not install a cmake package we need to -search for the library and headers to use the provided -version. - -Signed-off-by: James Hilliard -[james.hilliard1@gmail.com: backport from upstream commit -d8451a9048d09692994c40a6f9bc928e70ed79b5] ---- - tensorflow/lite/g3doc/guide/build_cmake.md | 1 + - .../tools/cmake/modules/Findfarmhash.cmake | 30 +++++++++++++++---- - 2 files changed, 26 insertions(+), 5 deletions(-) - -diff --git a/tensorflow/lite/g3doc/guide/build_cmake.md b/tensorflow/lite/g3doc/guide/build_cmake.md -index 6950a365bb8..6de955e70b0 100644 ---- a/tensorflow/lite/g3doc/guide/build_cmake.md -+++ b/tensorflow/lite/g3doc/guide/build_cmake.md -@@ -81,6 +81,7 @@ variables to point to your library installations. - ```sh - cmake ../tensorflow_src/tensorflow/lite -DTFLITE_ENABLE_INSTALL=ON \ - -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON \ -+ -DSYSTEM_FARMHASH=ON \ - -Dabsl_DIR=/lib/cmake/absl \ - -DEigen3_DIR=/share/eigen3/cmake \ - -DFlatbuffers_DIR=/lib/cmake/flatbuffers \ -diff --git a/tensorflow/lite/tools/cmake/modules/Findfarmhash.cmake b/tensorflow/lite/tools/cmake/modules/Findfarmhash.cmake -index 1b0dc28f624..97b43298f13 100644 ---- a/tensorflow/lite/tools/cmake/modules/Findfarmhash.cmake -+++ b/tensorflow/lite/tools/cmake/modules/Findfarmhash.cmake -@@ -13,12 +13,32 @@ - # See the License for the specific language governing permissions and - # limitations under the License. - --# tensorflow-lite uses find_package for this package, so override the system --# installation and build from source instead. --include(farmhash) --if(farmhash_POPULATED) -+# tensorflow-lite uses find_package for this package, so build from -+# source if the system version is not enabled. -+ -+if(SYSTEM_FARMHASH) -+ include(FindPackageHandleStandardArgs) -+ find_path(FARMHASH_ROOT_DIR NAMES include/farmhash.h) -+ find_library(FARMHASH_LIB NAMES farmhash PATHS ${FARMHASH_ROOT_DIR}/lib ${FARMHASH_LIB_PATH}) -+ find_path(FARMHASH_INCLUDE_DIRS NAMES farmhash.h PATHS ${FARMHASH_ROOT_DIR}/include) -+ find_package_handle_standard_args(farmhash DEFAULT_MSG FARMHASH_LIB FARMHASH_INCLUDE_DIRS) -+endif() -+ -+if(farmhash_FOUND) -+ add_library(farmhash SHARED IMPORTED GLOBAL) -+ set_target_properties(farmhash PROPERTIES -+ IMPORTED_LOCATION ${FARMHASH_LIB} -+ INTERFACE_INCLUDE_DIRECTORIES ${FARMHASH_INCLUDE_DIRS} -+ ) -+else() -+ include(farmhash) -+ if(farmhash_POPULATED) -+ get_target_property(FARMHASH_INCLUDE_DIRS farmhash INTERFACE_DIRECTORIES) -+ endif() -+endif() -+ -+if(farmhash_FOUND OR farmhash_POPULATED) - set(FARMHASH_FOUND TRUE) -- get_target_property(FARMHASH_INCLUDE_DIRS farmhash INTERFACE_DIRECTORIES) - add_library(farmhash::farmhash ALIAS farmhash) - set(FARMHASH_LIBRARIES farmhash::farmhash) - endif() --- -2.34.1 - diff --git a/buildroot-external/package/tensorflow-lite/0003-Fix-FindFlatBuffers-cmake-file.patch b/buildroot-external/package/tensorflow-lite/0003-Fix-FindFlatBuffers-cmake-file.patch deleted file mode 100644 index e97bb3e5..00000000 --- a/buildroot-external/package/tensorflow-lite/0003-Fix-FindFlatBuffers-cmake-file.patch +++ /dev/null @@ -1,37 +0,0 @@ -From a4ff4b5e952a22906ac0ed01e73f84f42926c325 Mon Sep 17 00:00:00 2001 -From: James Hilliard -Date: Thu, 24 Nov 2022 14:29:06 -0700 -Subject: [PATCH] Fix FindFlatBuffers cmake file - -Capitalization needs to match for system cmake override to work: -https://github.com/google/flatbuffers/blob/v22.11.23/CMake/FindFlatBuffers.cmake - -Signed-off-by: James Hilliard -[Upstream status: -https://github.com/tensorflow/tensorflow/pull/58677] ---- - tensorflow/lite/CMakeLists.txt | 2 +- - .../modules/{FindFlatbuffers.cmake => FindFlatBuffers.cmake} | 0 - 2 files changed, 1 insertion(+), 1 deletion(-) - rename tensorflow/lite/tools/cmake/modules/{FindFlatbuffers.cmake => FindFlatBuffers.cmake} (100%) - -diff --git a/tensorflow/lite/CMakeLists.txt b/tensorflow/lite/CMakeLists.txt -index f9c30d6a046..c2ee9edfb61 100644 ---- a/tensorflow/lite/CMakeLists.txt -+++ b/tensorflow/lite/CMakeLists.txt -@@ -143,7 +143,7 @@ find_package(absl REQUIRED) - find_package(Eigen3 REQUIRED) - find_package(farmhash REQUIRED) - find_package(fft2d REQUIRED) --find_package(Flatbuffers REQUIRED) -+find_package(FlatBuffers REQUIRED) - find_package(gemmlowp REQUIRED) - find_package(NEON_2_SSE REQUIRED) - find_package(cpuinfo REQUIRED) #CPUINFO is used by XNNPACK and RUY library -diff --git a/tensorflow/lite/tools/cmake/modules/FindFlatbuffers.cmake b/tensorflow/lite/tools/cmake/modules/FindFlatBuffers.cmake -similarity index 100% -rename from tensorflow/lite/tools/cmake/modules/FindFlatbuffers.cmake -rename to tensorflow/lite/tools/cmake/modules/FindFlatBuffers.cmake --- -2.34.1 - diff --git a/buildroot-external/package/tensorflow-lite/0004-Don-t-link-tensorflow-lite-against-gemmlowp.patch b/buildroot-external/package/tensorflow-lite/0004-Don-t-link-tensorflow-lite-against-gemmlowp.patch deleted file mode 100644 index dbee9942..00000000 --- a/buildroot-external/package/tensorflow-lite/0004-Don-t-link-tensorflow-lite-against-gemmlowp.patch +++ /dev/null @@ -1,32 +0,0 @@ -From fb584589f707853d85a081c99b1b82598c2631c1 Mon Sep 17 00:00:00 2001 -From: James Hilliard -Date: Thu, 24 Nov 2022 15:10:27 -0700 -Subject: [PATCH] Don't link tensorflow-lite against gemmlowp - -We can't link against gemmlowp as it is a header only library. - -Fixes: -/bin/ld: cannot find -lgemmlowp: No such file or directory - -Signed-off-by: James Hilliard -[Upstream status: -https://github.com/tensorflow/tensorflow/pull/58678] ---- - tensorflow/lite/CMakeLists.txt | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/tensorflow/lite/CMakeLists.txt b/tensorflow/lite/CMakeLists.txt -index f9c30d6a046..3fe5ed15605 100644 ---- a/tensorflow/lite/CMakeLists.txt -+++ b/tensorflow/lite/CMakeLists.txt -@@ -560,7 +560,6 @@ target_link_libraries(tensorflow-lite - farmhash - fft2d_fftsg2d - flatbuffers::flatbuffers -- gemmlowp - ruy::ruy - pthreadpool - ${CMAKE_DL_LIBS} --- -2.34.1 - diff --git a/buildroot-external/package/tensorflow-lite/Config.in b/buildroot-external/package/tensorflow-lite/Config.in deleted file mode 100644 index 8685ec0c..00000000 --- a/buildroot-external/package/tensorflow-lite/Config.in +++ /dev/null @@ -1,36 +0,0 @@ -config BR2_PACKAGE_TENSORFLOW_LITE_ARCH_SUPPORTS - bool - default y if BR2_aarch64 - default y if BR2_arm - default y if BR2_i386 - default y if BR2_x86_64 - depends on BR2_PACKAGE_CPUINFO_ARCH_SUPPORTS - -config BR2_PACKAGE_TENSORFLOW_LITE - bool "tensorflow-lite" - depends on BR2_PACKAGE_TENSORFLOW_LITE_ARCH_SUPPORTS - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # C++17 - depends on BR2_TOOLCHAIN_HAS_THREADS # cpuinfo - depends on BR2_TOOLCHAIN_USES_GLIBC - depends on BR2_SHARED_LIBS - select BR2_PACKAGE_CPUINFO - select BR2_PACKAGE_EIGEN - select BR2_PACKAGE_FARMHASH - select BR2_PACKAGE_FFT2D - select BR2_PACKAGE_FLATBUFFERS - select BR2_PACKAGE_GEMMLOWP - select BR2_PACKAGE_LIBABSEIL_CPP - select BR2_PACKAGE_NEON_2_SSE - select BR2_PACKAGE_RUY if BR2_PACKAGE_RUY_ARCH_SUPPORTS - select BR2_PACKAGE_XNNPACK if BR2_PACKAGE_XNNPACK_ARCH_SUPPORTS - help - Tensorflow Lite dynamic library and headers: Inference engine - to run previously trained machine learning models. - -comment "tensorflow-lite needs a toolchain w/ glibc, C++17, threads" - depends on !BR2_TOOLCHAIN_USES_GLIBC || !BR2_INSTALL_LIBSTDCPP || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_7 || !BR2_TOOLCHAIN_HAS_THREADS - -comment "tensorflow-lite needs a toolchain w/ shared libraries" - depends on !BR2_SHARED_LIBS diff --git a/buildroot-external/package/tensorflow-lite/tensorflow-lite.hash b/buildroot-external/package/tensorflow-lite/tensorflow-lite.hash deleted file mode 100644 index 7d903570..00000000 --- a/buildroot-external/package/tensorflow-lite/tensorflow-lite.hash +++ /dev/null @@ -1,4 +0,0 @@ -# Locally calculated -sha256 99c732b92b1b37fc243a559e02f9aef5671771e272758aa4aec7f34dc92dac48 tensorflow-lite-2.11.0.tar.gz -# License files, locally calculated -sha256 71c6915d04265772a0339bed47276942c678b45cc01534210ebe6984fd1aec65 LICENSE diff --git a/buildroot-external/package/tensorflow-lite/tensorflow-lite.mk b/buildroot-external/package/tensorflow-lite/tensorflow-lite.mk deleted file mode 100644 index fcc20d04..00000000 --- a/buildroot-external/package/tensorflow-lite/tensorflow-lite.mk +++ /dev/null @@ -1,120 +0,0 @@ -################################################################################ -# -# tensorflow-lite -# -################################################################################ - -TENSORFLOW_LITE_VERSION = 2.11.0 -TENSORFLOW_LITE_SITE = $(call github,tensorflow,tensorflow,v$(TENSORFLOW_LITE_VERSION)) -TENSORFLOW_LITE_INSTALL_STAGING = YES -TENSORFLOW_LITE_LICENSE = Apache-2.0 -TENSORFLOW_LITE_LICENSE_FILES = LICENSE -TENSORFLOW_LITE_SUBDIR = tensorflow/lite -TENSORFLOW_LITE_SUPPORTS_IN_SOURCE_BUILD = NO -TENSORFLOW_LITE_DEPENDENCIES += \ - host-pkgconf \ - host-flatbuffers \ - cpuinfo \ - eigen \ - farmhash \ - fft2d \ - flatbuffers \ - gemmlowp \ - libabseil-cpp \ - neon-2-sse - -TENSORFLOW_LITE_CONF_OPTS = \ - -DCMAKE_C_FLAGS="$(TARGET_CFLAGS) -funsafe-math-optimizations \ - -I$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ - -I$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/numpy/core/include \ - -I$(STAGING_DIR)/usr/include/pybind11 \ - -I$(STAGING_DIR)/usr/include/gemmlowp" \ - -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) -funsafe-math-optimizations \ - -I$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ - -I$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/numpy/core/include \ - -I$(STAGING_DIR)/usr/include/pybind11 \ - -I$(STAGING_DIR)/usr/include/gemmlowp" \ - -Dabsl_DIR=$(STAGING_DIR)/usr/lib/cmake/absl \ - -DBUILD_SHARED_LIBS=ON \ - -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON \ - -DCMAKE_POSITION_INDEPENDENT_CODE=ON \ - -DEigen3_DIR=$(STAGING_DIR)/usr/share/eigen3/cmake \ - -DFETCHCONTENT_FULLY_DISCONNECTED=ON \ - -DFETCHCONTENT_QUIET=OFF \ - -DFFT2D_SOURCE_DIR=$(STAGING_DIR)/usr/include/fft2d \ - -DFlatBuffers_DIR=$(STAGING_DIR)/usr/lib/cmake/flatbuffers \ - -DNEON_2_SSE_DIR=$(STAGING_DIR)/usr/lib/cmake/NEON_2_SSE \ - -DSYSTEM_FARMHASH=ON \ - -DTFLITE_ENABLE_EXTERNAL_DELEGATE=ON \ - -DTFLITE_ENABLE_GPU=OFF \ - -DTFLITE_ENABLE_INSTALL=ON \ - -DTFLITE_ENABLE_MMAP=ON \ - -DTFLITE_ENABLE_NNAPI=OFF - -ifeq ($(BR2_PACKAGE_RUY),y) -TENSORFLOW_LITE_DEPENDENCIES += ruy -TENSORFLOW_LITE_CONF_OPTS += -DTFLITE_ENABLE_RUY=ON -else -TENSORFLOW_LITE_CONF_OPTS += -DTFLITE_ENABLE_RUY=OFF -endif - -ifeq ($(BR2_PACKAGE_XNNPACK),y) -TENSORFLOW_LITE_DEPENDENCIES += xnnpack -TENSORFLOW_LITE_CONF_OPTS += -DTFLITE_ENABLE_XNNPACK=ON -Dxnnpack_POPULATED=ON -else -TENSORFLOW_LITE_CONF_OPTS += -DTFLITE_ENABLE_XNNPACK=OFF -endif - -TENSORFLOW_LITE_MAKE_OPTS += _pywrap_tensorflow_interpreter_wrapper benchmark_model - -TENSORFLOW_LITE_POST_INSTALL_STAGING_HOOKS = TENSORFLOW_LITE_INSTALL_VERSION_HEADER - -TENSORFLOW_LITE_POST_INSTALL_TARGET_HOOKS = TENSORFLOW_LITE_INSTALL_TFLITE_RUNTIME - -define TENSORFLOW_LITE_INSTALL_VERSION_HEADER - mkdir -p $(STAGING_DIR)/usr/include/tensorflow/core/public - $(INSTALL) -D -m 644 $(@D)/tensorflow/core/public/version.h \ - $(STAGING_DIR)/usr/include/tensorflow/core/public/ -endef - -define TENSORFLOW_LITE_INSTALL_TFLITE_RUNTIME - - mkdir -p $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/tflite_runtime - mkdir -p $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/tflite_runtime-${TENSORFLOW_LITE_VERSION}-py$(PYTHON3_VERSION_MAJOR).egg-info - - $(INSTALL) -D -m 755 $(@D)/$(TENSORFLOW_LITE_SUBDIR)/buildroot-build/_pywrap_tensorflow_interpreter_wrapper.so \ - $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/tflite_runtime/ - - $(INSTALL) -D -m 755 $(@D)/$(TENSORFLOW_LITE_SUBDIR)/python/interpreter.py \ - $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/tflite_runtime/ - - $(INSTALL) -D -m 755 $(@D)/$(TENSORFLOW_LITE_SUBDIR)/python/metrics/metrics_interface.py \ - $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/tflite_runtime/ - - $(INSTALL) -D -m 755 $(@D)/$(TENSORFLOW_LITE_SUBDIR)/python/metrics/metrics_portable.py \ - $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/tflite_runtime/ - - $(INSTALL) -D -m 755 $(BR2_EXTERNAL_OPENVOICEOS_PATH)/package/tensorflow-lite/tflite_runtime/__init__.py \ - $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/tflite_runtime/ - - $(INSTALL) -D -m 755 $(BR2_EXTERNAL_OPENVOICEOS_PATH)/package/tensorflow-lite/tflite_runtime/MANIFEST.in \ - $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/tflite_runtime/ - - $(INSTALL) -D -m 644 $(BR2_EXTERNAL_OPENVOICEOS_PATH)/package/tensorflow-lite/tflite_runtime/dependency_links.txt \ - $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/tflite_runtime-${TENSORFLOW_LITE_VERSION}-py$(PYTHON3_VERSION_MAJOR).egg-info/ - - $(INSTALL) -D -m 644 $(BR2_EXTERNAL_OPENVOICEOS_PATH)/package/tensorflow-lite/tflite_runtime/PKG-INFO \ - $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/tflite_runtime-${TENSORFLOW_LITE_VERSION}-py$(PYTHON3_VERSION_MAJOR).egg-info/ - - $(INSTALL) -D -m 644 $(BR2_EXTERNAL_OPENVOICEOS_PATH)/package/tensorflow-lite/tflite_runtime/requires.txt \ - $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/tflite_runtime-${TENSORFLOW_LITE_VERSION}-py$(PYTHON3_VERSION_MAJOR).egg-info/ - - $(INSTALL) -D -m 644 $(BR2_EXTERNAL_OPENVOICEOS_PATH)/package/tensorflow-lite/tflite_runtime/SOURCES.txt \ - $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/tflite_runtime-${TENSORFLOW_LITE_VERSION}-py$(PYTHON3_VERSION_MAJOR).egg-info/ - - $(INSTALL) -D -m 644 $(BR2_EXTERNAL_OPENVOICEOS_PATH)/package/tensorflow-lite/tflite_runtime/top_level.txt \ - $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/tflite_runtime-${TENSORFLOW_LITE_VERSION}-py$(PYTHON3_VERSION_MAJOR).egg-info/ - -endef - -$(eval $(cmake-package)) diff --git a/buildroot-external/package/tensorflow-lite/tflite_runtime/MANIFEST.in b/buildroot-external/package/tensorflow-lite/tflite_runtime/MANIFEST.in deleted file mode 100755 index bb574e63..00000000 --- a/buildroot-external/package/tensorflow-lite/tflite_runtime/MANIFEST.in +++ /dev/null @@ -1 +0,0 @@ -recursive-include * *.py diff --git a/buildroot-external/package/tensorflow-lite/tflite_runtime/PKG-INFO b/buildroot-external/package/tensorflow-lite/tflite_runtime/PKG-INFO deleted file mode 100644 index 07303e97..00000000 --- a/buildroot-external/package/tensorflow-lite/tflite_runtime/PKG-INFO +++ /dev/null @@ -1,31 +0,0 @@ -Metadata-Version: 2.1 -Name: tflite-runtime -Version: 2.11.0 -Summary: TensorFlow Lite is for mobile and embedded devices. -Home-page: https://www.tensorflow.org/lite/ -Author: Google, LLC -Author-email: packages@tensorflow.org -License: Apache 2.0 -Keywords: tflite tensorflow tensor machine learning -Platform: OpenVoiceOS -Classifier: Development Status :: 5 - Production/Stable -Classifier: Intended Audience :: Developers -Classifier: Intended Audience :: Education -Classifier: Intended Audience :: Science/Research -Classifier: License :: OSI Approved :: Apache Software License -Classifier: Programming Language :: Python :: 3 -Classifier: Programming Language :: Python :: 3.7 -Classifier: Programming Language :: Python :: 3.8 -Classifier: Programming Language :: Python :: 3.9 -Classifier: Programming Language :: Python :: 3.10 -Classifier: Programming Language :: Python :: 3.11 -Classifier: Topic :: Scientific/Engineering -Classifier: Topic :: Scientific/Engineering :: Mathematics -Classifier: Topic :: Scientific/Engineering :: Artificial Intelligence -Classifier: Topic :: Software Development -Classifier: Topic :: Software Development :: Libraries -Classifier: Topic :: Software Development :: Libraries :: Python Modules - -TensorFlow Lite is the official solution for running machine learning models on mobile and embedded devices. It enables on-device machine learning inference with low latency and a small binary size on Android, iOS, and other -operating -systems. diff --git a/buildroot-external/package/tensorflow-lite/tflite_runtime/SOURCES.txt b/buildroot-external/package/tensorflow-lite/tflite_runtime/SOURCES.txt deleted file mode 100644 index 02d3758c..00000000 --- a/buildroot-external/package/tensorflow-lite/tflite_runtime/SOURCES.txt +++ /dev/null @@ -1,11 +0,0 @@ -__init__.py -_pywrap_tensorflow_interpreter_wrapper.so -interpreter.py -MANIFEST.in -metrics_interface.py -metrics_portable.py -tflite_runtime.egg-info/PKG-INFO -tflite_runtime.egg-info/SOURCES.txt -tflite_runtime.egg-info/dependency_links.txt -tflite_runtime.egg-info/requires.txt -tflite_runtime.egg-info/top_level.txt diff --git a/buildroot-external/package/tensorflow-lite/tflite_runtime/__init__.py b/buildroot-external/package/tensorflow-lite/tflite_runtime/__init__.py deleted file mode 100755 index c61ec86a..00000000 --- a/buildroot-external/package/tensorflow-lite/tflite_runtime/__init__.py +++ /dev/null @@ -1,2 +0,0 @@ -__version__ = '2.11.0' -__git_version__ = 'd5b57ca93e506df258271ea00fc29cf98383a374' diff --git a/buildroot-external/package/tensorflow-lite/tflite_runtime/dependency_links.txt b/buildroot-external/package/tensorflow-lite/tflite_runtime/dependency_links.txt deleted file mode 100644 index 8b137891..00000000 --- a/buildroot-external/package/tensorflow-lite/tflite_runtime/dependency_links.txt +++ /dev/null @@ -1 +0,0 @@ - diff --git a/buildroot-external/package/tensorflow-lite/tflite_runtime/requires.txt b/buildroot-external/package/tensorflow-lite/tflite_runtime/requires.txt deleted file mode 100644 index 385649ac..00000000 --- a/buildroot-external/package/tensorflow-lite/tflite_runtime/requires.txt +++ /dev/null @@ -1 +0,0 @@ -numpy>=1.19.2 diff --git a/buildroot-external/package/tensorflow-lite/tflite_runtime/top_level.txt b/buildroot-external/package/tensorflow-lite/tflite_runtime/top_level.txt deleted file mode 100644 index 8b137891..00000000 --- a/buildroot-external/package/tensorflow-lite/tflite_runtime/top_level.txt +++ /dev/null @@ -1 +0,0 @@ - diff --git a/buildroot-external/package/xnnpack/Config.in b/buildroot-external/package/xnnpack/Config.in deleted file mode 100644 index 1b186ac0..00000000 --- a/buildroot-external/package/xnnpack/Config.in +++ /dev/null @@ -1,27 +0,0 @@ -config BR2_PACKAGE_XNNPACK_ARCH_SUPPORTS - bool - default y if BR2_aarch64 - default y if BR2_arm - default y if BR2_i386 - default y if BR2_x86_64 - depends on BR2_PACKAGE_CPUINFO_ARCH_SUPPORTS - -config BR2_PACKAGE_XNNPACK - bool "xnnpack" - depends on BR2_PACKAGE_XNNPACK_ARCH_SUPPORTS - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++14 - depends on BR2_TOOLCHAIN_HAS_THREADS # cpuinfo - select BR2_PACKAGE_CPUINFO - select BR2_PACKAGE_FP16 - select BR2_PACKAGE_FXDIV - select BR2_PACKAGE_PTHREADPOOL - help - XNNPACK is a highly optimized solution for neural network - inference on ARM, x86, WebAssembly, and RISC-V platforms. - - https://github.com/google/XNNPACK - -comment "xnnpack needs a toolchain w/ C++14, threads" - depends on !BR2_INSTALL_LIBSTDCPP || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/buildroot-external/package/xnnpack/xnnpack.hash b/buildroot-external/package/xnnpack/xnnpack.hash deleted file mode 100644 index e31eb690..00000000 --- a/buildroot-external/package/xnnpack/xnnpack.hash +++ /dev/null @@ -1,4 +0,0 @@ -# Locally calculated -sha256 fb519d082e5fcaa11e849386ad00e38b9ebde2cc9363032394516cd0d00295c3 xnnpack-e4b2b942b4a6d84b680ed690fee42ae99865945c.tar.gz -# License files, locally calculated -sha256 63f519e15726f4c4f830bd958f694c84fecb4e0a4cacc527d2696bb71ef95ada LICENSE diff --git a/buildroot-external/package/xnnpack/xnnpack.mk b/buildroot-external/package/xnnpack/xnnpack.mk deleted file mode 100644 index 6d5748a2..00000000 --- a/buildroot-external/package/xnnpack/xnnpack.mk +++ /dev/null @@ -1,20 +0,0 @@ -################################################################################ -# -# xnnpack -# -################################################################################ - -XNNPACK_VERSION = e4b2b942b4a6d84b680ed690fee42ae99865945c -XNNPACK_SITE = $(call github,google,XNNPACK,$(XNNPACK_VERSION)) -XNNPACK_LICENSE = BSD-3-Clause -XNNPACK_LICENSE_FILES = LICENSE -XNNPACK_INSTALL_STAGING = YES -XNNPACK_DEPENDENCIES = cpuinfo fp16 fxdiv pthreadpool -XNNPACK_CONF_OPTS = \ - -DCMAKE_POSITION_INDEPENDENT_CODE=ON \ - -DXNNPACK_LIBRARY_TYPE:STRING=shared \ - -DXNNPACK_BUILD_TESTS=OFF \ - -DXNNPACK_BUILD_BENCHMARKS=OFF \ - -DXNNPACK_USE_SYSTEM_LIBS=ON - -$(eval $(cmake-package))