Merge branch 'release-2.5.x'

.gitignore

@@ -26,6 +26,7 @@ readme.pdf
 !/modules/pluggableGeometryExample
 !/modules/simdGeometryExample
 !/modules/denoiser
+!/modules/mpi
 *.vim
 .idea/
 premake.local.*

.gitlab-ci.yml

@@ -1,4 +1,4 @@
-## Copyright 2009-2020 Intel Corporation
+## Copyright 2009-2021 Intel Corporation
 ## SPDX-License-Identifier: Apache-2.0
 
 stages:
@@ -38,7 +38,7 @@ variables:
     paths:
       - build/install/ospray
       - build/CMakeCache.txt
-      - build/ospray/build/CMakeCache.txt
+      - build/*/build/CMakeCache.txt
     expire_in: 3 day
 
 .job_template: &release_job
@@ -62,9 +62,16 @@ variables:
 .job_template: &test_job_unix
   <<: *test_job
   script:
-    - export LSAN_OPTIONS="suppressions=$CI_PROJECT_DIR/scripts/tests/sanitize_ignore.txt"
     - LD_LIBRARY_PATH="$CI_PROJECT_DIR/build/install/ospray/lib:$LD_LIBRARY_PATH" PATH="$CI_PROJECT_DIR/build/install/ospray/bin:$PATH" scripts/tests/run_tests.sh "$CI_PROJECT_DIR"
 
+.job_template: &test_job_unix_sanitize
+  <<: *test_job
+  script:
+    - export LSAN_OPTIONS="suppressions=$CI_PROJECT_DIR/scripts/tests/sanitize_ignore.txt"
+    - export LD_LIBRARY_PATH="$CI_PROJECT_DIR/build/install/ospray/lib:$LD_LIBRARY_PATH"
+    - PATH="$CI_PROJECT_DIR/build/install/ospray/bin:$PATH" scripts/tests/run_tests.sh "$CI_PROJECT_DIR"
+    - build/install/ospray/bin/ospBenchmark --benchmark_min_time=0
+
 .job_template: &test_job_windows
   <<: *test_job
   script:
@@ -108,7 +115,7 @@ build-arch-clang-devel:
   script:
     - export CC=clang
     - export CXX=clang++
-    - scripts/build_gitlab/linux.sh -G Ninja -DBUILD_GLFW=OFF -DBUILD_OSPRAY_CI_EXTRAS=ON -DBUILD_EMBREE_FROM_SOURCE=ON -DBUILD_EMBREE_VERSION=devel -DBUILD_OIDN=ON -DBUILD_OIDN_FROM_SOURCE=ON -DBUILD_OIDN_VERSION=devel -DBUILD_OPENVKL_VERSION=devel -DBUILD_RKCOMMON_VERSION=devel 
+    - scripts/build_gitlab/linux.sh -G Ninja -DBUILD_GLFW=OFF -DBUILD_OSPRAY_CI_EXTRAS=ON -DBUILD_EMBREE_FROM_SOURCE=ON -DBUILD_EMBREE_VERSION=devel -DBUILD_OIDN=ON -DBUILD_OIDN_FROM_SOURCE=ON -DBUILD_OIDN_VERSION=devel -DBUILD_OPENVKL_VERSION=devel -DBUILD_RKCOMMON_VERSION=devel
   only: [schedules]
 
 build-linux-debug-all:
@@ -171,21 +178,40 @@ build-centos7-gcc:
   image: $DOCKER_REGISTRY/ospray/docker-images:centos7
   <<: *build_artifacts
 
-build-centos7-mpi:
+build-centos7-mpi-impi:
   <<: *build_job_docker_modules
   script:
     - module load cmake
     - module load intel
     - scripts/build_gitlab/linux.sh -DBUILD_OSPRAY_MODULE_MPI=ON
-  allow_failure: true
 
-build-centos7-mpi-devel:
+build-centos7-mpi-openmpi:
   <<: *build_job_docker_modules
   script:
     - module load cmake
-    - module load intel
-    - scripts/build_gitlab/linux.sh -DBUILD_OSPRAY_MODULE_MPI=ON -DBUILD_OSPRAY_MODULE_MPI_VERSION=devel
-  allow_failure: true
+    - module load mpi/openmpi-x86_64
+    - scripts/build_gitlab/linux.sh -DBUILD_OSPRAY_MODULE_MPI=ON
+
+build-centos7-mpi-mpich:
+  <<: *build_job_docker_modules
+  script:
+    - module load cmake
+    - module load mpi/mpich-x86_64
+    - scripts/build_gitlab/linux.sh -DBUILD_OSPRAY_MODULE_MPI=ON
+
+build-centos8-mpi-openmpi:
+  <<: *build_job_docker
+  image: $DOCKER_REGISTRY/ospray/docker-images:centos8
+  script:
+    - module load mpi/openmpi-x86_64
+    - scripts/build_gitlab/linux.sh -DBUILD_OSPRAY_MODULE_MPI=ON
+
+build-centos8-mpi-mpich:
+  <<: *build_job_docker
+  image: $DOCKER_REGISTRY/ospray/docker-images:centos8
+  script:
+    - module load mpi/mpich-x86_64
+    - scripts/build_gitlab/linux.sh -DBUILD_OSPRAY_MODULE_MPI=ON
 
 build-linux-debug:
   <<: *build_job_docker
@@ -205,33 +231,33 @@ build-osx-clang:
     - scripts/build_gitlab/macosx.sh
   <<: *build_artifacts
 
-build-windows-msvc14:
+build-windows-msvc15:
   stage: build
   tags:
-    - msvc14
     - win
+    - msvc15
   script:
-    - scripts\build_gitlab\win.ps1 "Visual Studio 14 2015 Win64" "v140" "Release"
+    - scripts\build_gitlab\win.ps1 "Visual Studio 15 2017 Win64" "v141" "Release"
   <<: *build_artifacts
 
-build-windows-msvc15:
+build-windows-debug-all:
   stage: build
   tags:
-    - msvc15
     - win
+    - msvc15
   script:
-    - scripts\build_gitlab\win.ps1 "Visual Studio 15 2017 Win64" "v141" "Release"
+    - scripts\build_gitlab\win.ps1 "Visual Studio 15 2017 Win64" "v141" "Debug"
   <<: *build_artifacts
+  only: [schedules]
 
-build-windows-debug-all:
+build-windows-msvc16:
   stage: build
   tags:
-    - msvc15
     - win
+    - msvc16
   script:
-    - scripts\build_gitlab\win.ps1 "Visual Studio 15 2017 Win64" "v141" "Debug"
+    - scripts\build_gitlab\win.ps1 "Visual Studio 16 2019" "v142" "Release"
   <<: *build_artifacts
-  only: [schedules]
 
 #build-windows-icc:
 #  stage: build
@@ -270,8 +296,8 @@ test-ubuntu2004-gcc:
   image: $DOCKER_REGISTRY/ospray/docker-images:ubuntu20.04
   needs: [build-ubuntu2004-gcc]
 
-test-linux-debug:
-  <<: *test_job_unix
+sanitize-linux-debug:
+  <<: *test_job_unix_sanitize
   image: $DOCKER_REGISTRY/ospray/docker-images:arch
   needs: [build-linux-debug]
 
@@ -307,16 +333,9 @@ test-find-ospray:
     - module load cmake
     - mkdir buildtut
     - cd buildtut
-    - cmake -D ospray_DIR=`echo $CI_PROJECT_DIR/build/install/ospray/lib/cmake/ospray-*` ../apps/ospTutorial/ospTutorialFindospray 
+    - cmake -D ospray_DIR=`echo $CI_PROJECT_DIR/build/install/ospray/lib/cmake/ospray-*` ../apps/ospTutorial/ospTutorialFindospray
     - cmake --build .
 
-test-windows-msvc14:
-  <<: *test_job_windows
-  tags:
-    - win
-    - msvc14
-  needs: [build-windows-msvc14]
-
 test-windows-msvc15:
   <<: *test_job_windows
   tags:
@@ -332,6 +351,13 @@ test-windows-debug-all:
   needs: [build-windows-debug-all]
   only: [schedules]
 
+test-windows-msvc16:
+  <<: *test_job_windows
+  tags:
+    - win
+    - msvc16
+  needs: [build-windows-msvc16]
+
 generate-ci-baseline:
   <<: *test_job_unix
   image: $DOCKER_REGISTRY/ospray/docker-images:ubuntu18.04
@@ -402,6 +428,7 @@ release-osx-clang:
   tags:
     - clang
     - osx
+    - sign
   script:
     - export CC=clang
     - export CXX=clang++
@@ -417,7 +444,7 @@ release-osx-clang:
 release-windows:
   <<: *release_job
   tags:
-    - msvc14
+    - msvc15
     - win
   script:
     - scripts\release\win.ps1 "Visual Studio 15 2017 Win64"
@@ -431,17 +458,18 @@ release-windows:
 
 ### SCAN JOBS ###
 
-build-kw:
+kw-build:
   stage: scan1
   tags: [docker]
   image: $DOCKER_REGISTRY/ospray/docker-images:centos7
   needs: []
   script:
     - scripts/build_gitlab/kw.sh
-    - test -s $CI_PROJECT_DIR/kw_build_number
+    - test -s $CI_PROJECT_DIR/klocwork/build.log
+    - test -s $CI_PROJECT_DIR/klocwork/build_name
   artifacts:
     paths:
-        - $CI_PROJECT_DIR/kw_build_number
+        - ./klocwork/*
     expire_in: 3 day
 
 protex:
@@ -452,28 +480,47 @@ protex:
   script:
     - scripts/scan/protex.sh
 
-kw-critical:
+kw-scan:
   stage: scan2
   tags: [docker]
   image: $DOCKER_REGISTRY/ospray/docker-images:centos7
-  needs: [build-kw]
+  needs: [kw-build]
   script:
-    - scripts/scan/kw.sh
+    - scripts/scan/kw-check-issues.sh
+
+kw-gen-report:
+  stage: scan2
+  tags: [docker]
+  image: $DOCKER_REGISTRY/ospray/docker-images:centos7
+  needs: [kw-build]
+  only:
+    - devel
+    - master
+    - /release/
+  script:
+    - scripts/scan/kw-gen-report.sh
+    - scripts/scan/store-files.sh $CI_PROJECT_NAME $CI_PIPELINE_ID klocwork "klocwork/report.log"
+  artifacts:
+    paths:
+      - ./klocwork/report.log
 
 bdba:
   <<: *release_job
   stage: scan3
   tags: [docker]
-  image: $DOCKER_REGISTRY/ospray/docker-images:centos7 
+  image: $DOCKER_REGISTRY/ospray/docker-images:centos7
   needs:
     - release-linux
     - release-osx-clang
     - release-windows
   script:
     - scripts/scan/bdba.sh "build_release/ospray*"
+    - scripts/scan/store-files.sh $CI_PROJECT_NAME $CI_PIPELINE_ID bdba "ospray-*.pdf"
+    - scripts/scan/store-files.sh $CI_PROJECT_NAME $CI_PIPELINE_ID bdba "ospray-*.csv"
   artifacts:
     paths:
       - build_release/ospray-*
+      - ospray-*
 
 av:
   <<: *release_job
@@ -485,8 +532,9 @@ av:
     - release-osx-clang
     - release-windows
   script:
-    - freshclam
-    - clamscan -va --max-filesize=256M --max-scansize=1024M --alert-broken --alert-exceeds-max build_release/ospray-*
+    - freshclam | tee -a /tmp/av_scan.log
+    - clamscan -va --max-filesize=256M --max-scansize=1024M --alert-broken --alert-exceeds-max build_release/ospray-* | tee -a /tmp/av_scan.log
+    - scripts/scan/store-files.sh $CI_PROJECT_NAME $CI_PIPELINE_ID av /tmp/av_scan.log
   artifacts:
     paths:
       - build_release/ospray-*
@@ -495,7 +543,7 @@ test-release-linux:
   <<: *test_job
   <<: *release_job
   stage: scan3
-  image: $DOCKER_REGISTRY/ospray/docker-images:centos7 
+  image: $DOCKER_REGISTRY/ospray/docker-images:centos7
   needs: [release-linux]
   script:
     - tar xzf build_release/*.gz
@@ -505,7 +553,7 @@ test-release-osx:
   <<: *test_job
   <<: *release_job
   stage: scan3
-  tags: [osx]
+  tags: [osx, sign]
   needs: [release-osx-clang]
   script:
     - unzip build_release/*.zip
@@ -546,5 +594,5 @@ mirror:
   only: [devel]
   dependencies: []
   script:
-    - git remote add github https://${GITHUB_TOKEN}github.com/ospray/OSPRay.git
+    - git remote add github https://${GITHUB_TOKEN}github.com/ospray/ospray.git
     - git push github HEAD:devel