removed KFR dependency

Author: kwsp

ports/kfr/portfile.cmake

@@ -5,7 +5,6 @@ find_package(benchmark CONFIG REQUIRED)
 find_package(Armadillo REQUIRED)
 find_package(Eigen3 CONFIG REQUIRED)
 find_package(OpenBLAS CONFIG REQUIRED)
-find_package(KFR CONFIG REQUIRED)
 find_package(FFTW3 CONFIG REQUIRED)
 find_package(FFTW3f CONFIG REQUIRED)
 find_package(OpenCV CONFIG REQUIRED)
@@ -19,4 +18,4 @@ add_subdirectory(matrix_conversion)
 add_subdirectory(matrix_shift)
 add_subdirectory(conv1d)
 add_subdirectory(similarity)
-add_subdirectory(hilbert)
+add_subdirectory(hilbert)

ports/kfr/vcpkg.json

@@ -20,24 +20,18 @@ function(add_executable_script EXE_NAME)
     Eigen3::Eigen
     FFTW3::fftw3
     FFTW3::fftw3f
-    kfr
-    kfr_dsp
     opencv_world
   )
 
   if (IPP_FOUND)
     target_link_libraries(${EXE_NAME} PRIVATE ${IPP_LIBRARIES})
     target_compile_definitions(${EXE_NAME} PRIVATE -DHAS_IPP)
   endif()
-  
-  if (APPLE)
-    target_link_libraries(${EXE_NAME} PRIVATE kfr_dsp_neon64)
-  endif()
 
 endfunction()
 
 
 add_executable_script(conv1d main.cpp)
 
 add_executable_script(conv1d_bench benchmarks.cpp)
-target_link_libraries(conv1d_bench PRIVATE benchmark::benchmark benchmark::benchmark_main)
+target_link_libraries(conv1d_bench PRIVATE benchmark::benchmark benchmark::benchmark_main)

src/CMakeLists.txt

@@ -134,11 +134,6 @@ void BM_conv1d_Eigen(benchmark::State &state) {
 }
 BENCHMARK(BM_conv1d_Eigen<double>)->ArgsProduct(ARGS);
 
-template <fftconv::Floating Real> void BM_conv1d_KFR(benchmark::State &state) {
-  conv_bench_same<Real>(state, conv1d_KFR_fir<Real>);
-}
-BENCHMARK(BM_conv1d_KFR<double>)->ArgsProduct(ARGS);
-
 template <fftconv::Floating Real>
 void BM_conv1d_OpenCV(benchmark::State &state) {
   conv_bench_same<Real>(state, conv1d_OpenCV<Real>);

src/conv1d/CMakeLists.txt

@@ -3,7 +3,6 @@
 #include <Eigen/Dense>
 #include <fmt/core.h>
 #include <fmt/ranges.h>
-#include <kfr/all.hpp>
 #include <opencv2/core/hal/intrin.hpp>
 #include <opencv2/opencv.hpp>
 #include <span>
@@ -306,34 +305,6 @@ void conv1d_eigen(const std::span<const T> input_,
   }
 }
 
-/*
-KFR (same mode)
-*/
-template <typename T>
-void conv1d_KFR_fir(const std::span<const T> input,
-                    const std::span<const T> kernel, std::span<T> output) {
-
-  auto input_ = kfr::make_univector(input.data(), input.size());
-  auto kernel_ = kfr::make_univector(kernel.data(), kernel.size());
-  auto output_ = kfr::make_univector(output.data(), output.size());
-
-  kfr::filter_fir<T> filter(kernel_);
-  filter.apply(output_, input_);
-}
-
-// Link error
-// #ifndef __APPLE__
-// template <typename T>
-// void conv1d_kfr_oa(const std::span<const T> input,
-//                    const std::span<const T> kernel, std::span<T> output) {
-//   auto input_ = kfr::make_univector(input.data(), input.size());
-//   auto kernel_ = kfr::make_univector(kernel.data(), kernel.size());
-//   auto output_ = kfr::make_univector(output.data(), output.size());
-//   kfr::convolve_filter<T> filter(kernel_);
-//   filter.apply(output_, input_);
-// }
-// #endif
-
 /*
 OpenCV (same mode)
 */

src/conv1d/benchmarks.cpp

@@ -74,22 +74,6 @@ int main(int argc, char *argv[]) {
     fmt::println("Output: {}", fmt::join(output, ", "));
   }
 
-  {
-    std::vector<T> output(output_size_same, 0);
-    conv1d_KFR_fir<T>(input, kernel, output);
-    fmt::println("=== KFR (FIR convolve) ===");
-    fmt::println("Output: {}", fmt::join(output, ", "));
-  }
-
-  // #ifndef __APPLE__
-  //   {
-  //     std::vector<T> output(output_size_same, 0);
-  //     conv1d_kfr_oa<T>(input, kernel, output);
-  //     fmt::println("=== KFR (oa) ===");
-  //     fmt::println("Output: {}", fmt::join(output, ", "));
-  //   }
-  // #endif
-
   {
     std::vector<T> output(output_size_same, 0);
     conv1d_OpenCV<T>(input, kernel, output);
@@ -132,4 +116,4 @@ int main(int argc, char *argv[]) {
   return 0;
 }
 
-// NOLINTEND(*-magic-numbers)
+// NOLINTEND(*-magic-numbers)

src/conv1d/conv1d.hpp

@@ -40,8 +40,7 @@
       ]
     },
     "fftconv",
-    "openblas",
-    "kfr"
+    "openblas"
   ],
   "builtin-baseline": "4b6c50d962cc20aaa3ef457f8ba683b586263cfb"
 }