ASCEE/lasp
ASCEE/lasp
5
1
Fork 0
Code Issues 5 Pull Requests Actions Releases 14 Activity

Added Armadillo backend for Fft's. This one seems to work properly. Added some tests code for daq and StreamMgr in C++. Fixed a stray of a debug dmat somewhere in lasp_daqdata.

Browse Source
This commit is contained in:
Anne de Jong 2022-10-12 15:02:42 +02:00
parent 0d6d72fb35
commit ec689621b5
7 changed files with 199 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@ -8,9 +8,10 @@ set(CMAKE_CXX_STANDARD_REQUIRED)
option(LASP_DOUBLE_PRECISION "Compile as double precision floating point" ON)
option(LASP_HAS_RTAUDIO "Compile with RtAudio Daq backend" ON)
option(LASP_HAS_ULDAQ "Compile with UlDaq backend" ON)
option(LASP_BUILD_TUNED "Tune build for current machine" OFF)
option(LASP_WITH_OPENMP "Use OpenMP parallelization" ON)
option(LASP_BUILD_TUNED "Tune build for current machine (Experimental / untested)" OFF)
option(LASP_WITH_OPENMP "Use OpenMP parallelization (Experimental: crashes SHOULD BE EXPECTED)" OFF)
set(LASP_MAX_NFFT "33554432" CACHE STRING "Max FFT size")
option(LASP_BUILD_CPP_TESTS "Build CPP test code" OFF)
# Use ccache if available
find_program(CCACHE_PROGRAM ccache)
@ -100,4 +101,7 @@ include(rtaudio)
include(uldaq)
#
add_subdirectory(src/lasp)
if(LASP_BUILD_CPP_TESTS)
add_subdirectory(test)
endif()

2
src/lasp/CMakeLists.txt
View File

@ -6,7 +6,7 @@ add_definitions(-DARMA_DONT_USE_WRAPPER)
configure_file(lasp_config.h.in lasp_config.h)
include_directories(${CMAKE_CURRENT_BINARY_DIR})
include_directories(SYSTEM
../../third_party/armadillo-code/include)
${PROJECT_SOURCE_DIR}/third_party/armadillo-code/include)
include_directories(../../third_party/DebugTrace-cpp/include)
include_directories(../../third_party/gsl-lite/include)

5
src/lasp/device/lasp_daqdata.cpp
View File

