From 9d6817507855d09603278a7f38dd938d4e6178c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20G=C3=BCnther?= Date: Tue, 31 Mar 2026 13:02:19 +0200 Subject: [PATCH 1/5] Test size of VKLUnstructuredCellType, fix for MSVC --- CHANGELOG.md | 1 + openvkl/include/openvkl/VKLDataType.h | 7 +++---- openvkl/include/openvkl/VKLError.h | 2 +- openvkl/include/openvkl/VKLFilter.h | 4 ++-- openvkl/include/openvkl/VKLFormat.h | 5 ++--- openvkl/include/openvkl/VKLLogLevel.h | 2 +- openvkl/include/openvkl/VKLTemporalFormat.h | 7 +++---- openvkl/include/openvkl/data.h | 2 +- openvkl/include/openvkl/volume.h | 12 ++++++------ testing/apps/CMakeLists.txt | 1 + testing/apps/tests/enum.cpp | 15 +++++++++++++++ 11 files changed, 36 insertions(+), 22 deletions(-) create mode 100644 testing/apps/tests/enum.cpp diff --git a/CHANGELOG.md b/CHANGELOG.md index 96e95bc6..286cf6db 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ Version History ### Open VKL 2.0.3 - Fix artifacts when sampling AMR volume +- Fix enum size on Windows with older MSVC ### Open VKL 2.0.2 diff --git a/openvkl/include/openvkl/VKLDataType.h b/openvkl/include/openvkl/VKLDataType.h index 9a19407d..1b3f0cde 100644 --- a/openvkl/include/openvkl/VKLDataType.h +++ b/openvkl/include/openvkl/VKLDataType.h @@ -3,7 +3,7 @@ #pragma once -#if __cplusplus >= 201103L +#ifdef __cplusplus #include #endif @@ -13,10 +13,9 @@ // // IMPORTANT: enums added here should also be represented in stringForType() and // other functions in VKLCommon.cpp! -#if __cplusplus >= 201103L -typedef enum : uint32_t -#else typedef enum +#ifdef __cplusplus + : uint32_t #endif { // Driver reference type. diff --git a/openvkl/include/openvkl/VKLError.h b/openvkl/include/openvkl/VKLError.h index 353096cd..ee926564 100644 --- a/openvkl/include/openvkl/VKLError.h +++ b/openvkl/include/openvkl/VKLError.h @@ -5,7 +5,7 @@ // Error codes returned by various API and callback functions typedef enum -#if __cplusplus >= 201103L +#ifdef __cplusplus : uint32_t #endif { diff --git a/openvkl/include/openvkl/VKLFilter.h b/openvkl/include/openvkl/VKLFilter.h index add2dcaf..119af4e4 100644 --- a/openvkl/include/openvkl/VKLFilter.h +++ b/openvkl/include/openvkl/VKLFilter.h @@ -9,8 +9,8 @@ // An enum that represents the different filter types available in volumes. // ======================================================================== // enum VKLFilter -#if __cplusplus >= 201103L -: vkl_uint32 +#ifdef __cplusplus + : vkl_uint32 #endif { // Only read the voxel the sample position is in, treating it as diff --git a/openvkl/include/openvkl/VKLFormat.h b/openvkl/include/openvkl/VKLFormat.h index 0babe0f0..9d28856c 100644 --- a/openvkl/include/openvkl/VKLFormat.h +++ b/openvkl/include/openvkl/VKLFormat.h @@ -9,10 +9,9 @@ // An enum for data format constants. // This value determines how voxel data buffers are interpreted by VKL. // ========================================================================== // -#if __cplusplus > 201103L -enum VKLFormat : vkl_uint32 -#else enum VKLFormat +#ifdef __cplusplus + : vkl_uint32 #endif { // The node has no spatial variation. diff --git a/openvkl/include/openvkl/VKLLogLevel.h b/openvkl/include/openvkl/VKLLogLevel.h index b4173680..45cfb5fe 100644 --- a/openvkl/include/openvkl/VKLLogLevel.h +++ b/openvkl/include/openvkl/VKLLogLevel.h @@ -6,7 +6,7 @@ // Log levels which can be set on a device via "logLevel" parameter or // "OPENVKL_LOG_LEVEL" environment variable typedef enum -#if __cplusplus >= 201103L +#ifdef __cplusplus : uint32_t #endif { diff --git a/openvkl/include/openvkl/VKLTemporalFormat.h b/openvkl/include/openvkl/VKLTemporalFormat.h index 23bdea0b..c140de97 100644 --- a/openvkl/include/openvkl/VKLTemporalFormat.h +++ b/openvkl/include/openvkl/VKLTemporalFormat.h @@ -8,10 +8,9 @@ // ========================================================================== // // An enum for temporal format constants. // ========================================================================== // -#if __cplusplus > 201103L -enum VKLTemporalFormat : vkl_uint32 -#else enum VKLTemporalFormat +#ifdef __cplusplus + : vkl_uint32 #endif { // There is no temporal variation. @@ -19,7 +18,7 @@ enum VKLTemporalFormat // Each voxel contains the same number of temporal samples and they // are placed regularly in [0, 1]. VKL_TEMPORAL_FORMAT_STRUCTURED, - // Temporal resolution is adaptive, such that voxels may have different + // Temporal resolution is adaptive, such that voxels may have different // numbers of time steps. See the api documentation for more detail. VKL_TEMPORAL_FORMAT_UNSTRUCTURED, VKL_TEMPORAL_FORMAT_INVALID = 100 diff --git a/openvkl/include/openvkl/data.h b/openvkl/include/openvkl/data.h index 785c17af..5c7bfd34 100644 --- a/openvkl/include/openvkl/data.h +++ b/openvkl/include/openvkl/data.h @@ -14,7 +14,7 @@ // flags that can be passed to vklNewData(), which can be OR'ed together typedef enum -#if __cplusplus >= 201103L +#ifdef __cplusplus : uint32_t #endif { diff --git a/openvkl/include/openvkl/volume.h b/openvkl/include/openvkl/volume.h index e70eac98..01826883 100644 --- a/openvkl/include/openvkl/volume.h +++ b/openvkl/include/openvkl/volume.h @@ -24,19 +24,19 @@ typedef VKLObject VKLVolume; // cell types definition for unstructured volumes, values are set to match VTK typedef enum -# if __cplusplus >= 201103L -: uint8_t +#ifdef __cplusplus + : uint8_t #endif { VKL_TETRAHEDRON = 10, - VKL_HEXAHEDRON = 12, - VKL_WEDGE = 13, - VKL_PYRAMID = 14 + VKL_HEXAHEDRON = 12, + VKL_WEDGE = 13, + VKL_PYRAMID = 14 } VKLUnstructuredCellType; // AMR volume interpolation methods typedef enum -#if __cplusplus >= 201103L +#ifdef __cplusplus : uint32_t #endif { diff --git a/testing/apps/CMakeLists.txt b/testing/apps/CMakeLists.txt index 7e237855..22e81493 100644 --- a/testing/apps/CMakeLists.txt +++ b/testing/apps/CMakeLists.txt @@ -111,6 +111,7 @@ if (BUILD_TESTING) openvkl_add_executable_ispc(vklTestsCPU vklTests.cpp tests/alignment.cpp + tests/enum.cpp tests/background_undefined.cpp tests/hit_iterator.cpp tests/hit_iterator_epsilon.cpp diff --git a/testing/apps/tests/enum.cpp b/testing/apps/tests/enum.cpp new file mode 100644 index 00000000..8fc3fdda --- /dev/null +++ b/testing/apps/tests/enum.cpp @@ -0,0 +1,15 @@ +// Copyright 2020 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 + +#include "../../external/catch.hpp" +#include + +#include + +TEST_CASE("Enum", "") +{ + SECTION("VKLUnstructuredCellType") + { + REQUIRE(sizeof(VKLUnstructuredCellType) == 1); + } +} From ad46a918093e3ca0d63f2646b4ce1705b03a3dca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20G=C3=BCnther?= Date: Thu, 2 Apr 2026 12:50:55 +0200 Subject: [PATCH 2/5] Update dependency Embree --- .github/deps/dpcpp-sycl-nightly.env | 2 +- .github/deps/gfx-windows-public.env | 4 +--- CHANGELOG.md | 1 + doc/overview.md | 2 +- superbuild/CMakeLists.txt | 10 +++++----- 5 files changed, 9 insertions(+), 10 deletions(-) diff --git a/.github/deps/dpcpp-sycl-nightly.env b/.github/deps/dpcpp-sycl-nightly.env index 3948ebab..606c9372 100644 --- a/.github/deps/dpcpp-sycl-nightly.env +++ b/.github/deps/dpcpp-sycl-nightly.env @@ -1 +1 @@ -DPCPP_VERSION=intel-llvm/v6.2.1 +DPCPP_VERSION=intel-llvm/v6.2.0 diff --git a/.github/deps/gfx-windows-public.env b/.github/deps/gfx-windows-public.env index 8794ad66..095bfbec 100644 --- a/.github/deps/gfx-windows-public.env +++ b/.github/deps/gfx-windows-public.env @@ -1,3 +1 @@ -#GFX_DRIVER_VERSION=windows-latest -# the currently latest available v101.8509 leads to hangs on some DG2 CI machines -GFX_DRIVER_VERSION=windows-101.8331 +GFX_DRIVER_VERSION=windows-latest diff --git a/CHANGELOG.md b/CHANGELOG.md index 286cf6db..2fd79b60 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ Version History - Fix artifacts when sampling AMR volume - Fix enum size on Windows with older MSVC +- Superbuild updates to use Embree v4.4.1 ### Open VKL 2.0.2 diff --git a/doc/overview.md b/doc/overview.md index 51887bdf..35b2918d 100644 --- a/doc/overview.md +++ b/doc/overview.md @@ -8,7 +8,7 @@ performance of their volume rendering applications by leveraging Open VKL’s performance-optimized kernels, which include volume traversal and sampling functionality for a variety of volumetric data formats. Open VKL supports x86 CPUs under Linux, macOS, and Windows; ARM CPUs on macOS; as well as Intel® GPUs -under Linux and Windows (currently in beta). +under Linux and Windows. Open VKL contains kernels optimized for the latest x86 processors with support for SSE, AVX, AVX2, and AVX-512 instructions, and for ARM processors with diff --git a/superbuild/CMakeLists.txt b/superbuild/CMakeLists.txt index 3674bbf2..5483ff3d 100644 --- a/superbuild/CMakeLists.txt +++ b/superbuild/CMakeLists.txt @@ -170,23 +170,23 @@ option(BUILD_EMBREE "Build Intel Embree or search in environment?" ON) option(BUILD_EMBREE_FROM_SOURCE "Build Embree from source or use pre-built version? (Only used when BUILD_EMBREE=ON)" ON) option(BUILD_EMBREE_SYCL "Build Intel Embree with SYCL support?" OFF) if (BUILD_EMBREE) - set(EMBREE_VERSION "v4.4.0" CACHE STRING "Embree version to download") + set(EMBREE_VERSION "v4.4.1" CACHE STRING "Embree version to download") if (BUILD_EMBREE_FROM_SOURCE) set(_EMBREE_URL "https://github.com/embree/embree/archive/${EMBREE_VERSION}.tar.gz") - set(_EMBREE_HASH "acb517b0ea0f4b442235d5331b69f96192c28da6aca5d5dde0cbe40799638d5c") + set(_EMBREE_HASH "dcf338cc61b636c871ccf370e673bfd380c5ecb71ce49ad50f28e1d4ec9995dc") else() # Embree binary package URLs do not use the "v" prefix string(REPLACE "v" "" EMBREE_VERSION_NUMBER ${EMBREE_VERSION}) set(EMBREE_BASE_URL "https://github.com/embree/embree/releases/download/${EMBREE_VERSION}") if (APPLE) set(_EMBREE_URL "${EMBREE_BASE_URL}/embree-${EMBREE_VERSION_NUMBER}.x86_64.macosx.zip") - set(_EMBREE_HASH "435b4ef3421eb75cf41a41438d44b760f4d86c24124e0b9a0ed9d85adff54b4d") + set(_EMBREE_HASH "bbbfc0a1beea14c157d17349b71151b846baad884d81fb5da6d74fb8b0bacaec") elseif (WIN32) set(_EMBREE_URL "${EMBREE_BASE_URL}/embree-${EMBREE_VERSION_NUMBER}.x64.windows.zip") - set(_EMBREE_HASH "d951e5e6bd295c54cdd66be9cdb44a4e8c42fb38a99f94f79305e48765fc3454") + set(_EMBREE_HASH "5aa1fa3161a720f9c610b06c652b80f421cb2b1fe8221fdf92b74157336fdf8f") else() set(_EMBREE_URL "${EMBREE_BASE_URL}/embree-${EMBREE_VERSION_NUMBER}.x86_64.linux.tar.gz") - set(_EMBREE_HASH "cb3d4402537fc9165c76c3316b8953dcfea523cd1eaf588e2de7639864ee3c57") + set(_EMBREE_HASH "aa506a55a581055e30cdc8819557dd4163ed514fc63ce4c1d66a6df82631be3f") endif() endif() set(EMBREE_URL "${_EMBREE_URL}" CACHE STRING "URL of the Embree source archive.") From cdb56396c4824693d459ea0b20387594abc10269 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20G=C3=BCnther?= Date: Thu, 2 Apr 2026 13:02:25 +0200 Subject: [PATCH 3/5] Windows release with VC 2022, remove toolset --- .github/scripts/build.bat | 5 ++--- .github/scripts/release/windows-test.ps1 | 1 - .github/scripts/release/windows.ps1 | 2 -- .github/workflows/internal.ci.windows.yml | 6 +++--- .github/workflows/internal.nightly.windows.yml | 4 ++-- .github/workflows/internal.release.yml | 4 ++-- 6 files changed, 9 insertions(+), 13 deletions(-) diff --git a/.github/scripts/build.bat b/.github/scripts/build.bat index 008b9636..371f780d 100755 --- a/.github/scripts/build.bat +++ b/.github/scripts/build.bat @@ -11,14 +11,13 @@ cmake --version cmake -L ^ -G "%~1" ^ --T "%~2" ^ -D CMAKE_INSTALL_LIBDIR=lib ^ -D BUILD_OPENVKL_BENCHMARKS=OFF ^ -D BUILD_OPENVKL_TESTING=ON ^ -%~4 %~5 %~6 %~7 %~8 %~9 ^ +%~3 %~4 %~5 %~6 %~7 %~8 %~9 ^ ../superbuild -cmake --build . --verbose --config "%~3" --target ALL_BUILD -- /m /nologo +cmake --build . --verbose --config "%~2" --target ALL_BUILD -- /m /nologo :abort endlocal diff --git a/.github/scripts/release/windows-test.ps1 b/.github/scripts/release/windows-test.ps1 index 87f76cca..40619db6 100755 --- a/.github/scripts/release/windows-test.ps1 +++ b/.github/scripts/release/windows-test.ps1 @@ -19,7 +19,6 @@ cmake --version cmake -L ` -G $args[0] ` - -T $args[1] ` ../examples/from_openvkl_install cmake --build . --config Release --target ALL_BUILD -- /m /nologo diff --git a/.github/scripts/release/windows.ps1 b/.github/scripts/release/windows.ps1 index 204f2f86..bffb8ed8 100755 --- a/.github/scripts/release/windows.ps1 +++ b/.github/scripts/release/windows.ps1 @@ -21,7 +21,6 @@ cmake --version cmake -L ` -G $args[0] ` - -T $args[1] ` -D BUILD_DEPENDENCIES_ONLY=ON ` -D CMAKE_INSTALL_PREFIX=$DEP_INSTALL_DIR ` -D CMAKE_INSTALL_LIBDIR=lib ` @@ -44,7 +43,6 @@ $env:glfw3_DIR = $DEP_INSTALL_DIR # set release settings cmake -L ` -G $args[0] ` - -T $args[1] ` -D CMAKE_PREFIX_PATH="$DEP_INSTALL_DIR\lib\cmake" ` -D CMAKE_INSTALL_PREFIX="$OPENVKL_INSTALL_DIR" ` -D CMAKE_INSTALL_INCLUDEDIR=include ` diff --git a/.github/workflows/internal.ci.windows.yml b/.github/workflows/internal.ci.windows.yml index d1a788b9..2d355a61 100644 --- a/.github/workflows/internal.ci.windows.yml +++ b/.github/workflows/internal.ci.windows.yml @@ -22,7 +22,7 @@ jobs: runs-on: '[ "Windows", "build" ]' artifact-out: build-windows-msvc15 artifact-path: ./build/install - cmd: .github\scripts\build.bat "Visual Studio 15 2017 Win64" "v141" "Release" + cmd: .github\scripts\build.bat "Visual Studio 15 2017 Win64" "Release" test-windows-msvc15: needs: build-windows-msvc15 @@ -43,7 +43,7 @@ jobs: runs-on: '[ "Windows", "build" ]' artifact-out: build-windows-msvc16 artifact-path: ./build/install - cmd: .github\scripts\build.bat "Visual Studio 16 2019" "v142" "Release" + cmd: .github\scripts\build.bat "Visual Studio 16 2019" "Release" test-windows-msvc16: needs: build-windows-msvc16 @@ -65,7 +65,7 @@ jobs: runs-on: '[ "Windows", "build" ]' artifact-out: build-windows-msvc17 artifact-path: ./build/install - cmd: .github\scripts\build.bat "Visual Studio 17 2022" "v143" "Release" + cmd: .github\scripts\build.bat "Visual Studio 17 2022" "Release" test-windows-msvc17: needs: build-windows-msvc17 diff --git a/.github/workflows/internal.nightly.windows.yml b/.github/workflows/internal.nightly.windows.yml index 8c9232a9..7ed083ab 100644 --- a/.github/workflows/internal.nightly.windows.yml +++ b/.github/workflows/internal.nightly.windows.yml @@ -23,7 +23,7 @@ jobs: runs-on: '[ "Windows", "build" ]' artifact-out: build-windows-msvc15-debug artifact-path: ./build/install - cmd: .github\scripts\build.bat "Visual Studio 15 2017 Win64" "v141" "Debug" + cmd: .github\scripts\build.bat "Visual Studio 15 2017 Win64" "Debug" test-windows-msvc15-debug: needs: build-windows-msvc15-debug @@ -33,4 +33,4 @@ jobs: runs-on: '[ "Windows", "build" ]' artifact-in: build-windows-msvc15-debug cmd: | - .github\scripts\run_tests.bat \ No newline at end of file + .github\scripts\run_tests.bat diff --git a/.github/workflows/internal.release.yml b/.github/workflows/internal.release.yml index 22804c1b..aca25ad6 100644 --- a/.github/workflows/internal.release.yml +++ b/.github/workflows/internal.release.yml @@ -82,7 +82,7 @@ jobs: cmd: | $env:OPENVKL_RELEASE_PACKAGE_VERSION="2.0.2" $OPENVKL_RELEASE_PACKAGE_VERSION="2.0.2" - .github/scripts/release/windows.ps1 "Visual Studio 15 2017 Win64" "v141" + .github/scripts/release/windows.ps1 "Visual Studio 17 2022" windows_sycl: secrets: inherit @@ -167,7 +167,7 @@ jobs: cmd: | $env:OPENVKL_RELEASE_PACKAGE_VERSION="2.0.2" $OPENVKL_RELEASE_PACKAGE_VERSION="2.0.2" - .github/scripts/release/windows-test.ps1 "Visual Studio 15 2017 Win64" "v141" + .github/scripts/release/windows-test.ps1 "Visual Studio 17 2022" windows_sycl-test: needs: windows_sycl From 0fb2a5ac5bd076f9d9431e50c1d3a09148670d7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20G=C3=BCnther?= Date: Thu, 2 Apr 2026 12:51:48 +0200 Subject: [PATCH 4/5] Bump version to v2.0.3, rebuild README --- .github/workflows/internal.release.yml | 34 +++++++++++++------------- CMakeLists.txt | 2 +- README.md | 10 ++++++-- 3 files changed, 26 insertions(+), 20 deletions(-) diff --git a/.github/workflows/internal.release.yml b/.github/workflows/internal.release.yml index aca25ad6..35abb4a5 100644 --- a/.github/workflows/internal.release.yml +++ b/.github/workflows/internal.release.yml @@ -49,7 +49,7 @@ jobs: artifact-out: linux artifact-path: ./*.gz cmd: | - export OPENVKL_RELEASE_PACKAGE_VERSION="2.0.2" + export OPENVKL_RELEASE_PACKAGE_VERSION="2.0.3" export CXXFLAGS="-fPIC -fp-model=precise" export LDFLAGS="-static-intel" .github/scripts/release/linux.sh @@ -65,7 +65,7 @@ jobs: artifact-path: ./*.gz env-from-files: .github/deps/dpcpp-sycl-nightly.env cmd: | - export OPENVKL_RELEASE_PACKAGE_VERSION="2.0.2" + export OPENVKL_RELEASE_PACKAGE_VERSION="2.0.3" export CC=clang export CXX=clang++ .github/scripts/release/linux_sycl.sh @@ -80,8 +80,8 @@ jobs: artifact-out: windows artifact-path: ./*.zip cmd: | - $env:OPENVKL_RELEASE_PACKAGE_VERSION="2.0.2" - $OPENVKL_RELEASE_PACKAGE_VERSION="2.0.2" + $env:OPENVKL_RELEASE_PACKAGE_VERSION="2.0.3" + $OPENVKL_RELEASE_PACKAGE_VERSION="2.0.3" .github/scripts/release/windows.ps1 "Visual Studio 17 2022" windows_sycl: @@ -100,8 +100,8 @@ jobs: $env:CXXFLAGS = '-w' $env:CFLAGS = '-w' - $env:OPENVKL_RELEASE_PACKAGE_VERSION="2.0.2" - $OPENVKL_RELEASE_PACKAGE_VERSION="2.0.2" + $env:OPENVKL_RELEASE_PACKAGE_VERSION="2.0.3" + $OPENVKL_RELEASE_PACKAGE_VERSION="2.0.3" .github/scripts/release/windows_sycl.ps1 macos: @@ -114,7 +114,7 @@ jobs: artifact-out: macos artifact-path: ./*.zip cmd: | - export OPENVKL_RELEASE_PACKAGE_VERSION="2.0.2" + export OPENVKL_RELEASE_PACKAGE_VERSION="2.0.3" .github/scripts/release/macos.sh linux-test: @@ -126,7 +126,7 @@ jobs: image: rockylinux:8 artifact-in: linux cmd: | - export OPENVKL_RELEASE_PACKAGE_VERSION="2.0.2" + export OPENVKL_RELEASE_PACKAGE_VERSION="2.0.3" .github/scripts/release/linux-test.sh linux_sycl-test: @@ -140,7 +140,7 @@ jobs: env-from-files: .github/deps/dpcpp-sycl-nightly.env .github/deps/gfx-linux-public.env options: --device=/dev/dri:/dev/dri cmd: | - export OPENVKL_RELEASE_PACKAGE_VERSION="2.0.2" + export OPENVKL_RELEASE_PACKAGE_VERSION="2.0.3" .github/scripts/release/linux_sycl-test.sh linux_sycl-test_run_only: @@ -154,7 +154,7 @@ jobs: env-from-files: .github/deps/gfx-linux-public.env options: --device=/dev/dri:/dev/dri cmd: | - export OPENVKL_RELEASE_PACKAGE_VERSION="2.0.2" + export OPENVKL_RELEASE_PACKAGE_VERSION="2.0.3" .github/scripts/release/linux_sycl-test_run_only.sh windows-test: @@ -165,8 +165,8 @@ jobs: runs-on: '[ "Windows" ]' artifact-in: windows cmd: | - $env:OPENVKL_RELEASE_PACKAGE_VERSION="2.0.2" - $OPENVKL_RELEASE_PACKAGE_VERSION="2.0.2" + $env:OPENVKL_RELEASE_PACKAGE_VERSION="2.0.3" + $OPENVKL_RELEASE_PACKAGE_VERSION="2.0.3" .github/scripts/release/windows-test.ps1 "Visual Studio 17 2022" windows_sycl-test: @@ -181,8 +181,8 @@ jobs: msvc-version: 2022 artifact-in: windows_sycl cmd: | - $env:OPENVKL_RELEASE_PACKAGE_VERSION="2.0.2" - $OPENVKL_RELEASE_PACKAGE_VERSION="2.0.2" + $env:OPENVKL_RELEASE_PACKAGE_VERSION="2.0.3" + $OPENVKL_RELEASE_PACKAGE_VERSION="2.0.3" .github/scripts/release/windows_sycl-test.ps1 windows_sycl-test_run_only: @@ -196,8 +196,8 @@ jobs: env-from-files: ./.github/deps/gfx-windows-public.env artifact-in: windows_sycl cmd: | - $env:OPENVKL_RELEASE_PACKAGE_VERSION="2.0.2" - $OPENVKL_RELEASE_PACKAGE_VERSION="2.0.2" + $env:OPENVKL_RELEASE_PACKAGE_VERSION="2.0.3" + $OPENVKL_RELEASE_PACKAGE_VERSION="2.0.3" .github/scripts/release/windows_sycl-test_run_only.ps1 macos-test: @@ -208,7 +208,7 @@ jobs: runs-on: '[ "macOS", "build", "x86_64" ]' artifact-in: macos cmd: | - export OPENVKL_RELEASE_PACKAGE_VERSION="2.0.2" + export OPENVKL_RELEASE_PACKAGE_VERSION="2.0.3" .github/scripts/release/macos-test.sh binary-analysis: diff --git a/CMakeLists.txt b/CMakeLists.txt index 53238afd..5f472a2f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -24,7 +24,7 @@ cmake_policy(SET CMP0074 NEW) ## Establish project ## -project(openvkl VERSION 2.0.2 LANGUAGES C CXX) +project(openvkl VERSION 2.0.3 LANGUAGES C CXX) ## Add openvkl specific macros ## diff --git a/README.md b/README.md index d857561e..4519b2ec 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Intel® Open Volume Kernel Library -This is release v2.0.2 of Intel® Open VKL. For changes and new features +This is release v2.0.3 of Intel® Open VKL. For changes and new features see the [changelog](CHANGELOG.md). Visit http://www.openvkl.org for more information. @@ -14,7 +14,7 @@ leveraging Open VKL’s performance-optimized kernels, which include volume traversal and sampling functionality for a variety of volumetric data formats. Open VKL supports x86 CPUs under Linux, macOS, and Windows; ARM CPUs on macOS; as well as Intel® GPUs under Linux and -Windows (currently in beta). +Windows. Open VKL contains kernels optimized for the latest x86 processors with support for SSE, AVX, AVX2, and AVX-512 instructions, and for ARM @@ -43,6 +43,12 @@ example renderers to demonstrate how to best use the Open VKL API. ## Version History +### Open VKL 2.0.3 + +- Fix artifacts when sampling AMR volume +- Fix enum size on Windows with older MSVC +- Superbuild updates to use Embree v4.4.1 + ### Open VKL 2.0.2 - Fix used element size in copyDeviceBufferToHost From 1ecad4403da800042ee5b3ee1bf84486eda49ad4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20G=C3=BCnther?= Date: Thu, 2 Apr 2026 15:51:31 +0200 Subject: [PATCH 5/5] CI tweaks --- .github/workflows/internal.ci.windows.gpu.icx.yml | 1 + .github/workflows/internal.ci.windows.gpu.yml | 1 + .github/workflows/internal.ci.windows.yml | 15 +++++++++++++-- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/.github/workflows/internal.ci.windows.gpu.icx.yml b/.github/workflows/internal.ci.windows.gpu.icx.yml index 1f91495f..f0c510b8 100644 --- a/.github/workflows/internal.ci.windows.gpu.icx.yml +++ b/.github/workflows/internal.ci.windows.gpu.icx.yml @@ -60,6 +60,7 @@ jobs: needs: [ build-windows-gpu ] uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/windows.yml@main with: + timeout-minutes: 45 force-delete: true # guarantees .gitattributes are respected in working dir submodules: true runs-on: '[ "Windows", "dg2" ]' diff --git a/.github/workflows/internal.ci.windows.gpu.yml b/.github/workflows/internal.ci.windows.gpu.yml index 429b7775..932db8de 100644 --- a/.github/workflows/internal.ci.windows.gpu.yml +++ b/.github/workflows/internal.ci.windows.gpu.yml @@ -60,6 +60,7 @@ jobs: needs: [ build-windows-gpu ] uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/windows.yml@main with: + timeout-minutes: 45 force-delete: true # guarantees .gitattributes are respected in working dir submodules: true runs-on: '[ "Windows", "dg2" ]' diff --git a/.github/workflows/internal.ci.windows.yml b/.github/workflows/internal.ci.windows.yml index 2d355a61..d25698e4 100644 --- a/.github/workflows/internal.ci.windows.yml +++ b/.github/workflows/internal.ci.windows.yml @@ -22,7 +22,7 @@ jobs: runs-on: '[ "Windows", "build" ]' artifact-out: build-windows-msvc15 artifact-path: ./build/install - cmd: .github\scripts\build.bat "Visual Studio 15 2017 Win64" "Release" + cmd: .github\scripts\build.bat "Visual Studio 15 2017 Win64" "Release" '"-DBUILD_EMBREE_FROM_SOURCE=OFF"' test-windows-msvc15: needs: build-windows-msvc15 @@ -43,7 +43,7 @@ jobs: runs-on: '[ "Windows", "build" ]' artifact-out: build-windows-msvc16 artifact-path: ./build/install - cmd: .github\scripts\build.bat "Visual Studio 16 2019" "Release" + cmd: .github\scripts\build.bat "Visual Studio 16 2019" "Release" '"-DBUILD_EMBREE_FROM_SOURCE=OFF"' test-windows-msvc16: needs: build-windows-msvc16 @@ -65,6 +65,17 @@ jobs: runs-on: '[ "Windows", "build" ]' artifact-out: build-windows-msvc17 artifact-path: ./build/install + cmd: .github\scripts\build.bat "Visual Studio 17 2022" "Release" '"-DBUILD_EMBREE_FROM_SOURCE=OFF"' + + build-windows-msvc17-source: + secrets: inherit + uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/windows.yml@main + with: + force-delete: true # guarantees .gitattributes are respected in working dir + submodules: true + runs-on: '[ "Windows", "build" ]' + artifact-out: build-windows-msvc17-s + artifact-path: ./build/install cmd: .github\scripts\build.bat "Visual Studio 17 2022" "Release" test-windows-msvc17: