release preparations

.github/deps/dpcpp-sycl-nightly.env

@@ -1 +1 @@
-DPCPP_VERSION=intel-llvm/v6.2.1
+DPCPP_VERSION=intel-llvm/v6.2.0

.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

.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

.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

.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 `

.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" ]'

.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" ]'

.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" '"-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" "v142" "Release"
+      cmd: .github\scripts\build.bat "Visual Studio 16 2019" "Release" '"-DBUILD_EMBREE_FROM_SOURCE=OFF"'
 
   test-windows-msvc16:
     needs: build-windows-msvc16
@@ -65,7 +65,18 @@ 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" '"-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:
     needs: build-windows-msvc17

.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
+        .github\scripts\run_tests.bat

.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,9 +80,9 @@ jobs:
       artifact-out: windows
       artifact-path: ./*.zip
       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"
+        $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:
     secrets: inherit
@@ -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,9 +165,9 @@ jobs:
       runs-on: '[ "Windows" ]'
       artifact-in: windows
       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"
+        $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:
     needs: windows_sycl
@@ -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:

CHANGELOG.md

@@ -4,6 +4,8 @@ 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
 

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 ##
 

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

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

openvkl/include/openvkl/VKLDataType.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#if __cplusplus >= 201103L
+#ifdef __cplusplus
 #include <cstdint>
 #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.

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
 {

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

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.

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
 {

openvkl/include/openvkl/VKLTemporalFormat.h

@@ -8,18 +8,17 @@
 // ========================================================================== //
 // 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.
   VKL_TEMPORAL_FORMAT_CONSTANT = 0,
   // 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

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
 {