From 84773374c110ce2a87ef448911e43cb60a494685 Mon Sep 17 00:00:00 2001 From: Erik Garrison Date: Sat, 1 Jun 2024 11:05:02 -0500 Subject: [PATCH] correct debugging build with png and tsv --- .github/workflows/test_on_push.yml | 2 +- CMakeLists.txt | 4 ++-- src/common/wflign/CMakeLists.txt | 2 +- src/common/wflign/src/wflign.hpp | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test_on_push.yml b/.github/workflows/test_on_push.yml index e91b640c..72645261 100644 --- a/.github/workflows/test_on_push.yml +++ b/.github/workflows/test_on_push.yml @@ -35,7 +35,7 @@ jobs: - name: Init and update submodules run: git submodule update --init --recursive - name: Build wfmash - run: cmake -H. -Bbuild -D CMAKE_BUILD_TYPE=Debug -DWFA_PNG_TSV_TIMING=ON && cmake --build build -- -j 2 + run: cmake -H. -Bbuild -D CMAKE_BUILD_TYPE=Debug -DWFA_PNG_AND_TSV=ON && cmake --build build -- -j 2 - name: Test mapping coverage with 8 yeast genomes (PAF output) run: ASAN_OPTIONS=detect_leaks=1:symbolize=1 LSAN_OPTIONS=verbosity=0:log_threads=1 build/bin/wfmash data/scerevisiae8.fa.gz -p 95 -n 7 -m -L -Y '#' > scerevisiae8.paf; scripts/test.sh data/scerevisiae8.fa.gz.fai scerevisiae8.paf 0.92 - name: Test mapping+alignment with a subset of the LPA dataset (PAF output) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4c579a96..c155913b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -53,8 +53,8 @@ else() endif () if(WFA_PNG_AND_TSV) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DWFA_PNG_AND_TSV") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DWFA_PNG_AND_TSV") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DWFA_PNG_TSV_TIMING") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DWFA_PNG_TSV_TIMING") endif () set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) diff --git a/src/common/wflign/CMakeLists.txt b/src/common/wflign/CMakeLists.txt index 5341543b..92f62ad1 100644 --- a/src/common/wflign/CMakeLists.txt +++ b/src/common/wflign/CMakeLists.txt @@ -35,7 +35,7 @@ else() set (CMAKE_CXX_FLAGS "${OpenMP_CXX_FLAGS} ${PIC_FLAG} ${EXTRA_FLAGS}") endif () -if(WFA_PNG_TSV_TIMING) +if(WFA_PNG_AND_TSV) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DWFA_PNG_TSV_TIMING") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DWFA_PNG_TSV_TIMING") endif () diff --git a/src/common/wflign/src/wflign.hpp b/src/common/wflign/src/wflign.hpp index b0d1a680..5cb4149c 100644 --- a/src/common/wflign/src/wflign.hpp +++ b/src/common/wflign/src/wflign.hpp @@ -190,4 +190,4 @@ typedef struct { #endif } wflign_extend_data_t; -#endif /* WFLIGN_HPP_ */ \ No newline at end of file +#endif /* WFLIGN_HPP_ */