Merge branch 'simpletrack-tmp' into 'qa'

Switching to tmp for output

See merge request !14

.gitlab-ci.yml

@@ -61,7 +61,8 @@ simpletrack:
     strategy: depend
   only:
     variables:
-    - $CI_COMMIT_BRANCH == "qa"
+    - $CI_COMMIT_BRANCH =~ /^qa.*$/
+    - $CI_COMMIT_TAG =~ /^v.*$/
     changes:
     - lhc/simpletrack/Dockerfile.*
     - lhc/simpletrack/lhc-simpletrack.*

lhc/simpletrack/CHANGELOG.md

-# 0.3.0 (June 28th 2020)
+# QA
+
+FIXES:
+* For unpriviledged Singularity runs switched to /tmp/jobs as output folder. 
+
+# Master
 
 UPDATES:
 * intel: NEO version updated to 20.25.17111 and oneAPI DPC++ to 2020.10.6.0.4 (June releases).
 * ROCm container added
 
+CHANGES:
+* Tagged build based on the spec definition.
+* Using trigger-based build to rebuild only on simpletrack changes.
+* CI/CD basic functionality test added for the CPU-based container builds i.e. intel and pocl
+
 FEATURES:
 * Switched to argument for benchmark setup instead of environment variables.
-
-# 0.2.1 (June 25th 2020)
+* Added "benchmark" mode to run and generate json output for the runs.
+* Generate yaml alongside the json summary.
+* Standalone execution of the simpletrack benchmark without an orchestrator.
 
 FIXES:
 * ocl-icd-dev package explicitely installed now to avoid build failures.
-
-# 0.2.0 (June 16th 2020)
-
-FIXES:
 * Using simpletrack device lists instead of clinfo.
 
-FEATURES:
-* Added "benchmark" mode to run and generate json output for the runs.
-* Generate yaml alongside the json summary.
-
-# 0.1.0 (June 13th 2020)
-
-FEATURES:
-* Standalone execution of the simpletrack benchmark without an orchestrator.
-
-CHANGES:
-* Tagged build based on the spec definition.
-* Using trigger-based build to rebuild only on simpletrack changes.
-* CI/CD basic functionality test added for the CPU-based container builds i.e. intel and pocl

lhc/simpletrack/README.md

@@ -10,7 +10,7 @@ Docker images containing OpenCL-oriented Simpletrack benchmark built for a selec
 |              | __intel__   | __rocm__  | __nvidia__ | __pocl__   |
 |--------------|:-----------:|:-----------:|:--------:|:----------:|
 | __GPU__      | :heavy_check_mark:  | :heavy_check_mark: | :heavy_check_mark: |        |       
-| __CPU__      | :heavy_check_mark:  | :grey_question:    |                    | :heavy_check_mark: |
+| __CPU__      | :heavy_check_mark:  |                    |                    | :heavy_check_mark: |
 
 # Usage
 
@@ -33,15 +33,15 @@ Options:
 - Use the benchmark option "all" to execute runs on all available devices: ```~$ docker run --rm <image:tag> -b "all"```
 - To discover available platforms use the show option: ```~$ docker run --rm <image:tag> -s```
 
-The benchmark mode allows to generate logs and output files in a default location (/simpletrack/examples/lhc/jobs or $CI_PROJECT_DIR) for either a single or all available devices.
+The benchmark mode allows to generate logs and output files in a default location (/tmp/jobs or $CI_PROJECT_DIR) for either a single or all available devices.
 
-## Docker GPU Passthrough
+## GPU Passthrough
 
 To passthrough the device to the container, use the following options:
 
-| Target      | Passthrough option |
-|:------------|:-------------------|
-| __Nvidia__  | ```--gpus all```   |
-| __AMD__     | ```--device /dev/kfd --device /dev/dri``` |
-| __Intel__   | ```--device /dev/dri``` |
+| Target      | Docker             | Singularity |
+|:------------|:-------------------|:------------|
+| __Nvidia__  | ```--gpus all```   | ```--nv```  |
+| __AMD__     | ```--device /dev/kfd --device /dev/dri``` | ```--rocm``` |
+| __Intel__   | ```--device /dev/dri``` | |
 

lhc/simpletrack/lhc-simpletrack.sh

@@ -73,7 +73,7 @@ get_json() {
 ###################################
 ####### Main ######################
 
-if [ ! "$CI_PROJECT_DIR" == "" ]; then WORK_DIR=$CI_PROJECT_DIR/jobs; else WORK_DIR=`pwd`/jobs; fi
+if [ ! "$CI_PROJECT_DIR" == "" ]; then WORK_DIR=$CI_PROJECT_DIR/jobs; else WORK_DIR="/tmp/jobs"; fi
 
 if [ ! -d $WORK_DIR ]; then mkdir -p $WORK_DIR; fi
 if [ -f $WORK_DIR/out.log ]; then rm $WORK_DIR/out.log; fi