diff --git a/.gitlab/common.yml b/.gitlab/common.yml index ed22988426b4813a040886c018a384c1008993df..624b2b9811b052068aa6b0542ce529d9ff82c695 100644 --- a/.gitlab/common.yml +++ b/.gitlab/common.yml @@ -79,7 +79,7 @@ paths: - "chameleon-$NODE-$MPI-$SLURM_NP.err" - "chameleon-$NODE-$MPI-$SLURM_NP.out" - - "build-$NODE-$MPI/chameleon.csv" + - "tools/bench/plafrim/chameleon.csv" - "tools/bench/plafrim/results/$JUBE_ID" variables: PLATFORM: plafrim diff --git a/tools/bench/chameleon_guix.sh b/tools/bench/chameleon_guix.sh index 5c1c641f63469377b06e852f94a9c32bc7e6e873..a5847949dd83a2c51ee2829e2ba8d290f36a4bc6 100755 --- a/tools/bench/chameleon_guix.sh +++ b/tools/bench/chameleon_guix.sh @@ -4,7 +4,6 @@ set -x # Configure and Build Chameleon mkdir -p $CI_PROJECT_DIR/build-$NODE-$MPI -cp $CI_PROJECT_DIR/guix.json $CI_PROJECT_DIR/build-$NODE-$MPI/ cd $CI_PROJECT_DIR/build-$NODE-$MPI rm CMake* -rf cmake $CHAMELEON_BUILD_OPTIONS .. @@ -12,14 +11,16 @@ make -j20 VERBOSE=1 export CHAMELEON_BUILD=$PWD # clean old benchmarks -jube remove --id $JUBE_ID +cd $CI_PROJECT_DIR/tools/bench/$PLATFORM/results +jube remove --force --id $JUBE_ID # Execute jube benchmarks -jube run $CI_PROJECT_DIR/tools/bench/$PLATFORM/chameleon.xml --tag gemm potrf geqrf --include-path $CI_PROJECT_DIR/tools/bench/$PLATFORM/parameters/$NODE --id $JUBE_ID +cd $CI_PROJECT_DIR/tools/bench/$PLATFORM/ +jube run chameleon.xml --tag gemm potrf geqrf --include-path parameters/$NODE --id $JUBE_ID # jube analysis -jube analyse $CI_PROJECT_DIR/tools/bench/$PLATFORM/results --id $JUBE_ID +jube analyse results --id $JUBE_ID # jube report -jube result $CI_PROJECT_DIR/tools/bench/$PLATFORM/results --id $JUBE_ID > chameleon.csv +jube result results --id $JUBE_ID > chameleon.csv # send results to the elasticsearch server -export PYTHONPATH=$GUIX_ENVIRONMENT/lib/python3.7/site-packages +cp $CI_PROJECT_DIR/guix.json . python3 $CI_PROJECT_DIR/tools/bench/jube/add_result.py -e https://elasticsearch.bordeaux.inria.fr -t hiepacs -p "chameleon" -h $NODE -m $MPI chameleon.csv