Merge pull request #663 from intel-innersource/release-1.3.x

Release 1.3.1

.github/workflows/ci.mac.yml

@@ -0,0 +1,84 @@
+## Copyright 2022 Intel Corporation
+## SPDX-License-Identifier: Apache-2.0
+
+name: CI Mac Workflow
+on:
+  push:
+  workflow_dispatch:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  build-macOS:
+    secrets: inherit
+    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/macos.yml@main
+    with:
+      submodules: true
+      runs-on: '[ "macOS", "build", "avx2", "x86_64" ]'
+      artifact-out: build-macOS
+      artifact-path: ./build/install ./build/openvkl/build
+      cmd: |
+        gitlab/build.sh
+
+  test-macOS:
+    needs: build-macOS
+    secrets: inherit
+    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/macos.yml@main
+    with:
+      runs-on: '[ "macOS", "build", "avx2", "x86_64" ]'
+      artifact-in: build-macOS
+      cmd: |
+        export DYLD_LIBRARY_PATH=./build/install/lib
+        ./build/openvkl/build/vklTutorial
+        ./build/openvkl/build/vklTutorialISPC
+        ./build/openvkl/build/vklTests --durations yes
+
+  build-macOS-TBB2020:
+    secrets: inherit
+    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/macos.yml@main
+    with:
+      submodules: true
+      runs-on: '[ "macOS", "build", "avx2", "x86_64" ]'
+      artifact-out: build-macOS-TBB2020
+      artifact-path: ./build/install ./build/openvkl/build
+      cmd: |
+        gitlab/build.sh -D TBB_VERSION=2020.3 -D TBB_HASH=""
+
+  test-macOS-TBB2020:
+    needs: build-macOS-TBB2020
+    secrets: inherit
+    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/macos.yml@main
+    with:
+      runs-on: '[ "macOS", "build", "avx2", "x86_64" ]'
+      artifact-in: build-macOS-TBB2020
+      cmd: |
+        export DYLD_LIBRARY_PATH=./build/install/lib
+        ./build/openvkl/build/vklTutorial
+        ./build/openvkl/build/vklTutorialISPC
+        ./build/openvkl/build/vklTests --durations yes
+
+  build-macOS-arm:
+    secrets: inherit
+    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/macos.yml@main
+    with:
+      submodules: true
+      runs-on: '[ "macOS", "build", "arm" ]'
+      artifact-out: build-macOS-arm
+      artifact-path: ./build/install ./build/openvkl/build
+      cmd: |
+        gitlab/build.sh -DBUILD_TBB_FROM_SOURCE=ON
+
+  test-macOS-arm:
+    needs: build-macOS-arm
+    secrets: inherit
+    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/macos.yml@main
+    with:
+      runs-on: '[ "macOS", "build", "arm" ]'
+      artifact-in: build-macOS-arm
+      cmd: |
+        export DYLD_LIBRARY_PATH=./build/install/lib
+        ./build/openvkl/build/vklTutorial
+        ./build/openvkl/build/vklTutorialISPC
+        ./build/openvkl/build/vklTests --durations yes

.github/workflows/ci.windows.yml

@@ -0,0 +1,52 @@
+## Copyright 2022 Intel Corporation
+## SPDX-License-Identifier: Apache-2.0
+
+name: CI Windows Workflow
+on:
+  push:
+  workflow_dispatch:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  build-windows-msvc15:
+    secrets: inherit
+    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/windows.yml@main
+    with:
+      submodules: true
+      runs-on: '[ "Windows", "build" ]'
+      artifact-out: build-windows-msvc15
+      artifact-path: ./build/install
+      cmd: gitlab\build.bat "Visual Studio 15 2017 Win64" "v141"
+
+  build-windows-msvc15-TBB2020:
+    secrets: inherit
+    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/windows.yml@main
+    with:
+      submodules: true
+      runs-on: '[ "Windows", "build" ]'
+      artifact-out: build-windows-msvc15-TBB2020
+      artifact-path: ./build/install
+      cmd: gitlab\build.bat "Visual Studio 15 2017 Win64" "v141" '"-DTBB_VERSION=2020.3"' '"-DTBB_HASH="""'
+
+  test-windows-msvc15:
+    needs: build-windows-msvc15
+    secrets: inherit
+    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/windows.yml@main
+    with:
+      runs-on: '[ "Windows", "build" ]'
+      artifact-in: build-windows-msvc15
+      cmd: |
+        gitlab\run_tests.bat
+
+  test-windows-msvc15-TBB2020:
+    needs: build-windows-msvc15-TBB2020
+    secrets: inherit
+    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/windows.yml@main
+    with:
+      runs-on: '[ "Windows", "build" ]'
+      artifact-in: build-windows-msvc15-TBB2020
+      cmd: |
+        gitlab\run_tests.bat

.github/workflows/release.yml

