kfr

Fast, modern C++ DSP framework, FFT, Sample Rate Conversion, FIR/IIR/Biquad Filters (SSE, AVX, AVX-512, ARM NEON)
Log | Files | Refs | README

commit 250a3ac4d769e0404c3f6558bc66807eed034c95
parent 666320a28dc73b9b7d540dc1d02482b982101160
Author: d.levin256@gmail.com <d.levin256@gmail.com>
Date:   Sat, 12 Nov 2022 23:20:16 +0000

Enable VS2022 CI

Diffstat:
Mazure-pipelines.yml | 28++++++++++++++--------------
Minclude/kfr/cident.h | 4++++
Mtests/CMakeLists.txt | 37++++++++++++++++++-------------------
3 files changed, 36 insertions(+), 33 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml @@ -361,18 +361,18 @@ jobs: # set PATH=C:\sde;%PATH% # ci\run.cmd build-release -DKFR_ARCH_TESTS=OFF -DKFR_USE_SDE=ON -DKFR_ARCH=avx512 -DKFR_ENABLE_DFT=OFF -DCMAKE_BUILD_TYPE=Release -# - job: Windows_MSVC2022_x86_64_Release -# timeoutInMinutes: 180 -# pool: -# vmImage: 'windows-2022' -# steps: -# - script: | -# choco uninstall mingw -# choco install ninja +- job: Windows_MSVC2022_x86_64_Release + timeoutInMinutes: 180 + pool: + vmImage: 'windows-2022' + steps: + - script: | + choco uninstall mingw + choco install ninja -# call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat" -# set PATH=%PATH:C:\tools\mingw64\bin;=% -# set PATH=%PATH:C:\Program Files\Git\mingw64\bin;=% -# set PATH=%PATH:C:\Program Files\LLVM\bin;=% -# set PATH=%PATH:C:\Strawberry\c\bin;=% -# ci\run.cmd build-release -DKFR_ARCH_TESTS=OFF -DKFR_ARCH=detect -DKFR_ENABLE_DFT=OFF -DCMAKE_BUILD_TYPE=Release + call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat" + set PATH=%PATH:C:\tools\mingw64\bin;=% + set PATH=%PATH:C:\Program Files\Git\mingw64\bin;=% + set PATH=%PATH:C:\Program Files\LLVM\bin;=% + set PATH=%PATH:C:\Strawberry\c\bin;=% + ci\run.cmd build-release -DKFR_ARCH_TESTS=sse2,sse42,avx,avx2,avx512 -DKFR_ARCH=sse2 -DKFR_ENABLE_DFT=OFF -DCMAKE_BUILD_TYPE=Release diff --git a/include/kfr/cident.h b/include/kfr/cident.h @@ -344,6 +344,10 @@ extern char* gets(char* __s); #endif #endif +#if defined _MSC_VER && !defined(__clang__) && !defined(CMT_FORCE_INLINE_MSVC) +#define CMT_NO_FORCE_INLINE 1 +#endif + #if defined(CMT_COMPILER_INTEL) || defined(CMT_COMPILER_CLANG) #ifdef CMT_COMPILER_IS_MSVC #undef CMT_COMPILER_IS_MSVC diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt @@ -113,25 +113,24 @@ if (KFR_ENABLE_DFT) add_executable(dft_test dft_test.cpp) endif () -find_package(MPFR) -find_package(GMP) - -if (MPFR_FOUND - AND GMP_FOUND - AND KFR_REGENERATE_TESTS) - message(STATUS "MPFR is found") - add_executable(generate_data generate_data.cpp) - target_link_libraries(generate_data kfr) - target_include_directories(generate_data PRIVATE ${MPFR_INCLUDE_DIR} - ${GMP_INCLUDE_DIR}) - target_link_libraries(generate_data ${MPFR_LIBRARIES} ${GMP_LIBRARIES}) - if (KFR_REGENERATE_TESTS) - add_custom_command( - TARGET generate_data - POST_BUILD - COMMENT "Generating tests..." - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests/data - COMMAND generate_data) +if (KFR_REGENERATE_TESTS) + find_package(MPFR) + find_package(GMP) + + if (MPFR_FOUND AND GMP_FOUND) + add_executable(generate_data generate_data.cpp) + target_link_libraries(generate_data kfr) + target_include_directories(generate_data PRIVATE ${MPFR_INCLUDE_DIR} + ${GMP_INCLUDE_DIR}) + target_link_libraries(generate_data ${MPFR_LIBRARIES} ${GMP_LIBRARIES}) + if (KFR_REGENERATE_TESTS) + add_custom_command( + TARGET generate_data + POST_BUILD + COMMENT "Generating tests..." + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests/data + COMMAND generate_data) + endif () endif () endif ()