Merge branch 'develop' of ssh://code.ascee.nl:12001/ASCEE/lasp into develop

This commit is contained in:
Anne de Jong 2021-05-24 16:08:17 +02:00
commit f76c89a688
2 changed files with 20 additions and 7 deletions

View File

@ -39,10 +39,11 @@ add_definitions(-DLASP_MAX_NUM_CHANNELS=80)
add_definitions(-DLASP_MAX_NFFT=33554432) # 2**25 add_definitions(-DLASP_MAX_NFFT=33554432) # 2**25
# ####################################### End of user-adjustable variables section # ####################################### End of user-adjustable variables section
set(CMAKE_CXX_STANDARD 11)
set(CMAKE_C_STANDARD 11)
# ############### Choose an fft backend here # ############### Choose an fft backend here
if(LASP_FFTW_BACKEND AND LASP_FFTPACK_BACKEND) if(((LASP_FFTW_BACKEND AND LASP_FFTPACK_BACKEND) OR ((NOT (LASP_FFTPACK_BACKEND) AND (NOT LASP_FFTW_BACKEND)))))
message(FATAL_ERROR "Either FFTW or Fftpack backend should be chosen. Please disable one of them") message(FATAL_ERROR "Either FFTW or Fftpack backend should be chosen. Please disable one of them")
endif() endif()
@ -61,6 +62,7 @@ if(LASP_FLOAT STREQUAL "double")
add_definitions(-DLASP_FLOAT=64) add_definitions(-DLASP_FLOAT=64)
add_definitions(-DLASP_DOUBLE_PRECISION) add_definitions(-DLASP_DOUBLE_PRECISION)
else() else()
# TODO: This has not been tested for a long time.
add_definitions(-DLASP_FLOAT=32) add_definitions(-DLASP_FLOAT=32)
add_definitions(-DLASP_SINGLE_PRECISION) add_definitions(-DLASP_SINGLE_PRECISION)
endif(LASP_FLOAT STREQUAL "double") endif(LASP_FLOAT STREQUAL "double")
@ -78,19 +80,22 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11 -Wall -Wextra -Wno-type-limits \
if(CMAKE_SYSTEM_NAME STREQUAL "Windows") if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
set(win32 true) set(win32 true)
set(home $ENV{USERPROFILE})
# set(miniconda_dir ${home}\\Miniconda3)
message("Building for Windows") message("Building for Windows")
include_directories( include_directories(
..\\rtaudio ..\\rtaudio
C:\\mingw\\mingw64\\include\\OpenBLAS C:\\mingw\\mingw64\\include\\OpenBLAS
link_directories(C:\\Users\\User\\miniconda3\\Library\\include) link_directories(${home}\\miniconda3\\Library\\include)
) )
set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH} $miniconda_dir\\Lib\\cmake")
# include(
add_definitions(-DMS_WIN64) add_definitions(-DMS_WIN64)
link_directories(C:\\mingw\\mingw64\\lib) link_directories(C:\\mingw\\mingw64\\lib)
LINK_DIRECTORIES(C:\\Users\\User\\miniconda3)
link_directories(C:\\mingw\\mingw64\\bin)
link_directories(C:\\mingw\\mingw64\\bin) link_directories(C:\\mingw\\mingw64\\bin)
link_directories(..\\rtaudio) link_directories(..\\rtaudio)
link_directories(C:\\Users\\User\\Miniconda3) link_directories(${home}\\Miniconda3)
add_definitions(-DHAS_RTAUDIO_WIN_WASAPI_API) add_definitions(-DHAS_RTAUDIO_WIN_WASAPI_API)
else() # Linux compile else() # Linux compile
set(win32 false) set(win32 false)
@ -141,7 +146,7 @@ set(CYTHON_EXTRA_C_FLAGS "-Wno-sign-compare -Wno-cpp -Wno-implicit-fallthrough -
set(CYTHON_EXTRA_CXX_FLAGS "-Wno-sign-compare -Wno-cpp -Wno-implicit-fallthrough -Wno-strict-aliasing") set(CYTHON_EXTRA_CXX_FLAGS "-Wno-sign-compare -Wno-cpp -Wno-implicit-fallthrough -Wno-strict-aliasing")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -Wextra \ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra \
-Wno-type-limits") -Wno-type-limits")
# Debug make flags # Debug make flags

View File

@ -62,6 +62,14 @@ compilation:
- libopenblas-base - libopenblas-base
- libopenblas-dev - libopenblas-dev
#### Windows specific
Tested using a Anacond / Miniconda Python environment. Please first run the following command:
`conda install fftw`
in case you want the *FFTW* fft backend.
### Dependencies ### Dependencies
#### Ubuntu / Linux Mint #### Ubuntu / Linux Mint