@@ -0,0 +1,145 @@
+## Copyright 2022 Intel Corporation
+## SPDX-License-Identifier: Apache-2.0
+
+name: Release Workflow
+on:
+  push:
+    branches:
+      - '**release**'
+      - 'devel'
+      - 'master'
+  workflow_dispatch:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  kw-build-scan-report:
+    secrets: inherit
+    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/static_analysis.yml@main
+    with:
+      project: openvkl
+      submodules: true
+      prebuild: |
+        mkdir build
+        cd build
+        export LD_LIBRARY_PATH=`pwd`/install/lib:${LD_LIBRARY_PATH}
+        cmake -DBUILD_JOBS=`nproc` -DBUILD_DEPENDENCIES_ONLY=ON -DBUILD_GLFW=OFF "$@" ../superbuild
+        cmake --build .
+        mkdir openvkl_build
+        cd openvkl_build
+        DEP_INSTALL_DIR=`pwd`/../install
+        export rkcommon_DIR=$DEP_INSTALL_DIR
+        export embree_DIR=$DEP_INSTALL_DIR
+        cmake -DISPC_EXECUTABLE=$DEP_INSTALL_DIR/bin/ispc -DBUILD_EXAMPLES=OFF -DRKCOMMON_TBB_ROOT=$DEP_INSTALL_DIR ../..
+        cd ../..
+      build: cmake --build ./build/openvkl_build
+
+
+  release-linux:
+    secrets: inherit
+    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
+    with:
+      submodules: true
+      runs-on: '[ "Linux", "docker" ]'
+      image: centos:7
+      artifact-out: release-linux
+      artifact-path: ./*.gz
+      cmd: |
+        export OPENVKL_RELEASE_PACKAGE_VERSION="1.3.1"
+        module load cmake
+        module load intel/2022.1
+        export CC=icx
+        export CXX=icpx
+        export CXXFLAGS="-fPIC -fp-model=precise"
+        export LDFLAGS="-static-intel"
+        gitlab/release/linux.sh
+
+  release-windows:
+    secrets: inherit
+    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/windows.yml@main
+    with:
+      submodules: true
+      runs-on: '[ "Windows", "NAS", "build" ]'
+      artifact-out: release-windows
+      artifact-path: ./*.zip
+      cmd: |
+        $env:OPENVKL_RELEASE_PACKAGE_VERSION="1.3.1"
+        $OPENVKL_RELEASE_PACKAGE_VERSION="1.3.1"
+        gitlab/release/windows.ps1 "Visual Studio 15 2017 Win64" "v141"
+
+  release-macos:
+    secrets: inherit
+    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/macos.yml@main
+    with:
+      submodules: true
+      runs-on: '[ "macOS", "sign", "avx2", "x86_64" ]'
+      artifact-out: release-macos
+      artifact-path: ./*.zip
+      cmd: |
+        export OPENVKL_RELEASE_PACKAGE_VERSION="1.3.1"
+        gitlab/release/macos.sh
+
+  release-linux-test:
+    needs: release-linux
+    secrets: inherit
+    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
+    with:
+      runs-on: '[ "Linux", "docker" ]'
+      image: centos:7
+      artifact-in: release-linux
+      cmd: |
+        export OPENVKL_RELEASE_PACKAGE_VERSION="1.3.1"
+        gitlab/release/linux-test.sh
+
+  release-windows-test:
+    needs: release-windows
+    secrets: inherit
+    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/windows.yml@main
+    with:
+      runs-on: '[ "Windows" ]'
+      artifact-in: release-windows
+      cmd: |
+        $env:OPENVKL_RELEASE_PACKAGE_VERSION="1.3.1"
+        $OPENVKL_RELEASE_PACKAGE_VERSION="1.3.1"
+        gitlab/release/windows-test.ps1 "Visual Studio 15 2017 Win64" "v141"
+
+  release-macos-test:
+    needs: release-macos
+    secrets: inherit
+    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/macos.yml@main
+    with:
+      runs-on: '[ "macOS", "avx2", "x86_64" ]'
+      artifact-in: release-macos
+      cmd: |
+        export OPENVKL_RELEASE_PACKAGE_VERSION="1.3.1"
+        gitlab/release/macos-test.sh
+
+  binary-analysis:
+    needs:
+      - release-linux
+      - release-macos
+      - release-windows
+    secrets: inherit
+    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/binary_analysis.yml@main
+    with:
+      project: openvkl
+      artifact-in-linux: release-linux
+      artifact-in-macos: release-macos
+      artifact-in-windows: release-windows
+      path: "*.zip *.gz"
+
+  antivirus-scan:
+    needs:
+      - release-linux
+      - release-macos
+      - release-windows
+    secrets: inherit
+    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/antivirus_scan.yml@main
+    with:
+      project: openvkl
+      artifact-in-linux: release-linux
+      artifact-in-macos: release-macos
+      artifact-in-windows: release-windows
+      path: "*.zip *.gz"

CHANGELOG.md

@@ -1,6 +1,11 @@
 Version History
 ---------------
 
+### Open VKL 1.3.1
+
+-   Superbuild updates to latest versions of dependencies
+-   Note that the update to zlib v1.2.13 remedies CVE-2022-37434
+
 ### Open VKL 1.3.0
 
 -   Added AVX512 8-wide CPU device mode, enabled via the

CMakeLists.txt

@@ -17,9 +17,11 @@ set(CMAKE_DISABLE_SOURCE_CHANGES ON)
 set(CMAKE_DISABLE_IN_SOURCE_BUILD ON)
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
+cmake_policy(SET CMP0074 NEW)
+
 ## Establish project ##
 
-project(openvkl VERSION 1.3.0 LANGUAGES C CXX)
+project(openvkl VERSION 1.3.1 LANGUAGES C CXX)
 
 ## Add openvkl specific macros ##
 
@@ -52,6 +54,8 @@ find_package(rkcommon ${RKCOMMON_VERSION_REQUIRED} REQUIRED)
 get_target_property(RKCOMMON_INCLUDE_DIRS rkcommon::rkcommon
   INTERFACE_INCLUDE_DIRECTORIES)
 
+# rkcommon includes FindTBB.cmake, needed by Embree
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${rkcommon_DIR})
 
 find_package(embree 3.13.1 REQUIRED)
 openvkl_create_embree_target()