Merge branch 'master' into develop

This commit is contained in:
Anne de Jong 2021-10-23 14:27:41 +02:00
commit c016636add
2 changed files with 3 additions and 1 deletions

View File

@ -37,6 +37,8 @@ else()
endif() endif()
if(LASP_USE_BLAS) if(LASP_USE_BLAS)
# link openblas
set(BLA_VENDOR OpenBLAS)
find_package(BLAS REQUIRED) find_package(BLAS REQUIRED)
endif() endif()

View File

@ -215,7 +215,7 @@ void Fft_fft_single(const Fft* fft,const vd* timedata,vc* result) {
/* For an even fft, the imaginary part of the Nyquist frequency /* For an even fft, the imaginary part of the Nyquist frequency
* bin equals zero.*/ * bin equals zero.*/
if(likely(nfft%2 == 0)) { if(islikely(nfft%2 == 0)) {
result_ptr[nfft+1] = 0; result_ptr[nfft+1] = 0;
} }
check_overflow_vx(fft->fft_work); check_overflow_vx(fft->fft_work);