diff --git a/.gitlab/sonarqube.yml b/.gitlab/sonarqube.yml index c8372797adaaf97afbc5f571bad0bd66e90aa83e..20f9dab5ad406dd5362f2ff6a80d078fdec78964 100644 --- a/.gitlab/sonarqube.yml +++ b/.gitlab/sonarqube.yml @@ -3,6 +3,18 @@ sonarqube: stage: analyse extends: - .only-master + needs: [test_openmp_shm_c,test_openmp_shm_d,test_openmp_shm_s,test_openmp_shm_z, + test_parsec_shm_c,test_parsec_shm_d,test_parsec_shm_s,test_parsec_shm_z, + test_quark_shm_c,test_quark_shm_d,test_quark_shm_s,test_quark_shm_z, + test_starpu_shm_c,test_starpu_shm_d,test_starpu_shm_s,test_starpu_shm_z, + test_starpu_mpi_c,test_starpu_mpi_d,test_starpu_mpi_s,test_starpu_mpi_z, + test_starpu_simgrid_simu_all] + dependencies: [test_openmp_shm_c,test_openmp_shm_d,test_openmp_shm_s,test_openmp_shm_z, + test_parsec_shm_c,test_parsec_shm_d,test_parsec_shm_s,test_parsec_shm_z, + test_quark_shm_c,test_quark_shm_d,test_quark_shm_s,test_quark_shm_z, + test_starpu_shm_c,test_starpu_shm_d,test_starpu_shm_s,test_starpu_shm_z, + test_starpu_mpi_c,test_starpu_mpi_d,test_starpu_mpi_s,test_starpu_mpi_z, + test_starpu_simgrid_simu_all] variables: VERSION: sonarqube script: diff --git a/.gitlab/test_starpu.yml b/.gitlab/test_starpu.yml index 21fd6611d62035e85e2447f33845858f11de9868..2574cdc8a80a980549619f0f0e1dd773a509df17 100644 --- a/.gitlab/test_starpu.yml +++ b/.gitlab/test_starpu.yml @@ -90,8 +90,8 @@ test_starpu_shm_s_macosx: - cd build-starpu && ctest --no-compress-output -R test_shm_s -T Test --output-junit ../chameleon_macosx.junit | tee -a ../chameleon_macosx.log artifacts: name: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG" - paths: ['chameleon_macosx.log'] expire_in: 2 days + untracked: true when: always reports: junit: chameleon_macosx.junit diff --git a/coreblas/compute/core_zprint.c b/coreblas/compute/core_zprint.c index 0e4fdc887f0c47ca85d4900e1ff52341e9f8bc83..c28bf5edd73f5dff173f44f495c82198f336e65c 100644 --- a/coreblas/compute/core_zprint.c +++ b/coreblas/compute/core_zprint.c @@ -9,7 +9,7 @@ * * @brief Chameleon core_zprint CPU kernel * - * @version 1.0.0 + * @version 1.2.0 * @author Mathieu Faverge * @date 2020-03-03 * @precisions normal z -> c d s diff --git a/include/chameleon/descriptor_helpers.h b/include/chameleon/descriptor_helpers.h index 632dc0b0fe17b1b9412331ce8013ccae9ccc38ee..c732e930c8e05824da8ebf675bc38126f5a21ea7 100644 --- a/include/chameleon/descriptor_helpers.h +++ b/include/chameleon/descriptor_helpers.h @@ -11,7 +11,7 @@ * * @brief Set of functions to help the user to declare matrix descriptors (allocation, mapping... ) * - * @version 1.0.0 + * @version 1.2.0 * @author Jakub Kurzak * @author Mathieu Faverge * @author Cedric Castagnede diff --git a/runtime/starpu/control/runtime_tags.c b/runtime/starpu/control/runtime_tags.c index 80705fc44f037c2bd094ea048aabe48add557612..08d0366da0417ce70251034c630edb103548e394 100644 --- a/runtime/starpu/control/runtime_tags.c +++ b/runtime/starpu/control/runtime_tags.c @@ -5,7 +5,7 @@ * @copyright 2017-2023 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria, * Univ. Bordeaux. All rights reserved. * - * @version 1.3.0 + * @version 1.2.0 * @author Pierre Ramet * @author Mathieu Faverge * @date 2021-10-04 diff --git a/tools/analysis.sh b/tools/analysis.sh index 8fe79adcff8183bec01ffcac24d5052942203fb0..445817bdf68bcdf36d2a4deb321b0ae61528fcdc 100755 --- a/tools/analysis.sh +++ b/tools/analysis.sh @@ -45,6 +45,9 @@ cppcheck $CPPCHECK_OPT -DPRECISION_d -UPRECISION_s -UPRECISION_c -UPRECISION_z - cppcheck $CPPCHECK_OPT -DPRECISION_c -UPRECISION_s -UPRECISION_d -UPRECISION_z --file-list=./filelist_c.txt 2>> chameleon_cppcheck.xml cppcheck $CPPCHECK_OPT -DPRECISION_z -UPRECISION_s -UPRECISION_d -UPRECISION_c --file-list=./filelist_z.txt 2>> chameleon_cppcheck.xml +# merge all different compile_commands.json files from build-* directories into one single file for sonarqube +jq -s 'map(.[])' $PWD/build-*/compile_commands.json > compile_commands.json + # Set the default for the project key SONARQUBE_PROJECTKEY=${SONARQUBE_PROJECTKEY:-hiepacs:chameleon:gitlab:$CI_PROJECT_NAMESPACE} @@ -60,7 +63,7 @@ sonar.links.issue=$CI_PROJECT_URL/issues sonar.projectKey=$SONARQUBE_PROJECTKEY sonar.projectDescription=Dense linear algebra subroutines for heterogeneous and distributed architectures -sonar.projectVersion=1.1.2 +sonar.projectVersion=1.2.0 sonar.scm.disabled=false sonar.scm.provider=git @@ -79,7 +82,7 @@ sonar.cxx.xunit.reportPaths=*.junit sonar.cxx.cobertura.reportPaths=*.cov sonar.cxx.cppcheck.reportPaths=chameleon_cppcheck.xml sonar.cxx.clangsa.reportPaths=build-openmp/analyzer_reports/*/*.plist, build-parsec/analyzer_reports/*/*.plist, build-quark/analyzer_reports/*/*.plist, build-starpu/analyzer_reports/*/*.plist, build-starpu_simgrid/analyzer_reports/*/*.plist -sonar.cxx.jsonCompilationDatabase=build-openmp/compile_commands.json, build-parsec/compile_commands.json, build-quark/compile_commands.json, build-starpu/compile_commands.json, build-starpu_simgrid/compile_commands.json +sonar.cxx.jsonCompilationDatabase=compile_commands.json EOF # run sonar analysis + publish on sonarqube-dev