From 3e51a435fda95205aa81e834927fd52c6c4790b5 Mon Sep 17 00:00:00 2001 From: DavidIkov Date: Tue, 16 Sep 2025 19:30:02 +0300 Subject: [PATCH 1/3] Fixed broken test: #103 --- .../classification/processor.cpp | 13 ++++--------- knp/tests/framework/inference_evaluation_test.cpp | 2 +- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/knp/base-framework/impl/inference_evaluation/classification/processor.cpp b/knp/base-framework/impl/inference_evaluation/classification/processor.cpp index 48f2cedd..7f741986 100644 --- a/knp/base-framework/impl/inference_evaluation/classification/processor.cpp +++ b/knp/base-framework/impl/inference_evaluation/classification/processor.cpp @@ -33,9 +33,7 @@ namespace knp::framework::inference_evaluation::classification class EvaluationHelper { public: - explicit EvaluationHelper( - const knp::framework::data_processing::classification::Dataset &dataset, - std::vector &inference_results); + explicit EvaluationHelper(const knp::framework::data_processing::classification::Dataset &dataset); void process_spikes(const knp::core::messaging::SpikeData &firing_neuron_indices, size_t step); @@ -55,14 +53,11 @@ class EvaluationHelper std::vector class_votes_; const knp::framework::data_processing::classification::Dataset &dataset_; - std::vector &inference_results_; }; -EvaluationHelper::EvaluationHelper( - const knp::framework::data_processing::classification::Dataset &dataset, - std::vector &inference_results) - : class_votes_(dataset.get_amount_of_classes(), 0), dataset_(dataset), inference_results_(inference_results) +EvaluationHelper::EvaluationHelper(const knp::framework::data_processing::classification::Dataset &dataset) + : class_votes_(dataset.get_amount_of_classes(), 0), dataset_(dataset) { } @@ -119,7 +114,7 @@ void InferenceResultsProcessor::process_inference_results( const std::vector &spikes, knp::framework::data_processing::classification::Dataset const &dataset) { - EvaluationHelper helper(dataset, inference_results_); + EvaluationHelper helper(dataset); knp::core::messaging::SpikeData firing_neuron_indices; auto spikes_iter = spikes.begin(); diff --git a/knp/tests/framework/inference_evaluation_test.cpp b/knp/tests/framework/inference_evaluation_test.cpp index 6d0cf923..50a38641 100644 --- a/knp/tests/framework/inference_evaluation_test.cpp +++ b/knp/tests/framework/inference_evaluation_test.cpp @@ -68,5 +68,5 @@ TEST(InferenceEvaluation, Classification) ASSERT_EQ( csv_res.str(), "CLASS,TOTAL_VOTES,TRUE_POSITIVES,FALSE_NEGATIVES,FALSE_POSITIVES,TRUE_NEGATIVES,PRECISION,RECALL,PREVALENCE," - "ACCURACY,F_MEASURE\n0,2,1,0,1,2,0.5,0.5,0.25,0.75,0.5\n1,2,2,0,0,2,1,1,0.5,1,1\n"); + "ACCURACY,F_SCORE\n0,2,1,0,1,2,0.5,0.5,0.25,0.75,0.5\n1,2,2,0,0,2,1,1,0.5,1,1\n"); } From 366b75568f91441d696593264e700403ee33d06c Mon Sep 17 00:00:00 2001 From: DavidIkov Date: Tue, 16 Sep 2025 23:27:27 +0300 Subject: [PATCH 2/3] Fixed cmake bug: #103 --- CMakeLists.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index e34f4ae2..1376dba2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -24,6 +24,12 @@ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") +if(CMAKE_VERSION VERSION_GREATER_EQUAL "4.0") + # cmake > 4.0 does not support projects with minimal versions < 3.5 + message(STATUS "Changing cmake minimum version to 3.5 globally") + set(CMAKE_POLICY_VERSION_MINIMUM 3.5 CACHE INTERNAL "") +endif() + include(CMakeDependentOption) include(third-party) include(version) From b1863099eb4de4456d4162022b06ab1775fb2783 Mon Sep 17 00:00:00 2001 From: DavidIkov Date: Tue, 16 Sep 2025 23:32:59 +0300 Subject: [PATCH 3/3] Temporarily printing cmake version: #103 --- CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1376dba2..49e41c49 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -24,6 +24,7 @@ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") +message(STATUS "cmake version ${CMAKE_VERSION}") if(CMAKE_VERSION VERSION_GREATER_EQUAL "4.0") # cmake > 4.0 does not support projects with minimal versions < 3.5 message(STATUS "Changing cmake minimum version to 3.5 globally")