@ -64,17 +64,18 @@ void DaqData::copyInFromRaw(const std::vector<byte_t *> &ptrs) {
/* std::copy(ptr, ptr + sw * nframes, &_data[sw * ch * nframes]); */
ch++;
}
dmat data2(nframes, nchannels);
}
void DaqData::copyToRaw(const us channel, byte_t *ptr) {
/* std::copy(raw_ptr(0, channel), raw_ptr(nframes, channel), ptr); */
assert(channel<nchannels);
assert(ptr);
memcpy(ptr, raw_ptr(0, channel), sw*nframes);
}
template <typename T>
d DaqData::toFloat(const us frame, const us channel) const {
DEBUGTRACE_ENTER;
/* DEBUGTRACE_ENTER; */
if constexpr (std::is_integral<T>::value) {
return static_cast<d>(value<T>(frame, channel)) /
std::numeric_limits<T>::max();

157
src/lasp/dsp/lasp_fft.cpp
View File

@ -1,34 +1,30 @@
// lasp_fft.c
//
// Author: J.A. de Jong - ASCEE
//
// Description:
// FFt implementation
//
//////////////////////////////////////////////////////////////////////
/* #define DEBUGTRACE_ENABLED */
#include <memory>
#include <cassert>
/* #define DEBUGTRACE_ENABLED */
#include "lasp_fft.h"
#include "debugtrace.hpp"
#include "lasp_config.h"
#include "lasp_fft.h"
using rte = std::runtime_error;
#if LASP_FFT_BACKEND == Armadillo
#include "fftpack.h"
class Fft_impl {
public:
us nfft;
Fft_impl(const us nfft) : nfft(nfft) {
throw runtime_error(
"This code does not output correct results, as it computes the full "
"FFT. It needs to be reworked to single-sided spectra.");
public:
us nfft;
Fft_impl(const us nfft) : nfft(nfft) { DEBUGTRACE_ENTER; }
DEBUGTRACE_ENTER;
}
vd ifft(const vc &f) { return arma::ifft(f); }
vc fft(const vd &time) { return arma::fft(time); }
vc fft(const vd &time) {
DEBUGTRACE_ENTER;
vc res = arma::fft(time);
return res.rows(0, nfft / 2);
}
vd ifft(const vc &f) {
DEBUGTRACE_ENTER;
vc f_full(nfft);
vc f_above_nyq = arma::conj(arma::reverse(f));
f_full.rows(0, nfft / 2) = f;
f_full.rows(nfft / 2, nfft - 1) = f_above_nyq.rows(0, nfft/2-1);
return arma::real(arma::ifft(f_full));
}
};
#elif LASP_FFT_BACKEND == FFTW
#include <fftw3.h>
@ -37,77 +33,76 @@ class Fft_impl {
* @brief FFTW implementation
*/
class Fft_impl {
public:
us nfft;
fftw_plan forward_plan = nullptr;
fftw_plan reverse_plan = nullptr;
fftw_complex *frequencyDomain = nullptr;
d *timeDomain = nullptr;
public:
us nfft;
fftw_plan forward_plan = nullptr;
fftw_plan reverse_plan = nullptr;
fftw_complex *frequencyDomain = nullptr;
d *timeDomain = nullptr;
Fft_impl(const us nfft) : nfft(nfft) {
Fft_impl(const us nfft) : nfft(nfft) {
timeDomain = (d *)fftw_malloc(sizeof(d) * nfft);
timeDomain = (d *)fftw_malloc(sizeof(d) * nfft);
frequencyDomain =
frequencyDomain =
(fftw_complex *)fftw_malloc(sizeof(fftw_complex) * (nfft / 2 + 1));
forward_plan =
forward_plan =
fftw_plan_dft_r2c_1d(nfft, timeDomain, frequencyDomain, FFTW_MEASURE);
reverse_plan =
reverse_plan =
fftw_plan_dft_c2r_1d(nfft, frequencyDomain, timeDomain, FFTW_MEASURE);
if(!forward_plan || !reverse_plan || !timeDomain || !frequencyDomain) {
throw rte("Error allocating FFT");
}
if (!forward_plan || !reverse_plan || !timeDomain || !frequencyDomain) {
throw rte("Error allocating FFT");
}
};
};
~Fft_impl() {
fftw_destroy_plan(forward_plan);
fftw_destroy_plan(reverse_plan);
fftw_free(frequencyDomain);
fftw_free(timeDomain);
}
~Fft_impl() {
fftw_destroy_plan(forward_plan);
fftw_destroy_plan(reverse_plan);
fftw_free(frequencyDomain);
fftw_free(timeDomain);
vc fft(const vd &time) {
if (time.n_rows != nfft) {
throw rte("Invalid size of input vector, should be equal to nfft");
}
vc fft(const vd &time) {
if(time.n_rows != nfft) {
throw rte("Invalid size of input vector, should be equal to nfft");
}
vc res(nfft / 2 + 1);
memcpy(timeDomain, time.memptr(), sizeof(d) * nfft);
vc res(nfft / 2 + 1);
memcpy(timeDomain, time.memptr(), sizeof(d) * nfft);
fftw_execute(forward_plan);
fftw_execute(forward_plan);
memcpy(reinterpret_cast<void *>(res.memptr()), frequencyDomain,
sizeof(c) * (nfft / 2 + 1));
memcpy(reinterpret_cast<void *>(res.memptr()), frequencyDomain,
sizeof(c) * (nfft / 2 + 1));
return res;
return res;
}
vd ifft(const vc &f) {
DEBUGTRACE_ENTER;
if (f.n_rows != nfft / 2 + 1) {
throw rte("Invalid size of input vector, should be equal to nfft/2+1");
}
vd ifft(const vc &f) {
DEBUGTRACE_ENTER;
if(f.n_rows != nfft/2+1) {
throw rte("Invalid size of input vector, should be equal to nfft/2+1");
}
memcpy(frequencyDomain,
reinterpret_cast<void *>(const_cast<c *>(f.memptr())),
(nfft / 2 + 1) * sizeof(c));
memcpy(frequencyDomain,
reinterpret_cast<void *>(const_cast<c *>(f.memptr())),
(nfft / 2 + 1) * sizeof(c));
fftw_execute(reverse_plan);
fftw_execute(reverse_plan);
vd res(nfft);
memcpy(res.memptr(), timeDomain, nfft * sizeof(d));
vd res(nfft);
memcpy(res.memptr(), timeDomain, nfft * sizeof(d));
/* Scale by dividing by nfft. Checked with numpy implementation
* that this indeed needs to be done for FFTW. */
res *= 1.0 / nfft;
/* Scale by dividing by nfft. Checked with numpy implementation
* that this indeed needs to be done for FFTW. */
res *= 1.0 / nfft;
return res;
}
return res;
}
};
#else
#error \
"Cannot compile lasp_ffc.c, no FFT backend specified. Should either be FFTPack, or FFTW"
"Cannot compile lasp_ffc.c, no FFT backend specified. Should either be FFTPack, or FFTW"
#endif
Fft::Fft(const us nfft) {
@ -117,20 +112,26 @@ Fft::Fft(const us nfft) {
}
if (nfft >= LASP_MAX_NFFT) {
throw rte("Invalid nfft, should be smaller than: " +
std::to_string(LASP_MAX_NFFT));
std::to_string(LASP_MAX_NFFT));
}
_impl = std::make_unique<Fft_impl>(nfft);
}
Fft::~Fft() { }
Fft::~Fft() {}
us Fft::nfft() const { assert(_impl); return _impl->nfft; }
us Fft::nfft() const {
assert(_impl);
return _impl->nfft;
}
vc Fft::fft(const vd &timedata) { assert(_impl); return _impl->fft(timedata); }
vc Fft::fft(const vd &timedata) {
assert(_impl);
return _impl->fft(timedata);
}
cmat Fft::fft(const dmat &freqdata) {
DEBUGTRACE_ENTER;
assert(_impl);
cmat res(_impl->nfft/2+1, freqdata.n_cols);
cmat res(_impl->nfft / 2 + 1, freqdata.n_cols);
/// * WARNING *. This was source of a serious bug. It is not possible to run
/// FFT's and IFFT's on the same _impl, as it overwrites the same memory.
/// Uncommenting the line below results in faulty results.
@ -159,7 +160,7 @@ dmat Fft::ifft(const cmat &freqdata) {
return res;
}
void Fft::load_fft_wisdom(const std::string& wisdom) {
void Fft::load_fft_wisdom(const std::string &wisdom) {
#if LASP_FFT_BACKEND == Armadillo
#elif LASP_FFT_BACKEND == FFTW
if (wisdom.length() > 0) {
@ -179,8 +180,8 @@ std::string Fft::store_fft_wisdom() {
// put it in this container by copying in. Not a good solution if this has to
// happen often.
// Fortunately, this function is only called at the end of the program.
char* wis = fftw_export_wisdom_to_string();
std::string res {wis};
char *wis = fftw_export_wisdom_to_string();
std::string res{wis};
free(wis);
return res;
#endif

25
test/CMakeLists.txt
View File

@ -1,17 +1,8 @@
include_directories(${CMAKE_SOURCE_DIR}/lasp/c)
include_directories(${CMAKE_SOURCE_DIR}/lasp/device)
# add_executable(test_bf test_bf.c)
# add_executable(test_workers test_workers.c)
# add_executable(test_fft test_fft.c)
# add_executable(test_math test_math.c)
# target_link_libraries(test_bf lasp_lib ${LASP_THREADING_LIBRARIES})
# target_link_libraries(test_fft lasp_lib ${LASP_THREADING_LIBRARIES})
# target_link_libraries(test_workers lasp_lib ${LASP_THREADING_LIBRARIES})
# target_link_libraries(test_math lasp_lib ${LASP_THREADING_LIBRARIES})
if(LASP_ULDAQ)
add_executable(test_uldaq test_uldaq.cpp)
target_link_libraries(test_uldaq cpp_daq)
endif(LASP_ULDAQ)
include_directories(SYSTEM
${PROJECT_SOURCE_DIR}/third_party/armadillo-code/include)
add_executable(test_daq test_daq.cpp)
add_executable(test_smgr test_smgr.cpp)
include_directories(../src/lasp/device ../src/lasp/dsp ../src/lasp)
include_directories(../third_party/gsl-lite/include)
target_link_libraries(test_daq lasp_device_lib lasp_dsp_lib)
target_link_libraries(test_smgr lasp_device_lib lasp_dsp_lib)

48
test/test_daq.cpp Normal file
View File

@ -0,0 +1,48 @@
#include "lasp_daq.h"
#include "lasp_deviceinfo.h"
#include <memory>
#include <vector>
using namespace std;
bool inCallback(const DaqData& d) {
d.toFloat();
return true;
}
int main(int argc, const char **const argv) {
std::vector<DeviceInfo> devs = DeviceInfo::getDeviceInfo();
DeviceInfo *mon_device = nullptr;
for (auto &d : devs) {
string name_lower = d.device_name;
transform(name_lower.begin(), name_lower.end(), name_lower.begin(),
::tolower);
if (name_lower.find("monitor") != string::npos) {
mon_device = &d;
}
}
if (!mon_device) {
cerr << "Could not find monitor device\n";
exit(1);
}
DaqConfiguration config(*mon_device);
config.inchannel_config[0].enabled = true;
config.inchannel_config[1].enabled = true;
unique_ptr<Daq> daq = Daq::createDaq(*mon_device, config);
InDaqCallback icb = inCallback;
OutDaqCallback ocb;
daq->start(icb, ocb);
cout << "Press <enter> to stop" << endl;
cin.get();
return 0;
}

52
test/test_smgr.cpp Normal file
View File

@ -0,0 +1,52 @@
#include "lasp_daq.h"
#include "lasp_deviceinfo.h"
#include "lasp_streammgr.h"
#include "lasp_ppm.h"
#include <memory>
#include <vector>
using namespace std;
bool inCallback(const DaqData& d) {
d.toFloat();
return true;
}
int main(int argc, const char **const argv) {
StreamMgr& mgr = StreamMgr::getInstance();
std::vector<DeviceInfo> devs = mgr.getDeviceInfo();
DeviceInfo *mon_device = nullptr;
for (auto &d : devs) {
string name_lower = d.device_name;
transform(name_lower.begin(), name_lower.end(), name_lower.begin(),
::tolower);
if (name_lower.find("monitor") != string::npos) {
mon_device = &d;
}
}
if (!mon_device) {
cerr << "Could not find monitor device\n";
exit(1);
}
cout << "Found device. Name: " << mon_device->device_name << endl;
DaqConfiguration config(*mon_device);
config.inchannel_config.at(0).enabled = true;
config.inchannel_config.at(1).enabled = true;
mgr.startStream(config);
PPMHandler ppm(mgr);
ppm.start();
cout << "Press <enter> to stop" << endl;
cin.get();
return 0;
}