Merge branch 'ci-update-docker' into 'master'

Update docker environment, use shared runners, and plafrim for cuda/rocm

See merge request !501

cmake_modules/ChameleonPkgConfig.cmake

@@ -8,7 +8,7 @@
 ###
 #
 #  @project Chameleon
-#  @version 1.2.0
+#  @version 1.3.0
 #  @author Mathieu Faverge
 #  @author Florent Pruvost
 #  @author Abel Calluaud
@@ -93,7 +93,6 @@ macro(chameleon_generate_pkgconfig_files)
 
     if(CHAMELEON_USE_CUDA)
       list(APPEND GPUCUBLAS_PKGCONFIG_LIBS_PRIVATE ${CUDA_CUBLAS_LIBRARIES})
-      list(APPEND GPUCUBLAS_PKGCONFIG_REQUIRED "cuda")
       list(APPEND CHAMELEON_PKGCONFIG_REQUIRED "gpucublas")
     endif()
 
@@ -110,7 +109,28 @@ macro(chameleon_generate_pkgconfig_files)
   )
 
   if(CHAMELEON_USE_MPI)
-    list(APPEND CHAMELEON_PKGCONFIG_REQUIRED "mpi")
+    if(${MPI_C_LIBRARIES} MATCHES "mpich")
+      set(MPI_NAME "mpich")
+    elseif(${MPI_C_LIBRARIES} MATCHES "mvapich2")
+      set(MPI_NAME "mvapich2")
+    elseif(${MPI_C_LIBRARIES} MATCHES "madmpi" OR ${MPI_C_LIBRARIES} MATCHES "nmad")
+      set(MPI_NAME "nmad")
+    elseif(${MPI_C_LIBRARIES} MATCHES "openmpi")
+      set(MPI_NAME "ompi")
+    else()
+      set(MPI_NAME "mpi")
+    endif()
+    find_file(MPIPC_PATH "${MPI_NAME}.pc"
+              HINTS ${CMAKE_C_IMPLICIT_LINK_DIRECTORIES}
+              ENV PKG_CONFIG_PATH
+              PATH_SUFFIXES pkgconfig
+              NO_CACHE)
+    if(MPIPC_PATH)
+      list(APPEND CHAMELEON_PKGCONFIG_REQUIRED ${MPI_NAME})
+    else()
+      list(APPEND CHAMELEON_PKGCONFIG_INCS "${MPI_C_INCLUDE_DIRS}")
+      list(APPEND CHAMELEON_PKGCONFIG_LIBS "${MPI_C_LIBRARIES}")
+    endif()
   endif()
 
   generate_pkgconfig_files(

doc/dev/CMakeLists.txt

@@ -30,7 +30,7 @@ cmake_minimum_required(VERSION 3.5)
 
 # Looking for doxygen
 # -------------------
-find_package(Doxygen)
+find_package(Doxygen REQUIRED)
 
 # Generate documentation
 # ----------------------

doc/user/CMakeLists.txt

@@ -68,10 +68,10 @@ endforeach()
 
 # Looking for emacs
 # -----------------
-FIND_PROGRAM(EMACS_COMPILER emacs)
-FIND_PROGRAM(TEX_COMPILER tex)
+find_program(EMACS_COMPILER emacs REQUIRED)
 
 if(EMACS_COMPILER)
+    message(STATUS "Looking for emacs - found")
 
     # Add target for homepage
     # -----------------------

doc/user/homepage.org

@@ -6,7 +6,7 @@
 #+OPTIONS: H:3 num:t \n:nil @:t ::t |:t _:nil ^:nil -:t f:t *:t <:t
 #+OPTIONS: TeX:t LaTeX:t skip:nil d:nil pri:nil tags:not-in-toc html-style:nil
 # #+HTML_LINK_HOME: https://solverstack.gitlabpages.inria.fr/chameleon/
-#+SETUPFILE: https://mfelsoci.gitlabpages.inria.fr/inria-org-html-themes/online-theme-readtheorginria.setup
+#+SETUPFILE: https://solverstack.gitlabpages.inria.fr/inria-org-html-themes/online-theme-readtheorginria.setup
 
 * Overview
 :PROPERTIES:

doc/user/publish.el

@@ -9,6 +9,8 @@
 (require 'org)
 (require 'htmlize)
 
+(setq org-safe-remote-resources '("https://solverstack.gitlabpages.inria.fr/inria-org-html-themes/online-theme-readtheorginria.setup"))
+
 (setq org-html-htmlize-output-type 'css)
 (setq org-src-fontify-natively t)
 (org-babel-do-load-languages

tools/analysis.sh

@@ -23,7 +23,8 @@
 # - consider generated files in ${BUILDDIR}
 # - exclude base *z* files to avoid duplication
 # - exclude cblas.h and lapacke-.h because not really part of chameleon and make cppcheck analysis too long
-
+set -e
+set -x
 if [ $# -gt 0 ]
 then
     BUILDDIR=$1
@@ -37,7 +38,7 @@ $TOOLSDIR/find_sources.sh
 export UNDEFINITIONS="-UCHAMELEON_USE_OPENCL -UWIN32 -UWIN64 -U_MSC_EXTENSIONS -U_MSC_VER -U__SUNPRO_C -U__SUNPRO_CC -U__sun -Usun -U__cplusplus"
 
 # run cppcheck analysis
-CPPCHECK_OPT=" -v -f --language=c --platform=unix64 --enable=all --xml --xml-version=2 --suppress=missingInclude ${UNDEFINITIONS}"
+CPPCHECK_OPT=" -v -f --language=c --platform=unix64 --enable=all --xml --xml-version=2 --suppress=missingIncludeSystem ${UNDEFINITIONS}"
 cppcheck $CPPCHECK_OPT --file-list=./filelist_none.txt 2> chameleon_cppcheck.xml
 cppcheck $CPPCHECK_OPT -DPRECISION_s -UPRECISION_d -UPRECISION_c -UPRECISION_z --file-list=./filelist_s.txt 2>> chameleon_cppcheck.xml
 cppcheck $CPPCHECK_OPT -DPRECISION_d -UPRECISION_s -UPRECISION_c -UPRECISION_z --file-list=./filelist_d.txt 2>> chameleon_cppcheck.xml
@@ -68,6 +69,7 @@ sonar.scm.exclusions.disabled=true
 
 sonar.sources=build-openmp/runtime/openmp, build-parsec/runtime/parsec, build-quark/runtime/quark, build-starpu, compute, control, coreblas, example, include, runtime, testing
 sonar.inclusions=`cat filelist.txt | sed ':a;N;$!ba;s/\n/, /g'`
+sonar.coverage.exclusions=build-starpu/gpucublas/**/*,build-starpu/gpuhipblas/**/*
 sonar.sourceEncoding=UTF-8
 sonar.cxx.file.suffixes=.h,.c
 sonar.cxx.errorRecoveryEnabled=true

tools/bench/jube/get_result.py

@@ -11,7 +11,6 @@
 #
 import pandas
 import click
-import csv
 from elasticsearch import Elasticsearch
 
 @click.command()
@@ -57,7 +56,7 @@ def main(
         doc_data = doc_data.drop(labels=['Commit_date_chameleon', 'Commit_sha_chameleon', 'Commit_sha_guix', 'Commit_sha_guix_hpc', 'Commit_sha_guix_hpcnonfree'])
 
         # append the Series object to the DataFrame object
-        docs = docs.append(doc_data)
+        docs = pandas.concat([docs, doc_data.to_frame().T])
 
     docs = docs.astype({"Nmpi": int, "Nthread": int, "Ngpu": int, "P": int, "Q": int, "M": int, "N": int, "K": int})
     docs = docs.rename(columns=str.lower)

tools/coverity.sh

+#!/usr/bin/env bash
+#
+# @file coverity.sh
+#
+# @copyright 2024-2024 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria,
+#                      Univ. Bordeaux. All rights reserved.
+#
+# @version 1.3.0
+# @author Florent Pruvost
+# @date 2024-11-27
+#
+set -e
+set -x
+CHAMELEON_SRC_DIR=${CHAMELEON_SRC_DIR:-$PWD}
+
+# install plotting dependencies in the testing docker image
+CURRENTUSER=`whoami`
+if [[ -f /.dockerenv && $CURRENTUSER == "gitlab" ]]; then
+  export PKG_CONFIG_PATH=/home/gitlab/install/starpu/lib/pkgconfig:$PKG_CONFIG_PATH
+fi
+
+cmake -B build-$VERSION -C cmake_modules/gitlab-ci-initial-cache.cmake -DCHAMELEON_USE_CUDA=OFF -DCHAMELEON_USE_MPI=ON
+cov-build --dir cov-int/ cmake --build build-$VERSION -j4
+tar czvf chameleon.tgz cov-int/
+curl --form token=$COVERITY_TOKEN \
+     --form email=florent.pruvost@inria.fr \
+     --form file=@chameleon.tgz \
+     --form version="`git rev-parse --short HEAD`" \
+     --form description="" \
+     https://scan.coverity.com/builds?project=Chameleon

tools/find_sources.sh

@@ -12,7 +12,7 @@
 #
 #set -x
 
-SRCDIR_TO_ANALYZE="build-openmp/runtime/openmp build-parsec/runtime/parsec build-quark/runtime/quark build-starpu build compute control coreblas example include runtime testing"
+SRCDIR_TO_ANALYZE="build-openmp/runtime/openmp build-parsec/runtime/parsec build-quark/runtime/quark build-starpu compute control coreblas example include runtime testing"
 
 echo $PWD
 rm -f filelist.txt

tools/homebrew/starpu.rb

@@ -13,8 +13,8 @@
 class Starpu < Formula
   desc "StarPU is a task programming library for hybrid architectures"
   homepage "https://starpu.gitlabpages.inria.fr/"
-  url "https://files.inria.fr/starpu/starpu-1.4.6/starpu-1.4.6.tar.gz"
-  sha256 "579f38e150ab78c9ab299649d8649a043dbf49786e54acbf3dad90c160672cc7"
+  url "https://files.inria.fr/starpu/starpu-1.4.7/starpu-1.4.7.tar.gz"
+  sha256 "1eb3df551089153fe6e0b172ad95118434b4a81ea9eaa5a2c38725d0db53b13e"
   license "GNU GPL v2.1"
 
   depends_on "autoconf" => :build

tools/pages.sh

@@ -5,13 +5,15 @@
 # @copyright 2020-2024 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria,
 #                      Univ. Bordeaux. All rights reserved.
 #
-# @version 1.2.0
+# @version 1.3.0
 # @author Florent Pruvost
 # @date 2022-02-22
 #
+set -e
+set -x
 CHAMELEON_SRC_DIR=${CHAMELEON_SRC_DIR:-$PWD}
 
-mkdir tmp_fig
+mkdir -p tmp_fig
 cd tmp_fig
 
 ## need to generate figures from last benchmarks
@@ -49,22 +51,23 @@ cd ..
 
 ## Build the doc
 VERSION=${VERSION:-pages}
-mkdir -p build-$VERSION
-cd build-$VERSION
-
-cmake $CHAMELEON_SRC_DIR -DCHAMELEON_ENABLE_DOC=ON
-make doc -j5
+cmake -S ${CHAMELEON_SRC_DIR} -B build-$VERSION -DCHAMELEON_ENABLE_DOC=ON
+cmake --build build-$VERSION --target doc --verbose -j5
 
 ## Copy files in public/ used as an artefact (zip archive) to upload on gitlab pages, see
-## Homepage: https://solverstack.gitlabpages.inria.fr/chameleon/index.html
-## API: https://solverstack.gitlabpages.inria.fr/chameleon/dev/index.html
-cd ..
-mkdir public/
-mkdir public/dev/
+mkdir -p public/dev/
+
+## Homepage (user's guide): https://solverstack.gitlabpages.inria.fr/chameleon/index.html
 cp build-$VERSION/doc/user/*.html public/
 cp build-$VERSION/doc/user/*.png public/
 cp build-$VERSION/doc/user/*.jpg public/
 cp build-$VERSION/doc/user/*.svg public/
+
+## API (doxygen): https://solverstack.gitlabpages.inria.fr/chameleon/dev/index.html
 cp -r build-$VERSION/doc/dev/html/* public/dev/
+
+## Images such as last performances on plafrim
 cp tmp_fig/* public/
+
+## lcov code coverage: https://solverstack.gitlabpages.inria.fr/chameleon/coverage/
 cp -r coverage public/