Please allow using external cpu_features package #556
Comments
|
for reference: usually, debian is relatively strict about not including libraries: Description: use system cpu_features package
Author: Shengjing Zhu <zhsj@debian.org>
Last-Update: 2020-12-26
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -142,17 +142,7 @@
option(VOLK_CPU_FEATURES "Volk uses cpu_features" OFF)
endif()
if (VOLK_CPU_FEATURES)
- if(NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/cpu_features/CMakeLists.txt" )
- message(FATAL_ERROR "cpu_features/CMakeLists.txt not found. Did you forget to git clone recursively?\nFix with: git submodule update --init")
- endif()
- message(STATUS "Building Volk with cpu_features")
- set(BUILD_PIC ON CACHE BOOL
- "Build cpu_features with Position Independent Code (PIC)."
- FORCE)
- set(BUILD_SHARED_LIBS_SAVED "${BUILD_SHARED_LIBS}")
- set(BUILD_SHARED_LIBS OFF)
- add_subdirectory(cpu_features)
- set(BUILD_SHARED_LIBS "${BUILD_SHARED_LIBS_SAVED}")
+ find_package(CpuFeatures)
else()
message(STATUS "Building Volk without cpu_features")
endif()
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -517,7 +517,7 @@
if(VOLK_CPU_FEATURES)
set_source_files_properties(volk_cpu.c PROPERTIES COMPILE_DEFINITIONS "VOLK_CPU_FEATURES=1")
target_include_directories(volk_obj
- PRIVATE $<TARGET_PROPERTY:cpu_features,INTERFACE_INCLUDE_DIRECTORIES>
+ PRIVATE $<TARGET_PROPERTY:CpuFeatures::cpu_features,INTERFACE_INCLUDE_DIRECTORIES>
)
endif() |
|
|
|
the thing is, knowing the maintainers, they would probably prefer to not have made their lives easier (by not using cpu_features as submodule) if there was not (hard to detect) broken |
|
In the meantime, @yurivict, do you think you could try the debian patch above and see whether it works for you (may I guess for FreeBSD, then?) |
marcusmueller
added
CMake
Could you create a pull request with this patch? |
|
I know Debian ships VOLK and Having said that, why do we use In case of FreeBSD: You'd probably want the latest development version https://github.com/google/cpu_features because The argument is similar for MacOS. M1 support in I hope we are able to unbundle |
|
Re: patch: See the patch I've already included?
On January 17, 2022 9:53:54 AM GMT+01:00, Johannes Demel ***@***.***> wrote:
I know Debian ships VOLK and `cpu_features` separately. I'd be happy to make the submodule an optional dependency. This is probably an interesting feature for quite a lot of users now. @yurivict would you be able to provide a patch or point into the right direction? I'd be happy to add FreeBSD CI as well.
Having said that, why do we use `cpu_features` as a submodule?
[The `cpu_features` package](https://launchpad.net/ubuntu/+source/cpu-features) is fairly new on most systems. e.g. it got introduced after Ubuntu 20.04. With Debian 11 and soon Ubuntu 20.04 the situation improves quite significantly. I guess the Fedora situation is similar.
In case of FreeBSD: You'd probably want the latest development version https://github.com/google/cpu_features because `cpu_features` received FreeBSD support after the last release.
The argument is similar for MacOS. M1 support in `cpu_features`, and thus VOLK, got merged after the last release.
I hope we are able to unbundle `cpu_features` in the future. I hope we didn't miss any `cpu_features` includes that are public. So, `cpu_features` should be a private dependency as well.
--
Reply to this email directly or view it on GitHub:
#556 (comment)
You are receiving this because you commented.
Message ID: ***@***.***>
--
Sent from my Android device with K-9 Mail. Please excuse my brevity.
|
|
@marcusmueller Ah! I interpreted it as a suggestion. I'd like to merge smth similar. The Debian patch switches from submodule to package. I'd like to keep submodule usage optional. For now, I assume this is the best way forward. |
Since cpu_features is available as a package in recent distributions, we'd like to use the distro provided package. We try to find the CMake CpuFeatures package and build against it, if we can't find one, we try to use the git submodule. If both options fail, we emit an error message. Fix gnuradio#556 Signed-off-by: Johannes Demel <demel@uni-bremen.de>
Since cpu_features is available as a package in recent distributions, we'd like to use the distro provided package. We try to find the CMake CpuFeatures package and build against it, if we can't find one, we try to use the git submodule. If both options fail, we emit an error message. Fix gnuradio#556 Signed-off-by: Johannes Demel <demel@uni-bremen.de>
Bundling and installing
cpu_featurescauses conflicts with pre-installed package.Version: 2.5.0
The text was updated successfully, but these errors were encountered: