Skip to content

Commit 0f55eeb

Browse files
TrevorThomsonTrevorThomson
authored
Merge pull request #663 from intel-innersource/release-1.3.x
Release 1.3.1
2 parents ec551ea + 5c3a828 commit 0f55eeb

26 files changed

+1499
-758
lines changed

‎.github/workflows/ci.linux.yml‎

Lines changed: 484 additions & 0 deletions
Large diffs are not rendered by default.

‎.github/workflows/ci.mac.yml‎

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
## Copyright 2022 Intel Corporation
2+
## SPDX-License-Identifier: Apache-2.0
3+
4+
name: CI Mac Workflow
5+
on:
6+
push:
7+
workflow_dispatch:
8+
9+
concurrency:
10+
group: ${{ github.workflow }}-${{ github.ref }}
11+
cancel-in-progress: true
12+
13+
jobs:
14+
build-macOS:
15+
secrets: inherit
16+
uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/macos.yml@main
17+
with:
18+
submodules: true
19+
runs-on: '[ "macOS", "build", "avx2", "x86_64" ]'
20+
artifact-out: build-macOS
21+
artifact-path: ./build/install ./build/openvkl/build
22+
cmd: |
23+
gitlab/build.sh
24+
25+
test-macOS:
26+
needs: build-macOS
27+
secrets: inherit
28+
uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/macos.yml@main
29+
with:
30+
runs-on: '[ "macOS", "build", "avx2", "x86_64" ]'
31+
artifact-in: build-macOS
32+
cmd: |
33+
export DYLD_LIBRARY_PATH=./build/install/lib
34+
./build/openvkl/build/vklTutorial
35+
./build/openvkl/build/vklTutorialISPC
36+
./build/openvkl/build/vklTests --durations yes
37+
38+
build-macOS-TBB2020:
39+
secrets: inherit
40+
uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/macos.yml@main
41+
with:
42+
submodules: true
43+
runs-on: '[ "macOS", "build", "avx2", "x86_64" ]'
44+
artifact-out: build-macOS-TBB2020
45+
artifact-path: ./build/install ./build/openvkl/build
46+
cmd: |
47+
gitlab/build.sh -D TBB_VERSION=2020.3 -D TBB_HASH=""
48+
49+
test-macOS-TBB2020:
50+
needs: build-macOS-TBB2020
51+
secrets: inherit
52+
uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/macos.yml@main
53+
with:
54+
runs-on: '[ "macOS", "build", "avx2", "x86_64" ]'
55+
artifact-in: build-macOS-TBB2020
56+
cmd: |
57+
export DYLD_LIBRARY_PATH=./build/install/lib
58+
./build/openvkl/build/vklTutorial
59+
./build/openvkl/build/vklTutorialISPC
60+
./build/openvkl/build/vklTests --durations yes
61+
62+
build-macOS-arm:
63+
secrets: inherit
64+
uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/macos.yml@main
65+
with:
66+
submodules: true
67+
runs-on: '[ "macOS", "build", "arm" ]'
68+
artifact-out: build-macOS-arm
69+
artifact-path: ./build/install ./build/openvkl/build
70+
cmd: |
71+
gitlab/build.sh -DBUILD_TBB_FROM_SOURCE=ON
72+
73+
test-macOS-arm:
74+
needs: build-macOS-arm
75+
secrets: inherit
76+
uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/macos.yml@main
77+
with:
78+
runs-on: '[ "macOS", "build", "arm" ]'
79+
artifact-in: build-macOS-arm
80+
cmd: |
81+
export DYLD_LIBRARY_PATH=./build/install/lib
82+
./build/openvkl/build/vklTutorial
83+
./build/openvkl/build/vklTutorialISPC
84+
./build/openvkl/build/vklTests --durations yes

‎.github/workflows/ci.windows.yml‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
## Copyright 2022 Intel Corporation
2+
## SPDX-License-Identifier: Apache-2.0
3+
4+
name: CI Windows Workflow
5+
on:
6+
push:
7+
workflow_dispatch:
8+
9+
concurrency:
10+
group: ${{ github.workflow }}-${{ github.ref }}
11+
cancel-in-progress: true
12+
13+
jobs:
14+
build-windows-msvc15:
15+
secrets: inherit
16+
uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/windows.yml@main
17+
with:
18+
submodules: true
19+
runs-on: '[ "Windows", "build" ]'
20+
artifact-out: build-windows-msvc15
21+
artifact-path: ./build/install
22+
cmd: gitlab\build.bat "Visual Studio 15 2017 Win64" "v141"
23+
24+
build-windows-msvc15-TBB2020:
25+
secrets: inherit
26+
uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/windows.yml@main
27+
with:
28+
submodules: true
29+
runs-on: '[ "Windows", "build" ]'
30+
artifact-out: build-windows-msvc15-TBB2020
31+
artifact-path: ./build/install
32+
cmd: gitlab\build.bat "Visual Studio 15 2017 Win64" "v141" '"-DTBB_VERSION=2020.3"' '"-DTBB_HASH="""'
33+
34+
test-windows-msvc15:
35+
needs: build-windows-msvc15
36+
secrets: inherit
37+
uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/windows.yml@main
38+
with:
39+
runs-on: '[ "Windows", "build" ]'
40+
artifact-in: build-windows-msvc15
41+
cmd: |
42+
gitlab\run_tests.bat
43+
44+
test-windows-msvc15-TBB2020:
45+
needs: build-windows-msvc15-TBB2020
46+
secrets: inherit
47+
uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/windows.yml@main
48+
with:
49+
runs-on: '[ "Windows", "build" ]'
50+
artifact-in: build-windows-msvc15-TBB2020
51+
cmd: |
52+
gitlab\run_tests.bat

‎.github/workflows/release.yml‎

