diff options
| author | tnn <tnn@pkgsrc.org> | 2020-12-14 19:04:40 +0000 |
|---|---|---|
| committer | tnn <tnn@pkgsrc.org> | 2020-12-14 19:04:40 +0000 |
| commit | fe947ee3f106e69dbb25f87f394d083893e05784 (patch) | |
| tree | 723cc1654d4b1da59c433ed37a943bc074819b7a /math/volk/patches | |
| parent | a436f62c4c7af783e9449e79a4847907ba2f591f (diff) | |
| download | pkgsrc-fe947ee3f106e69dbb25f87f394d083893e05784.tar.gz | |
volk: update to 2.4.0
pkgsrc: since the volk release tarball only provides the required cpu_features
library as a git submodule that has to be manually cloned, we instead depend on
devel/cpu_features from pkgsrc and patch the cmake files to accept the static
library as an external dependency.
Documentation
Update README to be more verbose and to improve usefulness.
Compilers
AppleClang: Treat AppleClang as Clang.
Paired with the cpu_features introduction, this enables us to use architecture
specific kernels on a broader set of platforms.
CMake
Enable to not install volk_modtool.
Remove "find_package_handle_standard_args" warning.
cpu_features
Use cpu_features v0.6.0 as a private submodule to detect available CPU
features.
Fix incorrect feature detection for newer AVX versions.
Circumvent platform specific feature detection.
Enable more architecture specific kernels on more platforms.
Kernels
Disable slow and broken SSE4.1 kernel in volk_32fc_x2_dot_prod_32fc
Adjust min/max for 32f_s32f_convert_8i kernel
Use INT8_* instead of CHAR_*
Diffstat (limited to 'math/volk/patches')
| -rw-r--r-- | math/volk/patches/patch-CMakeLists.txt | 22 | ||||
| -rw-r--r-- | math/volk/patches/patch-lib_CMakeLists.txt | 16 |
2 files changed, 38 insertions, 0 deletions
diff --git a/math/volk/patches/patch-CMakeLists.txt b/math/volk/patches/patch-CMakeLists.txt new file mode 100644 index 00000000000..19f1d3c4719 --- /dev/null +++ b/math/volk/patches/patch-CMakeLists.txt @@ -0,0 +1,22 @@ +$NetBSD: patch-CMakeLists.txt,v 1.1 2020/12/14 19:04:41 tnn Exp $ + +Use devel/cpu_features from pkgsrc since the volk release tarball doesn't +bundle it and we need to patch cpu_features anyway. + +--- CMakeLists.txt.orig 2020-11-22 16:33:01.000000000 +0000 ++++ CMakeLists.txt +@@ -115,13 +115,7 @@ endif(MSVC) + ######################################################################## + + # 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) + + # Python + include(VolkPython) #sets PYTHON_EXECUTABLE and PYTHON_DASH_B diff --git a/math/volk/patches/patch-lib_CMakeLists.txt b/math/volk/patches/patch-lib_CMakeLists.txt new file mode 100644 index 00000000000..16ace627eaa --- /dev/null +++ b/math/volk/patches/patch-lib_CMakeLists.txt @@ -0,0 +1,16 @@ +$NetBSD: patch-lib_CMakeLists.txt,v 1.1 2020/12/14 19:04:41 tnn Exp $ + +Use devel/cpu_features from pkgsrc since the volk release tarball doesn't +bundle it and we need to patch cpu_features anyway. + +--- lib/CMakeLists.txt.orig 2020-11-22 16:33:01.000000000 +0000 ++++ lib/CMakeLists.txt +@@ -511,7 +511,7 @@ target_include_directories(volk_obj + PRIVATE $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/include> + PRIVATE $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include> + PRIVATE $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/kernels> +- PRIVATE $<TARGET_PROPERTY:cpu_features,INTERFACE_INCLUDE_DIRECTORIES> ++ PRIVATE $<TARGET_PROPERTY:CpuFeatures::cpu_features,INTERFACE_INCLUDE_DIRECTORIES> + PRIVATE ${CMAKE_CURRENT_BINARY_DIR} + PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} + ) |