Removed some compile warnings when compiling sub-projects. Removed warnings related to unknown pragmas in case of compiling without OpenMP support. Fixed some test problems
This commit is contained in:
parent
31ead60469
commit
12d6826140
@ -75,6 +75,8 @@ endif()
|
|||||||
# ###################################### OpenMP related
|
# ###################################### OpenMP related
|
||||||
if(LASP_WITH_OPENMP)
|
if(LASP_WITH_OPENMP)
|
||||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
|
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
|
||||||
|
else()
|
||||||
|
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unknown-pragmas")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# ###################################### Compilation flags
|
# ###################################### Compilation flags
|
||||||
|
@ -15,6 +15,8 @@ if(LASP_HAS_ULDAQ)
|
|||||||
|
|
||||||
add_library(uldaq STATIC ${ULDAQ_FILES1} ${ULDAQ_FILES2}
|
add_library(uldaq STATIC ${ULDAQ_FILES1} ${ULDAQ_FILES2}
|
||||||
${ULDAQ_FILES3} ${ULDAQ_FILES4})
|
${ULDAQ_FILES3} ${ULDAQ_FILES4})
|
||||||
|
target_compile_options(uldaq PUBLIC -Wno-unused -Wno-empty-body
|
||||||
|
-Wno-missing-field-initializers)
|
||||||
|
|
||||||
if(NOT WIN32)
|
if(NOT WIN32)
|
||||||
# message("libUSB libs: ${libusb-1.0_LIBRARIES}")
|
# message("libUSB libs: ${libusb-1.0_LIBRARIES}")
|
||||||
|
@ -22,16 +22,41 @@ def test_aps1():
|
|||||||
aps = AvPowerSpectra(nfft, w, 50, -1)
|
aps = AvPowerSpectra(nfft, w, 50, -1)
|
||||||
|
|
||||||
sig = np.random.randn(int(fs*tend))
|
sig = np.random.randn(int(fs*tend))
|
||||||
# freq = 400
|
|
||||||
# omg = 2*np.pi*freq
|
|
||||||
# sig = np.cos(omg*t)
|
|
||||||
|
|
||||||
cps = aps.compute(sig)
|
cps = aps.compute(sig)
|
||||||
|
|
||||||
pow1 = np.sum(sig**2)/sig.size
|
pow1 = np.sum(sig**2)/sig.size
|
||||||
pow2 = np.sum((cps[:,0,0]).real)
|
pow2 = np.sum((cps[:,0,0]).real)
|
||||||
|
|
||||||
|
# Check for Parseval
|
||||||
assert np.isclose(pow2 - pow1,0, atol=1e-2)
|
assert np.isclose(pow2 - pow1,0, atol=1e-2)
|
||||||
|
|
||||||
|
def test_aps2():
|
||||||
|
"""
|
||||||
|
Test whether we are able to estimate a simple transfer function of a gain
|
||||||
|
of 2 between two channels
|
||||||
|
"""
|
||||||
|
|
||||||
|
nfft = 16384
|
||||||
|
fs = 48000
|
||||||
|
tend = 10
|
||||||
|
t = np.linspace(0, (tend*fs)//fs, int(fs*tend), endpoint=False)
|
||||||
|
|
||||||
|
# w = Window.WindowType.Hann
|
||||||
|
w = Window.WindowType.Rectangular
|
||||||
|
aps = AvPowerSpectra(nfft, w, 50, -1)
|
||||||
|
|
||||||
|
sig1 = np.random.randn(int(fs*tend))
|
||||||
|
sig2 = 2*sig1
|
||||||
|
|
||||||
|
sig = np.concatenate((sig1[None,:], sig2[None,:])).T
|
||||||
|
|
||||||
|
cps = aps.compute(sig)
|
||||||
|
|
||||||
|
H = cps[:,0,1]/cps[:,0,0]
|
||||||
|
|
||||||
|
# Check if transfer function is obtained
|
||||||
|
assert np.all(np.isclose(H,2))
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
test_aps1()
|
test_aps1()
|
||||||
|
@ -38,4 +38,4 @@ freq, H2 = welch(in_,
|
|||||||
plt.semilogx(freq,10*np.log10(np.abs(H1/H2)))
|
plt.semilogx(freq,10*np.log10(np.abs(H1/H2)))
|
||||||
|
|
||||||
omg, H_ex = sosfreqz(filt)
|
omg, H_ex = sosfreqz(filt)
|
||||||
plt.semilogx(omg/(2*np.pi)*fs, 20*np.log10(np.abs(H_ex)))
|
plt.semilogx(omg/(2*np.pi)*fs, 20*np.log10(np.abs(H_ex)+1e-80))
|
||||||
|
@ -82,7 +82,7 @@ def test_cppslm3():
|
|||||||
Lpeak
|
Lpeak
|
||||||
slm.Lpeak()
|
slm.Lpeak()
|
||||||
assert np.isclose(out[-1,0], slm.Leq()[0][0], atol=1e-2)
|
assert np.isclose(out[-1,0], slm.Leq()[0][0], atol=1e-2)
|
||||||
assert np.isclose(Lpeak, slm.Lpeak()[0][0], atol=1e0)
|
assert np.isclose(Lpeak, slm.Lpeak()[0][0], atol=2e0)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user