diff --git a/.drone.yml b/.drone.yml index 3af0bcf..bd5bf79 100644 --- a/.drone.yml +++ b/.drone.yml @@ -16,6 +16,7 @@ steps: - mkdir build && cd build - cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS_RELEASE="-march=native" -DCMAKE_C_FLAGS_RELEASE="-march=native" -DCMAKE_INSTALL_PREFIX="/usr" - make -j$(nproc) + - ./test ../test.raw - make install --- kind: pipeline @@ -37,5 +38,6 @@ steps: - mkdir build && cd build - cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS_RELEASE="-march=native" -DCMAKE_C_FLAGS_RELEASE="-march=native" -DCMAKE_INSTALL_PREFIX="/usr" - make -j$(nproc) + - ./test ../test.raw - make install ... \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index 8bf4b65..09ea174 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,18 +19,18 @@ if(NOT CMAKE_BUILD_TYPE) set(CMAKE_BUILD_TYPE Release) endif() -set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -ggdb -O0 -fno-exceptions -fno-rtti") +set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -ggdb -O0 -fno-exceptions") set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -ggdb -O0 -fno-exceptions") if(EMSCRIPTEN) - set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DNDEBUG -O3 -ffast-math -fno-exceptions -fno-rtti") + set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DNDEBUG -O3 -ffast-math -fno-exceptions") set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -DNDEBUG -O3 -ffast-math -fno-exceptions") - set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -DNDEBUG -O3 -ffast-math -fno-exceptions -fno-rtti") + set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -DNDEBUG -O3 -ffast-math -fno-exceptions") set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -DNDEBUG -O3 -ffast-math -fno-exceptions") else() - set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DNDEBUG -Ofast -fno-exceptions -fno-rtti") + set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DNDEBUG -Ofast -fno-exceptions") set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -DNDEBUG -Ofast -fno-exceptions") - set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -DNDEBUG -Ofast -fno-exceptions -fno-rtti") + set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -DNDEBUG -Ofast -fno-exceptions") set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -DNDEBUG -Ofast -fno-exceptions") if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang") diff --git a/cgaborator.cpp b/cgaborator.cpp index ab6f342..f1674b1 100644 --- a/cgaborator.cpp +++ b/cgaborator.cpp @@ -157,7 +157,9 @@ private: gaborator::apply_to_slice(false, [&](int band, int64_t sampleIndex, int time_step, unsigned len, const std::complex *p0) { //process magnitudes beforehand for easier auto-vectorization - magnitudeCache.resize(len); + if(magnitudeCache.size() < len){ + magnitudeCache.resize(len); + } #ifdef __AVX2__ diff --git a/lib/gaborator b/lib/gaborator index 7442d68..f86f6d2 160000 --- a/lib/gaborator +++ b/lib/gaborator @@ -1 +1 @@ -Subproject commit 7442d68a0cd2c5a908ba8055e055f0fbf9c36e28 +Subproject commit f86f6d213a26ddc0b1f4bd99ddf77b338b221ecc diff --git a/test.cpp b/test.cpp index de1bfba..1a552c3 100644 --- a/test.cpp +++ b/test.cpp @@ -3,9 +3,12 @@ #define BLOCK_SIZE 8192 -int main() { +int main(int argc, char *argv[]) { + if (argc < 2) { + return 1; + } - auto fp = fopen("test.raw", "r"); + auto fp = fopen(argv[1], "r"); if (fp == nullptr){ return 1;