Commit e0903e43 authored by Rahman's avatar Rahman

disabling matplotlib-cpp and sse and avx uses in CMakeList.txt

parent 680f42e1
......@@ -17,10 +17,12 @@
#include "include/Radio.h"
#include "include/comms-lib.h"
#include "include/macros.h"
#include "include/matplotlibcpp.h"
#include "include/utils.h"
#ifdef MATPLOTLIB
#include "include/matplotlibcpp.h"
namespace plt = matplotlibcpp;
#endif
static std::vector<std::complex<float>> snoopSamples(SoapySDR::Device* dev, size_t channel, size_t readSize)
{
......@@ -169,6 +171,7 @@ static void adjustCalibrationGains(std::vector<SoapySDR::Device*> rxDevs, SoapyS
}
toneLevels[r] = toneLevel;
cout << "Node " << r << ": toneLevel3=" << toneLevel << endl;
#ifdef MATPLOTLIB
if (plot) {
auto fftMag = CommsLib::magnitudeFFT(samps, win, N);
std::vector<double> magDouble(N);
......@@ -191,6 +194,7 @@ static void adjustCalibrationGains(std::vector<SoapySDR::Device*> rxDevs, SoapyS
plt::legend();
plt::save("rx" + std::to_string(rxDevsSize) + "_" + std::to_string(r) + "_ch" + std::to_string(channel) + ".png");
}
#endif
}
std::cout << rxDevsSize - remainingRadios << " radios reached target level" << std::endl;
......
......@@ -2,9 +2,9 @@ cmake_minimum_required (VERSION 2.8)
project (Sounder)
set(CMAKE_C_FLAGS "-std=c99 -Wall")
set(CMAKE_CXX_FLAGS "-std=c++11 -Wall -O3 -mavx2 -mavx")
set(CMAKE_CXX_FLAGS "-std=c++11 -Wall -O3")
find_package(nlohmann_json 3.2.0 REQUIRED)
#find_package(nlohmann_json 3.2.0 REQUIRED)
find_package(PythonLibs REQUIRED)
########################################################################
......@@ -36,5 +36,5 @@ message(STATUS "HDF5_LIBRARIES: ${HDF5_LIBRARIES}")
include_directories(${SoapySDR_INCLUDE_DIRS} ${HDF5_INCLUDE_DIRS} ${PYTHON_INCLUDE_DIRS})
add_executable(sounder main.cc ClientRadioSet.cc config.cc Radio.cc receiver.cc recorder.cc BaseRadioSet.cc BaseRadioSet-calibrate.cc comms-lib.cc utils.cc signalHandler.cpp)
target_link_libraries(sounder -lpthread -lhdf5_cpp --enable-threadsafe ${SoapySDR_LIBRARIES} ${HDF5_LIBRARIES} ${CMAKE_SOURCE_DIR}/mufft/libmuFFT.a ${CMAKE_SOURCE_DIR}/mufft/libmuFFT-sse.a ${CMAKE_SOURCE_DIR}/mufft/libmuFFT-sse3.a ${CMAKE_SOURCE_DIR}/mufft/libmuFFT-avx.a ${PYTHON_LIBRARIES})
target_link_libraries(sounder -lpthread -lhdf5_cpp --enable-threadsafe ${SoapySDR_LIBRARIES} ${HDF5_LIBRARIES} ${CMAKE_SOURCE_DIR}/mufft/libmuFFT.a)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment