From 867f53a49e0f40f1e6ef2be167ca2a215a1d226c Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Mon, 4 Jan 2021 12:13:45 +0100 Subject: [PATCH 01/10] Update Pugixml local version to 1.11.4 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f16d77bf3..4169a2a7f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -327,7 +327,7 @@ set(GNSSSDR_GTEST_LOCAL_VERSION "1.10.0") set(GNSSSDR_GNSS_SIM_LOCAL_VERSION "master") set(GNSSSDR_GPSTK_LOCAL_VERSION "8.0.0") set(GNSSSDR_MATIO_LOCAL_VERSION "1.5.19") -set(GNSSSDR_PUGIXML_LOCAL_VERSION "1.11.2") +set(GNSSSDR_PUGIXML_LOCAL_VERSION "1.11.4") set(GNSSSDR_PROTOCOLBUFFERS_LOCAL_VERSION "3.14.0") set(GNSSSDR_BENCHMARK_LOCAL_VERSION "1.5.2") set(GNSSSDR_MATHJAX_EXTERNAL_VERSION "2.7.7") From cbdb2ad2e92958094972ae976b2829cdeb6f1844 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Mon, 4 Jan 2021 13:55:18 +0100 Subject: [PATCH 02/10] Enforce consistent function prototypes --- .../volk_gnsssdr/CMakeLists.txt | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/CMakeLists.txt b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/CMakeLists.txt index 3df149278..5b69ce569 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/CMakeLists.txt +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/CMakeLists.txt @@ -151,6 +151,10 @@ if(NOT ((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") AND NOT WIN32) AND NOT (CMAKE_CXX endif() endif() +######################################################################## +# Common compile flags +######################################################################## + # Disable complex math NaN/INFO range checking for performance include(CheckCXXCompilerFlag) check_cxx_compiler_flag(-fcx-limited-range HAVE_CX_LIMITED_RANGE) @@ -167,6 +171,19 @@ endif() set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${MY_CXX_FLAGS} -Wall") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall") +if(CMAKE_C_COMPILER_ID MATCHES "Clang|GNU") + # Abort compilation if kernel implementations have inconsistent function + # prototypes, i.e. if + # + # kernel_foo_sse(uint32_t *dst, lv32fc_t *src) + # kernel_foo_avx(uint16_t *dst, lv32fc_t *src) + # + # are defined. Note the different data type of the first argument). By + # default 'incompatible-pointer-types' is a warning only and 'pointer-sign' + # is a warning enabled by '-Wall'. These warnings are only applicable to C. + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror=incompatible-pointer-types -Werror=pointer-sign") +endif() + option(ENABLE_STRIP "Create a stripped volk_gnsssdr_profile binary (without debugging symbols)" OFF) if(ENABLE_STRIP) set(CMAKE_VERBOSE_MAKEFILE ON) From 68fdedb22441ca509fca3b11a932421037ceec85 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Mon, 4 Jan 2021 14:07:56 +0100 Subject: [PATCH 03/10] Remove _mm256_zeroupper() calls Manual usage of _mm256_zeroupper() is not required and leads to miscompilation with GCC 10.2 and optimization level -O3 --- .../volk_gnsssdr/volk_gnsssdr_16i_xn_resampler_16i_xn.h | 4 ++-- .../volk_gnsssdr_16ic_16i_rotator_dot_prod_16ic_xn.h | 2 -- .../kernels/volk_gnsssdr/volk_gnsssdr_16ic_convert_32fc.h | 4 ++-- .../volk_gnsssdr/volk_gnsssdr_16ic_x2_dot_prod_16ic.h | 2 -- .../volk_gnsssdr/volk_gnsssdr_16ic_x2_dot_prod_16ic_xn.h | 2 -- .../volk_gnsssdr/volk_gnsssdr_16ic_x2_multiply_16ic.h | 4 ++-- .../volk_gnsssdr_16ic_x2_rotator_dot_prod_16ic_xn.h | 4 ++-- .../volk_gnsssdr/volk_gnsssdr_16ic_xn_resampler_16ic_xn.h | 4 ++-- .../volk_gnsssdr_32f_xn_high_dynamics_resampler_32f_xn.h | 4 ---- .../volk_gnsssdr/volk_gnsssdr_32f_xn_resampler_32f_xn.h | 4 ++-- .../volk_gnsssdr_32fc_32f_rotator_dot_prod_32fc_xn.h | 2 -- .../volk_gnsssdr_32fc_x2_rotator_dot_prod_32fc_xn.h | 2 -- .../volk_gnsssdr/volk_gnsssdr_32fc_xn_resampler_32fc_xn.h | 8 ++++---- .../kernels/volk_gnsssdr/volk_gnsssdr_s32f_sincos_32fc.h | 4 ++-- 14 files changed, 18 insertions(+), 32 deletions(-) diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16i_xn_resampler_16i_xn.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16i_xn_resampler_16i_xn.h index 988b14a39..7c9a0e6e7 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16i_xn_resampler_16i_xn.h +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16i_xn_resampler_16i_xn.h @@ -416,7 +416,7 @@ static inline void volk_gnsssdr_16i_xn_resampler_16i_xn_a_avx(int16_t** result, indexn = _mm256_add_ps(indexn, eights); } } - _mm256_zeroupper(); + for (current_correlator_tap = 0; current_correlator_tap < num_out_vectors; current_correlator_tap++) { for (n = avx_iters * 8; n < num_points; n++) @@ -494,7 +494,7 @@ static inline void volk_gnsssdr_16i_xn_resampler_16i_xn_u_avx(int16_t** result, indexn = _mm256_add_ps(indexn, eights); } } - _mm256_zeroupper(); + for (current_correlator_tap = 0; current_correlator_tap < num_out_vectors; current_correlator_tap++) { for (n = avx_iters * 8; n < num_points; n++) diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_16i_rotator_dot_prod_16ic_xn.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_16i_rotator_dot_prod_16ic_xn.h index b1b8d6350..6df90e01c 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_16i_rotator_dot_prod_16ic_xn.h +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_16i_rotator_dot_prod_16ic_xn.h @@ -611,7 +611,6 @@ static inline void volk_gnsssdr_16ic_16i_rotator_dot_prod_16ic_xn_a_avx2(lv_16sc } volk_gnsssdr_free(cacc); - _mm256_zeroupper(); _mm256_store_ps((float*)four_phase_acc, four_phase_acc_reg); (*phase) = four_phase_acc[0]; @@ -763,7 +762,6 @@ static inline void volk_gnsssdr_16ic_16i_rotator_dot_prod_16ic_xn_u_avx2(lv_16sc } volk_gnsssdr_free(cacc); - _mm256_zeroupper(); _mm256_store_ps((float*)four_phase_acc, four_phase_acc_reg); (*phase) = four_phase_acc[0]; diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_convert_32fc.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_convert_32fc.h index 78fce6549..1cbfe081e 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_convert_32fc.h +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_convert_32fc.h @@ -129,7 +129,7 @@ static inline void volk_gnsssdr_16ic_convert_32fc_u_axv(lv_32fc_t* outputVector, _in += 4; _out += 4; } - _mm256_zeroupper(); + for (i = 0; i < (num_points % 4); ++i) { *_out++ = lv_cmake((float)lv_creal(*_in), (float)lv_cimag(*_in)); @@ -156,7 +156,7 @@ static inline void volk_gnsssdr_16ic_convert_32fc_a_axv(lv_32fc_t* outputVector, _in += 4; _out += 4; } - _mm256_zeroupper(); + for (i = 0; i < (num_points % 4); ++i) { *_out++ = lv_cmake((float)lv_creal(*_in), (float)lv_cimag(*_in)); diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_x2_dot_prod_16ic.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_x2_dot_prod_16ic.h index adc29674a..17a6d3097 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_x2_dot_prod_16ic.h +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_x2_dot_prod_16ic.h @@ -282,7 +282,6 @@ static inline void volk_gnsssdr_16ic_x2_dot_prod_16ic_u_axv2(lv_16sc_t* out, con result = _mm256_or_si256(realcacc, imagcacc); _mm256_storeu_si256((__m256i*)dotProductVector, result); // Store the results back into the dot product vector - _mm256_zeroupper(); for (i = 0; i < 8; ++i) { @@ -360,7 +359,6 @@ static inline void volk_gnsssdr_16ic_x2_dot_prod_16ic_a_axv2(lv_16sc_t* out, con result = _mm256_or_si256(realcacc, imagcacc); _mm256_store_si256((__m256i*)dotProductVector, result); // Store the results back into the dot product vector - _mm256_zeroupper(); for (i = 0; i < 8; ++i) { diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_x2_dot_prod_16ic_xn.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_x2_dot_prod_16ic_xn.h index cbbb231ba..711f47647 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_x2_dot_prod_16ic_xn.h +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_x2_dot_prod_16ic_xn.h @@ -364,7 +364,6 @@ static inline void volk_gnsssdr_16ic_x2_dot_prod_16ic_xn_a_avx2(lv_16sc_t* resul volk_gnsssdr_free(realcacc); volk_gnsssdr_free(imagcacc); } - _mm256_zeroupper(); for (n_vec = 0; n_vec < num_a_vectors; n_vec++) { @@ -459,7 +458,6 @@ static inline void volk_gnsssdr_16ic_x2_dot_prod_16ic_xn_u_avx2(lv_16sc_t* resul volk_gnsssdr_free(realcacc); volk_gnsssdr_free(imagcacc); } - _mm256_zeroupper(); for (n_vec = 0; n_vec < num_a_vectors; n_vec++) { diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_x2_multiply_16ic.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_x2_multiply_16ic.h index d39a8cd57..caa01db72 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_x2_multiply_16ic.h +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_x2_multiply_16ic.h @@ -214,7 +214,7 @@ static inline void volk_gnsssdr_16ic_x2_multiply_16ic_u_avx2(lv_16sc_t* out, con _in_b += 8; _out += 8; } - _mm256_zeroupper(); + number = avx2_points * 8; for (; number < num_points; number++) { @@ -268,7 +268,7 @@ static inline void volk_gnsssdr_16ic_x2_multiply_16ic_a_avx2(lv_16sc_t* out, con _in_b += 8; _out += 8; } - _mm256_zeroupper(); + number = avx2_points * 8; for (; number < num_points; number++) { diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_x2_rotator_dot_prod_16ic_xn.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_x2_rotator_dot_prod_16ic_xn.h index d94d456fb..840b6e745 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_x2_rotator_dot_prod_16ic_xn.h +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_x2_rotator_dot_prod_16ic_xn.h @@ -945,7 +945,7 @@ static inline void volk_gnsssdr_16ic_x2_rotator_dot_prod_16ic_xn_a_avx2(lv_16sc_ volk_gnsssdr_free(realcacc); volk_gnsssdr_free(imagcacc); - _mm256_zeroupper(); + _mm_store_ps((float*)two_phase_acc, two_phase_acc_reg); (*phase) = two_phase_acc[0]; @@ -1261,7 +1261,7 @@ static inline void volk_gnsssdr_16ic_x2_rotator_dot_prod_16ic_xn_a_avx2_reload(l } _out[n_vec] = dotProduct; } - _mm256_zeroupper(); + volk_gnsssdr_free(realcacc); volk_gnsssdr_free(imagcacc); diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_xn_resampler_16ic_xn.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_xn_resampler_16ic_xn.h index fc67d3cec..b6ed10f91 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_xn_resampler_16ic_xn.h +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_xn_resampler_16ic_xn.h @@ -415,7 +415,7 @@ static inline void volk_gnsssdr_16ic_xn_resampler_16ic_xn_a_avx(lv_16sc_t** resu indexn = _mm256_add_ps(indexn, eights); } } - _mm256_zeroupper(); + for (current_correlator_tap = 0; current_correlator_tap < num_out_vectors; current_correlator_tap++) { for (n = avx_iters * 8; n < num_points; n++) @@ -493,7 +493,7 @@ static inline void volk_gnsssdr_16ic_xn_resampler_16ic_xn_u_avx(lv_16sc_t** resu indexn = _mm256_add_ps(indexn, eights); } } - _mm256_zeroupper(); + for (current_correlator_tap = 0; current_correlator_tap < num_out_vectors; current_correlator_tap++) { for (n = avx_iters * 8; n < num_points; n++) diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32f_xn_high_dynamics_resampler_32f_xn.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32f_xn_high_dynamics_resampler_32f_xn.h index 5bd0039d5..717026269 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32f_xn_high_dynamics_resampler_32f_xn.h +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32f_xn_high_dynamics_resampler_32f_xn.h @@ -491,8 +491,6 @@ static inline void volk_gnsssdr_32f_xn_high_dynamics_resampler_32f_xn_a_avx(floa indexn = _mm256_add_ps(indexn, eights); } - _mm256_zeroupper(); - for (n = avx_iters * 8; n < num_points; n++) { // resample code for first tap @@ -579,8 +577,6 @@ static inline void volk_gnsssdr_32f_xn_high_dynamics_resampler_32f_xn_u_avx(floa indexn = _mm256_add_ps(indexn, eights); } - _mm256_zeroupper(); - for (n = avx_iters * 8; n < num_points; n++) { // resample code for first tap diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32f_xn_resampler_32f_xn.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32f_xn_resampler_32f_xn.h index 6c1d1d7ea..cf6d495e4 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32f_xn_resampler_32f_xn.h +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32f_xn_resampler_32f_xn.h @@ -417,7 +417,7 @@ static inline void volk_gnsssdr_32f_xn_resampler_32f_xn_a_avx(float** result, co indexn = _mm256_add_ps(indexn, eights); } } - _mm256_zeroupper(); + for (current_correlator_tap = 0; current_correlator_tap < num_out_vectors; current_correlator_tap++) { for (n = avx_iters * 8; n < num_points; n++) @@ -495,7 +495,7 @@ static inline void volk_gnsssdr_32f_xn_resampler_32f_xn_u_avx(float** result, co indexn = _mm256_add_ps(indexn, eights); } } - _mm256_zeroupper(); + for (current_correlator_tap = 0; current_correlator_tap < num_out_vectors; current_correlator_tap++) { for (n = avx_iters * 8; n < num_points; n++) diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32fc_32f_rotator_dot_prod_32fc_xn.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32fc_32f_rotator_dot_prod_32fc_xn.h index bcca81c9d..56bced832 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32fc_32f_rotator_dot_prod_32fc_xn.h +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32fc_32f_rotator_dot_prod_32fc_xn.h @@ -294,7 +294,6 @@ static inline void volk_gnsssdr_32fc_32f_rotator_dot_prod_32fc_xn_u_avx(lv_32fc_ z0 = _mm256_complexnormalise_ps(z0); _mm256_store_ps((float*)phase_vec, z0); _phase = phase_vec[0]; - _mm256_zeroupper(); number = sixteenthPoints * 16; for (; number < num_points; number++) @@ -462,7 +461,6 @@ static inline void volk_gnsssdr_32fc_32f_rotator_dot_prod_32fc_xn_a_avx(lv_32fc_ z0 = _mm256_complexnormalise_ps(z0); _mm256_store_ps((float*)phase_vec, z0); _phase = phase_vec[0]; - _mm256_zeroupper(); number = sixteenthPoints * 16; for (; number < num_points; number++) diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32fc_x2_rotator_dot_prod_32fc_xn.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32fc_x2_rotator_dot_prod_32fc_xn.h index 486729f69..6b795ee88 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32fc_x2_rotator_dot_prod_32fc_xn.h +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32fc_x2_rotator_dot_prod_32fc_xn.h @@ -488,7 +488,6 @@ static inline void volk_gnsssdr_32fc_x2_rotator_dot_prod_32fc_xn_u_avx(lv_32fc_t _mm256_store_ps((float*)four_phase_acc, four_phase_acc_reg); _phase = four_phase_acc[0]; - _mm256_zeroupper(); for (n = avx_iters * 4; n < num_points; n++) { @@ -618,7 +617,6 @@ static inline void volk_gnsssdr_32fc_x2_rotator_dot_prod_32fc_xn_a_avx(lv_32fc_t _mm256_store_ps((float*)four_phase_acc, four_phase_acc_reg); _phase = four_phase_acc[0]; - _mm256_zeroupper(); for (n = avx_iters * 4; n < num_points; n++) { diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32fc_xn_resampler_32fc_xn.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32fc_xn_resampler_32fc_xn.h index f13edc7ec..a0f5ee03f 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32fc_xn_resampler_32fc_xn.h +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32fc_xn_resampler_32fc_xn.h @@ -414,7 +414,7 @@ static inline void volk_gnsssdr_32fc_xn_resampler_32fc_xn_a_avx(lv_32fc_t** resu indexn = _mm256_add_ps(indexn, eights); } } - _mm256_zeroupper(); + for (current_correlator_tap = 0; current_correlator_tap < num_out_vectors; current_correlator_tap++) { for (n = avx_iters * 8; n < num_points; n++) @@ -492,7 +492,7 @@ static inline void volk_gnsssdr_32fc_xn_resampler_32fc_xn_u_avx(lv_32fc_t** resu indexn = _mm256_add_ps(indexn, eights); } } - _mm256_zeroupper(); + for (current_correlator_tap = 0; current_correlator_tap < num_out_vectors; current_correlator_tap++) { for (n = avx_iters * 8; n < num_points; n++) @@ -571,7 +571,7 @@ static inline void volk_gnsssdr_32fc_xn_resampler_32fc_xn_u_avx2(lv_32fc_t** res indexn = _mm256_add_ps(indexn, eights); } } - _mm256_zeroupper(); + for (current_correlator_tap = 0; current_correlator_tap < num_out_vectors; current_correlator_tap++) { for (n = avx_iters * 8; n < num_points; n++) @@ -650,7 +650,7 @@ static inline void volk_gnsssdr_32fc_xn_resampler_32fc_xn_a_avx2(lv_32fc_t** res indexn = _mm256_add_ps(indexn, eights); } } - _mm256_zeroupper(); + for (current_correlator_tap = 0; current_correlator_tap < num_out_vectors; current_correlator_tap++) { for (n = avx_iters * 8; n < num_points; n++) diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_s32f_sincos_32fc.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_s32f_sincos_32fc.h index 4c764d0cd..f3188a6f6 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_s32f_sincos_32fc.h +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_s32f_sincos_32fc.h @@ -616,7 +616,7 @@ static inline void volk_gnsssdr_s32f_sincos_32fc_a_avx2(lv_32fc_t *out, const fl eight_phases_reg = _mm256_add_ps(eight_phases_reg, eight_phases_inc_reg); } - _mm256_zeroupper(); + _phase = _phase + phase_inc * (avx_iters * 8); for (number = avx_iters * 8; number < num_points; number++) { @@ -803,7 +803,7 @@ static inline void volk_gnsssdr_s32f_sincos_32fc_u_avx2(lv_32fc_t *out, const fl eight_phases_reg = _mm256_add_ps(eight_phases_reg, eight_phases_inc_reg); } - _mm256_zeroupper(); + _phase = _phase + phase_inc * (avx_iters * 8); for (number = avx_iters * 8; number < num_points; number++) { From 6b1ab274b1c0a94fc719763fd508e62ed916b188 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Tue, 5 Jan 2021 10:53:32 +0100 Subject: [PATCH 04/10] Fix for GCC < 5.0 --- .../libs/volk_gnsssdr_module/volk_gnsssdr/CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/CMakeLists.txt b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/CMakeLists.txt index 5b69ce569..91217e1d8 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/CMakeLists.txt +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/CMakeLists.txt @@ -181,7 +181,9 @@ if(CMAKE_C_COMPILER_ID MATCHES "Clang|GNU") # are defined. Note the different data type of the first argument). By # default 'incompatible-pointer-types' is a warning only and 'pointer-sign' # is a warning enabled by '-Wall'. These warnings are only applicable to C. - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror=incompatible-pointer-types -Werror=pointer-sign") + if(NOT (CMAKE_C_COMPILER_ID MATCHES "GNU" AND CMAKE_C_COMPILER_VERSION VERSION_LESS "5.0")) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror=incompatible-pointer-types -Werror=pointer-sign") + endif() endif() option(ENABLE_STRIP "Create a stripped volk_gnsssdr_profile binary (without debugging symbols)" OFF) From b7bf8ceb14c355922b7f2469c32e566086a0bf44 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Tue, 5 Jan 2021 14:49:26 +0100 Subject: [PATCH 05/10] Add bugprone-reserved-identifier check, modernize options --- .clang-tidy | 51 +++++++++++++++++---------------------------------- 1 file changed, 17 insertions(+), 34 deletions(-) diff --git a/.clang-tidy b/.clang-tidy index 84d29783c..dae1b2dfe 100644 --- a/.clang-tidy +++ b/.clang-tidy @@ -23,6 +23,7 @@ Checks: '-*, bugprone-move-forwarding-reference, bugprone-multiple-statement-macro, bugprone-parent-virtual-call, + bugprone-reserved-identifier, bugprone-sizeof-container, bugprone-sizeof-expression, bugprone-string-constructor, @@ -149,6 +150,12 @@ CheckOptions: value: '' - key: bugprone-misplaced-widening-cast.CheckImplicitCasts value: 'false' + - key: bugprone-reserved-identifier.AggressiveDependentMemberLookup + value: 'false' + - key: bugprone-reserved-identifier.AllowedIdentifiers + value: '' + - key: bugprone-reserved-identifier.Invert + value: 'false' - key: bugprone-sizeof-expression.WarnOnSizeOfCompareToConstant value: 'true' - key: bugprone-sizeof-expression.WarnOnSizeOfConstant @@ -178,7 +185,7 @@ CheckOptions: - key: bugprone-too-small-loop-variable.MagnitudeBitsUpperLimit value: '16' - key: bugprone-unused-return-value.CheckedFunctions - value: '::std::async;::std::launder;::std::remove;::std::remove_if;::std::unique;::std::unique_ptr::release;::std::basic_string::empty;::std::vector::empty' + value: 'std::async;std::launder;std::remove;std::remove_if;std::unique;std::unique_ptr::release;std::basic_string::empty;std::vector::empty;std::back_inserter;std::distance;std::find;std::find_if;std::inserter;std::lower_bound;std::make_pair;std::map::count;std::map::find;std::map::lower_bound;std::multimap::equal_range;std::multimap::upper_bound;std::set::count;std::set::find;std::setfill;std::setprecision;std::setw;std::upper_bound;std::vector::at;::bsearch;::ferror;::feof;::isalnum;::isalpha;::isblank;::iscntrl;::isdigit;::isgraph;::islower;::isprint;::ispunct;::isspace;::isupper;::iswalnum;::iswprint;::iswspace;::isxdigit;::memchr;::memcmp;::strcmp;::strcoll;::strncmp;::strpbrk;::strrchr;::strspn;::strstr;::wcscmp;::access;::bind;::connect;::difftime;::dlsym;::fnmatch;::getaddrinfo;::getopt;::htonl;::htons;::iconv_open;::inet_addr;::isascii;::isatty;::mmap;::newlocale;::openat;::pathconf;::pthread_equal;::pthread_getspecific;::pthread_mutex_trylock;::readdir;::readlink;::recvmsg;::regexec;::scandir;::semget;::setjmp;::shm_open;::shmget;::sigismember;::strcasecmp;::strsignal;::ttyname' - key: cert-dcl16-c.NewSuffixes value: 'L;LL;LU;LLU' - key: cert-msc51-cpp.DisallowedSeedTypes @@ -198,9 +205,9 @@ CheckOptions: - key: cppcoreguidelines-special-member-functions.AllowSoleDefaultDtor value: 'false' - key: google-build-namespaces.HeaderFileExtensions - value: ',h' + value: ';h;hh;hpp;hxx' - key: google-global-names-in-headers.HeaderFileExtensions - value: ',h,hh,hpp,hxx' + value: ';h;hh;hpp;hxx' - key: google-readability-braces-around-statements.ShortStatementLines value: '1' - key: google-readability-function-size.StatementThreshold @@ -224,7 +231,7 @@ CheckOptions: - key: misc-throw-by-value-catch-by-reference.CheckThrowTemporaries value: 'true' - key: misc-throw-by-value-catch-by-reference.MaxSize - value: '-1' + value: '64' - key: misc-throw-by-value-catch-by-reference.WarnOnLargeObjects value: 'false' - key: modernize-avoid-bind.PermissiveParameterList @@ -254,15 +261,15 @@ CheckOptions: - key: modernize-use-default-member-init.UseAssignment value: 'false' - key: modernize-use-emplace.ContainersWithPushBack - value: '::std::vector;::std::list;::std::deque' + value: 'std::vector;std::list;std::deque' - key: modernize-use-emplace.IgnoreImplicitConstructors value: 'false' - key: modernize-use-emplace.SmartPointers - value: '::std::shared_ptr;::std::unique_ptr;::std::auto_ptr;::std::weak_ptr' + value: 'std::shared_ptr;std::unique_ptr;std::auto_ptr;std::weak_ptr' - key: modernize-use-emplace.TupleMakeFunctions - value: '::std::make_pair;::std::make_tuple' + value: 'std::make_pair;std::make_tuple' - key: modernize-use-emplace.TupleTypes - value: '::std::pair;::std::tuple' + value: 'std::pair;std::tuple' - key: modernize-use-equals-default.IgnoreMacros value: 'true' - key: modernize-use-equals-delete.IgnoreMacros @@ -282,7 +289,7 @@ CheckOptions: - key: modernize-use-override.OverrideSpelling value: override - key: performance-faster-string-find.StringLikeClasses - value: 'std::basic_string' + value: 'std::basic_string;std::basic_string_view' - key: performance-for-range-copy.AllowedTypes value: '' - key: performance-for-range-copy.WarnOnAllAutoCopies @@ -292,7 +299,7 @@ CheckOptions: - key: performance-inefficient-vector-operation.EnableProto value: 'false' - key: performance-inefficient-vector-operation.VectorLikeClasses - value: '::std::vector' + value: 'std::vector' - key: performance-move-const-arg.CheckTriviallyCopyableMove value: 'true' - key: performance-move-constructor-init.IncludeStyle @@ -307,36 +314,12 @@ CheckOptions: value: llvm - key: readability-braces-around-statements.ShortStatementLines value: '0' - - key: readability-identifier-naming.AbstractClassCase - value: CamelCase - - key: readability-identifier-naming.AbstractClassPrefix - value: '' - - key: readability-identifier-naming.AbstractClassSuffix - value: '' - key: readability-identifier-naming.AggressiveDependentMemberLookup value: 'false' - - key: readability-identifier-naming.ClassCase - value: Camel_Snake_Case - - key: readability-identifier-naming.ClassPrefix - value: '' - - key: readability-identifier-naming.ClassSuffix - value: '' - - key: readability-identifier-naming.GlobalConstantCase - value: UPPER_CASE - - key: readability-identifier-naming.GlobalConstantPrefix - value: '' - - key: readability-identifier-naming.GlobalConstantSuffix - value: '' - key: readability-identifier-naming.IgnoreFailedSplit value: 'false' - key: readability-identifier-naming.IgnoreMainLikeFunctions value: 'false' - - key: readability-identifier-naming.StructCase - value: aNy_CasE - - key: readability-identifier-naming.StructPrefix - value: '' - - key: readability-identifier-naming.StructSuffix - value: '' - key: readability-inconsistent-declaration-parameter-name.IgnoreMacros value: 'true' - key: readability-inconsistent-declaration-parameter-name.Strict From 9ee49136a3ed0ee22a674684ae4ab030428afc12 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Wed, 6 Jan 2021 10:21:40 +0100 Subject: [PATCH 06/10] Update changelog --- docs/changelog.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/docs/changelog.md b/docs/changelog.md index 97b5f38a1..7056d5359 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -37,6 +37,16 @@ SPDX-FileCopyrightText: 2011-2020 Carles Fernandez-Prades Date: Wed, 6 Jan 2021 13:42:48 +0100 Subject: [PATCH 07/10] Fix for Ubuntu 19.04 --- .../volk_gnsssdr/cmake/Modules/FindFILESYSTEM.cmake | 1 - 1 file changed, 1 deletion(-) diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Modules/FindFILESYSTEM.cmake b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Modules/FindFILESYSTEM.cmake index 9c8dc3679..0a2e53d79 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Modules/FindFILESYSTEM.cmake +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Modules/FindFILESYSTEM.cmake @@ -120,7 +120,6 @@ if(FILESYSTEM_FIND_QUIETLY) endif() # All of our tests require C++17 or later -set(CMAKE_CXX_STANDARD 17) if((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") AND (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER "9.0.0")) set(CMAKE_REQUIRED_FLAGS "-std=c++17") endif() From 25787deca7bf3863c3fc1af8bccbbda111b8d033 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Thu, 7 Jan 2021 17:25:36 +0100 Subject: [PATCH 08/10] Fix assert --- src/core/libs/supl/asn-rrlp/constr_CHOICE.c | 2 +- src/core/libs/supl/asn-supl/constr_CHOICE.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/core/libs/supl/asn-rrlp/constr_CHOICE.c b/src/core/libs/supl/asn-rrlp/constr_CHOICE.c index 4cc5d8a34..ded1c4f2a 100644 --- a/src/core/libs/supl/asn-rrlp/constr_CHOICE.c +++ b/src/core/libs/supl/asn-rrlp/constr_CHOICE.c @@ -755,7 +755,7 @@ asn_dec_rval_t CHOICE_decode_xer(asn_codec_ctx_t *opt_codec_ctx, { RETURN(tmprval.code); } - assert(_fetch_present_idx(st, specs->pres_offset, + assert(fetch_present_idx(st, specs->pres_offset, specs->pres_size) == 0); /* Record what we've got */ set_present_idx(st, specs->pres_offset, specs->pres_size, diff --git a/src/core/libs/supl/asn-supl/constr_CHOICE.c b/src/core/libs/supl/asn-supl/constr_CHOICE.c index 4cc5d8a34..ded1c4f2a 100644 --- a/src/core/libs/supl/asn-supl/constr_CHOICE.c +++ b/src/core/libs/supl/asn-supl/constr_CHOICE.c @@ -755,7 +755,7 @@ asn_dec_rval_t CHOICE_decode_xer(asn_codec_ctx_t *opt_codec_ctx, { RETURN(tmprval.code); } - assert(_fetch_present_idx(st, specs->pres_offset, + assert(fetch_present_idx(st, specs->pres_offset, specs->pres_size) == 0); /* Record what we've got */ set_present_idx(st, specs->pres_offset, specs->pres_size, From 71026773589816217e37a0e363011169171fde24 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Thu, 7 Jan 2021 19:16:54 +0100 Subject: [PATCH 09/10] Bump version number --- CMakeLists.txt | 8 ++++---- docs/changelog.md | 4 ++-- docs/manpage/gnss-sdr-manpage | 2 +- .../libs/volk_gnsssdr_module/volk_gnsssdr/CMakeLists.txt | 2 +- .../cmake/Packaging/volk_gnsssdr-config-info-manpage | 2 +- .../cmake/Packaging/volk_gnsssdr_profile-manpage | 2 +- src/main/main.cc | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4169a2a7f..dce68a1af 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ # GNSS-SDR is a Global Navigation Satellite System software-defined receiver. # This file is part of GNSS-SDR. # -# SPDX-FileCopyrightText: 2010-2020 C. Fernandez-Prades cfernandez(at)cttc.es +# SPDX-FileCopyrightText: 2010-2021 C. Fernandez-Prades cfernandez(at)cttc.es # SPDX-License-Identifier: BSD-3-Clause ################################################################################ @@ -121,7 +121,7 @@ option(ENABLE_EXTERNAL_MATHJAX "Use MathJax from an external CDN in HTML docs" O ################################################################################ # GNSS-SDR version information ################################################################################ -set(THIS_IS_A_RELEASE OFF) # only related to version name, no further implications. +set(THIS_IS_A_RELEASE ON) # only related to version name, no further implications. if(NOT ${THIS_IS_A_RELEASE}) find_package(Git) set_package_properties(Git PROPERTIES @@ -157,9 +157,9 @@ endif() set(VERSION_INFO_MAJOR_VERSION 0) set(VERSION_INFO_API_COMPAT 0) if(${THIS_IS_A_RELEASE}) - set(VERSION_INFO_MINOR_VERSION 13) + set(VERSION_INFO_MINOR_VERSION 14) else() - set(VERSION_INFO_MINOR_VERSION 13.git-${GIT_BRANCH}-${GIT_COMMIT_HASH}) + set(VERSION_INFO_MINOR_VERSION 14.git-${GIT_BRANCH}-${GIT_COMMIT_HASH}) endif() set(VERSION ${VERSION_INFO_MAJOR_VERSION}.${VERSION_INFO_API_COMPAT}.${VERSION_INFO_MINOR_VERSION}) diff --git a/docs/changelog.md b/docs/changelog.md index 7056d5359..5c0e139f2 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -4,11 +4,11 @@ SPDX-License-Identifier: GPL-3.0-or-later ) [comment]: # ( -SPDX-FileCopyrightText: 2011-2020 Carles Fernandez-Prades +SPDX-FileCopyrightText: 2011-2021 Carles Fernandez-Prades ) -## [Unreleased](https://github.com/gnss-sdr/gnss-sdr/tree/next) +## [GNSS-SDR v0.0.14](https://github.com/gnss-sdr/gnss-sdr/releases/tag/v0.0.14) ### Improvements in Availability: diff --git a/docs/manpage/gnss-sdr-manpage b/docs/manpage/gnss-sdr-manpage index 03c2738ae..817922129 100644 --- a/docs/manpage/gnss-sdr-manpage +++ b/docs/manpage/gnss-sdr-manpage @@ -2,7 +2,7 @@ .\" SPDX-License-Identifier: GPL-3.0-or-later .\" SPDX-FileCopyrightText: Carles Fernandez-Prades .\" Contact carles.fernandez@cttc.es to correct errors or typos. -.TH gnss\-sdr 1 "29 Jul 2020" "0.0.13" "gnss\-sdr man page" +.TH gnss\-sdr 1 "29 Jul 2020" "0.0.14" "gnss\-sdr man page" .SH NAME \fBgnss\-sdr\fR \- GNSS Software Defined Receiver. .SH SYNOPSIS diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/CMakeLists.txt b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/CMakeLists.txt index 91217e1d8..4e29c8dbf 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/CMakeLists.txt +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/CMakeLists.txt @@ -203,7 +203,7 @@ message(STATUS "Build type set to ${CMAKE_BUILD_TYPE}.") set(VERSION_INFO_MAJOR_VERSION 0) set(VERSION_INFO_MINOR_VERSION 0) -set(VERSION_INFO_MAINT_VERSION 13) +set(VERSION_INFO_MAINT_VERSION 14) include(VolkVersion) # setup version info diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Packaging/volk_gnsssdr-config-info-manpage b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Packaging/volk_gnsssdr-config-info-manpage index 7c4b9a1ce..8dacdb572 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Packaging/volk_gnsssdr-config-info-manpage +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Packaging/volk_gnsssdr-config-info-manpage @@ -2,7 +2,7 @@ .\" SPDX-License-Identifier: GPL-3.0-or-later .\" SPDX-FileCopyrightText: Carles Fernandez-Prades .\" Contact carles.fernandez@cttc.es to correct errors or typos. -.TH volk_gnsssdr\-config\-info 1 "29 Jul 2020" "0.0.13" "volk_gnsssdr\-config\-info man page" +.TH volk_gnsssdr\-config\-info 1 "29 Jul 2020" "0.0.14" "volk_gnsssdr\-config\-info man page" .SH NAME \fBvolk_gnsssdr\-config\-info\fR \- Prints configuration information of libvolk_gnsssdr functions. .SH SYNOPSIS diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Packaging/volk_gnsssdr_profile-manpage b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Packaging/volk_gnsssdr_profile-manpage index a409623b6..36613142d 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Packaging/volk_gnsssdr_profile-manpage +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Packaging/volk_gnsssdr_profile-manpage @@ -2,7 +2,7 @@ .\" SPDX-License-Identifier: GPL-3.0-or-later .\" SPDX-FileCopyrightText: Carles Fernandez-Prades .\" Contact carles.fernandez@cttc.es to correct errors or typos. -.TH volk_gnsssdr_profile 1 "29 Jul 2020" "0.0.13" "volk_gnsssdr_profile man page" +.TH volk_gnsssdr_profile 1 "29 Jul 2020" "0.0.14" "volk_gnsssdr_profile man page" .SH NAME \fBvolk_gnsssdr_profile\fR \- Profiler application for libvolk_gnsssdr functions. .SH SYNOPSIS diff --git a/src/main/main.cc b/src/main/main.cc index fe60a3618..082d17c0a 100644 --- a/src/main/main.cc +++ b/src/main/main.cc @@ -18,7 +18,7 @@ */ #ifndef GNSS_SDR_VERSION -#define GNSS_SDR_VERSION "0.0.13" +#define GNSS_SDR_VERSION "0.0.14" #endif #ifndef GOOGLE_STRIP_LOG From 87882d3d23d4d3d0e7381bb4f076e4e0383392d0 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Fri, 8 Jan 2021 12:02:31 +0100 Subject: [PATCH 10/10] The action continues in the next branch --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index dce68a1af..72d56e248 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -121,7 +121,7 @@ option(ENABLE_EXTERNAL_MATHJAX "Use MathJax from an external CDN in HTML docs" O ################################################################################ # GNSS-SDR version information ################################################################################ -set(THIS_IS_A_RELEASE ON) # only related to version name, no further implications. +set(THIS_IS_A_RELEASE OFF) # only related to version name, no further implications. if(NOT ${THIS_IS_A_RELEASE}) find_package(Git) set_package_properties(Git PROPERTIES