Lines changed: 145 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,145 @@
1+
## Copyright 2022 Intel Corporation
2+
## SPDX-License-Identifier: Apache-2.0
3+
4+
name: Release Workflow
5+
on:
6+
push:
7+
branches:
8+
- '**release**'
9+
- 'devel'
10+
- 'master'
11+
workflow_dispatch:
12+
13+
concurrency:
14+
group: ${{ github.workflow }}-${{ github.ref }}
15+
cancel-in-progress: true
16+
17+
jobs:
18+
kw-build-scan-report:
19+
secrets: inherit
20+
uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/static_analysis.yml@main
21+
with:
22+
project: openvkl
23+
submodules: true
24+
prebuild: |
25+
mkdir build
26+
cd build
27+
export LD_LIBRARY_PATH=`pwd`/install/lib:${LD_LIBRARY_PATH}
28+
cmake -DBUILD_JOBS=`nproc` -DBUILD_DEPENDENCIES_ONLY=ON -DBUILD_GLFW=OFF "$@" ../superbuild
29+
cmake --build .
30+
mkdir openvkl_build
31+
cd openvkl_build
32+
DEP_INSTALL_DIR=`pwd`/../install
33+
export rkcommon_DIR=$DEP_INSTALL_DIR
34+
export embree_DIR=$DEP_INSTALL_DIR
35+
cmake -DISPC_EXECUTABLE=$DEP_INSTALL_DIR/bin/ispc -DBUILD_EXAMPLES=OFF -DRKCOMMON_TBB_ROOT=$DEP_INSTALL_DIR ../..
36+
cd ../..
37+
build: cmake --build ./build/openvkl_build
38+
39+
40+
release-linux:
41+
secrets: inherit
42+
uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
43+
with:
44+
submodules: true
45+
runs-on: '[ "Linux", "docker" ]'
46+
image: centos:7
47+
artifact-out: release-linux
48+
artifact-path: ./*.gz
49+
cmd: |
50+
export OPENVKL_RELEASE_PACKAGE_VERSION="1.3.1"
51+
module load cmake
52+
module load intel/2022.1
53+
export CC=icx
54+
export CXX=icpx
55+
export CXXFLAGS="-fPIC -fp-model=precise"
56+
export LDFLAGS="-static-intel"
57+
gitlab/release/linux.sh
58+
59+
release-windows:
60+
secrets: inherit
61+
uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/windows.yml@main
62+
with:
63+
submodules: true
64+
runs-on: '[ "Windows", "NAS", "build" ]'
65+
artifact-out: release-windows
66+
artifact-path: ./*.zip
67+
cmd: |
68+
$env:OPENVKL_RELEASE_PACKAGE_VERSION="1.3.1"
69+
$OPENVKL_RELEASE_PACKAGE_VERSION="1.3.1"
70+
gitlab/release/windows.ps1 "Visual Studio 15 2017 Win64" "v141"
71+
72+
release-macos:
73+
secrets: inherit
74+
uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/macos.yml@main
75+
with:
76+
submodules: true
77+
runs-on: '[ "macOS", "sign", "avx2", "x86_64" ]'
78+
artifact-out: release-macos
79+
artifact-path: ./*.zip
80+
cmd: |
81+
export OPENVKL_RELEASE_PACKAGE_VERSION="1.3.1"
82+
gitlab/release/macos.sh
83+
84+
release-linux-test:
85+
needs: release-linux
86+
secrets: inherit
87+
uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
88+
with:
89+
runs-on: '[ "Linux", "docker" ]'
90+
image: centos:7
91+
artifact-in: release-linux
92+
cmd: |
93+
export OPENVKL_RELEASE_PACKAGE_VERSION="1.3.1"
94+
gitlab/release/linux-test.sh
95+
96+
release-windows-test:
97+
needs: release-windows
98+
secrets: inherit
99+
uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/windows.yml@main
100+
with:
101+
runs-on: '[ "Windows" ]'
102+
artifact-in: release-windows
103+
cmd: |
104+
$env:OPENVKL_RELEASE_PACKAGE_VERSION="1.3.1"
105+
$OPENVKL_RELEASE_PACKAGE_VERSION="1.3.1"
106+
gitlab/release/windows-test.ps1 "Visual Studio 15 2017 Win64" "v141"
107+
108+
release-macos-test:
109+
needs: release-macos
110+
secrets: inherit
111+
uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/macos.yml@main
112+
with:
113+
runs-on: '[ "macOS", "avx2", "x86_64" ]'
114+
artifact-in: release-macos
115+
cmd: |
116+
export OPENVKL_RELEASE_PACKAGE_VERSION="1.3.1"
117+
gitlab/release/macos-test.sh
118+
119+
binary-analysis:
120+
needs:
121+
- release-linux
122+
- release-macos
123+
- release-windows
124+
secrets: inherit
125+
uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/binary_analysis.yml@main
126+
with:
127+
project: openvkl
128+
artifact-in-linux: release-linux
129+
artifact-in-macos: release-macos
130+
artifact-in-windows: release-windows
131+
path: "*.zip *.gz"
132+
133+
antivirus-scan:
134+
needs:
135+
- release-linux
136+
- release-macos
137+
- release-windows
138+
secrets: inherit
139+
uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/antivirus_scan.yml@main
140+
with:
141+
project: openvkl
142+
artifact-in-linux: release-linux
143+
artifact-in-macos: release-macos
144+
artifact-in-windows: release-windows
145+
path: "*.zip *.gz"

‎CHANGELOG.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
Version History
22
---------------
33

4+
### Open VKL 1.3.1
5+
6+
- Superbuild updates to latest versions of dependencies
7+
- Note that the update to zlib v1.2.13 remedies CVE-2022-37434
8+
49
### Open VKL 1.3.0
510

611
- Added AVX512 8-wide CPU device mode, enabled via the

‎CMakeLists.txt‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,11 @@ set(CMAKE_DISABLE_SOURCE_CHANGES ON)
1717
set(CMAKE_DISABLE_IN_SOURCE_BUILD ON)
1818
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
1919

20+
cmake_policy(SET CMP0074 NEW)
21+
2022
## Establish project ##
2123

22-
project(openvkl VERSION 1.3.0 LANGUAGES C CXX)
24+
project(openvkl VERSION 1.3.1 LANGUAGES C CXX)
2325

2426
## Add openvkl specific macros ##
2527

@@ -52,6 +54,8 @@ find_package(rkcommon ${RKCOMMON_VERSION_REQUIRED} REQUIRED)
5254
get_target_property(RKCOMMON_INCLUDE_DIRS rkcommon::rkcommon
5355
INTERFACE_INCLUDE_DIRECTORIES)
5456

57+
# rkcommon includes FindTBB.cmake, needed by Embree
58+
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${rkcommon_DIR})
5559

5660
find_package(embree 3.13.1 REQUIRED)
5761
openvkl_create_embree_target()

0 commit comments

Comments
 (0)