From c0d3b61f379345463b372242786d10d66019cb38 Mon Sep 17 00:00:00 2001 From: Christophe Favergeon Date: Mon, 6 Jul 2020 09:39:15 +0200 Subject: [PATCH] CMSIS-DSP: Changed cmake required minimum version --- DSP_Lib_TestSuite/CMakeLists.txt | 2 +- DSP_Lib_TestSuite/RefLibs/CMakeLists.txt | 2 +- Examples/ARM/arm_bayes_example/CMakeLists.txt | 2 +- .../arm_class_marks_example/CMakeLists.txt | 2 +- .../arm_convolution_example/CMakeLists.txt | 2 +- .../ARM/arm_dotproduct_example/CMakeLists.txt | 2 +- .../ARM/arm_fft_bin_example/CMakeLists.txt | 2 +- Examples/ARM/arm_fir_example/CMakeLists.txt | 2 +- .../CMakeLists.txt | 2 +- .../arm_linear_interp_example/CMakeLists.txt | 2 +- .../ARM/arm_matrix_example/CMakeLists.txt | 2 +- .../CMakeLists.txt | 2 +- .../ARM/arm_sin_cos_example/CMakeLists.txt | 2 +- Examples/ARM/arm_svm_example/CMakeLists.txt | 2 +- .../ARM/arm_variance_example/CMakeLists.txt | 2 +- README.md | 2 +- Source/BasicMathFunctions/CMakeLists.txt | 2 +- Source/BayesFunctions/CMakeLists.txt | 2 +- Source/CMakeLists.txt | 2 +- Source/CommonTables/CMakeLists.txt | 2 +- Source/ComplexMathFunctions/CMakeLists.txt | 2 +- Source/ControllerFunctions/CMakeLists.txt | 2 +- Source/DistanceFunctions/CMakeLists.txt | 2 +- Source/FastMathFunctions/CMakeLists.txt | 2 +- Source/FilteringFunctions/CMakeLists.txt | 2 +- Source/MatrixFunctions/CMakeLists.txt | 2 +- Source/SVMFunctions/CMakeLists.txt | 2 +- Source/StatisticsFunctions/CMakeLists.txt | 2 +- Source/SupportFunctions/CMakeLists.txt | 2 +- Source/TransformFunctions/CMakeLists.txt | 2 +- Testing/CMakeLists.txt | 24 ++++++++++++++----- 31 files changed, 48 insertions(+), 36 deletions(-) diff --git a/DSP_Lib_TestSuite/CMakeLists.txt b/DSP_Lib_TestSuite/CMakeLists.txt index 63d2409a..72b83827 100644 --- a/DSP_Lib_TestSuite/CMakeLists.txt +++ b/DSP_Lib_TestSuite/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 3.6) +cmake_minimum_required (VERSION 3.14) cmake_policy(SET CMP0077 NEW) # The tests are assuming that MATRIX_CHECK is enabled when building # CMSIS-DSP. diff --git a/DSP_Lib_TestSuite/RefLibs/CMakeLists.txt b/DSP_Lib_TestSuite/RefLibs/CMakeLists.txt index 2fbb1910..c4b53cbd 100644 --- a/DSP_Lib_TestSuite/RefLibs/CMakeLists.txt +++ b/DSP_Lib_TestSuite/RefLibs/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 3.6) +cmake_minimum_required (VERSION 3.14) project(DspRefLibs) diff --git a/Examples/ARM/arm_bayes_example/CMakeLists.txt b/Examples/ARM/arm_bayes_example/CMakeLists.txt index c95fd9c4..6ac92d46 100755 --- a/Examples/ARM/arm_bayes_example/CMakeLists.txt +++ b/Examples/ARM/arm_bayes_example/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 3.6) +cmake_minimum_required (VERSION 3.14) project (arm_bayes_example VERSION 0.1) diff --git a/Examples/ARM/arm_class_marks_example/CMakeLists.txt b/Examples/ARM/arm_class_marks_example/CMakeLists.txt index 864984ed..a987446d 100755 --- a/Examples/ARM/arm_class_marks_example/CMakeLists.txt +++ b/Examples/ARM/arm_class_marks_example/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 3.6) +cmake_minimum_required (VERSION 3.14) project (arm_class_marks_example VERSION 0.1) diff --git a/Examples/ARM/arm_convolution_example/CMakeLists.txt b/Examples/ARM/arm_convolution_example/CMakeLists.txt index 14257acc..c6acc7a5 100755 --- a/Examples/ARM/arm_convolution_example/CMakeLists.txt +++ b/Examples/ARM/arm_convolution_example/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 3.6) +cmake_minimum_required (VERSION 3.14) project (arm_convolution_example VERSION 0.1) diff --git a/Examples/ARM/arm_dotproduct_example/CMakeLists.txt b/Examples/ARM/arm_dotproduct_example/CMakeLists.txt index 7ae1118c..9f4496b0 100755 --- a/Examples/ARM/arm_dotproduct_example/CMakeLists.txt +++ b/Examples/ARM/arm_dotproduct_example/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 3.6) +cmake_minimum_required (VERSION 3.14) project (arm_dotproduct_example VERSION 0.1) diff --git a/Examples/ARM/arm_fft_bin_example/CMakeLists.txt b/Examples/ARM/arm_fft_bin_example/CMakeLists.txt index 4682e7eb..a56d0fb6 100755 --- a/Examples/ARM/arm_fft_bin_example/CMakeLists.txt +++ b/Examples/ARM/arm_fft_bin_example/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 3.6) +cmake_minimum_required (VERSION 3.14) project (arm_fft_bin_example VERSION 0.1) diff --git a/Examples/ARM/arm_fir_example/CMakeLists.txt b/Examples/ARM/arm_fir_example/CMakeLists.txt index e0861393..bf850442 100755 --- a/Examples/ARM/arm_fir_example/CMakeLists.txt +++ b/Examples/ARM/arm_fir_example/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 3.6) +cmake_minimum_required (VERSION 3.14) project (arm_fir_example VERSION 0.1) diff --git a/Examples/ARM/arm_graphic_equalizer_example/CMakeLists.txt b/Examples/ARM/arm_graphic_equalizer_example/CMakeLists.txt index 961a8c7a..9cf05e17 100755 --- a/Examples/ARM/arm_graphic_equalizer_example/CMakeLists.txt +++ b/Examples/ARM/arm_graphic_equalizer_example/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 3.6) +cmake_minimum_required (VERSION 3.14) project (arm_graphic_equalizer_example VERSION 0.1) diff --git a/Examples/ARM/arm_linear_interp_example/CMakeLists.txt b/Examples/ARM/arm_linear_interp_example/CMakeLists.txt index ad6c7a69..00b18cdf 100755 --- a/Examples/ARM/arm_linear_interp_example/CMakeLists.txt +++ b/Examples/ARM/arm_linear_interp_example/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 3.6) +cmake_minimum_required (VERSION 3.14) project (arm_linear_interp_example VERSION 0.1) diff --git a/Examples/ARM/arm_matrix_example/CMakeLists.txt b/Examples/ARM/arm_matrix_example/CMakeLists.txt index 6ad590c5..0b269426 100755 --- a/Examples/ARM/arm_matrix_example/CMakeLists.txt +++ b/Examples/ARM/arm_matrix_example/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 3.6) +cmake_minimum_required (VERSION 3.14) project (arm_matrix_example VERSION 0.1) diff --git a/Examples/ARM/arm_signal_converge_example/CMakeLists.txt b/Examples/ARM/arm_signal_converge_example/CMakeLists.txt index 0d8fd771..e516758f 100755 --- a/Examples/ARM/arm_signal_converge_example/CMakeLists.txt +++ b/Examples/ARM/arm_signal_converge_example/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 3.6) +cmake_minimum_required (VERSION 3.14) project (arm_signal_convergence_example VERSION 0.1) diff --git a/Examples/ARM/arm_sin_cos_example/CMakeLists.txt b/Examples/ARM/arm_sin_cos_example/CMakeLists.txt index bdcad569..76c66491 100755 --- a/Examples/ARM/arm_sin_cos_example/CMakeLists.txt +++ b/Examples/ARM/arm_sin_cos_example/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 3.6) +cmake_minimum_required (VERSION 3.14) project (arm_sin_cos_example VERSION 0.1) diff --git a/Examples/ARM/arm_svm_example/CMakeLists.txt b/Examples/ARM/arm_svm_example/CMakeLists.txt index 81308c3c..2fa5d18c 100755 --- a/Examples/ARM/arm_svm_example/CMakeLists.txt +++ b/Examples/ARM/arm_svm_example/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 3.6) +cmake_minimum_required (VERSION 3.14) project (arm_svm_example VERSION 0.1) diff --git a/Examples/ARM/arm_variance_example/CMakeLists.txt b/Examples/ARM/arm_variance_example/CMakeLists.txt index 62ddf274..c7cdbd04 100755 --- a/Examples/ARM/arm_variance_example/CMakeLists.txt +++ b/Examples/ARM/arm_variance_example/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 3.6) +cmake_minimum_required (VERSION 3.14) project (arm_variance_example VERSION 0.1) diff --git a/README.md b/README.md index 584c3aca..73d47c36 100755 --- a/README.md +++ b/README.md @@ -71,7 +71,7 @@ Create a folder BuildCMSISOnly. Inside the folder, create a CMakeLists.txt with the following content: ```cmake -cmake_minimum_required (VERSION 3.6) +cmake_minimum_required (VERSION 3.14) # Define the project project (testcmsisdsp VERSION 0.1) diff --git a/Source/BasicMathFunctions/CMakeLists.txt b/Source/BasicMathFunctions/CMakeLists.txt index fe4a4def..37802a85 100644 --- a/Source/BasicMathFunctions/CMakeLists.txt +++ b/Source/BasicMathFunctions/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 3.6) +cmake_minimum_required (VERSION 3.14) project(CMSISDSPBasicMath) diff --git a/Source/BayesFunctions/CMakeLists.txt b/Source/BayesFunctions/CMakeLists.txt index 5f5ee4a2..c0bc79be 100755 --- a/Source/BayesFunctions/CMakeLists.txt +++ b/Source/BayesFunctions/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 3.6) +cmake_minimum_required (VERSION 3.14) project(CMSISDSPBayes) diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt index 895e6ec4..b4cb0d49 100755 --- a/Source/CMakeLists.txt +++ b/Source/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 3.6) +cmake_minimum_required (VERSION 3.14) cmake_policy(SET CMP0077 NEW) project(CMSISDSP) diff --git a/Source/CommonTables/CMakeLists.txt b/Source/CommonTables/CMakeLists.txt index 44777529..d58780af 100644 --- a/Source/CommonTables/CMakeLists.txt +++ b/Source/CommonTables/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 3.6) +cmake_minimum_required (VERSION 3.14) project(CMSISDSPCommon) diff --git a/Source/ComplexMathFunctions/CMakeLists.txt b/Source/ComplexMathFunctions/CMakeLists.txt index 5283e9b1..5307a0fd 100644 --- a/Source/ComplexMathFunctions/CMakeLists.txt +++ b/Source/ComplexMathFunctions/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 3.6) +cmake_minimum_required (VERSION 3.14) project(CMSISDSPComplexMath) diff --git a/Source/ControllerFunctions/CMakeLists.txt b/Source/ControllerFunctions/CMakeLists.txt index da41e429..12dedb4a 100644 --- a/Source/ControllerFunctions/CMakeLists.txt +++ b/Source/ControllerFunctions/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 3.6) +cmake_minimum_required (VERSION 3.14) project(CMSISDSPController) diff --git a/Source/DistanceFunctions/CMakeLists.txt b/Source/DistanceFunctions/CMakeLists.txt index 63da550c..a965a91f 100755 --- a/Source/DistanceFunctions/CMakeLists.txt +++ b/Source/DistanceFunctions/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 3.6) +cmake_minimum_required (VERSION 3.14) project(CMSISDSPDistance) diff --git a/Source/FastMathFunctions/CMakeLists.txt b/Source/FastMathFunctions/CMakeLists.txt index 04a0840a..c784b52e 100644 --- a/Source/FastMathFunctions/CMakeLists.txt +++ b/Source/FastMathFunctions/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 3.6) +cmake_minimum_required (VERSION 3.14) project(CMSISDSPFastMath) diff --git a/Source/FilteringFunctions/CMakeLists.txt b/Source/FilteringFunctions/CMakeLists.txt index d5d0acbf..8ec5f383 100644 --- a/Source/FilteringFunctions/CMakeLists.txt +++ b/Source/FilteringFunctions/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 3.6) +cmake_minimum_required (VERSION 3.14) project(CMSISDSPFiltering) diff --git a/Source/MatrixFunctions/CMakeLists.txt b/Source/MatrixFunctions/CMakeLists.txt index e8838b23..00e39c63 100644 --- a/Source/MatrixFunctions/CMakeLists.txt +++ b/Source/MatrixFunctions/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 3.6) +cmake_minimum_required (VERSION 3.14) project(CMSISDSPMatrix) diff --git a/Source/SVMFunctions/CMakeLists.txt b/Source/SVMFunctions/CMakeLists.txt index 2a547386..838b78ea 100755 --- a/Source/SVMFunctions/CMakeLists.txt +++ b/Source/SVMFunctions/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 3.6) +cmake_minimum_required (VERSION 3.14) project(CMSISDSPSVM) diff --git a/Source/StatisticsFunctions/CMakeLists.txt b/Source/StatisticsFunctions/CMakeLists.txt index 20b9f8aa..8c3763c1 100644 --- a/Source/StatisticsFunctions/CMakeLists.txt +++ b/Source/StatisticsFunctions/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 3.6) +cmake_minimum_required (VERSION 3.14) project(CMSISDSPStatistics) diff --git a/Source/SupportFunctions/CMakeLists.txt b/Source/SupportFunctions/CMakeLists.txt index 0379721d..c139c54a 100644 --- a/Source/SupportFunctions/CMakeLists.txt +++ b/Source/SupportFunctions/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 3.6) +cmake_minimum_required (VERSION 3.14) project(CMSISDSPSupport) diff --git a/Source/TransformFunctions/CMakeLists.txt b/Source/TransformFunctions/CMakeLists.txt index 24115633..bcf886d2 100644 --- a/Source/TransformFunctions/CMakeLists.txt +++ b/Source/TransformFunctions/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 3.6) +cmake_minimum_required (VERSION 3.14) project(CMSISDSPTransform) diff --git a/Testing/CMakeLists.txt b/Testing/CMakeLists.txt index 63304bb3..a3f8c561 100644 --- a/Testing/CMakeLists.txt +++ b/Testing/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 3.6) +cmake_minimum_required (VERSION 3.14) cmake_policy(SET CMP0077 NEW) include(CMakePrintHelpers) @@ -82,7 +82,7 @@ option(EMBEDDED "Embedded Mode" ON) option(FLOAT16TESTS "Float16 tests" OFF) option(MICROBENCH "Micro benchmarks" OFF) -option(EXTERNALBENCH "External benchmarks" OFF) +option(EXTERNAL "External benchmarks or tests" OFF) project(Testing) @@ -98,7 +98,7 @@ set(ROOT ${CMAKE_CURRENT_SOURCE_DIR}/../../..) set(TESTFRAMEWORK ON) include(config) -if (NOT REFLIB) +if ((NOT REFLIB) AND (NOT NOCMSIS)) add_subdirectory(../Source bin_dsp) endif() @@ -124,7 +124,7 @@ if (MICROBENCH) endif() -if (EXTERNALBENCH) +if (EXTERNAL) add_subdirectory(${EXTERNALDIR} bin_external) set(STANDARDBENCH OFF) endif() @@ -182,6 +182,8 @@ set (NNSRC else() +set(STANDARDTEST ON) + set(NNSRC Source/Tests/NNSupport.cpp Source/Tests/Pooling.cpp @@ -189,6 +191,12 @@ set(NNSRC Source/Tests/FullyConnected.cpp ) +if (EXTERNAL) + add_subdirectory(${EXTERNALDIR} bin_external) + set(STANDARDTEST OFF) +endif() + +if (STANDARDTEST) set(TESTSRC Source/Tests/BasicTestsF32.cpp Source/Tests/BasicTestsQ31.cpp @@ -254,12 +262,14 @@ set(TESTSRC Source/Tests/ExampleCategoryQ7.cpp ) + if ((NOT ARMAC5) AND (FLOAT16TESTS) AND ((FLOAT16) OR (MVEF) OR (HELIUM) OR (NEON) OR (NEONEXPERIMENTAL))) set(TESTSRC16 Source/Tests/BasicTestsF16.cpp Source/Tests/TransformCF16.cpp ) endif() +endif() target_include_directories(TestingLib PUBLIC Include/Tests) @@ -338,8 +348,10 @@ SET(DSP ${ROOT}/CMSIS/DSP) target_include_directories(TestingLib PUBLIC "${DSP}/Include") target_link_libraries(TestingLib PRIVATE "${REFLIBNAME}") else() +if (NOT NOCMSIS) target_link_libraries(TestingLib PRIVATE CMSISDSP) endif() +endif() if(NN) target_link_libraries(TestingLib PRIVATE CMSISNN) @@ -348,7 +360,7 @@ target_include_directories(TestingLib PRIVATE FrameworkInclude) target_include_directories(TestingLib PRIVATE GeneratedInclude) configLib(TestingLib ${ROOT}) -configDsp(TestingLib ${ROOT}) +#configDsp(TestingLib ${ROOT}) configLib(FrameworkLib ${ROOT}) target_include_directories(FrameworkLib PRIVATE FrameworkInclude) @@ -379,7 +391,7 @@ configApp(Testing ${ROOT}) target_link_libraries(Testing PRIVATE TestingLib) target_link_libraries(Testing PRIVATE FrameworkLib) -if (EXTERNALBENCH) +if (EXTERNAL) target_include_directories(${EXTERNALPROJECT} PRIVATE FrameworkInclude) target_include_directories(${EXTERNALPROJECT} PRIVATE GeneratedInclude) target_link_libraries(TestingLib PRIVATE ${EXTERNALPROJECT})