merged in devel

Merge branch 'devel' into swoop2
cleanups
2017-04-05 11:07:13 +02:00 · 2017-04-03 11:43:16 +02:00 · 2017-04-03 11:27:17 +02:00 · 2017-04-03 11:26:49 +02:00 · 2017-04-03 11:25:06 +02:00 · 2017-04-03 11:24:47 +02:00
2263 changed files with 84568 additions and 359253 deletions
@@ -1,7 +0,0 @@
-root = true
-
-[*]
-end_of_line = lf
-insert_final_newline = true
-indent_style = space
-indent_size = 2
@@ -11,4 +11,3 @@
 *.jpg       binary
 *.png       binary
 *.pdf       binary
-*.rc	    text working-tree-encoding=UTF-8 eol=CRLF
@@ -1,632 +0,0 @@
-## Copyright 2022 Intel Corporation
-## SPDX-License-Identifier: Apache-2.0
-
-name: continuous
-
-permissions: read-all
-
-on:
-  workflow_dispatch:
-  push:
-
-jobs:
-  ################################################################################
-  ################################################################################
-  # GPU tests
-  ################################################################################
-  ###############################################################################
-
-  ########################################
-  # Linux DG2
-  ########################################
-
-  linux-GPU-JIT-build:
-    secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
-    with:
-      image: embree/ubuntu:24.04
-      runs-on: '[ "Linux", "docker", "build" ]'
-      env-from-files: ./.github/workflows/dpcpp-sycl-nightly.env
-      artifact-out: linux-GPU-JIT-build
-      artifact-path: ./build/*.tar.gz
-      cmd: |
-        opts="-DCMAKE_BUILD_TYPE=Release"
-        opts+=" -DBUILD_TESTING=ON"
-        opts+=" -DEMBREE_TUTORIALS=ON"
-        opts+=" -DEMBREE_ISPC_SUPPORT=ON"
-        opts+=" -DEMBREE_TESTING_INTENSITY=3"
-        opts+=" -DEMBREE_SYCL_SUPPORT=ON"
-        opts+=" -DEMBREE_SYCL_AOT_DEVICES=none"
-        opts+=" -DEMBREE_MAX_ISA=AVX512"
-        opts+=" -DEMBREE_INSTALL_DEPENDENCIES=ON"
-        opts+=" -DEMBREE_TESTING_INSTALL_TESTS=ON"
-        opts+=" -DCMAKE_INSTALL_TESTDIR=testing"
-        opts+=" -DEMBREE_ZIP_MODE=ON"
-        opts+=" -DCMAKE_C_COMPILER=clang"
-        opts+=" -DCMAKE_CXX_COMPILER=clang++"
-
-        cmake -S superbuild -B build -D EMBREE_EXTRA_OPTIONS="$opts"
-        cmake --build build --config Release
-        cmake --build build/embree/build --config Release --target build
-        cp build/embree/build/embree-*.tar.gz build/
-
-  linux-DG2-JIT-PUBLIC-test:
-    secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
-    needs: ["linux-GPU-JIT-build"]
-    with:
-      image: embree/ubuntu:24.04
-      options: --device=/dev/dri:/dev/dri
-      runs-on: '[ "Linux", "docker", "dg2" ]'
-      env-from-files: ./.github/workflows/dpcpp-sycl-nightly.env ./.github/workflows/gfx-ubuntu24-public.env
-      artifact-in: linux-GPU-JIT-build
-      cmd: |
-        EMBREE_PATH=$(./scripts/prepare-test-files.sh --type ctest)
-        ./scripts/run-tests.sh --type ctest --embree-dir "$EMBREE_PATH" --ctest-config RelWithDebInfo
-
-  linux-PVC-JIT-PUBLIC-test:
-    secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
-    needs: ["linux-GPU-JIT-build"]
-    with:
-      image: embree/ubuntu:24.04
-      options: --device=/dev/dri:/dev/dri
-      runs-on: '[ "Linux", "docker", "pvc" ]'
-      env-from-files: ./.github/workflows/dpcpp-sycl-nightly.env ./.github/workflows/gfx-ubuntu24-public.env
-      artifact-in: linux-GPU-JIT-build
-      cmd: |
-        EMBREE_PATH=$(./scripts/prepare-test-files.sh --type ctest)
-        ./scripts/run-tests.sh --type ctest --embree-dir "$EMBREE_PATH" --ctest-config Release
-
-  linux-DG2-JIT-PUBLIC-ICX-build:
-    secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
-    with:
-      image: embree/ubuntu:24.04
-      runs-on: '[ "Linux", "docker", "build" ]'
-      dpcpp-version: intel/2025.2
-      artifact-out: linux-DG2-JIT-PUBLIC-ICX-build
-      artifact-path: ./build/*.tar.gz
-      cmd: |
-        opts="-DCMAKE_BUILD_TYPE=Release"
-        opts+=" -DBUILD_TESTING=ON"
-        opts+=" -DEMBREE_TUTORIALS=ON"
-        opts+=" -DEMBREE_ISPC_SUPPORT=ON"
-        opts+=" -DEMBREE_TESTING_INTENSITY=3"
-        opts+=" -DEMBREE_SYCL_SUPPORT=ON"
-        opts+=" -DEMBREE_SYCL_AOT_DEVICES=none"
-        opts+=" -DEMBREE_MAX_ISA=AVX512"
-        opts+=" -DEMBREE_INSTALL_DEPENDENCIES=ON"
-        opts+=" -DEMBREE_TESTING_INSTALL_TESTS=ON"
-        opts+=" -DCMAKE_INSTALL_TESTDIR=testing"
-        opts+=" -DEMBREE_ZIP_MODE=ON"
-        opts+=" -DCMAKE_C_COMPILER=icx"
-        opts+=" -DCMAKE_CXX_COMPILER=icpx"
-
-        cmake -S superbuild -B build -D EMBREE_EXTRA_OPTIONS="$opts"
-        cmake --build build --config Release
-        cmake --build build/embree/build --config Release --target build
-        cp build/embree/build/embree-*.tar.gz build/
-
-  linux-DG2-JIT-PUBLIC-ICX-test:
-    secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
-    needs: ["linux-DG2-JIT-PUBLIC-ICX-build"]
-    with:
-      image: embree/ubuntu:24.04
-      options: --device=/dev/dri:/dev/dri
-      runs-on: '[ "Linux", "docker", "dg2" ]'
-      env-from-files: ./.github/workflows/gfx-ubuntu24-public.env
-      dpcpp-version: intel/2025.2
-      artifact-in: linux-DG2-JIT-PUBLIC-ICX-build
-      cmd: |
-        EMBREE_PATH=$(./scripts/prepare-test-files.sh --type ctest)
-        ./scripts/run-tests.sh --type ctest --embree-dir "$EMBREE_PATH" --ctest-config Release
-
-
-  linux-DG2-JIT-PUBLIC-debug-build:
-    secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
-    with:
-      image: embree/ubuntu:24.04
-      runs-on: '[ "Linux", "docker", "build" ]'
-      env-from-files: ./.github/workflows/dpcpp-sycl-nightly.env
-      artifact-out: linux-DG2-JIT-PUBLIC-debug-build
-      artifact-path: ./build/*.tar.gz
-      cmd: |
-        opts="-DCMAKE_BUILD_TYPE=Debug"
-        opts+=" -DBUILD_TESTING=ON"
-        opts+=" -DEMBREE_TUTORIALS=ON"
-        opts+=" -DEMBREE_ISPC_SUPPORT=ON"
-        opts+=" -DEMBREE_TESTING_INTENSITY=3"
-        opts+=" -DEMBREE_SYCL_SUPPORT=ON"
-        opts+=" -DEMBREE_SYCL_AOT_DEVICES=none"
-        opts+=" -DEMBREE_MAX_ISA=AVX512"
-        opts+=" -DEMBREE_INSTALL_DEPENDENCIES=ON"
-        opts+=" -DEMBREE_TESTING_INSTALL_TESTS=ON"
-        opts+=" -DCMAKE_INSTALL_TESTDIR=testing"
-        opts+=" -DEMBREE_ZIP_MODE=ON"
-
-        cmake -S superbuild -B build -G Ninja -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -D EMBREE_EXTRA_OPTIONS="$opts"
-        cmake --build build --config Debug
-        cmake --build build/embree/build --config Debug --target build
-        cp build/embree/build/embree-*.tar.gz build/
-
-  ########################################
-  # Windows DG2
-  ########################################
-
-  windows-JIT-build:
-    secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/windows.yml@main
-    with:
-      force-delete: true
-      runs-on: '[ "Windows",  "build" ]'
-      env-from-files: ./.github/workflows/dpcpp-sycl-nightly.env
-      artifact-out: windows-JIT-build
-      artifact-path: ./build/*.zip
-      cmd: |
-        $opts  = "-DCMAKE_BUILD_TYPE=Release"
-        $opts += " -DBUILD_TESTING=ON"
-        $opts += " -DEMBREE_TUTORIALS=ON"
-        $opts += " -DEMBREE_ISPC_SUPPORT=ON"
-        $opts += " -DEMBREE_TESTING_INTENSITY=3"
-        $opts += " -DEMBREE_SYCL_SUPPORT=ON"
-        $opts += " -DEMBREE_SYCL_AOT_DEVICES=none"
-        $opts += " -DEMBREE_MAX_ISA=AVX512"
-        $opts += " -DEMBREE_INSTALL_DEPENDENCIES=ON"
-        $opts += " -DEMBREE_TESTING_INSTALL_TESTS=ON"
-        $opts += " -DCMAKE_INSTALL_TESTDIR=testing"
-        $opts += " -DEMBREE_ZIP_MODE=ON"
-        $opts += " -DCMAKE_C_COMPILER=clang"
-        $opts += " -DCMAKE_CXX_COMPILER=clang++"
-
-        cmake -S superbuild -B build -G Ninja -D EMBREE_EXTRA_OPTIONS="$opts"
-        cmake --build build --config Release
-        cmake --build build/embree/build --config Release --target build
-        Copy-Item build/embree/build/embree-*.zip build/ -Force
-
-  windows-DG2-JIT-test:
-    secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/windows.yml@main
-    needs: ["windows-JIT-build"]
-    with:
-      runs-on: '[ "Windows", "dg2" ]'
-      env-from-files: ./.github/workflows/dpcpp-sycl-nightly.env ./.github/workflows/gfx-windows-public.env
-      artifact-in: windows-JIT-build
-      cmd: |
-        $EmbreeDir = .\\scripts\\prepare-test-files.ps1 -TestType ctest
-        .\\scripts\\run-tests.ps1 -TestType ctest -EmbreeDir $EmbreeDir -CtestConfig Release
-
-  windows-BMG-JIT-test:
-    secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/windows.yml@main
-    needs: ["windows-JIT-build"]
-    with:
-      runs-on: '[ "Windows", "bmg" ]'
-      env-from-files: ./.github/workflows/dpcpp-sycl-nightly.env ./.github/workflows/gfx-windows-public.env
-      artifact-in: windows-JIT-build
-      cmd: |
-        $EmbreeDir = .\\scripts\\prepare-test-files.ps1 -TestType ctest
-        .\\scripts\\run-tests.ps1 -TestType ctest -EmbreeDir $EmbreeDir -CtestConfig Release
-
-  windows-LNL-JIT-test:
-    secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/windows.yml@main
-    needs: ["windows-JIT-build"]
-    with:
-      runs-on: '[ "Windows", "lnl" ]'
-      env-from-files: ./.github/workflows/dpcpp-sycl-nightly.env ./.github/workflows/gfx-windows-public.env
-      artifact-in: windows-JIT-build
-      cmd: |
-        $EmbreeDir = .\\scripts\\prepare-test-files.ps1 -TestType ctest
-        .\\scripts\\run-tests.ps1 -TestType ctest -EmbreeDir $EmbreeDir -CtestConfig Release
-
-  windows-DG2-JIT-INTERNAL-test:
-    secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/windows.yml@main
-    needs: ["windows-JIT-build"]
-    with:
-      runs-on: '[ "Windows",  "dg2" ]'
-      env-from-files: ./.github/workflows/dpcpp-sycl-nightly.env ./.github/workflows/gfx-windows-internal.env
-      artifact-in: windows-JIT-build
-      cmd: |
-        $EmbreeDir = .\\scripts\\prepare-test-files.ps1 -TestType ctest
-        .\\scripts\\run-tests.ps1 -TestType ctest -EmbreeDir $EmbreeDir -CtestConfig Release
-
-  windows-DG2-JIT-ICX-build:
-    secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/windows.yml@main
-    with:
-      runs-on: '[ "Windows",  "build" ]'
-      dpcpp-version: intel/2025.2
-      artifact-out: windows-DG2-JIT-ICX-build
-      artifact-path: ./build/*.zip
-      cmd: |
-        $opts  = "-DCMAKE_BUILD_TYPE=Release"
-        $opts += " -DBUILD_TESTING=ON"
-        $opts += " -DEMBREE_TUTORIALS=ON"
-        $opts += " -DEMBREE_ISPC_SUPPORT=ON"
-        $opts += " -DEMBREE_TESTING_INTENSITY=3"
-        $opts += " -DEMBREE_SYCL_SUPPORT=ON"
-        $opts += " -DEMBREE_SYCL_AOT_DEVICES=none"
-        $opts += " -DEMBREE_MAX_ISA=AVX512"
-        $opts += " -DEMBREE_INSTALL_DEPENDENCIES=ON"
-        $opts += " -DEMBREE_TESTING_INSTALL_TESTS=ON"
-        $opts += " -DCMAKE_INSTALL_TESTDIR=testing"
-        $opts += " -DEMBREE_ZIP_MODE=ON"
-        $opts += " -DCMAKE_C_COMPILER=icx"
-        $opts += " -DCMAKE_CXX_COMPILER=icx"
-
-        cmake -S superbuild -B build -G Ninja -D EMBREE_EXTRA_OPTIONS="$opts"
-        cmake --build build --config Release
-        cmake --build build/embree/build --config Release --target build
-        Copy-Item build/embree/build/embree-*.zip build/ -Force
-
-  windows-DG2-JIT-debug-build:
-    secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/windows.yml@main
-    with:
-      force-delete: true
-      runs-on: '[ "Windows",  "build" ]'
-      env-from-files: ./.github/workflows/dpcpp-sycl-nightly.env
-      cmd: |
-        $opts  = "-DCMAKE_BUILD_TYPE=Debug"
-        $opts += " -DBUILD_TESTING=ON"
-        $opts += " -DEMBREE_TUTORIALS=ON"
-        $opts += " -DEMBREE_ISPC_SUPPORT=ON"
-        $opts += " -DEMBREE_TESTING_INTENSITY=3"
-        $opts += " -DEMBREE_SYCL_SUPPORT=ON"
-        $opts += " -DEMBREE_SYCL_AOT_DEVICES=none"
-        $opts += " -DEMBREE_MAX_ISA=AVX512"
-        $opts += " -DEMBREE_INSTALL_DEPENDENCIES=ON"
-        $opts += " -DEMBREE_TESTING_INSTALL_TESTS=ON"
-        $opts += " -DCMAKE_INSTALL_TESTDIR=testing"
-        $opts += " -DEMBREE_ZIP_MODE=ON"
-
-        cmake -S superbuild -B build -G Ninja -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -D EMBREE_EXTRA_OPTIONS="$opts"
-        # Reduce parallelism for debug build to avoid OOM issues on CI machines with limited resources
-        cmake --build build --config Debug --parallel 4
-        cmake --build build/embree/build --config Debug --target build --parallel 4
-
-#   ################################################################################
-#   ################################################################################
-#   # CPU tests
-#   ################################################################################
-#   ################################################################################
-
-#   ########################################
-#   # Linux
-#   ########################################
-
-  linux-fedora42-CLANG:
-    secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
-    with:
-      image: embree/fedora:42
-      runs-on: '[ "Linux", "docker", "avx512" ]'
-      cmd: |
-        opts="-DCMAKE_BUILD_TYPE=RelWithDebInfo"
-        opts+=" -DBUILD_TESTING=ON"
-        opts+=" -DEMBREE_TUTORIALS=ON"
-        opts+=" -DEMBREE_ISPC_SUPPORT=ON"
-        opts+=" -DEMBREE_TESTING_INTENSITY=2"
-        opts+=" -DEMBREE_MAX_ISA=AVX512"
-        opts+=" -DEMBREE_INSTALL_DEPENDENCIES=ON"
-        opts+=" -DEMBREE_TESTING_INSTALL_TESTS=ON"
-        opts+=" -DCMAKE_INSTALL_TESTDIR=testing"
-        opts+=" -DEMBREE_ZIP_MODE=ON"
-        opts+=" -DCMAKE_C_COMPILER=clang"
-        opts+=" -DCMAKE_CXX_COMPILER=clang++"
-
-        cmake -S superbuild -B build -D EMBREE_EXTRA_OPTIONS="$opts"
-        cmake --build build --config RelWithDebInfo
-        cmake --build build/embree/build --config RelWithDebInfo --target build
-        cp build/embree/build/embree-*.tar.gz build/
-
-        EMBREE_PATH=$(./scripts/prepare-test-files.sh --type ctest)
-        ./scripts/run-tests.sh --type ctest --embree-dir "$EMBREE_PATH" --ctest-config RelWithDebInfo
-
-  linux-fedora42-CLANG-INT-ADDRSANITIZER:
-    secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
-    with:
-      image: embree/fedora:42
-      runs-on: '[ "Linux", "docker", "build" ]'
-      cmd: |
-        opts="-DCMAKE_BUILD_TYPE=RelWithDebInfo"
-        opts+=" -DBUILD_TESTING=ON"
-        opts+=" -DEMBREE_TUTORIALS=ON"
-        opts+=" -DEMBREE_ISPC_SUPPORT=ON"
-        opts+=" -DEMBREE_TESTING_INTENSITY=1"
-        opts+=" -DEMBREE_MAX_ISA=AVX512"
-        opts+=" -DEMBREE_INSTALL_DEPENDENCIES=ON"
-        opts+=" -DEMBREE_TESTING_INSTALL_TESTS=ON"
-        opts+=" -DCMAKE_INSTALL_TESTDIR=testing"
-        opts+=" -DEMBREE_TASKING_SYSTEM=INTERNAL"
-        opts+=" -DEMBREE_ZIP_MODE=ON"
-        opts+=" -DCMAKE_C_COMPILER=clang"
-        opts+=" -DCMAKE_CXX_COMPILER=clang++"
-        opts+=" -DEMBREE_ADDRESS_SANITIZER=ON"
-
-        cmake -S superbuild -B build -D BUILD_TBB=OFF -D EMBREE_EXTRA_OPTIONS="$opts"
-        cmake --build build --config RelWithDebInfo
-        cmake --build build/embree/build --config RelWithDebInfo --target build
-        cp build/embree/build/embree-*.tar.gz build/
-
-        EMBREE_PATH=$(./scripts/prepare-test-files.sh --type ctest)
-        ./scripts/run-tests.sh --type ctest --embree-dir "$EMBREE_PATH" --ctest-config RelWithDebInfo
-
-  linux-fedora42-ICX:
-    secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
-    with:
-      image: embree/fedora:42
-      runs-on: '[ "Linux", "docker", "avx512" ]'
-      dpcpp-version: intel/2025.2
-      cmd: |
-        opts="-DCMAKE_BUILD_TYPE=RelWithDebInfo"
-        opts+=" -DBUILD_TESTING=ON"
-        opts+=" -DEMBREE_TUTORIALS=ON"
-        opts+=" -DEMBREE_ISPC_SUPPORT=ON"
-        opts+=" -DEMBREE_TESTING_INTENSITY=2"
-        opts+=" -DEMBREE_MAX_ISA=AVX512"
-        opts+=" -DEMBREE_INSTALL_DEPENDENCIES=ON"
-        opts+=" -DEMBREE_TESTING_INSTALL_TESTS=ON"
-        opts+=" -DCMAKE_INSTALL_TESTDIR=testing"
-        opts+=" -DEMBREE_ZIP_MODE=ON"
-        opts+=" -DCMAKE_C_COMPILER=icx"
-        opts+=" -DCMAKE_CXX_COMPILER=icpx"
-
-        cmake -S superbuild -B build -D EMBREE_EXTRA_OPTIONS="$opts"
-        cmake --build build --config RelWithDebInfo
-        cmake --build build/embree/build --config RelWithDebInfo --target build
-        cp build/embree/build/embree-*.tar.gz build/
-
-        EMBREE_PATH=$(./scripts/prepare-test-files.sh --type ctest)
-        ./scripts/run-tests.sh --type ctest --embree-dir "$EMBREE_PATH" --ctest-config RelWithDebInfo
-
-  linux-ubuntu24_04-GCC:
-    secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
-    with:
-      image: embree/ubuntu:24.04
-      runs-on: '[ "Linux", "docker", "avx512" ]'
-      cmd: |
-        opts="-DCMAKE_BUILD_TYPE=Release"
-        opts+=" -DBUILD_TESTING=ON"
-        opts+=" -DEMBREE_TUTORIALS=ON"
-        opts+=" -DEMBREE_ISPC_SUPPORT=ON"
-        opts+=" -DEMBREE_TESTING_INTENSITY=3"
-        opts+=" -DEMBREE_MAX_ISA=AVX512"
-        opts+=" -DEMBREE_INSTALL_DEPENDENCIES=ON"
-        opts+=" -DEMBREE_TESTING_INSTALL_TESTS=ON"
-        opts+=" -DCMAKE_INSTALL_TESTDIR=testing"
-        opts+=" -DEMBREE_ZIP_MODE=ON"
-
-        cmake -S superbuild -B build -D EMBREE_EXTRA_OPTIONS="$opts"
-        cmake --build build --config Release
-        cmake --build build/embree/build --config Release --target build
-        cp build/embree/build/embree-*.tar.gz build/
-
-        EMBREE_PATH=$(./scripts/prepare-test-files.sh --type ctest)
-        ./scripts/run-tests.sh --type ctest --embree-dir "$EMBREE_PATH" --ctest-config Release
-
-  linux-ubuntu24_04-ICX:
-    secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
-    with:
-      image: embree/ubuntu:24.04
-      runs-on: '[ "Linux", "docker", "avx512" ]'
-      dpcpp-version: intel/2025.2
-      cmd: |
-        opts="-DCMAKE_BUILD_TYPE=RelWithDebInfo"
-        opts+=" -DBUILD_TESTING=ON"
-        opts+=" -DEMBREE_TUTORIALS=ON"
-        opts+=" -DEMBREE_ISPC_SUPPORT=ON"
-        opts+=" -DEMBREE_TESTING_INTENSITY=2"
-        opts+=" -DEMBREE_MAX_ISA=AVX512"
-        opts+=" -DEMBREE_INSTALL_DEPENDENCIES=ON"
-        opts+=" -DEMBREE_TESTING_INSTALL_TESTS=ON"
-        opts+=" -DCMAKE_INSTALL_TESTDIR=testing"
-        opts+=" -DEMBREE_ZIP_MODE=ON"
-        opts+=" -DCMAKE_C_COMPILER=icx"
-        opts+=" -DCMAKE_CXX_COMPILER=icpx"
-
-        cmake -S superbuild -B build -D EMBREE_EXTRA_OPTIONS="$opts"
-        cmake --build build --config RelWithDebInfo
-        cmake --build build/embree/build --config RelWithDebInfo --target build
-        cp build/embree/build/embree-*.tar.gz build/
-
-        EMBREE_PATH=$(./scripts/prepare-test-files.sh --type ctest)
-        ./scripts/run-tests.sh --type ctest --embree-dir "$EMBREE_PATH" --ctest-config RelWithDebInfo
-
-  ########################################
-  # Windows
-  ########################################
-  windows-V142:
-    secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/windows.yml@main
-    with:
-      force-delete: true
-      runs-on: '[ "Windows",  "build" ]'
-      msvc-version: 2019
-      cmd: |
-        $opts  = "-DCMAKE_BUILD_TYPE=RelWithDebInfo"
-        $opts += " -DBUILD_TESTING=ON"
-        $opts += " -DEMBREE_TUTORIALS=ON"
-        $opts += " -DEMBREE_ISPC_SUPPORT=ON"
-        $opts += " -DEMBREE_MAX_INSTANCE_LEVEL_COUNT=8"
-        $opts += " -DEMBREE_MAX_ISA=SSE2"
-        $opts += " -DEMBREE_INSTALL_DEPENDENCIES=ON"
-        $opts += " -DEMBREE_TESTING_INSTALL_TESTS=ON"
-        $opts += " -DCMAKE_INSTALL_TESTDIR=testing"
-        $opts += " -DEMBREE_ZIP_MODE=ON"
-
-        cmake -S superbuild -B build -G Ninja -D EMBREE_EXTRA_OPTIONS="$opts"
-        cmake --build build --config RelWithDebInfo
-        cmake --build build/embree/build --config RelWithDebInfo --target build
-        Copy-Item build/embree/build/embree-*.zip build/ -Force
-
-        $EmbreeDir = .\\scripts\\prepare-test-files.ps1 -TestType ctest
-        .\\scripts\\run-tests.ps1 -TestType ctest -EmbreeDir $EmbreeDir -CtestConfig RelWithDebInfo
-
-  ########################################
-  # MacOS
-  ########################################
-
-  macosx-ARM-CLANG-NEON-AVX2:
-    secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/macos.yml@main
-    with:
-      runs-on: '[ "macOS", "build", "arm" ]'
-      cmd: |
-        opts="-DCMAKE_BUILD_TYPE=RelWithDebInfo"
-        opts+=" -DBUILD_TESTING=ON"
-        opts+=" -DEMBREE_TUTORIALS=ON"
-        opts+=" -DEMBREE_ISPC_SUPPORT=ON"
-        opts+=" -DEMBREE_TESTING_INTENSITY=2"
-        opts+=" -DCMAKE_CXX_COMPILER=clang++"
-        opts+=" -DCMAKE_C_COMPILER=clang"
-        opts+=" -DCMAKE_INSTALL_BINDIR=bin"
-        opts+=" -DCMAKE_INSTALL_DOCDIR=doc"
-        opts+=" -DCMAKE_INSTALL_INCLUDEDIR=include"
-        opts+=" -DCMAKE_INSTALL_TESTDIR=testing"
-        opts+=" -DCMAKE_MACOSX_RPATH=ON"
-        opts+=" -DCMAKE_SKIP_INSTALL_RPATH=OFF"
-        opts+=" -DEMBREE_BUILD_GLFW_FROM_SOURCE=ON"
-        opts+=" -DEMBREE_INSTALL_DEPENDENCIES=ON"
-        opts+=" -DEMBREE_MAX_ISA=NEON2X"
-        opts+=" -DEMBREE_PATCH_GLFW_SOURCE=ON"
-        opts+=" -DEMBREE_TASKING_SYSTEM=TBB"
-        opts+=" -DEMBREE_TESTING_INSTALL_TESTS=ON"
-        opts+=" -DEMBREE_ZIP_MODE=ON"
-
-        cmake -S superbuild -B build -D BUILD_TBB_FROM_SOURCE=ON -D EMBREE_EXTRA_OPTIONS="$opts"
-        cmake --build build --config RelWithDebInfo
-        cmake --build build/embree/build --config RelWithDebInfo --target build
-        cp build/embree/build/embree-*.zip build/
-
-        EMBREE_PATH=$(./scripts/prepare-test-files-macos.sh --type ctest)
-        ./scripts/run-tests.sh --type ctest --embree-dir "$EMBREE_PATH" --ctest-config RelWithDebInfo
-
-  macosx-ARM-CLANG-NEON:
-    secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/macos.yml@main
-    with:
-      runs-on: '[ "macOS", "build", "arm" ]'
-      cmd: |
-        opts="-DCMAKE_BUILD_TYPE=RelWithDebInfo"
-        opts+=" -DBUILD_TESTING=ON"
-        opts+=" -DEMBREE_TUTORIALS=ON"
-        opts+=" -DEMBREE_ISPC_SUPPORT=ON"
-        opts+=" -DEMBREE_TESTING_INTENSITY=2"
-        opts+=" -DCMAKE_CXX_COMPILER=clang++"
-        opts+=" -DCMAKE_C_COMPILER=clang"
-        opts+=" -DCMAKE_INSTALL_BINDIR=bin"
-        opts+=" -DCMAKE_INSTALL_DOCDIR=doc"
-        opts+=" -DCMAKE_INSTALL_INCLUDEDIR=include"
-        opts+=" -DCMAKE_INSTALL_TESTDIR=testing"
-        opts+=" -DCMAKE_MACOSX_RPATH=ON"
-        opts+=" -DCMAKE_SKIP_INSTALL_RPATH=OFF"
-        opts+=" -DEMBREE_BUILD_GLFW_FROM_SOURCE=ON"
-        opts+=" -DEMBREE_INSTALL_DEPENDENCIES=ON"
-        opts+=" -DEMBREE_MAX_ISA=NEON"
-        opts+=" -DEMBREE_PATCH_GLFW_SOURCE=ON"
-        opts+=" -DEMBREE_TASKING_SYSTEM=TBB"
-        opts+=" -DEMBREE_TESTING_INSTALL_TESTS=ON"
-        opts+=" -DEMBREE_ZIP_MODE=ON"
-
-        cmake -S superbuild -B build -D BUILD_TBB_FROM_SOURCE=ON -D EMBREE_EXTRA_OPTIONS="$opts"
-        cmake --build build --config RelWithDebInfo
-        cmake --build build/embree/build --config RelWithDebInfo --target build
-        cp build/embree/build/embree-*.zip build/
-
-        EMBREE_PATH=$(./scripts/prepare-test-files-macos.sh --type ctest)
-        ./scripts/run-tests.sh --type ctest --embree-dir "$EMBREE_PATH" --ctest-config RelWithDebInfo
-
-  macosx-x64-CLANG:
-    secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/macos.yml@main
-    with:
-      runs-on: '[ "macOS", "build", "x86_64" ]'
-      cmd: |
-        opts="-DCMAKE_BUILD_TYPE=RelWithDebInfo"
-        opts+=" -DBUILD_TESTING=ON"
-        opts+=" -DEMBREE_TUTORIALS=ON"
-        opts+=" -DEMBREE_ISPC_SUPPORT=ON"
-        opts+=" -DEMBREE_TESTING_INTENSITY=2"
-        opts+=" -DCMAKE_CXX_COMPILER=clang++"
-        opts+=" -DCMAKE_C_COMPILER=clang"
-        opts+=" -DCMAKE_INSTALL_BINDIR=bin"
-        opts+=" -DCMAKE_INSTALL_DOCDIR=doc"
-        opts+=" -DCMAKE_INSTALL_INCLUDEDIR=include"
-        opts+=" -DCMAKE_INSTALL_TESTDIR=testing"
-        opts+=" -DCMAKE_MACOSX_RPATH=ON"
-        opts+=" -DCMAKE_SKIP_INSTALL_RPATH=OFF"
-        opts+=" -DEMBREE_BUILD_GLFW_FROM_SOURCE=ON"
-        opts+=" -DEMBREE_INSTALL_DEPENDENCIES=ON"
-        opts+=" -DEMBREE_MAX_ISA=AVX512"
-        opts+=" -DEMBREE_PATCH_GLFW_SOURCE=ON"
-        opts+=" -DEMBREE_TASKING_SYSTEM=TBB"
-        opts+=" -DEMBREE_TESTING_INSTALL_TESTS=ON"
-        opts+=" -DEMBREE_ZIP_MODE=ON"
-
-        cmake -S superbuild -B build -D EMBREE_EXTRA_OPTIONS="$opts"
-        cmake --build build --config RelWithDebInfo
-        cmake --build build/embree/build --config RelWithDebInfo --target build
-        cp build/embree/build/embree-*.zip build/
-
-        EMBREE_PATH=$(./scripts/prepare-test-files-macos.sh --type ctest)
-        ./scripts/run-tests.sh --type ctest --embree-dir "$EMBREE_PATH" --ctest-config RelWithDebInfo
-
-  macosx-ARM-CLANG-NEON-AVX2-universal-binaries:
-    secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/macos.yml@main
-    with:
-      runs-on: '[ "macOS", "build", "arm" ]'
-      cmd: |
-        opts="-DCMAKE_BUILD_TYPE=RelWithDebInfo"
-        opts+=" -DBUILD_TESTING=ON"
-        opts+=" -DEMBREE_TUTORIALS=ON"
-        opts+=" -DEMBREE_ISPC_SUPPORT=OFF"
-        opts+=" -DEMBREE_TESTING_INTENSITY=2"
-        opts+=" -DCMAKE_CXX_COMPILER=clang++"
-        opts+=" -DCMAKE_C_COMPILER=clang"
-        opts+=" -DCMAKE_INSTALL_BINDIR=bin"
-        opts+=" -DCMAKE_INSTALL_DOCDIR=doc"
-        opts+=" -DCMAKE_INSTALL_INCLUDEDIR=include"
-        opts+=" -DCMAKE_INSTALL_TESTDIR=testing"
-        opts+=" -DCMAKE_MACOSX_RPATH=ON"
-        opts+=" -DCMAKE_SKIP_INSTALL_RPATH=OFF"
-        opts+=" -DEMBREE_BUILD_GLFW_FROM_SOURCE=ON"
-        opts+=" -DEMBREE_INSTALL_DEPENDENCIES=ON"
-        opts+=" -DEMBREE_MAX_ISA=NEON2X"
-        opts+=" -DEMBREE_PATCH_GLFW_SOURCE=ON"
-        opts+=" -DEMBREE_TASKING_SYSTEM=TBB"
-        opts+=" -DEMBREE_TESTING_INSTALL_TESTS=ON"
-        opts+=" -DEMBREE_ZIP_MODE=ON"
-        opts+=" -DCMAKE_OSX_ARCHITECTURES=arm64;x86_64"
-
-        cmake -S superbuild -B build -D BUILD_TBB_FROM_SOURCE=ON -D EMBREE_EXTRA_OPTIONS="$opts"
-        cmake --build build --config RelWithDebInfo
-        cmake --build build/embree/build --config RelWithDebInfo --target build
-        cp build/embree/build/embree-*.zip build/
-
-        EMBREE_PATH=$(./scripts/prepare-test-files-macos.sh --type ctest)
-        ./scripts/run-tests.sh --type ctest --embree-dir "$EMBREE_PATH" --ctest-config RelWithDebInfo
-
-  ########################################
-  # Static code analysis jobs
-  ########################################
-
-  static-analysis-lin:
-    secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/static_analysis.yml@main
-    with:
-      os: Linux
-      project: Embree
-      prebuild: |
-        cmake -S superbuild -B build -D EMBREE_EXTRA_OPTIONS="-DCMAKE_BUILD_TYPE=Release -DEMBREE_MAX_ISA=SSE2"
-      build: |
-        cmake --build build --config Release
@@ -1 +0,0 @@
-DPCPP_VERSION=intel-llvm/v6.2.0
@@ -1 +0,0 @@
-GFX_DRIVER_VERSION=neo-builds/ci/master/ci-neo-master-033051/artifacts/linux/ubuntu/22.04
@@ -1 +0,0 @@
-GFX_DRIVER_VERSION=linux-latest
@@ -1 +0,0 @@
-GFX_DRIVER_VERSION=neo-builds/ci/master/ci-neo-master-033048/artifacts/linux/ubuntu/24.04
@@ -1 +0,0 @@
-GFX_DRIVER_VERSION=linux-latest
@@ -1 +0,0 @@
-GFX_DRIVER_VERSION=gfx-driver-ci-master-20127
@@ -1 +0,0 @@
-GFX_DRIVER_VERSION=windows-latest
@@ -1,627 +0,0 @@
-## Copyright 2022 Intel Corporation
-## SPDX-License-Identifier: Apache-2.0
-
-name: integrate
-
-permissions: read-all
-
-on:
-  schedule:
-    - cron:  '01 00 * * *'
-  workflow_dispatch:
-
-jobs:
-
-####################################################################
-# Linux
-####################################################################
-  integrate-linux-GCC:
-    secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
-    with:
-      image: embree/rockylinux:8.7
-      runs-on: '[ "Linux", "docker", "avx512" ]'
-      artifact-out: integrate-linux-GCC
-      artifact-path: ./build/*.tar.gz
-      cmd: |
-        opts="-DCMAKE_BUILD_TYPE=Release"
-        opts+=" -DBUILD_TESTING=ON"
-        opts+=" -DEMBREE_TUTORIALS=ON"
-        opts+=" -DEMBREE_ISPC_SUPPORT=ON"
-        opts+=" -DEMBREE_MAX_ISA=AVX512"
-        opts+=" -DEMBREE_INSTALL_DEPENDENCIES=ON"
-        opts+=" -DEMBREE_TESTING_INSTALL_TESTS=ON"
-        opts+=" -DCMAKE_INSTALL_TESTDIR=testing"
-        opts+=" -DEMBREE_ZIP_MODE=ON"
-
-        cmake -S superbuild -B build -D EMBREE_EXTRA_OPTIONS="$opts"
-        cmake --build build --config Release
-        cmake --build build/embree/build --config Release --target build
-        cp build/embree/build/embree-*.tar.gz build/
-
-  integrate-linux-GCC-test-GCC:
-    secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
-    needs: [ "integrate-linux-GCC" ]
-    with:
-      image: embree/rockylinux:8.7
-      runs-on: '[ "Linux", "docker", "avx512" ]'
-      artifact-in: integrate-linux-GCC
-      cmd: |
-        EMBREE_PATH=$(./scripts/prepare-test-files.sh --type integration)
-        ./scripts/run-tests.sh --type integration --embree-dir "$EMBREE_PATH"
-
-  integrate-linux-GCC-test-CLANG:
-    secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
-    needs: [ "integrate-linux-GCC" ]
-    with:
-      image: embree/rockylinux:8.7
-      runs-on: '[ "Linux", "docker", "avx512" ]'
-      artifact-in: integrate-linux-GCC
-      cmd: |
-        EMBREE_PATH=$(./scripts/prepare-test-files.sh --type integration)
-        ./scripts/run-tests.sh --type integration --embree-dir "$EMBREE_PATH" --c-compiler clang --cxx-compiler clang++
-
-  integrate-linux-GCC-test-ICX:
-    secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
-    needs: [ "integrate-linux-GCC" ]
-    with:
-      image: embree/rockylinux:8.7
-      runs-on: '[ "Linux", "docker", "avx512" ]'
-      dpcpp-version: intel/2025.2
-      artifact-in: integrate-linux-GCC
-      cmd: |
-        EMBREE_PATH=$(./scripts/prepare-test-files.sh --type integration)
-        ./scripts/run-tests.sh --type integration --embree-dir "$EMBREE_PATH" --c-compiler icx --cxx-compiler icpx
-
-  integrate-linux-ICX:
-    secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
-    with:
-      image: embree/rockylinux:8.7
-      runs-on: '[ "Linux", "docker", "avx512" ]'
-      dpcpp-version: intel/2025.2
-      artifact-out: integrate-linux-ICX
-      artifact-path: ./build/*.tar.gz
-      cmd: |
-        opts="-DCMAKE_BUILD_TYPE=Release"
-        opts+=" -DBUILD_TESTING=ON"
-        opts+=" -DEMBREE_TUTORIALS=ON"
-        opts+=" -DEMBREE_ISPC_SUPPORT=ON"
-        opts+=" -DEMBREE_MAX_ISA=AVX512"
-        opts+=" -DEMBREE_INSTALL_DEPENDENCIES=ON"
-        opts+=" -DEMBREE_TESTING_INSTALL_TESTS=ON"
-        opts+=" -DCMAKE_INSTALL_TESTDIR=testing"
-        opts+=" -DEMBREE_ZIP_MODE=ON"
-        opts+=" -DCMAKE_C_COMPILER=icx"
-        opts+=" -DCMAKE_CXX_COMPILER=icpx"
-
-        cmake -S superbuild -B build -D EMBREE_EXTRA_OPTIONS="$opts"
-        cmake --build build --config Release
-        cmake --build build/embree/build --config Release --target build
-        cp build/embree/build/embree-*.tar.gz build/
-
-  integrate-linux-ICX-test-GCC:
-    secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
-    needs: [ "integrate-linux-ICX" ]
-    with:
-      image: embree/rockylinux:8.7
-      runs-on: '[ "Linux", "docker", "avx512" ]'
-      artifact-in: integrate-linux-ICX
-      cmd: |
-        EMBREE_PATH=$(./scripts/prepare-test-files.sh --type integration)
-        ./scripts/run-tests.sh --type integration --embree-dir "$EMBREE_PATH"
-
-  integrate-linux-ICX-test-CLANG:
-    secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
-    needs: [ "integrate-linux-ICX" ]
-    with:
-      image: embree/rockylinux:8.7
-      runs-on: '[ "Linux", "docker", "avx512" ]'
-      dpcpp-version: intel/2025.2
-      artifact-in: integrate-linux-ICX
-      cmd: |
-        EMBREE_PATH=$(./scripts/prepare-test-files.sh --type integration)
-        ./scripts/run-tests.sh --type integration --embree-dir "$EMBREE_PATH" --c-compiler clang --cxx-compiler clang++
-
-  integrate-linux-ICX-test-ICX:
-    secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
-    needs: [ "integrate-linux-ICX" ]
-    with:
-      image: embree/rockylinux:8.7
-      runs-on: '[ "Linux", "docker", "avx512" ]'
-      dpcpp-version: intel/2025.2
-      artifact-in: integrate-linux-ICX
-      cmd: |
-        EMBREE_PATH=$(./scripts/prepare-test-files.sh --type integration)
-        ./scripts/run-tests.sh --type integration --embree-dir "$EMBREE_PATH" --c-compiler icx --cxx-compiler icpx
-        
-  integrate-static-linux-CLANG:
-    secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
-    with:
-      image: embree/rockylinux:8.7
-      runs-on: '[ "Linux", "docker", "avx512" ]'
-      artifact-out: integrate-static-linux-CLANG
-      artifact-path: ./build/*.tar.gz
-      cmd: |
-        opts="-DCMAKE_BUILD_TYPE=Release"
-        opts+=" -DBUILD_TESTING=ON"
-        opts+=" -DEMBREE_TUTORIALS=ON"
-        opts+=" -DEMBREE_ISPC_SUPPORT=ON"
-        opts+=" -DEMBREE_MAX_ISA=AVX512"
-        opts+=" -DEMBREE_INSTALL_DEPENDENCIES=ON"
-        opts+=" -DEMBREE_TESTING_INSTALL_TESTS=ON"
-        opts+=" -DCMAKE_INSTALL_TESTDIR=testing"
-        opts+=" -DEMBREE_ZIP_MODE=ON"
-        opts+=" -DCMAKE_C_COMPILER=clang"
-        opts+=" -DCMAKE_CXX_COMPILER=clang++"
-
-        cmake -S superbuild -B build -D EMBREE_EXTRA_OPTIONS="$opts"
-        cmake --build build --config Release
-        cmake --build build/embree/build --config Release --target build
-        cp build/embree/build/embree-*.tar.gz build/
-
-  integrate-static-linux-CLANG-test-GCC:
-    secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
-    needs: [ "integrate-static-linux-CLANG" ]
-    with:
-      image: embree/rockylinux:8.7
-      runs-on: '[ "Linux", "docker", "avx512" ]'
-      artifact-in: integrate-static-linux-CLANG
-      cmd: |
-        EMBREE_PATH=$(./scripts/prepare-test-files.sh --type integration)
-        ./scripts/run-tests.sh --type integration --embree-dir "$EMBREE_PATH"
-
-  integrate-static-linux-CLANG-test-CLANG:
-    secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
-    needs: [ "integrate-static-linux-CLANG" ]
-    with:
-      image: embree/rockylinux:8.7
-      runs-on: '[ "Linux", "docker", "avx512" ]'
-      artifact-in: integrate-static-linux-CLANG
-      cmd: |
-        EMBREE_PATH=$(./scripts/prepare-test-files.sh --type integration)
-        ./scripts/run-tests.sh --type integration --embree-dir "$EMBREE_PATH" --c-compiler clang --cxx-compiler clang++
-
-  integrate-static-linux-CLANG-test-ICX:
-    secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
-    needs: [ "integrate-static-linux-CLANG" ]
-    with:
-      image: embree/rockylinux:8.7
-      runs-on: '[ "Linux", "docker", "avx512" ]'
-      dpcpp-version: intel/2025.2
-      artifact-in: integrate-static-linux-CLANG
-      cmd: |
-        EMBREE_PATH=$(./scripts/prepare-test-files.sh --type integration)
-        ./scripts/run-tests.sh --type integration --embree-dir "$EMBREE_PATH" --c-compiler icx --cxx-compiler icpx
-        
-
-
-####################################################################
-# Linux STATIC
-####################################################################
-  integrate-static-linux-GCC:
-    secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
-    with:
-      image: embree/rockylinux:8.7
-      runs-on: '[ "Linux", "docker", "avx512" ]'
-      artifact-out: integrate-static-linux-GCC
-      artifact-path: ./build/*.tar.gz
-      cmd: |
-        opts="-DCMAKE_BUILD_TYPE=Release"
-        opts+=" -DBUILD_TESTING=ON"
-        opts+=" -DEMBREE_TUTORIALS=ON"
-        opts+=" -DEMBREE_ISPC_SUPPORT=ON"
-        opts+=" -DEMBREE_MAX_ISA=AVX512"
-        opts+=" -DEMBREE_INSTALL_DEPENDENCIES=ON"
-        opts+=" -DEMBREE_TESTING_INSTALL_TESTS=ON"
-        opts+=" -DCMAKE_INSTALL_TESTDIR=testing"
-        opts+=" -DEMBREE_ZIP_MODE=ON"
-
-        cmake -S superbuild -B build -D EMBREE_EXTRA_OPTIONS="$opts"
-        cmake --build build --config Release
-        cmake --build build/embree/build --config Release --target build
-        cp build/embree/build/embree-*.tar.gz build/
-
-  integrate-static-linux-GCC-test-GCC:
-    secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
-    needs: [ "integrate-static-linux-GCC" ]
-    with:
-      image: embree/rockylinux:8.7
-      runs-on: '[ "Linux", "docker", "avx512" ]'
-      artifact-in: integrate-static-linux-GCC
-      cmd: |
-        EMBREE_PATH=$(./scripts/prepare-test-files.sh --type integration)
-        ./scripts/run-tests.sh --type integration --embree-dir "$EMBREE_PATH"
-
-  integrate-static-linux-GCC-test-CLANG:
-    secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
-    needs: [ "integrate-static-linux-GCC" ]
-    with:
-      image: embree/rockylinux:8.7
-      runs-on: '[ "Linux", "docker", "avx512" ]'
-      artifact-in: integrate-static-linux-GCC
-      cmd: |
-        EMBREE_PATH=$(./scripts/prepare-test-files.sh --type integration)
-        ./scripts/run-tests.sh --type integration --embree-dir "$EMBREE_PATH" --c-compiler clang --cxx-compiler clang++
-
-  integrate-static-linux-GCC-test-ICX:
-    secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
-    needs: [ "integrate-static-linux-GCC" ]
-    with:
-      image: embree/rockylinux:8.7
-      runs-on: '[ "Linux", "docker", "avx512" ]'
-      dpcpp-version: intel/2025.2
-      artifact-in: integrate-static-linux-GCC
-      cmd: |
-        EMBREE_PATH=$(./scripts/prepare-test-files.sh --type integration)
-        ./scripts/run-tests.sh --type integration --embree-dir "$EMBREE_PATH" --c-compiler icx --cxx-compiler icpx
-
-
-  integrate-static-linux-ICX:
-    secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
-    with:
-      image: embree/rockylinux:8.7
-      runs-on: '[ "Linux", "docker", "avx512" ]'
-      dpcpp-version: intel/2025.2
-      artifact-out: integrate-static-linux-ICX
-      artifact-path: ./build/*.tar.gz
-      cmd: |
-        opts="-DCMAKE_BUILD_TYPE=Release"
-        opts+=" -DBUILD_TESTING=ON"
-        opts+=" -DEMBREE_TUTORIALS=ON"
-        opts+=" -DEMBREE_ISPC_SUPPORT=ON"
-        opts+=" -DEMBREE_MAX_ISA=AVX512"
-        opts+=" -DEMBREE_INSTALL_DEPENDENCIES=ON"
-        opts+=" -DEMBREE_TESTING_INSTALL_TESTS=ON"
-        opts+=" -DCMAKE_INSTALL_TESTDIR=testing"
-        opts+=" -DEMBREE_ZIP_MODE=ON"
-        opts+=" -DCMAKE_C_COMPILER=icx"
-        opts+=" -DCMAKE_CXX_COMPILER=icpx"
-
-        cmake -S superbuild -B build -D EMBREE_EXTRA_OPTIONS="$opts"
-        cmake --build build --config Release
-        cmake --build build/embree/build --config Release --target build
-        cp build/embree/build/embree-*.tar.gz build/
-
-  integrate-static-linux-ICX-test-GCC:
-    secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
-    needs: [ "integrate-static-linux-ICX" ]
-    with:
-      image: embree/rockylinux:8.7
-      runs-on: '[ "Linux", "docker", "avx512" ]'
-      dpcpp-version: intel/2025.2
-      artifact-in: integrate-static-linux-ICX
-      cmd: |
-        EMBREE_PATH=$(./scripts/prepare-test-files.sh --type integration)
-        ./scripts/run-tests.sh --type integration --embree-dir "$EMBREE_PATH"
-
-  integrate-static-linux-ICX-test-CLANG:
-    secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
-    needs: [ "integrate-static-linux-ICX" ]
-    with:
-      image: embree/rockylinux:8.7
-      runs-on: '[ "Linux", "docker", "avx512" ]'
-      dpcpp-version: intel/2025.2
-      artifact-in: integrate-static-linux-ICX
-      cmd: |
-        EMBREE_PATH=$(./scripts/prepare-test-files.sh --type integration)
-        ./scripts/run-tests.sh --type integration --embree-dir "$EMBREE_PATH" --c-compiler clang --cxx-compiler clang++
-
-  integrate-static-linux-ICX-test-ICX:
-    secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
-    needs: [ "integrate-static-linux-ICX" ]
-    with:
-      image: embree/rockylinux:8.7
-      runs-on: '[ "Linux", "docker", "avx512" ]'
-      dpcpp-version: intel/2025.2
-      artifact-in: integrate-static-linux-ICX
-      cmd: |
-        EMBREE_PATH=$(./scripts/prepare-test-files.sh --type integration)
-        ./scripts/run-tests.sh --type integration --embree-dir "$EMBREE_PATH" --c-compiler icx --cxx-compiler icpx
-        
-  integrate-linux-CLANG:
-    secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
-    with:
-      image: embree/rockylinux:8.7
-      runs-on: '[ "Linux", "docker", "avx512" ]'
-      artifact-out: integrate-linux-CLANG
-      artifact-path: ./build/*.tar.gz
-      cmd: |
-        opts="-DCMAKE_BUILD_TYPE=Release"
-        opts+=" -DBUILD_TESTING=ON"
-        opts+=" -DEMBREE_TUTORIALS=ON"
-        opts+=" -DEMBREE_ISPC_SUPPORT=ON"
-        opts+=" -DEMBREE_MAX_ISA=AVX512"
-        opts+=" -DEMBREE_INSTALL_DEPENDENCIES=ON"
-        opts+=" -DEMBREE_TESTING_INSTALL_TESTS=ON"
-        opts+=" -DCMAKE_INSTALL_TESTDIR=testing"
-        opts+=" -DEMBREE_ZIP_MODE=ON"
-        opts+=" -DCMAKE_C_COMPILER=clang"
-        opts+=" -DCMAKE_CXX_COMPILER=clang++"
-
-        cmake -S superbuild -B build -D EMBREE_EXTRA_OPTIONS="$opts"
-        cmake --build build --config Release
-        cmake --build build/embree/build --config Release --target build
-        cp build/embree/build/embree-*.tar.gz build/
-
-  integrate-linux-CLANG-test-GCC:
-    secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
-    needs: [ "integrate-linux-CLANG" ]
-    with:
-      image: embree/rockylinux:8.7
-      runs-on: '[ "Linux", "docker", "avx512" ]'
-      artifact-in: integrate-linux-CLANG
-      cmd: |
-        EMBREE_PATH=$(./scripts/prepare-test-files.sh --type integration)
-        ./scripts/run-tests.sh --type integration --embree-dir "$EMBREE_PATH"
-
-  integrate-linux-CLANG-test-CLANG:
-    secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
-    needs: [ "integrate-linux-CLANG" ]
-    with:
-      image: embree/rockylinux:8.7
-      runs-on: '[ "Linux", "docker", "avx512" ]'
-      artifact-in: integrate-linux-CLANG
-      cmd: |
-        EMBREE_PATH=$(./scripts/prepare-test-files.sh --type integration)
-        ./scripts/run-tests.sh --type integration --embree-dir "$EMBREE_PATH" --c-compiler clang --cxx-compiler clang++
-
-  integrate-linux-CLANG-test-ICX:
-    secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
-    needs: [ "integrate-linux-CLANG" ]
-    with:
-      image: embree/rockylinux:8.7
-      runs-on: '[ "Linux", "docker", "avx512" ]'
-      dpcpp-version: intel/2025.2
-      artifact-in: integrate-linux-CLANG
-      cmd: |
-        EMBREE_PATH=$(./scripts/prepare-test-files.sh --type integration)
-        ./scripts/run-tests.sh --type integration --embree-dir "$EMBREE_PATH" --c-compiler icx --cxx-compiler icpx
-
-
-
-
-####################################################################
-# Linux SYCL
-####################################################################
-  integrate-sycl-linux-ICX:
-    secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
-    with:
-      image: embree/ubuntu:24.04
-      runs-on: '[ "Linux", "docker", "build" ]'
-      dpcpp-version: intel/2025.2
-      artifact-out: integrate-sycl-linux-ICX
-      artifact-path: ./build/*.tar.gz
-      cmd: |
-        opts="-DCMAKE_BUILD_TYPE=Release"
-        opts+=" -DBUILD_TESTING=ON"
-        opts+=" -DEMBREE_TUTORIALS=ON"
-        opts+=" -DEMBREE_ISPC_SUPPORT=ON"
-        opts+=" -DEMBREE_MAX_ISA=AVX512"
-        opts+=" -DEMBREE_SYCL_SUPPORT=ON"
-        opts+=" -DEMBREE_SYCL_AOT_DEVICES=none"
-        opts+=" -DEMBREE_INSTALL_DEPENDENCIES=ON"
-        opts+=" -DEMBREE_TESTING_INSTALL_TESTS=ON"
-        opts+=" -DCMAKE_INSTALL_TESTDIR=testing"
-        opts+=" -DEMBREE_ZIP_MODE=ON"
-        opts+=" -DCMAKE_C_COMPILER=icx"
-        opts+=" -DCMAKE_CXX_COMPILER=icpx"
-
-        cmake -S superbuild -B build -D EMBREE_EXTRA_OPTIONS="$opts"
-        cmake --build build --config Release
-        cmake --build build/embree/build --config Release --target build
-        cp build/embree/build/embree-*.tar.gz build/
-
-  integrate-sycl-linux-ICX-test:
-    secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
-    needs: [ "integrate-sycl-linux-ICX" ]
-    with:
-      image: embree/ubuntu:24.04
-      options: --device=/dev/dri:/dev/dri
-      runs-on: '[ "Linux", "docker", "dg2" ]'
-      env-from-files: ./.github/workflows/gfx-ubuntu24-public.env
-      dpcpp-version: intel/2025.2
-      artifact-in: integrate-sycl-linux-ICX
-      cmd: |
-        EMBREE_PATH=$(./scripts/prepare-test-files.sh --type integration)
-        cd tests/integration/test_embree_release
-        cmake -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=icx -DCMAKE_CXX_COMPILER=icpx -Dembree_DIR="$EMBREE_PATH"
-        cmake --build build --config Release
-        ./build/test
-        
-  integrate-sycl-linux-DPCPP:
-    secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
-    with:
-      image: embree/ubuntu:24.04
-      runs-on: '[ "Linux", "docker", "build" ]'
-      env-from-files: ./.github/workflows/dpcpp-sycl-nightly.env
-      artifact-out: integrate-sycl-linux-DPCPP
-      artifact-path: ./build/*.tar.gz
-      cmd: |
-        opts="-DCMAKE_BUILD_TYPE=Release"
-        opts+=" -DBUILD_TESTING=ON"
-        opts+=" -DEMBREE_TUTORIALS=ON"
-        opts+=" -DEMBREE_ISPC_SUPPORT=ON"
-        opts+=" -DEMBREE_MAX_ISA=SSE2"
-        opts+=" -DEMBREE_SYCL_SUPPORT=ON"
-        opts+=" -DEMBREE_SYCL_AOT_DEVICES=none"
-        opts+=" -DEMBREE_INSTALL_DEPENDENCIES=ON"
-        opts+=" -DEMBREE_TESTING_INSTALL_TESTS=ON"
-        opts+=" -DCMAKE_INSTALL_TESTDIR=testing"
-        opts+=" -DEMBREE_ZIP_MODE=ON"
-        opts+=" -DCMAKE_C_COMPILER=clang"
-        opts+=" -DCMAKE_CXX_COMPILER=clang++"
-
-        cmake -S superbuild -B build -D EMBREE_EXTRA_OPTIONS="$opts"
-        cmake --build build --config Release
-        cmake --build build/embree/build --config Release --target build
-        cp build/embree/build/embree-*.tar.gz build/
-
-  integrate-sycl-linux-DPCPP-test:
-    secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
-    needs: [ "integrate-sycl-linux-DPCPP" ]
-    with:
-      image: embree/ubuntu:24.04
-      options: --device=/dev/dri:/dev/dri
-      runs-on: '[ "Linux", "docker", "dg2" ]'
-      env-from-files: ./.github/workflows/dpcpp-sycl-nightly.env ./.github/workflows/gfx-ubuntu24-public.env
-      artifact-in: integrate-sycl-linux-DPCPP
-      cmd: |
-        EMBREE_PATH=$(./scripts/prepare-test-files.sh --type integration)
-        cd tests/integration/test_embree_release
-        cmake -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -Dembree_DIR="$EMBREE_PATH"
-        cmake --build build --config Release
-        ./build/test
-        
-
-
-
-
-####################################################################
-# MacOS
-####################################################################
-  integrate-macos-GCC:
-    secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/macos.yml@main
-    with:
-      runs-on: '[ "macOS", "build", "x86_64" ]'
-      artifact-out: integrate-macos-GCC
-      artifact-path: ./build/*.zip
-      cmd: |
-        opts="-DCMAKE_BUILD_TYPE=Release"
-        opts+=" -DBUILD_TESTING=ON"
-        opts+=" -DEMBREE_TUTORIALS=ON"
-        opts+=" -DEMBREE_ISPC_SUPPORT=ON"
-        opts+=" -DEMBREE_MAX_ISA=AVX512"
-        opts+=" -DCMAKE_INSTALL_BINDIR=bin"
-        opts+=" -DCMAKE_INSTALL_DOCDIR=doc"
-        opts+=" -DCMAKE_INSTALL_INCLUDEDIR=include"
-        opts+=" -DCMAKE_INSTALL_TESTDIR=testing"
-        opts+=" -DCMAKE_MACOSX_RPATH=ON"
-        opts+=" -DCMAKE_SKIP_INSTALL_RPATH=OFF"
-        opts+=" -DEMBREE_BUILD_GLFW_FROM_SOURCE=ON"
-        opts+=" -DEMBREE_INSTALL_DEPENDENCIES=ON"
-        opts+=" -DEMBREE_PATCH_GLFW_SOURCE=ON"
-        opts+=" -DEMBREE_TASKING_SYSTEM=TBB"
-        opts+=" -DEMBREE_TESTING_INSTALL_TESTS=ON"
-        opts+=" -DEMBREE_ZIP_MODE=ON"
-
-        cmake -S superbuild -B build -D EMBREE_EXTRA_OPTIONS="$opts"
-        cmake --build build --config Release
-        cmake --build build/embree/build --config Release --target build
-        cp build/embree/build/embree-*.zip build/
-
-  integrate-macos-GCC-test-GCC:
-    secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/macos.yml@main
-    needs: [ "integrate-macos-GCC" ]
-    with:
-      runs-on: '[ "macOS", "build", "x86_64" ]'
-      artifact-in: integrate-macos-GCC
-      cmd: |
-        EMBREE_PATH=$(./scripts/prepare-test-files-macos.sh --type integration)
-        cd tests/integration/test_embree_release
-        cmake -B build -DCMAKE_BUILD_TYPE=Release -Dembree_DIR="$EMBREE_PATH"
-        cmake --build build --config Release
-        ./build/test
-
-  integrate-macos-GCC-test-CLANG:
-    secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/macos.yml@main
-    needs: [ "integrate-macos-GCC" ]
-    with:
-      runs-on: '[ "macOS", "build", "x86_64" ]'
-      artifact-in: integrate-macos-GCC
-      cmd: |
-        EMBREE_PATH=$(./scripts/prepare-test-files-macos.sh --type integration)
-        cd tests/integration/test_embree_release
-        cmake -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -Dembree_DIR="$EMBREE_PATH"
-        cmake --build build --config Release
-        ./build/test
-      
-  integrate-macos-CLANG:
-    secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/macos.yml@main
-    with:
-      runs-on: '[ "macOS", "build", "x86_64" ]'
-      artifact-out: integrate-macos-CLANG
-      artifact-path: ./build/*.zip
-      cmd: |
-        opts="-DCMAKE_BUILD_TYPE=Release"
-        opts+=" -DBUILD_TESTING=ON"
-        opts+=" -DEMBREE_TUTORIALS=ON"
-        opts+=" -DEMBREE_ISPC_SUPPORT=ON"
-        opts+=" -DEMBREE_MAX_ISA=AVX512"
-        opts+=" -DCMAKE_CXX_COMPILER=clang++"
-        opts+=" -DCMAKE_C_COMPILER=clang"
-        opts+=" -DCMAKE_INSTALL_BINDIR=bin"
-        opts+=" -DCMAKE_INSTALL_DOCDIR=doc"
-        opts+=" -DCMAKE_INSTALL_INCLUDEDIR=include"
-        opts+=" -DCMAKE_INSTALL_TESTDIR=testing"
-        opts+=" -DCMAKE_MACOSX_RPATH=ON"
-        opts+=" -DCMAKE_SKIP_INSTALL_RPATH=OFF"
-        opts+=" -DEMBREE_BUILD_GLFW_FROM_SOURCE=ON"
-        opts+=" -DEMBREE_INSTALL_DEPENDENCIES=ON"
-        opts+=" -DEMBREE_PATCH_GLFW_SOURCE=ON"
-        opts+=" -DEMBREE_TASKING_SYSTEM=TBB"
-        opts+=" -DEMBREE_TESTING_INSTALL_TESTS=ON"
-        opts+=" -DEMBREE_ZIP_MODE=ON"
-
-        cmake -S superbuild -B build -D EMBREE_EXTRA_OPTIONS="$opts"
-        cmake --build build --config Release
-        cmake --build build/embree/build --config Release --target build
-        cp build/embree/build/embree-*.zip build/
-
-  integrate-macos-CLANG-test-GCC:
-    secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/macos.yml@main
-    needs: [ "integrate-macos-CLANG" ]
-    with:
-      runs-on: '[ "macOS", "build", "x86_64" ]'
-      artifact-in: integrate-macos-CLANG
-      cmd: |
-        EMBREE_PATH=$(./scripts/prepare-test-files-macos.sh --type integration)
-        cd tests/integration/test_embree_release
-        cmake -B build -DCMAKE_BUILD_TYPE=Release -Dembree_DIR="$EMBREE_PATH"
-        cmake --build build --config Release
-        ./build/test
-
-  integrate-macos-CLANG-test-CLANG:
-    secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/macos.yml@main
-    needs: [ "integrate-macos-CLANG" ]
-    with:
-      runs-on: '[ "macOS", "build", "x86_64" ]'
-      artifact-in: integrate-macos-CLANG
-      cmd: |
-        EMBREE_PATH=$(./scripts/prepare-test-files-macos.sh --type integration)
-        cd tests/integration/test_embree_release
-        cmake -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -Dembree_DIR="$EMBREE_PATH"
-        cmake --build build --config Release
-        ./build/test
@@ -1,116 +0,0 @@
-## Copyright 2024 Intel Corporation
-## SPDX-License-Identifier: Apache-2.0
-
-name: continuous (public)
-
-on:
-  push:
-  pull_request:
-  workflow_dispatch:
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
-permissions: read-all
-
-jobs:
-  rocky-8:
-    runs-on: ubuntu-latest
-    container:
-      image: rockylinux:8
-    steps:
-      - name: Install packages (rocky 8)
-        run: |
-          yum -y install epel-release
-          yum -y install gcc-c++ clang tar git-lfs make tbb-devel freeglut-devel glfw-devel libXmu-devel libXi-devel python3
-          yum -y install cmake
-          yum -y install libXcursor-devel libXi-devel libXinerama-devel libXrandr-devel
-          yum -y install ncurses-compat-libs 
-          yum -y install environment-modules
-          dnf makecache --refresh
-          dnf config-manager --set-enabled powertools
-          dnf -y update
-          dnf -y install ninja-build
-
-      - name: Checkout Repository
-        uses: actions/checkout@v4
-
-      - name: Build and Run
-        run: |
-          mkdir build
-          cd build
-          cmake -DBUILD_TESTING=ON -DEMBREE_TUTORIALS=ON -DEMBREE_ISPC_SUPPORT=OFF -DEMBREE_TESTING_INTENSITY=3 ..
-          make -j$(nproc)
-          ctest
-
-  ubuntu-24-tbb-and-ispc-from-os:
-    runs-on: ubuntu-latest
-    container:
-      image: ubuntu:24.04
-    steps:
-      - name: Install packages (ubuntu 24.04)
-        run: |
-          apt-get update
-          apt-get -y upgrade
-          apt-get -y install g++ cmake git-lfs freeglut3-dev libglfw3-dev libxmu-dev libxi-dev unzip xorg-dev pip libtbb-dev ispc
-          apt-get -y install libopenimageio-dev
-
-      - name: Checkout Repository
-        uses: actions/checkout@v4
-
-      - name: Build and Run
-        run: |
-          mkdir build
-          cd build
-          cmake -DBUILD_TESTING=ON -DEMBREE_TUTORIALS=ON -DEMBREE_ISPC_SUPPORT=ON -DEMBREE_TESTING_INTENSITY=3 ..
-          make -j$(nproc)
-          ctest
-
-  ubuntu-24-tbb-and-ispc-prebuilt:
-    runs-on: ubuntu-latest
-    container:
-      image: ubuntu:24.04
-    steps:
-      - name: Install packages (ubuntu 24.04)
-        run: |
-          apt-get update
-          apt-get -y upgrade
-          apt-get -y install g++ cmake git-lfs freeglut3-dev libglfw3-dev libxmu-dev libxi-dev unzip xorg-dev pip
-          apt-get -y install libopenimageio-dev
-
-      - name: Checkout Repository
-        uses: actions/checkout@v4
-
-      - name: Build and Run
-        run: |
-          mkdir build
-          cd build
-          cmake -D EMBREE_EXTRA_OPTIONS="-DBUILD_TESTING=ON -DEMBREE_TUTORIALS=ON -DEMBREE_ISPC_SUPPORT=ON -DEMBREE_TESTING_INTENSITY=3" ../superbuild
-          cmake --build .
-          cd embree/build
-          ctest
-
-  ubuntu-24-tbb-src-ispc-prebuilt:
-    runs-on: ubuntu-latest
-    container:
-      image: ubuntu:24.04
-    steps:
-      - name: Install packages (ubuntu 24.04)
-        run: |
-          apt-get update
-          apt-get -y upgrade
-          apt-get -y install g++ cmake git-lfs freeglut3-dev libglfw3-dev libxmu-dev libxi-dev unzip xorg-dev pip
-          apt-get -y install libopenimageio-dev
-
-      - name: Checkout Repository
-        uses: actions/checkout@v4
-
-      - name: Build and Run
-        run: |
-          mkdir build
-          cd build
-          cmake -D BUILD_TBB_FROM_SOURCE=ON -D EMBREE_EXTRA_OPTIONS="-DBUILD_TESTING=ON -DEMBREE_TUTORIALS=ON -DEMBREE_ISPC_SUPPORT=ON -DEMBREE_TESTING_INTENSITY=3" ../superbuild
-          cmake --build .
-          cd embree/build
-          ctest
@@ -1,381 +0,0 @@
-## Copyright 2022 Intel Corporation
-## SPDX-License-Identifier: Apache-2.0
-
-name: release
-
-permissions: read-all
-
-on:
-  schedule:
-    - cron:  '01 00 * * *'
-  workflow_dispatch:
-
-jobs:
-
-####################################################################
-# CPU Builds and Tests
-####################################################################
-  build-windows:
-    secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/windows.yml@main
-    with:
-      runs-on: '[ "Windows", "build"]'
-      artifact-out: build-windows
-      artifact-path: ./build/embree-*.zip
-      dpcpp-version: intel-llvm/v6.2.0
-      cmd: |
-        $opts  = "-DCMAKE_BUILD_TYPE=Release"
-        $opts += " -DBUILD_TESTING=ON"
-        $opts += " -DEMBREE_TUTORIALS=ON"
-        $opts += " -DEMBREE_ISPC_SUPPORT=ON"
-        $opts += " -DEMBREE_TESTING_INTENSITY=3"
-        $opts += " -DEMBREE_MAX_ISA=AVX512"
-        $opts += " -DEMBREE_INSTALL_DEPENDENCIES=ON"
-        $opts += " -DEMBREE_TESTING_INSTALL_TESTS=ON"
-        $opts += " -DCMAKE_INSTALL_TESTDIR=testing"
-        $opts += " -DEMBREE_ZIP_MODE=ON"
-
-        cmake -S superbuild -B build -G Ninja -D EMBREE_EXTRA_OPTIONS="$opts"
-        cmake --build build --config Release
-        cmake --build build/embree/build --config Release --target build
-        Copy-Item build/embree/build/embree-*.zip build/ -Force
-
-  windows-test:
-    secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/windows.yml@main
-    needs: ["build-windows"]
-    strategy:
-      fail-fast: false
-      matrix:
-        platform: [avx2, avx512]
-    with:
-      runs-on: '[ "Windows", "${{ matrix.platform }}" ]'
-      artifact-in: build-windows
-      cmd: |
-        $EmbreeDir = .\\scripts\\prepare-test-files.ps1 -TestType ctest
-        .\\scripts\\run-tests.ps1 -TestType ctest -EmbreeDir $EmbreeDir -CtestConfig Release
-
-  build-macosx-x86_64:
-    secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/macos.yml@main
-    with:
-      runs-on: '[ "macOS", "build", "x86_64" ]'
-      cmd: |
-        opts="-DCMAKE_BUILD_TYPE=Release"
-        opts+=" -DBUILD_TESTING=ON"
-        opts+=" -DEMBREE_TUTORIALS=ON"
-        opts+=" -DEMBREE_ISPC_SUPPORT=ON"
-        opts+=" -DEMBREE_TESTING_INTENSITY=3"
-        opts+=" -DCMAKE_CXX_COMPILER=clang++"
-        opts+=" -DCMAKE_C_COMPILER=clang"
-        opts+=" -DCMAKE_INSTALL_BINDIR=bin"
-        opts+=" -DCMAKE_INSTALL_DOCDIR=doc"
-        opts+=" -DCMAKE_INSTALL_INCLUDEDIR=include"
-        opts+=" -DCMAKE_INSTALL_TESTDIR=testing"
-        opts+=" -DCMAKE_MACOSX_RPATH=ON"
-        opts+=" -DCMAKE_SKIP_INSTALL_RPATH=OFF"
-        opts+=" -DEMBREE_BUILD_GLFW_FROM_SOURCE=ON"
-        opts+=" -DEMBREE_INSTALL_DEPENDENCIES=ON"
-        opts+=" -DEMBREE_MAX_ISA=AVX512"
-        opts+=" -DEMBREE_PATCH_GLFW_SOURCE=ON"
-        opts+=" -DEMBREE_TASKING_SYSTEM=TBB"
-        opts+=" -DEMBREE_TESTING_INSTALL_TESTS=ON"
-        opts+=" -DEMBREE_ZIP_MODE=ON"
-        opts+=" -DCPACK_PRE_BUILD_SCRIPTS=$CPACK_PRE_BUILD_SIGNING_SCRIPT"
-
-        cmake -S superbuild -B build -D EMBREE_EXTRA_OPTIONS="$opts"
-        cmake --build build --config Release
-        cmake --build build/embree/build --config Release --target build
-        cp build/embree/build/embree-*.zip build/
-      notarize-package: ./build/embree-*.x86_64.macosx.zip
-      artifact-out: build-macosx-x86_64
-      artifact-path: ./build/embree-*.zip
-
-  test-macosx-x86_64:
-    secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/macos.yml@main
-    needs: ["build-macosx-x86_64"]
-    strategy:
-      fail-fast: false
-      matrix:
-        platform: [arm, x86_64]
-    with:
-      runs-on: '[ "macOS", "${{ matrix.platform }}" ]'
-      artifact-in: build-macosx-x86_64
-      cmd: |
-        EMBREE_PATH=$(./scripts/prepare-test-files-macos.sh --type ctest)
-        ./scripts/run-tests.sh --type ctest --embree-dir "$EMBREE_PATH" --ctest-config Release
-
-  build-macosx-arm:
-    secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/macos.yml@main
-    with:
-      runs-on: '[ "macOS", "build", "arm" ]'
-      cmd: |
-        opts="-DCMAKE_BUILD_TYPE=Release"
-        opts+=" -DBUILD_TESTING=ON"
-        opts+=" -DEMBREE_TUTORIALS=ON"
-        opts+=" -DEMBREE_ISPC_SUPPORT=ON"
-        opts+=" -DEMBREE_TESTING_INTENSITY=3"
-        opts+=" -DCMAKE_CXX_COMPILER=clang++"
-        opts+=" -DCMAKE_C_COMPILER=clang"
-        opts+=" -DCMAKE_INSTALL_BINDIR=bin"
-        opts+=" -DCMAKE_INSTALL_DOCDIR=doc"
-        opts+=" -DCMAKE_INSTALL_INCLUDEDIR=include"
-        opts+=" -DCMAKE_INSTALL_TESTDIR=testing"
-        opts+=" -DCMAKE_MACOSX_RPATH=ON"
-        opts+=" -DCMAKE_SKIP_INSTALL_RPATH=OFF"
-        opts+=" -DEMBREE_BUILD_GLFW_FROM_SOURCE=ON"
-        opts+=" -DEMBREE_INSTALL_DEPENDENCIES=ON"
-        opts+=" -DEMBREE_MAX_ISA=NEON2X"
-        opts+=" -DEMBREE_PATCH_GLFW_SOURCE=ON"
-        opts+=" -DEMBREE_TASKING_SYSTEM=TBB"
-        opts+=" -DEMBREE_TESTING_INSTALL_TESTS=ON"
-        opts+=" -DEMBREE_ZIP_MODE=ON"
-        opts+=" -DCPACK_PRE_BUILD_SCRIPTS=$CPACK_PRE_BUILD_SIGNING_SCRIPT"
-
-        cmake -S superbuild -B build -D BUILD_TBB_FROM_SOURCE=ON -D EMBREE_EXTRA_OPTIONS="$opts"
-        cmake --build build --config Release
-        cmake --build build/embree/build --config Release --target build
-        cp build/embree/build/embree-*.zip build/
-      notarize-package: build/embree-*.arm64.macosx.zip
-      artifact-out: build-macosx-arm
-      artifact-path: ./build/embree-*.zip
-
-  test-macosx-arm:
-    secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/macos.yml@main
-    needs: ["build-macosx-arm"]
-    strategy:
-      fail-fast: false
-      matrix:
-        platform: [arm]
-    with:
-      runs-on: '[ "macOS", "${{ matrix.platform }}" ]'
-      artifact-in: build-macosx-arm
-      cmd: |
-        EMBREE_PATH=$(./scripts/prepare-test-files-macos.sh --type ctest)
-        ./scripts/run-tests.sh --type ctest --embree-dir "$EMBREE_PATH" --ctest-config Release
-
-  build-linux:
-    secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
-    with:
-      image: rockylinux:8.7
-      runs-on: '[ "Linux", "build" ]'
-      artifact-out: build-linux
-      artifact-path: ./build/*.tar.gz
-      dpcpp-version: intel-llvm/v6.2.0
-      pre-cmd: |
-        dnf -y install epel-release
-        dnf -y config-manager --set-enabled powertools
-        dnf -y install ninja-build
-      cmd: |
-        opts="-DCMAKE_BUILD_TYPE=Release"
-        opts+=" -DBUILD_TESTING=ON"
-        opts+=" -DEMBREE_TUTORIALS=ON"
-        opts+=" -DEMBREE_ISPC_SUPPORT=ON"
-        opts+=" -DEMBREE_TESTING_INTENSITY=3"
-        opts+=" -DEMBREE_MAX_ISA=AVX512"
-        opts+=" -DEMBREE_INSTALL_DEPENDENCIES=ON"
-        opts+=" -DEMBREE_TESTING_INSTALL_TESTS=ON"
-        opts+=" -DCMAKE_INSTALL_TESTDIR=testing"
-        opts+=" -DEMBREE_ZIP_MODE=ON"
-
-        cmake -S superbuild -B build -D EMBREE_EXTRA_OPTIONS="$opts"
-        cmake --build build --config Release
-        cmake --build build/embree/build --config Release --target build
-        cp build/embree/build/embree-*.tar.gz build/
-
-  linux-test:
-    secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
-    needs: ["build-linux"]
-    strategy:
-      fail-fast: false
-      matrix:
-        platform: [avx512, avx2]
-    with:
-      image: ubuntu:24.04
-      runs-on: '[ "Linux", "${{ matrix.platform }}" ]'
-      artifact-in: build-linux
-      cmd: |
-        EMBREE_PATH=$(./scripts/prepare-test-files.sh --type ctest | tail -1)
-        ./scripts/run-tests.sh --type ctest --embree-dir "$EMBREE_PATH" --ctest-config Release
-
-
-####################################################################
-# SYCL Builds and Tests
-####################################################################
-  build-windows-sycl:
-    secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/windows.yml@main
-    with:
-      runs-on: '[ "Windows", "build" ]'
-      dpcpp-version: intel-llvm/v6.2.0
-      artifact-out: build-windows-sycl
-      artifact-path: ./build/*.zip
-      cmd: |
-        $opts  = "-DCMAKE_BUILD_TYPE=Release"
-        $opts += " -DBUILD_TESTING=ON"
-        $opts += " -DEMBREE_TUTORIALS=ON"
-        $opts += " -DEMBREE_ISPC_SUPPORT=ON"
-        $opts += " -DEMBREE_TESTING_INTENSITY=3"
-        $opts += " -DEMBREE_SYCL_SUPPORT=ON"
-        $opts += " -DEMBREE_SYCL_AOT_DEVICES=none"
-        $opts += " -DEMBREE_MAX_ISA=AVX512"
-        $opts += " -DEMBREE_INSTALL_DEPENDENCIES=ON"
-        $opts += " -DEMBREE_TESTING_INSTALL_TESTS=ON"
-        $opts += " -DCMAKE_INSTALL_TESTDIR=testing"
-        $opts += " -DEMBREE_ZIP_MODE=ON"
-
-        cmake -S superbuild -B build -G Ninja -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -D EMBREE_EXTRA_OPTIONS="$opts"
-        cmake --build build --config Release
-        cmake --build build/embree/build --config Release --target build
-        Copy-Item build/embree/build/embree-*.zip build/ -Force
-
-  build-linux-sycl:
-    secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
-    with:
-      image: rockylinux:8.7
-      runs-on: '[ "Linux", "build" ]'
-      dpcpp-version: intel-llvm/v6.2.0
-      artifact-out: build-linux-sycl
-      artifact-path: ./build/*.tar.gz
-      pre-cmd: |
-        dnf -y install epel-release
-        dnf -y config-manager --set-enabled powertools
-        dnf -y install ninja-build
-      cmd: |
-        opts="-DCMAKE_BUILD_TYPE=Release"
-        opts+=" -DBUILD_TESTING=ON"
-        opts+=" -DEMBREE_TUTORIALS=ON"
-        opts+=" -DEMBREE_ISPC_SUPPORT=ON"
-        opts+=" -DEMBREE_TESTING_INTENSITY=3"
-        opts+=" -DEMBREE_SYCL_SUPPORT=ON"
-        opts+=" -DEMBREE_SYCL_AOT_DEVICES=none"
-        opts+=" -DEMBREE_MAX_ISA=AVX512"
-        opts+=" -DEMBREE_INSTALL_DEPENDENCIES=ON"
-        opts+=" -DEMBREE_TESTING_INSTALL_TESTS=ON"
-        opts+=" -DCMAKE_INSTALL_TESTDIR=testing"
-        opts+=" -DEMBREE_ZIP_MODE=ON"
-
-        cmake -S superbuild -B build -G Ninja -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -D EMBREE_EXTRA_OPTIONS="$opts"
-        cmake --build build --config Release
-        cmake --build build/embree/build --config Release --target build
-        cp build/embree/build/embree-*.tar.gz build/
-
-  windows-sycl-test:
-    secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/windows.yml@main
-    needs: ["build-windows-sycl"]
-    strategy:
-      fail-fast: false
-      matrix:
-        platform: [dg2, bmg, lnl]
-    with:
-      runs-on: '[ "Windows", "${{ matrix.platform }}" ]'
-      env-from-files: ./.github/workflows/gfx-windows-public.env
-      artifact-in: build-windows-sycl
-      cmd: |
-        $EmbreeDir = .\\scripts\\prepare-test-files.ps1 -TestType ctest
-        .\\scripts\\run-tests.ps1 -TestType ctest -EmbreeDir $EmbreeDir -CtestConfig Release
-
-  linux-sycl-test:
-    secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
-    needs: ["build-linux-sycl"]
-    strategy:
-      fail-fast: false
-      matrix:
-        platform: [dg2, pvc, atsm]
-    with:
-      image: ubuntu:24.04
-      options: --device=/dev/dri:/dev/dri
-      runs-on: '[ "Linux", "${{ matrix.platform }}" ]'
-      env-from-files: ./.github/workflows/gfx-ubuntu24-public.env
-      artifact-in: build-linux-sycl
-      cmd: |
-        EMBREE_PATH=$(./scripts/prepare-test-files.sh --type ctest | tail -1)
-        ./scripts/run-tests.sh --type ctest --embree-dir "$EMBREE_PATH" --ctest-config Release
-
-
-####################################################################
-# Release binaries scans
-####################################################################
-  binary-analysis:
-    needs:
-      - build-windows
-      - build-macosx-x86_64
-      - build-linux
-    secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/binary_analysis.yml@main
-    with:
-      project: embree
-      artifact-in-windows: build-windows
-      artifact-in-macos: build-macosx-x86_64
-      artifact-in-linux: build-linux
-      path: "build/*.zip build/*.gz"
-
-  antivirus-scan:
-    needs:
-      - build-windows
-      - build-macosx-x86_64
-      - build-linux
-    secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/antivirus_scan.yml@main
-    with:
-      project: embree
-      artifact-in-windows: build-windows
-      artifact-in-macos: build-macosx-x86_64
-      artifact-in-linux: build-linux
-      path: "build/*.zip build/*.gz"
-
-  binary-analysis-sycl:
-    needs:
-      - build-windows-sycl
-      - build-linux-sycl
-    secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/binary_analysis.yml@main
-    with:
-      project: embree
-      artifact-in-windows: build-windows-sycl
-      artifact-in-linux: build-linux-sycl
-      path: "build/*.zip build/*.gz"
-      artifact-out-name: "binary-analysis-sycl"
-
-  antivirus-scan-sycl:
-    needs:
-      - build-windows-sycl
-      - build-linux-sycl
-    secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/antivirus_scan.yml@main
-    with:
-      project: embree
-      artifact-in-windows: build-windows-sycl
-      artifact-in-linux: build-linux-sycl
-      path: "build/*.zip build/*.gz"
-      artifact-out-name: "antivirus-scan-sycl"
-
-  binary-analysis-arm:
-    needs:
-      - build-macosx-arm
-    secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/binary_analysis.yml@main
-    with:
-      project: embree
-      artifact-in-macos: build-macosx-arm
-      path: "build/*.zip"
-      artifact-out-name: "binary-analysis-arm"
-
-  antivirus-scan-arm:
-    needs:
-      - build-macosx-arm
-    secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/antivirus_scan.yml@main
-    with:
-      project: embree
-      artifact-in-macos: build-macosx-arm
-      path: "build/*.zip"
-      artifact-out-name: "antivirus-scan-arm"
@@ -5,9 +5,3 @@ x64
 *.ncb
 .*sw?
 .DS_Store
-kernels/config.h
-kernels/hash.h
-include/embree4/rtcore_config.h
-build
-build*
-out
@@ -1,590 +1,13 @@
 Version History
 ---------------

-### Embree 4.4.1
-
-  Enabled support for Intel® Core™ Ultra series 3 integrated GPUs.
-  Added specialization constants for curves, motion blur, and motion blurred instances to reduce code complexity.
-  Enabled AVX512 support with MSVC compiler.
-  Fixed numerous potential uninitialized variables, integer over/underflows, and out-of-bounds accesses.
-  Fixed bounds checking for buffer stride and grid dimensions.
-  Fixed rare hang in rtcNewDevice when using single thread mode (start_threads=1).
-  Fixed morton builder for instance arrays.
-  Improved compiler warning handling for C++26, GCC, and ARM builds.
-  Improved AVX512 flag consistency between GCC and Clang.
-  Updated TinyEXR dependency to fix resource leaks.
-  Reduced memory copies and improved move semantics usage.
-  Bumped CMake minimum required version to 3.10.
-
-### Embree 4.4.0
-
-  Added support for passing geometry data to Embree using explicit host and SYCL device memory (see `rtcSetSharedGeometryBufferHostDevice`, `rtcNewBufferHostDevice`, and other API calls with `HostDevice` suffix).
-  Embree does not use SYCL shared memory anymore internally on systems without host unified memory (i.e., discrete GPUs). Therefore, memory transfers are triggered by specific Embree API calls (e.g. `rtcCommitScene`, `rtcCommitBuffer`).
-  Objects of type `RTCScene` are not accessible on a SYCL device anymore. Ray queries on SYCL devices must be performed using `RTCTraversable` objects and the `rtcTraversableIntersect` and `rtcTraversableOccluded` API calls.
-  Embree does not query the availability of RDRAND for its ISA detection anymore, which caused issues on some older AMD CPUs.
-  Performance improvements on GPU for the two level instancing case (RTC_MAX_INSTANCE_LEVEL_COUNT 2).
-
-### Embree 4.3.3
-   Added RTCError RTC_ERROR_LEVEL_ZERO_RAYTRACING_SUPPORT_MISSING which can indicate a GPU driver that is too old or not installed properly.
-   Added the API function rtcGetDeviceLastErrorMessage to query additional information about the last RTCError returned by rtcGetDeviceError. This can be used in case device creation failed and a rtcErrorFunction could not be set up for this purpose.
-   Added the API function rtcGetErrorString which returns a string representation of a given RTCError error code. This is purely meant for convenient error information reporting on the user application side.
-   Performance improvements on GPU for the one level instancing case (RTC_MAX_INSTANCE_LEVEL_COUNT 1).
-   Reduced the number of unnecessary GPU-CPU USM back-migrations which can increase build performance for scene with many instances on GPU.
-   Started adding public CI tests for streamlining integration of external pull requests.
-   Work-around for problem with unsigned Windows binaries.
-
-### Embree 4.3.2
-   Embree now uses level zero raytracing extension to build BVH which enables forward-compatibility. On Linux, the package intel-level-zero-gpu-raytracing has to be installed in addition to the other packages listed here [https://dgpu-docs.intel.com/](https://dgpu-docs.intel.com/).
-   MacOS universal binary compilation now works.
-   Some bugfixes for AVX512 on MacOS x86 machines.
-   Known issue: It is recommended to run Embree on Intel® Data Center GPU Max Series (e.g. Intel® Data Center GPU Max 1550) with the following environment settings: NEOReadDebugKeys=1 UseKmdMigration=0
-   Known issue: ISPC version of tutorials will not successfully build with MacOS universal binary compilation.
-
-### Embree 4.3.1
-   Add missing EMBREE_GEOMETRY types to embree-config.cmake
-   User defined thread count now takes precedence for internal task scheduler
-   Fixed static linking issue with ze_wrapper library
-   Better error reporting for SYCL platform and driver problems in embree_info and tutorial apps.
-   Patch to glfw source is not applied by default anymore.
-   Known issue: Running Embree on Intel® Data Center GPU Max Series with 2 tiles (e.g. Intel® Data Center GPU Max 1550) requires setting the environment variable ZE_FLAT_DEVICE_HIERARCHY=COMPOSITE.
-   Known issue: Embree build using Apple Clang 15 and ARM support (via the SEE2NEON library) may cause "EXEC_BAD_INSTRUCTION" runtime exceptions. Please use Apple Clang <= 14 on macOS.
-
-### Embree 4.3.0
-   Added instance array primitive for reducing memory requirements in scenes
-    with large amounts of similar instances.
-   Properly checks driver if L0 RTAS extension can get loaded.
-   Added varying version of rtcGetGeometryTransform for ISPC.
-   Fixed signature of RTCMemoryMonitorFunction for ISPC.
-   Add support for ARM64 Windows platform in CMake.
-
-### Embree 4.2.0
-   SYCL version of Embree with GPU support is no longer in beta phase.
-   Improved BVH build performance on many core machines for applications that oversubscribe threads.
-   Added rtcGetGeometryTransformFromScene API function that can get used inside SYCL kernels.
-   No longer linking to ze_loader in SYCL mode to avoid Intel(R) oneAPI Level Zero dependency
-    for CPU rendering.
-   Releasing test package to test Embree.
-
-### Embree 4.1.0
-   Added support for Intel® Data Center GPU Max Series.
-   Added ARM64 Linux support.
-   Added EMBREE_BACKFACE_CULLING_SPHERES cmake option. The new cmake option defaults to OFF.
-
-### Embree 4.0.1
-   Improved performance for Tiger Lake, Comet Lake, Cannon Lake, Kaby Lake,
-    and Skylake client CPUs by using 256 bit SIMD instructions by default.
-   Fixed broken motion blur of RTC_GEOMETRY_TYPE_ROUND_LINEAR_CURVE geometry type.
-   Fixed bvh build retry issue for TBB 2020.3
-   Added support for Intel® Data Center GPU Flex Series
-   Fixed issue on systems without a SYCL platform.
-
-### Embree 4.0.0
-   This Embree release adds support for Intel® Arc™ GPUs through SYCL.
-   The SYCL support of Embree is in beta phase. Current functionality, quality,
-    and GPU performance may not reflect that of the final product. Please read the
-    documentation section "Embree SYCL Known Issues" for known limitations.
-   Embree CPU support in this release as at Gold level, incorporating the same quality
-    and performance as previous releases.
-   A small number of API changes were required to get optimal experience and
-    performance on the CPU and GPU. See documentation section "Upgrading from Embree 3 to
-    Embree 4" for details.
-   rtcIntersect and rtcOccluded function arguments changed slightly.
-   RTCIntersectContext is renamed to RTCRayQuery context and most members moved to
-    new RTCIntersectArguments and RTCOccludedArguments structures.
-   rtcFilterIntersection and rtcFilterOcclusion API calls got replaced by
-    rtcInvokeIntersectFilterFromGeometry and rtcInvokeOccludedFilterFromGeometry API calls.
-   rtcSetGeometryEnableFilterFunctionFromArguments enables argument filter functions for some geometry.
-   RTC_RAY_QUERY_FLAG_INVOKE_ARGUMENT_FILTER ray query flag enables argument filter functions for each geometry.
-   User geometry callbacks have to return if a valid hit was found.
-   Ray masking is enabled by default now as required by most users.
-   The default ray mask for geometries got changed from 0xFFFFFFFF to 0x1.
-   Removed ray stream API as rarely used with minimal performance benefits over packet tracing.
-   Introduced rtcForwardIntersect/rtcForwardOccluded API calls to trace tail recursive rays from user geometry callback.
-   The rtcGetGeometryUserDataFromScene API call got added to be used in SYCL code.
-   Added support for user geometry callback function pointer passed through ray query context
-   Feature flags enable reducing code complexity for optimal performance on the GPU.
-   Fixed compilation issues for ARM AArch64 processor under Linux.
-   Setting default frequency level to SIMD256 for ARM on all platforms.
-    This allows using double pumped NEON execution by enabling EMBREE_ISA_NEON2X in cmake under Linux.
-   Fixed missing end caps of motion blurred line segments.
-   EMBREE_ISPC_SUPPORT is turned OFF by default.
-   Embree drops support of the deprecated Intel(R) Compiler. It is replaced by
-    the Intel(R) oneAPI DPC++/C++ Compiler on Windows and Linux and the
-    Intel(R) C++ Classic Compiler on MacOS (latest tested versions is 2023.0.0).
-
-### Embree 3.13.5
-   Fixed bug in bounding flat Catmull Rom curves of subdivision level 4.
-   Improved self intersection avoidance for
-    RTC_GEOMETRY_TYPE_DISC_POINT geometry type. Intersections are
-    skipped if the ray origin lies inside the sphere defined by the
-    point primitive. Self intersection avoidance can get disabled at compile time
-    using the EMBREE_DISC_POINT_SELF_INTERSECTION_AVOIDANCE cmake option.
-   Fixed spatial splitting for non-planar quads.
-
-### Embree 3.13.4
-   Using 8-wide BVH and double pumped NEON instructions on Apple M1 gives 8% performance boost.
-   Fixed binning related crash in SAH BVH builder.
-   Added EMBREE_TBB_COMPONENT cmake option to define the component/library name of Intel® TBB (default: tbb).
-   Embree supports now Intel® oneAPI DPC++/C++ Compiler 2022.0.0
-
-### Embree 3.13.3
-   Invalid multi segment motion blurred normal oriented curves are properly excluded from BVH build.
-   Fixing issue with normal oriented curve construction when center curve curvature is very large.
-    Due to this change normal oriented curve shape changes slightly.
-   Fixed crash caused by disabling a geometry and then detaching it from the scene.
-   Bugfix in emulated ray packet intersection when EMBREE_RAY_PACKETS is turned off.
-   Bugfix for linear quaternion interpolation fallback.
-   Fixed issues with spaces in path to Embree build folder.
-   Some fixes to compile Embree in SSE mode using WebAssembly.
-   Bugfix for occlusion rays with grids and ray packets.
-   We do no longer provide installers for Windows and macOS, please use the ZIP files instead.
-   Upgrading to Intel® ISPC 1.17.0 for release build.
-   Upgrading to Intel® oneTBB 2021.5.0 for release build.
-
-### Embree 3.13.2
-   Avoiding spatial split positions that are slightly out of geometry bounds.
-   Introduced rtcGetGeometryThreadSafe function, which is a thread safe version of rtcGetGeometry.
-   Using more accurate rcp implementation.
-   Bugfix to rare corner case of high quality BVH builder.
-
-### Embree 3.13.1
-   Added support for Intel® ISPC ARM target.
-   Releases upgrade to Intel® TBB 2021.3.0 and Intel® ISPC 1.16.1
-
-### Embree 3.13.0
-   Added support for Apple M1 CPUs.
-   RTC_SUBDIVISION_MODE_NO_BOUNDARY now works properly for non-manifold edges.
-   CMake target 'uninstall' is not defined if it already exists.
-   Embree no longer reads the .embree3 config files, thus all configuration has
-    to get passed through the config string to rtcNewDevice.
-   Releases upgrade to Intel® TBB 2021.2.0 and Intel® ISPC 1.15.0
-   Intel® TBB dll is automatically copied into build folder after build on windows.
-
-### Embree 3.12.2
-   Fixed wrong uv and Ng for grid intersector in robust mode for AVX.
-   Removed optimizations for Knights Landing.
-   Upgrading release builds to use Intel® oneTBB 2021.1.1
-
-### Embree 3.12.1
-
-   Changed default frequency level to SIMD128 for Skylake, Cannon Lake, Comet Lake and Tiger Lake CPUs.
-    This change typically improves performance for renderers that just use SSE by maintaining higher
-    CPU frequencies. In case your renderer is AVX optimized you can get higher ray tracing performance
-    by configuring the frequency level to simd256 through passing frequency_level=simd256 to rtcNewDevice.
-
-### Embree 3.12.0
-
-   Added linear cone curve geometry support. In this mode a real geometric surface for curves
-    with linear basis is rendered using capped cones.  They are discontinuous at edge boundaries.
-   Enabled fast two level builder for instances when low quality build is requested.
-   Bugfix for BVH build when geometries got disabled.
-   Added EMBREE_BACKFACE_CULLING_CURVES cmake option.  This allows for a cheaper round
-    linear curve intersection when correct internal tracking and back hits are not required.
-    The new cmake option defaults to OFF.
-   User geometries with invalid bounds with lower>upper in some dimension will be ignored.
-   Increased robustness for grid interpolation code and fixed returned out of range u/v
-    coordinates for grid primitive.
-   Fixed handling of motion blur time range for sphere, discs, and oriented disc geometries.
-   Fixed missing model data in releases.
-   Ensure compatibility to newer versions of Intel® oneTBB.
-   Motion blur BVH nodes no longer store NaN values.
-
-### Embree 3.11.0
-
-   Round linear curves now automatically check for the existence of left and right
-    connected segments if the flags buffer is empty.  Left segments exist if the
-    segment(id-1) + 1 == segment(id) and similarly for right segments.
-   Implemented the min-width feature for curves and points, which allows to increase the
-    radius in a distance dependent way, such that the curve or points thickness is n pixels wide.
-   Round linear curves are closed now also at their start.
-   Embree no longer supports Visual Studio 2013 starting with this release.
-   Bugfix in subdivision tessellation level assignment for non-quad base primitives
-   Small meshes are directly added to top level build phase of two-level builder to reduce memory consumption.
-   Enabled fast two level builder for user geometries when low quality build is requested.
-
-### Embree 3.10.0
-
-   Added EMBREE_COMPACT_POLYS CMake option which enables double indexed triangle and quad
-    leaves to reduce memory consumption in compact mode by an additional 40% at about
-    15% performance impact. This new mode is disabled by default.
-   Compile fix for Intel® oneTBB 2021.1-beta05
-   Releases upgrade to Intel® TBB 2020.2
-   Compile fix for Intel® ISPC v1.13.0
-   Adding RPATH to libembree.so in releases
-   Increased required CMake version to 3.1.0
-   Made instID member for array of pointers ray stream layout optional again.
-
-### Embree 3.9.0
-
-   Added round linear curve geometry support. In this mode a real geometric surface for curves
-    with linear basis is rendered using capped cones with spherical filling between
-    the curve segments.
-   Added rtcGetSceneDevice API function, that returns the device a scene got created in.
-   Improved performance of round curve rendering by up to 1.8x.
-   Bugfix to sphere intersection filter invocation for back hit.
-   Fixed wrong assertion that triggered for invalid curves which anyway get filtered out.
-   RelWithDebInfo mode no longer enables assertions.
-   Fixed an issue in FindTBB.cmake that caused compile error with Debug build under Linux.
-   Embree releases no longer provide RPMs for Linux. Please use the RPMs coming with the package
-    manager of your Linux distribution.
-
-### Embree 3.8.0
-
-   Added collision detection support for user geometries (see rtcCollide API function)
-   Passing geomID to user geometry callbacks.
-   Bugfix in AVX512VL codepath for rtcIntersect1
-   For sphere geometries the intersection filter gets now invoked for
-    front and back hit.
-   Fixed some bugs for quaternion motion blur.
-   RTCRayQueryContext always non-const in Embree API
-   Made RTCHit aligned to 16 bytes in Embree API
-
-### New Features in Embree 3.7.0
-   Added quaternion motion blur for correct interpolation of rotational transformations.
-   Fixed wrong bounding calculations when a motion blurred instance did
-    instantiate a motion blurred scene.
-   In robust mode the depth test consistently uses tnear <= t <= tfar now in order
-    to robustly continue traversal at a previous hit point
-    in a way that guarantees reaching all hits, even hits at the same place.
-   Fixed depth test in robust mode to be precise at tnear and tfar.
-   Added next_hit tutorial to demonstrate robustly collecting all hits
-    along a ray using multiple ray queries.
-   Implemented robust mode for curves. This has a small performance impact but
-    fixes bounding problems with flat curves.
-   Improved quality of motion blur BVH by using linear bounds during binning.
-   Implemented issue with motion blur builder where number of time segments
-    for SAH heuristic were counted wrong due to some numerical issues.
-   Fixed an accuracy issue with rendering very short fat curves.
-   rtcCommitScene can now get called during rendering from multiple threads
-    to lazily build geometry. When Intel® TBB is used this causes a much lower overhead
-    than using rtcJoinCommitScene.
-   Geometries can now get attached to multiple scenes at the same time, which
-    simplifies mapping general scene graphs to API.
-   Updated to Intel® TBB 2019.9 for release builds.
-   Fixed a bug in the BVH builder for Grid geometries.
-   Added macOS Catalina support to Embree releases.
-
-### New Features in Embree 3.6.1
-   Restored binary compatibility between Embree 3.6 and 3.5 when single-level instancing is used.
-   Fixed bug in subgrid intersector
-   Removed point query alignment in Intel® ISPC header
-
-### New Features in Embree 3.6
-   Added Catmull-Rom curve types.
-   Added support for multi-level instancing.
-   Added support for point queries.
-   Fixed a bug preventing normal oriented curves being used unless timesteps were
-    specified.
-   Fixed bug in external BVH builder when configured for dynamic build.
-   Added support for new config flag "user_threads=N" to device initialization
-    which sets the number of threads used by Intel® TBB but created by the user.
-   Fixed automatic vertex buffer padding when using rtcSetNewGeometry API function.
-
-### New Features in Embree 3.5.2
-   Added EMBREE_API_NAMESPACE cmake option that allows to put all Embree API functions
-    inside a user defined namespace.
-   Added EMBREE_LIBRARY_NAME cmake option that allows to rename the Embree library.
-   When Embree is compiled as static library, EMBREE_STATIC_LIB has no longer to get
-    defined before including the Embree API headers.
-   Added CPU frequency_level device configuration to allow an application to specify the
-    frequency level it wants to run on. This forces Embree to not use optimizations that
-    may reduce the CPU frequency below that level. By default Embree is configured to the
-    the AVX-heavy frequency level, thus if the application uses solely non-AVX code, configuring
-    the Embree device with "frequency_level=simd128" may give better performance.
-   Fixed a bug in the spatial split builder which caused it to fail
-    for scenes with more than 2^24 geometries.
-
-### New Features in Embree 3.5.1
-   Fixed ray/sphere intersector to work also for non-normalized rays.
-   Fixed self intersection avoidance for ray oriented discs when
-    non-normalized rays were used.
-   Increased maximal face valence for subdiv patch to 64 and reduced stack size
-    requirement for subdiv patch evaluation.
-
-### New Features in Embree 3.5.0
-   Changed normal oriented curve definition to fix waving artefacts.
-   Fixed bounding issue for normal oriented motion blurred curves.
-   Fixed performance issue with motion blurred point geometry.
-   Fixed generation of documentation with new pandoc versions.
-
-### New Features in Embree 3.4.0
-   Added point primitives (spheres, ray-oriented discs, normal-oriented discs).
-   Fixed crash triggered by scenes with only invalid primitives.
-   Improved robustness of quad/grid-based intersectors.
-   Upgraded to Intel® TBB 2019.2 for release builds.
-
-### New Features in Embree 3.3.0
-   Added support for motion blur time range per geometry. This way geometries
-    can appear and disappear during the camera shutter and time steps do not have
-    to start and end at camera shutter interval boundaries.
-   Fixed crash with pathtracer when using --triangle-sphere command line.
-   Fixed crash with pathtracer when using --shader ao command line.
-   Fixed tutorials showing a black window on macOS 10.14 until moved.
-
-### New Features in Embree 3.2.4
-   Fixed compile issues with ICC 2019.
-   Released ZIP files for Windows are now provided in a
-    version linked against Visual Studio 2013 and Visual Studio 2015.
-
-### New Features in Embree 3.2.3
-   Fixed crash when using curves with RTC_SCENE_FLAG_DYNAMIC
-    combined with RTC_BUILD_QUALITY_MEDIUM.
-
-### New Features in Embree 3.2.2
-   Fixed intersection distance for unnormalized rays with line segments.
-   Removed libmmd.dll dependency in release builds for Windows.
-   Fixed detection of AppleClang compiler under MacOSX.
-
-### New Features in Embree 3.2.1
-   Bugfix in flat mode for hermite curves.
-   Added EMBREE_CURVE_SELF_INTERSECTION_AVOIDANCE_FACTOR cmake option to
-    control self intersection avoidance for flat curves.
-   Performance fix when instantiating motion blurred scenes. The application
-    should best use two (or more) time steps for an instance that instantiates
-    a motion blurred scene.
-   Fixed AVX512 compile issue with GCC 6.1.1.
-   Fixed performance issue with rtcGetGeometryUserData when used
-    during rendering.
-   Bugfix in length of derivatives for grid geometry.
-   Added BVH8 support for motion blurred curves and lines. For some workloads
-    this increases performance by up to 7%.
-   Fixed rtcGetGeometryTransform to return the local to world transform.
-   Fixed bug in multi segment motion blur that caused missing of perfectly
-    axis aligned geometry.
-   Reduced memory consumption of small scenes by 4x.
-   Reduced temporal storage of grid builder.
-
-### New Features in Embree 3.2.0
-   Improved watertightness of robust mode.
-   Line segments, and other curves are now all contained in a single
-    BVH which improves performance when these are both used in a scene.
-   Performance improvement of up to 20% for line segments.
-   Bugfix to Embree2 to Embree3 conversion script.
-   Added support for Hermite curve basis.
-   Semantics of normal buffer for normal oriented curves has
-    changed to simplify usage. Please see documentation for details.
-   Using GLFW and imgui in tutorials.
-   Fixed floating point exception in static variable initialization.
-   Fixed invalid memory access in rtcGetGeometryTransform for non-motion
-    blur instances.
-   Improved self intersection avoidance for flat curves. Transparency rays
-    with tnear set to previous hit distance do not need curve radius
-    based self intersection avoidance as same hit is calculated again. For this
-    reason self intersection avoidance is now only applied to ray origin.
-
-### New Features in Embree 3.1.0
-   Added new normal-oriented curve primitive for ray tracing of grass-like
-    structures.
-   Added new grid primitive for ray tracing tessellated and displaced surfaces
-    in very memory efficient manner.
-   Fixed bug of ribbon curve intersector when derivative was zero.
-   Installing all static libraries when EMBREE_STATIC_LIB is enabled.
-   Added API functions to access topology of subdivision mesh.
-   Reduced memory consumption of instances.
-   Improved performance of instances by 8%.
-   Reduced memory consumption of curves by up to 2x.
-   Up to 5% higher performance on AVX-512 architectures.
-   Added native support for multiple curve basis functions. Internal
-    basis conversions are no longer performed, which saves additional
-    memory when multiple bases are used.
-   Fixed issue with non thread safe local static variable initialization
-    in VS2013.
-   Bugfix in rtcSetNewGeometry. Vertex buffers did not get properly
-    overallocated.
-   Replaced ImageMagick with OpenImageIO in the tutorials.
-
-### New Features in Embree 3.0.0
-   Switched to a new version of the API which provides improved
-    flexibility but is not backward compatible. Please see "Upgrading
-    from Embree 2 to Embree 3" section of the documentation for upgrade
-    instructions. In particular, we provide a Python script that performs
-    most of the transition work.
-   User geometries inside an instanced scene and a top-level scene no
-    longer need to handle the instID field of the ray differently. They
-    both just need to copy the context.instID into the ray.instID field.
-   Support for context filter functions that can be assigned to a ray
-    query.
-   User geometries can now invoke filter functions using the
-    rtcFilterIntersection and rtcFilterOcclusion calls.
-   Higher flexibility through specifying build quality per scene and
-    geometry.
-   Geometry normal uses commonly used right-hand rule from now on.
-   Added self-intersection avoidance to ribbon curves and lines.
-    Applications do not have to implement self-intersection workarounds
-    for these primitive types anymore.
-   Added support for 4 billion primitives in a single scene.
-   Removed the RTC_MAX_USER_VERTEX_BUFFERS and RTC_MAX_INDEX_BUFFERS
-    limitations.
-   Reduced memory consumption by 192 bytes per instance.
-   Fixed some performance issues on AVX-512 architectures.
-   Individual Contributor License Agreement (ICLA) and Corporate
-    Contributor License Agreement (CCLA) no longer required to
-    contribute to the project.
-
-### New Features in Embree 2.17.5
-   Improved watertightness of robust mode.
-   Fixed floating point exception in static variable initialization.
-   Fixed AVX512 compile issue with GCC 6.1.1.
-
-### New Features in Embree 2.17.4
-   Fixed AVX512 compile issue with GCC 7.
-   Fixed issue with not thread safe local static variable
-    initialization in VS2013.
-   Fixed bug in the 4 and 8-wide packet intersection of instances with
-    multi-segment motion blur on AVX-512 architectures.
-   Fixed bug in rtcOccluded4/8/16 when only AVX-512 ISA was enabled.
-
-### New Features in Embree 2.17.3
-   Fixed GCC compile warning in debug mode.
-   Fixed bug of ribbon curve intersector when derivative was zero.
-   Installing all static libraries when EMBREE_STATIC_LIB is enabled.
-
-### New Features in Embree 2.17.2
-   Made BVH build of curve geometry deterministic.
-
-### New Features in Embree 2.17.1
-   Improved performance of occlusion ray packets by up to 50%.
-   Fixed detection of Clang for CMake 3 under MacOSX
-   Fixed AVX code compilation issue with GCC 7 compiler caused by
-    explicit use of vzeroupper intrinsics.
-   Fixed an issue where Clang address sanitizer reported an error in
-    the internal tasking system.
-   Added fix to compile on 32 bit Linux distribution.
-   Fixed some wrong relative include paths in Embree.
-   Improved performance of robust single ray mode by 5%.
-   Added EMBREE_INSTALL_DEPENDENCIES option (default OFF) to enable
-    installing of Embree dependencies.
-   Fixed performance regression for occlusion ray streams.
-   Reduced temporary memory requirements of BVH builder for curves and
-    line segments.
-   Fixed performance regression for user geometries and packet ray tracing.
-   Fixed bug where wrong closest hit was reported for very curvy hair segment.
-
-### New Features in Embree 2.17.0
-   Improved packet ray tracing performance for coherent rays by 10-60%
-    (requires RTC_INTERSECT_COHERENT flag).
-   Improved ray tracing performance for incoherent rays on
-    AVX-512 architectures by 5%.
-   Improved ray tracing performance for streams of incoherent rays
-    by 5-15%.
-   Fixed tbb_debug.lib linking error under Windows.
-   Fast coherent ray stream and packet code paths now also work in robust mode.
-   Using less aggressive prefetching for large BVH nodes which
-    results in 1-2% higher ray tracing performance.
-   Precompiled binaries have stack-protector enabled, except for
-    traversal kernels. BVH builders can be slightly slower due to this
-    change. If you want stack-protectors disabled please turn off
-    EMBREE_STACK_PROTECTOR in cmake and build the binaries yourself.
-   When enabling ISAs individually, the 8-wide BVH was previously only
-    available when the AVX ISA was also selected. This issue is now
-    fixed, and one can enable only AVX2 and still get best
-    performance by using an 8-wide BVH.
-   Fixed rtcOccluded1 and rtcOccluded1Ex API functions which were
-    broken in Intel® ISPC.
-   Providing MSI installer for Windows.
-
-### New Features in Embree 2.16.5
-   Bugfix in the robust triangle intersector that rarely caused NaNs.
-   Fixed bug in hybrid traversal kernel when BVH leaf was entered with no
-    active rays. This rarely caused crashes when used with instancing.
-   Fixed bug introduced in Embree 2.16.2 which caused instancing not to
-    work properly when a smaller than the native SIMD width was
-    used in ray packet mode.
-   Fixed bug in the curve geometry intersector that caused rendering
-    artefacts for Bézier curves with p0=p1 and/or p2=p3.
-   Fixed bug in the curve geometry intersector that caused hit results
-    with NaNs to be reported.
-   Fixed masking bug that caused rare cracks in curve geometry.
-   Enabled support for SSE2 in precompiled binaries again.
-
-### New Features in Embree 2.16.4
-   Bugfix in the ribbon intersector for hair primitives. Non-normalized
-    rays caused wrong intersection distance to be reported.
-
-### New Features in Embree 2.16.3
-   Increased accuracy for handling subdivision surfaces. This fixes
-    cracks when using displacement mapping but reduces performance
-    at irregular vertices.
-   Fixed a bug where subdivision geometry was not properly updated
-    when modifying only the tessellation rate and vertex array.
-
-### New Features in Embree 2.16.2
-   Fixed bug that caused NULL ray query context in intersection
-    filter when instancing was used.
-   Fixed an issue where uv's where outside the triangle (or quad) for
-    very small triangles (or quads). In robust mode we improved the uv
-    calculation to avoid that issue, in fast mode we accept that
-    inconsistency for better performance.
-   Changed UV encoding for non-quad subdivision patches to
-    allow a subpatch UV range of `[-0.5,1.5[`. Using this new encoding
-    one can use finite differences to calculate derivatives if required.
-    Please adjust your code in case you rely on the old encoding.
-
-### New Features in Embree 2.16.1
-   Workaround for compile issues with Visual Studio 2017
-   Fixed bug in subdiv code for static scenes when using tessellation
-    levels larger than 50.
-   Fixed low performance when adding many geometries to a scene.
-   Fixed high memory consumption issue when using instances in
-    dynamic scene (by disabling two level builder for user geometries
-    and instances).
-
-### New Features in Embree 2.16.0
-   Improved multi-segment motion blur support for scenes with
-    different number of time steps per mesh.
-   New top level BVH builder that improves build times and BVH quality
-    of two-level BVHs.
-   Added support to enable only a single ISA. Previously code was
-    always compiled for SSE2.
-   Improved single ray tracing performance for incoherent rays on
-    AVX-512 architectures by 5-10%.
-   Improved packet/hybrid ray tracing performance for incoherent rays
-    on AVX-512 architectures by 10-30%.
-   Improved stream ray tracing performance for coherent rays in
-    structure-of-pointers layout by 40-70%.
-   BVH builder for compact scenes of triangles and quads needs
-    essentially no temporary memory anymore. This doubles the
-    maximal scene size that can be rendered in compact mode.
-   Triangles no longer store the geometry normal in fast/default mode
-    which reduces memory consumption by up to 20%.
-   Compact mode uses BVH4 now consistently which reduces memory
-    consumption by up to 10%.
-   Reduced memory consumption for small scenes (of 10k-100k primitives)
-    and dynamic scenes.
-   Improved performance of user geometries and instances through BVH8
-    support.
-   The API supports now specifying the geometry ID of a geometry at
-    construction time. This way matching the geometry ID used by
-    Embree and the application is simplified.
-   Fixed a bug that would have caused a failure of the BVH builder
-    for dynamic scenes when run on a machine with more then 1000 threads.
-   Fixed a bug that could have been triggered when reaching the maximal
-    number of mappings under Linux (`vm.max_map_count`). This could have
-    happened when creating a large number of small static scenes.
-   Added huge page support for Windows and MacOSX (experimental).
-   Added support for Visual Studio 2017.
-   Removed support for Visual Studio 2012.
-   Precompiled binaries now require a CPU supporting at least the
-    SSE4.2 ISA.
-   We no longer provide precompiled binaries for 32-bit on Windows.
-   Under Windows one now has to use the platform toolset option in
-    CMake to switch to Clang or the Intel® Compiler.
-   Fixed a bug for subdivision meshes when using the incoherent scene
-    flag.
-   Fixed a bug in the line geometry intersection, that caused reporting
-    an invalid line segment intersection with primID -1.
-   Buffer stride for vertex buffers of different time steps of triangle
-    and quad meshes have to be identical now.
-   Fixed a bug in the curve geometry intersection code when passed a
-    perfect cylinder.
-
 ### New Features in Embree 2.15.0

 -   Added `rtcCommitJoin` mode that allows thread to join a build
    operation. When using the internal tasking system this allows
    Embree to solely use the threads that called `rtcCommitJoin` to
    build the scene, while previously also normal worker threads
-    participated in the build. You should no longer use `rtcCommit`
+    participated in the build. You should no longer use  `rtcCommit`
    to join a build.
 -   Added `rtcDeviceSetErrorFunction2` API call, which sets an error
    callback function which additionally gets passed a user provided
@@ -593,21 +16,20 @@ Version History
    memory monitor callback function which additionally get passed a
    user provided pointer. (`rtcDeviceSetMemoryMonitorFunction` is now
    deprecated).
-   Build performance for hair geometry improved by up to 2×.
-   Standard BVH build performance increased by 5%.
-   Added API extension to use internal Morton-code based builder, the
-    standard binned-SAH builder, and the spatial split-based SAH builder.
+-   Build performance for hair geometry improved up to 2x.
+-   Added API extension to use internal Morton builder, standard SAH
+    builder, and spatial split SAH builder.
 -   Added support for BSpline hair and curves. Embree uses
-    either the Bézier or BSpline basis internally, and converts other
-    curves, which requires more memory during rendering. For reduced
-    memory consumption set the `EMBREE_NATIVE_SPLINE_BASIS` to the basis
-    your application uses (which is set to `BEZIER` by default).
-   Setting the number of threads through `tbb::taskscheduler_init`
-    object on the application side is now working properly.
-   Windows and Linux releases are build using AVX-512 support.
+    either the Bezier or BSpline basis internally, and converts other
+    curves, which requiring more memory during rendering. For reduced
+    memory consumption set the EMBREE_NATIVE_SPLINE_BASIS to the basis
+    your application uses (which is set to BEZIER by default).
+-   Setting the number of threads through an application side
+    tbb::taskscheduler_init object is now working properly.
+-   Windows and Linux releases are build using AVX512 support.
 -   Implemented hybrid traversal for hair and line segments for
    improved ray packet performance.
-   AVX-512 code compiles with Clang 4.0.0
+-   AVX512 code compiles with Clang 4.0.0
 -   Fixed crash when ray packets were disabled in CMake.

 ### New Features in Embree 2.14.0
@@ -627,14 +49,14 @@ Version History
 -   Reduced memory consumption when using lots of small dynamic objects.
 -   Fixed bug for subdivision surfaces using low tessellation rates.
 -   Hair geometry now uses a new ribbon intersector that intersects with
-    ray-facing quads. The new intersector also returns the v-coordinate
-    of the hair intersection, and fixes artefacts at junction points
-    between segments, at the cost of a small performance hit.
+    ray-facing quads. The new intersector also returns the
+    v-coordinate of the hair intersection, and fixes artefacts at junction
+    points between segments, at the cost of a small performance hit.
 -   Added `rtcSetBuffer2` function, that additionally gets the number of
    elements of a buffer. In dynamic scenes, this function allows to
-    quickly change buffer sizes, making it possible to change the number
-    of primitives of a mesh or the number of crease features for
-    subdivision surfaces.
+    quickly change buffer sizes, making it possible to change the number of
+    primitives of a mesh or the number of crease features for subdivision
+    surfaces.
 -   Added simple 'viewer_anim' tutorial for rendering key
    frame animations and 'buildbench' for measuring BVH (re-)build
    performance for static and dynamic scenes.
@@ -648,8 +70,8 @@ Version History
 -   Up to 20% faster BVH build performance on the second generation
    Intel® Xeon Phi™ processor codenamed Knights Landing.
 -   Improved quality of the spatial split builder.
-   Improved performance for coherent streams of ray packets (SOA
-    layout), e.g. for fast primary visibility.
+-   Improved performance for coherent streams of ray packets (SOA layout),
+    e.g. for fast primary visibility.
 -   Various bug fixes in tessellation cache, quad-based spatial
    split builder, etc.

@@ -669,14 +91,14 @@ Version History
    If you use Embree v2.11.0 please upgrade to Embree v2.12.0.
 -   Reduced memory consumption for dynamic scenes containing small
    meshes.
-   Added support to start and affinitize Intel® TBB worker threads by passing
+-   Added support to start and affinitize TBB worker threads by passing
    "`start_threads=1,set_affinity=1`" to `rtcNewDevice`. These settings
    are recommended on systems with a high thread count.
 -   `rtcInterpolate2` can now be called within a displacement shader.
 -   Added initial support for Microsoft's Parallel Pattern Library (PPL)
-    as tasking system alternative (for optimal performance Intel® TBB is
+    as tasking system alternative (for optimal performance TBB is
    highly recommended).
-   Updated to Intel® TBB 2017 which is released under the Apache v2.0 license.
+-   Updated to TBB 2017 which is released under the Apache v2.0 license.
 -   Dropped support for Visual Studio 2012 Win32 compiler. Visual Studio
    2012 x64 is still supported.

@@ -684,8 +106,8 @@ Version History

 -   Improved performance for streams of coherent (single) rays flagged
    with `RTC_INTERSECT_COHERENT`. For such coherent ray streams, e.g.
-    primary rays, the performance typically improves by 1.3-2×.
-   New spatial split BVH builder for triangles, which is 2-6× faster
+    primary rays, the performance typically improves by 1.3–2×.
+-   New spatial split BVH builder for triangles, which is 2–6× faster
    than the previous version and more memory conservative.
 -   Improved performance and scalability of all standard BVH builders on
    systems with large core counts.
@@ -702,12 +124,12 @@ Version History
 -   Geometry types can get disabled at compile time.
 -   Modified and extended the ray stream API.
 -   Added new callback mechanism for the ray stream API.
-   Improved ray stream performance (up to 5-10%).
+-   Improved ray stream performance (up to 5–10%).
 -   Up to 20% faster morton builder on machines with large core counts.
 -   Lots of optimizations for the second generation Intel® Xeon Phi™
    processor codenamed Knights Landing.
 -   Added experimental support for compressed BVH nodes (reduces node
-    size to 56-62% of uncompressed size). Compression introduces a
+    size to 56–62% of uncompressed size). Compression introduces a
    typical performance overhead of ~10%.
 -   Bugfix in backface culling mode. We do now properly cull the
    backfaces and not the frontfaces.
@@ -718,8 +140,8 @@ Version History

 ### New Features in Embree 2.9.0

-   Improved shadow ray performance (10-100% depending on the scene).
-   Added initial support for ray streams (10-30% higher performance
+-   Improved shadow ray performance (10–100% depending on the scene).
+-   Added initial support for ray streams (10–30% higher performance
    depending on ray coherence in the stream).
 -   Added support to calculate second order derivatives using the
    `rtcInterpolate2` function.
@@ -740,29 +162,26 @@ Version History
 -   Added support for quad geometry (replaces triangle-pairs feature).
 -   Added support for linear motion blur of user geometries.
 -   Improved performance through AVX-512 optimizations.
-   Improved performance of lazy scene build (when using Intel® TBB 4.4 update
-    2).
+-   Improved performance of lazy scene build (when using TBB 4.4 update 2).
 -   Improved performance through huge page support under linux.

 ### New Features in Embree 2.7.1

 -   Internal tasking system supports cancellation of build operations.
-   Intel® ISPC mode for robust and compact scenes got significantly faster
-    (implemented hybrid traversal for bvh4.triangle4v and
-    bvh4.triangle4i).
+-   ISPC mode for robust and compact scenes got significantly faster
+    (implemented hybrid traversal for bvh4.triangle4v and bvh4.triangle4i).
 -   Hair rendering got faster as we fixed some issues with the SAH
    heuristic cost factors.
 -   BVH8 got slight faster for single ray traversal (improved sorting
    when hitting more than 4 boxes).
 -   BVH build performance got up to 30% faster on CPUs with high core
    counts (improved parallel partition code).
-   High quality build mode again working properly (spatial splits had
-    been deactivated in v2.7.0 due to some bug).
+-   High quality build mode again working properly (spatial splits had been
+    deactivated in v2.7.0 due to some bug).
 -   Support for merging two adjacent triangles sharing a common edge
    into a triangle-pair primitive (can reduce memory consumption and
    BVH build times by up to 50% for mostly quad-based input meshes).
-   Internal cleanups (reduced number of traversal kernels by more
-    templating).
+-   Internal cleanups (reduced number of traversal kernels by more templating)
 -   Reduced stack size requirements of BVH builders.
 -   Fixed crash for dynamic scenes, triggered by deleting all
    geometries from the scene.
@@ -772,7 +191,7 @@ Version History
 -   Added device concept to Embree to allow different components of an
    application to use Embree without interfering with each other.
 -   Fixed memory leak in twolevel builder used for dynamic scenes.
-   Fixed bug in tessellation cache that caused crashes for subdivision
+-   Fixed bug in tesselation cache that caused crashes for subdivision
    surfaces.
 -   Fixed bug in internal task scheduler that caused deadlocks when
    using `rtcCommitThread`.
@@ -846,10 +265,10 @@ Version History
    progress and cancel long build operations
 -   BVH builders can be used to build user defined hierarchies inside
    the application (see tutorial [BVH Builder])
-   Switched to Intel® TBB as default tasking system on Xeon to get even faster
+-   Switched to TBB as default tasking system on Xeon to get even faster
    hierarchy build times and better integration for applications that
-    also use Intel® TBB
-   `rtcCommit` can get called from multiple Intel® TBB threads to join the
+    also use TBB
+-   `rtcCommit` can get called from multiple TBB threads to join the
    hierarchy build operations

 ### New Features in Embree 2.4
@@ -876,7 +295,7 @@ Version History

 -   Improved mixed AABB/OBB-BVH for hair geometry (Xeon Phi)
 -   Reduced amount of pre-allocated memory for BVH builders (Xeon Phi)
-   New 64-bit Morton code-based BVH builder (Xeon Phi)
+-   New 64 bit Morton code-based BVH builder (Xeon Phi)
 -   (Enhanced) Morton code-based BVH builders use now tree rotations to
    improve BVH quality (Xeon Phi)
 -   Bug fixes (Xeon and Xeon Phi)
@@ -932,12 +351,34 @@ Version History
    -   New variant of the SAH-based builder using triangle pre-splits
        (Xeon Phi)

+### Example Performance Numbers for Embree 2.1
+
+BVH rebuild performance (including triangle accel generation, excluding
+memory allocation) for scenes with 2–12 million triangles:
+
+-   Intel® Core™ i7 (Haswell-based CPU, 4 cores @ 3.0 GHz)
+    -   7–8 million triangles/s for the SAH-based BVH builder
+    -   30–36 million triangles/s for the Morton code-based BVH builder
+-   Intel® Xeon Phi™ 7120
+    -   37–40 million triangles/s for the SAH-based BVH builder
+    -   140–160 million triangles/s for the Morton code-based BVH
+        builder
+
+Rendering of the Crown model (`crown.ecs`) with 4 samples per pixel
+(`-spp 4`):
+
+-   Intel® Core™ i7 (Haswell-based CPU, 4 cores CPU @ 3.0 GHz)
+    -   1024×1024 resolution: 7.8 million rays per sec
+    -   1920×1080 resolution: 9.9 million rays per sec
+-   Intel® Xeon Phi™ 7120
+    -   1024×1024 resolution: 47.1 million rays per sec
+    -   1920×1080 resolution: 61.1 million rays per sec
+
 ### New Features in Embree 2.0

 -   Support for the Intel® Xeon Phi™ coprocessor platform
 -   Support for high-performance "packet" kernels on SSE, AVX, and Xeon
    Phi
-   Integration with the Intel® Implicit SPMD Program Compiler (Intel® ISPC)
+-   Integration with the Intel® SPMD Program Compiler (ISPC)
 -   Instantiation and fast BVH reconstruction
-   Example photo-realistic rendering engine for both C++ and Intel® ISPC
-
+-   Example photo-realistic rendering engine for both C++ and ISPC
@@ -1,48 +1,34 @@
-## Copyright 2009-2021 Intel Corporation
-## SPDX-License-Identifier: Apache-2.0
-
-CMAKE_MINIMUM_REQUIRED(VERSION 3.10)
-
-SET(EMBREE_VERSION_MAJOR 4)
-SET(EMBREE_VERSION_MINOR 4)
-SET(EMBREE_VERSION_PATCH 1)
-SET(EMBREE_VERSION_NOTE "")
+## ======================================================================== ##
+## Copyright 2009-2017 Intel Corporation                                    ##
+##                                                                          ##
+## Licensed under the Apache License, Version 2.0 (the "License");          ##
+## you may not use this file except in compliance with the License.         ##
+## You may obtain a copy of the License at                                  ##
+##                                                                          ##
+##     http://www.apache.org/licenses/LICENSE-2.0                           ##
+##                                                                          ##
+## Unless required by applicable law or agreed to in writing, software      ##
+## distributed under the License is distributed on an "AS IS" BASIS,        ##
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ##
+## See the License for the specific language governing permissions and      ##
+## limitations under the License.                                           ##
+## ======================================================================== ##

+SET(EMBREE_VERSION_MAJOR 2)
+SET(EMBREE_VERSION_MINOR 16)
+SET(EMBREE_VERSION_PATCH 0)
+SET(EMBREE_VERSION_NOTE "-alpha.1")
 SET(EMBREE_VERSION ${EMBREE_VERSION_MAJOR}.${EMBREE_VERSION_MINOR}.${EMBREE_VERSION_PATCH})
 MATH(EXPR EMBREE_VERSION_NUMBER "10000*${EMBREE_VERSION_MAJOR} + 100*${EMBREE_VERSION_MINOR} + ${EMBREE_VERSION_PATCH}")
 SET(CPACK_RPM_PACKAGE_RELEASE 1)

 PROJECT(embree${EMBREE_VERSION_MAJOR})
-SET(EMBREE_PROJECT_COMPILATION ON)

-include(CMakeDependentOption)
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8.11)

-# We use our own strip tool on macOS to sign during install. This is required as CMake modifies RPATH of the binary during install.
-IF (APPLE AND EMBREE_SIGN_FILE)
-  SET(EMBREE_STRIP ${CMAKE_STRIP})
-  SET(CMAKE_STRIP "${PROJECT_BINARY_DIR}/post_install_target.sh")
-  CONFIGURE_FILE(scripts/post_install_target.sh.in "${PROJECT_BINARY_DIR}/post_install_target.sh" @ONLY)
-ENDIF()
-
-MACRO (SIGN_TARGET target)
-  IF (EMBREE_SIGN_FILE)
-    IF (WIN32)
-      # on Windows we sign and do not strip as debug symbols not included in binary
-      ADD_CUSTOM_COMMAND(TARGET ${target} POST_BUILD
-        COMMAND ${EMBREE_SIGN_FILE} $<TARGET_FILE:${target}>)
-    ELSEIF (APPLE)
-      # on MacOSX we strip and sign here for testing purposes but also during install, as CMake modifies binary during install
-      ADD_CUSTOM_COMMAND(TARGET ${target} POST_BUILD
-        COMMAND ${EMBREE_STRIP} -x $<TARGET_FILE:${target}>
-        COMMAND ${EMBREE_SIGN_FILE} -o runtime -e "${CMAKE_SOURCE_DIR}/common/cmake/embree.entitlements" $<TARGET_FILE:${target}>)
-    ELSE()
-      # on Linux signing of binaries is not supported and stripping is done during install
-    ENDIF()
-  ENDIF()
-ENDMACRO()

 # find git version
-IF(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.git")
+IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/.git)
  FIND_PACKAGE(Git)
  IF(GIT_FOUND)
    EXECUTE_PROCESS(
@@ -56,17 +42,20 @@ IF(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.git")
  ENDIF()
 ENDIF()

+CONFIGURE_FILE(
+  "${PROJECT_SOURCE_DIR}/kernels/version.h.in"
+  "${PROJECT_BINARY_DIR}/version.h"
+)
+FILE(WRITE "${PROJECT_BINARY_DIR}/hash" "${EMBREE_HASH}")
+
 IF(COMMAND cmake_policy)
-  if(POLICY CMP0072)
-    cmake_policy(SET CMP0072 NEW)
+  if (POLICY CMP0003)
+    cmake_policy(SET CMP0003 NEW)
  endif()
-  if(POLICY CMP0074)
-    cmake_policy(SET CMP0074 NEW)
+  if (POLICY CMP0042)
+    cmake_policy(SET CMP0042 OLD)
  endif()
-  if(POLICY CMP0135)
-    cmake_policy(SET CMP0135 NEW)
-  endif()
-ENDIF()
+ENDIF(COMMAND cmake_policy)

 MARK_AS_ADVANCED(CMAKE_BACKWARDS_COMPATIBILITY)
 MARK_AS_ADVANCED(EXECUTABLE_OUTPUT_PATH)
@@ -76,29 +65,20 @@ MARK_AS_ADVANCED(CMAKE_OSX_ARCHITECTURES)
 MARK_AS_ADVANCED(CMAKE_OSX_DEPLOYMENT_TARGET)
 MARK_AS_ADVANCED(CMAKE_OSX_SYSROOT)
 MARK_AS_ADVANCED(CLEAR CMAKE_CXX_COMPILER)
+MARK_AS_ADVANCED(GLUT_cocoa_LIBRARY)

-SET(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/common/cmake" ${CMAKE_MODULE_PATH})
+SET(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/common/cmake ${CMAKE_MODULE_PATH})

 INCLUDE(test)

-set(BUILD_DOC OFF CACHE INTERNAL "build documentation (internal only)")
-IF (BUILD_DOC)
-  ADD_SUBDIRECTORY(doc)
-ENDIF()
-
-OPTION(EMBREE_TUTORIALS    "Enable to build Embree tutorials" ON)
-
 ##############################################################
 # Embree configuration
 ##############################################################
-
 GET_PROPERTY(SHARED_LIBS_SUPPORTED GLOBAL PROPERTY TARGET_SUPPORTS_SHARED_LIBS)
 IF(SHARED_LIBS_SUPPORTED)
-  OPTION(EMBREE_STATIC_LIB "Build Embree as a static library.")
-  MARK_AS_ADVANCED(CLEAR EMBREE_STATIC_LIB)
+  OPTION(EMBREE_STATIC_LIB "Build Embree as a static library." OFF)
 ELSE()
-  SET(EMBREE_STATIC_LIB ON CACHE BOOL "Build Embree as a static library." FORCE)
-  MARK_AS_ADVANCED(EMBREE_STATIC_LIB)
+  OPTION(EMBREE_STATIC_LIB "Build Embree as a static library." ON)
 ENDIF()
 IF (EMBREE_STATIC_LIB)
  SET(EMBREE_LIB_TYPE STATIC)
@@ -107,128 +87,37 @@ ELSE()
  SET(EMBREE_LIB_TYPE SHARED)
 ENDIF()

-OPTION(EMBREE_ISPC_SUPPORT "Build Embree with support for ISPC applications." OFF)
-IF (EMSCRIPTEN)
-  SET(EMBREE_ISPC_SUPPORT OFF CACHE BOOL "Build Embree with support for ISPC applications." FORCE)
-ENDIF()
-
-SET(EMBREE_API_NAMESPACE "" CACHE STRING "C++ namespace to put API symbols into.")
-SET(EMBREE_LIBRARY_NAME  "embree${EMBREE_VERSION_MAJOR}" CACHE STRING "Name of the embree library file (default is embree${EMBREE_VERSION_MAJOR})")
-
-IF (EMBREE_API_NAMESPACE AND EMBREE_ISPC_SUPPORT)
-   MESSAGE(FATAL_ERROR "You cannot enable ISPC when EMBREE_API_NAMESPACE is used.")
-ENDIF()
+OPTION(EMBREE_ISPC_SUPPORT "Build Embree with support for ISPC applications." ON)
+OPTION(EMBREE_TUTORIALS    "Enable to build Embree tutorials" ON)

 ##############################################################################
-# Configurations (add configurations also to common/cmake/embree-config.cmake)
-
-OPTION(EMBREE_ZIP_MODE "Create Embree ZIP package" ON)
-MARK_AS_ADVANCED(EMBREE_ZIP_MODE)
-
-OPTION(EMBREE_INSTALL_DEPENDENCIES "Install Embree dependencies in binary packages and install" OFF)
-MARK_AS_ADVANCED(EMBREE_INSTALL_DEPENDENCIES)
+# Configurations (add configurations also to common/cmake/embree-config-default.cmake)

 OPTION(EMBREE_STAT_COUNTERS "Enables statistic counters.")
-OPTION(EMBREE_STACK_PROTECTOR "When enabled Embree compiles with stack protection against return address overrides." OFF)

-IF (NOT APPLE)
-  OPTION(EMBREE_SYCL_SUPPORT "Enables SYCL GPU support." OFF)
-ENDIF()
-CMAKE_DEPENDENT_OPTION(EMBREE_SYCL_LARGEGRF "Enables SYCL large GRF support." OFF "EMBREE_SYCL_SUPPORT" OFF)
-CMAKE_DEPENDENT_OPTION(EMBREE_SYCL_DBG "Enables DPC++ debug info." OFF "EMBREE_SYCL_SUPPORT" OFF)
-CMAKE_DEPENDENT_OPTION(EMBREE_SYCL_GEOMETRY_CALLBACK  "Enabled geometry callbacks which are disabled by default for SYCL." OFF  "EMBREE_SYCL_SUPPORT" OFF)
-
-MARK_AS_ADVANCED(EMBREE_SYCL_LARGEGRF)
-MARK_AS_ADVANCED(EMBREE_SYCL_DBG)
-MARK_AS_ADVANCED(EMBREE_SYCL_GEOMETRY_CALLBACK)
-
-IF (EMBREE_SYCL_GEOMETRY_CALLBACK)
-  message(WARNING "Enabling EMBREE_SYCL_GEOMETRY_CALLBACK is experimental and may result in poor performance.")
-ENDIF()
-
-IF (EMBREE_SYCL_SUPPORT)
-  ADD_DEFINITIONS("-DEMBREE_SYCL_SUPPORT")  # FIXME: only use define from rtcore_config.h
-ENDIF()
-
-CMAKE_DEPENDENT_OPTION(EMBREE_SYCL_RT_SIMULATION "Using hardware simulation" OFF "EMBREE_SYCL_SUPPORT" OFF)
-MARK_AS_ADVANCED(EMBREE_SYCL_RT_SIMULATION)
-IF (EMBREE_SYCL_RT_SIMULATION AND NOT EMBREE_SYCL_RT_VALIDATION_API AND EMBREE_SYCL_IMPLICIT_DISPATCH_GLOBALS)
-  MESSAGE(FATAL_ERROR "Using EMBREE_SYCL_RT_SIMULATION requires EMBREE_SYCL_RT_VALIDATION_API=ON and EMBREE_SYCL_IMPLICIT_DISPATCH_GLOBALS=OFF")
-ENDIF()
-IF (EMBREE_SYCL_RT_SIMULATION)
-  ADD_DEFINITIONS("-DEMBREE_SYCL_RT_SIMULATION")
-ENDIF()
-
-CMAKE_DEPENDENT_OPTION(EMBREE_SYCL_RT_VALIDATION_API "Use rt_validation API instead of IGC provided rt_production API" OFF "EMBREE_SYCL_SUPPORT" OFF)
-IF (EMBREE_SYCL_RT_VALIDATION_API)
-  ADD_DEFINITIONS("-DEMBREE_SYCL_RT_VALIDATION_API")
-ENDIF()
-
-CMAKE_DEPENDENT_OPTION(EMBREE_SYCL_IMPLICIT_DISPATCH_GLOBALS "Using L0 allocated Dispatch Globals" ON "EMBREE_SYCL_RT_VALIDATION_API" OFF)
-IF (EMBREE_SYCL_RT_VALIDATION_API AND NOT EMBREE_SYCL_IMPLICIT_DISPATCH_GLOBALS)
-  ADD_DEFINITIONS("-DEMBREE_SYCL_ALLOC_DISPATCH_GLOBALS")
-ENDIF()
-
-MARK_AS_ADVANCED(EMBREE_SYCL_RT_VALIDATION_API)
-MARK_AS_ADVANCED(EMBREE_SYCL_IMPLICIT_DISPATCH_GLOBALS)
-
-IF (EMBREE_SYCL_SUPPORT)
-  SET(EMBREE_SYCL_AOT_DEVICES "none" CACHE STRING "SYCL devices to use for AOT compilation")
-  SET_PROPERTY(CACHE EMBREE_SYCL_AOT_DEVICES PROPERTY STRINGS none dg2 pvc XE_HPG_CORE XE_HPC_CORE)
-  
-  SET(EMBREE_SYCL_AOT_DEVICE_REVISION 0)
-  IF (EMBREE_SYCL_AOT_DEVICES STREQUAL "dg2")
-    SET(EMBREE_SYCL_AOT_DEVICE_REVISION 4)  # FIXME: bug workaround should get removed
-  ENDIF()
-ENDIF()
-
-OPTION(EMBREE_RAY_MASK "Enables ray mask support." ON)
+OPTION(EMBREE_RAY_MASK "Enables ray mask support.")
 OPTION(EMBREE_BACKFACE_CULLING "Enables backface culling.")
-OPTION(EMBREE_BACKFACE_CULLING_CURVES "Enables backface culling for curve primitives." OFF)
-OPTION(EMBREE_BACKFACE_CULLING_SPHERES "Enables backface culling for sphere primitives." OFF)
-
-OPTION(EMBREE_FILTER_FUNCTION "Enables filter functions." ON)
+OPTION(EMBREE_INTERSECTION_FILTER "Enables intersection filter callback." ON)
+OPTION(EMBREE_INTERSECTION_FILTER_RESTORE "Restores previous hit when hit is filtered out." ON)
 OPTION(EMBREE_IGNORE_INVALID_RAYS "Ignores invalid rays." OFF) # FIXME: enable by default?
-OPTION(EMBREE_COMPACT_POLYS "Enables double indexed poly layout." OFF)
-OPTION(EMBREE_GEOMETRY_TRIANGLE "Enables support for triangle geometries." ON)
-OPTION(EMBREE_GEOMETRY_QUAD "Enables support for quad geometries." ON)
-OPTION(EMBREE_GEOMETRY_CURVE "Enables support for curve geometries." ON)
-OPTION(EMBREE_GEOMETRY_SUBDIVISION "Enables support for subdiv geometries." ON)
+
+OPTION(EMBREE_GEOMETRY_TRIANGLES "Enables support for triangle geometries." ON)
+OPTION(EMBREE_GEOMETRY_QUADS "Enables support for quad geometries." ON)
+OPTION(EMBREE_GEOMETRY_LINES "Enables support for line geometries." ON)
+OPTION(EMBREE_GEOMETRY_HAIR "Enables support for hair geometries." ON)
+OPTION(EMBREE_GEOMETRY_SUBDIV "Enables support for subdiv geometries." ON)
 OPTION(EMBREE_GEOMETRY_USER "Enables support for user geometries." ON)
-OPTION(EMBREE_GEOMETRY_INSTANCE "Enables support for instances." ON)
-OPTION(EMBREE_GEOMETRY_INSTANCE_ARRAY "Enables support for instance arrays." ON)
-SET(EMBREE_MAX_INSTANCE_LEVEL_COUNT 1 CACHE STRING "Maximum number of instance levels.")
-
-IF (NOT EMBREE_GEOMETRY_INSTANCE AND NOT EMBREE_GEOMETRY_INSTANCE_ARRAY AND NOT EMBREE_MAX_INSTANCE_LEVEL_COUNT EQUAL 1)
-  message(FATAL_ERROR "EMBREE_MAX_INSTANCE_LEVEL_COUNT must be 1 when EMBREE_GEOMETRY_INSTANCE and EMBREE_GEOMETRY_INSTANCE_ARRAY are disabled")
-ENDIF()
-
-OPTION(EMBREE_GEOMETRY_GRID "Enables support for grid geometries." ON)
-OPTION(EMBREE_GEOMETRY_POINT "Enables support for point geometries." ON)
-
 OPTION(EMBREE_RAY_PACKETS "Enabled support for ray packets." ON)

-
-SET(EMBREE_CURVE_SELF_INTERSECTION_AVOIDANCE_FACTOR 2.0 CACHE STRING "Self intersection avoidance factor for flat curves. Specify floating point value in range 0 to inf.")
-OPTION(EMBREE_DISC_POINT_SELF_INTERSECTION_AVOIDANCE "Enables self intersection avoidance for ray oriented discs." ON)
-OPTION(EMBREE_MIN_WIDTH "Enables min-width feature to enlarge curve and point thickness to pixel width." OFF)
-
-##############################################################
-# Platform detection and defaults
-##############################################################
-
-# detect ARM compilation
-IF (APPLE AND CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND (CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64" AND CMAKE_OSX_ARCHITECTURES STREQUAL "") OR ("arm64" IN_LIST CMAKE_OSX_ARCHITECTURES))
-  MESSAGE(STATUS "Building for Apple silicon")
-  SET(EMBREE_ARM ON)
-ELSEIF(CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "ARM64")
-  MESSAGE(STATUS "Building for AArch64")
-  SET(EMBREE_ARM ON)
+SET(EMBREE_NATIVE_SPLINE_BASIS BEZIER CACHE STRING "Sets the basis for curves which Embree uses internally. Other types are converted and need more memory.")
+SET_PROPERTY(CACHE EMBREE_NATIVE_SPLINE_BASIS PROPERTY STRINGS BSPLINE BEZIER)
+IF (EMBREE_NATIVE_SPLINE_BASIS STREQUAL "BSPLINE")
+  SET(EMBREE_NATIVE_CURVE_BSPLINE ON)
+ELSE()
+  SET(EMBREE_NATIVE_CURVE_BSPLINE OFF)
 ENDIF()

 SET(EMBREE_TASKING_SYSTEM "TBB" CACHE STRING "Selects tasking system")
-SET(EMBREE_TBB_COMPONENT "tbb" CACHE STRING "The TBB component/library name.")
-
 IF (WIN32)
  SET_PROPERTY(CACHE EMBREE_TASKING_SYSTEM PROPERTY STRINGS TBB INTERNAL PPL)
 ELSE()
@@ -255,30 +144,16 @@ ELSE()
  LIST(APPEND ISPC_DEFINITIONS -DTASKING_INTERNAL)
 ENDIF()

+CONFIGURE_FILE(
+  "${PROJECT_SOURCE_DIR}/kernels/config.h.in"
+  "${PROJECT_BINARY_DIR}/config.h"
+)
+
 ##############################################################
 # Compiler
 ##############################################################
-# TODO: fixme, define relwithassert also for icc, msvc, ... or remove when debug build with dpcpp is useable
-IF(EMBREE_SYCL_SUPPORT)
-  SET(CONFIGURATION_TYPES "Debug;Release;RelWithDebInfo;RelWithAssert")
-ELSE()
+
 SET(CONFIGURATION_TYPES "Debug;Release;RelWithDebInfo")
-ENDIF()
-
-# Validate build type
-IF (CMAKE_BUILD_TYPE)
-  string(FIND "${CONFIGURATION_TYPES}" "${CMAKE_BUILD_TYPE}" MATCHED_CONFIG)
-  IF (${MATCHED_CONFIG} EQUAL -1)
-    message(FATAL_ERROR "CMAKE_BUILD_TYPE (${CMAKE_BUILD_TYPE}) allows only the following values: ${CONFIGURATION_TYPES}")
-  ENDIF()
-ENDIF()
-
-message(DEBUG "CMAKE_GENERATOR_TOOLSET: ${CMAKE_GENERATOR_TOOLSET}")
-message(DEBUG "CMAKE_CXX_COMPILER_ID: ${CMAKE_CXX_COMPILER_ID}")
-message(DEBUG "CMAKE_CXX_COMPILER: ${CMAKE_CXX_COMPILER}")
-
-include(CheckCXXCompilerFlag)
-check_cxx_compiler_flag(-fsycl COMPILER_HAS_SYCL_SUPPORT)

 IF (WIN32)
  IF (NOT DEFAULT_CMAKE_CONFIGURATION_TYPES_SET)
@@ -287,52 +162,21 @@ IF (WIN32)
  ENDIF()
  SET_PROPERTY(GLOBAL PROPERTY USE_FOLDERS ON)

-  IF ((${CMAKE_CXX_COMPILER_ID} MATCHES "IntelLLVM") OR
-      (${CMAKE_CXX_COMPILER_ID} MATCHES "Clang" AND COMPILER_HAS_SYCL_SUPPORT))
-    MESSAGE("-- DPCPP compiler detected")
-    INCLUDE(dpcpp)
-  ELSEIF(${CMAKE_GENERATOR_TOOLSET} MATCHES "^LLVM")
-    set(EMBREE_SYCL_SUPPORT OFF)
-    MESSAGE("-- CLANG compiler detected")
+  IF (${CMAKE_GENERATOR_TOOLSET} MATCHES "^LLVM" )
    INCLUDE(clang)
-  ELSEIF(${CMAKE_GENERATOR_TOOLSET} MATCHES "^Intel")
-    set(EMBREE_SYCL_SUPPORT OFF)
-    MESSAGE("-- Intel compiler detected")
-    INCLUDE (intel)
-  ELSEIF(${CMAKE_CXX_COMPILER_FRONTEND_VARIANT} MATCHES "GNU")
-    set(EMBREE_SYCL_SUPPORT OFF)
-    MESSAGE("-- GNU-like compiler detected")
-    INCLUDE(gnu)
  ELSE()
-    set(EMBREE_SYCL_SUPPORT OFF)
-    MESSAGE("-- MSVC detected")
    INCLUDE (msvc)
  ENDIF()

 ELSE (WIN32)
-  IF(CMAKE_CXX_COMPILER_WRAPPER STREQUAL "CrayPrgEnv")
-    INCLUDE (crayprgenv)
-  ELSE()
-    GET_FILENAME_COMPONENT(CXX_COMPILER_NAME ${CMAKE_CXX_COMPILER} NAME)
-    
-    STRING(TOLOWER "${CMAKE_CXX_COMPILER_ID}" _LOWER_CXX_COMPILER_ID)
-    STRING(REPLACE "appleclang" "clang" _LOWER_CXX_COMPILER_ID ${_LOWER_CXX_COMPILER_ID})
-    STRING(REPLACE "intelllvm" "dpcpp" _LOWER_CXX_COMPILER_ID ${_LOWER_CXX_COMPILER_ID})
-    IF(${_LOWER_CXX_COMPILER_ID} MATCHES "clang" AND ${CXX_COMPILER_NAME} MATCHES "icpx")
-      STRING(REPLACE "clang" "dpcpp" _LOWER_CXX_COMPILER_ID ${_LOWER_CXX_COMPILER_ID})
-    ENDIF()
-    IF(${_LOWER_CXX_COMPILER_ID} MATCHES "clang" AND ${CXX_COMPILER_NAME} MATCHES "dpcpp")
-      STRING(REPLACE "clang" "dpcpp" _LOWER_CXX_COMPILER_ID ${_LOWER_CXX_COMPILER_ID})
-    ENDIF()
-    IF (EMBREE_SYCL_SUPPORT)
-      SET(_LOWER_CXX_COMPILER_ID "dpcpp")
-    ENDIF()
-    STRING(TOUPPER "${_LOWER_CXX_COMPILER_ID}" _UPPER_CXX_COMPILER_ID)
-    MESSAGE("-- ${_UPPER_CXX_COMPILER_ID} detected")
-    INCLUDE(${_LOWER_CXX_COMPILER_ID} OPTIONAL RESULT_VARIABLE COMPILER_FOUND)
-    IF (NOT COMPILER_FOUND)
-      MESSAGE(FATAL_ERROR "Unsupported compiler: " ${CMAKE_CXX_COMPILER_ID})
-    ENDIF ()
+  IF (${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU")
+    INCLUDE (gcc)
+  ELSEIF (${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
+    INCLUDE (clang)
+  ELSEIF (${CMAKE_CXX_COMPILER_ID} STREQUAL "Intel")
+    INCLUDE (icc)
+  ELSE ()
+    MESSAGE(FATAL_ERROR "Unsupported compiler: " ${CMAKE_CXX_COMPILER_ID})
  ENDIF ()

  IF(NOT CMAKE_BUILD_TYPE)
@@ -345,94 +189,41 @@ ELSE (WIN32)

 ENDIF (WIN32)

+IF(CMAKE_CXX_COMPILER_WRAPPER STREQUAL "CrayPrgEnv")
+  INCLUDE(crayprgenv)
+ENDIF()
+
 ##############################################################
 # ISA configuration
 ##############################################################

-# just for compatibility with old naming
-IF(DEFINED EMBREE_ISA_AVX512SKX)
-  UNSET(EMBREE_ISA_AVX512 CACHE)
-  SET(EMBREE_ISA_AVX512 ${EMBREE_ISA_AVX512SKX} CACHE BOOL "")
-ENDIF()
-
-IF (CMAKE_CXX_COMPILER_WRAPPER STREQUAL "CrayPrgEnv")
-  SET(EMBREE_MAX_ISA "DEFAULT" CACHE STRING "Selects highest ISA to support.")
-ELSEIF (EMSCRIPTEN)
-  SET(EMBREE_MAX_ISA "SSE2" CACHE STRING "Selects highest ISA to support.")
-ELSE()
-  SET(EMBREE_MAX_ISA "NONE" CACHE STRING "Selects highest ISA to support.")
-ENDIF()
-
-IF (EMBREE_ARM)
-  SET_PROPERTY(CACHE EMBREE_MAX_ISA PROPERTY STRINGS NONE NEON NEON2X)
-ELSE()  
-  SET_PROPERTY(CACHE EMBREE_MAX_ISA PROPERTY STRINGS NONE SSE2 SSE4.2 AVX AVX2 AVX512 DEFAULT)
-ENDIF()
+SET(EMBREE_MAX_ISA "AVX2" CACHE STRING "Selects highest ISA to support.")
+SET_PROPERTY(CACHE EMBREE_MAX_ISA PROPERTY STRINGS NONE SSE2 SSE4.2 AVX AVX2 AVX512KNL AVX512SKX)

 IF (EMBREE_MAX_ISA STREQUAL "NONE")
-  
-  IF (EMBREE_ARM)
-    IF (APPLE)
-      OPTION(EMBREE_ISA_NEON   "Enables NEON ISA." OFF)
-      OPTION(EMBREE_ISA_NEON2X "Enables NEON ISA double pumped." ON)
-    ELSE()
-      OPTION(EMBREE_ISA_NEON   "Enables NEON ISA." ON)
-      OPTION(EMBREE_ISA_NEON2X "Enables NEON ISA double pumped." OFF)
-    ENDIF()
-  ELSE()
-    TRY_COMPILE(COMPILER_SUPPORTS_AVX    "${CMAKE_BINARY_DIR}" "${PROJECT_SOURCE_DIR}/common/cmake/check_isa.cpp" COMPILE_DEFINITIONS ${FLAGS_AVX})
-    TRY_COMPILE(COMPILER_SUPPORTS_AVX2   "${CMAKE_BINARY_DIR}" "${PROJECT_SOURCE_DIR}/common/cmake/check_isa.cpp" COMPILE_DEFINITIONS ${FLAGS_AVX2})
-    TRY_COMPILE(COMPILER_SUPPORTS_AVX512 "${CMAKE_BINARY_DIR}" "${PROJECT_SOURCE_DIR}/common/cmake/check_isa.cpp" COMPILE_DEFINITIONS ${FLAGS_AVX512})
-  
-    OPTION(EMBREE_ISA_SSE2 "Enables SSE2 ISA." ON)
-    OPTION(EMBREE_ISA_SSE42 "Enables SSE4.2 ISA." ON)
-    OPTION(EMBREE_ISA_AVX "Enables AVX ISA." ${COMPILER_SUPPORTS_AVX})
-    OPTION(EMBREE_ISA_AVX2 "Enables AVX2 ISA." ${COMPILER_SUPPORTS_AVX2})
-    IF (APPLE)
-      OPTION(EMBREE_ISA_AVX512 "Enables AVX512 ISA." OFF)
-    ELSE()
-      OPTION(EMBREE_ISA_AVX512 "Enables AVX512 ISA." ${COMPILER_SUPPORTS_AVX512})
-    ENDIF()
-    # Don't use OPTION, but still set them to OFF, so that embree-config.cmake is consisten with its definitions
-    SET(EMBREE_ISA_NEON   OFF)
-    SET(EMBREE_ISA_NEON2X OFF)
+  SET(EMBREE_ISA_SSE2 "OFF" CACHE BOOL "Enables SSE2 ISA.")
+  SET(EMBREE_ISA_SSE42 "OFF" CACHE BOOL "Enables SSE4.2 ISA.")
+  SET(EMBREE_ISA_AVX "OFF" CACHE BOOL "Enables AVX ISA.")
+  SET(EMBREE_ISA_AVX2 "OFF" CACHE BOOL "Enables AVX2 ISA.")
+  SET(EMBREE_ISA_AVX512KNL "OFF" CACHE BOOL "Enables AVX512 ISA for Knights Landing.")
+  SET(EMBREE_ISA_AVX512SKX "OFF" CACHE BOOL "Enables AVX512 ISA for Skylake.")
+  IF(NOT (EMBREE_ISA_SSE2 OR EMBREE_ISA_SSE42 OR EMBREE_ISA_AVX OR
+          EMBREE_ISA_AVX2 OR EMBREE_ISA_AVX512KNL OR EMBREE_ISA_AVX512SKX))
+    MESSAGE(STATUS "Detecting default ISA:")
+    INCLUDE(check_isa_default)
+    CHECK_ISA_DEFAULT(EMBREE_ISA_DEFAULT)
+    MESSAGE(STATUS "Detecting default ISA: ${EMBREE_ISA_DEFAULT}")
+    SET(EMBREE_ISA_${EMBREE_ISA_DEFAULT} ON)
  ENDIF()
-
-ELSEIF (EMBREE_MAX_ISA STREQUAL "DEFAULT")
-  UNSET(EMBREE_ISA_NEON CACHE)
-  UNSET(EMBREE_ISA_NEON2X CACHE)
-  UNSET(EMBREE_ISA_SSE2 CACHE)
-  UNSET(EMBREE_ISA_SSE42 CACHE)
-  UNSET(EMBREE_ISA_AVX CACHE)
-  UNSET(EMBREE_ISA_AVX2 CACHE)
-  UNSET(EMBREE_ISA_AVX512 CACHE)
-  SET(EMBREE_ISA_NEON OFF)
-  SET(EMBREE_ISA_NEON2X OFF)
-  SET(EMBREE_ISA_SSE2 OFF)
-  SET(EMBREE_ISA_SSE42 OFF)
-  SET(EMBREE_ISA_AVX OFF)
-  SET(EMBREE_ISA_AVX2 OFF)
-  SET(EMBREE_ISA_AVX512 OFF)
-  MESSAGE(STATUS "Detecting default ISA...")
-  INCLUDE(check_isa_default)
-  CHECK_ISA_DEFAULT(EMBREE_ISA_DEFAULT)
-  MESSAGE(STATUS "Detected default ISA: ${EMBREE_ISA_DEFAULT}")
-  SET(EMBREE_ISA_${EMBREE_ISA_DEFAULT} ON)
-
 ELSE()
-  UNSET(EMBREE_ISA_NEON CACHE)
-  UNSET(EMBREE_ISA_NEON2X CACHE)
  UNSET(EMBREE_ISA_SSE2 CACHE)
  UNSET(EMBREE_ISA_SSE42 CACHE)
  UNSET(EMBREE_ISA_AVX CACHE)
  UNSET(EMBREE_ISA_AVX2 CACHE)
-  UNSET(EMBREE_ISA_AVX512 CACHE)
- 
-  IF(EMBREE_MAX_ISA STREQUAL "NEON")
-    SET(ISA  1)
-  ELSEIF(EMBREE_MAX_ISA STREQUAL "NEON2X")
-    SET(ISA  2)
-  ELSEIF(EMBREE_MAX_ISA STREQUAL "SSE2")
+  UNSET(EMBREE_ISA_AVX512KNL CACHE)
+  UNSET(EMBREE_ISA_AVX512SKX CACHE)
+
+  IF(EMBREE_MAX_ISA STREQUAL "SSE2")
    SET(ISA  1)
  ELSEIF(EMBREE_MAX_ISA STREQUAL "SSE4.2")
    SET(ISA  2)
@@ -440,181 +231,90 @@ ELSE()
    SET(ISA  3)
  ELSEIF(EMBREE_MAX_ISA STREQUAL "AVX2")
    SET(ISA  4)
-  ELSEIF(EMBREE_MAX_ISA STREQUAL "AVX512")
-    SET(ISA 5)
-  ELSEIF(EMBREE_MAX_ISA STREQUAL "AVX512SKX")  # just for compatibility
-    SET(ISA 5)
+  ELSEIF(EMBREE_MAX_ISA STREQUAL "AVX512KNL")
+    SET(ISA  5)
+  ELSEIF(EMBREE_MAX_ISA STREQUAL "AVX512SKX")
+    SET(ISA 6)
  ELSE()
    MESSAGE(FATAL_ERROR "Unsupported ISA specified: " ${EMBREE_MAX_ISA})
  ENDIF()

-  SET(EMBREE_ISA_NEON OFF)
-  SET(EMBREE_ISA_NEON2X OFF)
  SET(EMBREE_ISA_SSE2 OFF)
  SET(EMBREE_ISA_SSE42 OFF)
  SET(EMBREE_ISA_AVX OFF)
  SET(EMBREE_ISA_AVX2 OFF)
-  SET(EMBREE_ISA_AVX512 OFF)
+  SET(EMBREE_ISA_AVX512KNL OFF)
+  SET(EMBREE_ISA_AVX512SKX OFF)

-  IF (EMBREE_ARM)
-    IF (ISA GREATER 0)
-      SET(EMBREE_ISA_NEON ON)
-    ENDIF ()
-    IF (ISA GREATER 1)
-      SET(EMBREE_ISA_NEON2X ON)
-    ENDIF ()
-  ELSE()
-    IF (ISA GREATER 0)
-      SET(EMBREE_ISA_SSE2  ON)
-    ENDIF ()
-    IF (ISA GREATER 1)
-      SET(EMBREE_ISA_SSE42  ON)
-    ENDIF ()
-    IF (ISA GREATER 2)
-      SET(EMBREE_ISA_AVX  ON)
-    ENDIF ()
-    IF (ISA GREATER 3)
-      SET(EMBREE_ISA_AVX2  ON)
-    ENDIF ()
-    IF (ISA GREATER 4)
-      SET(EMBREE_ISA_AVX512  ON)
-    ENDIF ()
-  ENDIF()
+  IF (ISA GREATER 0)
+    SET(EMBREE_ISA_SSE2  ON)
+  ENDIF ()
+  IF (ISA GREATER 1)
+    SET(EMBREE_ISA_SSE42  ON)
+  ENDIF ()
+  IF (ISA GREATER 2)
+    SET(EMBREE_ISA_AVX  ON)
+  ENDIF ()
+  IF (ISA GREATER 3)
+    SET(EMBREE_ISA_AVX2  ON)
+  ENDIF ()
+  IF (ISA GREATER 4)
+    SET(EMBREE_ISA_AVX512KNL  ON)
+  ENDIF ()
+  IF (ISA GREATER 5)
+    SET(EMBREE_ISA_AVX512SKX  ON)
+  ENDIF ()
 ENDIF()

-IF(CMAKE_CXX_COMPILER_WRAPPER STREQUAL "CrayPrgEnv")
-  SET(EMBREE_ISA_SSE42 OFF)
-ENDIF()
-
-IF (APPLE AND EMBREE_STATIC_LIB)
-
-  # count number of set ISAs
-  SET(NUMISA 0)
-  IF (EMBREE_ISA_NEON)
-    MATH(EXPR NUMISA "${NUMISA}+1")
-  ENDIF()
-  IF (EMBREE_ISA_NEON2X)
-    MATH(EXPR NUMISA "${NUMISA}+1")
-  ENDIF()
-  IF (EMBREE_ISA_SSE2)
-    MATH(EXPR NUMISA "${NUMISA}+1")
-  ENDIF()
-  IF (EMBREE_ISA_SSE42)
-    MATH(EXPR NUMISA "${NUMISA}+1")
-  ENDIF()
-  IF (EMBREE_ISA_AVX)
-    MATH(EXPR NUMISA "${NUMISA}+1")
-  ENDIF()
-  IF (EMBREE_ISA_AVX2)
-    MATH(EXPR NUMISA "${NUMISA}+1")
-  ENDIF()
-  IF (EMBREE_ISA_AVX512)
-    MATH(EXPR NUMISA "${NUMISA}+1")
-  ENDIF()
-
-  IF (NUMISA GREATER 1)
-    IF (${CMAKE_CXX_COMPILER_ID} MATCHES "Clang")
-      IF (${CMAKE_CXX_COMPILER_VERSION} VERSION_GREATER "9.0.0" OR ${CMAKE_CXX_COMPILER_VERSION} VERSION_EQUAL "9.0.0")
-        MESSAGE(FATAL_ERROR "Using Embree as static library is not supported with AppleClang >= 9.0 when multiple ISAs are selected. Please either build a shared library or enable only one ISA.")
-      ENDIF()
-    ENDIF()
-  ENDIF()
-ENDIF()
-
-##############################################################
-# ISA configuration continued
-##############################################################
-
-SET(SSE2 0)
-SET(SSE42 1)
-SET(AVX 2)
-SET(AVX2 3)
-SET(AVX512 4)
-
 UNSET(FLAGS_LOWEST)
-SET(ISA_LOWEST -1)
-SET(ISA_LOWEST_AVX 2)
-
-IF (EMBREE_ARM)
-  IF (EMBREE_ISA_NEON2X)
-    LIST(APPEND ISPC_TARGETS "neon-i32x8")
-  ELSEIF (EMBREE_ISA_NEON)
-    LIST(APPEND ISPC_TARGETS "neon-i32x4")
-  ENDIF()
-ENDIF()
-
-IF (EMBREE_ISA_NEON)
-  SET(EMBREE_ISA_SSE2 ON)
-ENDIF()
-
-IF (EMBREE_ISA_NEON2X)
-  SET(EMBREE_ISA_SSE2 OFF)
-  SET(EMBREE_ISA_SSE42 OFF)
-  SET(EMBREE_ISA_AVX OFF)
-  SET(EMBREE_ISA_AVX2 ON)
-ENDIF()

 IF (EMBREE_ISA_SSE2)
-  ADD_DEFINITIONS(-DEMBREE_TARGET_SSE2)
-  IF (NOT EMBREE_ARM)
-    LIST(APPEND ISPC_TARGETS "sse2")
-  ENDIF()
+  ADD_DEFINITIONS(-D__TARGET_SSE2__)
+  LIST(APPEND ISPC_TARGETS "sse2")
  IF(NOT FLAGS_LOWEST)
-    SET(ISA_LOWEST ${SSE2})
-    SET(FLAGS_LOWEST ${FLAGS_SSE2})
+   SET(FLAGS_LOWEST ${FLAGS_SSE2})
  ENDIF()
 ENDIF()

 IF (EMBREE_ISA_SSE42)
-  ADD_DEFINITIONS(-DEMBREE_TARGET_SSE42)
-  IF (NOT EMBREE_ARM)
-    LIST(APPEND ISPC_TARGETS "sse4")
-  ENDIF()
+  ADD_DEFINITIONS(-D__TARGET_SSE42__)
+  LIST(APPEND ISPC_TARGETS "sse4")
  IF(NOT FLAGS_LOWEST)
-    SET(ISA_LOWEST ${SSE42})
-    SET(FLAGS_LOWEST ${FLAGS_SSE42})
+   SET(FLAGS_LOWEST ${FLAGS_SSE42})
  ENDIF()
 ENDIF ()

 IF (EMBREE_ISA_AVX)
-  ADD_DEFINITIONS(-DEMBREE_TARGET_AVX)
-  IF (NOT EMBREE_ARM)
-    LIST(APPEND ISPC_TARGETS "avx")
-  ENDIF()
+  ADD_DEFINITIONS(-D__TARGET_AVX__)
+  LIST(APPEND ISPC_TARGETS "avx")
  IF(NOT FLAGS_LOWEST)
-    SET(ISA_LOWEST ${AVX})
-    SET(ISA_LOWEST_AVX ${AVX})
-    SET(FLAGS_LOWEST ${FLAGS_AVX})
+   SET(FLAGS_LOWEST ${FLAGS_AVX})
  ENDIF()
 ENDIF ()

 IF (EMBREE_ISA_AVX2)
-  ADD_DEFINITIONS(-DEMBREE_TARGET_AVX2)
-  IF (NOT EMBREE_ARM)
-    LIST(APPEND ISPC_TARGETS "avx2")
-  ENDIF()
+  ADD_DEFINITIONS(-D__TARGET_AVX2__)
+  LIST(APPEND ISPC_TARGETS "avx2")
  IF(NOT FLAGS_LOWEST)
-    SET(ISA_LOWEST ${AVX2})
-    SET(ISA_LOWEST_AVX ${AVX2})
-    SET(FLAGS_LOWEST ${FLAGS_AVX2})
+   SET(FLAGS_LOWEST ${FLAGS_AVX2})
  ENDIF()
 ENDIF ()

-IF (EMBREE_ISA_AVX512)
-  ADD_DEFINITIONS(-DEMBREE_TARGET_AVX512)
-  IF (NOT EMBREE_ARM)
-    LIST(APPEND ISPC_TARGETS "avx512skx-i32x16")
-  ENDIF()
+IF (EMBREE_ISA_AVX512KNL)
+  ADD_DEFINITIONS(-D__TARGET_AVX512KNL__)
+  LIST(APPEND ISPC_TARGETS "avx512knl-i32x16")
  IF(NOT FLAGS_LOWEST)
-    SET(ISA_LOWEST ${AVX512})
-    SET(ISA_LOWEST_AVX ${AVX512})
-    SET(FLAGS_LOWEST ${FLAGS_AVX512})
+   SET(FLAGS_LOWEST ${FLAGS_AVX512KNL})
  ENDIF()
 ENDIF ()

-IF (ISA_LOWEST EQUAL -1)
-  MESSAGE(FATAL_ERROR "You have to enable at least one ISA!")
-ENDIF()
+IF (EMBREE_ISA_AVX512SKX)
+  ADD_DEFINITIONS(-D__TARGET_AVX512SKX__)
+  LIST(APPEND ISPC_TARGETS "avx512skx-i32x16")
+  IF(NOT FLAGS_LOWEST)
+   SET(FLAGS_LOWEST ${FLAGS_AVX512SKX})
+  ENDIF()
+ENDIF ()

 INCLUDE (ispc)

@@ -624,34 +324,15 @@ INCLUDE (ispc)
 include(package)

 ##############################################################
-# Create Config files
+# Search paths
 ##############################################################
-
-CONFIGURE_FILE(
-  "${PROJECT_SOURCE_DIR}/kernels/config.h.in"
-  "${PROJECT_SOURCE_DIR}/kernels/config.h"
-  )
-
-INCLUDE_DIRECTORIES(${PROJECT_BINARY_DIR})
-
-CONFIGURE_FILE(
-  "${PROJECT_SOURCE_DIR}/kernels/rtcore_config.h.in"
-  "${PROJECT_SOURCE_DIR}/include/embree4/rtcore_config.h"
-)
-
-CONFIGURE_FILE(
-  "${PROJECT_SOURCE_DIR}/kernels/hash.h.in"
-  "${PROJECT_SOURCE_DIR}/kernels/hash.h"
-)
-CONFIGURE_FILE(
-  "${PROJECT_SOURCE_DIR}/kernels/export.linux.map.in"
-  "${PROJECT_SOURCE_DIR}/kernels/export.linux.map"
-)
-CONFIGURE_FILE(
-  "${PROJECT_SOURCE_DIR}/kernels/export.macosx.map.in"
-  "${PROJECT_SOURCE_DIR}/kernels/export.macosx.map"
-)
-
+INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/include)
+INCLUDE_DIRECTORIES("${PROJECT_BINARY_DIR}")
+INCLUDE_DIRECTORIES_ISPC("${PROJECT_BINARY_DIR}")
+IF (TASKING_TBB)
+  FIND_PACKAGE(TBB REQUIRED)
+  INCLUDE_DIRECTORIES(${TBB_INCLUDE_DIRS})
+ENDIF()

 ##############################################################
 # Output paths
@@ -666,7 +347,6 @@ SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")

 ADD_SUBDIRECTORY(common)
 ADD_SUBDIRECTORY(kernels)
-ADD_SUBDIRECTORY(tests)

 IF (EMBREE_TUTORIALS)
  ADD_SUBDIRECTORY(tutorials)
@@ -676,20 +356,17 @@ ENDIF()
 # Uninstall
 ##############################################################

-IF (NOT TARGET uninstall)
-  configure_file(
-      "${CMAKE_CURRENT_SOURCE_DIR}/common/cmake/uninstall.cmake.in"
-      "${CMAKE_CURRENT_BINARY_DIR}/uninstall.cmake"
-      IMMEDIATE @ONLY)
+configure_file(
+    "${CMAKE_CURRENT_SOURCE_DIR}/common/cmake/uninstall.cmake.in"
+    "${CMAKE_CURRENT_BINARY_DIR}/uninstall.cmake"
+    IMMEDIATE @ONLY)

-  add_custom_target(uninstall
-      COMMAND ${CMAKE_COMMAND} -P "${CMAKE_CURRENT_BINARY_DIR}/uninstall.cmake")
+add_custom_target(uninstall
+    COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/uninstall.cmake)

-  SET_PROPERTY(TARGET uninstall PROPERTY FOLDER CMakePredefinedTargets)
-ENDIF()
+SET_PROPERTY(TARGET uninstall PROPERTY FOLDER CMakePredefinedTargets)

 ##############################################################
 # Has to be last
 ##############################################################
-
 INCLUDE(CPack)
@@ -1,6 +1,33 @@
-## Copyright 2009-2021 Intel Corporation
-## SPDX-License-Identifier: Apache-2.0
+## ======================================================================== ##
+## Copyright 2009-2017 Intel Corporation                                    ##
+##                                                                          ##
+## Licensed under the Apache License, Version 2.0 (the "License");          ##
+## you may not use this file except in compliance with the License.         ##
+## You may obtain a copy of the License at                                  ##
+##                                                                          ##
+##     http://www.apache.org/licenses/LICENSE-2.0                           ##
+##                                                                          ##
+## Unless required by applicable law or agreed to in writing, software      ##
+## distributed under the License is distributed on an "AS IS" BASIS,        ##
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ##
+## See the License for the specific language governing permissions and      ##
+## limitations under the License.                                           ##
+## ======================================================================== ##

 set(CTEST_PROJECT_NAME "Embree")
-set(TEST_MODELS_HASH 05b5a61035485d3090868f9abf5cc057d1e31101)
+set(CTEST_NIGHTLY_START_TIME "22:00:00 UTC")
+set(TEST_MODELS_HASH 208ffea4545822ac58015d215b19927ee9449918)

+IF (NOT CTEST_DROP_SITE)
+  set(CTEST_DROP_METHOD "http")
+  set(CTEST_DROP_SITE "cdash")
+  set(CTEST_DROP_LOCATION "/CDash/submit.php?project=Embree")
+  set(CTEST_DROP_SITE_CDASH TRUE)
+endif()
+
+list (APPEND CTEST_CUSTOM_WARNING_EXCEPTION "warning #1478")  # deprecated function used
+#list (APPEND CTEST_CUSTOM_WARNING_EXCEPTION "warning #10237") # -lcilkrts linked in dynamically, static library not available")
+list (APPEND CTEST_CUSTOM_WARNING_EXCEPTION "-Wextern-initializer")
+
+SET(CTEST_CUSTOM_MAXIMUM_PASSED_TEST_OUTPUT_SIZE 200000)
+SET(CTEST_CUSTOM_MAXIMUM_FAILED_TEST_OUTPUT_SIZE 800000)
@@ -1,14 +0,0 @@
-Security Policy
-===============
-
-Intel is committed to rapidly addressing security vulnerabilities
-affecting our customers and providing clear guidance on the solution,
-impact, severity and mitigation.
-
-Reporting a Vulnerability
-------------------------
-
-Please [report any security vulnerabilities][guidelines] in this project
-utilizing the [guidelines here][guidelines].
-
-[guidelines]: https://www.intel.com/content/www/us/en/security-center/vulnerability-handling-guidelines.html "Vulnerability Handling Guidelines"
@@ -1,8 +1,21 @@
-## Copyright 2009-2021 Intel Corporation
-## SPDX-License-Identifier: Apache-2.0
+## ======================================================================== ##
+## Copyright 2009-2017 Intel Corporation                                    ##
+##                                                                          ##
+## Licensed under the Apache License, Version 2.0 (the "License");          ##
+## you may not use this file except in compliance with the License.         ##
+## You may obtain a copy of the License at                                  ##
+##                                                                          ##
+##     http://www.apache.org/licenses/LICENSE-2.0                           ##
+##                                                                          ##
+## Unless required by applicable law or agreed to in writing, software      ##
+## distributed under the License is distributed on an "AS IS" BASIS,        ##
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ##
+## See the License for the specific language governing permissions and      ##
+## limitations under the License.                                           ##
+## ======================================================================== ##

 ADD_SUBDIRECTORY(sys)
-ADD_SUBDIRECTORY(math)
 ADD_SUBDIRECTORY(simd)
 ADD_SUBDIRECTORY(lexers)
-ADD_SUBDIRECTORY(tasking)
+ADD_SUBDIRECTORY(tasking)
+ADD_SUBDIRECTORY(algorithms)
@@ -0,0 +1,32 @@
+## ======================================================================== ##
+## Copyright 2009-2017 Intel Corporation                                    ##
+##                                                                          ##
+## Licensed under the Apache License, Version 2.0 (the "License");          ##
+## you may not use this file except in compliance with the License.         ##
+## You may obtain a copy of the License at                                  ##
+##                                                                          ##
+##     http://www.apache.org/licenses/LICENSE-2.0                           ##
+##                                                                          ##
+## Unless required by applicable law or agreed to in writing, software      ##
+## distributed under the License is distributed on an "AS IS" BASIS,        ##
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ##
+## See the License for the specific language governing permissions and      ##
+## limitations under the License.                                           ##
+## ======================================================================== ##
+
+ADD_LIBRARY(algorithms OBJECT
+ parallel_for.cpp
+ parallel_reduce.cpp
+ parallel_prefix_sum.cpp
+ parallel_for_for.cpp
+ parallel_for_for_prefix_sum.cpp
+ parallel_partition.cpp
+ parallel_sort.cpp
+ parallel_set.cpp
+ parallel_map.cpp
+ parallel_filter.cpp
+)
+
+SET_PROPERTY(TARGET algorithms PROPERTY FOLDER common)
+
+ 
@@ -1,56 +0,0 @@
-// Copyright 2009-2021 Intel Corporation
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <functional>
-#include "parallel_reduce.h"
-
-namespace embree
-{
-  
-  template<typename Index, class UnaryPredicate>
-    __forceinline bool parallel_any_of (Index first, Index last, UnaryPredicate pred)
-  {
-    std::atomic_bool ret;
-    ret = false;
-    
-#if defined(TASKING_TBB)
-#if TBB_INTERFACE_VERSION >= 12002
-    tbb::task_group_context context;
-    tbb::parallel_for(tbb::blocked_range<size_t>{first, last}, [&ret,pred,&context](const tbb::blocked_range<size_t>& r) {
-        if (context.is_group_execution_cancelled()) return;
-        for (size_t i = r.begin(); i != r.end(); ++i) {
-          if (pred(i)) {
-            ret = true;
-            context.cancel_group_execution();
-          }
-        }
-      });
-#else
-    tbb::parallel_for(tbb::blocked_range<size_t>{first, last}, [&ret,pred](const tbb::blocked_range<size_t>& r) {
-        if (tbb::task::self().is_cancelled()) return;
-        for (size_t i = r.begin(); i != r.end(); ++i) {
-          if (pred(i)) {
-            ret = true;
-            tbb::task::self().cancel_group_execution();
-          }
-        }
-      });
-#endif
-#else
-    ret = parallel_reduce (first, last, false, [pred](const range<size_t>& r)->bool {
-        bool localret = false;
-        for (auto i=r.begin(); i<r.end(); ++i) {
-          localret |= pred(i);
-        }
-        return localret;
-      },
-      std::bit_or<bool>()
-      );
-#endif
-    
-    return ret;
-  }
-  
-} // end namespace
@@ -0,0 +1,67 @@
+// ======================================================================== //
+// Copyright 2009-2017 Intel Corporation                                    //
+//                                                                          //
+// Licensed under the Apache License, Version 2.0 (the "License");          //
+// you may not use this file except in compliance with the License.         //
+// You may obtain a copy of the License at                                  //
+//                                                                          //
+//     http://www.apache.org/licenses/LICENSE-2.0                           //
+//                                                                          //
+// Unless required by applicable law or agreed to in writing, software      //
+// distributed under the License is distributed on an "AS IS" BASIS,        //
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. //
+// See the License for the specific language governing permissions and      //
+// limitations under the License.                                           //
+// ======================================================================== //
+
+#include "parallel_filter.h"
+#include "../sys/regression.h"
+#include <map>
+
+namespace embree
+{
+  struct parallel_filter_regression_test : public RegressionTest
+  {
+    parallel_filter_regression_test(const char* name) : RegressionTest(name) {
+      registerRegressionTest(this);
+    }
+    
+    bool run ()
+    {
+      bool passed = true;
+      auto pred = [&]( uint32_t v ) { return (v & 0x3) == 0; };
+      
+      for (size_t N=10; N<1000000; N=size_t(2.1*N))
+      {
+	/* initialize array with random numbers */
+	std::vector<uint32_t> src(N);
+        std::map<uint32_t,int> m;
+	for (size_t i=0; i<N; i++) src[i] = rand();
+
+        /* count elements up */
+	for (size_t i=0; i<N; i++)
+          if (pred(src[i]))
+            m[src[i]] = 0;
+        for (size_t i=0; i<N; i++)
+          if (pred(src[i]))
+            m[src[i]]++;
+
+        /* filter array */
+        //size_t_t M = sequential_filter(src.data(),size_t(0),N,pred);
+        size_t M = parallel_filter(src.data(),size_t(0),N,size_t(1024),pred);
+        
+	/* check if filtered data is correct */
+	for (size_t i=0; i<M; i++) {
+          passed &= pred(src[i]);
+          m[src[i]]--;
+        }
+	for (size_t i=0; i<M; i++)
+          passed &= (m[src[i]] == 0);
+      }
+
+      return passed;
+    }
+  };
+
+  parallel_filter_regression_test parallel_filter_regression("parallel_filter_regression");
+}
@@ -1,5 +1,18 @@
-// Copyright 2009-2021 Intel Corporation
-// SPDX-License-Identifier: Apache-2.0
+// ======================================================================== //
+// Copyright 2009-2017 Intel Corporation                                    //
+//                                                                          //
+// Licensed under the Apache License, Version 2.0 (the "License");          //
+// you may not use this file except in compliance with the License.         //
+// You may obtain a copy of the License at                                  //
+//                                                                          //
+//     http://www.apache.org/licenses/LICENSE-2.0                           //
+//                                                                          //
+// Unless required by applicable law or agreed to in writing, software      //
+// distributed under the License is distributed on an "AS IS" BASIS,        //
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. //
+// See the License for the specific language governing permissions and      //
+// limitations under the License.                                           //
+// ======================================================================== //

 #pragma once

@@ -26,7 +39,7 @@ namespace embree
      return sequential_filter(data,begin,end,predicate);

    /* calculate number of tasks to use */
-    enum { MAX_TASKS = 64 };
+    enum { MAX_TASKS = 512 };
    const Index numThreads = TaskScheduler::threadCount();
    const Index numBlocks  = (end-begin+minStepSize-1)/minStepSize;
    const Index taskCount  = min(numThreads,numBlocks,(Index)MAX_TASKS);
@@ -63,8 +76,8 @@ namespace embree
    parallel_for(taskCount, [&](const Index taskIndex)
    {
      /* destination to write elements to */
-      Index dst = begin+(taskIndex+0)*(end-begin)/taskCount+nused[taskIndex];
-      Index dst_end = min(dst+nfree[taskIndex],begin+sused);
+      Index dst = (taskIndex+0)*(end-begin)/taskCount+nused[taskIndex];
+      Index dst_end = min(dst+nfree[taskIndex],sused);
      if (dst_end <= dst) return;

      /* range of misplaced elements to copy to destination */
@@ -79,10 +92,7 @@ namespace embree
        Index k1 = k0+nused[i];
        Index src = begin+(i+0)*(end-begin)/taskCount+nused[i];
        for (Index i=max(r0,k0); i<min(r1,k1); i++) {
-          Index isrc = src-i+k0-1;
-          assert(dst >= begin && dst < end);
-          assert(isrc >= begin && isrc < end);
-          data[dst++] = data[isrc];
+          data[dst++] = data[src-i+k0-1];
        }
        k0 = k1;
      }
@@ -0,0 +1,61 @@
+// ======================================================================== //
+// Copyright 2009-2017 Intel Corporation                                    //
+//                                                                          //
+// Licensed under the Apache License, Version 2.0 (the "License");          //
+// you may not use this file except in compliance with the License.         //
+// You may obtain a copy of the License at                                  //
+//                                                                          //
+//     http://www.apache.org/licenses/LICENSE-2.0                           //
+//                                                                          //
+// Unless required by applicable law or agreed to in writing, software      //
+// distributed under the License is distributed on an "AS IS" BASIS,        //
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. //
+// See the License for the specific language governing permissions and      //
+// limitations under the License.                                           //
+// ======================================================================== //
+
+#include "parallel_for.h"
+#include "../sys/regression.h"
+
+namespace embree
+{
+  struct parallel_for_regression_test : public RegressionTest
+  {
+    parallel_for_regression_test(const char* name) : RegressionTest(name) {
+      registerRegressionTest(this);
+    }
+    
+    bool run ()
+    {
+      bool passed = true;
+
+      const size_t M = 10;
+      for (size_t N=10; N<10000000; N=size_t(2.1*N))
+      {
+        /* sequentially calculate sum of squares */
+        size_t sum0 = 0;
+        for (size_t i=0; i<N; i++) {
+          sum0 += i*i;
+        }
+
+        /* parallel calculation of sum of squares */
+        for (size_t m=0; m<M; m++)
+        {
+          std::atomic<size_t> sum1(0);
+          parallel_for( size_t(0), size_t(N), size_t(1024), [&](const range<size_t>& r) 
+          {
+            size_t s = 0;
+            for (size_t i=r.begin(); i<r.end(); i++) 
+              s += i*i;
+            sum1 += s;
+          });
+          passed = sum0 == sum1;
+        }
+      }
+      
+      return passed;
+    }
+  };
+
+  parallel_for_regression_test parallel_for_regression("parallel_for_regression_test");
+}
@@ -1,12 +1,25 @@
-// Copyright 2009-2021 Intel Corporation
-// SPDX-License-Identifier: Apache-2.0
+// ======================================================================== //
+// Copyright 2009-2017 Intel Corporation                                    //
+//                                                                          //
+// Licensed under the Apache License, Version 2.0 (the "License");          //
+// you may not use this file except in compliance with the License.         //
+// You may obtain a copy of the License at                                  //
+//                                                                          //
+//     http://www.apache.org/licenses/LICENSE-2.0                           //
+//                                                                          //
+// Unless required by applicable law or agreed to in writing, software      //
+// distributed under the License is distributed on an "AS IS" BASIS,        //
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. //
+// See the License for the specific language governing permissions and      //
+// limitations under the License.                                           //
+// ======================================================================== //

 #pragma once

-#include "../tasking/taskscheduler.h"
+#include "../common/tasking/taskscheduler.h"
 #include "../sys/array.h"
-#include "../math/emath.h"
-#include "../math/range.h"
+#include "../math/math.h"
+#include "../common/math/range.h"

 namespace embree
 {
@@ -14,33 +27,22 @@ namespace embree
  template<typename Index, typename Func>
    __forceinline void parallel_for( const Index N, const Func& func)
  {
-#if defined(TASKING_INTERNAL) && !defined(TASKING_TBB)
+#if defined(TASKING_INTERNAL)
    if (N) {
-      TaskScheduler::TaskGroupContext context;
      TaskScheduler::spawn(Index(0),N,Index(1),[&] (const range<Index>& r) {
          assert(r.size() == 1);
          func(r.begin());
-        },&context);
-      TaskScheduler::wait();
-      if (context.cancellingException != nullptr) {
-        std::rethrow_exception(context.cancellingException);
-      }
+        });
+      if (!TaskScheduler::wait())
+        throw std::runtime_error("task cancelled");
    }
+    
 #elif defined(TASKING_TBB)
-  #if TBB_INTERFACE_VERSION >= 12002
-    tbb::task_group_context context;
-    tbb::parallel_for(Index(0),N,Index(1),[&](Index i) {
-        func(i);
-      },context);
-    if (context.is_group_execution_cancelled())
-      throw std::runtime_error("task cancelled");
-  #else
-    tbb::parallel_for(Index(0),N,Index(1),[&](Index i) {
-        func(i);
+    tbb::parallel_for(Index(0),N,Index(1),[&](Index i) { 
+	func(i);
      });
    if (tbb::task::self().is_cancelled())
      throw std::runtime_error("task cancelled");
-  #endif

 #elif defined(TASKING_PPL)
    concurrency::parallel_for(Index(0),N,Index(1),[&](Index i) { 
@@ -56,29 +58,17 @@ namespace embree
    __forceinline void parallel_for( const Index first, const Index last, const Index minStepSize, const Func& func)
  {
    assert(first <= last);
-#if defined(TASKING_INTERNAL) && !defined(TASKING_TBB)
-    TaskScheduler::TaskGroupContext context;
-    TaskScheduler::spawn(first,last,minStepSize,func,&context);
-    TaskScheduler::wait();
-    if (context.cancellingException != nullptr) {
-      std::rethrow_exception(context.cancellingException);
-    }
+#if defined(TASKING_INTERNAL)
+    TaskScheduler::spawn(first,last,minStepSize,func);
+    if (!TaskScheduler::wait())
+      throw std::runtime_error("task cancelled");

 #elif defined(TASKING_TBB)
-  #if TBB_INTERFACE_VERSION >= 12002
-    tbb::task_group_context context;
-    tbb::parallel_for(tbb::blocked_range<Index>(first,last,minStepSize),[&](const tbb::blocked_range<Index>& r) {
-        func(range<Index>(r.begin(),r.end()));
-      },context);
-    if (context.is_group_execution_cancelled())
-      throw std::runtime_error("task cancelled");
-  #else
-    tbb::parallel_for(tbb::blocked_range<Index>(first,last,minStepSize),[&](const tbb::blocked_range<Index>& r) {
+    tbb::parallel_for(tbb::blocked_range<Index>(first,last,minStepSize),[&](const tbb::blocked_range<Index>& r) { 
        func(range<Index>(r.begin(),r.end()));
      });
    if (tbb::task::self().is_cancelled())
      throw std::runtime_error("task cancelled");
-  #endif

 #elif defined(TASKING_PPL)
    concurrency::parallel_for(first, last, Index(1) /*minStepSize*/, [&](Index i) { 
@@ -103,20 +93,11 @@ namespace embree
  template<typename Index, typename Func>
    __forceinline void parallel_for_static( const Index N, const Func& func)
  {
-    #if TBB_INTERFACE_VERSION >= 12002
-      tbb::task_group_context context;
-      tbb::parallel_for(Index(0),N,Index(1),[&](Index i) {
-          func(i);
-        },tbb::simple_partitioner(),context);
-      if (context.is_group_execution_cancelled())
-        throw std::runtime_error("task cancelled");
-    #else
-      tbb::parallel_for(Index(0),N,Index(1),[&](Index i) {
-          func(i);
-        },tbb::simple_partitioner());
-      if (tbb::task::self().is_cancelled())
-        throw std::runtime_error("task cancelled");
-    #endif
+    tbb::parallel_for(Index(0),N,Index(1),[&](Index i) { 
+	func(i);
+      },tbb::simple_partitioner());
+    if (tbb::task::self().is_cancelled())
+      throw std::runtime_error("task cancelled");
  }

  typedef tbb::affinity_partitioner affinity_partitioner;
@@ -124,20 +105,11 @@ namespace embree
  template<typename Index, typename Func>
    __forceinline void parallel_for_affinity( const Index N, const Func& func, tbb::affinity_partitioner& ap)
  {
-    #if TBB_INTERFACE_VERSION >= 12002
-      tbb::task_group_context context;
-      tbb::parallel_for(Index(0),N,Index(1),[&](Index i) {
-          func(i);
-        },ap,context);
-      if (context.is_group_execution_cancelled())
-        throw std::runtime_error("task cancelled");
-    #else
-      tbb::parallel_for(Index(0),N,Index(1),[&](Index i) {
-          func(i);
-        },ap);
-      if (tbb::task::self().is_cancelled())
-        throw std::runtime_error("task cancelled");
-    #endif
+    tbb::parallel_for(Index(0),N,Index(1),[&](Index i) { 
+	func(i);
+      },ap);
+    if (tbb::task::self().is_cancelled())
+      throw std::runtime_error("task cancelled");
  }

 #else
@@ -0,0 +1,76 @@
+// ======================================================================== //
+// Copyright 2009-2017 Intel Corporation                                    //
+//                                                                          //
+// Licensed under the Apache License, Version 2.0 (the "License");          //
+// you may not use this file except in compliance with the License.         //
+// You may obtain a copy of the License at                                  //
+//                                                                          //
+//     http://www.apache.org/licenses/LICENSE-2.0                           //
+//                                                                          //
+// Unless required by applicable law or agreed to in writing, software      //
+// distributed under the License is distributed on an "AS IS" BASIS,        //
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. //
+// See the License for the specific language governing permissions and      //
+// limitations under the License.                                           //
+// ======================================================================== //
+
+#include "parallel_for_for.h"
+#include "../sys/regression.h"
+
+namespace embree
+{
+  struct parallel_for_for_regression_test : public RegressionTest
+  {
+    parallel_for_for_regression_test(const char* name) : RegressionTest(name) {
+      registerRegressionTest(this);
+    }
+    
+    bool run ()
+    {
+      bool passed = true;
+
+      /* create vector with random numbers */
+      size_t sum0 = 0;
+      size_t K = 0;
+      const size_t M = 1000;
+      std::vector<std::vector<size_t>* > array2(M);
+      for (size_t i=0; i<M; i++) {
+        const size_t N = rand() % 1024;
+        K+=N;
+        array2[i] = new std::vector<size_t>(N);
+        for (size_t j=0; j<N; j++) 
+          sum0 += (*array2[i])[j] = rand();
+      }
+
+      /* array to test global index */
+      std::vector<atomic<size_t>> verify_k(K);
+      for (size_t i=0; i<K; i++) verify_k[i].store(0);
+
+      /* add all numbers using parallel_for_for */
+      std::atomic<size_t> sum1(0);
+      parallel_for_for( array2, size_t(1), [&](std::vector<size_t>* v, const range<size_t>& r, size_t k) -> size_t
+      {
+        size_t s = 0;
+	for (size_t i=r.begin(); i<r.end(); i++) {
+	  s += (*v)[i];
+          verify_k[k++]++;
+        }
+        sum1 += s;
+	return sum1;
+      });
+      passed &= (sum0 == sum1);
+
+      /* check global index */
+      for (size_t i=0; i<K; i++) 
+        passed &= (verify_k[i] == 1);
+
+      /* delete vectors again */
+      for (size_t i=0; i<array2.size(); i++)
+	delete array2[i];
+      
+      return passed;
+    }
+  };
+
+  parallel_for_for_regression_test parallel_for_for_regression("parallel_for_for_regression_test");
+}
@@ -1,5 +1,18 @@
-// Copyright 2009-2021 Intel Corporation
-// SPDX-License-Identifier: Apache-2.0
+// ======================================================================== //
+// Copyright 2009-2017 Intel Corporation                                    //
+//                                                                          //
+// Licensed under the Apache License, Version 2.0 (the "License");          //
+// you may not use this file except in compliance with the License.         //
+// You may obtain a copy of the License at                                  //
+//                                                                          //
+//     http://www.apache.org/licenses/LICENSE-2.0                           //
+//                                                                          //
+// Unless required by applicable law or agreed to in writing, software      //
+// distributed under the License is distributed on an "AS IS" BASIS,        //
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. //
+// See the License for the specific language governing permissions and      //
+// limitations under the License.                                           //
+// ======================================================================== //

 #pragma once

@@ -22,7 +35,7 @@ namespace embree
  {
  public:

-    enum { MAX_TASKS = 64 };
+    enum { MAX_TASKS = 512 };

    __forceinline ParallelForForState () 
      : taskCount(0) {}
@@ -30,20 +43,15 @@ namespace embree
    template<typename ArrayArray>
      __forceinline ParallelForForState (ArrayArray& array2, const size_t minStepSize) {
      init(array2,minStepSize);
-    }
-
-    template<typename SizeFunc>
-    __forceinline ParallelForForState (const size_t numArrays, const SizeFunc& getSize, const size_t minStepSize) {
-      init(numArrays,getSize,minStepSize);
    } 

-    template<typename SizeFunc>
-    __forceinline void init ( const size_t numArrays, const SizeFunc& getSize, const size_t minStepSize )
+    template<typename ArrayArray>
+      __forceinline void init ( ArrayArray& array2, const size_t minStepSize )
    {
      /* first calculate total number of elements */
      size_t N = 0;
-      for (size_t i=0; i<numArrays; i++) {
-	N += getSize(i);
+      for (size_t i=0; i<array2.size(); i++) {
+	N += array2[i] ? array2[i]->size() : 0;
      }
      this->N = N;

@@ -59,8 +67,8 @@ namespace embree
      size_t k0 = (++taskIndex)*N/taskCount;
      for (size_t i=0, k=0; taskIndex < taskCount; i++) 
      {
-	assert(i<numArrays);
-	size_t j=0, M = getSize(i);
+	assert(i<array2.size());
+	size_t j=0, M = array2[i] ? array2[i]->size() : 0;
 	while (j<M && k+M-j >= k0 && taskIndex < taskCount) {
 	  assert(taskIndex<taskCount);
 	  i0[taskIndex] = i;
@@ -72,12 +80,6 @@ namespace embree
      }
    }

-    template<typename ArrayArray>
-      __forceinline void init ( ArrayArray& array2, const size_t minStepSize )
-    {
-      init(array2.size(),[&](size_t i) { return array2[i] ? array2[i]->size() : 0; },minStepSize);
-    }
-    
    __forceinline size_t size() const {
      return N;
    }
@@ -0,0 +1,98 @@
+// ======================================================================== //
+// Copyright 2009-2017 Intel Corporation                                    //
+//                                                                          //
+// Licensed under the Apache License, Version 2.0 (the "License");          //
+// you may not use this file except in compliance with the License.         //
+// You may obtain a copy of the License at                                  //
+//                                                                          //
+//     http://www.apache.org/licenses/LICENSE-2.0                           //
+//                                                                          //
+// Unless required by applicable law or agreed to in writing, software      //
+// distributed under the License is distributed on an "AS IS" BASIS,        //
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. //
+// See the License for the specific language governing permissions and      //
+// limitations under the License.                                           //
+// ======================================================================== //
+
+#include "parallel_for_for_prefix_sum.h"
+#include "../sys/regression.h"
+
+namespace embree
+{
+  struct parallel_for_for_prefix_sum_regression_test : public RegressionTest
+  {
+    parallel_for_for_prefix_sum_regression_test(const char* name) : RegressionTest(name) {
+      registerRegressionTest(this);
+    }
+    
+    bool run ()
+    {
+      bool passed = true;
+
+      /* create vector with random numbers */
+      const size_t M = 10;
+      std::vector<atomic<size_t>> flattened;
+      typedef std::vector<std::vector<size_t>* > ArrayArray;
+      ArrayArray array2(M);
+      size_t K = 0;
+      for (size_t i=0; i<M; i++) {
+        const size_t N = rand() % 10;
+        K += N;
+        array2[i] = new std::vector<size_t>(N);
+        for (size_t j=0; j<N; j++) 
+          (*array2[i])[j] = rand() % 10;
+      }
+  
+      /* array to test global index */
+      std::vector<atomic<size_t>> verify_k(K);
+      for (size_t i=0; i<K; i++) verify_k[i].store(0);
+
+      ParallelForForPrefixSumState<size_t> state(array2,size_t(1));
+  
+      /* dry run only counts */
+      size_t S = parallel_for_for_prefix_sum( state, array2, size_t(0), [&](std::vector<size_t>* v, const range<size_t>& r, size_t k, const size_t base) -> size_t
+      {
+        size_t s = 0;
+	for (size_t i=r.begin(); i<r.end(); i++) {
+          s += (*v)[i];
+          verify_k[k++]++;
+        }
+        return s;
+      }, [](size_t v0, size_t v1) { return v0+v1; });
+      
+      /* create properly sized output array */
+      flattened.resize(S);
+      for (auto& a : flattened) a.store(0);
+
+      /* now we actually fill the flattened array */
+      parallel_for_for_prefix_sum( state, array2, size_t(0), [&](std::vector<size_t>* v, const range<size_t>& r, size_t k, const size_t base) -> size_t
+      {
+        size_t s = 0;
+	for (size_t i=r.begin(); i<r.end(); i++) {
+          for (size_t j=0; j<(*v)[i]; j++) {
+            flattened[base+s+j]++;
+          }
+          s += (*v)[i];
+          verify_k[k++]++;
+        }
+        return s;
+      }, [](size_t v0, size_t v1) { return v0+v1; });
+
+      /* check global index */
+      for (size_t i=0; i<K; i++) 
+        passed &= (verify_k[i] == 2);
+
+      /* check if each element was assigned exactly once */
+      for (size_t i=0; i<flattened.size(); i++)
+        passed &= (flattened[i] == 1);
+      
+      /* delete arrays again */
+      for (size_t i=0; i<array2.size(); i++)
+	delete array2[i];
+
+      return passed;
+    }
+  };
+
+  parallel_for_for_prefix_sum_regression_test parallel_for_for_prefix_sum_regression("parallel_for_for_prefix_sum_regression_test");
+}
@@ -1,5 +1,18 @@
-// Copyright 2009-2021 Intel Corporation
-// SPDX-License-Identifier: Apache-2.0
+// ======================================================================== //
+// Copyright 2009-2017 Intel Corporation                                    //
+//                                                                          //
+// Licensed under the Apache License, Version 2.0 (the "License");          //
+// you may not use this file except in compliance with the License.         //
+// You may obtain a copy of the License at                                  //
+//                                                                          //
+//     http://www.apache.org/licenses/LICENSE-2.0                           //
+//                                                                          //
+// Unless required by applicable law or agreed to in writing, software      //
+// distributed under the License is distributed on an "AS IS" BASIS,        //
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. //
+// See the License for the specific language governing permissions and      //
+// limitations under the License.                                           //
+// ======================================================================== //

 #pragma once

@@ -17,20 +30,15 @@ namespace embree
      __forceinline ParallelForForPrefixSumState (ArrayArray& array2, const size_t minStepSize)
      : ParallelForForState(array2,minStepSize) {}

-    template<typename SizeFunc>
-    __forceinline ParallelForForPrefixSumState (size_t numArrays, const SizeFunc& getSize, const size_t minStepSize)
-      : ParallelForForState(numArrays,getSize,minStepSize) {}
-
    ParallelPrefixSumState<Value> prefix_state;
  };
  
-  template<typename SizeFunc, typename Index, typename Value, typename Func, typename Reduction>
-    __forceinline Value parallel_for_for_prefix_sum0_( ParallelForForPrefixSumState<Value>& state, Index minStepSize, 
-                                                       const SizeFunc& getSize, const Value& identity, const Func& func, const Reduction& reduction)
+  template<typename ArrayArray, typename Index, typename Value, typename Func, typename Reduction>
+    __forceinline Value parallel_for_for_prefix_sum( ParallelForForPrefixSumState<Value>& state, ArrayArray& array2, Index minStepSize, 
+						     const Value& identity, const Func& func, const Reduction& reduction)
  {
    /* calculate number of tasks to use */
    const size_t taskCount = state.taskCount;
-    
    /* perform parallel prefix sum */
    parallel_for(taskCount, [&](const size_t taskIndex)
    {
@@ -43,9 +51,9 @@ namespace embree
      size_t k=k0;
      Value N=identity;
      for (size_t i=i0; k<k1; i++) {
-	const size_t size = getSize(i);
+	const size_t size = array2[i] ? array2[i]->size() : 0;
        const size_t r0 = j0, r1 = min(size,r0+k1-k);
-        if (r1 > r0) N = reduction(N, func((Index)i,range<Index>((Index)r0,(Index)r1),(Index)k));
+        if (r1 > r0) N = reduction(N, func(array2[i],range<size_t>(r0,r1),k,reduction(state.prefix_state.sums[taskIndex],N)));
        k+=r1-r0; j0 = 0;
      }
      state.prefix_state.counts[taskIndex] = N;
@@ -63,80 +71,10 @@ namespace embree
    return sum;
  }

-  template<typename SizeFunc, typename Index, typename Value, typename Func, typename Reduction>
-    __forceinline Value parallel_for_for_prefix_sum1_( ParallelForForPrefixSumState<Value>& state, Index minStepSize, 
-                                                       const SizeFunc& getSize, 
-                                                       const Value& identity, const Func& func, const Reduction& reduction)
-  {
-    /* calculate number of tasks to use */
-    const size_t taskCount = state.taskCount;
-    /* perform parallel prefix sum */
-    parallel_for(taskCount, [&](const size_t taskIndex)
-    {
-      const size_t k0 = (taskIndex+0)*state.size()/taskCount;
-      const size_t k1 = (taskIndex+1)*state.size()/taskCount;
-      size_t i0 = state.i0[taskIndex];
-      size_t j0 = state.j0[taskIndex];
-
-      /* iterate over arrays */
-      size_t k=k0;
-      Value N=identity;
-      for (size_t i=i0; k<k1; i++) {
-	const size_t size = getSize(i);
-        const size_t r0 = j0, r1 = min(size,r0+k1-k);
-        if (r1 > r0) N = reduction(N, func((Index)i,range<Index>((Index)r0,(Index)r1),(Index)k,reduction(state.prefix_state.sums[taskIndex],N)));
-        k+=r1-r0; j0 = 0;
-      }
-      state.prefix_state.counts[taskIndex] = N;
-    });
-
-    /* calculate prefix sum */
-    Value sum=identity;
-    for (size_t i=0; i<taskCount; i++)
-    {
-      const Value c = state.prefix_state.counts[i];
-      state.prefix_state.sums[i] = sum;
-      sum=reduction(sum,c);
-    }
-
-    return sum;
-  }
-
-  template<typename ArrayArray, typename Index, typename Value, typename Func, typename Reduction>
-  __forceinline Value parallel_for_for_prefix_sum0( ParallelForForPrefixSumState<Value>& state,
-                                                    ArrayArray& array2, Index minStepSize, 
-                                                    const Value& identity, const Func& func, const Reduction& reduction)
-  {
-    return parallel_for_for_prefix_sum0_(state,minStepSize,
-                                        [&](Index i) { return array2[i] ? array2[i]->size() : 0; },
-                                        identity,
-                                        [&](Index i, const range<Index>& r, Index k) { return func(array2[i], r, k, i); },
-                                        reduction);
-  }
-
-  template<typename ArrayArray, typename Index, typename Value, typename Func, typename Reduction>
-  __forceinline Value parallel_for_for_prefix_sum1( ParallelForForPrefixSumState<Value>& state,
-                                                    ArrayArray& array2, Index minStepSize, 
-                                                    const Value& identity, const Func& func, const Reduction& reduction)
-  {
-    return parallel_for_for_prefix_sum1_(state,minStepSize,
-                                        [&](Index i) { return array2[i] ? array2[i]->size() : 0; },
-                                        identity,
-                                        [&](Index i, const range<Index>& r, Index k, const Value& base) { return func(array2[i], r, k, i, base); },
-                                        reduction);
-  }                                       
-
-  template<typename ArrayArray, typename Value, typename Func, typename Reduction>
-    __forceinline Value parallel_for_for_prefix_sum0( ParallelForForPrefixSumState<Value>& state, ArrayArray& array2, 
+   template<typename ArrayArray, typename Value, typename Func, typename Reduction>
+    __forceinline Value parallel_for_for_prefix_sum( ParallelForForPrefixSumState<Value>& state, ArrayArray& array2, 
 						     const Value& identity, const Func& func, const Reduction& reduction)
  {
-    return parallel_for_for_prefix_sum0(state,array2,size_t(1),identity,func,reduction);
-  }
-
-  template<typename ArrayArray, typename Value, typename Func, typename Reduction>
-    __forceinline Value parallel_for_for_prefix_sum1( ParallelForForPrefixSumState<Value>& state, ArrayArray& array2, 
-						     const Value& identity, const Func& func, const Reduction& reduction)
-  {
-    return parallel_for_for_prefix_sum1(state,array2,size_t(1),identity,func,reduction);
+    return parallel_for_for_prefix_sum(state,array2,size_t(1),identity,func,reduction);
  }
 }
@@ -0,0 +1,60 @@
+// ======================================================================== //
+// Copyright 2009-2017 Intel Corporation                                    //
+//                                                                          //
+// Licensed under the Apache License, Version 2.0 (the "License");          //
+// you may not use this file except in compliance with the License.         //
+// You may obtain a copy of the License at                                  //
+//                                                                          //
+//     http://www.apache.org/licenses/LICENSE-2.0                           //
+//                                                                          //
+// Unless required by applicable law or agreed to in writing, software      //
+// distributed under the License is distributed on an "AS IS" BASIS,        //
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. //
+// See the License for the specific language governing permissions and      //
+// limitations under the License.                                           //
+// ======================================================================== //
+
+#include "parallel_map.h"
+#include "../sys/regression.h"
+
+namespace embree
+{
+  struct parallel_map_regression_test : public RegressionTest
+  {
+    parallel_map_regression_test(const char* name) : RegressionTest(name) {
+      registerRegressionTest(this);
+    }
+    
+    bool run ()
+    {
+      bool passed = true;
+
+      /* create key/value vectors with random numbers */
+      const size_t N = 10000;
+      std::vector<uint32_t> keys(N);
+      std::vector<uint32_t> vals(N);
+      for (size_t i=0; i<N; i++) keys[i] = 2*unsigned(i)*647382649;
+      for (size_t i=0; i<N; i++) std::swap(keys[i],keys[rand()%N]);
+      for (size_t i=0; i<N; i++) vals[i] = 2*rand();
+      
+      /* create map */
+      parallel_map<uint32_t,uint32_t> map;
+      map.init(keys,vals);
+
+      /* check that all keys are properly mapped */
+      for (size_t i=0; i<N; i++) {
+        const uint32_t* val = map.lookup(keys[i]);
+        passed &= val && (*val == vals[i]);
+      }
+
+      /* check that these keys are not in the map */
+      for (size_t i=0; i<N; i++) {
+        passed &= !map.lookup(keys[i]+1);
+      }
+
+      return passed;
+    }
+  };
+
+  parallel_map_regression_test parallel_map_regression("parallel_map_regression_test");
+}
@@ -1,5 +1,18 @@
-// Copyright 2009-2021 Intel Corporation
-// SPDX-License-Identifier: Apache-2.0
+// ======================================================================== //
+// Copyright 2009-2017 Intel Corporation                                    //
+//                                                                          //
+// Licensed under the Apache License, Version 2.0 (the "License");          //
+// you may not use this file except in compliance with the License.         //
+// You may obtain a copy of the License at                                  //
+//                                                                          //
+//     http://www.apache.org/licenses/LICENSE-2.0                           //
+//                                                                          //
+// Unless required by applicable law or agreed to in writing, software      //
+// distributed under the License is distributed on an "AS IS" BASIS,        //
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. //
+// See the License for the specific language governing permissions and      //
+// limitations under the License.                                           //
+// ======================================================================== //

 #pragma once

@@ -0,0 +1,66 @@
+// ======================================================================== //
+// Copyright 2009-2017 Intel Corporation                                    //
+//                                                                          //
+// Licensed under the Apache License, Version 2.0 (the "License");          //
+// you may not use this file except in compliance with the License.         //
+// You may obtain a copy of the License at                                  //
+//                                                                          //
+//     http://www.apache.org/licenses/LICENSE-2.0                           //
+//                                                                          //
+// Unless required by applicable law or agreed to in writing, software      //
+// distributed under the License is distributed on an "AS IS" BASIS,        //
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. //
+// See the License for the specific language governing permissions and      //
+// limitations under the License.                                           //
+// ======================================================================== //
+
+#include "parallel_partition.h"
+#include "../sys/regression.h"
+
+namespace embree
+{
+  struct parallel_partition_regression_test : public RegressionTest
+  {
+    parallel_partition_regression_test(const char* name) : RegressionTest(name) {
+      registerRegressionTest(this);
+    }
+    
+    bool run ()
+    {
+      bool passed = true;
+
+      for (size_t i=0; i<100; i++)
+      {
+        /* create random permutation */
+        size_t N = std::rand() % 1000000;
+        std::vector<unsigned> array(N);
+        for (unsigned i=0; i<N; i++) array[i] = i;
+        for (auto& v : array) std::swap(v,array[std::rand()%array.size()]);
+        size_t split = std::rand() % (N+1);
+
+        /* perform parallel partitioning */
+        size_t left_sum = 0, right_sum = 0;
+        size_t mid = parallel_partitioning(array.data(),0,array.size(),0,left_sum,right_sum,
+                                           [&] ( size_t i ) { return i < split; },
+                                           []  ( size_t& sum, unsigned v) { sum += v; },
+                                           []  ( size_t& sum, size_t v) { sum += v; },
+                                           128);
+        
+        /*serial_partitioning(array.data(),0,array.size(),left_sum,right_sum,
+                            [&] ( size_t i ) { return i < split; },
+                            []  ( size_t& left_sum, int v) { left_sum += v; });*/
+
+        /* verify result */
+        passed &= mid == split;
+        passed &= left_sum == split*(split-1)/2;
+        passed &= right_sum == N*(N-1)/2-left_sum;
+        for (size_t i=0; i<split; i++) passed &= array[i] < split;
+        for (size_t i=split; i<N; i++) passed &= array[i] >= split;
+      }
+      
+      return passed;
+    }
+  };
+
+  parallel_partition_regression_test parallel_partition_regression("parallel_partition_regression_test");
+}
@@ -1,10 +1,23 @@
-// Copyright 2009-2021 Intel Corporation
-// SPDX-License-Identifier: Apache-2.0
+// ======================================================================== //
+// Copyright 2009-2017 Intel Corporation                                    //
+//                                                                          //
+// Licensed under the Apache License, Version 2.0 (the "License");          //
+// you may not use this file except in compliance with the License.         //
+// You may obtain a copy of the License at                                  //
+//                                                                          //
+//     http://www.apache.org/licenses/LICENSE-2.0                           //
+//                                                                          //
+// Unless required by applicable law or agreed to in writing, software      //
+// distributed under the License is distributed on an "AS IS" BASIS,        //
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. //
+// See the License for the specific language governing permissions and      //
+// limitations under the License.                                           //
+// ======================================================================== //

 #pragma once

 #include "parallel_for.h"
-#include "../math/range.h"
+#include "../common/math/range.h"

 namespace embree
 {
@@ -51,10 +64,10 @@ namespace embree
  template<typename T, typename V, typename Vi, typename IsLeft, typename Reduction_T, typename Reduction_V>
    class __aligned(64) parallel_partition_task
  {
-    ALIGNED_CLASS_(64);
+    ALIGNED_CLASS;
  private:

-    static const size_t MAX_TASKS = 64;
+    static const size_t MAX_TASKS = 512;

    T* array;
    size_t N;
@@ -175,8 +188,8 @@ namespace embree
      /* calculate all left and right ranges that are on the wrong global side */
      size_t numMisplacedRangesLeft  = 0;
      size_t numMisplacedRangesRight = 0;
-      size_t numMisplacedItemsLeft  MAYBE_UNUSED = 0;
-      size_t numMisplacedItemsRight MAYBE_UNUSED = 0;
+      size_t numMisplacedItemsLeft   = 0;
+      size_t numMisplacedItemsRight  = 0;

      for (size_t i=0; i<numTasks; i++)
      {	    
@@ -262,22 +275,4 @@ namespace embree
      return begin+p->partition(leftReduction,rightReduction);    
    }
  }
-
-
-  template<typename T, typename IsLeft>
-    inline size_t parallel_partitioning(T* array, 
-                                        const size_t begin,
-                                        const size_t end, 
-                                        const IsLeft& is_left, 
-                                        size_t BLOCK_SIZE = 128)
-  {
-    size_t leftReduction = 0;
-    size_t rightReduction = 0;
-    return parallel_partitioning(
-      array,begin,end,0,leftReduction,rightReduction,is_left,
-      [] (size_t& t,const T& ref) {  },
-      [] (size_t& t0,size_t& t1) { },
-      BLOCK_SIZE);
-  }
-
 }
@@ -0,0 +1,61 @@
+// ======================================================================== //
+// Copyright 2009-2017 Intel Corporation                                    //
+//                                                                          //
+// Licensed under the Apache License, Version 2.0 (the "License");          //
+// you may not use this file except in compliance with the License.         //
+// You may obtain a copy of the License at                                  //
+//                                                                          //
+//     http://www.apache.org/licenses/LICENSE-2.0                           //
+//                                                                          //
+// Unless required by applicable law or agreed to in writing, software      //
+// distributed under the License is distributed on an "AS IS" BASIS,        //
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. //
+// See the License for the specific language governing permissions and      //
+// limitations under the License.                                           //
+// ======================================================================== //
+
+#include "parallel_prefix_sum.h"
+#include "../sys/regression.h"
+
+namespace embree
+{
+  struct parallel_prefix_sum_regression_test : public RegressionTest
+  {
+    parallel_prefix_sum_regression_test(const char* name) : RegressionTest(name) {
+      registerRegressionTest(this);
+    }
+    
+    bool run ()
+    {
+      bool passed = true;
+      const size_t M = 10;
+      
+      for (size_t N=10; N<10000000; N=size_t(2.1*N))
+      {
+	/* initialize array with random numbers */
+        uint32_t sum0 = 0;
+	std::vector<uint32_t> src(N);
+	for (size_t i=0; i<N; i++) {
+	  sum0 += src[i] = rand();
+        }
+        
+	/* calculate parallel prefix sum */
+	std::vector<uint32_t> dst(N);
+	for (auto& v : dst) v = 0;
+	
+	for (size_t i=0; i<M; i++) {
+	  uint32_t sum1 = parallel_prefix_sum(src,dst,N,0,std::plus<uint32_t>());
+          passed &= (sum0 == sum1);
+        }
+        
+	/* check if prefix sum is correct */
+	for (size_t i=0, sum=0; i<N; sum+=src[i++])
+	  passed &= ((uint32_t)sum == dst[i]);
+      }
+      
+      return passed;
+    }
+  };
+
+  parallel_prefix_sum_regression_test parallel_prefix_sum_regression("parallel_prefix_sum_regression");
+}
@@ -1,5 +1,18 @@
-// Copyright 2009-2021 Intel Corporation
-// SPDX-License-Identifier: Apache-2.0
+// ======================================================================== //
+// Copyright 2009-2017 Intel Corporation                                    //
+//                                                                          //
+// Licensed under the Apache License, Version 2.0 (the "License");          //
+// you may not use this file except in compliance with the License.         //
+// You may obtain a copy of the License at                                  //
+//                                                                          //
+//     http://www.apache.org/licenses/LICENSE-2.0                           //
+//                                                                          //
+// Unless required by applicable law or agreed to in writing, software      //
+// distributed under the License is distributed on an "AS IS" BASIS,        //
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. //
+// See the License for the specific language governing permissions and      //
+// limitations under the License.                                           //
+// ======================================================================== //

 #pragma once

@@ -10,7 +23,7 @@ namespace embree
  template<typename Value>
    struct ParallelPrefixSumState 
  {
-    enum { MAX_TASKS = 64 };
+    enum { MAX_TASKS = 512 };
    Value counts[MAX_TASKS];
    Value sums  [MAX_TASKS];
  };
@@ -0,0 +1,62 @@
+// ======================================================================== //
+// Copyright 2009-2017 Intel Corporation                                    //
+//                                                                          //
+// Licensed under the Apache License, Version 2.0 (the "License");          //
+// you may not use this file except in compliance with the License.         //
+// You may obtain a copy of the License at                                  //
+//                                                                          //
+//     http://www.apache.org/licenses/LICENSE-2.0                           //
+//                                                                          //
+// Unless required by applicable law or agreed to in writing, software      //
+// distributed under the License is distributed on an "AS IS" BASIS,        //
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. //
+// See the License for the specific language governing permissions and      //
+// limitations under the License.                                           //
+// ======================================================================== //
+
+#include "parallel_reduce.h"
+#include "../sys/regression.h"
+
+namespace embree
+{
+  struct parallel_reduce_regression_test : public RegressionTest
+  {
+    parallel_reduce_regression_test(const char* name) : RegressionTest(name) {
+      registerRegressionTest(this);
+    }
+    
+    bool run ()
+    {
+      bool passed = true;
+
+      const size_t M = 10;
+      for (size_t N=10; N<10000000; N=size_t(2.1*N))
+      {
+        /* sequentially calculate sum of squares */
+        size_t sum0 = 0;
+        for (size_t i=0; i<N; i++) {
+          sum0 += i*i;
+        }
+
+        /* parallel calculation of sum of squares */
+        for (size_t m=0; m<M; m++)
+        {
+          size_t sum1 = parallel_reduce( size_t(0), size_t(N), size_t(1024), size_t(0), [&](const range<size_t>& r) -> size_t
+          {
+            size_t s = 0;
+            for (size_t i=r.begin(); i<r.end(); i++) 
+              s += i*i;
+            return s;
+          }, 
+          [](const size_t v0, const size_t v1) {
+            return v0+v1;
+          });
+          passed = sum0 == sum1;
+        }
+      }
+      return passed;
+    }
+  };
+
+  parallel_reduce_regression_test parallel_reduce_regression("parallel_reduce_regression_test");
+}
@@ -1,5 +1,18 @@
-// Copyright 2009-2021 Intel Corporation
-// SPDX-License-Identifier: Apache-2.0
+// ======================================================================== //
+// Copyright 2009-2017 Intel Corporation                                    //
+//                                                                          //
+// Licensed under the Apache License, Version 2.0 (the "License");          //
+// you may not use this file except in compliance with the License.         //
+// You may obtain a copy of the License at                                  //
+//                                                                          //
+//     http://www.apache.org/licenses/LICENSE-2.0                           //
+//                                                                          //
+// Unless required by applicable law or agreed to in writing, software      //
+// distributed under the License is distributed on an "AS IS" BASIS,        //
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. //
+// See the License for the specific language governing permissions and      //
+// limitations under the License.                                           //
+// ======================================================================== //

 #pragma once

@@ -26,8 +39,8 @@ namespace embree
    const Index threadCount = (Index) TaskScheduler::threadCount();
    taskCount = min(taskCount,threadCount,maxTasks);

-    /* parallel invocation of all tasks */
-    dynamic_large_stack_array(Value,values,taskCount,8192); // consumes at most 8192 bytes on the stack
+    /* parallel invokation of all tasks */
+    dynamic_large_stack_array(Value,values,taskCount,4096); // consumes at most 4096 bytes on the stack
    parallel_for(taskCount, [&](const Index taskIndex) {
        const Index k0 = first+(taskIndex+0)*(last-first)/taskCount;
        const Index k1 = first+(taskIndex+1)*(last-first)/taskCount;
@@ -43,7 +56,7 @@ namespace embree
  template<typename Index, typename Value, typename Func, typename Reduction>
    __forceinline Value parallel_reduce( const Index first, const Index last, const Index minStepSize, const Value& identity, const Func& func, const Reduction& reduction )
  {
-#if defined(TASKING_INTERNAL) && !defined(TASKING_TBB)
+#if defined(TASKING_INTERNAL)

    /* fast path for small number of iterations */
    Index taskCount = (last-first+minStepSize-1)/minStepSize;
@@ -53,22 +66,12 @@ namespace embree
    return parallel_reduce_internal(taskCount,first,last,minStepSize,identity,func,reduction);

 #elif defined(TASKING_TBB)
-  #if TBB_INTERFACE_VERSION >= 12002
-    tbb::task_group_context context;
-    const Value v = tbb::parallel_reduce(tbb::blocked_range<Index>(first,last,minStepSize),identity,
-      [&](const tbb::blocked_range<Index>& r, const Value& start) { return reduction(start,func(range<Index>(r.begin(),r.end()))); },
-      reduction,context);
-    if (context.is_group_execution_cancelled())
-      throw std::runtime_error("task cancelled");
-    return v;
-  #else
    const Value v = tbb::parallel_reduce(tbb::blocked_range<Index>(first,last,minStepSize),identity,
      [&](const tbb::blocked_range<Index>& r, const Value& start) { return reduction(start,func(range<Index>(r.begin(),r.end()))); },
      reduction);
    if (tbb::task::self().is_cancelled())
      throw std::runtime_error("task cancelled");
    return v;
-  #endif
 #else // TASKING_PPL
    struct AlignedValue
    {
@@ -0,0 +1,56 @@
+// ======================================================================== //
+// Copyright 2009-2017 Intel Corporation                                    //
+//                                                                          //
+// Licensed under the Apache License, Version 2.0 (the "License");          //
+// you may not use this file except in compliance with the License.         //
+// You may obtain a copy of the License at                                  //
+//                                                                          //
+//     http://www.apache.org/licenses/LICENSE-2.0                           //
+//                                                                          //
+// Unless required by applicable law or agreed to in writing, software      //
+// distributed under the License is distributed on an "AS IS" BASIS,        //
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. //
+// See the License for the specific language governing permissions and      //
+// limitations under the License.                                           //
+// ======================================================================== //
+
+#include "parallel_set.h"
+#include "../sys/regression.h"
+
+namespace embree
+{
+  struct parallel_set_regression_test : public RegressionTest
+  {
+    parallel_set_regression_test(const char* name) : RegressionTest(name) {
+      registerRegressionTest(this);
+    }
+    
+    bool run ()
+    {
+      bool passed = true;
+
+      /* create vector with random numbers */
+      const size_t N = 10000;
+      std::vector<uint32_t> unsorted(N);
+      for (size_t i=0; i<N; i++) unsorted[i] = 2*rand();
+      
+      /* created set from numbers */
+      parallel_set<uint32_t> sorted;
+      sorted.init(unsorted);
+
+      /* check that all elements are in the set */
+      for (size_t i=0; i<N; i++) {
+	passed &= sorted.lookup(unsorted[i]);
+      }
+
+      /* check that these elements are not in the set */
+      for (size_t i=0; i<N; i++) {
+	passed &= !sorted.lookup(unsorted[i]+1);
+      }
+
+      return passed;
+    }
+  };
+
+  parallel_set_regression_test parallel_set_regression("parallel_set_regression_test");
+}
@@ -1,5 +1,18 @@
-// Copyright 2009-2021 Intel Corporation
-// SPDX-License-Identifier: Apache-2.0
+// ======================================================================== //
+// Copyright 2009-2017 Intel Corporation                                    //
+//                                                                          //
+// Licensed under the Apache License, Version 2.0 (the "License");          //
+// you may not use this file except in compliance with the License.         //
+// You may obtain a copy of the License at                                  //
+//                                                                          //
+//     http://www.apache.org/licenses/LICENSE-2.0                           //
+//                                                                          //
+// Unless required by applicable law or agreed to in writing, software      //
+// distributed under the License is distributed on an "AS IS" BASIS,        //
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. //
+// See the License for the specific language governing permissions and      //
+// limitations under the License.                                           //
+// ======================================================================== //

 #pragma once

@@ -0,0 +1,63 @@
+// ======================================================================== //
+// Copyright 2009-2017 Intel Corporation                                    //
+//                                                                          //
+// Licensed under the Apache License, Version 2.0 (the "License");          //
+// you may not use this file except in compliance with the License.         //
+// You may obtain a copy of the License at                                  //
+//                                                                          //
+//     http://www.apache.org/licenses/LICENSE-2.0                           //
+//                                                                          //
+// Unless required by applicable law or agreed to in writing, software      //
+// distributed under the License is distributed on an "AS IS" BASIS,        //
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. //
+// See the License for the specific language governing permissions and      //
+// limitations under the License.                                           //
+// ======================================================================== //
+
+#include "parallel_sort.h"
+#include "../sys/regression.h"
+
+namespace embree
+{
+  template<typename Key>
+  struct RadixSortRegressionTest : public RegressionTest
+  {
+    RadixSortRegressionTest(const char* name) : RegressionTest(name) {
+      registerRegressionTest(this);
+    }
+    
+    bool run ()
+    {
+      bool passed = true;
+      const size_t M = 10;
+
+      for (size_t N=10; N<1000000; N=size_t(2.1*N))
+      {
+	std::vector<Key> src(N); memset(src.data(),0,N*sizeof(Key));
+	std::vector<Key> tmp(N); memset(tmp.data(),0,N*sizeof(Key));
+	for (size_t i=0; i<N; i++) src[i] = uint64_t(rand())*uint64_t(rand());
+	
+	/* calculate checksum */
+	Key sum0 = 0; for (size_t i=0; i<N; i++) sum0 += src[i];
+        
+	/* sort numbers */
+	for (size_t i=0; i<M; i++) {
+          radix_sort<Key>(src.data(),tmp.data(),N);
+        }
+	
+	/* calculate checksum */
+	Key sum1 = 0; for (size_t i=0; i<N; i++) sum1 += src[i];
+	if (sum0 != sum1) passed = false;
+        
+	/* check if numbers are sorted */
+	for (size_t i=1; i<N; i++)
+	  passed &= src[i-1] <= src[i];
+      }
+      
+      return passed;
+    }
+  };
+
+  RadixSortRegressionTest<uint32_t> test_u32("RadixSortRegressionTestU32");
+  RadixSortRegressionTest<uint64_t> test_u64("RadixSortRegressionTestU64");
+}
@@ -1,5 +1,18 @@
-// Copyright 2009-2021 Intel Corporation
-// SPDX-License-Identifier: Apache-2.0
+// ======================================================================== //
+// Copyright 2009-2017 Intel Corporation                                    //
+//                                                                          //
+// Licensed under the Apache License, Version 2.0 (the "License");          //
+// you may not use this file except in compliance with the License.         //
+// You may obtain a copy of the License at                                  //
+//                                                                          //
+//     http://www.apache.org/licenses/LICENSE-2.0                           //
+//                                                                          //
+// Unless required by applicable law or agreed to in writing, software      //
+// distributed under the License is distributed on an "AS IS" BASIS,        //
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. //
+// See the License for the specific language governing permissions and      //
+// limitations under the License.                                           //
+// ======================================================================== //

 #pragma once

@@ -253,7 +266,7 @@ namespace embree
  template<typename Ty, typename Key>
    class ParallelRadixSort
  {
-    static const size_t MAX_TASKS = 64;
+    static const size_t MAX_TASKS = 512;
    static const size_t BITS = 8;
    static const size_t BUCKETS = (1 << BITS);
    typedef unsigned int TyRadixCount[BUCKETS];
@@ -262,17 +275,10 @@ namespace embree
      static bool compare(const T& v0, const T& v1) {
      return (Key)v0 < (Key)v1;
    }
-
-  private:
-    ParallelRadixSort (const ParallelRadixSort& other) DELETED; // do not implement
-    ParallelRadixSort& operator= (const ParallelRadixSort& other) DELETED; // do not implement
-
    
  public:
-    ParallelRadixSort (Ty* const src, Ty* const tmp, const size_t N)
-      : radixCount(nullptr), src(src), tmp(tmp), N(N) {}
-
-    void sort(const size_t blockSize)
+    ParallelRadixSort (Ty* const src, Ty* const tmp, const size_t N, const size_t blockSize)
+      : radixCount(nullptr), src(src), tmp(tmp), N(N)
    {
      assert(blockSize > 0);
      
@@ -290,12 +296,6 @@ namespace embree
        tbbRadixSort(numThreads);
      }
    }
-
-    ~ParallelRadixSort()
-    {
-      alignedFree(radixCount); 
-      radixCount = nullptr;
-    }
    
  private:
    
@@ -320,7 +320,7 @@ namespace embree
 #pragma nounroll      
 #endif
      for (size_t i=startID; i<endID; i++) {
-#if defined(__64BIT__)
+#if defined(__X86_64__)
        const size_t index = ((size_t)(Key)src[i] >> (size_t)shift) & (size_t)mask;
 #else
        const Key index = ((Key)src[i] >> shift) & mask;
@@ -382,7 +382,7 @@ namespace embree
 #endif
      for (size_t i=startID; i<endID; i++) {
        const Ty elt = src[i];
-#if defined(__64BIT__)
+#if defined(__X86_64__)
        const size_t index = ((size_t)(Key)src[i] >> (size_t)shift) & (size_t)mask;
 #else
        const size_t index = ((Key)src[i] >> shift) & mask;
@@ -402,7 +402,7 @@ namespace embree
    
    void tbbRadixSort(const size_t numTasks)
    {
-      radixCount = (TyRadixCount*) alignedMalloc(MAX_TASKS*sizeof(TyRadixCount),64);
+      radixCount = (TyRadixCount*) alignedMalloc(MAX_TASKS*sizeof(TyRadixCount));
      
      if (sizeof(Key) == sizeof(uint32_t)) {
        tbbRadixIteration(0*BITS,0,src,tmp,numTasks);
@@ -421,6 +421,8 @@ namespace embree
        tbbRadixIteration(6*BITS,0,src,tmp,numTasks);
        tbbRadixIteration(7*BITS,1,tmp,src,numTasks);
      }
+      alignedFree(radixCount); 
+      radixCount = nullptr;
    }
    
  private:
@@ -433,13 +435,13 @@ namespace embree
  template<typename Ty>
    void radix_sort(Ty* const src, Ty* const tmp, const size_t N, const size_t blockSize = 8192)
  {
-    ParallelRadixSort<Ty,Ty>(src,tmp,N).sort(blockSize);
+    ParallelRadixSort<Ty,Ty>(src,tmp,N,blockSize);
  }
  
  template<typename Ty, typename Key>
    void radix_sort(Ty* const src, Ty* const tmp, const size_t N, const size_t blockSize = 8192)
  {
-    ParallelRadixSort<Ty,Key>(src,tmp,N).sort(blockSize);
+    ParallelRadixSort<Ty,Key>(src,tmp,N,blockSize);
  }
  
  template<typename Ty>
@@ -1,75 +0,0 @@
-## Copyright 2009-2021 Intel Corporation
-## SPDX-License-Identifier: Apache-2.0
-
-IF (NOT OPENIMAGEIO_ROOT)
-  SET(OPENIMAGEIO_ROOT $ENV{OPENIMAGEIO_ROOT})
-ENDIF()
-IF (NOT OPENIMAGEIO_ROOT)
-  SET(OPENIMAGEIO_ROOT $ENV{OPENIMAGEIOROOT})
-ENDIF()
-
-# detect changed OPENIMAGEIO_ROOT
-IF (NOT OPENIMAGEIO_ROOT STREQUAL OPENIMAGEIO_ROOT_LAST)
-  UNSET(OPENIMAGEIO_INCLUDE_DIR CACHE)
-  UNSET(OPENIMAGEIO_LIBRARY CACHE)
-ENDIF()
-
-set(OPENIMAGEIO_LIB_SUFFIX "")
-IF (WIN32)
-  IF (MSVC14)
-    SET(OPENIMAGEIO_LIB_SUFFIX "vc2015")
-  ELSEIF (MSVC12)
-    SET(OPENIMAGEIO_LIB_SUFFIX "vc2013")
-  ELSEIF (MSVC11)
-    SET(OPENIMAGEIO_LIB_SUFFIX "vc2012")
-  ELSEIF (MINGW)
-    IF (X64)
-      SET(OPENIMAGEIO_LIB_SUFFIX "mingw-w64")
-    # Who's ever going to build for 32bit??
-    ELSE ()
-      SET(OPENIMAGEIO_LIB_SUFFIX "mingw-w64")
-    ENDIF()
-  ENDIF()
-ENDIF ()
-
-FIND_PATH(OPENIMAGEIO_ROOT include/OpenImageIO/imageio.h
-  DOC "Root of OpenImageIO installation"
-  HINTS ${OPENIMAGEIO_ROOT}
-  PATHS
-    "${PROJECT_SOURCE_DIR}/oiio"
-    /usr/local
-    /usr
-    /
-)
-
-FIND_PATH(OPENIMAGEIO_INCLUDE_DIR OpenImageIO/imageio.h PATHS ${OPENIMAGEIO_ROOT}/include NO_DEFAULT_PATH)
-SET(OPENIMAGEIO_HINTS
-  HINTS
-    ${OPENIMAGEIO_ROOT}
-  PATH_SUFFIXES
-    /lib
-    /lib64
-    /lib-${OPENIMAGEIO_LIB_SUFFIX}
-  )
-SET(OPENIMAGEIO_PATHS PATHS /usr/lib /usr/lib64 /lib /lib64)
-FIND_LIBRARY(OPENIMAGEIO_LIBRARY OpenImageIO ${OPENIMAGEIO_HINTS} ${OPENIMAGEIO_PATHS})
-
-SET(OPENIMAGEIO_ROOT_LAST ${OPENIMAGEIO_ROOT} CACHE INTERNAL "Last value of OPENIMAGEIO_ROOT to detect changes")
-
-SET(OPENIMAGEIO_ERROR_MESSAGE "OpenImageIO not found in your environment. You can 1) install
-                              via your OS package manager, or 2) install it
-                              somewhere on your machine and point OPENIMAGEIO_ROOT to it.")
-
-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenImageIO
-  ${OPENIMAGEIO_ERROR_MESSAGE}
-  OPENIMAGEIO_INCLUDE_DIR OPENIMAGEIO_LIBRARY
-)
-
-IF (OPENIMAGEIO_FOUND)
-  SET(OPENIMAGEIO_INCLUDE_DIRS ${OPENIMAGEIO_INCLUDE_DIR})
-  SET(OPENIMAGEIO_LIBRARIES ${OPENIMAGEIO_LIBRARY})
-ENDIF()
-
-MARK_AS_ADVANCED(OPENIMAGEIO_INCLUDE_DIR)
-MARK_AS_ADVANCED(OPENIMAGEIO_LIBRARY)
@@ -1,5 +1,18 @@
-## Copyright 2009-2021 Intel Corporation
-## SPDX-License-Identifier: Apache-2.0
+## ======================================================================== ##
+## Copyright 2009-2017 Intel Corporation                                    ##
+##                                                                          ##
+## Licensed under the Apache License, Version 2.0 (the "License");          ##
+## you may not use this file except in compliance with the License.         ##
+## You may obtain a copy of the License at                                  ##
+##                                                                          ##
+##     http://www.apache.org/licenses/LICENSE-2.0                           ##
+##                                                                          ##
+## Unless required by applicable law or agreed to in writing, software      ##
+## distributed under the License is distributed on an "AS IS" BASIS,        ##
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ##
+## See the License for the specific language governing permissions and      ##
+## limitations under the License.                                           ##
+## ======================================================================== ##

 FIND_PATH( PNG_INCLUDE_DIR NAMES png.h )
 FIND_LIBRARY( PNG_LIBRARIES NAMES png )
@@ -1,482 +1,110 @@
-## Copyright 2009-2021 Intel Corporation
-## SPDX-License-Identifier: Apache-2.0
-
-#===============================================================================
-# This script will attempt to find TBB and set up a TBB target.
-#
-# The user may specify a version and lists of required and optional components:
-#
-# find_package(TBB 2017.0 EXACT REQUIRED
-#              tbb tbbmalloc
-#              OPTIONAL_COMPONENTS tbbmalloc_proxy
-#              QUIET)
-#
-# If this target exists already, the script will attempt to re-use it, but fail
-# if version or components do not match the user-specified requirements.
-#
-# If all the required component targets (e.g. TBB::tbb) exist, the script will
-# attempt to create a target TBB and link existing component targets to it.
-# It will fail if the component target version does not match the user-specified
-# requirements.
-#
-# The user may specify the following variables to help the search process:
-# - TBB_ROOT
-# - TBB_INCLUDE_DIR
-#
-# After the script has run successfully, there is a target TBB, as well as
-# component targets TBB::<COMPONENT>, e.g. TBB::tbbmalloc.
-#
-# The targets will attempt to link to release versions of TBB in release mode,
-# and debug versions in debug mode.
-#
-# In addition to the targets, the script defines:
-#
-# TBB_FOUND
-# TBB_INCLUDE_DIRS
-#
-#===============================================================================
-
-# We use INTERFACE libraries, which are only supported in 3.x
-cmake_minimum_required(VERSION 3.10)
-
-# These two are used to automatically find the root and include directories.
-set(_TBB_INCLUDE_SUBDIR "include")
-set(_TBB_HEADER "tbb/tbb.h")
-
-# Initialize cache variable; but use existing non-cache variable as the default,
-# and fall back to the environment variable.
-if (NOT TBB_ROOT)
-  set(TBB_ROOT "$ENV{TBB_ROOT}")
-endif()
-
-set(TBB_ROOT "${TBB_ROOT}" CACHE PATH "The root path of TBB.")
-
-#===============================================================================
-# Error messages that respect the user's wishes about peace and quiet.
-#===============================================================================
-
-function(rk_tbb_status)
-  if (NOT TBB_FIND_QUIETLY)
-    message(STATUS "${ARGV}")
-  endif()
-endfunction()
-
-function(rk_tbb_warning)
-  if (NOT TBB_FIND_QUIETLY)
-    message(WARNING "${ARGV}")
-  endif()
-endfunction()
-
-macro(rk_tbb_error)
-  if (TBB_FIND_REQUIRED)
-    message(FATAL_ERROR "${ARGV}")
-  else()
-    rk_tbb_warning("${ARGV}")
-  endif()
-  return()
-endmacro()
-
-#===============================================================================
-# Extract a list of required and optional components.
-#===============================================================================
-
-macro(rk_tbb_list_components)
-  # cmake provides the TBB_FIND_COMPONENTS and
-  # TBB_FIND_REQUIRED_<C> variables based on the invocation
-  # of find_package.
-  if (TBB_FIND_COMPONENTS STREQUAL "")
-    set(_REQUIRED_COMPONENTS "tbb")
-    set(_OPTIONAL_COMPONENTS "tbbmalloc"
-                             "tbbmalloc_proxy"
-                             "tbbbind"
-                             "tbbpreview")
-  else()
-    set(_REQUIRED_COMPONENTS "")
-    set(_OPTIONAL_COMPONENTS "")
-    foreach (C IN LISTS TBB_FIND_COMPONENTS)
-      if (${TBB_FIND_REQUIRED_${C}})
-        list(APPEND _REQUIRED_COMPONENTS ${C})
-      else()
-        list(APPEND _OPTIONAL_COMPONENTS ${C})
-      endif()
-    endforeach()
-  endif()
-
-  rk_tbb_status("Looking for TBB components ${_REQUIRED_COMPONENTS}"
-                " (${_OPTIONAL_COMPONENTS})")
-endmacro()
-
-#===============================================================================
-# List components that are available, and check if any REQUIRED components
-# are missing.
-#===============================================================================
-
-macro(rk_tbb_check_components)
-  set(_TBB_MISSING_COMPONENTS "")
-  set(_TBB_AVAILABLE_COMPONENTS "")
-
-  foreach (C IN LISTS _REQUIRED_COMPONENTS)
-    if (TARGET TBB::${C})
-      list(APPEND _TBB_AVAILABLE_COMPONENTS ${C})
-    else()
-      list(APPEND _TBB_MISSING_COMPONENTS ${C})
-    endif()
-  endforeach()
-
-  foreach (C IN LISTS _OPTIONAL_COMPONENTS)
-    if (TARGET TBB::${C})
-      list(APPEND _TBB_AVAILABLE_COMPONENTS ${C})
-    endif()
-  endforeach()
-endmacro()
-
-#===============================================================================
-# Check the version of the TBB root we found.
-#===============================================================================
-
-macro(rk_tbb_check_version)
-  # Extract the version we found in our root.
-  if(EXISTS "${TBB_INCLUDE_DIR}/oneapi/tbb/version.h")
-    set(_TBB_VERSION_HEADER "oneapi/tbb/version.h")
-  elseif(EXISTS "${TBB_INCLUDE_DIR}/tbb/tbb_stddef.h")
-    set(_TBB_VERSION_HEADER "tbb/tbb_stddef.h")
-  elseif(EXISTS "${TBB_INCLUDE_DIR}/tbb/version.h")
-    set(_TBB_VERSION_HEADER "tbb/version.h")
-  else()
-    rk_tbb_error("Missing TBB version information. Could not find"
-      "tbb/tbb_stddef.h or tbb/version.h in ${TBB_INCLUDE_DIR}")
-  endif()
-  file(READ "${TBB_INCLUDE_DIR}/${_TBB_VERSION_HEADER}" VERSION_HEADER_CONTENT)
-  string(REGEX MATCH "#define TBB_VERSION_MAJOR ([0-9]+)" DUMMY "${VERSION_HEADER_CONTENT}")
-  set(TBB_VERSION_MAJOR ${CMAKE_MATCH_1})
-  string(REGEX MATCH "#define TBB_VERSION_MINOR ([0-9]+)" DUMMY "${VERSION_HEADER_CONTENT}")
-  set(TBB_VERSION_MINOR ${CMAKE_MATCH_1})
-  set(TBB_VERSION "${TBB_VERSION_MAJOR}.${TBB_VERSION_MINOR}")
-  set(TBB_VERSION_STRING "${TBB_VERSION}")
-
-  # If the user provided information about required versions, check them!
-  if (TBB_FIND_VERSION)
-    if (${TBB_FIND_VERSION_EXACT} AND NOT
-        TBB_VERSION VERSION_EQUAL ${TBB_FIND_VERSION})
-      rk_tbb_error("Requested exact TBB version ${TBB_FIND_VERSION},"
-        " but found ${TBB_VERSION}")
-    elseif(TBB_VERSION VERSION_LESS ${TBB_FIND_VERSION})
-      rk_tbb_error("Requested minimum TBB version ${TBB_FIND_VERSION},"
-        " but found ${TBB_VERSION}")
-    endif()
-  endif()
-
-  rk_tbb_status("Found TBB version ${TBB_VERSION} at ${TBB_ROOT}")
-endmacro()
-
-#===============================================================================
-# Reuse existing targets.
-# NOTE: This must be a macro, as we rely on return() to exit this script.
-#===============================================================================
-
-macro(rk_tbb_reuse_existing_target_components)
-  rk_tbb_check_components()
-
-  if (_TBB_MISSING_COMPONENTS STREQUAL "")
-    rk_tbb_status("Found existing TBB component targets: ${_TBB_AVAILABLE_COMPONENTS}")
-
-    # Get TBB_INCLUDE_DIR if not already set to check for the version of the
-    # existing component targets (making the assumption that they all have
-    # the same version)
-    if (NOT TBB_INCLUDE_DIR)
-      list(GET _TBB_AVAILABLE_COMPONENTS 0 first_target)
-      get_target_property(TBB_INCLUDE_DIR TBB::${first_target} INTERFACE_INCLUDE_DIRECTORIES)
-      foreach(TGT IN LISTS _TBB_AVAILABLE_COMPONENTS)
-        get_target_property(_TGT_INCLUDE_DIR TBB::${TGT} INTERFACE_INCLUDE_DIRECTORIES)
-        if (NOT _TGT_INCLUDE_DIR STREQUAL "${TBB_INCLUDE_DIR}")
-          rk_tbb_error("Existing TBB component targets have inconsistent include directories.")
-        endif()
-      endforeach()
-    endif()
-
-    find_path(TBB_INCLUDE_DIR
-      NAMES "${_TBB_HEADER}"
-      PATHS "${TBB_INCLUDE_DIRS}")
-
-    # Extract TBB_ROOT from the include path so that rk_tbb_check_version
-    # prints the correct tbb location
-    string(REPLACE "/${_TBB_INCLUDE_SUBDIR}" "" TBB_ROOT "${TBB_INCLUDE_DIR}")
-    rk_tbb_check_version()
-
-    # Add target TBB and link all available components
-    if (NOT TARGET TBB)
-      add_library(TBB INTERFACE)
-      foreach(C IN LISTS _TBB_AVAILABLE_COMPONENTS)
-        target_link_libraries(TBB INTERFACE TBB::${C})
-      endforeach()
-    endif()
-    set(TBB_FOUND TRUE)
-    set(TBB_INCLUDE_DIRS "${TBB_INCLUDE_DIR}")
-    return()
-  elseif ((TARGET TBB) OR (NOT _TBB_AVAILABLE_COMPONENTS STREQUAL ""))
-    rk_tbb_error("Ignoring existing TBB targets because required components are missing: ${_TBB_MISSING_COMPONENTS}")
-  endif()
-endmacro()
-
-
-#===============================================================================
-# Find the root directory if a manual override is not specified.
-# Sets TBB_ROOT in the parent scope, but does not check for failure.
-#===============================================================================
-
-function(rk_tbb_find_root)
-  if (NOT TBB_ROOT OR TBB_ROOT STREQUAL "")
-    set(TBB_HINTS "")
-    set(TBB_PATHS "")
-
-    if (WIN32)
-      # workaround for parentheses in variable name / CMP0053
-      set(PROGRAMFILESx86 "PROGRAMFILES(x86)")
-      set(PROGRAMFILES32 "$ENV{${PROGRAMFILESx86}}")
-      if(NOT PROGRAMFILES32)
-        set(PROGRAMFILES32 "$ENV{PROGRAMFILES}")
-      endif()
-      if(NOT PROGRAMFILES32)
-        set(PROGRAMFILES32 "C:/Program Files (x86)")
-      endif()
-      set(TBB_PATHS
-          "${PROJECT_SOURCE_DIR}/../tbb"
-          "${PROGRAMFILES32}/IntelSWTools/compilers_and_libraries/windows/tbb"
-          "${PROGRAMFILES32}/Intel/Composer XE/tbb"
-          "${PROGRAMFILES32}/Intel/compilers_and_libraries/windows/tbb")
-    else()
-      set(TBB_HINTS "/usr/local")
-      set(TBB_PATHS
-          "${PROJECT_SOURCE_DIR}/tbb"
-          "/opt/intel/composerxe/tbb"
-          "/opt/intel/compilers_and_libraries/tbb"
-          "/opt/intel/compilers_and_libraries/linux/tbb"
-          "/opt/intel/tbb")
-    endif()
-
-    set(TBB_ROOT "TBB_ROOT-NOTFOUND")
-    find_path(TBB_ROOT
-      NAMES "${_TBB_INCLUDE_SUBDIR}/${_TBB_HEADER}"
-      HINTS ${TBB_HINTS}
-      PATHS ${TBB_PATHS}
-      NO_PACKAGE_ROOT_PATH)
-  endif()
-endfunction()
-
-#===============================================================================
-# Find the include directory if a manual override is not specified.
-# Assumes TBB_ROOT to be set.
-#===============================================================================
-
-function(rk_tbb_find_include_directory)
-  find_path(TBB_INCLUDE_DIR
-    NAMES "${_TBB_HEADER}"
-    HINTS "${TBB_ROOT}/${_TBB_INCLUDE_SUBDIR}"
-    NO_PACKAGE_ROOT_PATH)
-endfunction()
-
-#===============================================================================
-# Find a specific library and create a target for it.
-#===============================================================================
-
-function(rk_tbb_find_library COMPONENT_NAME BUILD_CONFIG)
-  set(LIB_VAR "${COMPONENT_NAME}_LIBRARY_${BUILD_CONFIG}")
-  set(BIN_DIR_VAR "${COMPONENT_NAME}_BIN_DIR_${BUILD_CONFIG}")
-  set(DLL_VAR "${COMPONENT_NAME}_DLL_${BUILD_CONFIG}")
-  if (BUILD_CONFIG STREQUAL "DEBUG")
-    set(LIB_NAME "${COMPONENT_NAME}_debug")
-  else()
-    set(LIB_NAME "${COMPONENT_NAME}")
-  endif()
-
-  unset(LIB_PATHS)
-
-  if (WIN32)
-    if(CMAKE_SIZEOF_VOID_P EQUAL 8)
-      set(TBB_ARCH intel64)
-    else()
-      set(TBB_ARCH ia32)
-    endif()
-
-    if(MSVC10)
-      set(TBB_VCVER vc10)
-    elseif(MSVC11)
-      set(TBB_VCVER vc11)
-    elseif(MSVC12)
-      set(TBB_VCVER vc12)
-    else()
-      set(TBB_VCVER vc14)
-    endif()
-
-    set(LIB_PATHS
-      ${TBB_ROOT}/lib/${TBB_ARCH}/${TBB_VCVER}
-      ${TBB_ROOT}/lib
-    )
-
-    # On window, also search the DLL so that the client may install it.
-    set(DLL_NAME "${LIB_NAME}.dll")
-
-    # lib name with version suffix to handle oneTBB tbb12.dll
-    set(LIB_NAME_VERSION "") 
-    if (${COMPONENT_NAME} STREQUAL "tbb")
-      if (BUILD_CONFIG STREQUAL "DEBUG")
-        set(LIB_NAME_VERSION "tbb12_debug")
-      else()
-        set(LIB_NAME_VERSION "tbb12")
-      endif()
-    endif()
-    set(DLL_NAME_VERSION "${LIB_NAME_VERSION}.dll")
-
-    find_file(BIN_FILE
-      NAMES ${DLL_NAME} ${DLL_NAME_VERSION}
-      PATHS
-        "${TBB_ROOT}/bin/${TBB_ARCH}/${TBB_VCVER}"
-        "${TBB_ROOT}/bin"
-        "${TBB_ROOT}/redist/${TBB_ARCH}/${TBB_VCVER}"
-        "${TBB_ROOT}/../redist/${TBB_ARCH}/tbb/${TBB_VCVER}"
-        "${TBB_ROOT}/../redist/${TBB_ARCH}_win/tbb/${TBB_VCVER}"
-      NO_DEFAULT_PATH)
-    get_filename_component(${BIN_DIR_VAR} ${BIN_FILE} DIRECTORY)
-    set(${DLL_VAR} "${BIN_FILE}" CACHE PATH "${COMPONENT_NAME} ${BUILD_CONFIG} dll path")
-  elseif(APPLE)
-    set(LIB_PATHS ${TBB_ROOT}/lib)
-  else()
-    file(GLOB LIB_PATHS PATHS ${TBB_ROOT}/lib/intel64/gcc*)
-    list(REVERSE LIB_PATHS)
-    list(APPEND LIB_PATHS
-      ${TBB_ROOT}/lib
-      ${TBB_ROOT}/lib/x86_64-linux-gnu
-      ${TBB_ROOT}/lib64
-      ${TBB_ROOT}/libx86_64-linux-gnu)
-  endif()
-
-  # We prefer finding the versioned file on Unix so that the library path
-  # variable will not point to a symlink. This makes installing TBB as a
-  # dependency easier.
-  if (UNIX)
-    set(LIB_NAME lib${LIB_NAME}.so.2 ${LIB_NAME})
-  endif()
-
-  find_library(${LIB_VAR}
-    NAMES ${LIB_NAME}
-    PATHS ${LIB_PATHS}
-    NO_DEFAULT_PATH)
-
-  # Hide this variable if we found something, otherwise display it for
-  # easy override.
-  if(${LIB_VAR})
-    mark_as_advanced(${LIB_VAR})
-  endif()
-  if(${BIN_DIR_VAR})
-    mark_as_advanced(${BIN_DIR_VAR})
-  endif()
-  if(${DLL_VAR})
-    mark_as_advanced(${DLL_VAR})
-  endif()
-endfunction()
-
-#===============================================================================
-# Find the given component.
-# This macro attempts to find both release and debug versions, and falls back
-# appropriately if only one can be found.
-# On success, it creates a target ${TARGET}::${COMPONENT_NAME} and links
-# it to the overall ${TARGET}.
-#
-# For more information on the variables set here, see
-# https://cmake.org/cmake/help/v3.17/manual/cmake-developer.7.html#a-sample-find-module
-#===============================================================================
-
-function(rk_tbb_find_and_link_component COMPONENT_NAME)
-  set(COMPONENT_TARGET "TBB::${COMPONENT_NAME}")
-
-  rk_tbb_find_library("${COMPONENT_NAME}" RELEASE)
-  rk_tbb_find_library("${COMPONENT_NAME}" DEBUG)
-
-  if (${COMPONENT_NAME}_LIBRARY_RELEASE OR ${COMPONENT_NAME}_LIBRARY_DEBUG)
-    # Note: We *must* use SHARED here rather than UNKNOWN as our
-    #       IMPORTED_NO_SONAME trick a few lines down does not work with
-    #       UNKNOWN.
-    add_library(${COMPONENT_TARGET} SHARED IMPORTED)
-
-    if (${COMPONENT_NAME}_LIBRARY_RELEASE)
-      set_property(TARGET ${COMPONENT_TARGET} APPEND PROPERTY
-        IMPORTED_CONFIGURATIONS RELEASE)
-      if(WIN32)
-        set_target_properties(${COMPONENT_TARGET} PROPERTIES
-          IMPORTED_LOCATION_RELEASE "${${COMPONENT_NAME}_DLL_RELEASE}")
-        set_target_properties(${COMPONENT_TARGET} PROPERTIES
-          IMPORTED_IMPLIB_RELEASE "${${COMPONENT_NAME}_LIBRARY_RELEASE}")
-      else()
-        set_target_properties(${COMPONENT_TARGET} PROPERTIES
-          IMPORTED_LOCATION_RELEASE "${${COMPONENT_NAME}_LIBRARY_RELEASE}")
-      endif()
-    endif()
-
-    if (${COMPONENT_NAME}_LIBRARY_DEBUG)
-      set_property(TARGET ${COMPONENT_TARGET} APPEND PROPERTY
-        IMPORTED_CONFIGURATIONS DEBUG)
-      if(WIN32)
-        set_target_properties(${COMPONENT_TARGET} PROPERTIES
-          IMPORTED_LOCATION_DEBUG "${${COMPONENT_NAME}_DLL_DEBUG}")
-        set_target_properties(${COMPONENT_TARGET} PROPERTIES
-          IMPORTED_IMPLIB_DEBUG "${${COMPONENT_NAME}_LIBRARY_DEBUG}")
-      else()
-        set_target_properties(${COMPONENT_TARGET} PROPERTIES
-          IMPORTED_LOCATION_DEBUG "${${COMPONENT_NAME}_LIBRARY_DEBUG}")
-      endif()
-    endif()
-
-    set_target_properties(${COMPONENT_TARGET} PROPERTIES
-      INTERFACE_INCLUDE_DIRECTORIES "${TBB_INCLUDE_DIR}"
-      INTERFACE_COMPILE_DEFINITIONS "__TBB_NO_IMPLICIT_LINKAGE=1"
-    )
-
-
-    if(NOT WIN32)
-      # Note: IMPORTED_NO_SONAME must be set or cmake will attempt
-      #       to link to the full path of libtbb.so. Instead, we
-      #       rely on the linker to find libtbb.so.2.
-      set_target_properties(${COMPONENT_TARGET} PROPERTIES
-        IMPORTED_NO_SONAME TRUE
-      )
-    endif()
-
-    target_link_libraries(TBB INTERFACE ${COMPONENT_TARGET})
-  endif()
-endfunction()
-
-#===============================================================================
-
-# Note: The order of these is important.
-#       Some of these macros create variables that are used in later calls.
-rk_tbb_list_components()
-rk_tbb_reuse_existing_target_components()
-
-rk_tbb_find_root()
-if (NOT EXISTS "${TBB_ROOT}")
-  rk_tbb_error("Unable to find root directory ${TBB_ROOT}")
-endif()
-mark_as_advanced(TBB_ROOT) # Hide, we found something.
-
-rk_tbb_find_include_directory()
-if (NOT EXISTS "${TBB_INCLUDE_DIR}")
-  rk_tbb_error("Unable to find include directory ${TBB_INCLUDE_DIR}")
-endif()
-mark_as_advanced(TBB_INCLUDE_DIR) # Hide, we found something.
-
-rk_tbb_check_version()
-
-add_library(TBB INTERFACE)
-
-foreach(C IN LISTS _REQUIRED_COMPONENTS _OPTIONAL_COMPONENTS)
-  rk_tbb_find_and_link_component(${C})
-endforeach()
-
-rk_tbb_check_components()
-if (_TBB_MISSING_COMPONENTS)
-  rk_tbb_error("Cannot find required components: "
-               "${_TBB_MISSING_COMPONENTS}")
-endif()
-
-set(TBB_FOUND TRUE)
-set(TBB_INCLUDE_DIRS "${TBB_INCLUDE_DIR}")
+## ======================================================================== ##
+## Copyright 2009-2017 Intel Corporation                                    ##
+##                                                                          ##
+## Licensed under the Apache License, Version 2.0 (the "License");          ##
+## you may not use this file except in compliance with the License.         ##
+## You may obtain a copy of the License at                                  ##
+##                                                                          ##
+##     http://www.apache.org/licenses/LICENSE-2.0                           ##
+##                                                                          ##
+## Unless required by applicable law or agreed to in writing, software      ##
+## distributed under the License is distributed on an "AS IS" BASIS,        ##
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ##
+## See the License for the specific language governing permissions and      ##
+## limitations under the License.                                           ##
+## ======================================================================== ##
+
+IF (WIN32)
+  FIND_PATH(EMBREE_TBB_ROOT include/tbb/tbb.h
+    DOC "Root of TBB installation"
+    PATHS ${PROJECT_SOURCE_DIR}/tbb "C:/Program Files (x86)/Intel/Composer XE/tbb"
+    NO_DEFAULT_PATH
+  )
+  FIND_PATH(EMBREE_TBB_ROOT include/tbb/tbb.h)
+
+  IF (CMAKE_SIZEOF_VOID_P EQUAL 8)
+    SET(TBB_ARCH intel64)
+  ELSE()
+    SET(TBB_ARCH ia32)
+  ENDIF()
+
+  IF (MSVC10)
+    SET(TBB_VCVER vc10)
+  ELSEIF (MSVC11)
+    SET(TBB_VCVER vc11)
+  ELSE()
+    SET(TBB_VCVER vc12)
+  ENDIF()
+
+  SET(TBB_LIBDIR ${EMBREE_TBB_ROOT}/lib/${TBB_ARCH}/${TBB_VCVER})
+  SET(TBB_BINDIR ${EMBREE_TBB_ROOT}/bin/${TBB_ARCH}/${TBB_VCVER})
+
+  IF (EMBREE_TBB_ROOT STREQUAL "")
+    FIND_PATH(TBB_INCLUDE_DIR tbb/task_scheduler_init.h)
+    FIND_LIBRARY(TBB_LIBRARY tbb)
+    FIND_LIBRARY(TBB_LIBRARY_MALLOC tbbmalloc)
+  ELSE()
+    SET(TBB_INCLUDE_DIR TBB_INCLUDE_DIR-NOTFOUND)
+    SET(TBB_LIBRARY TBB_LIBRARY-NOTFOUND)
+    SET(TBB_LIBRARY_MALLOC TBB_LIBRARY_MALLOC-NOTFOUND)
+    FIND_PATH(TBB_INCLUDE_DIR tbb/task_scheduler_init.h PATHS ${EMBREE_TBB_ROOT}/include NO_DEFAULT_PATH)
+    FIND_LIBRARY(TBB_LIBRARY tbb PATHS ${TBB_LIBDIR} NO_DEFAULT_PATH)
+    FIND_LIBRARY(TBB_LIBRARY_MALLOC tbbmalloc PATHS ${TBB_LIBDIR} NO_DEFAULT_PATH)
+  ENDIF()
+
+ELSE ()
+
+  FIND_PATH(EMBREE_TBB_ROOT include/tbb/tbb.h
+    DOC "Root of TBB installation"
+    PATHS ${PROJECT_SOURCE_DIR}/tbb /opt/intel/composerxe/tbb 
+    NO_DEFAULT_PATH
+  )
+  FIND_PATH(EMBREE_TBB_ROOT include/tbb/tbb.h)
+
+  IF (EMBREE_TBB_ROOT STREQUAL "")
+    FIND_PATH(TBB_INCLUDE_DIR tbb/task_scheduler_init.h)
+    FIND_LIBRARY(TBB_LIBRARY tbb)
+    FIND_LIBRARY(TBB_LIBRARY_MALLOC tbbmalloc)
+  ELSE()
+    SET(TBB_INCLUDE_DIR TBB_INCLUDE_DIR-NOTFOUND)
+    SET(TBB_LIBRARY TBB_LIBRARY-NOTFOUND)
+    SET(TBB_LIBRARY_MALLOC TBB_LIBRARY_MALLOC-NOTFOUND)
+    IF (APPLE)
+      FIND_PATH(TBB_INCLUDE_DIR tbb/task_scheduler_init.h PATHS ${EMBREE_TBB_ROOT}/include NO_DEFAULT_PATH)
+      FIND_LIBRARY(TBB_LIBRARY tbb PATHS ${EMBREE_TBB_ROOT}/lib NO_DEFAULT_PATH)
+      FIND_LIBRARY(TBB_LIBRARY_MALLOC tbbmalloc PATHS ${EMBREE_TBB_ROOT}/lib NO_DEFAULT_PATH)
+    ELSE()
+      FIND_PATH(TBB_INCLUDE_DIR tbb/task_scheduler_init.h PATHS ${EMBREE_TBB_ROOT}/include NO_DEFAULT_PATH)
+      FIND_LIBRARY(TBB_LIBRARY tbb PATHS ${EMBREE_TBB_ROOT}/lib/intel64/gcc4.4 ${EMBREE_TBB_ROOT}/lib ${EMBREE_TBB_ROOT}/lib64  /usr/libx86_64-linux-gnu/ NO_DEFAULT_PATH)
+      FIND_LIBRARY(TBB_LIBRARY_MALLOC tbbmalloc PATHS ${EMBREE_TBB_ROOT}/lib/intel64/gcc4.4 ${EMBREE_TBB_ROOT}/lib ${EMBREE_TBB_ROOT}/lib64  /usr/libx86_64-linux-gnu/ NO_DEFAULT_PATH)
+    ENDIF()
+  ENDIF()
+
+ENDIF()
+
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(TBB DEFAULT_MSG TBB_INCLUDE_DIR TBB_LIBRARY TBB_LIBRARY_MALLOC)
+
+IF (TBB_FOUND)
+  SET(TBB_INCLUDE_DIRS ${TBB_INCLUDE_DIR})
+  SET(TBB_LIBRARIES ${TBB_LIBRARY} ${TBB_LIBRARY_MALLOC})
+ENDIF()
+
+MARK_AS_ADVANCED(TBB_INCLUDE_DIR)
+MARK_AS_ADVANCED(TBB_LIBRARY)
+MARK_AS_ADVANCED(TBB_LIBRARY_MALLOC)
+
+##############################################################
+# Install TBB
+##############################################################
+
+IF (WIN32)
+  INSTALL(PROGRAMS ${TBB_BINDIR}/tbb.dll ${TBB_BINDIR}/tbbmalloc.dll DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT examples)
+  INSTALL(PROGRAMS ${TBB_BINDIR}/tbb.dll ${TBB_BINDIR}/tbbmalloc.dll DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT lib)
+ELSEIF (EMBREE_ZIP_MODE)
+  IF (APPLE)
+    INSTALL(PROGRAMS ${EMBREE_TBB_ROOT}/lib/libtbb.dylib ${EMBREE_TBB_ROOT}/lib/libtbbmalloc.dylib DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT lib)
+  ELSE()
+    INSTALL(PROGRAMS ${EMBREE_TBB_ROOT}/lib/intel64/gcc4.4/libtbb.so.2 ${EMBREE_TBB_ROOT}/lib/intel64/gcc4.4/libtbbmalloc.so.2 DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT lib)
+  ENDIF()
+ENDIF()
@@ -1,13 +0,0 @@
-// Copyright 2009-2020 Intel Corporation
-// SPDX-License-Identifier: Apache-2.0
-
-#if !defined(__ARM_NEON)
-#error "No ARM Neon support"
-#endif
-
-#include <arm_neon.h>
-
-int main()
-{
-  return vaddvq_s32(vdupq_n_s32(1));
-}
@@ -1,5 +1,18 @@
-## Copyright 2009-2021 Intel Corporation
-## SPDX-License-Identifier: Apache-2.0
+## ======================================================================== ##
+## Copyright 2009-2017 Intel Corporation                                    ##
+##                                                                          ##
+## Licensed under the Apache License, Version 2.0 (the "License");          ##
+## you may not use this file except in compliance with the License.         ##
+## You may obtain a copy of the License at                                  ##
+##                                                                          ##
+##     http://www.apache.org/licenses/LICENSE-2.0                           ##
+##                                                                          ##
+## Unless required by applicable law or agreed to in writing, software      ##
+## distributed under the License is distributed on an "AS IS" BASIS,        ##
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ##
+## See the License for the specific language governing permissions and      ##
+## limitations under the License.                                           ##
+## ======================================================================== ##

 IF (WIN32 OR APPLE)
   return()
@@ -10,10 +23,8 @@ string(REPLACE "\n" ";" output ${output})

 foreach (line ${output})
  if ("${line}" MATCHES "O .bss")
-    if (NOT "${line}" MATCHES "std::__ioinit" AND          # this is caused by iostream initialization and is likely also ok
-        NOT "${line}" MATCHES "\\(\\)::" AND               # this matches a static inside a function which is fine
-        NOT "${line}" MATCHES "function_local_static_" AND # static variable inside a function (explicitly named)
-        NOT "${line}" MATCHES "__\\$U")                    # ICC generated locks for static variable inside a function
+    if (NOT "${line}" MATCHES "std::__ioinit" AND    # this is caused by iostream initialization and is likely also ok
+        NOT "${line}" MATCHES "\\(\\)::")            # this matches a static inside a function which is fine
      message(WARNING "\nProblematic global variable in non-SSE code:\n" ${line})
    endif()
  endif()
@@ -17,7 +17,11 @@
 #if \
  defined(__AVX512F__) &&  defined(__AVX512CD__) && \
  defined(__AVX512DQ__) && defined(__AVX512BW__) && defined(__AVX512VL__)
-char const *info_isa = "ISA" ":" "AVX512";
+char const *info_isa = "ISA" ":" "AVX512SKX";
+#elif \
+  defined(__AVX512F__) &&  defined(__AVX512CD__) && \
+  defined(__AVX512ER__) && defined(__AVX512PF__)
+char const *info_isa = "ISA" ":" "AVX512KNL";
 #elif defined(__AVX2__)
 char const *info_isa = "ISA" ":" "AVX2";
 #elif defined(__AVX__)
@@ -14,29 +14,19 @@
 ## limitations under the License.                                           ##
 ## ======================================================================== ##

-SET(CHECK_ISA_DIR "${CMAKE_CURRENT_LIST_DIR}")
+SET(CHECK_ISA_DIR ${CMAKE_CURRENT_LIST_DIR})
 FUNCTION(CHECK_ISA_DEFAULT OUTVAR)
-
-  TRY_COMPILE(COMPILER_SUPPORTS_ARM_NEON "${CMAKE_BINARY_DIR}" "${PROJECT_SOURCE_DIR}/common/cmake/check_arm_neon.cpp")
-  IF (COMPILER_SUPPORTS_ARM_NEON)
-    SET(ISA_DEFAULT "NEON")
-    SET(${OUTVAR} ${ISA_DEFAULT} PARENT_SCOPE)
-    RETURN()
-  ENDIF()
-  
-  SET(ISA_DEFAULT_BIN "${CMAKE_BINARY_DIR}/${CMAKE_FILES_DIRECTORY}/check_isa_default.bin")
-  SET(SRC "${CHECK_ISA_DIR}/check_isa.cpp")
+  SET(ISA_DEFAULT_BIN ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/check_isa_default.bin)
+  SET(SRC ${CHECK_ISA_DIR}/check_isa.cpp)
  TRY_COMPILE(ISA_DEFAULT_COMPILE
-    "${CMAKE_BINARY_DIR}"
-    "${SRC}"
-    COPY_FILE "${ISA_DEFAULT_BIN}"
+    ${CMAKE_BINARY_DIR}
+    ${SRC}
+    COPY_FILE ${ISA_DEFAULT_BIN}
  )
  IF(NOT ISA_DEFAULT_COMPILE)
    SET(ISA_DEFAULT "SSE2")
-    SET(${OUTVAR} ${ISA_DEFAULT} PARENT_SCOPE)
    RETURN()
  ENDIF()
-  
  FILE(STRINGS ${ISA_DEFAULT_BIN} ISA_DEFAULT REGEX "^ISA:")
  STRING(REPLACE "ISA:" "" ISA_DEFAULT "${ISA_DEFAULT}")
  SET(${OUTVAR} ${ISA_DEFAULT} PARENT_SCOPE)
@@ -1,5 +1,18 @@
-## Copyright 2009-2021 Intel Corporation
-## SPDX-License-Identifier: Apache-2.0
+## ======================================================================== ##
+## Copyright 2009-2017 Intel Corporation                                    ##
+##                                                                          ##
+## Licensed under the Apache License, Version 2.0 (the "License");          ##
+## you may not use this file except in compliance with the License.         ##
+## You may obtain a copy of the License at                                  ##
+##                                                                          ##
+##     http://www.apache.org/licenses/LICENSE-2.0                           ##
+##                                                                          ##
+## Unless required by applicable law or agreed to in writing, software      ##
+## distributed under the License is distributed on an "AS IS" BASIS,        ##
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ##
+## See the License for the specific language governing permissions and      ##
+## limitations under the License.                                           ##
+## ======================================================================== ##

 IF (WIN32 OR APPLE)
   return()
@@ -1,155 +1,59 @@
-## Copyright 2009-2021 Intel Corporation
-## SPDX-License-Identifier: Apache-2.0
+## ======================================================================== ##
+## Copyright 2009-2017 Intel Corporation                                    ##
+##                                                                          ##
+## Licensed under the Apache License, Version 2.0 (the "License");          ##
+## you may not use this file except in compliance with the License.         ##
+## You may obtain a copy of the License at                                  ##
+##                                                                          ##
+##     http://www.apache.org/licenses/LICENSE-2.0                           ##
+##                                                                          ##
+## Unless required by applicable law or agreed to in writing, software      ##
+## distributed under the License is distributed on an "AS IS" BASIS,        ##
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ##
+## See the License for the specific language governing permissions and      ##
+## limitations under the License.                                           ##
+## ======================================================================== ##

-MACRO(_SET_IF_EMPTY VAR VALUE)
-  IF(NOT ${VAR})
-    SET(${VAR} "${VALUE}")
-  ENDIF()
-ENDMACRO()
-
-IF (EMBREE_ARM)
-  IF ("x86_64" IN_LIST CMAKE_OSX_ARCHITECTURES)
-    # set ARM an x86 flags for macOS universal binary build
-    SET(FLAGS_SSE2 "-D__SSE__ -D__SSE2__ -msse -msse2 -mno-sse4.2")
-    SET(FLAGS_SSE42 "-D__SSE4_2__  -D__SSE4_1__ -msse4.2")
-    SET(FLAGS_AVX "-D__AVX__ -D__SSE4_2__  -D__SSE4_1__  -D__BMI__ -D__BMI2__ -D__LZCNT__ -mavx")
-    SET(FLAGS_AVX2 "-D__AVX2__ -D__AVX__ -D__SSE4_2__  -D__SSE4_1__  -D__BMI__ -D__BMI2__ -D__LZCNT__ -mf16c -mavx2 -mfma -mlzcnt -mbmi -mbmi2")
-    _SET_IF_EMPTY(FLAGS_AVX512 "-march=skx")
-  ELSE ()
-    SET(FLAGS_SSE2 "-D__SSE__ -D__SSE2__")
-    SET(FLAGS_SSE42 "-D__SSE4_2__  -D__SSE4_1__")
-    SET(FLAGS_AVX "-D__AVX__ -D__SSE4_2__  -D__SSE4_1__  -D__BMI__ -D__BMI2__ -D__LZCNT__")
-    SET(FLAGS_AVX2 "-D__AVX2__ -D__AVX__ -D__SSE4_2__  -D__SSE4_1__  -D__BMI__ -D__BMI2__ -D__LZCNT__")
-  ENDIF ()
-ELSE ()
-  # for `thread` keyword
-  _SET_IF_EMPTY(FLAGS_SSE2  "-msse -msse2 -mno-sse4.2")
-  _SET_IF_EMPTY(FLAGS_SSE42 "-msse4.2")
-  _SET_IF_EMPTY(FLAGS_AVX   "-mavx")
-  _SET_IF_EMPTY(FLAGS_AVX2  "-mf16c -mavx2 -mfma -mlzcnt -mbmi -mbmi2")
-  _SET_IF_EMPTY(FLAGS_AVX512 "-march=skx")
-ENDIF ()
+SET(FLAGS_SSE2  "-msse2")
+SET(FLAGS_SSE3  "-msse3")
+SET(FLAGS_SSSE3 "-mssse3")
+SET(FLAGS_SSE41 "-msse4.1")
+SET(FLAGS_SSE42 "-msse4.2")
+SET(FLAGS_AVX   "-mavx")
+SET(FLAGS_AVX2  "-mf16c -mavx2 -mfma -mlzcnt -mbmi -mbmi2")
+SET(FLAGS_AVX512KNL "-march=knl")
+SET(FLAGS_AVX512SKX "-march=skx")

 IF (WIN32)

-  SET(COMMON_CXX_FLAGS "")
-  SET(COMMON_CXX_FLAGS "${COMMON_CXX_FLAGS} /EHsc")        # catch C++ exceptions only and extern "C" functions never throw a C++ exception
-#  SET(COMMON_CXX_FLAGS "${COMMON_CXX_FLAGS} /MP")          # compile source files in parallel
-  SET(COMMON_CXX_FLAGS "${COMMON_CXX_FLAGS} /GR")          # enable runtime type information (on by default)
-  SET(COMMON_CXX_FLAGS "${COMMON_CXX_FLAGS} -Xclang -fcxx-exceptions") # enable C++ exceptions in Clang
-  SET(COMMON_CXX_FLAGS "${COMMON_CXX_FLAGS} /w")          # disable all warnings
-  SET(COMMON_CXX_FLAGS "${COMMON_CXX_FLAGS} /Gy")          # package individual functions
-  IF (EMBREE_STACK_PROTECTOR)
-    SET(COMMON_CXX_FLAGS "${COMMON_CXX_FLAGS} /GS")          # protects against return address overrides
-  ELSE()
-    SET(COMMON_CXX_FLAGS "${COMMON_CXX_FLAGS} /GS-")          # do not protect against return address overrides
-  ENDIF()
-  MACRO(DISABLE_STACK_PROTECTOR_FOR_FILE file)
-    IF (EMBREE_STACK_PROTECTOR)
-      SET_SOURCE_FILES_PROPERTIES(${file} PROPERTIES COMPILE_FLAGS "/GS-")
-    ENDIF()
-  ENDMACRO()
-  
-  SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${COMMON_CXX_FLAGS}")
-  SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /DDEBUG")                     # enables assertions
-  SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /DTBB_USE_DEBUG")             # configures TBB in debug mode
-  SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /Ox")                         # enable full optimizations
-  SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /Oi")                         # inline intrinsic functions
-  SET(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} /DEBUG")        # generate debug information
-  SET(CMAKE_SHARED_LINKER_FLAGS_DEBUG "${CMAKE_SHARED_LINKER_FLAGS_DEBUG} /DEBUG")  # generate debug information
+  SET(COMMON_CXX_FLAGS "/EHsc /GR -Xclang -fcxx-exceptions")
+  SET(CMAKE_CXX_FLAGS_DEBUG          "${CMAKE_CXX_FLAGS_DEBUG} ${COMMON_CXX_FLAGS}")
+  SET(CMAKE_CXX_FLAGS_RELEASE        "${CMAKE_CXX_FLAGS_RELEASE}        ${COMMON_CXX_FLAGS} /Ox /Oi /Gy -fno-vectorize")
+  SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} ${COMMON_CXX_FLAGS} /Ox /Oi /Gy -fno-vectorize")

-  SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${COMMON_CXX_FLAGS}")
-  SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Ox")                       # enable full optimizations
-  SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Oi")                       # inline intrinsic functions
-  
-  SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} ${COMMON_CXX_FLAGS}")
-  SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /Ox")                      # enable full optimizations
-  SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /Oi")                      # inline intrinsic functions
-  SET(CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO} /DEBUG")        # generate debug information
-  SET(CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO} /DEBUG")  # generate debug information
-  
-  SET(SECURE_LINKER_FLAGS "")
-  SET(SECURE_LINKER_FLAGS "${SECURE_LINKER_FLAGS} /NXCompat")    # compatible with data execution prevention (on by default)
-  SET(SECURE_LINKER_FLAGS "${SECURE_LINKER_FLAGS} /DynamicBase") # random rebase of executable at load time
-  IF (CMAKE_SIZEOF_VOID_P EQUAL 4)
-    SET(SECURE_LINKER_FLAGS "${SECURE_LINKER_FLAGS} /SafeSEH")     # invoke known exception handlers (Win32 only, x64 exception handlers are safe by design)
-  ENDIF()
-  SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${SECURE_LINKER_FLAGS}")
-  SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${SECURE_LINKER_FLAGS}")
+  SET(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} /DEBUG")
+  SET(CMAKE_SHARED_LINKER_FLAGS_DEBUG "${CMAKE_SHARED_LINKER_FLAGS_DEBUG} /DEBUG")
+
+  # remove define NDEBUG and instead set define DEBUG for config RelWithDebInfo
+  STRING(REPLACE "NDEBUG" "DEBUG" CMAKE_CXX_FLAGS_RELWITHDEBINFO ${CMAKE_CXX_FLAGS_RELWITHDEBINFO})

-  INCLUDE(msvc_post)
 ELSE()

  OPTION(EMBREE_IGNORE_CMAKE_CXX_FLAGS "When enabled Embree ignores default CMAKE_CXX_FLAGS." ON)
-  OPTION(EMBREE_ADDRESS_SANITIZER "Enabled CLANG address sanitizer." OFF)
  IF (EMBREE_IGNORE_CMAKE_CXX_FLAGS)
    SET(CMAKE_CXX_FLAGS "")
  ENDIF()

-  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") 
-  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")                       # enables most warnings
-  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wformat -Wformat-security")  # enables string format vulnerability warnings
-  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsigned-char")               # treat char as signed on all processors, including ARM
-  IF (NOT APPLE)
-    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIE")                     # enables support for more secure position independent execution
-  ENDIF()
-  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")                       # generate position independent code suitable for shared libraries
-  SET(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS}   -fPIC")                       # generate position independent code suitable for shared libraries
-  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")                  # enables C++11 features    
-  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden")         # makes all symbols hidden by default
-  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility-inlines-hidden") # makes all inline symbols hidden by default
-  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-strict-aliasing")        # disables strict aliasing rules
-  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-tree-vectorize")         # disable auto vectorizer
-  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_FORTIFY_SOURCE=2")         # perform extra security checks for some standard library calls
-  IF (EMBREE_STACK_PROTECTOR)
-    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fstack-protector")           # protects against return address overrides
-  ENDIF()
-  MACRO(DISABLE_STACK_PROTECTOR_FOR_FILE file)
-    IF (EMBREE_STACK_PROTECTOR)
-      SET_SOURCE_FILES_PROPERTIES(${file} PROPERTIES COMPILE_FLAGS "-fno-stack-protector")
-    ENDIF()
-  ENDMACRO()
-
-  IF (EMBREE_ADDRESS_SANITIZER)
-    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address -fsanitize-address-use-after-scope -fno-omit-frame-pointer -fno-optimize-sibling-calls")
-  ENDIF()
-
-  IF (EMSCRIPTEN)
-    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fexceptions")              # enable exceptions
-    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread")                  # enable threads
-    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msimd128")                 # enable SIMD intrinsics
-  ENDIF()
-
-  SET(CMAKE_CXX_FLAGS_DEBUG "")
-  SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -g")              # generate debug information
-  SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG")         # enable assertions
-  SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DTBB_USE_DEBUG") # configure TBB in debug mode
-  SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O3")             # enable full optimizations
-
-  SET(CMAKE_CXX_FLAGS_RELEASE "")
-  SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DNDEBUG")     # disable assertions
-  SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3")          # enable full optimizations
-
-  SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "")
-  SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -g")              # generate debug information
-  SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -DNDEBUG")        # disable assertions
-  SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -O3")             # enable full optimizations
+  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -fPIC -std=c++11 -fvisibility-inlines-hidden -fvisibility=hidden -fno-strict-aliasing")
+  SET(CMAKE_CXX_FLAGS_DEBUG          "-DDEBUG  -DTBB_USE_DEBUG -g -O0")
+  SET(CMAKE_CXX_FLAGS_RELEASE        "-DNDEBUG                    -O3 -fno-vectorize")
+  SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-DDEBUG  -DTBB_USE_DEBUG -g -O3 -fno-vectorize")

  IF (APPLE)
-    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mmacosx-version-min=10.7")   # makes sure code runs on older MacOSX versions
-    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")             # link against libc++ which supports C++11 features
+    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mmacosx-version-min=10.7 ") # we only use MacOSX 10.7 features
+    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++"            ) # link against C++11 stdlib
  ELSE(APPLE)
-    IF (NOT EMBREE_ADDRESS_SANITIZER) # for address sanitizer this causes link errors
-      SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined") # issues link error for undefined symbols in shared library
-      SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pie")                     # enables position independent execution for executable
-      IF (NOT EMSCRIPTEN)
-        SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -z relro -z now")    # re-arranges data sections to increase security
-        SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -z noexecstack")     # we do not need an executable stack
-        SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -z relro -z now")          # re-arranges data sections to increase security
-        SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -z noexecstack")           # we do not need an executable stack
-      ENDIF()
-    ENDIF()
+    SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined")
  ENDIF(APPLE)

-
 ENDIF()
@@ -13,11 +13,13 @@
 ## See the License for the specific language governing permissions and      ##
 ## limitations under the License.                                           ##
 ## ======================================================================== ##
-SET(FLAGS_SSE2      "-target-cpu=x86_64")
-SET(FLAGS_SSE42     "NOT_SUPPORTED")
+SET(EMBREE_MAX_ISA "NONE" CACHE INTERNAL "")
+SET(FLAGS_SSE2      "-target-cpu=xeon")
+SET(FLAGS_SSE3      "-target-cpu=x86_64")
+SET(FLAGS_SSSE3     "ERROR_ISA_NOT_SUPPORTED")
+SET(FLAGS_SSE41     "ERROR_ISA_NOT_SUPPORTED")
+SET(FLAGS_SSE42     "ERROR_ISA_NOT_SUPPORTED")
 SET(FLAGS_AVX       "-target-cpu=sandybridge")
 SET(FLAGS_AVX2      "-target-cpu=haswell")
-SET(FLAGS_AVX512 "-target-cpu=x86-skylake")
-
-STRING(TOLOWER "${CMAKE_CXX_COMPILER_ID}" _lower_compiler_id)
-INCLUDE("${CMAKE_CURRENT_LIST_DIR}/${_lower_compiler_id}.cmake" OPTIONAL)
+SET(FLAGS_AVX512KNL "-target-cpu=mic-knl")
+SET(FLAGS_AVX512SKX "ERROR_ISA_NOT_SUPPORTED")
@@ -1,4 +1,17 @@
-## Copyright 2009-2021 Intel Corporation
-## SPDX-License-Identifier: Apache-2.0
+## ======================================================================== ##
+## Copyright 2009-2017 Intel Corporation                                    ##
+##                                                                          ##
+## Licensed under the Apache License, Version 2.0 (the "License");          ##
+## you may not use this file except in compliance with the License.         ##
+## You may obtain a copy of the License at                                  ##
+##                                                                          ##
+##     http://www.apache.org/licenses/LICENSE-2.0                           ##
+##                                                                          ##
+## Unless required by applicable law or agreed to in writing, software      ##
+## distributed under the License is distributed on an "AS IS" BASIS,        ##
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ##
+## See the License for the specific language governing permissions and      ##
+## limitations under the License.                                           ##
+## ======================================================================== ##

 file(WRITE ${dst} "#include \"${src}\"\n")
@@ -1,293 +0,0 @@
-## Copyright 2009-2022 Intel Corporation
-## SPDX-License-Identifier: Apache-2.0
-
-MACRO(_SET_IF_EMPTY VAR VALUE)
-  IF(NOT ${VAR})
-    SET(${VAR} "${VALUE}")
-  ENDIF()
-ENDMACRO()
-
-_SET_IF_EMPTY(FLAGS_SSE2  "-msse2")
-_SET_IF_EMPTY(FLAGS_SSE42 "-msse4.2")
-_SET_IF_EMPTY(FLAGS_AVX   "-mavx")
-_SET_IF_EMPTY(FLAGS_AVX2  "-mf16c -mavx2 -mfma -mlzcnt -mbmi -mbmi2")
-_SET_IF_EMPTY(FLAGS_AVX512 "-march=skx")
-
-IF (NOT WIN32)
-  OPTION(EMBREE_IGNORE_CMAKE_CXX_FLAGS "When enabled Embree ignores default CMAKE_CXX_FLAGS." ON)
-  IF (EMBREE_IGNORE_CMAKE_CXX_FLAGS)
-    SET(CMAKE_CXX_FLAGS "")
-  ENDIF()
-ENDIF()
-
-GET_FILENAME_COMPONENT(SYCL_COMPILER_DIR ${CMAKE_CXX_COMPILER} PATH)
-GET_FILENAME_COMPONENT(SYCL_COMPILER_NAME ${CMAKE_CXX_COMPILER} NAME_WE)
-IF (NOT SYCL_COMPILER_NAME STREQUAL "clang++")
-  SET(SYCL_ONEAPI TRUE)
-  IF (SYCL_COMPILER_NAME STREQUAL "icx" OR SYCL_COMPILER_NAME STREQUAL "icpx")
-    SET(SYCL_ONEAPI_ICX TRUE)
-  ELSE()
-    SET(SYCL_ONEAPI_ICX FALSE)
-  ENDIF()
-  SET(STORE_CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
-  SET(STORE_CMAKE_CXX_LINK_FLAGS ${CMAKE_CXX_LINK_FLAGS})
-  IF (NOT EMBREE_SYCL_SUPPORT)
-    # if EMBREE_SYCL_SUPPORT is off we don't want the -fsycl flags
-    SET(CMAKE_CXX_FLAGS ${STORE_CMAKE_CXX_FLAGS})
-    SET(CMAKE_CXX_LINK_FLAGS ${STORE_CMAKE_CXX_LINK_FLAGS})
-  ENDIF()
-ELSE()
-  SET(SYCL_ONEAPI FALSE)
-  ADD_DEFINITIONS(-D__INTEL_LLVM_COMPILER)
-ENDIF()
-
-IF (EMBREE_SYCL_SUPPORT)
-
-  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-sycl")   # makes dpcpp compiler compatible with clang++
-  
-  SET(CMAKE_CXX_FLAGS_SYCL "-fsycl -fsycl-unnamed-lambda -Xclang -fsycl-allow-func-ptr")
-  SET(CMAKE_CXX_FLAGS_SYCL "${CMAKE_CXX_FLAGS_SYCL} -Wno-mismatched-tags -Wno-pessimizing-move -Wno-reorder -Wno-unneeded-internal-declaration -Wno-delete-non-abstract-non-virtual-dtor -Wno-dangling-field -Wno-unknown-pragmas -Wno-logical-op-parentheses")
-  
-  IF (SYCL_ONEAPI_ICX AND WIN32)
-    SET(CMAKE_CXX_FLAGS_SYCL "${CMAKE_CXX_FLAGS_SYCL} /debug:none")    # FIXME: debug information generation takes forever in SYCL
-    SET(CMAKE_CXX_FLAGS_SYCL "${CMAKE_CXX_FLAGS_SYCL} /DNDEBUG")    # FIXME: debug information generation takes forever in SYCL
-  ELSE()
-    SET(CMAKE_CXX_FLAGS_SYCL "${CMAKE_CXX_FLAGS_SYCL} -g0")            # FIXME: debug information generation takes forever in SYCL
-    SET(CMAKE_CXX_FLAGS_SYCL "${CMAKE_CXX_FLAGS_SYCL} -UDEBUG -DNDEBUG") # FIXME: assertion still not working in SYCL
-  ENDIF()
-  
-  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-bitwise-instead-of-logical") # disables "use of bitwise '&' with boolean operands" warning
-  SET(CMAKE_CXX_FLAGS_SYCL "${CMAKE_CXX_FLAGS_SYCL} -Wno-bitwise-instead-of-logical") # disables "use of bitwise '&' with boolean operands" warning
-
-  IF (WIN32)
-    SET(SYCL_COMPILER_LIB_DIR "${SYCL_COMPILER_DIR}/../lib")
-    IF (CMAKE_BUILD_TYPE STREQUAL "Debug")
-      file(GLOB SYCL_LIB RELATIVE ${SYCL_COMPILER_LIB_DIR}
-           ${SYCL_COMPILER_LIB_DIR}/sycld.lib
-           ${SYCL_COMPILER_LIB_DIR}/sycl[0-9]d.lib
-           ${SYCL_COMPILER_LIB_DIR}/sycl[0-9][0-9]d.lib)
-    ELSE()
-      file(GLOB SYCL_LIB RELATIVE ${SYCL_COMPILER_LIB_DIR}
-           ${SYCL_COMPILER_LIB_DIR}/sycl.lib
-           ${SYCL_COMPILER_LIB_DIR}/sycl[0-9].lib
-           ${SYCL_COMPILER_LIB_DIR}/sycl[0-9][0-9].lib)
-    ENDIF()
-    LIST(GET SYCL_LIB 0 SYCL_LIB)
-    GET_FILENAME_COMPONENT(SYCL_LIB_NAME ${SYCL_LIB} NAME_WE)
-  ELSE()
-    SET(SYCL_LIB_NAME "sycl")
-  ENDIF()
-
-  SET(CMAKE_LINK_FLAGS_SYCL "-fsycl")
-  
-  #LIST(APPEND CMAKE_IGC_OPTIONS "EnableOCLNoInlineAttr=0")                                # enabled __noinline
-  #LIST(APPEND CMAKE_IGC_OPTIONS "ControlKernelTotalSize=0")
-  #LIST(APPEND CMAKE_IGC_OPTIONS "SubroutineThreshold=110000")        # Minimal kernel size to enable subroutines
-  #LIST(APPEND CMAKE_IGC_OPTIONS "EnableUnmaskedFunctions=1")         # enables unmasked functions
-  #LIST(APPEND CMAKE_IGC_OPTIONS "ByPassAllocaSizeHeuristic=64")      # puts small arrays into registers
-  #LIST(APPEND CMAKE_IGC_OPTIONS "EnableIndirectCallOptimization=0")  # Enables inlining indirect calls by comparing function addresses
-  #LIST(APPEND CMAKE_IGC_OPTIONS "FunctionControl=0")                 # 0 = default, 1 = inline, 2 = subroutine, 3 = stackcall, 4 = keep indirect calls
-  #LIST(APPEND CMAKE_IGC_OPTIONS "forceGlobalRA=1")                   # "force global register allocator
-  #LIST(APPEND CMAKE_IGC_OPTIONS "TotalGRFNum=128")                   # Total GRF used for register allocation
-  #LIST(APPEND CMAKE_IGC_OPTIONS "GRFNumToUse=64")                   # "Set the number of general registers to use (64 to totalGRFNum)
-  #LIST(APPEND CMAKE_IGC_OPTIONS "ReplaceIndirectCallWithJmpi=1")     # Replace indirect call with jmpi instruction (HW WA)
-  #LIST(APPEND CMAKE_IGC_OPTIONS "DisableUniformAnalysis=1")          # Setting this to 1/true adds a compiler switch to disable uniform_analysis
-  #LIST(APPEND CMAKE_IGC_OPTIONS "DisableLoopUnroll=1")               # Setting this to 1/true adds a compiler switch to disable loop unrolling
-  #LIST(APPEND CMAKE_IGC_OPTIONS "EnableStatelessToStatefull=0")      #  Enable Stateless To Statefull transformation for global and constant address space in OpenCL kernels
-  #LIST(APPEND CMAKE_IGC_OPTIONS "EnableRecursionOpenCL=1")           # Enable recursion with OpenCL user functions
-  #LIST(APPEND CMAKE_IGC_OPTIONS "EnableAdvMemOpt=0")                 # Enable advanced memory optimization
-  #LIST(APPEND CMAKE_IGC_OPTIONS "UniformMemOptLimit=512")            # "Limit of uniform memory optimization in bits
-  #LIST(APPEND CMAKE_IGC_OPTIONS "EnablePreemption=0")                 # Enable generating preeemptable code (SKL+)
-  #LIST(APPEND CMAKE_IGC_OPTIONS "AllowSubroutineAndInirectdCalls=1")  # Allow subroutine in the presence of indirect calls
-  #LIST(APPEND CMAKE_IGC_OPTIONS "AllocaRAPressureThreshold=0")        # The threshold for the register pressure potential (this reduces amount of spilling!)
-  #LIST(APPEND CMAKE_IGC_OPTIONS "AssumeInt64Support=0")               # Architecture with partial int64 still promote uniform arrays to registers
-  LIST(APPEND CMAKE_IGC_OPTIONS "VISAOptions=-scratchAllocForStackInKB 128 ")  # this works around some IGC bug in spill compression
-  
-  IF (CMAKE_BUILD_TYPE STREQUAL "Debug") # to allow printf inside indirectly callable function
-    LIST(APPEND CMAKE_IGC_OPTIONS "ForceInlineStackCallWithImplArg=0")
-    LIST(APPEND CMAKE_IGC_OPTIONS "EnableGlobalStateBuffer=1")   
-  ENDIF()
-  
-  STRING(REPLACE ";" "," CMAKE_IGC_OPTIONS "${CMAKE_IGC_OPTIONS}")
-
-  IF (EMBREE_SYCL_AOT_DEVICE_REVISION GREATER 0)
-    SET(CMAKE_OCL_OPTIONS "${CMAKE_OCL_OPTIONS} -revision_id ${EMBREE_SYCL_AOT_DEVICE_REVISION}")        # Enable this to override the stepping/RevId
-  ENDIF()
-  
-  SET(CMAKE_OCL_OPTIONS "${CMAKE_OCL_OPTIONS} -cl-intel-greater-than-4GB-buffer-required")      # enables support for buffers larger than 4GB
-  IF (EMBREE_SYCL_LARGEGRF)
-    SET(CMAKE_OCL_OPTIONS "${CMAKE_OCL_OPTIONS} -internal_options -cl-intel-256-GRF-per-thread")          # large GRF mode
-  ENDIF()
-  SET(CMAKE_OCL_OTHER_OPTIONS "${CMAKE_OCL_OTHER_OPTIONS} -cl-intel-force-global-mem-allocation -cl-intel-no-local-to-generic")
-  #SET(CMAKE_OCL_OTHER_OPTIONS "${CMAKE_OCL_OTHER_OPTIONS} -cl-intel-private-memory-minimal-size-per-thread 8192")
-  
-  IF (EMBREE_SYCL_AOT_DEVICES STREQUAL "none")
-    SET(CMAKE_CXX_FLAGS_SYCL_AOT "-fsycl-targets=spir64")
-  ELSE()
-    SET(CMAKE_CXX_FLAGS_SYCL_AOT "-fsycl-targets=spir64,spir64_gen")
-  ENDIF()
-  
-  SET(CMAKE_LINK_FLAGS_SYCL_AOT "${CMAKE_CXX_FLAGS_SYCL_AOT} -Xsycl-target-backend=spir64 \"${CMAKE_OCL_OPTIONS} -options \\\"${CMAKE_OCL_OTHER_OPTIONS} -igc_opts='${CMAKE_IGC_OPTIONS}'\\\"\"")
-  
-  IF (NOT EMBREE_SYCL_AOT_DEVICES STREQUAL "none")
-    SET(CMAKE_LINK_FLAGS_SYCL_AOT "${CMAKE_LINK_FLAGS_SYCL_AOT} -Xsycl-target-backend=spir64_gen \"-device ${EMBREE_SYCL_AOT_DEVICES} ${CMAKE_OCL_OPTIONS} -options \\\"${CMAKE_OCL_OTHER_OPTIONS} -igc_opts='${CMAKE_IGC_OPTIONS}'\\\"\"")
-  ENDIF()
- 
-  IF (EMBREE_SYCL_DBG)
-    SET(CMAKE_CXX_FLAGS_SYCL_AOT "-g")
-  ENDIF()
-
-  SET(CMAKE_CXX_FLAGS_SYCL  "${CMAKE_CXX_FLAGS_SYCL}  ${CMAKE_CXX_FLAGS_SYCL_AOT}")
-  SET(CMAKE_LINK_FLAGS_SYCL "${CMAKE_LINK_FLAGS_SYCL} ${CMAKE_LINK_FLAGS_SYCL_AOT}")
-
-
-  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-pessimizing-move") # disabled: warning: moving a temporary object prevents copy elision [-Wpessimizing-move]
-
-  IF (SYCL_ONEAPI_ICX AND WIN32)
-    IF (${CMAKE_CXX_COMPILER_VERSION} VERSION_GREATER_EQUAL 2024.0)
-      SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I\"${SYCL_COMPILER_DIR}/../opt/compiler/include/sycl\" -I\"${SYCL_COMPILER_DIR}/../opt/compiler/include/sycl/sycl\"")       # disable warning from SYCL header
-    ENDIF()
-    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I\"${SYCL_COMPILER_DIR}/../include/sycl\" -I\"${SYCL_COMPILER_DIR}/../include/\"")       # disable warning from SYCL header
-    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Qstd=c++17")
-  ELSE()
-    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")
-    IF (SYCL_ONEAPI_ICX AND ${CMAKE_CXX_COMPILER_VERSION} VERSION_GREATER_EQUAL 2024.0)
-      SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -isystem \"${SYCL_COMPILER_DIR}/../opt/compiler/include/sycl\" -isystem \"${SYCL_COMPILER_DIR}/../opt/compiler/include/sycl/sycl\"")       # disable warning from SYCL header
-    ENDIF()
-    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -isystem \"${SYCL_COMPILER_DIR}/../include/sycl\" -isystem \"${SYCL_COMPILER_DIR}/../include/\"")       # disable warning from SYCL header
-  ENDIF()
-
-  # enable C++17 features
-  IF (SYCL_ONEAPI_ICX AND WIN32)
-    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Qstd=c++17")
-  ELSE()
-    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")
-  ENDIF()
-ENDIF(EMBREE_SYCL_SUPPORT)
-
-IF(SYCL_ONEAPI_ICX)
-  IF (WIN32)
-    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Qno-intel-lib")
-    SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /Qno-intel-lib")
-    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Qimf-use-svml:false")
-    SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /Qimf-use-svml:false")
-    SET(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} /Qno-intel-lib")
-    SET(CMAKE_C_LINK_FLAGS "${CMAKE_C_LINK_FLAGS} /Qno-intel-lib")
-    SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /Qoption,link,/DEPENDENTLOADFLAG:0x2000")
-    SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /Qoption,link,/DEPENDENTLOADFLAG:0x2000")
-  ELSE()
-    SET(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} -static-intel")
-    SET(CMAKE_C_LINK_FLAGS "${CMAKE_C_LINK_FLAGS} -static-intel")
-    #SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fimf-use-svml=false")
-    #SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fimf-use-svml=false")
-    IF (NOT EMBREE_SYCL_SUPPORT)
-      SET(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} -no-intel-lib")
-      SET(CMAKE_C_LINK_FLAGS "${CMAKE_C_LINK_FLAGS} -no-intel-lib")
-      SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -no-intel-lib")
-      SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -no-intel-lib")
-    ENDIF()
-  ENDIF()
-ENDIF()
-
-IF (EMBREE_STACK_PROTECTOR)
-  IF (SYCL_ONEAPI_ICX AND WIN32)
-    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /GS")           # protects against return address overrides
-  ELSE()
-    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fstack-protector") # protects against return address overrides
-  ENDIF()
-ENDIF()
-MACRO(DISABLE_STACK_PROTECTOR_FOR_FILE file)
-  IF (EMBREE_STACK_PROTECTOR)
-    IF (SYCL_ONEAPI_ICX AND WIN32)
-      SET_SOURCE_FILES_PROPERTIES(${file} PROPERTIES COMPILE_FLAGS "/GS-")
-    ELSE()
-      SET_SOURCE_FILES_PROPERTIES(${file} PROPERTIES COMPILE_FLAGS "-fno-stack-protector")
-    ENDIF()
-  ENDIF()
-ENDMACRO()
-
-IF (SYCL_ONEAPI_ICX AND WIN32)
-  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /fp:precise")   # makes dpcpp compiler compatible with clang++
-  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHsc")        # catch C++ exceptions only and extern "C" functions never throw a C++ exception
-  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /GR")          # enable runtime type information (on by default)
-  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Xclang -fcxx-exceptions") # enable C++ exceptions in Clang
-  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Gy")          # package individual functions
-ELSE()
-  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden")         # makes all symbols hidden by default
-  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility-inlines-hidden") # makes all inline symbols hidden by default
-  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-strict-aliasing")        # disables strict aliasing rules
-  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-tree-vectorize")         # disable auto vectorizer
-  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_FORTIFY_SOURCE=2")         # perform extra security checks for some standard library calls
-  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsigned-char")               # treat char as signed on all processors, including ARM
-  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")                       # enables most warnings
-  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wformat -Wformat-security")  # enables string format vulnerability warnings
-  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ffp-model=precise")   # makes dpcpp compiler compatible with clang++
-ENDIF()
-
-IF (WIN32)
-
-  IF (NOT EMBREE_SYCL_SUPPORT)
-    IF (SYCL_ONEAPI_ICX)
-      IF (${MSVC_VERSION} VERSION_GREATER_EQUAL 1916)
-        SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Qstd=c++14")
-      ELSE()
-        SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Qstd=c++11")
-      ENDIF()
-      SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Oi")
-    ELSE()
-      IF (${MSVC_VERSION} VERSION_GREATER_EQUAL 1916)
-        SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
-      ELSE()
-        SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-      ENDIF()
-    ENDIF()
-  ENDIF()
-
-  INCLUDE(msvc_post)
-
-  # workaround for file encoding problems of kernels/embree.rc found here https://gitlab.kitware.com/cmake/cmake/-/issues/18311
-  set(CMAKE_NINJA_CMCLDEPS_RC OFF)
-
-ELSE()
-
-  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIE")                     # enables support for more secure position independent execution
-  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")                       # generate position independent code suitable for shared libraries
-  SET(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS}   -fPIC")                       # generate position independent code suitable for shared libraries
-
-  OPTION(EMBREE_ADDRESS_SANITIZER "Enabled CLANG address sanitizer." OFF)
-
-  IF (EMBREE_ADDRESS_SANITIZER)
-    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address -fsanitize-address-use-after-scope -fno-omit-frame-pointer -fno-optimize-sibling-calls")
-  ENDIF()
-
-  SET(CMAKE_CXX_FLAGS_DEBUG "")
-  SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -g")              # generate debug information
-  SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG")         # enable assertions
-  SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DTBB_USE_DEBUG") # configure TBB in debug mode
-  SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O3")             # enable full optimizations
-
-  SET(CMAKE_CXX_FLAGS_RELEASE "")
-  SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DNDEBUG")     # disable assertions
-  SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3")          # enable full optimizations
-
-  SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "")
-  SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -g")              # generate debug information
-  SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -DNDEBUG")        # disable assertions
-  SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -O3")             # enable full optimizations
-
-  IF(EMBREE_SYCL_SUPPORT)
-    SET(CMAKE_CXX_FLAGS_RELWITHASSERT "")
-    SET(CMAKE_CXX_FLAGS_RELWITHASSERT "${CMAKE_CXX_FLAGS_RELWITHASSERT} -DDEBUG")         # enable assertions
-    SET(CMAKE_CXX_FLAGS_RELWITHASSERT "${CMAKE_CXX_FLAGS_RELWITHASSERT} -O3")             # enable full optimizations
-  ENDIF(EMBREE_SYCL_SUPPORT)
-
-  IF (NOT EMBREE_ADDRESS_SANITIZER) # for address sanitizer this causes link errors
-    SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined") # issues link error for undefined symbols in shared library
-    SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -z noexecstack")     # we do not need an executable stack
-    SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -z relro -z now")    # re-arranges data sections to increase security
-    SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -z noexecstack")           # we do not need an executable stack
-    SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -z relro -z now")          # re-arranges data sections to increase security
-    SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pie")                     # enables position independent execution for executable
-  ENDIF()
-
-ENDIF()
@@ -1,10 +1,23 @@
-## Copyright 2009-2021 Intel Corporation
-## SPDX-License-Identifier: Apache-2.0
+## ======================================================================== ##
+## Copyright 2009-2017 Intel Corporation                                    ##
+##                                                                          ##
+## Licensed under the Apache License, Version 2.0 (the "License");          ##
+## you may not use this file except in compliance with the License.         ##
+## You may obtain a copy of the License at                                  ##
+##                                                                          ##
+##     http://www.apache.org/licenses/LICENSE-2.0                           ##
+##                                                                          ##
+## Unless required by applicable law or agreed to in writing, software      ##
+## distributed under the License is distributed on an "AS IS" BASIS,        ##
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ##
+## See the License for the specific language governing permissions and      ##
+## limitations under the License.                                           ##
+## ======================================================================== ##

 # use default install config
-INCLUDE("${CMAKE_CURRENT_LIST_DIR}/embree-config-install.cmake")
+INCLUDE(${CMAKE_CURRENT_LIST_DIR}/embree-config-install.cmake)

 # and override path variables to match for build directory
 SET(EMBREE_INCLUDE_DIRS @PROJECT_SOURCE_DIR@/include)
-SET(EMBREE_LIBRARY @PROJECT_BINARY_DIR@/@EMBREE_LIBRARY_FULLNAME@)
+SET(EMBREE_LIBRARY @PROJECT_BINARY_DIR@/@EMBREE_LIBRARY_NAME@)
 SET(EMBREE_LIBRARIES ${EMBREE_LIBRARY})
@@ -1,16 +1,28 @@
-## Copyright 2009-2021 Intel Corporation
-## SPDX-License-Identifier: Apache-2.0
+## ======================================================================== ##
+## Copyright 2009-2017 Intel Corporation                                    ##
+##                                                                          ##
+## Licensed under the Apache License, Version 2.0 (the "License");          ##
+## you may not use this file except in compliance with the License.         ##
+## You may obtain a copy of the License at                                  ##
+##                                                                          ##
+##     http://www.apache.org/licenses/LICENSE-2.0                           ##
+##                                                                          ##
+## Unless required by applicable law or agreed to in writing, software      ##
+## distributed under the License is distributed on an "AS IS" BASIS,        ##
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ##
+## See the License for the specific language governing permissions and      ##
+## limitations under the License.                                           ##
+## ======================================================================== ##

 SET(PACKAGE_VERSION @EMBREE_VERSION@)

-SET(PACKAGE_VERSION_EXACT 0)
-SET(PACKAGE_VERSION_COMPATIBLE 0)
-
-IF (PACKAGE_FIND_VERSION VERSION_EQUAL PACKAGE_VERSION)
-  SET(PACKAGE_VERSION_EXACT 1)
-  SET(PACKAGE_VERSION_COMPATIBLE 1)
-ENDIF()
-
-IF (PACKAGE_FIND_VERSION_MAJOR EQUAL @EMBREE_VERSION_MAJOR@ AND PACKAGE_FIND_VERSION VERSION_LESS PACKAGE_VERSION)
-  SET(PACKAGE_VERSION_COMPATIBLE 1)
+IF (${PACKAGE_FIND_VERSION_MAJOR} EQUAL @EMBREE_VERSION_MAJOR@)
+  IF (${PACKAGE_FIND_VERSION} VERSION_LESS @EMBREE_VERSION@)
+    SET(PACKAGE_VERSION_COMPATIBLE 1)  
+  ENDIF()
+  IF (${PACKAGE_FIND_VERSION} VERSION_EQUAL @EMBREE_VERSION@)
+    SET(PACKAGE_VERSION_EXACT 1)  
+  ENDIF()
+ELSE()
+  SET(PACKAGE_VERSION_UNSUITABLE 1)
 ENDIF()
@@ -1,13 +1,27 @@
-## Copyright 2009-2021 Intel Corporation
-## SPDX-License-Identifier: Apache-2.0
+## ======================================================================== ##
+## Copyright 2009-2017 Intel Corporation                                    ##
+##                                                                          ##
+## Licensed under the Apache License, Version 2.0 (the "License");          ##
+## you may not use this file except in compliance with the License.         ##
+## You may obtain a copy of the License at                                  ##
+##                                                                          ##
+##     http://www.apache.org/licenses/LICENSE-2.0                           ##
+##                                                                          ##
+## Unless required by applicable law or agreed to in writing, software      ##
+## distributed under the License is distributed on an "AS IS" BASIS,        ##
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ##
+## See the License for the specific language governing permissions and      ##
+## limitations under the License.                                           ##
+## ======================================================================== ##

-SET(EMBREE_ROOT_DIR "${CMAKE_CURRENT_LIST_DIR}/@EMBREE_RELATIVE_ROOT_DIR@")
-GET_FILENAME_COMPONENT(EMBREE_ROOT_DIR "${EMBREE_ROOT_DIR}" ABSOLUTE)
+SET(EMBREE_ROOT_DIR ${CMAKE_CURRENT_LIST_DIR}/@EMBREE_RELATIV_ROOT_DIR@)

-SET(EMBREE_INCLUDE_DIRS "${EMBREE_ROOT_DIR}/@CMAKE_INSTALL_INCLUDEDIR@")
-SET(EMBREE_LIBRARY "${EMBREE_ROOT_DIR}/@CMAKE_INSTALL_LIBDIR@/@EMBREE_LIBRARY_FULLNAME@")
+SET(EMBREE_INCLUDE_DIRS ${EMBREE_ROOT_DIR}/@CMAKE_INSTALL_INCLUDEDIR@)
+SET(EMBREE_LIBRARY ${EMBREE_ROOT_DIR}/@CMAKE_INSTALL_LIBDIR@/@EMBREE_LIBRARY_NAME@)
 SET(EMBREE_LIBRARIES ${EMBREE_LIBRARY})

+MARK_AS_ADVANCED(embree_DIR)
+
 SET(EMBREE_VERSION @EMBREE_VERSION@)
 SET(EMBREE_VERSION_MAJOR @EMBREE_VERSION_MAJOR@)
 SET(EMBREE_VERSION_MINOR @EMBREE_VERSION_MINOR@)
@@ -19,94 +33,26 @@ SET(EMBREE_ISA_SSE2  @EMBREE_ISA_SSE2@)
 SET(EMBREE_ISA_SSE42 @EMBREE_ISA_SSE42@)
 SET(EMBREE_ISA_AVX @EMBREE_ISA_AVX@) 
 SET(EMBREE_ISA_AVX2  @EMBREE_ISA_AVX2@)
-SET(EMBREE_ISA_AVX512 @EMBREE_ISA_AVX512@)
-SET(EMBREE_ISA_AVX512SKX @EMBREE_ISA_AVX512@) # just for compatibility
-SET(EMBREE_ISA_NEON @EMBREE_ISA_NEON@)
-SET(EMBREE_ISA_NEON2X @EMBREE_ISA_NEON2X@)
+SET(EMBREE_ISA_AVX512KNL @EMBREE_ISA_AVX512KNL@)
+SET(EMBREE_ISA_AVX512SKX @EMBREE_ISA_AVX512SKX@)

 SET(EMBREE_BUILD_TYPE @CMAKE_BUILD_TYPE@)
 SET(EMBREE_ISPC_SUPPORT @EMBREE_ISPC_SUPPORT@)
 SET(EMBREE_STATIC_LIB @EMBREE_STATIC_LIB@)
-SET(EMBREE_SYCL_SUPPORT @EMBREE_SYCL_SUPPORT@)
-SET(EMBREE_SYCL_GEOMETRY_CALLBACK @EMBREE_SYCL_GEOMETRY_CALLBACK@)
 SET(EMBREE_TUTORIALS @EMBREE_TUTORIALS@)

 SET(EMBREE_RAY_MASK @EMBREE_RAY_MASK@)
 SET(EMBREE_STAT_COUNTERS @EMBREE_STAT_COUNTERS@)
 SET(EMBREE_BACKFACE_CULLING @EMBREE_BACKFACE_CULLING@)
-SET(EMBREE_FILTER_FUNCTION @EMBREE_FILTER_FUNCTION@)
+SET(EMBREE_INTERSECTION_FILTER @EMBREE_INTERSECTION_FILTER@)
+SET(EMBREE_INTERSECTION_FILTER_RESTORE @EMBREE_INTERSECTION_FILTER_RESTORE@)
 SET(EMBREE_IGNORE_INVALID_RAYS @EMBREE_IGNORE_INVALID_RAYS@)
 SET(EMBREE_TASKING_SYSTEM @EMBREE_TASKING_SYSTEM@)
-SET(EMBREE_TBB_COMPONENT @EMBREE_TBB_COMPONENT@)
-SET(EMBREE_COMPACT_POLYS @EMBREE_COMPACT_POLYS@)

-SET(EMBREE_GEOMETRY_TRIANGLE @EMBREE_GEOMETRY_TRIANGLE@)
-SET(EMBREE_GEOMETRY_QUAD @EMBREE_GEOMETRY_QUAD@)
-SET(EMBREE_GEOMETRY_CURVE @EMBREE_GEOMETRY_CURVE@)
-SET(EMBREE_GEOMETRY_SUBDIVISION @EMBREE_GEOMETRY_SUBDIVISION@)
+SET(EMBREE_GEOMETRY_TRIANGLES @EMBREE_GEOMETRY_TRIANGLES@)
+SET(EMBREE_GEOMETRY_QUADS @EMBREE_GEOMETRY_QUADS@)
+SET(EMBREE_GEOMETRY_LINES @EMBREE_GEOMETRY_LINES@)
+SET(EMBREE_GEOMETRY_HAIR @EMBREE_GEOMETRY_HAIR@)
+SET(EMBREE_GEOMETRY_SUBDIV @EMBREE_GEOMETRY_SUBDIV@)
 SET(EMBREE_GEOMETRY_USER @EMBREE_GEOMETRY_USER@)
-SET(EMBREE_GEOMETRY_INSTANCE @EMBREE_GEOMETRY_INSTANCE@)
-SET(EMBREE_GEOMETRY_INSTANCE_ARRAY @EMBREE_GEOMETRY_INSTANCE_ARRAY@)
-SET(EMBREE_GEOMETRY_GRID @EMBREE_GEOMETRY_GRID@)
-SET(EMBREE_GEOMETRY_POINT @EMBREE_GEOMETRY_POINT@)
-
 SET(EMBREE_RAY_PACKETS @EMBREE_RAY_PACKETS@)
-SET(EMBREE_MAX_INSTANCE_LEVEL_COUNT @EMBREE_MAX_INSTANCE_LEVEL_COUNT@)
-SET(EMBREE_CURVE_SELF_INTERSECTION_AVOIDANCE_FACTOR @EMBREE_CURVE_SELF_INTERSECTION_AVOIDANCE_FACTOR@)
-SET(EMBREE_DISC_POINT_SELF_INTERSECTION_AVOIDANCE @EMBREE_DISC_POINT_SELF_INTERSECTION_AVOIDANCE@)
-SET(EMBREE_MIN_WIDTH @EMBREE_MIN_WIDTH@)
-
-IF (EMBREE_STATIC_LIB AND (EMBREE_TASKING_SYSTEM STREQUAL "TBB"))
-  INCLUDE(CMakeFindDependencyMacro)
-  FIND_DEPENDENCY(TBB)
-ENDIF()
-
-IF (EMBREE_STATIC_LIB)
-
-  INCLUDE("${EMBREE_ROOT_DIR}/@EMBREE_CMAKEEXPORT_DIR@/sys-targets.cmake")
-  INCLUDE("${EMBREE_ROOT_DIR}/@EMBREE_CMAKEEXPORT_DIR@/math-targets.cmake")
-  INCLUDE("${EMBREE_ROOT_DIR}/@EMBREE_CMAKEEXPORT_DIR@/simd-targets.cmake")
-  INCLUDE("${EMBREE_ROOT_DIR}/@EMBREE_CMAKEEXPORT_DIR@/lexers-targets.cmake")
-  INCLUDE("${EMBREE_ROOT_DIR}/@EMBREE_CMAKEEXPORT_DIR@/tasking-targets.cmake")
-
-  IF (EMBREE_ISA_SSE42)
-    INCLUDE("${EMBREE_ROOT_DIR}/@EMBREE_CMAKEEXPORT_DIR@/embree_sse42-targets.cmake")
-  ENDIF()
-
-  IF (EMBREE_ISA_AVX)
-    INCLUDE("${EMBREE_ROOT_DIR}/@EMBREE_CMAKEEXPORT_DIR@/embree_avx-targets.cmake")
-  ENDIF()
-
-  IF (EMBREE_ISA_AVX2)
-    INCLUDE("${EMBREE_ROOT_DIR}/@EMBREE_CMAKEEXPORT_DIR@/embree_avx2-targets.cmake")
-  ENDIF()
-
-  IF (EMBREE_ISA_AVX512)
-    INCLUDE("${EMBREE_ROOT_DIR}/@EMBREE_CMAKEEXPORT_DIR@/embree_avx512-targets.cmake")
-  ENDIF()
-
-ENDIF()
-
-IF (EMBREE_SYCL_SUPPORT)
-
-  SET(EMBREE_SYCL_AOT_DEVICES @EMBREE_SYCL_AOT_DEVICES@)
-  SET(EMBREE_SYCL_LARGEGRF @EMBREE_SYCL_LARGEGRF@)
-  SET(EMBREE_SYCL_RT_VALIDATION_API @EMBREE_SYCL_RT_VALIDATION_API@)
-  IF (EMBREE_SYCL_RT_VALIDATION_API)
-    INCLUDE("${EMBREE_ROOT_DIR}/@EMBREE_CMAKEEXPORT_DIR@/embree_rthwif_sycl-targets.cmake")
-  ENDIF()
-  IF (EMBREE_STATIC_LIB)
-    INCLUDE("${EMBREE_ROOT_DIR}/@EMBREE_CMAKEEXPORT_DIR@/embree_rthwif-targets.cmake")
-    INCLUDE("${EMBREE_ROOT_DIR}/@EMBREE_CMAKEEXPORT_DIR@/ze_wrapper-targets.cmake")
-  ENDIF()
-  INCLUDE("${EMBREE_ROOT_DIR}/@EMBREE_CMAKEEXPORT_DIR@/embree_sycl-targets.cmake")
-
-ENDIF()
-
-INCLUDE("${EMBREE_ROOT_DIR}/@EMBREE_CMAKEEXPORT_DIR@/embree-targets.cmake")
-
-
-SET(EMBREE_TESTING_ONLY_SYCL_TESTS @EMBREE_TESTING_ONLY_SYCL_TESTS@)
-SET(EMBREE_TESTING_INTENSITY @EMBREE_TESTING_INTENSITY@)
-SET(EMBREE_TESTING_MEMCHECK @EMBREE_TESTING_MEMCHECK@)
-SET(EMBREE_TESTING_BENCHMARK @EMBREE_TESTING_BENCHMARK@)
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>com.apple.security.cs.disable-library-validation</key>
-	<true/>
-</dict>
-</plist>
@@ -0,0 +1,44 @@
+## ======================================================================== ##
+## Copyright 2009-2017 Intel Corporation                                    ##
+##                                                                          ##
+## Licensed under the Apache License, Version 2.0 (the "License");          ##
+## you may not use this file except in compliance with the License.         ##
+## You may obtain a copy of the License at                                  ##
+##                                                                          ##
+##     http://www.apache.org/licenses/LICENSE-2.0                           ##
+##                                                                          ##
+## Unless required by applicable law or agreed to in writing, software      ##
+## distributed under the License is distributed on an "AS IS" BASIS,        ##
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ##
+## See the License for the specific language governing permissions and      ##
+## limitations under the License.                                           ##
+## ======================================================================== ##
+
+SET(FLAGS_SSE2  "-msse2")
+SET(FLAGS_SSE3  "-msse3")
+SET(FLAGS_SSSE3 "-mssse3")
+SET(FLAGS_SSE41 "-msse4.1")
+SET(FLAGS_SSE42 "-msse4.2")
+SET(FLAGS_AVX   "-mavx")
+SET(FLAGS_AVX2  "-mf16c -mavx2 -mfma -mlzcnt -mbmi -mbmi2")
+SET(FLAGS_AVX512KNL "-mavx512f -mavx512pf -mavx512er -mavx512cd")
+SET(FLAGS_AVX512SKX "-mavx512f -mavx512dq -mavx512cd -mavx512bw -mavx512vl")
+
+OPTION(EMBREE_IGNORE_CMAKE_CXX_FLAGS "When enabled Embree ignores default CMAKE_CXX_FLAGS." ON)
+IF (EMBREE_IGNORE_CMAKE_CXX_FLAGS)
+  SET(CMAKE_CXX_FLAGS "")
+ENDIF()
+
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -fPIC -std=c++11 -fvisibility-inlines-hidden -fvisibility=hidden -fno-strict-aliasing")
+SET(CMAKE_CXX_FLAGS_DEBUG          "-DDEBUG  -DTBB_USE_DEBUG -g -O0")
+SET(CMAKE_CXX_FLAGS_RELEASE        "-DNDEBUG                    -O3 -fno-tree-vectorize")
+SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-DDEBUG  -DTBB_USE_DEBUG -g -O3 -fno-tree-vectorize")
+SET(CMAKE_EXE_LINKER_FLAGS "")
+
+IF (APPLE)
+  SET (CMAKE_SHARED_LINKER_FLAGS ${CMAKE_SHARED_LINKER_FLAGS_INIT} -dynamiclib)
+  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mmacosx-version-min=10.7 -stdlib=libc++")
+ELSE(APPLE)
+  SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined")
+ENDIF(APPLE)
+
@@ -1,105 +0,0 @@
-## Copyright 2009-2021 Intel Corporation
-## SPDX-License-Identifier: Apache-2.0
-
-MACRO(_SET_IF_EMPTY VAR VALUE)
-  IF(NOT ${VAR})
-    SET(${VAR} "${VALUE}")
-  ENDIF()
-ENDMACRO()
-
-IF (EMBREE_ARM)
-  SET(FLAGS_SSE2 "-D__SSE__ -D__SSE2__")
-  SET(FLAGS_SSE42 "-D__SSE4_2__  -D__SSE4_1__")
-  SET(FLAGS_AVX "-D__AVX__ -D__SSE4_2__  -D__SSE4_1__  -D__BMI__ -D__BMI2__ -D__LZCNT__")
-  SET(FLAGS_AVX2 "-D__AVX2__ -D__AVX__ -D__SSE4_2__  -D__SSE4_1__  -D__BMI__ -D__BMI2__ -D__LZCNT__")
-ELSE ()
-  _SET_IF_EMPTY(FLAGS_SSE2  "-msse2")
-  _SET_IF_EMPTY(FLAGS_SSE42 "-msse4.2")
-  _SET_IF_EMPTY(FLAGS_AVX   "-mavx")
-  _SET_IF_EMPTY(FLAGS_AVX2  "-mf16c -mavx2 -mfma -mlzcnt -mbmi -mbmi2")
-  _SET_IF_EMPTY(FLAGS_AVX512 "-march=skylake-avx512")
-ENDIF ()
-
-OPTION(EMBREE_IGNORE_CMAKE_CXX_FLAGS "When enabled Embree ignores default CMAKE_CXX_FLAGS." ON)
-IF (EMBREE_IGNORE_CMAKE_CXX_FLAGS)
-  SET(CMAKE_CXX_FLAGS "")
-ENDIF()
-
-SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
-
-IF (EMBREE_ARM)
-  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsigned-char")             # treat 'char' as 'signed char'
-  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -flax-vector-conversions")  # allow lax vector type conversions
-ENDIF (EMBREE_ARM)
-
-SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")                       # enables most warnings
-SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wformat -Wformat-security")  # enables string format vulnerability warnings
-SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-class-memaccess")        # disables clearing an object of type ‘XXX’ with no trivial copy-assignment; use assignment or value-initialization instead
-
-# these prevent compile to optimize away security checks
-SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-strict-overflow")            # assume that signed overflow occurs
-SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-delete-null-pointer-checks") # keep all checks for NULL pointers
-SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fwrapv")                         # this option instructs the compiler to assume that signed arithmetic overflow warps around.
-SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsigned-char")                   # treat char as signed on all processors, including ARM
-
-IF (NOT WIN32)
-  IF (NOT APPLE)
-    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIE")                   # enables support for more secure position independent execution
-  ENDIF()
-  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")                     # generate position independent code suitable for shared libraries
-  SET(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS}   -fPIC")                     # generate position independent code suitable for shared libraries
-ENDIF ()
-
-SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")                  # enables C++11 features
-SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden")         # makes all symbols hidden by default
-SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility-inlines-hidden") # makes all inline symbols hidden by default
-SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-strict-aliasing")        # disables strict aliasing rules
-SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-tree-vectorize")         # disable auto vectorizer
-SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_FORTIFY_SOURCE=2")         # perform extra security checks for some standard library calls
-IF (EMBREE_STACK_PROTECTOR)
-  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fstack-protector")           # protects against return address overrides
-ENDIF()
-MACRO(DISABLE_STACK_PROTECTOR_FOR_FILE file)
-  IF (EMBREE_STACK_PROTECTOR)
-    SET_SOURCE_FILES_PROPERTIES(${file} PROPERTIES COMPILE_FLAGS "-fno-stack-protector")
-  ENDIF()
-ENDMACRO()
-
-SET(CMAKE_CXX_FLAGS_DEBUG "")
-IF (EMBREE_ARM)
-  SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fsigned-char")             # treat 'char' as 'signed char'
-ENDIF (EMBREE_ARM)
-SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -g")              # generate debug information
-SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG")         # enable assertions
-SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DTBB_USE_DEBUG") # configure TBB in debug mode
-SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O3")             # enable full optimizations
-
-SET(CMAKE_CXX_FLAGS_RELEASE "")
-IF (EMBREE_ARM)
-  SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fsigned-char")             # treat 'char' as 'signed char'
-ENDIF (EMBREE_ARM)
-SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DNDEBUG")     # disable assertions
-SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3")          # enable full optimizations
-
-SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "")
-IF (EMBREE_ARM)
-  SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -fsigned-char")             # treat 'char' as 'signed char'
-ENDIF (EMBREE_ARM)
-SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -g")              # generate debug information
-SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -DNDEBUG")        # disable assertions
-SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -O3")             # enable full optimizations
-
-IF (APPLE)
-  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mmacosx-version-min=10.7")   # makes sure code runs on older MacOSX versions
-  # SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")             # link against libc++ which supports C++11 features
-ELSE(APPLE)
-  IF (CMAKE_CXX_COMPILER_ID MATCHES "GNU")
-    SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined") # issues link error for undefined symbols in shared library
-    SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -z noexecstack")     # we do not need an executable stack
-    SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -z relro -z now")    # re-arranges data sections to increase security
-    SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -z noexecstack")           # we do not need an executable stack
-    SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -z relro -z now")          # re-arranges data sections to increase security
-  ENDIF ()
-  SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pie")                       # enables position independent execution for executable
-ENDIF(APPLE)
-
@@ -0,0 +1,51 @@
+## ======================================================================== ##
+## Copyright 2009-2017 Intel Corporation                                    ##
+##                                                                          ##
+## Licensed under the Apache License, Version 2.0 (the "License");          ##
+## you may not use this file except in compliance with the License.         ##
+## You may obtain a copy of the License at                                  ##
+##                                                                          ##
+##     http://www.apache.org/licenses/LICENSE-2.0                           ##
+##                                                                          ##
+## Unless required by applicable law or agreed to in writing, software      ##
+## distributed under the License is distributed on an "AS IS" BASIS,        ##
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ##
+## See the License for the specific language governing permissions and      ##
+## limitations under the License.                                           ##
+## ======================================================================== ##
+
+SET(FLAGS_SSE2   "-xsse2")
+SET(FLAGS_SSE3   "-xsse3")
+SET(FLAGS_SSSE3  "-xssse3")
+SET(FLAGS_SSE41  "-xsse4.1")
+SET(FLAGS_SSE42  "-xsse4.2")
+SET(FLAGS_AVX    "-xAVX")
+SET(FLAGS_AVX2   "-xCORE-AVX2")
+SET(FLAGS_AVX512KNL "-xMIC-AVX512")
+SET(FLAGS_AVX512SKX "-xCORE-AVX512")
+
+OPTION(EMBREE_IGNORE_CMAKE_CXX_FLAGS "When enabled Embree ignores default CMAKE_CXX_FLAGS." ON)
+IF (EMBREE_IGNORE_CMAKE_CXX_FLAGS)
+  SET(CMAKE_CXX_FLAGS "")
+ENDIF()
+
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -fPIC -std=c++11 -fvisibility-inlines-hidden -fvisibility=hidden -no-ansi-alias -fasm-blocks")
+SET(CMAKE_CXX_FLAGS_DEBUG          "-DDEBUG  -DTBB_USE_DEBUG -g -O0")
+SET(CMAKE_CXX_FLAGS_RELEASE        "-DNDEBUG                    -O3 -restrict -no-inline-max-total-size -inline-factor=200 -no-inline-max-per-compile -no-vec")
+SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-DDEBUG  -DTBB_USE_DEBUG -g -O3 -restrict -no-inline-max-total-size -inline-factor=200 -no-inline-max-per-compile -no-vec")
+
+# Don't change linker flags used by Cray wrappers
+IF(NOT CMAKE_CXX_COMPILER_WRAPPER STREQUAL "CrayPrgEnv")
+  # enable -static-intel and -no-intel-extensions to void to export ICC specific symbols from Embree
+  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -static-intel -no-intel-extensions")
+ENDIF()
+
+#SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -g -debug inline-debug-info")
+#SET(CMAKE_EXE_LINKER_FLAGS "-g") 
+
+IF (APPLE)
+  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mmacosx-version-min=10.7 ") # we only use MacOSX 10.7 features
+  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++"            ) # link against C++11 stdlib
+ELSE(APPLE)
+  SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined")
+ENDIF(APPLE)
@@ -1,25 +0,0 @@
-## Copyright 2009-2021 Intel Corporation
-## SPDX-License-Identifier: Apache-2.0
-
-IF (EMBREE_INSTALL_DEPENDENCIES)
-  IF (TARGET TBB::${EMBREE_TBB_COMPONENT})
-    GET_TARGET_PROPERTY(LIB_PATH TBB::${EMBREE_TBB_COMPONENT} IMPORTED_LOCATION_RELEASE)
-    IF(WIN32)
-      INSTALL(FILES "${LIB_PATH}" DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT examples)
-      GET_TARGET_PROPERTY(IMPLIB_PATH TBB::${EMBREE_TBB_COMPONENT} IMPORTED_IMPLIB_RELEASE)
-      INSTALL(FILES "${IMPLIB_PATH}" DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT lib)
-
-      # Include tbbmalloc.dll even though we don't use or need tbb_malloc.dll because it is searched for by tbb.dll.
-      GET_FILENAME_COMPONENT(LIB_FOLDER ${LIB_PATH} DIRECTORY)
-      FILE(GLOB TBB_MALLOC_FILES LIST_DIRECTORIES false "${LIB_FOLDER}/tbbmalloc.dll" "${LIB_FOLDER}/tbbmalloc?.dll")
-      INSTALL(FILES "${TBB_MALLOC_FILES}" DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT examples)
-
-    ELSE()
-      GET_FILENAME_COMPONENT(LIB_DIR "${LIB_PATH}" DIRECTORY)
-      FILE(GLOB LIB_FILES ${LIB_DIR}/libtbb.* ${LIB_DIR}/libtbbmalloc.so*)
-      INSTALL(FILES ${LIB_FILES} DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT lib)
-    ENDIF()
-  ELSE()
-    MESSAGE(SEND_ERROR "Target TBB::${EMBREE_TBB_COMPONENT} not found during install.")
-  ENDIF()
-ENDIF()
@@ -1,176 +0,0 @@
-## Copyright 2009-2021 Intel Corporation
-## SPDX-License-Identifier: Apache-2.0
-
-MACRO(_SET_IF_EMPTY VAR VALUE)
-  IF(NOT ${VAR})
-    SET(${VAR} "${VALUE}")
-  ENDIF()
-ENDMACRO()
-
-IF (WIN32)
-
-  _SET_IF_EMPTY(FLAGS_SSE2  "/QxSSE2")
-  _SET_IF_EMPTY(FLAGS_SSE42 "/QxSSE4.2")
-  _SET_IF_EMPTY(FLAGS_AVX   "/arch:AVX")
-  _SET_IF_EMPTY(FLAGS_AVX2  "/QxCORE-AVX2")
-  _SET_IF_EMPTY(FLAGS_AVX512 "/QxCORE-AVX512")
-
-  SET(COMMON_CXX_FLAGS "")
-  SET(COMMON_CXX_FLAGS "${COMMON_CXX_FLAGS} /EHsc")        # catch C++ exceptions only and extern "C" functions never throw a C++ exception
-  SET(COMMON_CXX_FLAGS "${COMMON_CXX_FLAGS} /MP")          # compile source files in parallel
-  SET(COMMON_CXX_FLAGS "${COMMON_CXX_FLAGS} /GR")          # enable runtime type information (on by default)
-  SET(COMMON_CXX_FLAGS "${COMMON_CXX_FLAGS} /Qvec-")       # disable auto vectorizer
-  SET(COMMON_CXX_FLAGS "${COMMON_CXX_FLAGS} /Qfast-transcendentals-") # disable fast transcendentals, prevents sin(x),cos(x) -> sincos(x) optimization
-  IF (EMBREE_STACK_PROTECTOR)
-    SET(COMMON_CXX_FLAGS "${COMMON_CXX_FLAGS} /GS")          # protects against return address overrides
-  ELSE()
-    SET(COMMON_CXX_FLAGS "${COMMON_CXX_FLAGS} /GS-")          # do not protect against return address overrides
-  ENDIF()
-  MACRO(DISABLE_STACK_PROTECTOR_FOR_FILE file)
-    IF (EMBREE_STACK_PROTECTOR)
-      SET_SOURCE_FILES_PROPERTIES(${file} PROPERTIES COMPILE_FLAGS "/GS-")
-    ENDIF()
-  ENDMACRO()
-
-  SET(COMMON_CXX_FLAGS "${COMMON_CXX_FLAGS} /Qdiag-disable:11074 ")  # remark #11074: Inlining inhibited by limit max-size
-  SET(COMMON_CXX_FLAGS "${COMMON_CXX_FLAGS} /Qdiag-disable:11075 ")  # remark #11075: To get full report use -Qopt-report:4 -Qopt-report-phase ipo
-
-  SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${COMMON_CXX_FLAGS}")
-  SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /DDEBUG")                     # enables assertions
-  SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /DTBB_USE_DEBUG")             # configures TBB in debug mode
-  SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /Oi")                         # inline intrinsic functions
-  SET(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} /DEBUG")        # generate debug information
-  SET(CMAKE_SHARED_LINKER_FLAGS_DEBUG "${CMAKE_SHARED_LINKER_FLAGS_DEBUG} /DEBUG")  # generate debug information
-
-  SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${COMMON_CXX_FLAGS}")
-  SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Ox")                       # enable full optimizations
-  SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Oi")                       # inline intrinsic functions
-  SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Gy")                       # package individual functions
-  SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Qinline-max-total-size-")  # no size limit when performing inlining
-  SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Qinline-factor=150")       # increase default inline factors by 2x
-
-  SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} ${COMMON_CXX_FLAGS}")
-#  SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /DTBB_USE_DEBUG")          # configures TBB in debug mode
-  SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /Ox")                      # enable full optimizations
-  SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /Oi")                      # inline intrinsic functions
-  SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /Gy")                      # package individual functions
-  SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /Qinline-max-total-size-") # no size limit when performing inlining
-  SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /Qinline-factor=150")      # increase default inline factors by 2x
-  SET(CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO} /DEBUG")        # generate debug information
-  SET(CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO} /DEBUG")  # generate debug information
-
-  SET(SECURE_LINKER_FLAGS "")
-  SET(SECURE_LINKER_FLAGS "${SECURE_LINKER_FLAGS} /NXCompat")    # compatible with data execution prevention (on by default)
-  SET(SECURE_LINKER_FLAGS "${SECURE_LINKER_FLAGS} /DynamicBase") # random rebase of executable at load time
-  IF (CMAKE_SIZEOF_VOID_P EQUAL 4)
-    SET(SECURE_LINKER_FLAGS "${SECURE_LINKER_FLAGS} /SafeSEH")     # invoke known exception handlers (Win32 only, x64 exception handlers are safe by design)
-  ENDIF()
-  SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${SECURE_LINKER_FLAGS}")
-  SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${SECURE_LINKER_FLAGS}")
-
-  SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /IGNORE:4217")  # locally defined symbol XXX imported in function YYY (happens as the ISPC API layer uses exported library functions)
-  SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /IGNORE:4049")  # warning LNK4049: locally defined symbol _rtcOccluded1M imported
-  
-  INCLUDE(msvc_post)
-
-  # remove libmmd dependency
-  IF (NOT EMBREE_STATIC_RUNTIME)
-    # Use the default math library instead of libmmd[d]
-    STRING(APPEND CMAKE_EXE_LINKER_FLAGS_DEBUG " /nodefaultlib:libmmdd.lib")
-    STRING(APPEND CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO " /nodefaultlib:libmmd.lib")
-    STRING(APPEND CMAKE_EXE_LINKER_FLAGS_RELEASE " /nodefaultlib:libmmd.lib")
-    STRING(APPEND CMAKE_SHARED_LINKER_FLAGS_DEBUG " /nodefaultlib:libmmdd.lib")
-    STRING(APPEND CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO " /nodefaultlib:libmmd.lib")
-    STRING(APPEND CMAKE_SHARED_LINKER_FLAGS_RELEASE " /nodefaultlib:libmmd.lib")
-
-    # Link the static version of SVML
-    string(APPEND CMAKE_EXE_LINKER_FLAGS " /defaultlib:svml_dispmt.lib")
-    string(APPEND CMAKE_SHARED_LINKER_FLAGS " /defaultlib:svml_dispmt.lib")
-  ENDIF()
-
-ELSE()
-
-  IF (APPLE)
-    _SET_IF_EMPTY(FLAGS_SSE2 "-xssse3") # on MacOSX ICC does not support SSE2
-  ELSE()
-    _SET_IF_EMPTY(FLAGS_SSE2 "-xsse2")
-  ENDIF()
-  _SET_IF_EMPTY(FLAGS_SSE42  "-xsse4.2")
-  _SET_IF_EMPTY(FLAGS_AVX    "-xAVX")
-  _SET_IF_EMPTY(FLAGS_AVX2   "-xCORE-AVX2")
-  _SET_IF_EMPTY(FLAGS_AVX512 "-xCORE-AVX512")
-
-  OPTION(EMBREE_IGNORE_CMAKE_CXX_FLAGS "When enabled Embree ignores default CMAKE_CXX_FLAGS." ON)
-  IF (EMBREE_IGNORE_CMAKE_CXX_FLAGS)
-    SET(CMAKE_CXX_FLAGS "")
-  ENDIF()
-
-  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") 
-  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")                       # enables most warnings
-  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wformat -Wformat-security")  # enables string format vulnerability warnings
-
-  # these prevent compile to optimize away security checks
-  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-strict-overflow")            # assume that signed overflow occurs
-  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-delete-null-pointer-checks") # keep all checks for NULL pointers
-  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fwrapv")                         # this option instructs the compiler to assume that signed arithmetic overflow warps around.
-
-  IF (NOT APPLE)
-    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIE")                     # enables support for more secure position independent execution
-    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ftls-model=local-dynamic") # otherwise ICC2019 cannot compile code with -fPIE enabled
-  ENDIF()
-  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")                       # generate position independent code suitable for shared libraries
-  SET(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS}   -fPIC")                       # generate position independent code suitable for shared libraries
-  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")                  # enables C++11 features
-  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden")         # makes all symbols hidden by default
-  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility-inlines-hidden") # makes all inline symbols hidden by default
-  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -no-ansi-alias")              # disables strict aliasing rules
-  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -no-vec")                     # disable auto vectorizer
-  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fasm-blocks")                # enable assembly blocks
-  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_FORTIFY_SOURCE=2")         # perform extra security checks for some standard library calls
-  IF (EMBREE_STACK_PROTECTOR)
-    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fstack-protector")           # protects against return address overrides
-  ENDIF()
-  MACRO(DISABLE_STACK_PROTECTOR_FOR_FILE file)
-    IF (EMBREE_STACK_PROTECTOR)
-      SET_SOURCE_FILES_PROPERTIES(${file} PROPERTIES COMPILE_FLAGS "-fno-stack-protector")
-    ENDIF()
-  ENDMACRO()
-  
-  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -restrict")                   # enable restrict keyword
-  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -no-inline-max-total-size")   # no size limit when performing inlining
-  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -no-inline-max-per-compile")  # no maximal number of inlinings per compilation unit
-  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -inline-factor=150")          # increase default inline factors by 2x
-
-    IF(NOT CMAKE_CXX_COMPILER_WRAPPER STREQUAL "CrayPrgEnv")
-    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -static-intel")             # links intel runtime statically
-    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -no-intel-extensions")      # disables some intel extensions which cause symbols to be exported
-  ENDIF()
-
-  SET(CMAKE_CXX_FLAGS_DEBUG "")
-  SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -g")              # generate debug information
-  SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG")         # enable assertions
-  SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DTBB_USE_DEBUG") # configure TBB in debug mode
-  SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O3")             # enable full optimizations
-
-  SET(CMAKE_CXX_FLAGS_RELEASE "")
-  SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DNDEBUG")     # disable assertions
-  SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3")          # enable full optimizations
-
-  SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "")
-  SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -g")              # generate debug information
-  SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -DNDEBUG")        # disable assertions
-  SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -O3")             # enable full optimizations
-  
-  IF (APPLE)
-    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mmacosx-version-min=10.7")   # makes sure code runs on older MacOSX versions
-    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")             # link against libc++ which supports C++11 features
-  ELSE(APPLE)
-    SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined") # issues link error for undefined symbols in shared library
-    SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -z noexecstack")     # we do not need an executable stack
-    SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -z relro -z now")    # re-arranges data sections to increase security
-    SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -z noexecstack")           # we do not need an executable stack
-    SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -z relro -z now")          # re-arranges data sections to increase security
-    SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pie")                     # enables position independent execution for executable
-  ENDIF(APPLE)
-
-ENDIF()
@@ -1,5 +1,18 @@
-## Copyright 2009-2021 Intel Corporation
-## SPDX-License-Identifier: Apache-2.0
+## ======================================================================== ##
+## Copyright 2009-2017 Intel Corporation                                    ##
+##                                                                          ##
+## Licensed under the Apache License, Version 2.0 (the "License");          ##
+## you may not use this file except in compliance with the License.         ##
+## You may obtain a copy of the License at                                  ##
+##                                                                          ##
+##     http://www.apache.org/licenses/LICENSE-2.0                           ##
+##                                                                          ##
+## Unless required by applicable law or agreed to in writing, software      ##
+## distributed under the License is distributed on an "AS IS" BASIS,        ##
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ##
+## See the License for the specific language governing permissions and      ##
+## limitations under the License.                                           ##
+## ======================================================================== ##

 # ##################################################################
 # add macro INCLUDE_DIRECTORIES_ISPC() that allows to specify search
@@ -12,7 +25,7 @@ ENDMACRO ()

 IF (EMBREE_ISPC_SUPPORT)

-# ISPC versions to look for, in descending order (newest first)
+# ISPC versions to look for, in decending order (newest first)
 SET(ISPC_VERSION_WORKING "1.9.1" "1.9.0" "1.8.3" "1.8.2")
 LIST(GET ISPC_VERSION_WORKING -1 ISPC_VERSION_REQUIRED)

@@ -32,38 +45,30 @@ IF (NOT EMBREE_ISPC_EXECUTABLE)
  ENDIF()
  FOREACH(ver ${ISPC_VERSION_WORKING})
    FOREACH(suffix ${ISPC_DIR_SUFFIX})
-      LIST(APPEND ISPC_DIR_HINT "${PROJECT_SOURCE_DIR}/../ispc-v${ver}-${suffix}")
+      LIST(APPEND ISPC_DIR_HINT ${PROJECT_SOURCE_DIR}/../ispc-v${ver}-${suffix})
    ENDFOREACH()
  ENDFOREACH()

  FIND_PROGRAM(EMBREE_ISPC_EXECUTABLE ispc PATHS ${ISPC_DIR_HINT} DOC "Path to the ISPC executable.")
  IF (NOT EMBREE_ISPC_EXECUTABLE)
    MESSAGE(FATAL_ERROR "Intel SPMD Compiler (ISPC) not found. Disable EMBREE_ISPC_SUPPORT or install ISPC.")
+  ELSE()
+    MESSAGE(STATUS "Found Intel SPMD Compiler (ISPC): ${EMBREE_ISPC_EXECUTABLE}")
  ENDIF()
 ENDIF()

 # check ISPC version
-EXECUTE_PROCESS(COMMAND ${EMBREE_ISPC_EXECUTABLE} --version
-                OUTPUT_VARIABLE ISPC_OUTPUT
-                RESULT_VARIABLE ISPC_RESULT)
-
-IF (NOT ${ISPC_RESULT} STREQUAL "0")
-  MESSAGE(FATAL_ERROR "Error executing ISPC executable '${EMBREE_ISPC_EXECUTABLE}': ${ISPC_RESULT}")
-ELSE()
-  MESSAGE(STATUS "Found working Intel SPMD Compiler (ISPC): ${EMBREE_ISPC_EXECUTABLE}")
-ENDIF()
-
-STRING(REGEX MATCH "([0-9]+[.][0-9]+[.][0-9]+)" DUMMY "${ISPC_OUTPUT}")
+EXECUTE_PROCESS(COMMAND ${EMBREE_ISPC_EXECUTABLE} --version OUTPUT_VARIABLE ISPC_OUTPUT)
+STRING(REGEX MATCH " ([0-9]+[.][0-9]+[.][0-9]+)(dev|knl)? " DUMMY "${ISPC_OUTPUT}")
 SET(ISPC_VERSION ${CMAKE_MATCH_1})

 IF (ISPC_VERSION VERSION_LESS ISPC_VERSION_REQUIRED)
-  MESSAGE(FATAL_ERROR "ISPC ${ISPC_VERSION} is too old. You need at least ISPC ${ISPC_VERSION_REQUIRED}.")
+  MESSAGE(FATAL_ERROR "Need at least version ${ISPC_VERSION_REQUIRED} of Intel SPMD Compiler (ISPC).")
 ENDIF()

 GET_FILENAME_COMPONENT(ISPC_DIR ${EMBREE_ISPC_EXECUTABLE} PATH)

-SET(EMBREE_ISPC_ADDRESSING 32 CACHE STRING "32vs64 bit addressing in ispc")
-SET_PROPERTY(CACHE EMBREE_ISPC_ADDRESSING PROPERTY STRINGS 32 64)
+SET(EMBREE_ISPC_ADDRESSING 32 CACHE INT "32vs64 bit addressing in ispc")
 MARK_AS_ADVANCED(EMBREE_ISPC_ADDRESSING)

 MACRO (ISPC_COMPILE)
@@ -73,16 +78,12 @@ MACRO (ISPC_COMPILE)
  STRING(REPLACE ";" "," ISPC_TARGET_ARGS "${ISPC_TARGETS}")

  IF (CMAKE_SIZEOF_VOID_P EQUAL 8)
-    IF (${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm64|aarch64")
-      SET(ISPC_ARCHITECTURE "aarch64")
-    ELSE()
-      SET(ISPC_ARCHITECTURE "x86-64")
-    ENDIF()
+    SET(ISPC_ARCHITECTURE "x86-64")
  ELSE()
    SET(ISPC_ARCHITECTURE "x86")
  ENDIF()

-  SET(ISPC_TARGET_DIR "${CMAKE_CURRENT_BINARY_DIR}")
+  SET(ISPC_TARGET_DIR ${CMAKE_CURRENT_BINARY_DIR})

  IF(ISPC_INCLUDE_DIR)
    STRING(REPLACE ";" ";-I;" ISPC_INCLUDE_DIR_PARMS "${ISPC_INCLUDE_DIR}")
@@ -92,7 +93,7 @@ MACRO (ISPC_COMPILE)
  IF (WIN32 OR "${CMAKE_BUILD_TYPE}" STREQUAL "Release")
    SET(ISPC_OPT_FLAGS -O3)
  ELSE()
-    SET(ISPC_OPT_FLAGS -O2)
+    SET(ISPC_OPT_FLAGS -O2 -g)
  ENDIF()

  IF (WIN32)
@@ -108,7 +109,7 @@ MACRO (ISPC_COMPILE)
    GET_FILENAME_COMPONENT(dir ${src} PATH)

    SET(outdir "${ISPC_TARGET_DIR}/${dir}")
-    SET(input "${CMAKE_CURRENT_SOURCE_DIR}/${src}")
+    SET(input ${CMAKE_CURRENT_SOURCE_DIR}/${src})

    SET(deps "")
    IF (EXISTS ${outdir}/${fname}.dev.idep)
@@ -129,7 +130,10 @@ MACRO (ISPC_COMPILE)
    LIST(LENGTH ISPC_TARGETS NUM_TARGETS)
    IF (NUM_TARGETS GREATER 1)
      FOREACH(target ${ISPC_TARGETS})
-        IF (${target} STREQUAL "avx512skx-i32x16")
+        # in v1.9.0 ISPC changed the ISA suffix of avx512knl-i32x16 to just 'avx512knl'
+        IF (${target} STREQUAL "avx512knl-i32x16" AND NOT ISPC_VERSION VERSION_LESS "1.9.0")
+          SET(target "avx512knl")
+        ELSEIF (${target} STREQUAL "avx512skx-i32x16")
          SET(target "avx512skx")
        ENDIF()
        SET(results ${results} "${outdir}/${fname}.dev_${target}${ISPC_TARGET_EXT}")
@@ -137,10 +141,10 @@ MACRO (ISPC_COMPILE)
    ENDIF()

    ADD_CUSTOM_COMMAND(
-      OUTPUT ${results} "${ISPC_TARGET_DIR}/${fname}_ispc.h"
+      OUTPUT ${results} ${ISPC_TARGET_DIR}/${fname}_ispc.h
      COMMAND ${CMAKE_COMMAND} -E make_directory ${outdir}
      COMMAND ${EMBREE_ISPC_EXECUTABLE}
-      -I "${CMAKE_CURRENT_SOURCE_DIR}"
+      -I ${CMAKE_CURRENT_SOURCE_DIR}
      ${ISPC_INCLUDE_DIR_PARMS}
      ${ISPC_DEFINITIONS}
      --arch=${ISPC_ARCHITECTURE}
@@ -150,7 +154,7 @@ MACRO (ISPC_COMPILE)
      --woff
      --opt=fast-math
      ${ISPC_ADDITIONAL_ARGS}
-      -h "${ISPC_TARGET_DIR}/${fname}_ispc.h"
+      -h ${ISPC_TARGET_DIR}/${fname}_ispc.h
      -MMM  ${outdir}/${fname}.dev.idep
      -o ${outdir}/${fname}.dev${ISPC_TARGET_EXT}
      ${input}
@@ -1,61 +1,64 @@
-## Copyright 2009-2021 Intel Corporation
-## SPDX-License-Identifier: Apache-2.0
+## ======================================================================== ##
+## Copyright 2009-2017 Intel Corporation                                    ##
+##                                                                          ##
+## Licensed under the Apache License, Version 2.0 (the "License");          ##
+## you may not use this file except in compliance with the License.         ##
+## You may obtain a copy of the License at                                  ##
+##                                                                          ##
+##     http://www.apache.org/licenses/LICENSE-2.0                           ##
+##                                                                          ##
+## Unless required by applicable law or agreed to in writing, software      ##
+## distributed under the License is distributed on an "AS IS" BASIS,        ##
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ##
+## See the License for the specific language governing permissions and      ##
+## limitations under the License.                                           ##
+## ======================================================================== ##

-SET(FLAGS_SSE2  "/D__SSE__ /D__SSE2__")
-SET(FLAGS_SSE42 "${FLAGS_SSE2} /D__SSE3__ /D__SSSE3__ /D__SSE4_1__ /D__SSE4_2__")
-SET(FLAGS_AVX   "${FLAGS_SSE42} /arch:AVX")
-SET(FLAGS_AVX2  "${FLAGS_SSE42} /arch:AVX2")
-SET(FLAGS_AVX512  "${FLAGS_AVX2} /arch:AVX512")
+# the /QxXXX flags are meant for the Intel Compiler, MSVC ignores them
+SET(FLAGS_SSE2  "/QxSSE2")
+SET(FLAGS_SSE3  "/QxSSE3")
+SET(FLAGS_SSSE3 "/QxSSSE3")
+SET(FLAGS_SSE41 "/DCONFIG_SSE41 /QxSSE4.1")
+SET(FLAGS_SSE42 "/DCONFIG_SSE42 /QxSSE4.2")
+SET(FLAGS_AVX   "/arch:AVX /DCONFIG_AVX")

-SET(COMMON_CXX_FLAGS "")
-SET(COMMON_CXX_FLAGS "${COMMON_CXX_FLAGS} /EHsc")        # catch C++ exceptions only and extern "C" functions never throw a C++ exception
-SET(COMMON_CXX_FLAGS "${COMMON_CXX_FLAGS} /MP")          # compile source files in parallel
-SET(COMMON_CXX_FLAGS "${COMMON_CXX_FLAGS} /GR")          # enable runtime type information (on by default)
-SET(COMMON_CXX_FLAGS "${COMMON_CXX_FLAGS} /Gy")          # package individual functions
-IF (EMBREE_STACK_PROTECTOR)
-  SET(COMMON_CXX_FLAGS "${COMMON_CXX_FLAGS} /GS")          # protects against return address overrides
+# Intel Compiler 15, Update 1 unfortunately cannot handle /arch:AVX2
+IF (${CMAKE_CXX_COMPILER_ID} STREQUAL "Intel")
+  SET(FLAGS_AVX2  "/DCONFIG_AVX2 /QxCORE-AVX2")
+  SET(FLAGS_AVX512KNL "/DCONFIG_AVX512KNL /QxMIC-AVX512")
+  SET(FLAGS_AVX512SKX "/DCONFIG_AVX512SKX /QxCORE-AVX512")
 ELSE()
-  SET(COMMON_CXX_FLAGS "${COMMON_CXX_FLAGS} /GS-")          # do not protect against return address overrides
+  SET(FLAGS_AVX2  "/arch:AVX2 /DCONFIG_AVX2 /QxCORE-AVX2")
+  SET(FLAGS_AVX512KNL "")
+  SET(FLAGS_AVX512SKX "")
 ENDIF()
-MACRO(DISABLE_STACK_PROTECTOR_FOR_FILE file)
-  IF (EMBREE_STACK_PROTECTOR)
-    SET_SOURCE_FILES_PROPERTIES(${file} PROPERTIES COMPILE_FLAGS "/GS-")
-  ENDIF()
-ENDMACRO()

-SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /DEPENDENTLOADFLAG:0x2000")
-SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /DEPENDENTLOADFLAG:0x2000")
-
-SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${COMMON_CXX_FLAGS}")
-STRING(REPLACE "/RTC1" "" CMAKE_CXX_FLAGS_DEBUG ${CMAKE_CXX_FLAGS_DEBUG})         # disable native runtime checks
-SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /DDEBUG")                     # enables assertions
-SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /DTBB_USE_DEBUG")             # configures TBB in debug mode
-SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /Ox")                         # enable full optimizations
-SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /Oi")                         # inline intrinsic functions
-SET(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} /DEBUG")        # generate debug information
-SET(CMAKE_SHARED_LINKER_FLAGS_DEBUG "${CMAKE_SHARED_LINKER_FLAGS_DEBUG} /DEBUG")  # generate debug information
-
-SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${COMMON_CXX_FLAGS}")
-SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Ox")                       # enable full optimizations
-SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Oi")                       # inline intrinsic functions
-
-SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} ${COMMON_CXX_FLAGS}")
-SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /Ox")                      # enable full optimizations
-SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /Oi")                      # inline intrinsic functions
-SET(CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO} /DEBUG")        # generate debug information
-SET(CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO} /DEBUG")  # generate debug information
-
-SET(SECURE_LINKER_FLAGS "")
-SET(SECURE_LINKER_FLAGS "${SECURE_LINKER_FLAGS} /NXCompat")    # compatible with data execution prevention (on by default)
-SET(SECURE_LINKER_FLAGS "${SECURE_LINKER_FLAGS} /DynamicBase") # random rebase of executable at load time
-IF (CMAKE_SIZEOF_VOID_P EQUAL 4)
-  SET(SECURE_LINKER_FLAGS "${SECURE_LINKER_FLAGS} /SafeSEH")     # invoke known exception handlers (Win32 only, x64 exception handlers are safe by design)
+SET(COMMON_CXX_FLAGS "/EHsc /MP /GR /GS-")
+IF (${CMAKE_CXX_COMPILER_ID} STREQUAL "Intel")
+  SET(COMMON_CXX_FLAGS "${COMMON_CXX_FLAGS} /Qdiag-disable:11074 ")  # remark #11074: Inlining inhibited by limit max-size
+  SET(COMMON_CXX_FLAGS "${COMMON_CXX_FLAGS} /Qdiag-disable:11075 ")  # remark #11075: To get full report use -Qopt-report:4 -Qopt-report-phase ipo
 ENDIF()
-SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${SECURE_LINKER_FLAGS}")
-SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${SECURE_LINKER_FLAGS}")

+SET(CMAKE_CXX_FLAGS_DEBUG          "${CMAKE_CXX_FLAGS_DEBUG} ${COMMON_CXX_FLAGS}")
+SET(CMAKE_CXX_FLAGS_RELEASE        "${CMAKE_CXX_FLAGS_RELEASE}        ${COMMON_CXX_FLAGS} /Ox /Oi /Gy /Qinline-max-total-size- /Qinline-factor=200 /Qvec- ")
+SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} ${COMMON_CXX_FLAGS} /Ox /Oi /Gy /Qinline-max-total-size- /Qinline-factor=200 /Qvec- ")
+
+SET(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} /DEBUG")
+
+IF (${CMAKE_CXX_COMPILER_ID} STREQUAL "Intel")
+  SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /Qdiag-disable:11082 ")  # warning #11082: locally defined symbol XXX imported
+ENDIF()
 SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /IGNORE:4217")  # locally defined symbol XXX imported in function YYY (happens as the ISPC API layer uses exported library functions)
 SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /IGNORE:4049")  # warning LNK4049: locally defined symbol _rtcOccluded1M imported
+SET(CMAKE_SHARED_LINKER_FLAGS_DEBUG "${CMAKE_SHARED_LINKER_FLAGS_DEBUG} /DEBUG")

-INCLUDE(msvc_post)
+# optionally use static runtime library
+OPTION(EMBREE_STATIC_RUNTIME "Use the static version of the C/C++ runtime library." ON)
+IF (EMBREE_STATIC_RUNTIME)
+  STRING(REPLACE "/MDd" "/MTd" CMAKE_CXX_FLAGS_DEBUG ${CMAKE_CXX_FLAGS_DEBUG})
+  STRING(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_RELWITHDEBINFO ${CMAKE_CXX_FLAGS_RELWITHDEBINFO})
+  STRING(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS_RELEASE})
+ENDIF()

+# remove define NDEBUG and instead set define DEBUG for config RelWithDebInfo
+STRING(REPLACE "NDEBUG" "DEBUG" CMAKE_CXX_FLAGS_RELWITHDEBINFO ${CMAKE_CXX_FLAGS_RELWITHDEBINFO})
@@ -1,13 +0,0 @@
-## Copyright 2009-2021 Intel Corporation
-## SPDX-License-Identifier: Apache-2.0
-
-# optionally use static runtime library
-OPTION(EMBREE_STATIC_RUNTIME "Use the static version of the C/C++ runtime library." OFF)
-IF (EMBREE_STATIC_RUNTIME)
-  STRING(REPLACE "/MDd" "/MTd" CMAKE_CXX_FLAGS_DEBUG ${CMAKE_CXX_FLAGS_DEBUG})
-  STRING(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_RELWITHDEBINFO ${CMAKE_CXX_FLAGS_RELWITHDEBINFO})
-  STRING(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS_RELEASE})
-ENDIF()
-
-# remove define NDEBUG and instead set define DEBUG for config RelWithDebInfo
-STRING(REPLACE "NDEBUG" "DEBUG" CMAKE_CXX_FLAGS_RELWITHDEBINFO ${CMAKE_CXX_FLAGS_RELWITHDEBINFO})
@@ -1,163 +1,69 @@
-## Copyright 2009-2021 Intel Corporation
-## SPDX-License-Identifier: Apache-2.0
+## ======================================================================== ##
+## Copyright 2009-2017 Intel Corporation                                    ##
+##                                                                          ##
+## Licensed under the Apache License, Version 2.0 (the "License");          ##
+## you may not use this file except in compliance with the License.         ##
+## You may obtain a copy of the License at                                  ##
+##                                                                          ##
+##     http://www.apache.org/licenses/LICENSE-2.0                           ##
+##                                                                          ##
+## Unless required by applicable law or agreed to in writing, software      ##
+## distributed under the License is distributed on an "AS IS" BASIS,        ##
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ##
+## See the License for the specific language governing permissions and      ##
+## limitations under the License.                                           ##
+## ======================================================================== ##

 INCLUDE(GNUInstallDirs)

+if (NOT DEFINED EMBREE_ZIP_MODE)
+  set(EMBREE_ZIP_MODE OFF)
+endif()
+
 IF (NOT EMBREE_ZIP_MODE AND NOT WIN32 AND NOT APPLE)
-  SET(CMAKE_INSTALL_BINDIR "${CMAKE_INSTALL_BINDIR}/embree${EMBREE_VERSION_MAJOR}")
-  SET(CMAKE_INSTALL_FULL_BINDIR "${CMAKE_INSTALL_FULL_BINDIR}/embree${EMBREE_VERSION_MAJOR}")
+  SET(CMAKE_INSTALL_BINDIR ${CMAKE_INSTALL_BINDIR}/embree${EMBREE_VERSION_MAJOR})
+  SET(CMAKE_INSTALL_FULL_BINDIR ${CMAKE_INSTALL_FULL_BINDIR}/embree${EMBREE_VERSION_MAJOR})
 ENDIF()

 # use full absolute path as install name
 IF (NOT EMBREE_ZIP_MODE)
-  SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_FULL_LIBDIR}")
+  SET(CMAKE_INSTALL_NAME_DIR ${CMAKE_INSTALL_FULL_LIBDIR})
 ELSE()
  IF(APPLE)
-    SET(CMAKE_INSTALL_RPATH "@loader_path/../${CMAKE_INSTALL_LIBDIR}")
+    SET(CMAKE_INSTALL_RPATH "@loader_path/../lib")
  ELSE()
-    SET(CMAKE_INSTALL_RPATH "$ORIGIN/../${CMAKE_INSTALL_LIBDIR}")
+    SET(CMAKE_INSTALL_RPATH "$ORIGIN/../lib")
  ENDIF()
 ENDIF()

-##############################################################
-# Install SYCL specific files
-##############################################################
-
-IF (EMBREE_SYCL_SUPPORT AND EMBREE_INSTALL_DEPENDENCIES)
-  GET_FILENAME_COMPONENT(DPCPP_COMPILER_DIR ${CMAKE_CXX_COMPILER} PATH)
-
-  IF (WIN32)
-
-    FILE(GLOB LIB_SYCL_LIB_FILES LIST_DIRECTORIES FALSE
-      "${DPCPP_COMPILER_DIR}/../lib/sycl.lib"
-      "${DPCPP_COMPILER_DIR}/../lib/sycl?.lib")
-    INSTALL(FILES ${LIB_SYCL_LIB_FILES} DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT lib)
-
-    FILE(GLOB LIB_SYCL_DLL_FILES LIST_DIRECTORIES FALSE
-      "${DPCPP_COMPILER_DIR}/../bin/sycl.dll"
-      "${DPCPP_COMPILER_DIR}/../bin/sycl?.dll")
-    INSTALL(FILES ${LIB_SYCL_DLL_FILES} DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT lib)
-
-    # copy level zero dll
-    IF (EXISTS "${DPCPP_COMPILER_DIR}/pi_level_zero.dll")
-      INSTALL(FILES "${DPCPP_COMPILER_DIR}/pi_level_zero.dll" DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT lib)
-    ENDIF()
-    IF (EXISTS "${DPCPP_COMPILER_DIR}/ur_adapter_level_zero.dll")
-      INSTALL(FILES "${DPCPP_COMPILER_DIR}/ur_adapter_level_zero.dll" DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT lib)
-    ENDIF()
-
-    # copy unified runtime loader dll
-    IF(EXISTS "${DPCPP_COMPILER_DIR}/ur_loader.dll")
-      INSTALL(FILES "${DPCPP_COMPILER_DIR}/ur_loader.dll" DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT lib OPTIONAL)
-    ENDIF()
-
-    # copy proxy loader dll
-    IF(EXISTS "${DPCPP_COMPILER_DIR}/win_proxy_loader.dll")
-      INSTALL(FILES "${DPCPP_COMPILER_DIR}/win_proxy_loader.dll" DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT lib OPTIONAL)
-    ENDIF()
-    IF (EXISTS "${DPCPP_COMPILER_DIR}/pi_win_proxy_loader.dll")
-      INSTALL(FILES "${DPCPP_COMPILER_DIR}/pi_win_proxy_loader.dll" DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT lib)
-    ENDIF()
-    IF(EXISTS "${DPCPP_COMPILER_DIR}/ur_win_proxy_loader.dll")
-      INSTALL(FILES "${DPCPP_COMPILER_DIR}/ur_win_proxy_loader.dll" DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT lib OPTIONAL)
-    ENDIF()
-
-    # copy additional oneAPI dlls
-    IF(SYCL_ONEAPI_ICX)
-      IF (EXISTS "${DPCPP_COMPILER_DIR}/../redist/intel64_win/compiler/libmmd.dll")
-        INSTALL(FILES "${DPCPP_COMPILER_DIR}/../redist/intel64_win/compiler/libmmd.dll" DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT lib)
-      ENDIF()
-      IF (EXISTS "${DPCPP_COMPILER_DIR}/libmmd.dll")
-        INSTALL(FILES "${DPCPP_COMPILER_DIR}/libmmd.dll" DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT lib)
-      ENDIF()
-      IF (EXISTS "${DPCPP_COMPILER_DIR}/../redist/intel64_win/compiler/svml_dispmd.dll")
-        INSTALL(FILES "${DPCPP_COMPILER_DIR}/../redist/intel64_win/compiler/svml_dispmd.dll" DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT lib)
-      ENDIF()
-    ENDIF()
-
-  ELSE()
-
-    FILE(GLOB LIB_SYCL_FILES LIST_DIRECTORIES FALSE
-      "${DPCPP_COMPILER_DIR}/../lib/libsycl.so"
-      "${DPCPP_COMPILER_DIR}/../lib/libsycl.so.?"
-      "${DPCPP_COMPILER_DIR}/../lib/libsycl.so.?.?"
-      "${DPCPP_COMPILER_DIR}/../lib/libsycl.so.?.?.?"
-      "${DPCPP_COMPILER_DIR}/../lib/libsycl.so.?.?.?-?"
-      "${DPCPP_COMPILER_DIR}/../lib/libur_adapter_level_zero.so*"
-      "${DPCPP_COMPILER_DIR}/../lib/libur_loader.so*"
-      "${DPCPP_COMPILER_DIR}/../lib/libumf.so*")
-    INSTALL(FILES ${LIB_SYCL_FILES} DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT lib)
-
-    # copy additional oneAPI runtime libraries
-    IF(SYCL_ONEAPI_ICX)
-      IF (EXISTS "${DPCPP_COMPILER_DIR}/../compiler/lib/intel64_lin/libsvml.so")
-        INSTALL(FILES "${DPCPP_COMPILER_DIR}/../compiler/lib/intel64_lin/libsvml.so" DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT lib)
-      ENDIF()
-
-      IF (EXISTS "${DPCPP_COMPILER_DIR}/../compiler/lib/intel64_lin/libirng.so")
-        INSTALL(FILES "${DPCPP_COMPILER_DIR}/../compiler/lib/intel64_lin/libirng.so" DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT lib)
-      ENDIF()
-
-      IF (EXISTS "${DPCPP_COMPILER_DIR}/../compiler/lib/intel64_lin/libimf.so")
-        INSTALL(FILES "${DPCPP_COMPILER_DIR}/../compiler/lib/intel64_lin/libimf.so" DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT lib)
-      ENDIF()
-
-      IF (EXISTS "${DPCPP_COMPILER_DIR}/../compiler/lib/intel64_lin/libintlc.so")
-        FILE(GLOB LIB_SYCL_FILES LIST_DIRECTORIES FALSE
-          "${DPCPP_COMPILER_DIR}/../compiler/lib/intel64_lin/libintlc.so"
-          "${DPCPP_COMPILER_DIR}/../compiler/lib/intel64_lin/libintlc.so.?")
-        INSTALL(FILES ${LIB_SYCL_FILES} DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT lib)
-      ENDIF()
-    ENDIF()
-
-  ENDIF()
-
-ENDIF()
-
-##############################################################
-# Install MSVC runtime
-##############################################################
-
-IF (WIN32)
-
-  SET(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP TRUE)
-  SET(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_NO_WARNINGS TRUE)
-  INCLUDE(InstallRequiredSystemLibraries)
-  LIST(FILTER CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS INCLUDE REGEX ".*msvcp[0-9]+\.dll|.*vcruntime[0-9]+\.dll|.*vcruntime[0-9]+_[0-9]+\.dll")
-  INSTALL(FILES ${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS} DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT lib)
-
-ENDIF()
-
 ##############################################################
 # Install Headers
 ##############################################################

-INSTALL(DIRECTORY include/embree4 DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" COMPONENT devel)
-IF (NOT WIN32)
-  INSTALL(DIRECTORY man/man3 DESTINATION "${CMAKE_INSTALL_MANDIR}" COMPONENT devel)
-ENDIF()
+INSTALL(DIRECTORY include/embree2 DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} COMPONENT devel)
+CONFIGURE_FILE(include/embree2/rtcore.h rtcore.h @ONLY)
+CONFIGURE_FILE(include/embree2/rtcore.isph rtcore.isph @ONLY)
+INSTALL(FILES ${PROJECT_BINARY_DIR}/rtcore.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/embree2 COMPONENT devel)
+INSTALL(FILES ${PROJECT_BINARY_DIR}/rtcore.isph DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/embree2 COMPONENT devel)

 ##############################################################
 # Install Models
 ##############################################################
-
-IF (EMBREE_TUTORIALS)
-  INSTALL(DIRECTORY tutorials/models DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT examples)
-ENDIF()
+INSTALL(DIRECTORY tutorials/models DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT examples)

 ##############################################################
 # Install Documentation
 ##############################################################

-INSTALL(FILES "${PROJECT_SOURCE_DIR}/LICENSE.txt" DESTINATION "${CMAKE_INSTALL_DOCDIR}" COMPONENT lib)
-INSTALL(FILES "${PROJECT_SOURCE_DIR}/CHANGELOG.md" DESTINATION "${CMAKE_INSTALL_DOCDIR}" COMPONENT lib)
-INSTALL(FILES "${PROJECT_SOURCE_DIR}/README.md" DESTINATION "${CMAKE_INSTALL_DOCDIR}" COMPONENT lib)
-INSTALL(FILES "${PROJECT_SOURCE_DIR}/readme.pdf" DESTINATION "${CMAKE_INSTALL_DOCDIR}" COMPONENT lib)
-INSTALL(FILES "${PROJECT_SOURCE_DIR}/third-party-programs.txt" DESTINATION "${CMAKE_INSTALL_DOCDIR}" COMPONENT lib)
-INSTALL(FILES "${PROJECT_SOURCE_DIR}/third-party-programs-TBB.txt" DESTINATION "${CMAKE_INSTALL_DOCDIR}" COMPONENT lib)
-INSTALL(FILES "${PROJECT_SOURCE_DIR}/third-party-programs-OIDN.txt" DESTINATION "${CMAKE_INSTALL_DOCDIR}" COMPONENT lib)
-INSTALL(FILES "${PROJECT_SOURCE_DIR}/third-party-programs-DPCPP.txt" DESTINATION "${CMAKE_INSTALL_DOCDIR}" COMPONENT lib)
-INSTALL(FILES "${PROJECT_SOURCE_DIR}/third-party-programs-oneAPI-DPCPP.txt" DESTINATION "${CMAKE_INSTALL_DOCDIR}" COMPONENT lib)
+INSTALL(FILES ${PROJECT_SOURCE_DIR}/LICENSE.txt DESTINATION ${CMAKE_INSTALL_DOCDIR} COMPONENT lib)
+INSTALL(FILES ${PROJECT_SOURCE_DIR}/CHANGELOG.md DESTINATION ${CMAKE_INSTALL_DOCDIR} COMPONENT lib)
+INSTALL(FILES ${PROJECT_SOURCE_DIR}/README.md DESTINATION ${CMAKE_INSTALL_DOCDIR} COMPONENT lib)
+INSTALL(FILES ${PROJECT_SOURCE_DIR}/readme.pdf DESTINATION ${CMAKE_INSTALL_DOCDIR} COMPONENT lib)
+
+SET(CPACK_NSIS_MENU_LINKS ${CPACK_NSIS_MENU_LINKS} "${CMAKE_INSTALL_DOCDIR}/LICENSE.txt" "LICENSE")
+SET(CPACK_NSIS_MENU_LINKS ${CPACK_NSIS_MENU_LINKS} "${CMAKE_INSTALL_DOCDIR}/CHANGELOG.txt" "CHANGELOG")
+SET(CPACK_NSIS_MENU_LINKS ${CPACK_NSIS_MENU_LINKS} "${CMAKE_INSTALL_DOCDIR}/README.md" "README.md")
+SET(CPACK_NSIS_MENU_LINKS ${CPACK_NSIS_MENU_LINKS} "${CMAKE_INSTALL_DOCDIR}/readme.pdf" "readme.pdf")

 ##############################################################
 # Install scripts to set embree paths
@@ -166,15 +72,15 @@ INSTALL(FILES "${PROJECT_SOURCE_DIR}/third-party-programs-oneAPI-DPCPP.txt" DEST
 IF (EMBREE_ZIP_MODE)
  IF (WIN32)
  ELSEIF(APPLE)
-    CONFIGURE_FILE("${PROJECT_SOURCE_DIR}/scripts/install_macosx/embree-vars.sh" embree-vars.sh @ONLY)
-    CONFIGURE_FILE("${PROJECT_SOURCE_DIR}/scripts/install_macosx/embree-vars.csh" embree-vars.csh @ONLY)
-    INSTALL(FILES "${PROJECT_BINARY_DIR}/embree-vars.sh" DESTINATION "." COMPONENT lib)
-    INSTALL(FILES "${PROJECT_BINARY_DIR}/embree-vars.csh" DESTINATION "." COMPONENT lib)
+    CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/scripts/install_macosx/embree-vars.sh embree-vars.sh @ONLY)
+    CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/scripts/install_macosx/embree-vars.csh embree-vars.csh @ONLY)
+    INSTALL(FILES ${PROJECT_BINARY_DIR}/embree-vars.sh DESTINATION "." COMPONENT lib)
+    INSTALL(FILES ${PROJECT_BINARY_DIR}/embree-vars.csh DESTINATION "." COMPONENT lib)
  ELSE()
-    CONFIGURE_FILE("${PROJECT_SOURCE_DIR}/scripts/install_linux/embree-vars.sh" embree-vars.sh @ONLY)
-    CONFIGURE_FILE("${PROJECT_SOURCE_DIR}/scripts/install_linux/embree-vars.csh" embree-vars.csh @ONLY)
-    INSTALL(FILES "${PROJECT_BINARY_DIR}/embree-vars.sh" DESTINATION "." COMPONENT lib)
-    INSTALL(FILES "${PROJECT_BINARY_DIR}/embree-vars.csh" DESTINATION "." COMPONENT lib)
+    CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/scripts/install_linux/embree-vars.sh embree-vars.sh @ONLY)
+    CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/scripts/install_linux/embree-vars.csh embree-vars.csh @ONLY)
+    INSTALL(FILES ${PROJECT_BINARY_DIR}/embree-vars.sh DESTINATION "." COMPONENT lib)
+    INSTALL(FILES ${PROJECT_BINARY_DIR}/embree-vars.csh DESTINATION "." COMPONENT lib)
  ENDIF()
 ENDIF()

@@ -188,164 +94,171 @@ ELSE()
  SET(EMBREE_CONFIG_VERSION ${EMBREE_VERSION_MAJOR})
 ENDIF()

-# why does this have to be so complicated...
-IF (EMBREE_STATIC_LIB)
-  SET(EMBREE_LIBRARY_FULLNAME ${CMAKE_STATIC_LIBRARY_PREFIX}${EMBREE_LIBRARY_NAME}${CMAKE_STATIC_LIBRARY_SUFFIX})
-ELSE()
-  IF (WIN32)
-    SET(EMBREE_LIBRARY_FULLNAME ${CMAKE_IMPORT_LIBRARY_PREFIX}${EMBREE_LIBRARY_NAME}${CMAKE_IMPORT_LIBRARY_SUFFIX})
-  ELSEIF (APPLE)
-    SET(EMBREE_LIBRARY_FULLNAME ${CMAKE_SHARED_LIBRARY_PREFIX}${EMBREE_LIBRARY_NAME}.${EMBREE_CONFIG_VERSION}${CMAKE_SHARED_LIBRARY_SUFFIX})
-  ELSE()
-    SET(EMBREE_LIBRARY_FULLNAME ${CMAKE_SHARED_LIBRARY_PREFIX}${EMBREE_LIBRARY_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}.${EMBREE_CONFIG_VERSION})
-  ENDIF()
+IF (APPLE AND NOT EMBREE_ZIP_MODE)
+  CONFIGURE_FILE(scripts/install_macosx/uninstall.command uninstall.command @ONLY)
+  INSTALL(PROGRAMS "${PROJECT_BINARY_DIR}/uninstall.command" DESTINATION ${CMAKE_INSTALL_BINDIR}/.. COMPONENT lib)
 ENDIF()

-#IF (WIN32 OR EMBREE_ZIP_MODE)
+IF (WIN32)
+  SET(EMBREE_LIBRARY_NAME embree.lib)
+ELSE()
+  SET(EMBREE_LIBRARY_NAME ${CMAKE_SHARED_LIBRARY_PREFIX}embree${CMAKE_SHARED_LIBRARY_SUFFIX})
+ENDIF()
+IF (WIN32 OR EMBREE_ZIP_MODE)
  # for local "installs" and on Windows we want the cmake config files placed
  # in the install root, such that users can point the CMake variable
  # embree_DIR just to the install folder
-#  SET(EMBREE_CMAKECONFIG_DIR ".")
-#  SET(EMBREE_CMAKEEXPORT_DIR "cmake")
-#  SET(EMBREE_RELATIVE_ROOT_DIR ".")
-#ELSE()
-SET(EMBREE_CMAKECONFIG_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/embree-${EMBREE_VERSION}")
-SET(EMBREE_CMAKEEXPORT_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/embree-${EMBREE_VERSION}")
-IF (WIN32)
-  SET(EMBREE_RELATIVE_ROOT_DIR "../../../")
+  SET(EMBREE_CMAKECONFIG_DIR ".")
+  SET(EMBREE_RELATIV_ROOT_DIR ".")
 ELSE()
-  FILE(RELATIVE_PATH EMBREE_RELATIVE_ROOT_DIR "/${EMBREE_CMAKECONFIG_DIR}" "/")
+  SET(EMBREE_CMAKECONFIG_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/embree-${EMBREE_VERSION}")
+  SET(EMBREE_RELATIV_ROOT_DIR "../../..")
 ENDIF()
-#ENDIF()
-
 CONFIGURE_FILE(common/cmake/embree-config.cmake embree-config-install.cmake @ONLY)
 CONFIGURE_FILE(common/cmake/embree-config-version.cmake embree-config-version.cmake @ONLY)
 # create a config file for the build directory
 CONFIGURE_FILE(common/cmake/embree-config-builddir.cmake embree-config.cmake @ONLY)

-INSTALL(FILES "${PROJECT_BINARY_DIR}/embree-config-install.cmake" DESTINATION "${EMBREE_CMAKECONFIG_DIR}" RENAME "embree-config.cmake" COMPONENT devel)
-INSTALL(FILES "${PROJECT_BINARY_DIR}/embree-config-version.cmake" DESTINATION "${EMBREE_CMAKECONFIG_DIR}" COMPONENT devel)
+INSTALL(FILES "${PROJECT_BINARY_DIR}/embree-config-install.cmake" DESTINATION ${EMBREE_CMAKECONFIG_DIR} RENAME "embree-config.cmake" COMPONENT devel)
+INSTALL(FILES "${PROJECT_BINARY_DIR}/embree-config-version.cmake" DESTINATION ${EMBREE_CMAKECONFIG_DIR} COMPONENT devel)

 ##############################################################
 # CPack specific stuff
 ##############################################################

-SET(CPACK_PACKAGE_NAME "Intel(R) Embree Ray Tracing Kernels")
-SET(CPACK_PACKAGE_FILE_NAME "embree-${EMBREE_VERSION}${EMBREE_VERSION_NOTE}")
-IF (EMBREE_SYCL_SUPPORT)
-  SET(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_FILE_NAME}.sycl")
-  SET(EMBREE_VERSION_SUFFIX)
-ENDIF()
-#SET(CPACK_PACKAGE_ICON "${PROJECT_SOURCE_DIR}/embree-doc/images/icon.png")
+SET(CPACK_PACKAGE_NAME "Embree")
+SET(CPACK_PACKAGE_FILE_NAME "embree-${EMBREE_VERSION}")
+#SET(CPACK_PACKAGE_ICON ${PROJECT_SOURCE_DIR}/embree-doc/images/icon.png)
 #SET(CPACK_PACKAGE_RELOCATABLE TRUE)
-IF(NOT WIN32)
-  SET(CPACK_STRIP_FILES TRUE)
-ENDIF()
+SET(CPACK_STRIP_FILES TRUE)

 SET(CPACK_PACKAGE_VERSION_MAJOR ${EMBREE_VERSION_MAJOR})
 SET(CPACK_PACKAGE_VERSION_MINOR ${EMBREE_VERSION_MINOR})
 SET(CPACK_PACKAGE_VERSION_PATCH ${EMBREE_VERSION_PATCH})
-SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Intel(R) Embree implements high performance ray tracing kernels including acceleration structure construction and traversal.")
+SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Embree: High Performance Ray Tracing Kernels")
 SET(CPACK_PACKAGE_VENDOR "Intel Corporation")
 SET(CPACK_PACKAGE_CONTACT embree_support@intel.com)

-
-SET(CPACK_ARCHIVE_COMPONENT_INSTALL ON)
-SET(CPACK_COMPONENTS_GROUPING ONE_PER_GROUP)
-
 SET(CPACK_COMPONENT_LIB_DISPLAY_NAME "Library")
 SET(CPACK_COMPONENT_LIB_DESCRIPTION "The Embree library including documentation.")
-SET(CPACK_COMPONENT_LIB_GROUP "embree")

 SET(CPACK_COMPONENT_DEVEL_DISPLAY_NAME "Development")
 SET(CPACK_COMPONENT_DEVEL_DESCRIPTION "Header Files for C and ISPC required to develop applications with Embree.")
-SET(CPACK_COMPONENT_DEVEL_GROUP "embree")

 SET(CPACK_COMPONENT_EXAMPLES_DISPLAY_NAME "Examples")
 SET(CPACK_COMPONENT_EXAMPLES_DESCRIPTION "Tutorials demonstrating how to use Embree.")
-SET(CPACK_COMPONENT_EXAMPLES_GROUP "embree")
-
-SET(CPACK_COMPONENT_TESTING_DISPLAY_NAME "Testing")
-SET(CPACK_COMPONENT_TESTING_DESCRIPTION "Models and reference images for tests")
-SET(CPACK_COMPONENT_TESTING_GROUP "embree-testing")

 # dependencies between components
-#SET(CPACK_COMPONENT_DEVEL_DEPENDS lib)
-#SET(CPACK_COMPONENT_EXAMPLES_DEPENDS lib)
-#SET(CPACK_COMPONENT_LIB_REQUIRED ON) # always install the libs
+SET(CPACK_COMPONENT_DEVEL_DEPENDS lib)
+SET(CPACK_COMPONENT_EXAMPLES_DEPENDS lib)
+SET(CPACK_COMPONENT_LIB_REQUIRED ON) # always install the libs

 # point to readme and license files
-SET(CPACK_RESOURCE_FILE_README "${PROJECT_SOURCE_DIR}/README.md")
-SET(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/LICENSE.txt")
+SET(CPACK_RESOURCE_FILE_README ${PROJECT_SOURCE_DIR}/README.md)
+SET(CPACK_RESOURCE_FILE_LICENSE ${PROJECT_SOURCE_DIR}/LICENSE.txt)

 # Windows specific settings
 IF(WIN32)
+
  IF (CMAKE_SIZEOF_VOID_P EQUAL 8)
    SET(ARCH x64)
-    SET(CPACK_PACKAGE_NAME "${CPACK_PACKAGE_NAME} x64")
+    SET(PROGRAMFILES "\$PROGRAMFILES64")
+	SET(CPACK_PACKAGE_NAME "${CPACK_PACKAGE_NAME} x64")
  ELSE()
    SET(ARCH win32)
-    SET(CPACK_PACKAGE_NAME "${CPACK_PACKAGE_NAME} Win32")
+    SET(PROGRAMFILES "\$PROGRAMFILES")
+	SET(CPACK_PACKAGE_NAME "${CPACK_PACKAGE_NAME} Win32")
  ENDIF()

-  SET(CPACK_GENERATOR ZIP)
-  SET(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_FILE_NAME}.${ARCH}.windows")
-  SET(PACKAGE_BASE_NAME "${CPACK_PACKAGE_FILE_NAME}")
-  SET(PACKAGE_EXT "zip")
+  # NSIS specific settings
+  IF (NOT EMBREE_ZIP_MODE)
+    SET(CPACK_GENERATOR NSIS)
+    SET(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_FILE_NAME}.${ARCH}")
+    SET(CPACK_COMPONENTS_ALL lib devel examples)
+    SET(CPACK_NSIS_INSTALL_ROOT "${PROGRAMFILES}\\\\Intel")
+    SET(CPACK_PACKAGE_INSTALL_DIRECTORY "Embree v${EMBREE_VERSION} ${ARCH}")
+    SET(CPACK_NSIS_DISPLAY_NAME "Embree v${EMBREE_VERSION} ${ARCH}")
+    SET(CPACK_NSIS_PACKAGE_NAME "Embree v${EMBREE_VERSION} ${ARCH}")
+    SET(CPACK_NSIS_URL_INFO_ABOUT http://embree.github.io/)
+    #SET(CPACK_NSIS_HELP_LINK http://embree.github.io/downloads.html#windows)
+    SET(CPACK_NSIS_MUI_ICON ${PROJECT_SOURCE_DIR}/scripts/install_windows/icon32.ico)
+    SET(CPACK_NSIS_CONTACT ${CPACK_PACKAGE_CONTACT})
+	#SET(CPACK_NSIS_EXTRA_PREINSTALL_COMMANDS ${CPACK_NSIS_EXTRA_PREINSTALL_COMMANDS} "\n CreateDirectory \\\"$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\"")
+	#SET(CPACK_NSIS_EXTRA_PREINSTALL_COMMANDS ${CPACK_NSIS_EXTRA_PREINSTALL_COMMANDS} "\n CreateDirectory \\\"$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\documentation\\\"")
+	#SET(CPACK_NSIS_EXTRA_PREINSTALL_COMMANDS ${CPACK_NSIS_EXTRA_PREINSTALL_COMMANDS} "\n CreateDirectory \\\"$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\tutorials\\\" \n")
+	#SET(CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS  ${CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS} "\n ${UNINSTALL_LIST}\n RMDir \\\"$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\documentation\\\"")
+	#SET(CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS  ${CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS} "\n ${UNINSTALL_LIST}\n RMDir \\\"$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\tutorials\\\"")
+	#SET(CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS  ${CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS} "\n ${UNINSTALL_LIST}\n RMDir \\\"$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\"\n")
+    IF (EMBREE_TESTING_PACKAGE)
+      ADD_TEST(NAME "BuildPackage" WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${PROJECT_SOURCE_DIR}/scripts/package_win.bat ${CPACK_PACKAGE_FILE_NAME}.exe ${CMAKE_BUILD_TYPE})
+    ENDIF()
+  ELSE()
+    SET(CPACK_GENERATOR ZIP)
+    SET(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_FILE_NAME}.${ARCH}.windows")
+    SET(CPACK_MONOLITHIC_INSTALL 1)
+    IF (EMBREE_TESTING_PACKAGE)
+      ADD_TEST(NAME "BuildPackage" WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${PROJECT_SOURCE_DIR}/scripts/package_win.bat  ${CPACK_PACKAGE_FILE_NAME}.zip ${CMAKE_BUILD_TYPE})
+    ENDIF()
+  ENDIF()

 # MacOSX specific settings
 ELSEIF(APPLE)

  CONFIGURE_FILE(README.md README.txt)
-  SET(CPACK_RESOURCE_FILE_README "${PROJECT_BINARY_DIR}/README.txt")
+  SET(CPACK_RESOURCE_FILE_README ${PROJECT_BINARY_DIR}/README.txt)

-  SET(CPACK_GENERATOR ZIP)
-  IF (EMBREE_ARM)
-    SET(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_FILE_NAME}.arm64.macosx")
+  IF (NOT EMBREE_ZIP_MODE)
+    SET(CPACK_PACKAGING_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})
+    SET(CPACK_GENERATOR PackageMaker)
+    SET(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_FILE_NAME}.x86_64")
+    #SET(CPACK_COMPONENTS_ALL lib devel examples)
+    SET(CPACK_MONOLITHIC_INSTALL 1)
+    SET(CPACK_PACKAGE_NAME embree-${EMBREE_VERSION})
+    SET(CPACK_PACKAGE_VENDOR "intel") # creates short name com.intel.embree2.xxx in pkgutil
+    SET(CPACK_OSX_PACKAGE_VERSION 10.7)
+    IF (EMBREE_TESTING_PACKAGE)
+      ADD_TEST(NAME "BuildPackage" WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${PROJECT_SOURCE_DIR}/scripts/package_macosx.sh ${CMAKE_BUILD_TYPE} ${CPACK_PACKAGE_FILE_NAME}.dmg)
+    ENDIF()
  ELSE()
+    SET(CPACK_GENERATOR TGZ)
    SET(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_FILE_NAME}.x86_64.macosx")
+    SET(CPACK_MONOLITHIC_INSTALL 1)
+    IF (EMBREE_TESTING_PACKAGE)
+      ADD_TEST(NAME "BuildPackage" WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${PROJECT_SOURCE_DIR}/scripts/package_macosx.sh ${CMAKE_BUILD_TYPE} ${CPACK_PACKAGE_FILE_NAME}.tgz)
+    ENDIF()
  ENDIF()
-  SET(PACKAGE_BASE_NAME "${CPACK_PACKAGE_FILE_NAME}")
-  SET(PACKAGE_EXT "zip")
-
-  add_custom_target(
-    post_package_notarize "${PROJECT_SOURCE_DIR}/scripts/package_post_build_notarize_macosx.sh" ${PACKAGE_BASE_NAME} ${EMBREE_SIGN_FILE}
-  )

 # Linux specific settings
 ELSE()
-  SET(CPACK_GENERATOR TGZ)
-  SET(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_FILE_NAME}.x86_64.linux")
-  SET(PACKAGE_BASE_NAME "${CPACK_PACKAGE_FILE_NAME}")
-  SET(PACKAGE_EXT "tar.gz")
-  IF (EMBREE_SYCL_SUPPORT)
-    SET(EMBREE_VERSION_SYCL_SUFFIX ".sycl")
+
+
+  IF (NOT EMBREE_ZIP_MODE)
+
+    SET(CPACK_GENERATOR RPM)
+    SET(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_FILE_NAME}-${CPACK_RPM_PACKAGE_RELEASE}.x86_64")
+    SET(CPACK_COMPONENTS_ALL devel lib examples)
+    SET(CPACK_RPM_COMPONENT_INSTALL ON)
+    SET(CPACK_RPM_PACKAGE_LICENSE "ASL 2.0") # Apache Software License, Version 2.0
+    SET(CPACK_RPM_PACKAGE_GROUP "Development/Libraries")
+    #SET(CPACK_RPM_CHANGELOG_FILE "") # ChangeLog of the RPM; also CHANGELOG.md is not in the required format
+    SET(CPACK_RPM_PACKAGE_ARCHITECTURE x86_64)
+    SET(CPACK_RPM_PACKAGE_URL http://embree.github.io/)
+    SET(CPACK_RPM_DEFAULT_DIR_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) # otherwise cmake directory has wrong 775 permissions
+
+    # post install and uninstall scripts
+    SET(CPACK_RPM_lib_POST_INSTALL_SCRIPT_FILE ${PROJECT_SOURCE_DIR}/common/cmake/rpm_ldconfig.sh)
+    SET(CPACK_RPM_lib_POST_UNINSTALL_SCRIPT_FILE ${PROJECT_SOURCE_DIR}/common/cmake/rpm_ldconfig.sh)
+    IF (EMBREE_TESTING_PACKAGE)
+      ADD_TEST(NAME "BuildPackage" WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${PROJECT_SOURCE_DIR}/scripts/package_linux.sh ${EMBREE_ZIP_MODE} ${EMBREE_VERSION})
+    ENDIF()
+  ELSE()
+  
+    SET(CPACK_GENERATOR TGZ)
+    SET(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_FILE_NAME}.x86_64.linux")
+    SET(CPACK_MONOLITHIC_INSTALL 1)
+    IF (EMBREE_TESTING_PACKAGE)
+      ADD_TEST(NAME "BuildPackage" WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${PROJECT_SOURCE_DIR}/scripts/package_linux.sh ${EMBREE_ZIP_MODE} ${EMBREE_VERSION})
+    ENDIF()
  ENDIF()
+  
 ENDIF()
-
-
-add_custom_target(
-  build ${CMAKE_COMMAND} --build . --config ${CMAKE_BUILD_TYPE} --target package -j8
-  COMMAND ${CMAKE_COMMAND} -DPACKAGE_BASENAME=${PACKAGE_BASE_NAME} -DPACKAGE_EXT=${PACKAGE_EXT} -P ${PROJECT_SOURCE_DIR}/scripts/package_build.cmake
-)
-
-add_custom_target(
-  test_package ${CMAKE_COMMAND} -DWHAT="UNPACK" -DPACKAGE_BASENAME=${PACKAGE_BASE_NAME} -DPACKAGE_EXT=${PACKAGE_EXT} -P ${PROJECT_SOURCE_DIR}/scripts/package_test.cmake
-  COMMAND cd embree_install/testing && ${CMAKE_COMMAND} -B build -DEMBREE_TESTING_INTENSITY=${EMBREE_TESTING_INTENSITY}
-  COMMAND ctest --test-dir ${CMAKE_CURRENT_BINARY_DIR}/embree_install/testing/build -VV -C ${CMAKE_BUILD_TYPE} --output-log ctest.output 
-  COMMAND ${CMAKE_COMMAND} -DWHAT="CHECK" -P ${PROJECT_SOURCE_DIR}/scripts/package_test.cmake
-)
-
-
-if(WIN32)
-  set(INTEGRATE_BINARY "./build/Release/test.exe")
-else()
-  set(INTEGRATE_BINARY "./build/test")
-endif()
-
-add_custom_target(
-  test_integration ${CMAKE_COMMAND} -DWHAT="UNPACK" -DPACKAGE_BASENAME=${PACKAGE_BASE_NAME} -DPACKAGE_EXT=${PACKAGE_EXT} -P ${PROJECT_SOURCE_DIR}/scripts/package_test.cmake 
-  COMMAND cd ${PROJECT_SOURCE_DIR}/tests/integration/test_embree_release && ${CMAKE_COMMAND} -B build --preset ${EMBREE_TESTING_INTEGRATION_PRESET} -Dembree_DIR="${CMAKE_CURRENT_BINARY_DIR}/embree_install/lib/cmake/embree-${EMBREE_VERSION}"
-  COMMAND cd ${PROJECT_SOURCE_DIR}/tests/integration/test_embree_release && ${CMAKE_COMMAND} --build build --config Release
-  COMMAND cd ${PROJECT_SOURCE_DIR}/tests/integration/test_embree_release && ${INTEGRATE_BINARY}
-)
@@ -1,4 +1 @@
-## Copyright 2009-2021 Intel Corporation
-## SPDX-License-Identifier: Apache-2.0
-
 /sbin/ldconfig
@@ -1,569 +1,148 @@
-## Copyright 2009-2021 Intel Corporation
-## SPDX-License-Identifier: Apache-2.0
-if (BUILD_TESTING OR EMBREE_TESTING_INSTALL_TESTS)
+## ======================================================================== ##
+## Copyright 2009-2017 Intel Corporation                                    ##
+##                                                                          ##
+## Licensed under the Apache License, Version 2.0 (the "License");          ##
+## you may not use this file except in compliance with the License.         ##
+## You may obtain a copy of the License at                                  ##
+##                                                                          ##
+##     http://www.apache.org/licenses/LICENSE-2.0                           ##
+##                                                                          ##
+## Unless required by applicable law or agreed to in writing, software      ##
+## distributed under the License is distributed on an "AS IS" BASIS,        ##
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ##
+## See the License for the specific language governing permissions and      ##
+## limitations under the License.                                           ##
+## ======================================================================== ##

-  INCLUDE(CTest)
+IF(NOT BUILD_TESTING)
+  SET(BUILD_TESTING OFF CACHE BOOL "Build the testing tree.")
+ENDIF()

-  if (EMBREE_TESTING_INSTALL_TESTS)
-    SET(EMBREE_INSTALL_CTESTTESTFILE "${CMAKE_CURRENT_BINARY_DIR}/embree-addtests.cmake")
-    file(WRITE "${EMBREE_INSTALL_CTESTTESTFILE}" "")
-  endif()
+INCLUDE(CTest)

-  if (NOT EMBREE_TESTING_PACKAGE_TEST_PROJECT)
-    IF (WIN32)
-        IF("${CMAKE_CXX_COMPILER_ID}" MATCHES "MSVC")
-          SET(MY_PROJECT_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_BUILD_TYPE}")
-        ELSE()
-          SET(MY_PROJECT_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}")
-        ENDIF()
-    ELSE()
-        SET(MY_PROJECT_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}")
-    ENDIF()
-  else()
-    SET(MY_PROJECT_BINARY_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../${EMBREE_INSTALL_BINDIR}")
-  endif()
-
-  if (NOT EMBREE_TESTING_PACKAGE_TEST_PROJECT)
-    SET(EMBREE_TESTING_INTENSITY 1 CACHE STRING "Intensity of testing (0 = no testing, 1 = verify and tutorials, 2 = light testing, 3 = intensive testing, 4 = very intensive testing.")
-    SET_PROPERTY(CACHE EMBREE_TESTING_INTENSITY PROPERTY STRINGS 0 1 2 3 4)
-    SET(EMBREE_TESTING_ONLY_SYCL_TESTS OFF CACHE BOOL "Run only tests with the sycl support.")
-    SET(EMBREE_TESTING_MEMCHECK OFF CACHE BOOL "Turns on memory checking for some tests.")
-    SET(EMBREE_TESTING_BENCHMARK OFF CACHE BOOL "Turns benchmarking on.")
-    SET(EMBREE_TESTING_BENCHMARK_DATABASE "${PROJECT_BINARY_DIR}" CACHE PATH "Path to database for benchmarking.")
-    SET(EMBREE_TESTING_PACKAGE OFF CACHE BOOL "Packages release as test.")
-    SET(EMBREE_TESTING_KLOCWORK OFF CACHE BOOL "Runs Kocwork as test.")
-    SET(EMBREE_TESTING_SDE OFF CACHE STRING "Uses SDE to run tests for specified CPU.")
-    SET_PROPERTY(CACHE EMBREE_TESTING_SDE PROPERTY STRINGS OFF pnr nhm wsm snb ivb hsw bdw knl skl skx cnl)
-  endif()
-
-  FUNCTION (SET_EMBREE_TEST_PROPERTIES testname)
-    SET(variants "_cpp;_ispc;_sycl")
-    foreach(v ${variants})
-      if (v STREQUAL "_cpp")
-        SET(v "")
-      endif()
-      set(testnamedef "EMBREE_TEST_${testname}${v}_DEFINED")
-      if(${testnamedef})
-        SET_TESTS_PROPERTIES(${testname}${v} ${ARGN})
-      endif()
-    endforeach()
-
-    if (EMBREE_TESTING_INSTALL_TESTS)
-      file(APPEND "${EMBREE_INSTALL_CTESTTESTFILE}" "SET_EMBREE_TEST_PROPERTIES(${testname} ${ARGN}) \n")
-    endif()
-  ENDFUNCTION()
-
-  MACRO (ADD_EMBREE_GENERIC_TEST testname executable)  
-    ADD_TEST(NAME ${testname}
-             WORKING_DIRECTORY "${MY_PROJECT_BINARY_DIR}"
-             COMMAND ${executable} ${ARGN})
-    SET(testnamedef EMBREE_TEST_${testname}_DEFINED)
-    SET(${testnamedef} "1" CACHE INTERNAL "")
-  ENDMACRO()
-
-  MACRO (ADD_EMBREE_GENERIC_CPP_TEST testname executable)  
-    if((NOT ${EMBREE_SYCL_SUPPORT}) OR (NOT ${EMBREE_TESTING_ONLY_SYCL_TESTS}))
-      ADD_TEST(NAME ${testname}
-               WORKING_DIRECTORY "${MY_PROJECT_BINARY_DIR}"
-               COMMAND ${executable} ${ARGN})
-      SET(testnamedef EMBREE_TEST_${testname}_DEFINED)
-      SET(${testnamedef} "1" CACHE INTERNAL "")
-    endif()
-  ENDMACRO()
-
-  MACRO (ADD_EMBREE_GENERIC_ISPC_TEST testname executable)  
-    if((NOT ${EMBREE_SYCL_SUPPORT}) OR (NOT ${EMBREE_TESTING_ONLY_SYCL_TESTS}))
-      IF (EMBREE_ISPC_SUPPORT AND EMBREE_RAY_PACKETS)
-        ADD_TEST(NAME ${testname}_ispc
-                 WORKING_DIRECTORY "${MY_PROJECT_BINARY_DIR}"
-                 COMMAND ${executable}_ispc ${ARGN})
-        SET(testnamedef EMBREE_TEST_${testname}_ispc_DEFINED)
-        SET(${testnamedef} "1" CACHE INTERNAL "")
-      ENDIF()       
-    endif()
-  ENDMACRO()
-
-  MACRO (ADD_EMBREE_GENERIC_SYCL_TEST testname executable)  
-    IF (EMBREE_SYCL_SUPPORT)
-      ADD_TEST(NAME ${testname}_sycl
-               WORKING_DIRECTORY ${MY_PROJECT_BINARY_DIR}
-               COMMAND ${executable}_sycl ${ARGN})
-      SET(testnamedef EMBREE_TEST_${testname}_sycl_DEFINED)
-      SET(${testnamedef} 1 CACHE INTERNAL "")
-      SET_TESTS_PROPERTIES(${testname}_sycl PROPERTIES TIMEOUT 150)
-    ENDIF()
-  ENDMACRO()
+IF (BUILD_TESTING)

+  CMAKE_HOST_SYSTEM_INFORMATION(RESULT memory QUERY TOTAL_PHYSICAL_MEMORY)
  
+  SET(EMBREE_TESTING_MODEL_DIR "${PROJECT_SOURCE_DIR}/models" CACHE PATH "Path to the folder containing the Embree models for regression testing.")
+  SET(EMBREE_TESTING_INTENSIVE OFF CACHE BOOL "Turns intensive testing on.")
+  SET(EMBREE_TESTING_MEMCHECK OFF CACHE BOOL "Turns on memory checking for some tests.")
+  SET(EMBREE_TESTING_BENCHMARK OFF CACHE BOOL "Turns benchmarking on.")
+  SET(EMBREE_TESTING_BENCHMARK_DATABASE "${PROJECT_BINARY_DIR}" CACHE PATH "Path to database for benchmarking.")
+  SET(EMBREE_TESTING_PACKAGE OFF CACHE BOOL "Packages release as test.")
+  SET(EMBREE_TESTING_KLOCWORK OFF CACHE BOOL "Runs Kocwork as test.")

+  SET(EMBREE_TESTING_SDE OFF CACHE STRING "Uses SDE to run tests for specified CPU.")
+  SET_PROPERTY(CACHE EMBREE_TESTING_SDE PROPERTY STRINGS OFF pnr nhm wsm snb ivb hsw bdw knl skl skx cnl)

+  IF(   NOT EXISTS "${EMBREE_TESTING_MODEL_DIR}/embree-models-subdiv.txt"
+     OR NOT EXISTS "${EMBREE_TESTING_MODEL_DIR}/embree-models-small-win32.txt"
+     OR NOT EXISTS "${EMBREE_TESTING_MODEL_DIR}/embree-models-small-x64.txt"
+     OR NOT EXISTS "${EMBREE_TESTING_MODEL_DIR}/embree-models-large.txt")
+    MESSAGE(FATAL_ERROR "Invalid Embree testing model repository. Either disable BUILD_TESTING or properly set EMBREE_TESTING_MODEL_DIR.")
+  ENDIF()
+  
+  FILE(READ "${EMBREE_TESTING_MODEL_DIR}/embree-models-subdiv.txt" models_subdiv)
+  STRING(REGEX REPLACE "\n" ";" models_subdiv "${models_subdiv}")
+  
+  FILE(READ "${EMBREE_TESTING_MODEL_DIR}/embree-models-small-win32.txt" models_small_win32)
+  STRING(REGEX REPLACE "\n" ";" models_small_win32 "${models_small_win32}")
+  
+  FILE(READ "${EMBREE_TESTING_MODEL_DIR}/embree-models-small-x64.txt" models_small_x64)
+  STRING(REGEX REPLACE "\n" ";" models_small_x64 "${models_small_x64}")
+  
+  FILE(READ "${EMBREE_TESTING_MODEL_DIR}/embree-models-large.txt" models_large)
+  STRING(REGEX REPLACE "\n" ";" models_large "${models_large}")

-
-
-
-
-
-
-
-
-
-
-
-
-
-
-  # Checks if the current cmake configuration is compatible with <condition>
-  # condition may be a triple of CMAKE_VARIABLE_NAME op VALUE
-  # supported operators for op are: ==, !=, <, <=, >, >=
-  FUNCTION (EMBREE_TESTING_CHECK_OPTION out condition)  
-    # parse condition into list
-    string(REGEX MATCHALL "([^\ ]+\ |[^\ ]+$)" tokens "${condition}")
-    LIST(LENGTH tokens token_count)
-    IF (NOT ${token_count} EQUAL 3)
-      message(FATAL_ERROR "illegal embree_opitons condition: ${condition}")
+  IF (EMBREE_TESTING_INTENSIVE)
+    SET(models ${models_small_x64})
+    IF (${memory} GREATER 10000) 
+      SET(models ${models} ${models_large})
    ENDIF()
+  ELSE()
+    SET(models ${models_small_win32})
+  ENDIF()

-    # we require every condition to follow the scheme "variable_name op value"
-    LIST(GET tokens 0 option)
-    LIST(GET tokens 1 comp)
-    LIST(GET tokens 2 value)
-
-    STRING(STRIP ${option} option)
-    STRING(STRIP ${comp} comp)
-    STRING(STRIP ${value} value)
-
-    SET(${out} 0 PARENT_SCOPE)
-    if ("${comp}" STREQUAL "==")
-      if ("${${option}}" STREQUAL "${value}")
-        SET(${out} 1 PARENT_SCOPE)
-      endif()
-    elseif ("${comp}" STREQUAL "!=")
-      if (NOT ("${${option}}" STREQUAL "${value}"))
-        SET(${out} 1 PARENT_SCOPE)
-      endif()
-    elseif ("${comp}" STREQUAL ">")
-      if ("${${option}}" GREATER "${value}")
-        SET(${out} 1 PARENT_SCOPE)
-      endif()
-    elseif ("${comp}" STREQUAL ">=")
-      if ("${${option}}" GREATER_EQUAL "${value}")
-        SET(${out} 1 PARENT_SCOPE)
-      endif()
-    elseif ("${comp}" STREQUAL "<")
-      if ("${${option}}" LESS "${value}")
-        SET(${out} 1 PARENT_SCOPE)
-      endif()
-    elseif ("${comp}" STREQUAL "<=")
-      if ("${${option}}" LESS_EQUAL "${value}")
-        SET(${out} 1 PARENT_SCOPE)
-      endif()
-    else()
-      message(FATAL_ERROR "Could not parse embree_option condition: ${condition}")
-    endif()
-
-  ENDFUNCTION()
-
-  # Checks multiple options from a list with EMBREE_TESTING_CHECK_OPTION
-  FUNCTION (EMBREE_TESTING_CHECK_OPTIONS_LIST out conditions)  
-    SET(${out} 1 PARENT_SCOPE)
-    FOREACH (c ${conditions})
-      EMBREE_TESTING_CHECK_OPTION(myout ${c})
-
-      IF (myout EQUAL 0)
-        SET(${out} 0 PARENT_SCOPE)
-        BREAK()
-      ENDIF()
+  IF (WIN32)
+    SET(MY_PROJECT_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_BUILD_TYPE}")
+  ELSE()
+    SET(MY_PROJECT_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}")
+  ENDIF()
+  
+  MACRO (ADD_EMBREE_MODEL_TEST name reference executable args model)
+  
+    ADD_TEST(NAME ${name}
+             WORKING_DIRECTORY ${MY_PROJECT_BINARY_DIR}
+             COMMAND python ${PROJECT_SOURCE_DIR}/scripts/invoke_test.py
+                     --name ${name}
+                     --modeldir ${EMBREE_TESTING_MODEL_DIR}
+                     --reference ${reference}
+                     --model ${model}
+                     --sde ${EMBREE_TESTING_SDE}
+                     --execute ${MY_PROJECT_BINARY_DIR}/${executable} ${args})
+                     
+    IF (EMBREE_ISPC_SUPPORT AND EMBREE_RAY_PACKETS)
+      ADD_TEST(NAME ${name}_ispc
+               WORKING_DIRECTORY ${MY_PROJECT_BINARY_DIR}
+               COMMAND python ${PROJECT_SOURCE_DIR}/scripts/invoke_test.py
+                       --name ${name}_ispc
+                       --modeldir ${EMBREE_TESTING_MODEL_DIR}
+                       --reference ${reference}
+                       --model ${model}
+                       --sde ${EMBREE_TESTING_SDE}
+                       --execute ${MY_PROJECT_BINARY_DIR}/${executable}_ispc ${args})
+    ENDIF()
+  ENDMACRO()
+  
+  MACRO (ADD_EMBREE_MODELS_TEST name reference executable)
+    FOREACH (model ${models})
+      STRING(REGEX REPLACE "/" "_" modelname "${model}")
+      STRING(REGEX REPLACE ".ecs" "" modelname "${modelname}")
+      ADD_EMBREE_MODEL_TEST(${name}_${modelname} ${reference}_${modelname} ${executable} "${ARGN}" ${model})
    ENDFOREACH()
+  ENDMACRO()
+
+  MACRO (ADD_EMBREE_SUBDIV_MODELS_TEST name reference executable)
+    FOREACH (model ${models_subdiv})
+      STRING(REGEX REPLACE "/" "_" modelname "${model}")
+      STRING(REGEX REPLACE ".ecs" "" modelname "${modelname}")
+      ADD_EMBREE_MODEL_TEST(${name}_${modelname} ${reference}_${modelname} ${executable} "${ARGN}" ${model})
+    ENDFOREACH()
+  ENDMACRO()
+
+  IF (EMBREE_TESTING_KLOCWORK)
+    ADD_TEST(NAME Klocwork WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${PROJECT_SOURCE_DIR}/scripts/klocwork.sh)
+    SET_TESTS_PROPERTIES(Klocwork PROPERTIES TIMEOUT 1200)
+  ENDIF()
+
+ELSE()
+
+  MACRO (ADD_EMBREE_MODEL_TEST name reference executable args model)
+  ENDMACRO()
+
+  MACRO (ADD_EMBREE_SUBDIV_MODELS_TEST name reference executable)
+  ENDMACRO()
+
+  MACRO (ADD_EMBREE_MODELS_TEST name)
+  ENDMACRO()
+
+ENDIF()
+
+MACRO (ADD_EMBREE_TEST name)
+  ADD_EMBREE_MODEL_TEST(${name} ${name} ${name} "" "default")
+ENDMACRO()
+
+MACRO (ADD_EMBREE_TEST2 name exe args)
+  ADD_EMBREE_MODEL_TEST(${name} ${exe} ${exe} "${args}" "default")
+ENDMACRO()
+
+IF (EMBREE_TESTING_MEMCHECK)
+  find_program( EMBREE_MEMORYCHECK_COMMAND valgrind )
+  set( EMBREE_MEMORYCHECK_COMMAND_OPTIONS "--trace-children=yes --leak-check=full --show-leak-kinds=definite --errors-for-leak-kinds=definite --error-exitcode=1" )
+
+  FUNCTION(ADD_MEMCHECK_TEST name binary)
+    set(memcheck_command "${EMBREE_MEMORYCHECK_COMMAND} ${EMBREE_MEMORYCHECK_COMMAND_OPTIONS}")
+    separate_arguments(memcheck_command)
+    add_test(NAME ${name} COMMAND ${memcheck_command} ${MY_PROJECT_BINARY_DIR}/${binary} ${ARGN})
  ENDFUNCTION()
-
-
-  # looks for ifile in multiple possible locations and outputs a file with absolute path in ofile
-  FUNCTION (EMBREE_FIND_TEST_FILE ifile ofile errmsgflavor)
-    if (EXISTS "${ifile}")                                  # abs path, use get_filename_component because it could also be relative to cwd
-      get_filename_component(absifile "${ifile}" ABSOLUTE)
-      SET(${ofile} ${absifile} PARENT_SCOPE)
-    elseif(EXISTS "${PROJECT_SOURCE_DIR}/tests/${ifile}")   # testing dir
-      set(${ofile} "${PROJECT_SOURCE_DIR}/tests/${ifile}" PARENT_SCOPE)
-    elseif(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${ifile}")   # relative to source folder
-      set(${ofile} "${CMAKE_CURRENT_SOURCE_DIR}/${ifile}" PARENT_SCOPE)
-    else()
-      set(${ofile} "" PARENT_SCOPE)
-      if (errmsgflavor)
-        message(FATAL_ERROR
-          "Could not find ${errmsgflavor} \"${ifile}\"\n"
-          "looked for:\n"
-          "  ${inputfile}\n"
-          "  ${PROJECT_SOURCE_DIR}/tests/${ifile}\n"
-          "  ${CMAKE_CURRENT_SOURCE_DIR}/${ifile}\n"
-        )
-      endif()
-    endif()
-  ENDFUNCTION()
-
-
-  FUNCTION (EMBREE_ADD_TEST_PARSE_SUBLIST args keyword sublist)
-    SET(myargs ${args})
-    SET(mysublist "")
-    SET(keywords "ECS;XML;NO_REFERENCE;REFERENCE;REFERENCE_SUFFIX;INTENSITY;CONDITION_FILE;CONDITION;ARGS;NO_CPP;NO_ISPC;NO_SYCL;GEN_REFERENCE;")
-
-    list(FIND nargs ${keyword} istart)
-    if (NOT(istart EQUAL -1))
-      list(LENGTH myargs iend)
-      foreach(k ${keywords})
-        list(FIND myargs ${k} i)
-        if (NOT(i EQUAL -1) AND (i GREATER istart) AND (i LESS iend))
-          SET(iend ${i})
-        endif()
-      endforeach()
-
-      MATH(EXPR i "${istart}+1")
-      while (i LESS iend)
-        list(GET myargs ${i} elem)
-        list(APPEND mysublist ${elem})
-        MATH(EXPR i "${i}+1")
-      endwhile()
-    endif()
-
-    SET(${sublist} ${mysublist} PARENT_SCOPE)
-  ENDFUNCTION()
-
-  FUNCTION (EMBREE_ADD_TEST_PARSE_FLAG args keyword value)
-    SET(myargs ${args})
-    SET(${value} OFF PARENT_SCOPE)
-    list(FIND nargs ${keyword} i)
-    if (NOT(i EQUAL -1))
-      SET(${value} ON PARENT_SCOPE)
-    endif()
-  ENDFUNCTION()
-
-    # ADD_EMBREE_TEST_ECS(testname exename [ECS <file> | XML <file>] [NO_REFERENCE | REFERENCE <path> | REFERENCE_SUFFIX <suffix>] [INTENSITY <i>] [CONDITION <conds>] [ARGS <args>] [GEN_REFERENCE])
-    # [ECS <file> | XML <inputfile> | OPTIONS <inputfile>]
-    #   - looks for file and calls the test command with either "-c <inputfile>.ecs" or "-i <inputfile>.xml"
-    #
-    # [NO_REFERENCE | REFERENCE <path> | REFERENCE_SUFFIX <suffix>]
-    #   - if not found a reference is will be expected in the same folder as *.ecs with name *.ecs.exename.exr
-    #   - NO_REFERENCE: don't look for a reference (no --compare in test command)
-    #   - REFERENCE <path>: use the reference located in <path>. Same rules aplly as for finding ecs files: absolute or relative to CMAKE_CURRENT_SOURCE_DIR path, must not be located outside the embree root dir.
-    #   - REFERENCE_SUFFIX <suffix>: use the default reference location and name with a suffix before the last file extension, e.g. *.ecs.exename<suffix>.exr
-    #   - if this argument is not specified, looks for 
-    #       1. <inputfile>.exename.exr, or
-    #       2. <testname>.exr, if no <inputfile> was given
-    #
-    # [INTENSITY <i>] 
-    #   - default i = 1
-    #   - sets the intensity level for the test, test is only run if ${EMBREE_TESTING_INTENSITY} GREATER_EQUAL i
-    #   - could be done with an *.embree_options file, but this is more flexible, e.g. you can easier share reference images without specifying an absolute path
-    #   - DOES NOT overrite EMBREE_TESTING_INTENSITY, if specified in *.embree_options
-    #
-    # [CONDITION_FILE <file>]
-    #   - file containing additional conditions
-    #   - conditions are specified linewise in form of: EMBREE_OPTION op VALUE, where EMBREE_OPTION is a cmake variable used during embree configuration and op is one of ==, !=, <, <=, >, >=
-    #   - if this argument is not specified, looks for 
-    #       1. <inputfile>.embree_options, or
-    #       2. <testname>.embree_options, if no <inputfile> was given
-    #
-    # [CONDITION <conds>]
-    #   - cmake list of additional conditions, specified the same way as in an embree_options file
-    #
-    # [ARGS <args>]
-    #   - additional arguments for the test command
-    #
-    # [GEN_REFERENCE]
-    #   - writes the reference to the expected location
-    #   - could also be done with the ARGS parameter, but this way we don't have to deal with paths
-    #
-    # EXAMPLES
-    #
-    # all optional arguments default, 
-    #  - looks for points.ecs.embree_options to filter out test by configured options, if not found no restrictions
-    #  - runs for EMBREE_TESTING_INTENSITY >= 1
-    #  - reference will be expected in the same folder as points.ecs with name points.ecs.embree_viewer.exr
-    #ADD_EMBREE_TEST_ECS(viewer_points embree_viewer "models/xxx/points.ecs")                                  # 1) 
-    #ADD_EMBREE_TEST_ECS(viewer_points embree_viewer "${PROJECT_SOURCE_DIR}/models/xxx/points.ecs")            # 2) same as 1) but with absolute path to ecs
-    #ADD_EMBREE_TEST_ECS(viewer_points embree_viewer "points.ecs")                                             # 3) same as 1) but looks for points.ecs in the ${CMAKE_CURRENT_SOURCE_DIR} i.e. <embree_root>/tutorials/viewer/points.ecs
-
-    #ADD_EMBREE_TEST_ECS(viewer_points embree_viewer "models/xxx/points.ecs" ARGS --coherent INTENSITY 2)      # 4) same as 1) but runs only at EMBREE_TESTING_INTENSITY >= 2
-    #ADD_EMBREE_TEST_ECS(viewer_points embree_viewer "models/xxx/points.ecs" REFERENCE_SUFFIX "_quads" ARGS 
-    #  --coherent 
-    #  --convert-triangles-to-quads INTENSITY 2)                                                               # 5) same as 4) but expects reference name points.ecr.embree_viewer_quads.ecs
-    #ADD_EMBREE_TEST_ECS(viewer_points embree_viewer "models/xxx/points.ecs" REFERENCE "special.exr" ARGS 
-    #  --coherent 
-    #  --convert-triangles-to-quads INTENSITY 2)                                                               # 5) same as 4) but expects reference <embree-root>/tutorials/viewer/special.exr
-    ## 1) - 5) all share the same base input arguments defined in points.ecs as well as the points.ecs.embree_options
-
-    #ADD_EMBREE_TEST_ECS(point_geometry embree_point_geometry)                                                 # 6) no ecs file, uses point_geometry.embree_options if exists, expects reference ${CMAKE_CURRENT_SOURCE_DIR}/point_geometry.exr
-    #ADD_EMBREE_TEST_ECS(verify verify NO_REFERENCE)                                                           # 7) no ecs file, uses verify.embree_options if exists, no reference
-    #ADD_EMBREE_TEST_ECS(verify_memcheck verify NO_REFERENCE CONDITIONS "EMBREE_TESTING_MEMCHECK == ON")       # 8) same as 7) but with extra condition
-
-  FUNCTION (ADD_EMBREE_TEST_ECS testname executable)
-    if (EMBREE_TESTING_FILTER_TESTNAMES)
-      list(FIND EMBREE_TESTING_FILTER_TESTNAMES "${testname}" i)
-      if (${i} EQUAL -1)
-        return()
-      endif()
-    endif()
-
-    SET(nargs ${ARGN})
-
-    # disable everything
-    SET(testnamedef EMBREE_TEST_${testname}_DEFINED)
-    SET(${testnamedef} "0" CACHE INTERNAL "")
-    SET(testnamedef EMBREE_TEST_${testname}_ispc_DEFINED)
-    SET(${testnamedef} "0" CACHE INTERNAL "")
-    SET(testnamedef EMBREE_TEST_${testname}_sycl_DEFINED)
-    SET(${testnamedef} "0" CACHE INTERNAL "")
-
-    # parsing input file
-    #   ECS mode -> single parameter with filename after ECS keyword
-    list(FIND nargs "ECS" i)
-    if (NOT(i EQUAL -1))
-      SET(inputtype "-c")
-      MATH(EXPR i "${i}+1")
-      list(GET nargs ${i} out)
-      EMBREE_FIND_TEST_FILE("${out}" inputfile "test file")
-    endif()
-    #   XML mode -> single parameter with filename after XML keyword
-    list(FIND nargs "XML" i)
-    if (NOT(i EQUAL -1))
-      SET(inputtype "-i")
-      MATH(EXPR i "${i}+1")
-      list(GET nargs ${i} out)
-      EMBREE_FIND_TEST_FILE("${out}" inputfile "test file")
-    endif()
-    #   no filetype keyword -> look for <testname>.ecs/xml
-    #   does not need to be specified
-    if (NOT inputtype)
-      EMBREE_FIND_TEST_FILE("${testname}.ecs" inputfile "")
-      if(inputfile)
-        SET(inputtype "-c")
-      endif()
-      EMBREE_FIND_TEST_FILE("${testname}.ecs" inputfile "")
-      if(inputfile)
-        SET(inputtype "-i")
-      endif()
-    endif()
-
-    # parsing refernce image
-    #   no reference image mode -> no additional parameter to parse
-    list(FIND nargs "NO_REFERENCE" i)
-    if (NOT(i EQUAL -1))
-      SET(no_reference ON)
-    endif()
-    #   reference suffix mode -> singe parameter with suffix to default reference file name
-    list(FIND nargs "REFERENCE_SUFFIX" i)
-    if (NOT(i EQUAL -1))
-      MATH(EXPR i "${i}+1")
-      list(GET nargs ${i} out)
-      EMBREE_FIND_TEST_FILE("${inputfile}.${executable}${out}.exr" referencefile "reference image")
-    endif()
-    #   reference mode -> singe parameter with absolute path to reference image
-    list(FIND nargs "REFERENCE" i)
-    if (NOT(i EQUAL -1))
-      MATH(EXPR i "${i}+1")
-      list(GET nargs ${i} out)
-      EMBREE_FIND_TEST_FILE("${out}" referencefile "reference image")
-    endif()
-    #   no reference keyword -> look for <testname>.exr and <inputfile>.<executable>.exr respectively
-    if ((NOT no_reference) AND (NOT referencefile))
-      if (NOT inputfile)
-        EMBREE_FIND_TEST_FILE("${testname}.exr" referencefile "reference image")
-      else()
-        EMBREE_FIND_TEST_FILE("${inputfile}.${executable}.exr" referencefile "reference image")
-      endif()
-    endif()
-
-    # parsing intensity
-    #   single integer parameter
-    SET(intensity 1)
-    list(FIND nargs "INTENSITY" i)
-    if (NOT(i EQUAL -1))
-      MATH(EXPR i "${i}+1")
-      list(GET nargs ${i} intensity)
-    endif()
-
-    # parsing condition
-    SET(conditions "")
-    SET(conditionsfile)
-    list(FIND nargs "CONDITION_FILE" i)
-    #   condition file -> single parameter to absolute path of conditions file
-    if (NOT(i EQUAL -1))
-      list(GET nargs ${i} conditionsfile)
-      EMBREE_FIND_TEST_FILE("${conditionsfile}" conditionsfile "")
-    #   no <inputfile> specified -> look for <testname>.embree_options
-    elseif (NOT inputtype)
-      EMBREE_FIND_TEST_FILE("${testname}.embree_options" conditionsfile "")
-    #   <inputfile> specified -> look for <inputfile>.embree_options
-    else()
-      EMBREE_FIND_TEST_FILE("${inputfile}.embree_options" conditionsfile "")
-    endif()
-    if (conditionsfile)
-      file(READ "${conditionsfile}" lines)
-      string(REGEX REPLACE "\n" ";" conditions "${lines}")
-    endif()
-
-    # parsing additional conditions
-    EMBREE_ADD_TEST_PARSE_SUBLIST("${nargs}" "CONDITION" extra_conditions)
-    list(APPEND conditions ${extra_conditions})
-
-    # parsing extra args
-    EMBREE_ADD_TEST_PARSE_SUBLIST("${nargs}" "ARGS" extraargs)
-
-    EMBREE_ADD_TEST_PARSE_FLAG("${nargs}" "MEMCHECK"      memcheck)
-    EMBREE_ADD_TEST_PARSE_FLAG("${nargs}" "NO_CPP"        no_cpp)
-    EMBREE_ADD_TEST_PARSE_FLAG("${nargs}" "NO_ISPC"       no_ispc)
-    EMBREE_ADD_TEST_PARSE_FLAG("${nargs}" "NO_SYCL"       no_sycl)
-    EMBREE_ADD_TEST_PARSE_FLAG("${nargs}" "NO_POSTFIX"    no_postfix)
-    EMBREE_ADD_TEST_PARSE_FLAG("${nargs}" "GEN_REFERENCE" gen_reference)
-
-    # add the test, if the conditions are met
-    SET(matchconditions ON)
-    if (conditions)
-      EMBREE_TESTING_CHECK_OPTIONS_LIST(out "${conditions}")
-      if (out EQUAL 0)
-        SET(matchconditions OFF)
-      endif()
-    endif()
-
-    # LESS_EQUAL not supported on all CI runners
-    if (matchconditions AND ((intensity LESS EMBREE_TESTING_INTENSITY) OR (intensity EQUAL EMBREE_TESTING_INTENSITY)))
-      SET(args "")
-      if (inputfile)
-        list(APPEND args "${inputtype} ${inputfile}")
-      endif()
-      if (NOT no_reference)
-        list(APPEND args "--compare ${referencefile}")
-      endif()
-      if (gen_reference)
-        list(APPEND args "-o ${referencefile}")
-      endif()
-      foreach(a ${extraargs})
-        list(APPEND args "${a}")
-      endforeach()
-
-
-
-      if (memcheck)
-        list(PREPEND args "${MY_PROJECT_BINARY_DIR}/${executable}")
-        list(PREPEND args "${EMBREE_MEMORYCHECK_COMMAND_OPTIONS}")
-        if (no_postfix)
-          ADD_EMBREE_GENERIC_TEST(${testname} ${EMBREE_MEMORYCHECK_COMMAND} ${args})
-        else()
-          if((NOT ${EMBREE_SYCL_SUPPORT}) OR (NOT ${EMBREE_TESTING_ONLY_SYCL_TESTS}))
-            if (NOT(no_cpp))
-              ADD_EMBREE_GENERIC_CPP_TEST(${testname} ${EMBREE_MEMORYCHECK_COMMAND} ${args})
-            endif()
-            if (NOT(no_ispc))
-              ADD_EMBREE_GENERIC_ISPC_TEST(${testname} ${EMBREE_MEMORYCHECK_COMMAND} ${args})
-            endif()
-          endif()
-          if (NOT(no_sycl))
-            ADD_EMBREE_GENERIC_SYCL_TEST(${testname} ${EMBREE_MEMORYCHECK_COMMAND} ${args}) 
-          endif()
-        endif()
-      else()
-        if (no_postfix)
-          ADD_EMBREE_GENERIC_TEST(${testname} ${executable} ${args})
-        else()
-          if (NOT(no_cpp))
-            ADD_EMBREE_GENERIC_CPP_TEST(${testname} ${executable} ${args})
-          endif()
-          if (NOT(no_ispc))
-            ADD_EMBREE_GENERIC_ISPC_TEST(${testname} ${executable} ${args})
-          endif()
-          if (NOT(no_sycl))
-            ADD_EMBREE_GENERIC_SYCL_TEST(${testname} ${executable} ${args}) 
-          endif()
-        endif()
-      endif()
-    endif()
-
-
-
-    if (EMBREE_TESTING_INSTALL_TESTS)
-      if (inputfile)
-        get_filename_component(inputpath ${inputfile} DIRECTORY)
-        STRING(REPLACE "${PROJECT_SOURCE_DIR}/" "" inputpath "${inputpath}")
-        INSTALL(FILES "${inputfile}"
-                DESTINATION "${CMAKE_INSTALL_TESTDIR}/${inputpath}"
-                COMPONENT testing)
-      endif()
-
-      if (conditionsfile)
-        get_filename_component(conditionspath ${conditionsfile} DIRECTORY)
-        STRING(REPLACE "${PROJECT_SOURCE_DIR}/" "" conditionspath "${conditionspath}")
-        INSTALL(FILES "${conditionsfile}"
-                DESTINATION "${CMAKE_INSTALL_TESTDIR}/${conditionspath}"
-                COMPONENT testing)
-      endif()
-
-      if (referencefile)
-        get_filename_component(referencepath ${referencefile} DIRECTORY)
-        STRING(REPLACE "${PROJECT_SOURCE_DIR}/" "" referencepath "${referencepath}")
-        INSTALL(FILES "${referencefile}"
-                DESTINATION "${CMAKE_INSTALL_TESTDIR}/${referencepath}"
-                COMPONENT testing)
-      endif()
-
-      SET(testcall "ADD_EMBREE_TEST_ECS(${testname} ${executable}")
-      if (inputfile)
-        STRING(REPLACE "${PROJECT_SOURCE_DIR}/" "" inputfile "${inputfile}")
-        if (inputtype STREQUAL "-c")
-          SET(testcall "${testcall} \n    ECS ${inputfile}")
-        elseif (inputtype STREQUAL "-i")
-          SET(testcall "${testcall} \n    XML ${inputfile}")
-        endif()
-      endif()
-
-      if (no_reference)
-        SET(testcall "${testcall} \n    NO_REFERENCE")
-      else()
-        STRING(REPLACE "${PROJECT_SOURCE_DIR}/" "" referencefile "${referencefile}")
-        SET(testcall "${testcall} \n    REFERENCE ${referencefile}")
-      endif()
-
-      SET(testcall "${testcall} \n    INTENSITY ${intensity}")
-      if (${memcheck})
-        SET(testcall "${testcall} \n    MEMCHECK")
-      endif()
-      if (${no_cpp})
-        SET(testcall "${testcall} \n    NO_CPP")
-      endif()
-      if (${no_ispc})
-        SET(testcall "${testcall} \n    NO_ISPC")
-      endif()
-      if (${no_sycl})
-        SET(testcall "${testcall} \n    NO_SYCL")
-      endif()
-      if (${no_postfix})
-        SET(testcall "${testcall} \n    NO_POSTFIX")
-      endif()
-      STRING(REPLACE "${PROJECT_SOURCE_DIR}/" "" conditionsfile "${conditionsfile}")
-      SET(testcall "${testcall} \n    CONDITION_FILE ${conditionsfile}")
-      SET(testcall "${testcall} \n    CONDITION ")
-      foreach(c ${conditions})
-        SET(testcall "${testcall} \"${c}\"")
-      endforeach()
-      SET(testcall "${testcall} \n    ARGS ")
-      foreach(a ${extraargs})
-        SET(testcall "${testcall} ${a}")
-      endforeach()
-
-      SET(testcall "${testcall})\n\n")
-      file(APPEND "${EMBREE_INSTALL_CTESTTESTFILE}" "${testcall}")
-    endif()
-  ENDFUNCTION()
-
-else()
-  FUNCTION(ADD_EMBREE_TEST_ECS testname executable)
-  ENDFUNCTION()
-  FUNCTION(ADD_EMBREE_GENERIC_TEST testname executable)
-  ENDFUNCTION()
-  FUNCTION(ADD_EMBREE_GENERIC_CPP_TEST testname executable)
-  ENDFUNCTION()
-  FUNCTION(ADD_EMBREE_GENERIC_SYCL_TEST testname executable)
-  ENDFUNCTION()
-  FUNCTION(ADD_EMBREE_GENERIC_ISPC_TEST testname executable)
-  ENDFUNCTION()
-  FUNCTION(SET_EMBREE_TEST_PROPERTIES testname)
-  ENDFUNCTION()
-endif()
+ENDIF()
@@ -1,38 +1,38 @@
-## Copyright 2009-2021 Intel Corporation
-## SPDX-License-Identifier: Apache-2.0
+## ======================================================================== ##
+## Copyright 2009-2017 Intel Corporation                                    ##
+##                                                                          ##
+## Licensed under the Apache License, Version 2.0 (the "License");          ##
+## you may not use this file except in compliance with the License.         ##
+## You may obtain a copy of the License at                                  ##
+##                                                                          ##
+##     http://www.apache.org/licenses/LICENSE-2.0                           ##
+##                                                                          ##
+## Unless required by applicable law or agreed to in writing, software      ##
+## distributed under the License is distributed on an "AS IS" BASIS,        ##
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ##
+## See the License for the specific language governing permissions and      ##
+## limitations under the License.                                           ##
+## ======================================================================== ##

 # additional parameters (beyond the name) are treated as additional dependencies
 # if ADDITIONAL_LIBRARIES is set these will be included during linking

 MACRO (ADD_TUTORIAL TUTORIAL_NAME)
-  ADD_EXECUTABLE(embree_${TUTORIAL_NAME} ../../kernels/embree.rc ${TUTORIAL_NAME}.cpp ${TUTORIAL_NAME}_device.cpp ${ARGN})
-  TARGET_LINK_LIBRARIES(embree_${TUTORIAL_NAME} embree image tutorial noise ${ADDITIONAL_LIBRARIES})
-  SET_PROPERTY(TARGET embree_${TUTORIAL_NAME} PROPERTY FOLDER tutorials/single)
-  SET_PROPERTY(TARGET embree_${TUTORIAL_NAME} APPEND PROPERTY COMPILE_FLAGS " ${FLAGS_LOWEST}")
-  INSTALL(TARGETS embree_${TUTORIAL_NAME} DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT examples)
-  SIGN_TARGET(embree_${TUTORIAL_NAME})
-ENDMACRO ()

-MACRO (ADD_TUTORIAL_SYCL TUTORIAL_NAME)
-  IF (EMBREE_SYCL_SUPPORT)
-    ADD_EXECUTABLE(embree_${TUTORIAL_NAME}_sycl ${TUTORIAL_NAME}.cpp ${TUTORIAL_NAME}_device.cpp ${ARGN})
-    TARGET_LINK_LIBRARIES(embree_${TUTORIAL_NAME}_sycl embree image tutorial_sycl noise ${ADDITIONAL_LIBRARIES})
-    TARGET_COMPILE_DEFINITIONS(embree_${TUTORIAL_NAME}_sycl PUBLIC EMBREE_SYCL_TUTORIAL)
-    SET_PROPERTY(TARGET embree_${TUTORIAL_NAME}_sycl PROPERTY FOLDER tutorials/sycl)
-    SET_PROPERTY(TARGET embree_${TUTORIAL_NAME}_sycl APPEND PROPERTY COMPILE_FLAGS " ${FLAGS_LOWEST} ${CMAKE_CXX_FLAGS_SYCL}")
-    SET_PROPERTY(TARGET embree_${TUTORIAL_NAME}_sycl APPEND PROPERTY LINK_FLAGS "${CMAKE_LINK_FLAGS_SYCL}")
-    INSTALL(TARGETS embree_${TUTORIAL_NAME}_sycl DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT examples)
-    SIGN_TARGET(embree_${TUTORIAL_NAME}_sycl)
-  ENDIF()
-ENDMACRO ()
+  ADD_EXECUTABLE(${TUTORIAL_NAME} ${TUTORIAL_NAME}.cpp ${TUTORIAL_NAME}_device.cpp ${ARGN})
+                                  TARGET_LINK_LIBRARIES(${TUTORIAL_NAME} embree tutorial image tutorial_device noise ${ADDITIONAL_LIBRARIES})
+  SET_PROPERTY(TARGET ${TUTORIAL_NAME} PROPERTY FOLDER tutorials/single)
+  INSTALL(TARGETS ${TUTORIAL_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT examples)
+  SET(CPACK_NSIS_MENU_LINKS ${CPACK_NSIS_MENU_LINKS} "${CMAKE_INSTALL_BINDIR}/${TUTORIAL_NAME}" "${TUTORIAL_NAME}")

-MACRO (ADD_TUTORIAL_ISPC TUTORIAL_NAME)
-  IF (EMBREE_ISPC_SUPPORT)
-    ADD_EMBREE_ISPC_EXECUTABLE(embree_${TUTORIAL_NAME}_ispc ../../kernels/embree.rc ${TUTORIAL_NAME}.cpp ${TUTORIAL_NAME}_device.ispc ${ARGN})
-    TARGET_LINK_LIBRARIES(embree_${TUTORIAL_NAME}_ispc embree image tutorial_ispc noise noise_ispc)
-    SET_PROPERTY(TARGET embree_${TUTORIAL_NAME}_ispc PROPERTY FOLDER tutorials/ispc)
-    SET_PROPERTY(TARGET embree_${TUTORIAL_NAME}_ispc APPEND PROPERTY COMPILE_FLAGS " ${FLAGS_LOWEST}")
-    INSTALL(TARGETS embree_${TUTORIAL_NAME}_ispc DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT examples)
-    SIGN_TARGET(embree_${TUTORIAL_NAME}_ispc)
+  IF (EMBREE_ISPC_SUPPORT AND EMBREE_RAY_PACKETS)
+    ADD_EMBREE_ISPC_EXECUTABLE(${TUTORIAL_NAME}_ispc ${TUTORIAL_NAME}.cpp ${TUTORIAL_NAME}_device.ispc)
+    TARGET_LINK_LIBRARIES(${TUTORIAL_NAME}_ispc embree tutorial image tutorial_device_ispc noise noise_ispc)
+    SET_PROPERTY(TARGET ${TUTORIAL_NAME}_ispc PROPERTY FOLDER tutorials/ispc)
+    INSTALL(TARGETS ${TUTORIAL_NAME}_ispc DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT examples)
+    SET(CPACK_NSIS_MENU_LINKS ${CPACK_NSIS_MENU_LINKS} "${CMAKE_INSTALL_BINDIR}/${TUTORIAL_NAME}_ispc" "${TUTORIAL_NAME}_ispc")
  ENDIF()
+
+  SET(CPACK_NSIS_MENU_LINKS ${CPACK_NSIS_MENU_LINKS} PARENT_SCOPE)
+
 ENDMACRO ()
@@ -1,5 +1,18 @@
-## Copyright 2009-2021 Intel Corporation
-## SPDX-License-Identifier: Apache-2.0
+## ======================================================================== ##
+## Copyright 2009-2015 Intel Corporation                                    ##
+##                                                                          ##
+## Licensed under the Apache License, Version 2.0 (the "License");          ##
+## you may not use this file except in compliance with the License.         ##
+## You may obtain a copy of the License at                                  ##
+##                                                                          ##
+##     http://www.apache.org/licenses/LICENSE-2.0                           ##
+##                                                                          ##
+## Unless required by applicable law or agreed to in writing, software      ##
+## distributed under the License is distributed on an "AS IS" BASIS,        ##
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ##
+## See the License for the specific language governing permissions and      ##
+## limitations under the License.                                           ##
+## ======================================================================== ##

 IF(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
  MESSAGE(FATAL_ERROR "Cannot find install manifest: @CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
@@ -1,17 +1,23 @@
-## Copyright 2009-2021 Intel Corporation
-## SPDX-License-Identifier: Apache-2.0
+## ======================================================================== ##
+## Copyright 2009-2017 Intel Corporation                                    ##
+##                                                                          ##
+## Licensed under the Apache License, Version 2.0 (the "License");          ##
+## you may not use this file except in compliance with the License.         ##
+## You may obtain a copy of the License at                                  ##
+##                                                                          ##
+##     http://www.apache.org/licenses/LICENSE-2.0                           ##
+##                                                                          ##
+## Unless required by applicable law or agreed to in writing, software      ##
+## distributed under the License is distributed on an "AS IS" BASIS,        ##
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ##
+## See the License for the specific language governing permissions and      ##
+## limitations under the License.                                           ##
+## ======================================================================== ##

 ADD_LIBRARY(lexers STATIC
 stringstream.cpp
 tokenstream.cpp
 )
-TARGET_LINK_LIBRARIES(lexers sys math)
+
+TARGET_LINK_LIBRARIES(lexers sys)
 SET_PROPERTY(TARGET lexers PROPERTY FOLDER common)
-SET_PROPERTY(TARGET lexers APPEND PROPERTY COMPILE_FLAGS " ${FLAGS_LOWEST}")
-
-IF (EMBREE_STATIC_LIB)
-  INSTALL(TARGETS lexers EXPORT lexers-targets ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT devel)
-  INSTALL(EXPORT lexers-targets DESTINATION "${EMBREE_CMAKEEXPORT_DIR}" COMPONENT devel)
-ENDIF()
-
-
@@ -1,5 +1,18 @@
-// Copyright 2009-2021 Intel Corporation
-// SPDX-License-Identifier: Apache-2.0
+// ======================================================================== //
+// Copyright 2009-2017 Intel Corporation                                    //
+//                                                                          //
+// Licensed under the Apache License, Version 2.0 (the "License");          //
+// you may not use this file except in compliance with the License.         //
+// You may obtain a copy of the License at                                  //
+//                                                                          //
+//     http://www.apache.org/licenses/LICENSE-2.0                           //
+//                                                                          //
+// Unless required by applicable law or agreed to in writing, software      //
+// distributed under the License is distributed on an "AS IS" BASIS,        //
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. //
+// See the License for the specific language governing permissions and      //
+// limitations under the License.                                           //
+// ======================================================================== //

 #pragma once

@@ -1,12 +1,25 @@
-// Copyright 2009-2021 Intel Corporation
-// SPDX-License-Identifier: Apache-2.0
+// ======================================================================== //
+// Copyright 2009-2017 Intel Corporation                                    //
+//                                                                          //
+// Licensed under the Apache License, Version 2.0 (the "License");          //
+// you may not use this file except in compliance with the License.         //
+// You may obtain a copy of the License at                                  //
+//                                                                          //
+//     http://www.apache.org/licenses/LICENSE-2.0                           //
+//                                                                          //
+// Unless required by applicable law or agreed to in writing, software      //
+// distributed under the License is distributed on an "AS IS" BASIS,        //
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. //
+// See the License for the specific language governing permissions and      //
+// limitations under the License.                                           //
+// ======================================================================== //

 #pragma once

 #include "../sys/platform.h"
 #include "../sys/ref.h"
 #include "../sys/filename.h"
-#include "../sys/estring.h"
+#include "../sys/string.h"

 #include <vector>
 #include <iostream>
@@ -19,23 +32,24 @@ namespace embree
  class ParseLocation
  {
  public:
-    ParseLocation () : lineNumber(-1), colNumber(-1) {}
-    ParseLocation (std::shared_ptr<std::string> fileName, ssize_t lineNumber, ssize_t colNumber, ssize_t /*charNumber*/)
-      : fileName(fileName), lineNumber(lineNumber), colNumber(colNumber) {}
+    ParseLocation () : fileName(nullptr), lineNumber(-1), colNumber(-1), charNumber(-1) {}
+    ParseLocation (const char* fileName, ssize_t lineNumber, ssize_t colNumber, ssize_t charNumber)
+      : fileName(fileName), lineNumber(lineNumber), colNumber(colNumber), charNumber(charNumber) {}

    std::string str() const
    {
      std::string str = "unknown";
-      if (fileName) str = *fileName;
+      if (fileName) str = fileName;
      if (lineNumber >= 0) str += " line " + toString(lineNumber);
      if (lineNumber >= 0 && colNumber >= 0) str += " character " + toString(colNumber);
      return str;
    }

  private:
-    std::shared_ptr<std::string> fileName;         /// name of the file (or stream) the token is from
+    const char* fileName;         /// name of the file (or stream) the token is from
    ssize_t lineNumber;           /// the line number the token is from
    ssize_t colNumber;            /// the character number in the current line
+    ssize_t charNumber;           /// the character in the file
  };

  /*! a stream class templated over the stream elements */
@@ -53,7 +67,7 @@ namespace embree
    }
    __forceinline void push_back(const std::pair<T,ParseLocation>& v) {
      if (past+future == BUF_SIZE) pop_front();
-      size_t end = (start+past+future++)%BUF_SIZE;
+      int end = (start+past+future++)%BUF_SIZE;
      buffer[end] = v;
    }
    __forceinline void pop_front() {
@@ -99,10 +113,10 @@ namespace embree
  {
  public:
    StdStream (std::istream& cin, const std::string& name = "std::stream")
-      : cin(cin), lineNumber(1), colNumber(0), charNumber(0), name(std::shared_ptr<std::string>(new std::string(name))) {}
+      : cin(cin), lineNumber(1), colNumber(0), charNumber(0), name(name) {}
    ~StdStream() {}
    ParseLocation location() {
-      return ParseLocation(name,lineNumber,colNumber,charNumber);
+      return ParseLocation(name.c_str(),lineNumber,colNumber,charNumber);
    }
    int next() {
      int c = cin.get();
@@ -115,43 +129,43 @@ namespace embree
    ssize_t lineNumber;           /// the line number the token is from
    ssize_t colNumber;            /// the character number in the current line
    ssize_t charNumber;           /// the character in the file
-    std::shared_ptr<std::string> name;             /// name of buffer
+    std::string name;             /// name of buffer
  };

  /*! creates a stream from a file */
  class FileStream : public Stream<int>
  {
  public:
+
+    FileStream (FILE* file, const std::string& name = "file")
+      : file(file), lineNumber(1), colNumber(0), charNumber(0), name(name) {}
+
    FileStream (const FileName& fileName)
-      : lineNumber(1), colNumber(0), charNumber(0), name(std::shared_ptr<std::string>(new std::string(fileName.str())))
+      : lineNumber(1), colNumber(0), charNumber(0), name(fileName.str())
    {
-      if (ifs) ifs.close();
-      ifs.open(fileName.str());
-      if (!ifs.is_open()) THROW_RUNTIME_ERROR("cannot open file " + fileName.str());
-    }
-    ~FileStream() { 
-      if (ifs) ifs.close();
+      file = fopen(fileName.c_str(),"r");
+      if (file == nullptr) THROW_RUNTIME_ERROR("cannot open file " + fileName.str());
    }
+    ~FileStream() { if (file) fclose(file); }

  public:
    ParseLocation location() {
-      return ParseLocation(name,lineNumber,colNumber,charNumber);
+      return ParseLocation(name.c_str(),lineNumber,colNumber,charNumber);
    }

    int next() {
-      int c = ifs.get();
+      int c = fgetc(file);
      if (c == '\n') { lineNumber++; colNumber = 0; } else if (c != '\r') colNumber++;
      charNumber++;
      return c;
    }

-
  private:
-    std::ifstream ifs;
+    FILE* file;
    ssize_t lineNumber;           /// the line number the token is from
    ssize_t colNumber;            /// the character number in the current line
    ssize_t charNumber;           /// the character in the file
-    std::shared_ptr<std::string> name;             /// name of buffer
+    std::string name;             /// name of buffer
  };

  /*! creates a stream from a string */
@@ -164,7 +178,7 @@ namespace embree

  public:
    ParseLocation location() {
-      return ParseLocation(std::shared_ptr<std::string>(),lineNumber,colNumber,charNumber);
+      return ParseLocation(nullptr,lineNumber,colNumber,charNumber);
    }

    int next() {
@@ -187,18 +201,15 @@ namespace embree
  {
  public:
    CommandLineStream (int argc, char** argv, const std::string& name = "command line")
-      : i(0), j(0), charNumber(0), name(std::shared_ptr<std::string>(new std::string(name)))
+      : i(0), j(0), charNumber(0), name(name)
    {
-      if (argc > 0) {
-	for (size_t i=0; argv[0][i] && i<1024; i++) charNumber++;
-	charNumber++;
-      }
+      if (argc > 0) charNumber = strlen(argv[0])+1;
      for (ssize_t k=1; k<argc; k++) args.push_back(argv[k]);
    }
    ~CommandLineStream() {}
  public:
    ParseLocation location() {
-      return ParseLocation(name,0,charNumber,charNumber);
+      return ParseLocation(name.c_str(),0,charNumber,charNumber);
    }
    int next() {
      if (i == args.size()) return EOF;
@@ -210,6 +221,6 @@ namespace embree
    size_t i,j;
    std::vector<std::string> args;
    ssize_t charNumber;           /// the character in the file
-    std::shared_ptr<std::string> name;             /// name of buffer
+    std::string name;             /// name of buffer
  };
 }
@@ -1,5 +1,18 @@
-// Copyright 2009-2021 Intel Corporation
-// SPDX-License-Identifier: Apache-2.0
+// ======================================================================== //
+// Copyright 2009-2017 Intel Corporation                                    //
+//                                                                          //
+// Licensed under the Apache License, Version 2.0 (the "License");          //
+// you may not use this file except in compliance with the License.         //
+// You may obtain a copy of the License at                                  //
+//                                                                          //
+//     http://www.apache.org/licenses/LICENSE-2.0                           //
+//                                                                          //
+// Unless required by applicable law or agreed to in writing, software      //
+// distributed under the License is distributed on an "AS IS" BASIS,        //
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. //
+// See the License for the specific language governing permissions and      //
+// limitations under the License.                                           //
+// ======================================================================== //

 #pragma once

@@ -1,12 +1,23 @@
-// Copyright 2009-2021 Intel Corporation
-// SPDX-License-Identifier: Apache-2.0
+// ======================================================================== //
+// Copyright 2009-2017 Intel Corporation                                    //
+//                                                                          //
+// Licensed under the Apache License, Version 2.0 (the "License");          //
+// you may not use this file except in compliance with the License.         //
+// You may obtain a copy of the License at                                  //
+//                                                                          //
+//     http://www.apache.org/licenses/LICENSE-2.0                           //
+//                                                                          //
+// Unless required by applicable law or agreed to in writing, software      //
+// distributed under the License is distributed on an "AS IS" BASIS,        //
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. //
+// See the License for the specific language governing permissions and      //
+// limitations under the License.                                           //
+// ======================================================================== //

 #include "stringstream.h"

 namespace embree
 {
-  static const std::string stringChars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 _.,+-=:/*\\";
-  
  /* creates map for fast categorization of characters */
  static void createCharMap(bool map[256], const std::string& chrs) {
    for (size_t i=0; i<256; i++) map[i] = false;
@@ -18,7 +29,6 @@ namespace embree
    : cin(cin), endl(endl), multiLine(multiLine)
  {
    createCharMap(isSepMap,seps);
-    createCharMap(isValidCharMap,stringChars);
  }

  std::string StringStream::next()
@@ -37,11 +47,8 @@ namespace embree

    /* parse everything until the next separator */
    std::vector<char> str; str.reserve(64);
-    while (cin->peek() != EOF && !isSeparator(cin->peek())) {
-      int c = cin->get();
-      if (!isValidChar(c)) throw std::runtime_error("invalid character "+std::string(1,c)+" in input");
-      str.push_back((char)c);
-    }
+    while (cin->peek() != EOF && !isSeparator(cin->peek()))
+      str.push_back((char)cin->get());
    str.push_back(0);
    return std::string(str.data());
  }
@@ -1,5 +1,18 @@
-// Copyright 2009-2021 Intel Corporation
-// SPDX-License-Identifier: Apache-2.0
+// ======================================================================== //
+// Copyright 2009-2017 Intel Corporation                                    //
+//                                                                          //
+// Licensed under the Apache License, Version 2.0 (the "License");          //
+// you may not use this file except in compliance with the License.         //
+// You may obtain a copy of the License at                                  //
+//                                                                          //
+//     http://www.apache.org/licenses/LICENSE-2.0                           //
+//                                                                          //
+// Unless required by applicable law or agreed to in writing, software      //
+// distributed under the License is distributed on an "AS IS" BASIS,        //
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. //
+// See the License for the specific language governing permissions and      //
+// limitations under the License.                                           //
+// ======================================================================== //

 #pragma once

@@ -17,12 +30,10 @@ namespace embree
    ParseLocation location() { return cin->loc(); }
    std::string next();
  private:
-    __forceinline bool isSeparator(unsigned int c) const { return c<256 && isSepMap[c]; }
-    __forceinline bool isValidChar(unsigned int c) const { return c<256 && isValidCharMap[c]; }
+    __forceinline bool isSeparator(int c) const { return isSepMap[c]; }
  private:
    Ref<Stream<int> > cin; /*! source character stream */
    bool isSepMap[256];    /*! map for fast classification of separators */
-    bool isValidCharMap[256];  /*! map for valid characters */
    std::string endl;      /*! the token of the end of line */
    bool multiLine;        /*! whether to parse lines wrapped with \ */
  };
@@ -1,8 +1,21 @@
-// Copyright 2009-2021 Intel Corporation
-// SPDX-License-Identifier: Apache-2.0
+// ======================================================================== //
+// Copyright 2009-2017 Intel Corporation                                    //
+//                                                                          //
+// Licensed under the Apache License, Version 2.0 (the "License");          //
+// you may not use this file except in compliance with the License.         //
+// You may obtain a copy of the License at                                  //
+//                                                                          //
+//     http://www.apache.org/licenses/LICENSE-2.0                           //
+//                                                                          //
+// Unless required by applicable law or agreed to in writing, software      //
+// distributed under the License is distributed on an "AS IS" BASIS,        //
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. //
+// See the License for the specific language governing permissions and      //
+// limitations under the License.                                           //
+// ======================================================================== //

 #include "tokenstream.h"
-#include "../math/emath.h"
+#include "../math/math.h"

 namespace embree
 {
@@ -11,7 +24,6 @@ namespace embree
  const std::string TokenStream::ALPHA = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
  const std::string TokenStream::numbers = "0123456789";
  const std::string TokenStream::separators = "\n\t\r ";
-  const std::string TokenStream::stringChars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 _.,+-=:/*\\";

  /* creates map for fast categorization of characters */
  static void createCharMap(bool map[256], const std::string& chrs) {
@@ -28,7 +40,6 @@ namespace embree
  {
    createCharMap(isAlphaMap,alpha);
    createCharMap(isSepMap,seps);
-    createCharMap(isStringCharMap,stringChars);
  }

  bool TokenStream::decDigits(std::string& str_o)
@@ -138,11 +149,7 @@ namespace embree
    std::string str;
    if (cin->peek() != '\"') return false;
    cin->drop();
-    while (cin->peek() != '\"') {
-      const int c = cin->get();
-      if (!isStringChar(c)) THROW_RUNTIME_ERROR("invalid string character "+std::string(1,c)+" at "+loc.str());
-      str += (char)c;
-    }
+    while (cin->peek() != '\"') str += (char)cin->get();
    cin->drop();
    token = Token(str,Token::TY_STRING,loc);
    return true;
@@ -1,5 +1,18 @@
-// Copyright 2009-2021 Intel Corporation
-// SPDX-License-Identifier: Apache-2.0
+// ======================================================================== //
+// Copyright 2009-2017 Intel Corporation                                    //
+//                                                                          //
+// Licensed under the Apache License, Version 2.0 (the "License");          //
+// you may not use this file except in compliance with the License.         //
+// You may obtain a copy of the License at                                  //
+//                                                                          //
+//     http://www.apache.org/licenses/LICENSE-2.0                           //
+//                                                                          //
+// Unless required by applicable law or agreed to in writing, software      //
+// distributed under the License is distributed on an "AS IS" BASIS,        //
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. //
+// See the License for the specific language governing permissions and      //
+// limitations under the License.                                           //
+// ======================================================================== //

 #pragma once

@@ -120,7 +133,6 @@ namespace embree
    static const std::string ALPHA;
    static const std::string numbers;
    static const std::string separators;
-    static const std::string stringChars;

  public:
    TokenStream(const Ref<Stream<int> >& cin,
@@ -145,20 +157,16 @@ namespace embree
    Ref<Stream<int> > cin;
    bool isSepMap[256];
    bool isAlphaMap[256];
-    bool isStringCharMap[256];
    std::vector<std::string> symbols;

    /*! checks if a character is a separator */
-    __forceinline bool isSeparator(unsigned int c) const { return c<256 && isSepMap[c]; }
+    __forceinline bool isSeparator(int c) const { return isSepMap[c]; }

    /*! checks if a character is a number */
-    __forceinline bool isDigit(unsigned int c) const {  return c >= '0' && c <= '9'; }
-
-    /*! checks if a character is valid inside a string */
-    __forceinline bool isStringChar(unsigned int c) const { return c<256 && isStringCharMap[c]; }
+    __forceinline bool isDigit(int c) const {  return c >= '0' && c <= '9';}

    /*! checks if a character is legal for an identifier */
-    __forceinline bool isAlpha(unsigned int c) const {  return c<256 && isAlphaMap[c];  }
-    __forceinline bool isAlphaNum(unsigned int c) const { return isAlpha(c) || isDigit(c); }
+    __forceinline bool isAlpha(int c) const {  return isAlphaMap[c];  }
+    __forceinline bool isAlphaNum(int c) const { return isAlpha(c) || isDigit(c); }
  };
 }
@@ -1,12 +0,0 @@
-## Copyright 2009-2021 Intel Corporation
-## SPDX-License-Identifier: Apache-2.0
-
-ADD_LIBRARY(math STATIC constants.cpp)
-SET_PROPERTY(TARGET math PROPERTY FOLDER common)
-SET_PROPERTY(TARGET math APPEND PROPERTY COMPILE_FLAGS " ${FLAGS_LOWEST}")
-
-IF (EMBREE_STATIC_LIB)
-  INSTALL(TARGETS math EXPORT math-targets ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT devel)
-  INSTALL(EXPORT math-targets DESTINATION "${EMBREE_CMAKEEXPORT_DIR}" COMPONENT devel)
-ENDIF()
-
@@ -1,5 +1,18 @@
-// Copyright 2009-2021 Intel Corporation
-// SPDX-License-Identifier: Apache-2.0
+// ======================================================================== //
+// Copyright 2009-2017 Intel Corporation                                    //
+//                                                                          //
+// Licensed under the Apache License, Version 2.0 (the "License");          //
+// you may not use this file except in compliance with the License.         //
+// You may obtain a copy of the License at                                  //
+//                                                                          //
+//     http://www.apache.org/licenses/LICENSE-2.0                           //
+//                                                                          //
+// Unless required by applicable law or agreed to in writing, software      //
+// distributed under the License is distributed on an "AS IS" BASIS,        //
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. //
+// See the License for the specific language governing permissions and      //
+// limitations under the License.                                           //
+// ======================================================================== //

 #pragma once

@@ -7,7 +20,6 @@
 #include "linearspace3.h"
 #include "quaternion.h"
 #include "bbox.h"
-#include "vec4.h"

 namespace embree
 {
@@ -69,10 +81,6 @@ namespace embree
      }

    };
-  
-  // template specialization to get correct identity matrix for type AffineSpace3fa
-  template<>
-    __forceinline AffineSpaceT<LinearSpace3ff>::AffineSpaceT( OneTy )  : l(one),  p(0.f, 0.f, 0.f, 1.f) {}

  ////////////////////////////////////////////////////////////////////////////////
  // Unary Operators
@@ -99,9 +107,9 @@ namespace embree
  template<typename L> __forceinline AffineSpaceT<L>& operator /=( AffineSpaceT<L>& a, const AffineSpaceT<L>& b ) { return a = a / b; }
  template<typename L> __forceinline AffineSpaceT<L>& operator /=( AffineSpaceT<L>& a, const ScalarT        & b ) { return a = a / b; }

-  template<typename L> __forceinline VectorT xfmPoint (const AffineSpaceT<L>& m, const VectorT& p) { return madd(VectorT(p.x),m.l.vx,madd(VectorT(p.y),m.l.vy,madd(VectorT(p.z),m.l.vz,m.p))); }
-  template<typename L> __forceinline VectorT xfmVector(const AffineSpaceT<L>& m, const VectorT& v) { return xfmVector(m.l,v); }
-  template<typename L> __forceinline VectorT xfmNormal(const AffineSpaceT<L>& m, const VectorT& n) { return xfmNormal(m.l,n); }
+  template<typename L> __forceinline const VectorT xfmPoint (const AffineSpaceT<L>& m, const VectorT& p) { return madd(VectorT(p.x),m.l.vx,madd(VectorT(p.y),m.l.vy,madd(VectorT(p.z),m.l.vz,m.p))); }
+  template<typename L> __forceinline const VectorT xfmVector(const AffineSpaceT<L>& m, const VectorT& v) { return xfmVector(m.l,v); }
+  template<typename L> __forceinline const VectorT xfmNormal(const AffineSpaceT<L>& m, const VectorT& n) { return xfmNormal(m.l,n); }

  __forceinline const BBox<Vec3fa> xfmBounds(const AffineSpaceT<LinearSpace3<Vec3fa> >& m, const BBox<Vec3fa>& b) 
  { 
@@ -132,11 +140,17 @@ namespace embree
    return AffineSpaceT<L>(select(s,t.l,f.l),select(s,t.p,f.p));
  }

+  /*! blending */
+  template<typename T>
+    __forceinline AffineSpaceT<T> lerp(const AffineSpaceT<T>& l0, const AffineSpaceT<T>& l1, const float t) {
+    return AffineSpaceT<T>(lerp(l0.l,l1.l,t),lerp(l0.p,l1.p,t));
+  }
+
  ////////////////////////////////////////////////////////////////////////////////
  // Output Operators
  ////////////////////////////////////////////////////////////////////////////////

-  template<typename L> static embree_ostream operator<<(embree_ostream cout, const AffineSpaceT<L>& m) {
+  template<typename L> static std::ostream& operator<<(std::ostream& cout, const AffineSpaceT<L>& m) {
    return cout << "{ l = " << m.l << ", p = " << m.p << " }";
  }

@@ -147,214 +161,11 @@ namespace embree
  typedef AffineSpaceT<LinearSpace2f> AffineSpace2f;
  typedef AffineSpaceT<LinearSpace3f> AffineSpace3f;
  typedef AffineSpaceT<LinearSpace3fa> AffineSpace3fa;
-  typedef AffineSpaceT<LinearSpace3fx> AffineSpace3fx;
-  typedef AffineSpaceT<LinearSpace3ff> AffineSpace3ff;
  typedef AffineSpaceT<Quaternion3f > OrthonormalSpace3f;

-  template<int N> using AffineSpace3vf = AffineSpaceT<LinearSpace3<Vec3<vfloat<N>>>>;
-  typedef AffineSpaceT<LinearSpace3<Vec3<vfloat<4>>>>  AffineSpace3vf4;
-  typedef AffineSpaceT<LinearSpace3<Vec3<vfloat<8>>>>  AffineSpace3vf8;
-  typedef AffineSpaceT<LinearSpace3<Vec3<vfloat<16>>>> AffineSpace3vf16;
-
-  template<int N> using AffineSpace3vff = AffineSpaceT<LinearSpace3<Vec4<vfloat<N>>>>;
-  typedef AffineSpaceT<LinearSpace3<Vec4<vfloat<4>>>>  AffineSpace3vfa4;
-  typedef AffineSpaceT<LinearSpace3<Vec4<vfloat<8>>>>  AffineSpace3vfa8;
-  typedef AffineSpaceT<LinearSpace3<Vec4<vfloat<16>>>> AffineSpace3vfa16;
-
-  //////////////////////////////////////////////////////////////////////////////
-  /// Interpolation
-  //////////////////////////////////////////////////////////////////////////////
-  template<typename T, typename R>
-  __forceinline AffineSpaceT<T> lerp(const AffineSpaceT<T>& M0,
-                                     const AffineSpaceT<T>& M1,
-                                     const R& t)
-  {
-    return AffineSpaceT<T>(lerp(M0.l,M1.l,t),lerp(M0.p,M1.p,t));
-  }
-
-  // slerp interprets the 16 floats of the matrix M = D * R * S as components of
-  // three matrizes (D, R, S) that are interpolated individually.
-  template<typename T> __forceinline AffineSpaceT<LinearSpace3<Vec3<T>>>
-  slerp(const AffineSpaceT<LinearSpace3<Vec4<T>>>& M0,
-        const AffineSpaceT<LinearSpace3<Vec4<T>>>& M1,
-        const T& t)
-  {
-    QuaternionT<T> q0(M0.p.w, M0.l.vx.w, M0.l.vy.w, M0.l.vz.w);
-    QuaternionT<T> q1(M1.p.w, M1.l.vx.w, M1.l.vy.w, M1.l.vz.w);
-    QuaternionT<T> q = slerp(q0, q1, t);
-
-    AffineSpaceT<LinearSpace3<Vec3<T>>> S = lerp(M0, M1, t);
-    AffineSpaceT<LinearSpace3<Vec3<T>>> D(one);
-    D.p.x = S.l.vx.y;
-    D.p.y = S.l.vx.z;
-    D.p.z = S.l.vy.z;
-    S.l.vx.y = 0;
-    S.l.vx.z = 0;
-    S.l.vy.z = 0;
-
-    AffineSpaceT<LinearSpace3<Vec3<T>>> R = LinearSpace3<Vec3<T>>(q);
-    return D * R * S;
-  }
-
-  // this is a specialized version for Vec3fa because that does
-  // not play along nicely with the other templated Vec3/Vec4 types
-  __forceinline AffineSpace3fa slerp(const AffineSpace3ff& M0,
-                                     const AffineSpace3ff& M1,
-                                     const float& t)
-  {
-    Quaternion3f q0(M0.p.w, M0.l.vx.w, M0.l.vy.w, M0.l.vz.w);
-    Quaternion3f q1(M1.p.w, M1.l.vx.w, M1.l.vy.w, M1.l.vz.w);
-    Quaternion3f q = slerp(q0, q1, t);
-
-    AffineSpace3fa S = lerp(M0, M1, t);
-    AffineSpace3fa D(one);
-    D.p.x = S.l.vx.y;
-    D.p.y = S.l.vx.z;
-    D.p.z = S.l.vy.z;
-    S.l.vx.y = 0;
-    S.l.vx.z = 0;
-    S.l.vy.z = 0;
-
-    AffineSpace3fa R = LinearSpace3fa(q);
-    return D * R * S;
-  }
-  
-  __forceinline AffineSpace3fa quaternionDecompositionToAffineSpace(const AffineSpace3ff& qd)
-  {
-    // compute affine transform from quaternion decomposition
-    Quaternion3f q(qd.p.w, qd.l.vx.w, qd.l.vy.w, qd.l.vz.w);
-    AffineSpace3fa M = qd;
-    AffineSpace3fa D(one);
-    D.p.x = M.l.vx.y;
-    D.p.y = M.l.vx.z;
-    D.p.z = M.l.vy.z;
-    M.l.vx.y = 0;
-    M.l.vx.z = 0;
-    M.l.vy.z = 0;
-    AffineSpace3fa R = LinearSpace3fa(q);
-    return D * R * M;
-  }
-  
-  __forceinline void quaternionDecomposition(const AffineSpace3ff& qd, Vec3fa& T, Quaternion3f& q, AffineSpace3fa& S)
-  {
-    q = Quaternion3f(qd.p.w, qd.l.vx.w, qd.l.vy.w, qd.l.vz.w);
-    S = qd;
-    T.x = qd.l.vx.y;
-    T.y = qd.l.vx.z;
-    T.z = qd.l.vy.z;
-    S.l.vx.y = 0;
-    S.l.vx.z = 0;
-    S.l.vy.z = 0;
-  }
-
-  __forceinline AffineSpace3fx quaternionDecomposition(Vec3fa const& T, Quaternion3f const& q, AffineSpace3fa const& S)
-  {
-    AffineSpace3ff M = S;
-    M.l.vx.w = q.i;
-    M.l.vy.w = q.j;
-    M.l.vz.w = q.k;
-    M.p.w    = q.r;
-    M.l.vx.y = T.x;
-    M.l.vx.z = T.y;
-    M.l.vy.z = T.z;
-    return M;
-  }
-
-  struct __aligned(16) QuaternionDecomposition
-  {
-    float scale_x = 1.f;
-    float scale_y = 1.f;
-    float scale_z = 1.f;
-    float skew_xy = 0.f;
-    float skew_xz = 0.f;
-    float skew_yz = 0.f;
-    float shift_x = 0.f;
-    float shift_y = 0.f;
-    float shift_z = 0.f;
-    float quaternion_r = 1.f;
-    float quaternion_i = 0.f;
-    float quaternion_j = 0.f;
-    float quaternion_k = 0.f;
-    float translation_x = 0.f;
-    float translation_y = 0.f;
-    float translation_z = 0.f;
-  };
-
-  __forceinline QuaternionDecomposition quaternionDecomposition(AffineSpace3ff const& M)
-  {
-    QuaternionDecomposition qd;
-    qd.scale_x       = M.l.vx.x;
-    qd.scale_y       = M.l.vy.y;
-    qd.scale_z       = M.l.vz.z;
-    qd.shift_x       = M.p.x;
-    qd.shift_y       = M.p.y;
-    qd.shift_z       = M.p.z;
-    qd.translation_x = M.l.vx.y;
-    qd.translation_y = M.l.vx.z;
-    qd.translation_z = M.l.vy.z;
-    qd.skew_xy       = M.l.vy.x;
-    qd.skew_xz       = M.l.vz.x;
-    qd.skew_yz       = M.l.vz.y;
-    qd.quaternion_r  = M.p.w;
-    qd.quaternion_i  = M.l.vx.w;
-    qd.quaternion_j  = M.l.vy.w;
-    qd.quaternion_k  = M.l.vz.w;
-    return qd;
-  }
-
  ////////////////////////////////////////////////////////////////////////////////
-  /*
-   * ! Template Specialization for 2D: return matrix for rotation around point
-   * (rotation around arbitrarty vector is not meaningful in 2D)
-   */
-  template<> __forceinline
-  AffineSpace2f AffineSpace2f::rotate(const Vec2f& p, const float& r) {
-    return translate(+p)*AffineSpace2f(LinearSpace2f::rotate(r))*translate(-p);
-  }
-
-  ////////////////////////////////////////////////////////////////////////////////
-  // Similarity Transform
-  //
-  // checks, if M is a similarity transformation, i.e if there exists a factor D
-  // such that for all x,y: distance(Mx, My) = D * distance(x, y)
-  ////////////////////////////////////////////////////////////////////////////////
-  __forceinline bool similarityTransform(const AffineSpace3fa& M, float* D)
-  {
-    if (D) *D = 0.f;
-    if (abs(dot(M.l.vx, M.l.vy)) > 1e-5f) return false;
-    if (abs(dot(M.l.vx, M.l.vz)) > 1e-5f) return false;
-    if (abs(dot(M.l.vy, M.l.vz)) > 1e-5f) return false;
-
-    const float D_x = dot(M.l.vx, M.l.vx);
-    const float D_y = dot(M.l.vy, M.l.vy);
-    const float D_z = dot(M.l.vz, M.l.vz);
-
-    if (abs(D_x - D_y) > 1e-5f ||
-        abs(D_x - D_z) > 1e-5f ||
-        abs(D_y - D_z) > 1e-5f)
-      return false;
-
-    if (D) *D = sqrtf(D_x);
-    return true;
-  }
-  
-  __forceinline void AffineSpace3fa_store_unaligned(const AffineSpace3fa &source, AffineSpace3fa* ptr)
-  {
-    Vec3fa::storeu(&ptr->l.vx, source.l.vx);
-    Vec3fa::storeu(&ptr->l.vy, source.l.vy);
-    Vec3fa::storeu(&ptr->l.vz, source.l.vz);
-    Vec3fa::storeu(&ptr->p, source.p);
-  }
-
-  __forceinline AffineSpace3fa AffineSpace3fa_load_unaligned(AffineSpace3fa* ptr)
-  {
-    AffineSpace3fa space;
-    space.l.vx = Vec3fa::loadu(&ptr->l.vx);
-    space.l.vy = Vec3fa::loadu(&ptr->l.vy);
-    space.l.vz = Vec3fa::loadu(&ptr->l.vz);
-    space.p    = Vec3fa::loadu(&ptr->p);
-    return space;
-  }
+  /*! Template Specialization for 2D: return matrix for rotation around point (rotation around arbitrarty vector is not meaningful in 2D) */
+  template<> __forceinline AffineSpace2f AffineSpace2f::rotate(const Vec2f& p, const float& r) { return translate(+p) * AffineSpace2f(LinearSpace2f::rotate(r)) * translate(-p); }

  #undef VectorT
  #undef ScalarT
@@ -1,5 +1,18 @@
-// Copyright 2009-2021 Intel Corporation
-// SPDX-License-Identifier: Apache-2.0
+// ======================================================================== //
+// Copyright 2009-2017 Intel Corporation                                    //
+//                                                                          //
+// Licensed under the Apache License, Version 2.0 (the "License");          //
+// you may not use this file except in compliance with the License.         //
+// You may obtain a copy of the License at                                  //
+//                                                                          //
+//     http://www.apache.org/licenses/LICENSE-2.0                           //
+//                                                                          //
+// Unless required by applicable law or agreed to in writing, software      //
+// distributed under the License is distributed on an "AS IS" BASIS,        //
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. //
+// See the License for the specific language governing permissions and      //
+// limitations under the License.                                           //
+// ======================================================================== //

 #pragma once

@@ -8,13 +21,6 @@

 namespace embree
 {
-  namespace internal {
-
-    template <typename T> __forceinline T divideByTwo(const T& v) { return v / T(2); }
-    template <> __forceinline float divideByTwo<float>(const float& v) { return v * 0.5f; }
-    template <> __forceinline double divideByTwo<double>(const double& v) { return v * 0.5; }
-
-  } // namespace internal
  template<typename T>
  struct BBox
  {
@@ -25,8 +31,7 @@ namespace embree
    ////////////////////////////////////////////////////////////////////////////////

    __forceinline BBox           ( )                   { }
-    template<typename T1>
-    __forceinline BBox           ( const BBox<T1>& other ) : lower(other.lower), upper(other.upper) {}
+    __forceinline BBox           ( const BBox& other ) { lower = other.lower; upper = other.upper; }
    __forceinline BBox& operator=( const BBox& other ) { lower = other.lower; upper = other.upper; return *this; }

    __forceinline BBox ( const T& v                     ) : lower(v), upper(v) {}
@@ -46,7 +51,7 @@ namespace embree
    __forceinline T size() const { return upper - lower; }

    /*! computes the center of the box */
-    __forceinline T center() const { return internal::divideByTwo<T>(lower+upper); }
+    __forceinline T center() const { return 0.5f*(lower+upper); }

    /*! computes twice the center of the box */
    __forceinline T center2() const { return lower+upper; }
@@ -55,16 +60,6 @@ namespace embree
    __forceinline static const BBox merge (const BBox& a, const BBox& b) {
      return BBox(min(a.lower, b.lower), max(a.upper, b.upper));
    }
-
-    /*! intersects two boxes */
-    __forceinline static const BBox intersect (const BBox& a, const BBox& b) {
-      return BBox(max(a.lower, b.lower), min(a.upper, b.upper));
-    }
-
-     /*! enlarge box by some scaling factor */
-    __forceinline BBox enlarge_by(const float a) const {
-      return BBox(lower - T(a)*abs(lower), upper + T(a)*abs(upper));
-    }
    
    ////////////////////////////////////////////////////////////////////////////////
    /// Constants
@@ -82,13 +77,10 @@ namespace embree
    return lower > upper;
  }

-#if defined(__SSE__) || defined(__ARM_NEON)
+#if defined(__SSE__)
  template<> __forceinline bool BBox<Vec3fa>::empty() const {
    return !all(le_mask(lower,upper));
  }
-  template<> __forceinline bool BBox<Vec3fx>::empty() const {
-    return !all(le_mask(lower,upper));
-  }
 #endif

  /*! tests if box is finite */
@@ -96,11 +88,6 @@ namespace embree
    return all(gt_mask(v.lower,Vec3fa_t(-FLT_LARGE)) & lt_mask(v.upper,Vec3fa_t(+FLT_LARGE)));
  }

-  /*! tests if box is finite and non-empty*/
-  __forceinline bool isvalid_non_empty( const BBox<Vec3fa>& v ) {
-    return all(gt_mask(v.lower,Vec3fa_t(-FLT_LARGE)) & lt_mask(v.upper,Vec3fa_t(+FLT_LARGE)) & le_mask(v.lower,v.upper));
-  }
-  
  /*! tests if box has finite entries */
  __forceinline bool is_finite( const BBox<Vec3fa>& b) {
    return is_finite(b.lower) && is_finite(b.upper);
@@ -111,7 +98,7 @@ namespace embree

  /*! computes the center of the box */
  template<typename T> __forceinline const T center2(const BBox<T>& box) { return box.lower + box.upper; }
-  template<typename T> __forceinline const T center (const BBox<T>& box) { return internal::divideByTwo<T>(center2(box)); }
+  template<typename T> __forceinline const T center (const BBox<T>& box) { return T(0.5f)*center2(box); }

  /*! computes the volume of a bounding box */
  __forceinline float volume    ( const BBox<Vec3fa>& b ) { return reduce_mul(b.size()); }
@@ -124,14 +111,11 @@ namespace embree
  template<typename T> __forceinline const T area( const BBox<Vec2<T> >& b ) { const Vec2<T> d = b.size(); return d.x*d.y; }

  template<typename T> __forceinline const T halfArea( const BBox<Vec3<T> >& b ) { return halfArea(b.size()); }
-  template<typename T> __forceinline const T     area( const BBox<Vec3<T> >& b ) { return T(2)*halfArea(b); }
+  template<typename T> __forceinline const T     area( const BBox<Vec3<T> >& b ) { return 2.0f*halfArea(b); }

  __forceinline float halfArea( const BBox<Vec3fa>& b ) { return halfArea(b.size()); }
  __forceinline float     area( const BBox<Vec3fa>& b ) { return 2.0f*halfArea(b); }

-  __forceinline float halfArea( const BBox<Vec3fx>& b ) { return halfArea(b.size()); }
-  __forceinline float     area( const BBox<Vec3fx>& b ) { return 2.0f*halfArea(b); }
-
  template<typename Vec> __forceinline float safeArea( const BBox<Vec>& b ) { if (b.empty()) return 0.0f; else return area(b); }

  template<typename T> __forceinline float expectedApproxHalfArea(const BBox<T>& box) {
@@ -200,14 +184,6 @@ namespace embree
    return true; 
  }

-  template<> __inline bool subset( const BBox<Vec3fa>& a, const BBox<Vec3fa>& b ) {
-    return all(ge_mask(a.lower,b.lower)) && all(le_mask(a.upper,b.upper));
-  }
-
-  template<> __inline bool subset( const BBox<Vec3fx>& a, const BBox<Vec3fx>& b ) {
-    return all(ge_mask(a.lower,b.lower)) && all(le_mask(a.upper,b.upper));
-  }
-  
  /*! blending */
  template<typename T>
    __forceinline BBox<T> lerp(const BBox<T>& b0, const BBox<T>& b1, const float t) {
@@ -215,29 +191,26 @@ namespace embree
  }

  /*! output operator */
-  template<typename T> __forceinline embree_ostream operator<<(embree_ostream cout, const BBox<T>& box) {
+  template<typename T> __forceinline std::ostream& operator<<(std::ostream& cout, const BBox<T>& box) {
    return cout << "[" << box.lower << "; " << box.upper << "]";
  }

  /*! default template instantiations */
  typedef BBox<float> BBox1f;
  typedef BBox<Vec2f> BBox2f;
-  typedef BBox<Vec2fa> BBox2fa;
  typedef BBox<Vec3f> BBox3f;
  typedef BBox<Vec3fa> BBox3fa;
-  typedef BBox<Vec3fx> BBox3fx;
-  typedef BBox<Vec3ff> BBox3ff;
 }

 ////////////////////////////////////////////////////////////////////////////////
 /// SSE / AVX / MIC specializations
 ////////////////////////////////////////////////////////////////////////////////

-#if defined (__SSE__) || defined(__ARM_NEON)
+#if defined __SSE__
 #include "../simd/sse.h"
 #endif

-#if defined (__AVX__)
+#if defined __AVX__
 #include "../simd/avx.h"
 #endif

@@ -1,9 +1,22 @@
-// Copyright 2009-2021 Intel Corporation
-// SPDX-License-Identifier: Apache-2.0
+// ======================================================================== //
+// Copyright 2009-2017 Intel Corporation                                    //
+//                                                                          //
+// Licensed under the Apache License, Version 2.0 (the "License");          //
+// you may not use this file except in compliance with the License.         //
+// You may obtain a copy of the License at                                  //
+//                                                                          //
+//     http://www.apache.org/licenses/LICENSE-2.0                           //
+//                                                                          //
+// Unless required by applicable law or agreed to in writing, software      //
+// distributed under the License is distributed on an "AS IS" BASIS,        //
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. //
+// See the License for the specific language governing permissions and      //
+// limitations under the License.                                           //
+// ======================================================================== //

 #pragma once

-#include "emath.h"
+#include "math.h"

 namespace embree
 {
@@ -37,7 +50,7 @@ namespace embree
  };

  /*! output operator */
-  template<typename T> __forceinline embree_ostream operator<<(embree_ostream cout, const Col3<T>& a) {
+  template<typename T> inline std::ostream& operator<<(std::ostream& cout, const Col3<T>& a) {
    return cout << "(" << a.r << ", " << a.g << ", " << a.b << ")";
  }

@@ -1,9 +1,22 @@
-// Copyright 2009-2021 Intel Corporation
-// SPDX-License-Identifier: Apache-2.0
+// ======================================================================== //
+// Copyright 2009-2017 Intel Corporation                                    //
+//                                                                          //
+// Licensed under the Apache License, Version 2.0 (the "License");          //
+// you may not use this file except in compliance with the License.         //
+// You may obtain a copy of the License at                                  //
+//                                                                          //
+//     http://www.apache.org/licenses/LICENSE-2.0                           //
+//                                                                          //
+// Unless required by applicable law or agreed to in writing, software      //
+// distributed under the License is distributed on an "AS IS" BASIS,        //
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. //
+// See the License for the specific language governing permissions and      //
+// limitations under the License.                                           //
+// ======================================================================== //

 #pragma once

-#include "emath.h"
+#include "math.h"

 namespace embree
 {
@@ -37,7 +50,7 @@ namespace embree
  };

  /*! output operator */
-  template<typename T> __forceinline embree_ostream operator<<(embree_ostream cout, const Col4<T>& a) {
+  template<typename T> inline std::ostream& operator<<(std::ostream& cout, const Col4<T>& a) {
    return cout << "(" << a.r << ", " << a.g << ", " << a.b << ", " << a.a << ")";
  }

@@ -1,12 +1,21 @@
-// Copyright 2009-2021 Intel Corporation
-// SPDX-License-Identifier: Apache-2.0
+// ======================================================================== //
+// Copyright 2009-2017 Intel Corporation                                    //
+//                                                                          //
+// Licensed under the Apache License, Version 2.0 (the "License");          //
+// you may not use this file except in compliance with the License.         //
+// You may obtain a copy of the License at                                  //
+//                                                                          //
+//     http://www.apache.org/licenses/LICENSE-2.0                           //
+//                                                                          //
+// Unless required by applicable law or agreed to in writing, software      //
+// distributed under the License is distributed on an "AS IS" BASIS,        //
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. //
+// See the License for the specific language governing permissions and      //
+// limitations under the License.                                           //
+// ======================================================================== //

 #pragma once

-#if defined(EMBREE_SYCL_SUPPORT) && defined(__SYCL_DEVICE_ONLY__)
-#  include "color_sycl.h"
-#else
-
 #include "constants.h"
 #include "col3.h"
 #include "col4.h"
@@ -44,8 +53,8 @@ namespace embree
    __forceinline Color4           ( const Color4& other ) : m128(other.m128) {}
    __forceinline Color4& operator=( const Color4& other ) { m128 = other.m128; return *this; }

-    __forceinline operator const __m128&() const { return m128; }
-    __forceinline operator       __m128&()       { return m128; }
+    __forceinline operator const __m128&( void ) const { return m128; }
+    __forceinline operator       __m128&( void )       { return m128; }

    ////////////////////////////////////////////////////////////////////////////////
    /// Set
@@ -68,10 +77,6 @@ namespace embree
      d.b = (unsigned char)(s[2]); 
      d.a = (unsigned char)(s[3]); 
    }
-    __forceinline void set(float &f) const
-    {
-      f = 0.2126f*r+0.7125f*g+0.0722f*b; // sRGB luminance.
-    }

    ////////////////////////////////////////////////////////////////////////////////
    /// Constants
@@ -110,8 +115,8 @@ namespace embree
    __forceinline Color           ( const Color4& other ) : m128(other.m128) {}
    __forceinline Color& operator=( const Color4& other ) { m128 = other.m128; return *this; }

-    __forceinline operator const __m128&() const { return m128; }
-    __forceinline operator       __m128&()       { return m128; }
+    __forceinline operator const __m128&( void ) const { return m128; }
+    __forceinline operator       __m128&( void )       { return m128; }

    ////////////////////////////////////////////////////////////////////////////////
    /// Set
@@ -160,38 +165,21 @@ namespace embree
  }
  __forceinline const Color rcp  ( const Color& a )
  {
-#if defined(__aarch64__)
-    __m128 reciprocal = _mm_rcp_ps(a.m128);
-    reciprocal = vmulq_f32(vrecpsq_f32(a.m128, reciprocal), reciprocal);
-    reciprocal = vmulq_f32(vrecpsq_f32(a.m128, reciprocal), reciprocal);
-    return (const Color)reciprocal;
-#else
 #if defined(__AVX512VL__)
    const Color r = _mm_rcp14_ps(a.m128);
 #else
    const Color r = _mm_rcp_ps(a.m128);
 #endif
-    return _mm_add_ps(r,_mm_mul_ps(r, _mm_sub_ps(_mm_set1_ps(1.0f), _mm_mul_ps(a, r))));   // computes r + r * (1 - a * r)
-
-#endif  //defined(__aarch64__)
+    return _mm_sub_ps(_mm_add_ps(r, r), _mm_mul_ps(_mm_mul_ps(r, r), a));
  }
  __forceinline const Color rsqrt( const Color& a )
  {
-#if defined(__aarch64__)
-    __m128 r = _mm_rsqrt_ps(a.m128);
-    r = vmulq_f32(r, vrsqrtsq_f32(vmulq_f32(a.m128, r), r));
-    r = vmulq_f32(r, vrsqrtsq_f32(vmulq_f32(a.m128, r), r));
-    return r;
-#else
-
 #if defined(__AVX512VL__)
    __m128 r = _mm_rsqrt14_ps(a.m128);
 #else
    __m128 r = _mm_rsqrt_ps(a.m128);
 #endif
    return _mm_add_ps(_mm_mul_ps(_mm_set1_ps(1.5f),r), _mm_mul_ps(_mm_mul_ps(_mm_mul_ps(a, _mm_set1_ps(-0.5f)), r), _mm_mul_ps(r, r)));
-
-#endif  //defined(__aarch64__)
  }
  __forceinline const Color sqrt ( const Color& a ) { return _mm_sqrt_ps(a.m128); }

@@ -260,9 +248,7 @@ namespace embree
  __forceinline float luminance (const Color& a) { return madd(0.212671f,a.r,madd(0.715160f,a.g,0.072169f*a.b)); }

  /*! output operator */
-  __forceinline embree_ostream operator<<(embree_ostream cout, const Color& a) {
+  inline std::ostream& operator<<(std::ostream& cout, const Color& a) {
    return cout << "(" << a.r << ", " << a.g << ", " << a.b << ")";
  }
 }
-
-#endif
@@ -1,219 +0,0 @@
-// Copyright 2009-2021 Intel Corporation
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include "constants.h"
-#include "col3.h"
-#include "col4.h"
-
-#include "../simd/sse.h"
-
-namespace embree
-{
-  ////////////////////////////////////////////////////////////////////////////////
-  /// SSE RGBA Color Class
-  ////////////////////////////////////////////////////////////////////////////////
-
-  struct Color4
-  {
-    struct { float r,g,b,a; };
-
-    ////////////////////////////////////////////////////////////////////////////////
-    /// Construction
-    ////////////////////////////////////////////////////////////////////////////////
-
-    __forceinline Color4 () {}
-    //__forceinline Color4 ( const __m128 a ) : m128(a) {}
-
-    __forceinline explicit Color4 (const float v) : r(v), g(v), b(v), a(v) {}
-    __forceinline          Color4 (const float r, const float g, const float b, const float a) : r(r), g(g), b(b), a(a) {}
-
-    __forceinline explicit Color4 ( const Col3uc& other ) : r(other.r/255.0f), g(other.g/255.0f), b(other.b/255.0f), a(1.0f) {}
-    __forceinline explicit Color4 ( const Col3f&  other ) : r(other.r), g(other.g), b(other.b), a(1.0f) {}
-    __forceinline explicit Color4 ( const Col4uc& other ) : r(other.r/255.0f), g(other.g/255.0f), b(other.b/255.0f), a(other.a/255.0f) {}
-    __forceinline explicit Color4 ( const Col4f&  other ) : r(other.r), g(other.g), b(other.b), a(other.a) {}
-
-    //__forceinline Color4           ( const Color4& other ) : m128(other.m128) {}
-    //__forceinline Color4& operator=( const Color4& other ) { m128 = other.m128; return *this; }
-
-    //__forceinline operator const __m128&() const { return m128; }
-    //__forceinline operator       __m128&()       { return m128; }
-
-    ////////////////////////////////////////////////////////////////////////////////
-    /// Set
-    ////////////////////////////////////////////////////////////////////////////////
-
-    __forceinline void set(Col3f& d) const { d.r = r; d.g = g; d.b = b; }
-    __forceinline void set(Col4f& d) const { d.r = r; d.g = g; d.b = b; d.a = a; }
-
-    __forceinline void set(Col3uc& d) const 
-    {
-      d.r = (unsigned char)(clamp(r)*255.0f); 
-      d.g = (unsigned char)(clamp(g)*255.0f); 
-      d.b = (unsigned char)(clamp(b)*255.0f);
-    }
-    
-    __forceinline void set(Col4uc& d) const 
-    {
-      d.r = (unsigned char)(clamp(r)*255.0f); 
-      d.g = (unsigned char)(clamp(g)*255.0f); 
-      d.b = (unsigned char)(clamp(b)*255.0f); 
-      d.a = (unsigned char)(clamp(a)*255.0f);
-    }
-    __forceinline void set(float &f) const
-    {
-      f = 0.2126f*r+0.7125f*g+0.0722f*b; // sRGB luminance.
-    }
-
-    ////////////////////////////////////////////////////////////////////////////////
-    /// Constants
-    ////////////////////////////////////////////////////////////////////////////////
-
-    __forceinline Color4( ZeroTy   ) : r(0.0f), g(0.0f), b(0.0f), a(0.0f) {}
-    __forceinline Color4( OneTy    ) : r(1.0f), g(1.0f), b(1.0f), a(1.0f) {}
-    //__forceinline Color4( PosInfTy ) : m128(_mm_set1_ps(pos_inf)) {}
-    //__forceinline Color4( NegInfTy ) : m128(_mm_set1_ps(neg_inf)) {}
-  };
-
-  ////////////////////////////////////////////////////////////////////////////////
-  /// SSE RGB Color Class
-  ////////////////////////////////////////////////////////////////////////////////
-
-  struct Color
-  {
-    struct { float r,g,b; };
-    
-    ////////////////////////////////////////////////////////////////////////////////
-    /// Construction
-    ////////////////////////////////////////////////////////////////////////////////
-
-    __forceinline Color () {}
-    //__forceinline Color ( const __m128 a ) : m128(a) {}
-
-    __forceinline explicit Color  (const float v)  : r(v), g(v), b(v) {}
-    __forceinline          Color  (const float r, const float g, const float b) : r(r), g(g), b(b) {}
-
-    //__forceinline Color           ( const Color& other ) : m128(other.m128) {}
-    //__forceinline Color& operator=( const Color& other ) { m128 = other.m128; return *this; }
-
-    //__forceinline Color           ( const Color4& other ) : m128(other.m128) {}
-    //__forceinline Color& operator=( const Color4& other ) { m128 = other.m128; return *this; }
-
-    //__forceinline operator const __m128&() const { return m128; }
-    //__forceinline operator       __m128&()       { return m128; }
-
-    ////////////////////////////////////////////////////////////////////////////////
-    /// Set
-    ////////////////////////////////////////////////////////////////////////////////
-
-    __forceinline void set(Col3f& d) const { d.r = r; d.g = g; d.b = b; }
-    __forceinline void set(Col4f& d) const { d.r = r; d.g = g; d.b = b; d.a = 1.0f; }
-
-#if 0
-    __forceinline void set(Col3uc& d) const 
-    { 
-      vfloat4 s = clamp(vfloat4(m128))*255.0f;
-      d.r = (unsigned char)(s[0]); 
-      d.g = (unsigned char)(s[1]); 
-      d.b = (unsigned char)(s[2]); 
-    }
-    __forceinline void set(Col4uc& d) const 
-    { 
-      vfloat4 s = clamp(vfloat4(m128))*255.0f;
-      d.r = (unsigned char)(s[0]); 
-      d.g = (unsigned char)(s[1]); 
-      d.b = (unsigned char)(s[2]); 
-      d.a = 255;  
-    }
-#endif
-
-    ////////////////////////////////////////////////////////////////////////////////
-    /// Constants
-    ////////////////////////////////////////////////////////////////////////////////
-
-    __forceinline Color( ZeroTy   ) : r(0.0f), g(0.0f), b(0.0f) {}
-    __forceinline Color( OneTy    ) : r(1.0f), g(1.0f), b(1.0f) {}
-    //__forceinline Color( PosInfTy ) : m128(_mm_set1_ps(pos_inf)) {}
-    //__forceinline Color( NegInfTy ) : m128(_mm_set1_ps(neg_inf)) {}
-  };
-
-  ////////////////////////////////////////////////////////////////////////////////
-  /// Unary Operators
-  ////////////////////////////////////////////////////////////////////////////////
-
-  __forceinline const Color operator +( const Color& a ) { return a; }
-  __forceinline const Color operator -( const Color& a ) { return Color(-a.r, -a.g, -a.b); }
-  __forceinline const Color abs  ( const Color& a ) { return Color(abs(a.r), abs(a.g), abs(a.b)); }
-  __forceinline const Color rcp  ( const Color& a ) { return Color(1.0f/a.r, 1.0f/a.g, 1.0f/a.b); }
-  __forceinline const Color rsqrt( const Color& a ) { return Color(1.0f/sqrt(a.r), 1.0f/sqrt(a.g), 1.0f/sqrt(a.b)); }
-  __forceinline const Color sqrt ( const Color& a ) { return Color(sqrt(a.r), sqrt(a.g), sqrt(a.b)); }
-
-  ////////////////////////////////////////////////////////////////////////////////
-  /// Binary Operators
-  ////////////////////////////////////////////////////////////////////////////////
-
-  __forceinline const Color operator +( const Color& a, const Color& b ) { return Color(a.r+b.r, a.g+b.g, a.b+b.b); }
-  __forceinline const Color operator -( const Color& a, const Color& b ) { return Color(a.r-b.r, a.g-b.g, a.b-b.b); }
-  __forceinline const Color operator *( const Color& a, const Color& b ) { return Color(a.r*b.r, a.g*b.g, a.b*b.b); }
-  __forceinline const Color operator *( const Color& a, const float  b ) { return a * Color(b); }
-  __forceinline const Color operator *( const float  a, const Color& b ) { return Color(a) * b; }
-  __forceinline const Color operator /( const Color& a, const Color& b ) { return a * rcp(b); }
-  __forceinline const Color operator /( const Color& a, const float  b ) { return a * rcp(b); }
-
-  __forceinline const Color min( const Color& a, const Color& b ) { return Color(min(a.r,b.r), min(a.g,b.g), min(a.b,b.b)); }
-  __forceinline const Color max( const Color& a, const Color& b ) { return Color(max(a.r,b.r), max(a.g,b.g), max(a.b,b.b)); }
-
-  ////////////////////////////////////////////////////////////////////////////////
-  /// Assignment Operators
-  ////////////////////////////////////////////////////////////////////////////////
-
-  __forceinline const Color operator+=(Color& a, const Color& b) { return a = a + b; }
-  __forceinline const Color operator-=(Color& a, const Color& b) { return a = a - b; }
-  __forceinline const Color operator*=(Color& a, const Color& b) { return a = a * b; }
-  __forceinline const Color operator/=(Color& a, const Color& b) { return a = a / b; }
-  __forceinline const Color operator*=(Color& a, const float b      ) { return a = a * b; }
-  __forceinline const Color operator/=(Color& a, const float b      ) { return a = a / b; }
-
-  ////////////////////////////////////////////////////////////////////////////////
-  /// Reductions
-  ////////////////////////////////////////////////////////////////////////////////
-
-  __forceinline float reduce_add(const Color& v) { return v.r+v.g+v.b; }
-  __forceinline float reduce_mul(const Color& v) { return v.r*v.g*v.b; }
-  __forceinline float reduce_min(const Color& v) { return min(v.r,v.g,v.b); }
-  __forceinline float reduce_max(const Color& v) { return max(v.r,v.g,v.b); }
-
-  ////////////////////////////////////////////////////////////////////////////////
-  /// Comparison Operators
-  ////////////////////////////////////////////////////////////////////////////////
-
-  __forceinline bool operator ==( const Color& a, const Color& b ) { return a.r == b.r && a.g == b.g && a.b == b.b; }
-  __forceinline bool operator !=( const Color& a, const Color& b ) { return a.r != b.r || a.g != b.g || a.b != b.b; }
-  __forceinline bool operator < ( const Color& a, const Color& b ) {
-    if (a.r != b.r) return a.r < b.r;
-    if (a.g != b.g) return a.g < b.g;
-    if (a.b != b.b) return a.b < b.b;
-    return false;
-  }
-
-   ////////////////////////////////////////////////////////////////////////////////
-  /// Select
-  ////////////////////////////////////////////////////////////////////////////////
-
-  __forceinline const Color select( bool s, const Color& t, const Color& f ) {
-    return s ? t : f;
-  }
-
-  ////////////////////////////////////////////////////////////////////////////////
-  /// Special Operators
-  ////////////////////////////////////////////////////////////////////////////////
-
-  /*! computes luminance of a color */
-  __forceinline float luminance (const Color& a) { return madd(0.212671f,a.r,madd(0.715160f,a.g,0.072169f*a.b)); }
-
-  /*! output operator */
-  inline std::ostream& operator<<(std::ostream& cout, const Color& a) {
-    return cout << "(" << a.r << ", " << a.g << ", " << a.b << ")";
-  }
-}
@@ -1,8 +0,0 @@
-// Copyright 2009-2021 Intel Corporation
-// SPDX-License-Identifier: Apache-2.0
-
-#include "constants.h"
-
-namespace embree
-{
-}
@@ -1,5 +1,18 @@
-// Copyright 2009-2021 Intel Corporation
-// SPDX-License-Identifier: Apache-2.0
+// ======================================================================== //
+// Copyright 2009-2017 Intel Corporation                                    //
+//                                                                          //
+// Licensed under the Apache License, Version 2.0 (the "License");          //
+// you may not use this file except in compliance with the License.         //
+// You may obtain a copy of the License at                                  //
+//                                                                          //
+//     http://www.apache.org/licenses/LICENSE-2.0                           //
+//                                                                          //
+// Unless required by applicable law or agreed to in writing, software      //
+// distributed under the License is distributed on an "AS IS" BASIS,        //
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. //
+// See the License for the specific language governing permissions and      //
+// limitations under the License.                                           //
+// ======================================================================== //

 #pragma once

@@ -10,29 +23,24 @@
 #define _USE_MATH_DEFINES
 #include <math.h> // using cmath causes issues under Windows
 #include <cfloat>
-#include <climits>

 namespace embree
 {
-  static MAYBE_UNUSED const float one_over_255 = 1.0f/255.0f;
-  static MAYBE_UNUSED const float min_rcp_input = 1E-18f;  // for abs(x) >= min_rcp_input the newton raphson rcp calculation does not fail
+  static const float one_over_255 = 1.0f/255.0f;
+  static const float min_rcp_input = 1E-18f;  // for abs(x) >= min_rcp_input the newton raphson rcp calculation does not fail

  /* we consider floating point numbers in that range as valid input numbers */
-  static MAYBE_UNUSED float FLT_LARGE = 1.844E18f;
+  static float FLT_LARGE = 1.844E18f;

-  struct TrueTy {
+  static struct TrueTy {
    __forceinline operator bool( ) const { return true; }
-  };
+  } True MAYBE_UNUSED;

-  const constexpr TrueTy True = TrueTy();
-
-  struct FalseTy {
+  static struct FalseTy {
    __forceinline operator bool( ) const { return false; }
-  };
-
-  const constexpr FalseTy False = FalseTy();
+  } False MAYBE_UNUSED;
  
-  struct ZeroTy
+  static struct ZeroTy
  {
    __forceinline operator          double   ( ) const { return 0; }
    __forceinline operator          float    ( ) const { return 0; }
@@ -46,11 +54,9 @@ namespace embree
    __forceinline operator unsigned short    ( ) const { return 0; }
    __forceinline operator          char     ( ) const { return 0; }
    __forceinline operator unsigned char     ( ) const { return 0; }
-  }; 
+  } zero MAYBE_UNUSED;

-  const constexpr ZeroTy zero = ZeroTy();
-
-  struct OneTy
+  static struct OneTy
  {
    __forceinline operator          double   ( ) const { return 1; }
    __forceinline operator          float    ( ) const { return 1; }
@@ -64,11 +70,9 @@ namespace embree
    __forceinline operator unsigned short    ( ) const { return 1; }
    __forceinline operator          char     ( ) const { return 1; }
    __forceinline operator unsigned char     ( ) const { return 1; }
-  };
+  } one MAYBE_UNUSED;

-  const constexpr OneTy one = OneTy();
-
-  struct NegInfTy
+  static struct NegInfTy
  {
    __forceinline operator          double   ( ) const { return -std::numeric_limits<double>::infinity(); }
    __forceinline operator          float    ( ) const { return -std::numeric_limits<float>::infinity(); }
@@ -83,11 +87,9 @@ namespace embree
    __forceinline operator          char     ( ) const { return std::numeric_limits<char>::min(); }
    __forceinline operator unsigned char     ( ) const { return std::numeric_limits<unsigned char>::min(); }

-  };
+  } neg_inf MAYBE_UNUSED;

-  const constexpr NegInfTy neg_inf = NegInfTy();
-
-  struct PosInfTy
+  static struct PosInfTy
  {
    __forceinline operator          double   ( ) const { return std::numeric_limits<double>::infinity(); }
    __forceinline operator          float    ( ) const { return std::numeric_limits<float>::infinity(); }
@@ -101,109 +103,65 @@ namespace embree
    __forceinline operator unsigned short    ( ) const { return std::numeric_limits<unsigned short>::max(); }
    __forceinline operator          char     ( ) const { return std::numeric_limits<char>::max(); }
    __forceinline operator unsigned char     ( ) const { return std::numeric_limits<unsigned char>::max(); }
-  };
+  } inf MAYBE_UNUSED, pos_inf MAYBE_UNUSED;

-  const constexpr PosInfTy     inf = PosInfTy();
-  const constexpr PosInfTy pos_inf = PosInfTy();
-
-  struct NaNTy
+  static struct NaNTy
  {
    __forceinline operator double( ) const { return std::numeric_limits<double>::quiet_NaN(); }
    __forceinline operator float ( ) const { return std::numeric_limits<float>::quiet_NaN(); }
-  };
+  } nan MAYBE_UNUSED;

-  const constexpr NaNTy nan = NaNTy();
-
-  struct UlpTy
+  static struct UlpTy
  {
    __forceinline operator double( ) const { return std::numeric_limits<double>::epsilon(); }
    __forceinline operator float ( ) const { return std::numeric_limits<float>::epsilon(); }
-  };
-  
-  const constexpr UlpTy ulp = UlpTy();
+  } ulp MAYBE_UNUSED;

-  struct PiTy
+  static struct PiTy
  {
    __forceinline operator double( ) const { return double(M_PI); }
    __forceinline operator float ( ) const { return float(M_PI); }
-  };
+  } pi MAYBE_UNUSED;

-  const constexpr PiTy pi = PiTy();
-
-  struct OneOverPiTy
+  static struct OneOverPiTy
  {
    __forceinline operator double( ) const { return double(M_1_PI); }
    __forceinline operator float ( ) const { return float(M_1_PI); }
-  };
+  } one_over_pi MAYBE_UNUSED;

-  const constexpr OneOverPiTy one_over_pi = OneOverPiTy();
-
-  struct TwoPiTy
+  static struct TwoPiTy
  {
    __forceinline operator double( ) const { return double(2.0*M_PI); }
    __forceinline operator float ( ) const { return float(2.0*M_PI); }
-  };
+  } two_pi MAYBE_UNUSED;

-  const constexpr TwoPiTy two_pi = TwoPiTy();
-
-  struct OneOverTwoPiTy
+  static struct OneOverTwoPiTy
  {
    __forceinline operator double( ) const { return double(0.5*M_1_PI); }
    __forceinline operator float ( ) const { return float(0.5*M_1_PI); }
-  };
+  } one_over_two_pi MAYBE_UNUSED;

-  const constexpr OneOverTwoPiTy one_over_two_pi = OneOverTwoPiTy();
-
-  struct FourPiTy
+  static struct FourPiTy
  {
    __forceinline operator double( ) const { return double(4.0*M_PI); } 
    __forceinline operator float ( ) const { return float(4.0*M_PI); }
-  };
+  } four_pi MAYBE_UNUSED;

-  const constexpr FourPiTy four_pi = FourPiTy();
-
-  struct OneOverFourPiTy
+  static struct OneOverFourPiTy
  {
    __forceinline operator double( ) const { return double(0.25*M_1_PI); }
    __forceinline operator float ( ) const { return float(0.25*M_1_PI); }
-  };
+  } one_over_four_pi MAYBE_UNUSED;

-  const constexpr OneOverFourPiTy one_over_four_pi = OneOverFourPiTy();
+  static struct StepTy {
+  } step MAYBE_UNUSED;

-  struct StepTy {
-    __forceinline operator          double   ( ) const { return 0; }
-    __forceinline operator          float    ( ) const { return 0; }
-    __forceinline operator          long long( ) const { return 0; }
-    __forceinline operator unsigned long long( ) const { return 0; }
-    __forceinline operator          long     ( ) const { return 0; }
-    __forceinline operator unsigned long     ( ) const { return 0; }
-    __forceinline operator          int      ( ) const { return 0; }
-    __forceinline operator unsigned int      ( ) const { return 0; }
-    __forceinline operator          short    ( ) const { return 0; }
-    __forceinline operator unsigned short    ( ) const { return 0; }
-    __forceinline operator          char     ( ) const { return 0; }
-    __forceinline operator unsigned char     ( ) const { return 0; }
-  };
+  static struct ReverseStepTy {
+  } reverse_step MAYBE_UNUSED;

-  const constexpr StepTy step = StepTy();
+  static struct EmptyTy {
+  } empty MAYBE_UNUSED;

-  struct ReverseStepTy {
-  };
-
-  const constexpr ReverseStepTy reverse_step = ReverseStepTy();
-
-  struct EmptyTy {
-  };
-
-  const constexpr EmptyTy empty = EmptyTy();
-
-  struct FullTy {
-  };
-
-  const constexpr FullTy full = FullTy();
-
-  struct UndefinedTy {
-  };
-
-  const constexpr UndefinedTy undefined = UndefinedTy();
+  static struct FullTy {
+  } full MAYBE_UNUSED;
 }
@@ -1,161 +0,0 @@
-// Copyright 2009-2021 Intel Corporation
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include "vec2.h"
-#include "vec3.h"
-#include "bbox.h"
-
-namespace embree
-{
-  template<typename V>
-    struct Interval
-    {
-      V lower, upper;
-      
-      __forceinline Interval() {}
-      __forceinline Interval           ( const Interval& other ) { lower = other.lower; upper = other.upper; }
-      __forceinline Interval& operator=( const Interval& other ) { lower = other.lower; upper = other.upper; return *this; }
-
-      __forceinline Interval(const V& a) : lower(a), upper(a) {}
-      __forceinline Interval(const V& lower, const V& upper) : lower(lower), upper(upper) {}
-      __forceinline Interval(const BBox<V>& a) : lower(a.lower), upper(a.upper) {}
-          
-      /*! tests if box is empty */
-      //__forceinline bool empty() const { return lower > upper; }
-      
-      /*! computes the size of the interval */
-      __forceinline V size() const { return upper - lower; }
-      
-      __forceinline V center() const { return 0.5f*(lower+upper); }
-      
-      __forceinline const Interval& extend(const Interval& other) { lower = min(lower,other.lower); upper = max(upper,other.upper); return *this; }
-      __forceinline const Interval& extend(const V   & other) { lower = min(lower,other      ); upper = max(upper,other      ); return *this; }
-      
-      __forceinline friend Interval operator +( const Interval& a, const Interval& b ) {
-        return Interval(a.lower+b.lower,a.upper+b.upper);
-      }
-      
-      __forceinline friend Interval operator -( const Interval& a, const Interval& b ) {
-        return Interval(a.lower-b.upper,a.upper-b.lower);
-      }
-      
-      __forceinline friend Interval operator -( const Interval& a, const V& b ) {
-        return Interval(a.lower-b,a.upper-b);
-      }
-      
-      __forceinline friend Interval operator *( const Interval& a, const Interval& b )
-      {
-        const V ll = a.lower*b.lower;
-        const V lu = a.lower*b.upper;
-        const V ul = a.upper*b.lower;
-        const V uu = a.upper*b.upper;
-        return Interval(min(ll,lu,ul,uu),max(ll,lu,ul,uu));
-      }
-      
-      __forceinline friend Interval merge( const Interval& a, const Interval& b) {
-        return Interval(min(a.lower,b.lower),max(a.upper,b.upper));
-      }
-      
-      __forceinline friend Interval merge( const Interval& a, const Interval& b, const Interval& c) {
-        return merge(merge(a,b),c);
-      }
-      
-      __forceinline friend Interval merge( const Interval& a, const Interval& b, const Interval& c, const Interval& d) {
-        return merge(merge(a,b),merge(c,d));
-      }
-      
-      /*! intersect bounding boxes */
-      __forceinline friend const Interval intersect( const Interval& a, const Interval& b ) { return Interval(max(a.lower, b.lower), min(a.upper, b.upper)); }
-      __forceinline friend const Interval intersect( const Interval& a, const Interval& b, const Interval& c ) { return intersect(a,intersect(b,c)); }
-      __forceinline friend const Interval intersect( const Interval& a, const Interval& b, const Interval& c, const Interval& d ) { return intersect(intersect(a,b),intersect(c,d)); }       
-      
-      friend embree_ostream operator<<(embree_ostream cout, const Interval& a) {
-        return cout << "[" << a.lower << ", " << a.upper << "]";
-      }
-      
-      ////////////////////////////////////////////////////////////////////////////////
-      /// Constants
-      ////////////////////////////////////////////////////////////////////////////////
-      
-      __forceinline Interval( EmptyTy ) : lower(pos_inf), upper(neg_inf) {}
-      __forceinline Interval( FullTy  ) : lower(neg_inf), upper(pos_inf) {}
-    };
-
-  __forceinline bool isEmpty(const Interval<float>& v) { 
-    return v.lower > v.upper;
-  }
-
-  __forceinline vboolx isEmpty(const Interval<vfloatx>& v) {
-    return v.lower > v.upper;
-  }
-  
-  /*! subset relation */
-  template<typename T> __forceinline bool subset( const Interval<T>& a, const Interval<T>& b ) { 
-    return (a.lower > b.lower) && (a.upper < b.upper);
-  }
-
-  template<typename T> __forceinline bool subset( const Vec2<Interval<T>>& a, const Vec2<Interval<T>>& b ) { 
-    return subset(a.x,b.x) && subset(a.y,b.y);
-  }
-
-  template<typename T> __forceinline const Vec2<Interval<T>> intersect( const Vec2<Interval<T>>& a, const Vec2<Interval<T>>& b ) {
-    return Vec2<Interval<T>>(intersect(a.x,b.x),intersect(a.y,b.y));
-  }
-
-  ////////////////////////////////////////////////////////////////////////////////
-  /// Select
-  ////////////////////////////////////////////////////////////////////////////////
-
-  template<typename T> __forceinline Interval<T> select ( bool s, const Interval<T>& t, const Interval<T>& f ) {
-    return Interval<T>(select(s,t.lower,f.lower),select(s,t.upper,f.upper));
-  }
-
-  template<typename T> __forceinline Interval<T> select ( const typename T::Bool& s, const Interval<T>& t, const Interval<T>& f ) {
-    return Interval<T>(select(s,t.lower,f.lower),select(s,t.upper,f.upper));
-  }
-
-  __forceinline int numRoots(const Interval<float>& p0, const Interval<float>& p1)
-  {
-    float eps = 1E-4f;
-    bool neg0 = p0.lower < eps; bool pos0 = p0.upper > -eps;
-    bool neg1 = p1.lower < eps; bool pos1 = p1.upper > -eps;
-    return (neg0 && pos1) || (pos0 && neg1) || (neg0 && pos0) || (neg1 && pos1);
-  }
-  
-  typedef Interval<float> Interval1f;
-  typedef Vec2<Interval<float>> Interval2f;
-  typedef Vec3<Interval<float>> Interval3f;
-
-inline void swap(float& a, float& b) { float tmp = a; a = b; b = tmp; }
-
-inline Interval1f shift(const Interval1f& v, float shift) { return Interval1f(v.lower + shift, v.upper + shift); }
-
-#define TWO_PI (2.0*M_PI)
-inline Interval1f sin(Interval1f interval)
-{
-  if (interval.upper-interval.lower >= M_PI) { return Interval1f(-1.0, 1.0); }
-  if (interval.upper > TWO_PI)                 { interval = shift(interval, -TWO_PI*floor(interval.upper/TWO_PI)); }
-  if (interval.lower < 0)                      { interval = shift(interval, -TWO_PI*floor(interval.lower/TWO_PI)); }
-  float sinLower = sin(interval.lower);
-  float sinUpper = sin(interval.upper);
-  if (sinLower > sinUpper) swap(sinLower, sinUpper);
-  if (interval.lower <       M_PI / 2.0 && interval.upper >       M_PI / 2.0) sinUpper =  1.0;
-  if (interval.lower < 3.0 * M_PI / 2.0 && interval.upper > 3.0 * M_PI / 2.0) sinLower = -1.0;
-  return Interval1f(sinLower, sinUpper);
-}
-
-inline Interval1f cos(Interval1f interval)
-{
-  if (interval.upper-interval.lower >= M_PI) { return Interval1f(-1.0, 1.0); }
-  if (interval.upper > TWO_PI)                 { interval = shift(interval, -TWO_PI*floor(interval.upper/TWO_PI)); }
-  if (interval.lower < 0)                      { interval = shift(interval, -TWO_PI*floor(interval.lower/TWO_PI)); }
-  float cosLower = cos(interval.lower);
-  float cosUpper = cos(interval.upper);
-  if (cosLower > cosUpper) swap(cosLower, cosUpper);
-  if (interval.lower < M_PI && interval.upper > M_PI) cosLower = -1.0;
-  return Interval1f(cosLower, cosUpper);
-}
-#undef TWO_PI
-}
@@ -1,15 +1,27 @@
-// Copyright 2009-2021 Intel Corporation
-// SPDX-License-Identifier: Apache-2.0
+// ======================================================================== //
+// Copyright 2009-2017 Intel Corporation                                    //
+//                                                                          //
+// Licensed under the Apache License, Version 2.0 (the "License");          //
+// you may not use this file except in compliance with the License.         //
+// You may obtain a copy of the License at                                  //
+//                                                                          //
+//     http://www.apache.org/licenses/LICENSE-2.0                           //
+//                                                                          //
+// Unless required by applicable law or agreed to in writing, software      //
+// distributed under the License is distributed on an "AS IS" BASIS,        //
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. //
+// See the License for the specific language governing permissions and      //
+// limitations under the License.                                           //
+// ======================================================================== //

 #pragma once

 #include "bbox.h"
-#include "range.h"

 namespace embree
 {
  template<typename T>
-    __forceinline std::pair<T,T> globalLinear(const std::pair<T,T>& v, const BBox1f& dt)
+    __forceinline std::pair<T,T> globalLinear(const std::pair<T,T> v, const BBox1f& dt)
  {
    const float rcp_dt_size = float(1.0f)/dt.size();
    const T g0 = lerp(v.first,v.second,-dt.lower*rcp_dt_size);
@@ -23,10 +35,9 @@ namespace embree
  public:
    __forceinline LBBox () {}

-    template<typename T1>
-    __forceinline LBBox ( const LBBox<T1>& other )
-    : bounds0(other.bounds0), bounds1(other.bounds1) {} 
-
+    __forceinline LBBox ( const LBBox& other ) { 
+      bounds0 = other.bounds0; bounds1 = other.bounds1; 
+    }
    __forceinline LBBox& operator= ( const LBBox& other ) { 
      bounds0 = other.bounds0; bounds1 = other.bounds1; return *this; 
    }
@@ -57,170 +68,6 @@ namespace embree
      bounds1 = b1;
    }

-    /*! calculates the linear bounds of a primitive for the specified time range */
-    template<typename BoundsFunc>
-    __forceinline LBBox(const BoundsFunc& bounds, const BBox1f& time_range, float numTimeSegments)
-    {
-      const float lower = time_range.lower*numTimeSegments;
-      const float upper = time_range.upper*numTimeSegments;
-      const float ilowerf = floor(lower);
-      const float iupperf = ceil(upper);
-      const int ilower = (int)ilowerf;
-      const int iupper = (int)iupperf;
-
-      const BBox<T> blower0 = bounds(ilower);
-      const BBox<T> bupper1 = bounds(iupper);
-
-      if (iupper-ilower == 1) {
-        bounds0 = lerp(blower0, bupper1, lower-ilowerf);
-        bounds1 = lerp(bupper1, blower0, iupperf-upper);
-        return;
-      }
-
-      const BBox<T> blower1 = bounds(ilower+1);
-      const BBox<T> bupper0 = bounds(iupper-1);
-      BBox<T> b0 = lerp(blower0, blower1, lower-ilowerf);
-      BBox<T> b1 = lerp(bupper1, bupper0, iupperf-upper);
-
-      for (int i = ilower+1; i < iupper; i++)
-      {
-        const float f = (float(i)/numTimeSegments - time_range.lower) / time_range.size();
-        const BBox<T> bt = lerp(b0, b1, f);
-        const BBox<T> bi = bounds(i);
-        const T dlower = min(bi.lower-bt.lower, T(zero));
-        const T dupper = max(bi.upper-bt.upper, T(zero));
-        b0.lower += dlower; b1.lower += dlower;
-        b0.upper += dupper; b1.upper += dupper;
-      }
-
-      bounds0 = b0;
-      bounds1 = b1;
-    }
-
-    /*! calculates the linear bounds of a primitive for the specified time range */
-    template<typename BoundsFunc>
-    __forceinline LBBox(const BoundsFunc& bounds, const BBox1f& time_range_in, const BBox1f& geom_time_range, float geom_time_segments)
-    {
-      /* normalize global time_range_in to local geom_time_range */
-      const BBox1f time_range((time_range_in.lower-geom_time_range.lower)/geom_time_range.size(),
-                              (time_range_in.upper-geom_time_range.lower)/geom_time_range.size());
-        
-      const float lower = time_range.lower*geom_time_segments;
-      const float upper = time_range.upper*geom_time_segments;
-      const float ilowerf = floor(lower);
-      const float iupperf = ceil(upper);
-      const float ilowerfc = max(0.0f,ilowerf);
-      const float iupperfc = min(iupperf,geom_time_segments);
-      const int   ilowerc = (int)ilowerfc;
-      const int   iupperc = (int)iupperfc;
-      assert(iupperc-ilowerc > 0);
-
-      /* this larger iteration range guarantees that we process borders of geom_time_range is (partially) inside time_range_in */
-      const int ilower_iter = max(-1,(int)ilowerf);
-      const int iupper_iter = min((int)iupperf,(int)geom_time_segments+1);
-        
-      const BBox<T> blower0 = bounds(ilowerc);
-      const BBox<T> bupper1 = bounds(iupperc);
-      if (iupper_iter-ilower_iter == 1) {
-        bounds0 = lerp(blower0, bupper1, max(0.0f,lower-ilowerfc));
-        bounds1 = lerp(bupper1, blower0, max(0.0f,iupperfc-upper));
-        return;
-      }
-
-      const BBox<T> blower1 = bounds(ilowerc+1);
-      const BBox<T> bupper0 = bounds(iupperc-1);
-      BBox<T> b0 = lerp(blower0, blower1, max(0.0f,lower-ilowerfc));
-      BBox<T> b1 = lerp(bupper1, bupper0, max(0.0f,iupperfc-upper));
-
-      for (int i = ilower_iter+1; i < iupper_iter; i++)
-      {
-        const float f = (float(i)/geom_time_segments - time_range.lower) / time_range.size();
-        const BBox<T> bt = lerp(b0, b1, f);
-        const BBox<T> bi = bounds(i);
-        const T dlower = min(bi.lower-bt.lower, T(zero));
-        const T dupper = max(bi.upper-bt.upper, T(zero));
-        b0.lower += dlower; b1.lower += dlower;
-        b0.upper += dupper; b1.upper += dupper;
-      }
-
-      bounds0 = b0;
-      bounds1 = b1;
-    }
-
-    /*! calculates the linear bounds of a primitive for the specified time range */
-    template<typename BoundsFunc>
-    __forceinline LBBox(const BoundsFunc& bounds, const range<int>& time_range, int numTimeSegments)
-    {
-      const int ilower = time_range.begin();
-      const int iupper = time_range.end();
-
-      BBox<T> b0 = bounds(ilower);
-      BBox<T> b1 = bounds(iupper);
-
-      if (iupper-ilower == 1)
-      {
-        bounds0 = b0;
-        bounds1 = b1;
-        return;
-      }
-  
-      for (int i = ilower+1; i<iupper; i++)
-      {
-        const float f = float(i - time_range.begin()) / float(time_range.size());
-        const BBox<T> bt = lerp(b0, b1, f);
-        const BBox<T> bi = bounds(i);
-        const T dlower = min(bi.lower-bt.lower, T(zero));
-        const T dupper = max(bi.upper-bt.upper, T(zero));
-        b0.lower += dlower; b1.lower += dlower;
-        b0.upper += dupper; b1.upper += dupper;
-      }
-
-      bounds0 = b0;
-      bounds1 = b1;
-    }
-
-     /*! calculates the linear bounds for target_time_range of primitive with it's time_range_in and bounds */
-    __forceinline LBBox(const BBox1f& time_range_in, const LBBox<T> lbounds, const BBox1f& target_time_range)
-    {
-      const BBox3f bounds0 = lbounds.bounds0;
-      const BBox3f bounds1 = lbounds.bounds1;
-      
-      /* normalize global target_time_range to local time_range_in */
-      const BBox1f time_range((target_time_range.lower-time_range_in.lower)/time_range_in.size(),
-                              (target_time_range.upper-time_range_in.lower)/time_range_in.size());
-
-      const BBox1f clipped_time_range(max(0.0f,time_range.lower), min(1.0f,time_range.upper));
-
-      /* compute bounds at begin and end of clipped time range */
-      BBox<T> b0 = lerp(bounds0,bounds1,clipped_time_range.lower);
-      BBox<T> b1 = lerp(bounds0,bounds1,clipped_time_range.upper);
-
-      /* make sure that b0 is properly bounded at time_range_in.lower */
-      {
-        const BBox<T> bt = lerp(b0, b1, (0.0f - time_range.lower) / time_range.size());
-        const T dlower = min(bounds0.lower-bt.lower, T(zero));
-        const T dupper = max(bounds0.upper-bt.upper, T(zero));
-        b0.lower += dlower; b1.lower += dlower;
-        b0.upper += dupper; b1.upper += dupper;
-      }
-
-      /* make sure that b1 is properly bounded at time_range_in.upper */
-      {
-        const BBox<T> bt = lerp(b0, b1, (1.0f - time_range.lower) / time_range.size());
-        const T dlower = min(bounds1.lower-bt.lower, T(zero));
-        const T dupper = max(bounds1.upper-bt.upper, T(zero));
-        b0.lower += dlower; b1.lower += dlower;
-        b0.upper += dupper; b1.upper += dupper;
-      }
-      
-      this->bounds0 = b0;
-      this->bounds1 = b1;
-    }
-
-    /*! calculates the linear bounds for target_time_range of primitive with it's time_range_in and bounds */
-    __forceinline LBBox(const BBox1f& time_range_in, const BBox<T>& bounds0, const BBox<T>& bounds1, const BBox1f& target_time_range)
-      : LBBox(time_range_in,LBBox(bounds0,bounds1),target_time_range) {}
-
  public:

    __forceinline bool empty() const {
@@ -264,13 +111,11 @@ namespace embree
    }

    /*! Comparison Operators */
-    //template<typename TT> friend __forceinline bool operator==( const LBBox<TT>& a, const LBBox<TT>& b ) { return a.bounds0 == b.bounds0 && a.bounds1 == b.bounds1; }
-    //template<typename TT> friend __forceinline bool operator!=( const LBBox<TT>& a, const LBBox<TT>& b ) { return a.bounds0 != b.bounds0 || a.bounds1 != b.bounds1; }
-    friend __forceinline bool operator==( const LBBox& a, const LBBox& b ) { return a.bounds0 == b.bounds0 && a.bounds1 == b.bounds1; }
-    friend __forceinline bool operator!=( const LBBox& a, const LBBox& b ) { return a.bounds0 != b.bounds0 || a.bounds1 != b.bounds1; }
-    
+    template<typename TT> friend __forceinline bool operator==( const LBBox<TT>& a, const LBBox<TT>& b ) { return a.bounds0 == b.bounds0 && a.bounds1 == b.bounds1; }
+    template<typename TT> friend __forceinline bool operator!=( const LBBox<TT>& a, const LBBox<TT>& b ) { return a.bounds0 != b.bounds0 || a.bounds1 != b.bounds1; }
+
    /*! output operator */
-    friend __forceinline embree_ostream operator<<(embree_ostream cout, const LBBox& box) {
+    friend __forceinline std::ostream& operator<<(std::ostream& cout, const LBBox& box) {
      return cout << "LBBox { " << box.bounds0 << "; " << box.bounds1 << " }";
    }

@@ -278,17 +123,6 @@ namespace embree
    BBox<T> bounds0, bounds1;
  };

-  /*! tests if box is finite */
-  template<typename T>
-    __forceinline bool isvalid( const LBBox<T>& v ) {
-    return isvalid(v.bounds0) && isvalid(v.bounds1);
-  }
-
-  template<typename T>
-    __forceinline bool isvalid_non_empty( const LBBox<T>& v ) {
-    return isvalid_non_empty(v.bounds0) && isvalid_non_empty(v.bounds1);
-  }
-  
  template<typename T>
    __forceinline T expectedArea(const T& a0, const T& a1, const T& b0, const T& b1)
  {
@@ -317,15 +151,9 @@ namespace embree
    return LBBox<T>(merge(a.bounds0, b.bounds0), merge(a.bounds1, b.bounds1));
  }

-   /*! subset relation */
-  template<typename T> __inline bool subset( const LBBox<T>& a, const LBBox<T>& b ) {
-    return subset(a.bounds0,b.bounds0) && subset(a.bounds1,b.bounds1);
-  }
-
  /*! default template instantiations */
  typedef LBBox<float> LBBox1f;
  typedef LBBox<Vec2f> LBBox2f;
  typedef LBBox<Vec3f> LBBox3f;
  typedef LBBox<Vec3fa> LBBox3fa;
-  typedef LBBox<Vec3fx> LBBox3fx;
 }
@@ -1,5 +1,18 @@
-// Copyright 2009-2021 Intel Corporation
-// SPDX-License-Identifier: Apache-2.0
+// ======================================================================== //
+// Copyright 2009-2017 Intel Corporation                                    //
+//                                                                          //
+// Licensed under the Apache License, Version 2.0 (the "License");          //
+// you may not use this file except in compliance with the License.         //
+// You may obtain a copy of the License at                                  //
+//                                                                          //
+//     http://www.apache.org/licenses/LICENSE-2.0                           //
+//                                                                          //
+// Unless required by applicable law or agreed to in writing, software      //
+// distributed under the License is distributed on an "AS IS" BASIS,        //
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. //
+// See the License for the specific language governing permissions and      //
+// limitations under the License.                                           //
+// ======================================================================== //

 #pragma once

@@ -18,7 +31,6 @@ namespace embree

    /*! default matrix constructor */
    __forceinline LinearSpace2           ( ) {}
-
    __forceinline LinearSpace2           ( const LinearSpace2& other ) { vx = other.vx; vy = other.vy; }
    __forceinline LinearSpace2& operator=( const LinearSpace2& other ) { vx = other.vx; vy = other.vy; return *this; }

@@ -46,10 +58,10 @@ namespace embree
    __forceinline const LinearSpace2 transposed() const { return LinearSpace2(vx.x,vx.y,vy.x,vy.y); }

    /*! returns first row of matrix */
-    __forceinline Vector row0() const { return Vector(vx.x,vy.x); }
+    __forceinline const Vector row0() const { return Vector(vx.x,vy.x); }

    /*! returns second row of matrix */
-    __forceinline Vector row1() const { return Vector(vx.y,vy.y); }
+    __forceinline const Vector row1() const { return Vector(vx.y,vy.y); }

    ////////////////////////////////////////////////////////////////////////////////
    /// Constants
@@ -139,11 +151,10 @@ namespace embree
  /// Output Operators
  ////////////////////////////////////////////////////////////////////////////////

-  template<typename T> static embree_ostream operator<<(embree_ostream cout, const LinearSpace2<T>& m) {
+  template<typename T> static std::ostream& operator<<(std::ostream& cout, const LinearSpace2<T>& m) {
    return cout << "{ vx = " << m.vx << ", vy = " << m.vy << "}";
  }

  /*! Shortcuts for common linear spaces. */
  typedef LinearSpace2<Vec2f> LinearSpace2f;
-  typedef LinearSpace2<Vec2fa> LinearSpace2fa;
 }
@@ -1,5 +1,18 @@
-// Copyright 2009-2021 Intel Corporation
-// SPDX-License-Identifier: Apache-2.0
+// ======================================================================== //
+// Copyright 2009-2017 Intel Corporation                                    //
+//                                                                          //
+// Licensed under the Apache License, Version 2.0 (the "License");          //
+// you may not use this file except in compliance with the License.         //
+// You may obtain a copy of the License at                                  //
+//                                                                          //
+//     http://www.apache.org/licenses/LICENSE-2.0                           //
+//                                                                          //
+// Unless required by applicable law or agreed to in writing, software      //
+// distributed under the License is distributed on an "AS IS" BASIS,        //
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. //
+// See the License for the specific language governing permissions and      //
+// limitations under the License.                                           //
+// ======================================================================== //

 #pragma once

@@ -19,7 +32,6 @@ namespace embree

    /*! default matrix constructor */
    __forceinline LinearSpace3           ( ) {}
-
    __forceinline LinearSpace3           ( const LinearSpace3& other ) { vx = other.vx; vy = other.vy; vz = other.vz; }
    __forceinline LinearSpace3& operator=( const LinearSpace3& other ) { vx = other.vx; vy = other.vy; vz = other.vz; return *this; }

@@ -54,13 +66,13 @@ namespace embree
    __forceinline const LinearSpace3 transposed() const { return LinearSpace3(vx.x,vx.y,vx.z,vy.x,vy.y,vy.z,vz.x,vz.y,vz.z); }

    /*! returns first row of matrix */
-    __forceinline Vector row0() const { return Vector(vx.x,vy.x,vz.x); }
+    __forceinline const Vector row0() const { return Vector(vx.x,vy.x,vz.x); }

    /*! returns second row of matrix */
-    __forceinline Vector row1() const { return Vector(vx.y,vy.y,vz.y); }
+    __forceinline const Vector row1() const { return Vector(vx.y,vy.y,vz.y); }

    /*! returns third row of matrix */
-    __forceinline Vector row2() const { return Vector(vx.z,vy.z,vz.z); }
+    __forceinline const Vector row2() const { return Vector(vx.z,vy.z,vz.z); }

    ////////////////////////////////////////////////////////////////////////////////
    /// Constants
@@ -91,20 +103,17 @@ namespace embree
    Vector vx,vy,vz;
  };

-#if !defined(__SYCL_DEVICE_ONLY__)
-  
  /*! compute transposed matrix */
  template<> __forceinline const LinearSpace3<Vec3fa> LinearSpace3<Vec3fa>::transposed() const { 
    vfloat4 rx,ry,rz; transpose((vfloat4&)vx,(vfloat4&)vy,(vfloat4&)vz,vfloat4(zero),rx,ry,rz);
    return LinearSpace3<Vec3fa>(Vec3fa(rx),Vec3fa(ry),Vec3fa(rz)); 
  }
-#endif
-  
+
  template<typename T>
    __forceinline const LinearSpace3<T> transposed(const LinearSpace3<T>& xfm) { 
    return xfm.transposed();
  }
-  
+
  ////////////////////////////////////////////////////////////////////////////////
  // Unary Operators
  ////////////////////////////////////////////////////////////////////////////////
@@ -188,30 +197,11 @@ namespace embree
  /// Output Operators
  ////////////////////////////////////////////////////////////////////////////////

-  template<typename T> static embree_ostream operator<<(embree_ostream cout, const LinearSpace3<T>& m) {
+  template<typename T> static std::ostream& operator<<(std::ostream& cout, const LinearSpace3<T>& m) {
    return cout << "{ vx = " << m.vx << ", vy = " << m.vy << ", vz = " << m.vz << "}";
  }

  /*! Shortcuts for common linear spaces. */
  typedef LinearSpace3<Vec3f> LinearSpace3f;
  typedef LinearSpace3<Vec3fa> LinearSpace3fa;
-  typedef LinearSpace3<Vec3fx> LinearSpace3fx;
-  typedef LinearSpace3<Vec3ff> LinearSpace3ff;
-
-  template<int N> using LinearSpace3vf = LinearSpace3<Vec3<vfloat<N>>>;
-  typedef LinearSpace3<Vec3<vfloat<4>>>  LinearSpace3vf4;
-  typedef LinearSpace3<Vec3<vfloat<8>>>  LinearSpace3vf8;
-  typedef LinearSpace3<Vec3<vfloat<16>>> LinearSpace3vf16;
-
-  /*! blending */
-  template<typename T, typename S>
-    __forceinline LinearSpace3<T> lerp(const LinearSpace3<T>& l0,
-                                       const LinearSpace3<T>& l1,
-                                       const S& t)
-  {
-    return LinearSpace3<T>(lerp(l0.vx,l1.vx,t),
-                           lerp(l0.vy,l1.vy,t),
-                           lerp(l0.vz,l1.vz,t));
-  }
-
 }
@@ -1,5 +1,18 @@
-// Copyright 2009-2021 Intel Corporation
-// SPDX-License-Identifier: Apache-2.0
+// ======================================================================== //
+// Copyright 2009-2017 Intel Corporation                                    //
+//                                                                          //
+// Licensed under the Apache License, Version 2.0 (the "License");          //
+// you may not use this file except in compliance with the License.         //
+// You may obtain a copy of the License at                                  //
+//                                                                          //
+//     http://www.apache.org/licenses/LICENSE-2.0                           //
+//                                                                          //
+// Unless required by applicable law or agreed to in writing, software      //
+// distributed under the License is distributed on an "AS IS" BASIS,        //
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. //
+// See the License for the specific language governing permissions and      //
+// limitations under the License.                                           //
+// ======================================================================== //

 #pragma once

@@ -8,20 +21,12 @@
 #include "constants.h"
 #include <cmath>

-#if defined(EMBREE_SYCL_SUPPORT) && defined(__SYCL_DEVICE_ONLY__)
-#  include "math_sycl.h"
-#else
-
-#if defined(__ARM_NEON)
-#include "../simd/arm/emulation.h"
-#else
 #include <emmintrin.h>
 #include <xmmintrin.h>
 #include <immintrin.h>
-#endif

 #if defined(__WIN32__)
-#if defined(_MSC_VER) && (_MSC_VER <= 1700)
+#if (__MSV_VER <= 1700)
 namespace std
 {
  __forceinline bool isinf ( const float x ) { return _finite(x) == 0; }
@@ -45,12 +50,6 @@ namespace embree
    union { float f; int i; } v; v.i = i; return v.f;
  }

-  __forceinline int   toInt  (const float& a) { return int(a); }
-  __forceinline float toFloat(const int&   a) { return float(a); }
-
-  __forceinline int   asInt  (const float& a) { return *((int*)&a); }
-  __forceinline float asFloat(const int&   a) { return *((float*)&a); }
-
 #if defined(__WIN32__)
  __forceinline bool finite ( const float x ) { return _finite(x) != 0; }
 #endif
@@ -60,100 +59,46 @@ namespace embree

  __forceinline float rcp  ( const float x )
  {
-#if defined(__aarch64__)
-      // Move scalar to vector register and do rcp.
-      __m128 a;
-      a[0] = x;
-      float32x4_t reciprocal = vrecpeq_f32(a);
-      reciprocal = vmulq_f32(vrecpsq_f32(a, reciprocal), reciprocal);
-      reciprocal = vmulq_f32(vrecpsq_f32(a, reciprocal), reciprocal);
-      return reciprocal[0];
-#else
-
    const __m128 a = _mm_set_ss(x);

 #if defined(__AVX512VL__)
-    const __m128 r = _mm_rcp14_ss(_mm_set_ss(0.0f),a);
+    const __m128 r = _mm_rcp14_ps(a);
 #else
-    const __m128 r = _mm_rcp_ss(a);
+    const __m128 r = _mm_rcp_ps(a);
 #endif

 #if defined(__AVX2__)
-    return _mm_cvtss_f32(_mm_mul_ss(r,_mm_fnmadd_ss(r, a, _mm_set_ss(2.0f))));
+    return _mm_cvtss_f32(_mm_mul_ps(r,_mm_fnmadd_ps(r, a, _mm_set_ss(2.0f))));
 #else
-    return _mm_cvtss_f32(_mm_mul_ss(r,_mm_sub_ss(_mm_set_ss(2.0f), _mm_mul_ss(r, a))));
+    return _mm_cvtss_f32(_mm_mul_ps(r,_mm_sub_ps(_mm_set_ss(2.0f), _mm_mul_ps(r, a))));
 #endif
-
-#endif  //defined(__aarch64__)
  }

  __forceinline float signmsk ( const float x ) {
-#if defined(__aarch64__)
-      // FP and Neon shares same vector register in arm64
-      __m128 a;
-      __m128i b;
-      a[0] = x;
-      b[0] = 0x80000000;
-      a = _mm_and_ps(a, vreinterpretq_f32_s32(b));
-      return a[0];
-#else
    return _mm_cvtss_f32(_mm_and_ps(_mm_set_ss(x),_mm_castsi128_ps(_mm_set1_epi32(0x80000000))));
-#endif
  }
  __forceinline float xorf( const float x, const float y ) {
-#if defined(__aarch64__)
-      // FP and Neon shares same vector register in arm64
-      __m128 a;
-      __m128 b;
-      a[0] = x;
-      b[0] = y;
-      a = _mm_xor_ps(a, b);
-      return a[0];
-#else
    return _mm_cvtss_f32(_mm_xor_ps(_mm_set_ss(x),_mm_set_ss(y)));
-#endif
  }
  __forceinline float andf( const float x, const unsigned y ) {
-#if defined(__aarch64__)
-      // FP and Neon shares same vector register in arm64
-      __m128 a;
-      __m128i b;
-      a[0] = x;
-      b[0] = y;
-      a = _mm_and_ps(a, vreinterpretq_f32_s32(b));
-      return a[0];
-#else
    return _mm_cvtss_f32(_mm_and_ps(_mm_set_ss(x),_mm_castsi128_ps(_mm_set1_epi32(y))));
-#endif
  }
  __forceinline float rsqrt( const float x )
  {
-#if defined(__aarch64__)
-      // FP and Neon shares same vector register in arm64
-      __m128 a;
-      a[0] = x;
-      __m128 value = _mm_rsqrt_ps(a);
-      value = vmulq_f32(value, vrsqrtsq_f32(vmulq_f32(a, value), value));
-      value = vmulq_f32(value, vrsqrtsq_f32(vmulq_f32(a, value), value));
-      return value[0];
-#else
-
    const __m128 a = _mm_set_ss(x);
 #if defined(__AVX512VL__)
-    __m128 r = _mm_rsqrt14_ss(_mm_set_ss(0.0f),a);
+    const __m128 r = _mm_rsqrt14_ps(a);
 #else
-    __m128 r = _mm_rsqrt_ss(a);
+    const __m128 r = _mm_rsqrt_ps(a);
 #endif
-    const __m128 c = _mm_add_ss(_mm_mul_ss(_mm_set_ss(1.5f), r),
-                                _mm_mul_ss(_mm_mul_ss(_mm_mul_ss(a, _mm_set_ss(-0.5f)), r), _mm_mul_ss(r, r)));
+    const __m128 c = _mm_add_ps(_mm_mul_ps(_mm_set_ps(1.5f, 1.5f, 1.5f, 1.5f), r),
+                                _mm_mul_ps(_mm_mul_ps(_mm_mul_ps(a, _mm_set_ps(-0.5f, -0.5f, -0.5f, -0.5f)), r), _mm_mul_ps(r, r)));
    return _mm_cvtss_f32(c);
-#endif
  }

-#if defined(__WIN32__) && defined(_MSC_VER) && (_MSC_VER <= 1700)
+#if defined(__WIN32__) && (__MSC_VER <= 1700)
  __forceinline float nextafter(float x, float y) { if ((x<y) == (x>0)) return x*(1.1f+float(ulp)); else return x*(0.9f-float(ulp)); }
  __forceinline double nextafter(double x, double y) { return _nextafter(x, y); }
-  __forceinline int roundf(float f) { return (int)(f + 0.5f); }
 #else
  __forceinline float nextafter(float x, float y) { return ::nextafterf(x, y); }
  __forceinline double nextafter(double x, double y) { return ::nextafter(x, y); }
@@ -204,17 +149,7 @@ namespace embree
  __forceinline double floor( const double x ) { return ::floor (x); }
  __forceinline double ceil ( const double x ) { return ::ceil (x); }

-#if defined(__aarch64__)
-    __forceinline float mini(float a, float b) {
-        // FP and Neon shares same vector register in arm64
-        __m128 x;
-        __m128 y;
-        x[0] = a;
-        y[0] = b;
-        x = _mm_min_ps(x, y);
-        return x[0];
-    }
-#elif defined(__SSE4_1__)
+#if defined(__SSE4_1__)
  __forceinline float mini(float a, float b) {
    const __m128i ai = _mm_castps_si128(_mm_set_ss(a));
    const __m128i bi = _mm_castps_si128(_mm_set_ss(b));
@@ -223,17 +158,7 @@ namespace embree
  }
 #endif

-#if defined(__aarch64__)
-    __forceinline float maxi(float a, float b) {
-        // FP and Neon shares same vector register in arm64
-        __m128 x;
-        __m128 y;
-        x[0] = a;
-        y[0] = b;
-        x = _mm_max_ps(x, y);
-        return x[0];
-    }
-#elif defined(__SSE4_1__)
+#if defined(__SSE4_1__)
  __forceinline float maxi(float a, float b) {
    const __m128i ai = _mm_castps_si128(_mm_set_ss(a));
    const __m128i bi = _mm_castps_si128(_mm_set_ss(b));
@@ -250,12 +175,9 @@ namespace embree
  __forceinline  int64_t min(int64_t  a, int64_t  b) { return a<b ? a:b; }
  __forceinline    float min(float    a, float    b) { return a<b ? a:b; }
  __forceinline   double min(double   a, double   b) { return a<b ? a:b; }
-#if defined(__64BIT__) || defined(__EMSCRIPTEN__)
+#if defined(__X86_64__)
  __forceinline   size_t min(size_t   a, size_t   b) { return a<b ? a:b; }
 #endif
-#if defined(__EMSCRIPTEN__)
-  __forceinline   long   min(long     a, long     b) { return a<b ? a:b; }
-#endif

  template<typename T> __forceinline T min(const T& a, const T& b, const T& c) { return min(min(a,b),c); }
  template<typename T> __forceinline T min(const T& a, const T& b, const T& c, const T& d) { return min(min(a,b),min(c,d)); }
@@ -270,12 +192,9 @@ namespace embree
  __forceinline  int64_t max(int64_t  a, int64_t  b) { return a<b ? b:a; }
  __forceinline    float max(float    a, float    b) { return a<b ? b:a; }
  __forceinline   double max(double   a, double   b) { return a<b ? b:a; }
-#if defined(__64BIT__) || defined(__EMSCRIPTEN__)
+#if defined(__X86_64__)
  __forceinline   size_t max(size_t   a, size_t   b) { return a<b ? b:a; }
 #endif
-#if defined(__EMSCRIPTEN__)
-  __forceinline   long   max(long     a, long     b) { return a<b ? b:a; }
-#endif

  template<typename T> __forceinline T max(const T& a, const T& b, const T& c) { return max(max(a,b),c); }
  template<typename T> __forceinline T max(const T& a, const T& b, const T& c, const T& d) { return max(max(a,b),max(c,d)); }
@@ -315,15 +234,6 @@ namespace embree
  __forceinline float msub  ( const float a, const float b, const float c) { return _mm_cvtss_f32(_mm_fmsub_ss(_mm_set_ss(a),_mm_set_ss(b),_mm_set_ss(c))); }
  __forceinline float nmadd ( const float a, const float b, const float c) { return _mm_cvtss_f32(_mm_fnmadd_ss(_mm_set_ss(a),_mm_set_ss(b),_mm_set_ss(c))); }
  __forceinline float nmsub ( const float a, const float b, const float c) { return _mm_cvtss_f32(_mm_fnmsub_ss(_mm_set_ss(a),_mm_set_ss(b),_mm_set_ss(c))); }
-  
-#elif defined (__aarch64__) && defined(__clang__)
-#pragma clang fp contract(fast)
-__forceinline float madd  ( const float a, const float b, const float c) { return a*b + c; }
-__forceinline float msub  ( const float a, const float b, const float c) { return a*b - c; }
-__forceinline float nmadd ( const float a, const float b, const float c) { return c - a*b; }
-__forceinline float nmsub ( const float a, const float b, const float c) { return -(c + a*b); }
-#pragma clang fp contract(on)
-  
 #else
  __forceinline float madd  ( const float a, const float b, const float c) { return a*b+c; }
  __forceinline float msub  ( const float a, const float b, const float c) { return a*b-c; }
@@ -358,14 +268,10 @@ __forceinline float nmsub ( const float a, const float b, const float c) { retur
  __forceinline int   select(bool s, int   t,   int f) { return s ? t : f; }
  __forceinline float select(bool s, float t, float f) { return s ? t : f; }

-  __forceinline bool none(bool s) { return !s; }
-  __forceinline bool all (bool s) { return s; }
-  __forceinline bool any (bool s) { return s; }

-  __forceinline unsigned movemask (bool s) { return (unsigned)s; }
-
-  __forceinline float lerp(const float v0, const float v1, const float t) {
-    return madd(1.0f-t,v0,t*v1);
+  template<typename V>
+    __forceinline V lerp(const V& v0, const V& v1, const float t) {
+    return madd(V(1.0f-t),v0,t*v1);
  }

  template<typename T>
@@ -376,17 +282,6 @@ __forceinline float nmsub ( const float a, const float b, const float c) { retur
  /*! exchange */
  template<typename T> __forceinline void xchg ( T& a, T& b ) { const T tmp = a; a = b; b = tmp; }

-  /*  load/store */
-  template<typename Ty> struct mem;
- 
-  template<> struct mem<float> {
-    static __forceinline float load (bool mask, const void* ptr) { return mask ? *(float*)ptr : 0.0f; }
-    static __forceinline float loadu(bool mask, const void* ptr) { return mask ? *(float*)ptr : 0.0f; }
-  
-    static __forceinline void store (bool mask, void* ptr, const float v) { if (mask) *(float*)ptr = v; }
-    static __forceinline void storeu(bool mask, void* ptr, const float v) { if (mask) *(float*)ptr = v; }
-  };
-  
  /*! bit reverse operation */
  template<class T>
    __forceinline T bitReverse(const T& vin)
@@ -423,7 +318,7 @@ __forceinline float nmsub ( const float a, const float b, const float c) { retur
    return x | (y << 1) | (z << 2);
  }

-#if defined(__AVX2__) && !defined(__aarch64__)
+#if defined(__AVX2__)

  template<>
    __forceinline unsigned int bitInterleave(const unsigned int &xi, const unsigned int& yi, const unsigned int& zi)
@@ -464,5 +359,3 @@ __forceinline float nmsub ( const float a, const float b, const float c) { retur
    return x | (y << 1) | (z << 2);
  }
 }
-
-#endif
@@ -1,279 +0,0 @@
-// Copyright 2009-2021 Intel Corporation
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include "../sys/platform.h"
-#include "../sys/intrinsics.h"
-#include "constants.h"
-#include <cmath>
-
-namespace embree
-{
-  __forceinline bool isvalid ( const float& v ) {
-    return (v > -FLT_LARGE) & (v < +FLT_LARGE);
-  }
-
-  __forceinline int cast_f2i(float f) {
-    return __builtin_bit_cast(int,f);
-  }
-
-  __forceinline float cast_i2f(int i) {
-    return __builtin_bit_cast(float,i);
-  }
-
-  __forceinline int   toInt  (const float& a) { return int(a); }
-  __forceinline float toFloat(const int&   a) { return float(a); }
-
-  __forceinline float asFloat(const int   a) { return __builtin_bit_cast(float,a); }
-  __forceinline int   asInt  (const float a) { return __builtin_bit_cast(int,a); }
-  
-  //__forceinline bool finite ( const float x ) { return _finite(x) != 0; }
-  __forceinline float sign ( const float x ) { return x<0?-1.0f:1.0f; }
-  __forceinline float sqr  ( const float x ) { return x*x; }
-
-  __forceinline float rcp  ( const float x ) {
-    return sycl::native::recip(x);
-  }
-
-  __forceinline float signmsk(const float a) { return asFloat(asInt(a) & 0x80000000); }
-  //__forceinline float signmsk ( const float x ) {
-  //  return _mm_cvtss_f32(_mm_and_ps(_mm_set_ss(x),_mm_castsi128_ps(_mm_set1_epi32(0x80000000))));
-  //}
-  //__forceinline float xorf( const float x, const float y ) {
-  //  return _mm_cvtss_f32(_mm_xor_ps(_mm_set_ss(x),_mm_set_ss(y)));
-  //}
-  //__forceinline float andf( const float x, const unsigned y ) {
-  //  return _mm_cvtss_f32(_mm_and_ps(_mm_set_ss(x),_mm_castsi128_ps(_mm_set1_epi32(y))));
-  //}
-  
-  __forceinline float rsqrt( const float x ) {
-    return sycl::rsqrt(x);
-  }
-
-  //__forceinline float nextafter(float x, float y) { if ((x<y) == (x>0)) return x*(1.1f+float(ulp)); else return x*(0.9f-float(ulp)); }
-  //__forceinline double nextafter(double x, double y) { return _nextafter(x, y); }
-  //__forceinline int roundf(float f) { return (int)(f + 0.5f); }
-
-  __forceinline float abs  ( const float x ) { return sycl::fabs(x); }
-  __forceinline float acos ( const float x ) { return sycl::acos(x); }
-  __forceinline float asin ( const float x ) { return sycl::asin(x); }
-  __forceinline float atan ( const float x ) { return sycl::atan(x); }
-  __forceinline float atan2( const float y, const float x ) { return sycl::atan2(y, x); }
-  __forceinline float cos  ( const float x ) { return sycl::cos(x); }
-  __forceinline float cosh ( const float x ) { return sycl::cosh(x); }
-  __forceinline float exp  ( const float x ) { return sycl::exp(x); }
-  __forceinline float fmod ( const float x, const float y ) { return sycl::fmod(x, y); }
-  __forceinline float log  ( const float x ) { return sycl::log(x); }
-  __forceinline float log10( const float x ) { return sycl::log10(x); }
-  __forceinline float pow  ( const float x, const float y ) { return sycl::pow(x, y); }
-  __forceinline float sin  ( const float x ) { return sycl::sin(x); }
-  __forceinline float sinh ( const float x ) { return sycl::sinh(x); }
-  __forceinline float sqrt ( const float x ) { return sycl::sqrt(x); }
-  __forceinline float tan  ( const float x ) { return sycl::tan(x); }
-  __forceinline float tanh ( const float x ) { return sycl::tanh(x); }
-  __forceinline float floor( const float x ) { return sycl::floor(x); }
-  __forceinline float ceil ( const float x ) { return sycl::ceil(x); }
-  __forceinline float frac ( const float x ) { return x-floor(x); }
-
-  //__forceinline double abs  ( const double x ) { return ::fabs(x); }
-  //__forceinline double sign ( const double x ) { return x<0?-1.0:1.0; }
-  //__forceinline double acos ( const double x ) { return ::acos (x); }
-  //__forceinline double asin ( const double x ) { return ::asin (x); }
-  //__forceinline double atan ( const double x ) { return ::atan (x); }
-  //__forceinline double atan2( const double y, const double x ) { return ::atan2(y, x); }
-  //__forceinline double cos  ( const double x ) { return ::cos  (x); }
-  //__forceinline double cosh ( const double x ) { return ::cosh (x); }
-  //__forceinline double exp  ( const double x ) { return ::exp  (x); }
-  //__forceinline double fmod ( const double x, const double y ) { return ::fmod (x, y); }
-  //__forceinline double log  ( const double x ) { return ::log  (x); }
-  //__forceinline double log10( const double x ) { return ::log10(x); }
-  //__forceinline double pow  ( const double x, const double y ) { return ::pow  (x, y); }
-  //__forceinline double rcp  ( const double x ) { return 1.0/x; }
-  //__forceinline double rsqrt( const double x ) { return 1.0/::sqrt(x); }
-  //__forceinline double sin  ( const double x ) { return ::sin  (x); }
-  //__forceinline double sinh ( const double x ) { return ::sinh (x); }
-  //__forceinline double sqr  ( const double x ) { return x*x; }
-  //__forceinline double sqrt ( const double x ) { return ::sqrt (x); }
-  //__forceinline double tan  ( const double x ) { return ::tan  (x); }
-  //__forceinline double tanh ( const double x ) { return ::tanh (x); }
-  //__forceinline double floor( const double x ) { return ::floor (x); }
-  //__forceinline double ceil ( const double x ) { return ::ceil (x); }
-
-/*
-#if defined(__SSE4_1__)
-  __forceinline float mini(float a, float b) {
-    const __m128i ai = _mm_castps_si128(_mm_set_ss(a));
-    const __m128i bi = _mm_castps_si128(_mm_set_ss(b));
-    const __m128i ci = _mm_min_epi32(ai,bi);
-    return _mm_cvtss_f32(_mm_castsi128_ps(ci));
-  }
-#endif
-
-#if defined(__SSE4_1__)
-  __forceinline float maxi(float a, float b) {
-    const __m128i ai = _mm_castps_si128(_mm_set_ss(a));
-    const __m128i bi = _mm_castps_si128(_mm_set_ss(b));
-    const __m128i ci = _mm_max_epi32(ai,bi);
-    return _mm_cvtss_f32(_mm_castsi128_ps(ci));
-  }
-#endif
-*/
-  
-  template<typename T>
-    __forceinline T twice(const T& a) { return a+a; }
-
-  __forceinline      int min(int      a, int      b) { return sycl::min(a,b); }
-  __forceinline unsigned min(unsigned a, unsigned b) { return sycl::min(a,b); }
-  __forceinline  int64_t min(int64_t  a, int64_t  b) { return sycl::min(a,b); }
-  __forceinline    float min(float    a, float    b) { return sycl::fmin(a,b); }
-  __forceinline   double min(double   a, double   b) { return sycl::fmin(a,b); }
-#if defined(__X86_64__)
-  __forceinline   size_t min(size_t   a, size_t   b) { return sycl::min(a,b); }
-#endif
-
-  template<typename T> __forceinline T min(const T& a, const T& b, const T& c) { return min(min(a,b),c); }
-  template<typename T> __forceinline T min(const T& a, const T& b, const T& c, const T& d) { return min(min(a,b),min(c,d)); }
-  template<typename T> __forceinline T min(const T& a, const T& b, const T& c, const T& d, const T& e) { return min(min(min(a,b),min(c,d)),e); }
-
-//  template<typename T> __forceinline T mini(const T& a, const T& b, const T& c) { return mini(mini(a,b),c); }
-//  template<typename T> __forceinline T mini(const T& a, const T& b, const T& c, const T& d) { return mini(mini(a,b),mini(c,d)); }
-//  template<typename T> __forceinline T mini(const T& a, const T& b, const T& c, const T& d, const T& e) { return mini(mini(mini(a,b),mini(c,d)),e); }
-
-  __forceinline      int max(int      a, int      b) { return sycl::max(a,b); }
-  __forceinline unsigned max(unsigned a, unsigned b) { return sycl::max(a,b); }
-  __forceinline  int64_t max(int64_t  a, int64_t  b) { return sycl::max(a,b); }
-  __forceinline    float max(float    a, float    b) { return sycl::fmax(a,b); }
-  __forceinline   double max(double   a, double   b) { return sycl::fmax(a,b); }
-#if defined(__X86_64__)
-  __forceinline   size_t max(size_t   a, size_t   b) { return sycl::max(a,b); }
-#endif
-
-  template<typename T> __forceinline T max(const T& a, const T& b, const T& c) { return max(max(a,b),c); }
-  template<typename T> __forceinline T max(const T& a, const T& b, const T& c, const T& d) { return max(max(a,b),max(c,d)); }
-  template<typename T> __forceinline T max(const T& a, const T& b, const T& c, const T& d, const T& e) { return max(max(max(a,b),max(c,d)),e); }
-
-//  template<typename T> __forceinline T maxi(const T& a, const T& b, const T& c) { return maxi(maxi(a,b),c); }
-//  template<typename T> __forceinline T maxi(const T& a, const T& b, const T& c, const T& d) { return maxi(maxi(a,b),maxi(c,d)); }
-//  template<typename T> __forceinline T maxi(const T& a, const T& b, const T& c, const T& d, const T& e) { return maxi(maxi(maxi(a,b),maxi(c,d)),e); }
-
-  template<typename T> __forceinline T clamp(const T& x, const T& lower = T(zero), const T& upper = T(one)) { return max(min(x,upper),lower); }
-  template<typename T> __forceinline T clampz(const T& x, const T& upper) { return max(T(zero), min(x,upper)); }
-
-  template<typename T> __forceinline T  deg2rad ( const T& x )  { return x * T(1.74532925199432957692e-2f); }
-  template<typename T> __forceinline T  rad2deg ( const T& x )  { return x * T(5.72957795130823208768e1f); }
-  template<typename T> __forceinline T  sin2cos ( const T& x )  { return sqrt(max(T(zero),T(one)-x*x)); }
-  template<typename T> __forceinline T  cos2sin ( const T& x )  { return sin2cos(x); }
-
-  __forceinline float madd  ( const float a, const float b, const float c) { return +sycl::fma(+a,b,+c); }
-  __forceinline float msub  ( const float a, const float b, const float c) { return +sycl::fma(+a,b,-c); }
-  __forceinline float nmadd ( const float a, const float b, const float c) { return +sycl::fma(-a,b,+c); }
-  __forceinline float nmsub ( const float a, const float b, const float c) { return -sycl::fma(+a,b,+c); }
-
-  /*! random functions */
-/*
-  template<typename T> T random() { return T(0); }
-  template<> __forceinline int      random() { return int(rand()); }
-  template<> __forceinline uint32_t random() { return uint32_t(rand()) ^ (uint32_t(rand()) << 16); }
-  template<> __forceinline float  random() { return rand()/float(RAND_MAX); }
-  template<> __forceinline double random() { return rand()/double(RAND_MAX); }
-*/
-  
-  /*! selects */
-  __forceinline bool  select(bool s, bool  t , bool f) { return s ? t : f; }
-  __forceinline int   select(bool s, int   t,   int f) { return s ? t : f; }
-  __forceinline float select(bool s, float t, float f) { return s ? t : f; }
-
-  __forceinline bool none(bool s) { return !s; }
-  __forceinline bool all (bool s) { return s; }
-  __forceinline bool any (bool s) { return s; }
-
-  __forceinline unsigned movemask (bool s) { return (unsigned)s; }
-
-  __forceinline float lerp(const float v0, const float v1, const float t) {
-    return madd(1.0f-t,v0,t*v1);
-  }
-
-  template<typename T>
-    __forceinline T lerp2(const float x0, const float x1, const float x2, const float x3, const T& u, const T& v) {
-    return madd((1.0f-u),madd((1.0f-v),T(x0),v*T(x2)),u*madd((1.0f-v),T(x1),v*T(x3)));
-  }
-
-  /*! exchange */
-  template<typename T> __forceinline void xchg ( T& a, T& b ) { const T tmp = a; a = b; b = tmp; }
-
-   /*  load/store */
-  template<typename Ty> struct mem;
- 
-  template<> struct mem<float> {
-    static __forceinline float load (bool mask, const void* ptr) { return mask ? *(float*)ptr : 0.0f; }
-    static __forceinline float loadu(bool mask, const void* ptr) { return mask ? *(float*)ptr : 0.0f; }
-  
-    static __forceinline void store (bool mask, void* ptr, const float v) { if (mask) *(float*)ptr = v; }
-    static __forceinline void storeu(bool mask, void* ptr, const float v) { if (mask) *(float*)ptr = v; }
-  };
-  
-  /*! bit reverse operation */
-  template<class T>
-    __forceinline T bitReverse(const T& vin)
-  {
-    T v = vin;
-    v = ((v >> 1) & 0x55555555) | ((v & 0x55555555) << 1);
-    v = ((v >> 2) & 0x33333333) | ((v & 0x33333333) << 2);
-    v = ((v >> 4) & 0x0F0F0F0F) | ((v & 0x0F0F0F0F) << 4);
-    v = ((v >> 8) & 0x00FF00FF) | ((v & 0x00FF00FF) << 8);
-    v = ( v >> 16             ) | ( v               << 16);
-    return v;
-  }
-
-  /*! bit interleave operation */
-  template<class T>
-    __forceinline T bitInterleave(const T& xin, const T& yin, const T& zin)
-  {
-	T x = xin, y = yin, z = zin;
-    x = (x | (x << 16)) & 0x030000FF;
-    x = (x | (x <<  8)) & 0x0300F00F;
-    x = (x | (x <<  4)) & 0x030C30C3;
-    x = (x | (x <<  2)) & 0x09249249;
-
-    y = (y | (y << 16)) & 0x030000FF;
-    y = (y | (y <<  8)) & 0x0300F00F;
-    y = (y | (y <<  4)) & 0x030C30C3;
-    y = (y | (y <<  2)) & 0x09249249;
-
-    z = (z | (z << 16)) & 0x030000FF;
-    z = (z | (z <<  8)) & 0x0300F00F;
-    z = (z | (z <<  4)) & 0x030C30C3;
-    z = (z | (z <<  2)) & 0x09249249;
-
-    return x | (y << 1) | (z << 2);
-  }
-
-  /*! bit interleave operation for 64bit data types*/
-  template<class T>
-    __forceinline T bitInterleave64(const T& xin, const T& yin, const T& zin){
-    T x = xin & 0x1fffff;
-    T y = yin & 0x1fffff;
-    T z = zin & 0x1fffff;
-
-    x = (x | x << 32) & 0x1f00000000ffff;
-    x = (x | x << 16) & 0x1f0000ff0000ff;
-    x = (x | x << 8) & 0x100f00f00f00f00f;
-    x = (x | x << 4) & 0x10c30c30c30c30c3;
-    x = (x | x << 2) & 0x1249249249249249;
-
-    y = (y | y << 32) & 0x1f00000000ffff;
-    y = (y | y << 16) & 0x1f0000ff0000ff;
-    y = (y | y << 8) & 0x100f00f00f00f00f;
-    y = (y | y << 4) & 0x10c30c30c30c30c3;
-    y = (y | y << 2) & 0x1249249249249249;
-
-    z = (z | z << 32) & 0x1f00000000ffff;
-    z = (z | z << 16) & 0x1f0000ff0000ff;
-    z = (z | z << 8) & 0x100f00f00f00f00f;
-    z = (z | z << 4) & 0x10c30c30c30c30c3;
-    z = (z | z << 2) & 0x1249249249249249;
-
-    return x | (y << 1) | (z << 2);
-  }
-}
@@ -1,5 +1,18 @@
-// Copyright 2009-2021 Intel Corporation
-// SPDX-License-Identifier: Apache-2.0
+// ======================================================================== //
+// Copyright 2009-2017 Intel Corporation                                    //
+//                                                                          //
+// Licensed under the Apache License, Version 2.0 (the "License");          //
+// you may not use this file except in compliance with the License.         //
+// You may obtain a copy of the License at                                  //
+//                                                                          //
+//     http://www.apache.org/licenses/LICENSE-2.0                           //
+//                                                                          //
+// Unless required by applicable law or agreed to in writing, software      //
+// distributed under the License is distributed on an "AS IS" BASIS,        //
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. //
+// See the License for the specific language governing permissions and      //
+// limitations under the License.                                           //
+// ======================================================================== //

 #pragma once

@@ -25,8 +38,8 @@ namespace embree
    __forceinline OBBox (const LinearSpace3<T>& space, const BBox<T>& bounds) 
      : space(space), bounds(bounds) {}
    
-    friend embree_ostream operator<<(embree_ostream cout, const OBBox& p) {
-      return cout << "{ space = " << p.space << ", bounds = " << p.bounds << "}";
+    friend std::ostream& operator<<(std::ostream& cout, const OBBox& p) {
+      return std::cout << "{ space = " << p.space << ", bounds = " << p.bounds << "}";
    }
    
  public:
@@ -1,12 +1,22 @@
-// Copyright 2009-2021 Intel Corporation
-// SPDX-License-Identifier: Apache-2.0
+// ======================================================================== //
+// Copyright 2009-2017 Intel Corporation                                    //
+//                                                                          //
+// Licensed under the Apache License, Version 2.0 (the "License");          //
+// you may not use this file except in compliance with the License.         //
+// You may obtain a copy of the License at                                  //
+//                                                                          //
+//     http://www.apache.org/licenses/LICENSE-2.0                           //
+//                                                                          //
+// Unless required by applicable law or agreed to in writing, software      //
+// distributed under the License is distributed on an "AS IS" BASIS,        //
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. //
+// See the License for the specific language governing permissions and      //
+// limitations under the License.                                           //
+// ======================================================================== //

 #pragma once

 #include "vec3.h"
-#include "vec4.h"
-
-#include "transcendental.h"

 namespace embree
 {
@@ -23,13 +33,12 @@ namespace embree
    /// Construction
    ////////////////////////////////////////////////////////////////////////////////

-    __forceinline QuaternionT           ()                     { }
+    __forceinline QuaternionT           ( void )                     { }
    __forceinline QuaternionT           ( const QuaternionT& other ) { r = other.r; i = other.i; j = other.j; k = other.k; }
    __forceinline QuaternionT& operator=( const QuaternionT& other ) { r = other.r; i = other.i; j = other.j; k = other.k; return *this; }

    __forceinline          QuaternionT( const T& r       ) : r(r), i(zero), j(zero), k(zero) {}
    __forceinline explicit QuaternionT( const Vec3<T>& v ) : r(zero), i(v.x), j(v.y), k(v.z) {}
-    __forceinline explicit QuaternionT( const Vec4<T>& v ) : r(v.x), i(v.y), j(v.z), k(v.w) {}
    __forceinline          QuaternionT( const T& r, const T& i, const T& j, const T& k ) : r(r), i(i), j(j), k(k) {}
    __forceinline          QuaternionT( const T& r, const Vec3<T>& v ) : r(r), i(v.x), j(v.y), k(v.z) {}

@@ -49,7 +58,7 @@ namespace embree
    }

    /*! returns the rotation axis of the quaternion as a vector */
-    __forceinline Vec3<T> v( ) const { return Vec3<T>(i, j, k); }
+    __forceinline const Vec3<T> v( ) const { return Vec3<T>(i, j, k); }

  public:
    T r, i, j, k;
@@ -69,25 +78,6 @@ namespace embree
  template<typename T> __forceinline QuaternionT<T> rcp       ( const QuaternionT<T>& a ) { return conj(a)*rcp(a.r*a.r + a.i*a.i + a.j*a.j + a.k*a.k); }
  template<typename T> __forceinline QuaternionT<T> normalize ( const QuaternionT<T>& a ) { return a*rsqrt(a.r*a.r + a.i*a.i + a.j*a.j + a.k*a.k); }

-  // evaluates a*q-r
-  template<typename T> __forceinline QuaternionT<T>
-  msub(const T& a, const QuaternionT<T>& q, const QuaternionT<T>& p)
-  {
-    return QuaternionT<T>(msub(a, q.r, p.r),
-                          msub(a, q.i, p.i),
-                          msub(a, q.j, p.j),
-                          msub(a, q.k, p.k));
-  }
-  // evaluates a*q-r
-  template<typename T> __forceinline QuaternionT<T>
-  madd (const T& a, const QuaternionT<T>& q, const QuaternionT<T>& p)
-  {
-    return QuaternionT<T>(madd(a, q.r, p.r),
-                          madd(a, q.i, p.i),
-                          madd(a, q.j, p.j),
-                          madd(a, q.k, p.k));
-  }
-
  ////////////////////////////////////////////////////////////////
  // Binary Operators
  ////////////////////////////////////////////////////////////////
@@ -119,22 +109,10 @@ namespace embree
  template<typename T> __forceinline QuaternionT<T>& operator /=( QuaternionT<T>& a, const T             & b ) { return a = a*rcp(b); }
  template<typename T> __forceinline QuaternionT<T>& operator /=( QuaternionT<T>& a, const QuaternionT<T>& b ) { return a = a*rcp(b); }

-  template<typename T, typename M> __forceinline QuaternionT<T>
-  select(const M& m, const QuaternionT<T>& q, const QuaternionT<T>& p)
-  {
-    return QuaternionT<T>(select(m, q.r, p.r),
-                          select(m, q.i, p.i),
-                          select(m, q.j, p.j),
-                          select(m, q.k, p.k));
-  }
-
-
  template<typename T> __forceinline Vec3<T> xfmPoint ( const QuaternionT<T>& a, const Vec3<T>&       b ) { return (a*QuaternionT<T>(b)*conj(a)).v(); }
  template<typename T> __forceinline Vec3<T> xfmVector( const QuaternionT<T>& a, const Vec3<T>&       b ) { return (a*QuaternionT<T>(b)*conj(a)).v(); }
  template<typename T> __forceinline Vec3<T> xfmNormal( const QuaternionT<T>& a, const Vec3<T>&       b ) { return (a*QuaternionT<T>(b)*conj(a)).v(); }

-  template<typename T> __forceinline T dot(const QuaternionT<T>& a, const QuaternionT<T>& b) { return a.r*b.r + a.i*b.i + a.j*b.j + a.k*b.k; }
-
  ////////////////////////////////////////////////////////////////////////////////
  /// Comparison Operators
  ////////////////////////////////////////////////////////////////////////////////
@@ -201,58 +179,15 @@ namespace embree
    k = sro*cya*cpi - cro*sya*spi;
  }

-  //////////////////////////////////////////////////////////////////////////////
+  ////////////////////////////////////////////////////////////////////////////////
  /// Output Operators
-  //////////////////////////////////////////////////////////////////////////////
+  ////////////////////////////////////////////////////////////////////////////////

-  template<typename T> static embree_ostream operator<<(embree_ostream cout, const QuaternionT<T>& q) {
+  template<typename T> static std::ostream& operator<<(std::ostream& cout, const QuaternionT<T>& q) {
    return cout << "{ r = " << q.r << ", i = " << q.i << ", j = " << q.j << ", k = " << q.k << " }";
  }

  /*! default template instantiations */
  typedef QuaternionT<float>  Quaternion3f;
  typedef QuaternionT<double> Quaternion3d;
-
-  template<int N> using Quaternion3vf = QuaternionT<vfloat<N>>;
-  typedef QuaternionT<vfloat<4>>  Quaternion3vf4;
-  typedef QuaternionT<vfloat<8>>  Quaternion3vf8;
-  typedef QuaternionT<vfloat<16>> Quaternion3vf16;
-
-  //////////////////////////////////////////////////////////////////////////////
-  /// Interpolation
-  //////////////////////////////////////////////////////////////////////////////
-  template<typename T>
-  __forceinline QuaternionT<T>lerp(const QuaternionT<T>& q0,
-                                   const QuaternionT<T>& q1,
-                                   const T& factor)
-  {
-    QuaternionT<T> q;
-    q.r = lerp(q0.r, q1.r, factor);
-    q.i = lerp(q0.i, q1.i, factor);
-    q.j = lerp(q0.j, q1.j, factor);
-    q.k = lerp(q0.k, q1.k, factor);
-    return q;
-  }
-
-  template<typename T>
-  __forceinline QuaternionT<T> slerp(const QuaternionT<T>& q0,
-                                     const QuaternionT<T>& q1_,
-                                     const T& t)
-  {
-    T cosTheta = dot(q0, q1_);
-    QuaternionT<T> q1 = select(cosTheta < 0.f, -q1_, q1_);
-    cosTheta          = select(cosTheta < 0.f, -cosTheta, cosTheta);
-
-    // spherical linear interpolation
-    const T phi = t * fastapprox::acos(cosTheta);
-    T sinPhi, cosPhi;
-    fastapprox::sincos(phi, sinPhi, cosPhi);
-    QuaternionT<T> qperp = sinPhi * normalize(msub(cosTheta, q0, q1));
-    QuaternionT<T> qslerp = msub(cosPhi, q0, qperp);
-
-    // regular linear interpolation as fallback
-    QuaternionT<T> qlerp = normalize(lerp(q0, q1, t));
-
-    return select(cosTheta > 0.9995f, qlerp, qslerp);
-  }
 }
@@ -1,10 +1,23 @@
-// Copyright 2009-2021 Intel Corporation
-// SPDX-License-Identifier: Apache-2.0
+// ======================================================================== //
+// Copyright 2009-2017 Intel Corporation                                    //
+//                                                                          //
+// Licensed under the Apache License, Version 2.0 (the "License");          //
+// you may not use this file except in compliance with the License.         //
+// You may obtain a copy of the License at                                  //
+//                                                                          //
+//     http://www.apache.org/licenses/LICENSE-2.0                           //
+//                                                                          //
+// Unless required by applicable law or agreed to in writing, software      //
+// distributed under the License is distributed on an "AS IS" BASIS,        //
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. //
+// See the License for the specific language governing permissions and      //
+// limitations under the License.                                           //
+// ======================================================================== //

 #pragma once

 #include "../sys/platform.h"
-#include "../math/emath.h"
+#include "../math/math.h"

 namespace embree
 {
@@ -74,7 +87,7 @@ namespace embree
        return r0.size() < r1.size();
      }
 	
-      friend embree_ostream operator<<(embree_ostream cout, const range& r) {
+      friend std::ostream& operator<<(std::ostream& cout, const range& r) {
        return cout << "range [" << r.begin() << ", " << r.end() << "]";
      }
      
@@ -87,51 +100,63 @@ namespace embree
  }

  template<typename Ty>
-    struct extended_range : public range<Ty>
+    struct extended_range 
    {
      __forceinline extended_range () {}

      __forceinline extended_range (const Ty& begin)
-        : range<Ty>(begin), _ext_end(begin+1) {}
+        : _begin(begin), _end(begin+1), _ext_end(begin+1) {}
      
      __forceinline extended_range (const Ty& begin, const Ty& end)
-        : range<Ty>(begin,end), _ext_end(end) {}
+        : _begin(begin), _end(end), _ext_end(end) {}

      __forceinline extended_range (const Ty& begin, const Ty& end, const Ty& ext_end)
-        : range<Ty>(begin,end), _ext_end(ext_end) {}
+        : _begin(begin), _end(end), _ext_end(ext_end) {}
      
+      __forceinline Ty begin() const {
+        return _begin;
+      }
+      
+      __forceinline Ty end() const {
+	return _end;
+      }
+
      __forceinline Ty ext_end() const {
 	return _ext_end;
      }

+      __forceinline Ty size() const {
+        return _end - _begin;
+      }
+
      __forceinline Ty ext_size() const {
-        return _ext_end - range<Ty>::_begin;
+        return _ext_end - _begin;
      }

      __forceinline Ty ext_range_size() const {
-        return _ext_end - range<Ty>::_end;
+        return _ext_end - _end;
      }

      __forceinline bool has_ext_range() const {
-        assert(_ext_end >= range<Ty>::_end);
-        return (_ext_end - range<Ty>::_end) > 0;
+        assert(_ext_end >= _end);
+        return (_ext_end - _end) > 0;
      }

      __forceinline void set_ext_range(const size_t ext_end){
-        assert(ext_end >= range<Ty>::_end);
+        assert(ext_end >= _end);
        _ext_end = ext_end;
      }

      __forceinline void move_right(const size_t plus){
-        range<Ty>::_begin   += plus;
-        range<Ty>::_end     += plus;
+        _begin   += plus;
+        _end     += plus;
        _ext_end += plus;
      }

-      friend embree_ostream operator<<(embree_ostream cout, const extended_range& r) {
+      friend std::ostream& operator<<(std::ostream& cout, const extended_range& r) {
        return cout << "extended_range [" << r.begin() << ", " << r.end() <<  " (" << r.ext_end() << ")]";
      }
      
-      Ty _ext_end;
+      Ty _begin, _end, _ext_end;
    };
 }
@@ -1,525 +0,0 @@
-// Copyright 2009-2021 Intel Corporation
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-// Transcendental functions from "ispc": https://github.com/ispc/ispc/
-// Most of the transcendental implementations in ispc code come from
-// Solomon Boulos's "syrah": https://github.com/boulos/syrah/
-
-#include "../simd/simd.h"
-
-namespace embree
-{
-
-namespace fastapprox
-{
-
-template <typename T>
-__forceinline T sin(const T &v)
-{
-  static const float piOverTwoVec = 1.57079637050628662109375;
-  static const float twoOverPiVec = 0.636619746685028076171875;
-  auto scaled = v * twoOverPiVec;
-  auto kReal = floor(scaled);
-  auto k = toInt(kReal);
-
-  // Reduced range version of x
-  auto x = v - kReal * piOverTwoVec;
-  auto kMod4 = k & 3;
-  auto sinUseCos = (kMod4 == 1) | (kMod4 == 3);
-  auto flipSign = (kMod4 > 1);
-
-  // These coefficients are from sollya with fpminimax(sin(x)/x, [|0, 2,
-  // 4, 6, 8, 10|], [|single...|], [0;Pi/2]);
-  static const float sinC2  = -0.16666667163372039794921875;
-  static const float sinC4  = +8.333347737789154052734375e-3;
-  static const float sinC6  = -1.9842604524455964565277099609375e-4;
-  static const float sinC8  = +2.760012648650445044040679931640625e-6;
-  static const float sinC10 = -2.50293279435709337121807038784027099609375e-8;
-
-  static const float cosC2  = -0.5;
-  static const float cosC4  = +4.166664183139801025390625e-2;
-  static const float cosC6  = -1.388833043165504932403564453125e-3;
-  static const float cosC8  = +2.47562347794882953166961669921875e-5;
-  static const float cosC10 = -2.59630184018533327616751194000244140625e-7;
-
-  auto outside = select(sinUseCos, 1., x);
-  auto c2  = select(sinUseCos, T(cosC2),  T(sinC2));
-  auto c4  = select(sinUseCos, T(cosC4),  T(sinC4));
-  auto c6  = select(sinUseCos, T(cosC6),  T(sinC6));
-  auto c8  = select(sinUseCos, T(cosC8),  T(sinC8));
-  auto c10 = select(sinUseCos, T(cosC10), T(sinC10));
-
-  auto x2 = x * x;
-  auto formula = x2 * c10 + c8;
-  formula = x2 * formula + c6;
-  formula = x2 * formula + c4;
-  formula = x2 * formula + c2;
-  formula = x2 * formula + 1.;
-  formula *= outside;
-
-  formula = select(flipSign, -formula, formula);
-  return formula;
-}
-
-template <typename T>
-__forceinline T cos(const T &v)
-{
-  static const float piOverTwoVec = 1.57079637050628662109375;
-  static const float twoOverPiVec = 0.636619746685028076171875;
-  auto scaled = v * twoOverPiVec;
-  auto kReal = floor(scaled);
-  auto k = toInt(kReal);
-
-  // Reduced range version of x
-  auto x = v - kReal * piOverTwoVec;
-
-  auto kMod4 = k & 3;
-  auto cosUseCos = (kMod4 == 0) | (kMod4 == 2);
-  auto flipSign = (kMod4 == 1) | (kMod4 == 2);
-
-  const float sinC2  = -0.16666667163372039794921875;
-  const float sinC4  = +8.333347737789154052734375e-3;
-  const float sinC6  = -1.9842604524455964565277099609375e-4;
-  const float sinC8  = +2.760012648650445044040679931640625e-6;
-  const float sinC10 = -2.50293279435709337121807038784027099609375e-8;
-
-  const float cosC2  = -0.5;
-  const float cosC4  = +4.166664183139801025390625e-2;
-  const float cosC6  = -1.388833043165504932403564453125e-3;
-  const float cosC8  = +2.47562347794882953166961669921875e-5;
-  const float cosC10 = -2.59630184018533327616751194000244140625e-7;
-
-  auto outside = select(cosUseCos, 1., x);
-  auto c2  = select(cosUseCos, T(cosC2),  T(sinC2));
-  auto c4  = select(cosUseCos, T(cosC4),  T(sinC4));
-  auto c6  = select(cosUseCos, T(cosC6),  T(sinC6));
-  auto c8  = select(cosUseCos, T(cosC8),  T(sinC8));
-  auto c10 = select(cosUseCos, T(cosC10), T(sinC10));
-
-  auto x2 = x * x;
-  auto formula = x2 * c10 + c8;
-  formula = x2 * formula + c6;
-  formula = x2 * formula + c4;
-  formula = x2 * formula + c2;
-  formula = x2 * formula + 1.;
-  formula *= outside;
-
-  formula = select(flipSign, -formula, formula);
-  return formula;
-}
-
-template <typename T>
-__forceinline void sincos(const T &v, T &sinResult, T &cosResult)
-{
-  const float piOverTwoVec = 1.57079637050628662109375;
-  const float twoOverPiVec = 0.636619746685028076171875;
-  auto scaled = v * twoOverPiVec;
-  auto kReal = floor(scaled);
-  auto k = toInt(kReal);
-
-  // Reduced range version of x
-  auto x = v - kReal * piOverTwoVec;
-  auto kMod4 = k & 3;
-  auto cosUseCos = ((kMod4 == 0) | (kMod4 == 2));
-  auto sinUseCos = ((kMod4 == 1) | (kMod4 == 3));
-  auto sinFlipSign = (kMod4 > 1);
-  auto cosFlipSign = ((kMod4 == 1) | (kMod4 == 2));
-
-  const float oneVec = +1.;
-  const float sinC2  = -0.16666667163372039794921875;
-  const float sinC4  = +8.333347737789154052734375e-3;
-  const float sinC6  = -1.9842604524455964565277099609375e-4;
-  const float sinC8  = +2.760012648650445044040679931640625e-6;
-  const float sinC10 = -2.50293279435709337121807038784027099609375e-8;
-
-  const float cosC2  = -0.5;
-  const float cosC4  = +4.166664183139801025390625e-2;
-  const float cosC6  = -1.388833043165504932403564453125e-3;
-  const float cosC8  = +2.47562347794882953166961669921875e-5;
-  const float cosC10 = -2.59630184018533327616751194000244140625e-7;
-
-  auto x2 = x * x;
-
-  auto sinFormula = x2 * sinC10 + sinC8;
-  auto cosFormula = x2 * cosC10 + cosC8;
-  sinFormula = x2 * sinFormula + sinC6;
-  cosFormula = x2 * cosFormula + cosC6;
-
-  sinFormula = x2 * sinFormula + sinC4;
-  cosFormula = x2 * cosFormula + cosC4;
-
-  sinFormula = x2 * sinFormula + sinC2;
-  cosFormula = x2 * cosFormula + cosC2;
-
-  sinFormula = x2 * sinFormula + oneVec;
-  cosFormula = x2 * cosFormula + oneVec;
-
-  sinFormula *= x;
-
-  sinResult = select(sinUseCos, cosFormula, sinFormula);
-  cosResult = select(cosUseCos, cosFormula, sinFormula);
-
-  sinResult = select(sinFlipSign, -sinResult, sinResult);
-  cosResult = select(cosFlipSign, -cosResult, cosResult);
-}
-
-template <typename T>
-__forceinline T tan(const T &v)
-{
-  const float piOverFourVec = 0.785398185253143310546875;
-  const float fourOverPiVec = 1.27323949337005615234375;
-
-  auto xLt0 = v < 0.;
-  auto y = select(xLt0, -v, v);
-  auto scaled = y * fourOverPiVec;
-
-  auto kReal = floor(scaled);
-  auto k = toInt(kReal);
-
-  auto x = y - kReal * piOverFourVec;
-
-  // If k & 1, x -= Pi/4
-  auto needOffset = (k & 1) != 0;
-  x = select(needOffset, x - piOverFourVec, x);
-
-  // If k & 3 == (0 or 3) let z = tan_In...(y) otherwise z = -cot_In0To...
-  auto kMod4 = k & 3;
-  auto useCotan = (kMod4 == 1) | (kMod4 == 2);
-
-  const float oneVec = 1.0;
-
-  const float tanC2  = +0.33333075046539306640625;
-  const float tanC4  = +0.13339905440807342529296875;
-  const float tanC6  = +5.3348250687122344970703125e-2;
-  const float tanC8  = +2.46033705770969390869140625e-2;
-  const float tanC10 = +2.892402000725269317626953125e-3;
-  const float tanC12 = +9.500005282461643218994140625e-3;
-
-  const float cotC2  = -0.3333333432674407958984375;
-  const float cotC4  = -2.222204394638538360595703125e-2;
-  const float cotC6  = -2.11752182804048061370849609375e-3;
-  const float cotC8  = -2.0846328698098659515380859375e-4;
-  const float cotC10 = -2.548247357481159269809722900390625e-5;
-  const float cotC12 = -3.5257363606433500535786151885986328125e-7;
-
-  auto x2 = x * x;
-  T z;
-  if (any(useCotan))
-  {
-    auto cotVal = x2 * cotC12 + cotC10;
-    cotVal = x2 * cotVal + cotC8;
-    cotVal = x2 * cotVal + cotC6;
-    cotVal = x2 * cotVal + cotC4;
-    cotVal = x2 * cotVal + cotC2;
-    cotVal = x2 * cotVal + oneVec;
-    // The equation is for x * cot(x) but we need -x * cot(x) for the tan part.
-    cotVal /= -x;
-    z = cotVal;
-  }
-  auto useTan = !useCotan;
-  if (any(useTan))
-  {
-    auto tanVal = x2 * tanC12 + tanC10;
-    tanVal = x2 * tanVal + tanC8;
-    tanVal = x2 * tanVal + tanC6;
-    tanVal = x2 * tanVal + tanC4;
-    tanVal = x2 * tanVal + tanC2;
-    tanVal = x2 * tanVal + oneVec;
-    // Equation was for tan(x)/x
-    tanVal *= x;
-    z = select(useTan, tanVal, z);
-  }
-  return select(xLt0, -z, z);
-}
-
-template <typename T>
-__forceinline T asin(const T &x0)
-{
-  auto isneg = (x0 < 0.f);
-  auto x = abs(x0);
-  auto isnan = (x > 1.f);
-
-  // sollya
-  // fpminimax(((asin(x)-pi/2)/-sqrt(1-x)), [|0,1,2,3,4,5|],[|single...|],
-  //           [1e-20;.9999999999999999]);
-  // avg error: 1.1105439e-06, max error 1.3187528e-06
-  auto v = 1.57079517841339111328125f +
-           x * (-0.21450997889041900634765625f +
-                x * (8.78556668758392333984375e-2f +
-                     x * (-4.489909112453460693359375e-2f +
-                          x * (1.928029954433441162109375e-2f +
-                               x * (-4.3095736764371395111083984375e-3f)))));
-
-  v *= -sqrt(1.f - x);
-  v = v + 1.57079637050628662109375f;
-
-  v = select(v < 0.f, T(0.f), v);
-  v = select(isneg, -v, v);
-  v = select(isnan, T(cast_i2f(0x7fc00000)), v);
-
-  return v;
-}
-
-template <typename T>
-__forceinline T acos(const T &v)
-{
-  return 1.57079637050628662109375f - asin(v);
-}
-
-template <typename T>
-__forceinline T atan(const T &v)
-{
-  const float piOverTwoVec = 1.57079637050628662109375;
-  // atan(-x) = -atan(x) (so flip from negative to positive first)
-  // If x > 1 -> atan(x) = Pi/2 - atan(1/x)
-  auto xNeg = v < 0.f;
-  auto xFlipped = select(xNeg, -v, v);
-
-  auto xGt1 = xFlipped > 1.;
-  auto x = select(xGt1, rcpSafe(xFlipped), xFlipped);
-
-  // These coefficients approximate atan(x)/x
-  const float atanC0  = +0.99999988079071044921875;
-  const float atanC2  = -0.3333191573619842529296875;
-  const float atanC4  = +0.199689209461212158203125;
-  const float atanC6  = -0.14015688002109527587890625;
-  const float atanC8  = +9.905083477497100830078125e-2;
-  const float atanC10 = -5.93664981424808502197265625e-2;
-  const float atanC12 = +2.417283318936824798583984375e-2;
-  const float atanC14 = -4.6721356920897960662841796875e-3;
-
-  auto x2 = x * x;
-  auto result = x2 * atanC14 + atanC12;
-  result = x2 * result + atanC10;
-  result = x2 * result + atanC8;
-  result = x2 * result + atanC6;
-  result = x2 * result + atanC4;
-  result = x2 * result + atanC2;
-  result = x2 * result + atanC0;
-  result *= x;
-
-  result = select(xGt1, piOverTwoVec - result, result);
-  result = select(xNeg, -result, result);
-  return result;
-}
-
-template <typename T>
-__forceinline T atan2(const T &y, const T &x)
-{
-  const float piVec = 3.1415926536;
-  // atan2(y, x) =
-  //
-  // atan2(y > 0, x = +-0) ->  Pi/2
-  // atan2(y < 0, x = +-0) -> -Pi/2
-  // atan2(y = +-0, x < +0) -> +-Pi
-  // atan2(y = +-0, x >= +0) -> +-0
-  //
-  // atan2(y >= 0, x < 0) ->  Pi + atan(y/x)
-  // atan2(y <  0, x < 0) -> -Pi + atan(y/x)
-  // atan2(y, x > 0) -> atan(y/x)
-  //
-  // and then a bunch of code for dealing with infinities.
-  auto yOverX = y * rcpSafe(x);
-  auto atanArg = atan(yOverX);
-  auto xLt0 = x < 0.f;
-  auto yLt0 = y < 0.f;
-  auto offset = select(xLt0,
-                select(yLt0, T(-piVec), T(piVec)), 0.f);
-  return offset + atanArg;
-}
-
-template <typename T>
-__forceinline T exp(const T &v)
-{
-  const float ln2Part1 = 0.6931457519;
-  const float ln2Part2 = 1.4286067653e-6;
-  const float oneOverLn2 = 1.44269502162933349609375;
-
-  auto scaled = v * oneOverLn2;
-  auto kReal = floor(scaled);
-  auto k = toInt(kReal);
-
-  // Reduced range version of x
-  auto x = v - kReal * ln2Part1;
-  x -= kReal * ln2Part2;
-
-  // These coefficients are for e^x in [0, ln(2)]
-  const float one = 1.;
-  const float c2 = 0.4999999105930328369140625;
-  const float c3 = 0.166668415069580078125;
-  const float c4 = 4.16539050638675689697265625e-2;
-  const float c5 = 8.378830738365650177001953125e-3;
-  const float c6 = 1.304379315115511417388916015625e-3;
-  const float c7 = 2.7555381529964506626129150390625e-4;
-
-  auto result = x * c7 + c6;
-  result = x * result + c5;
-  result = x * result + c4;
-  result = x * result + c3;
-  result = x * result + c2;
-  result = x * result + one;
-  result = x * result + one;
-
-  // Compute 2^k (should differ for float and double, but I'll avoid
-  // it for now and just do floats)
-  const int fpbias = 127;
-  auto biasedN = k + fpbias;
-  auto overflow = kReal > fpbias;
-  // Minimum exponent is -126, so if k is <= -127 (k + 127 <= 0)
-  // we've got underflow. -127 * ln(2) -> -88.02. So the most
-  // negative float input that doesn't result in zero is like -88.
-  auto underflow = kReal <= -fpbias;
-  const int infBits = 0x7f800000;
-  biasedN <<= 23;
-  // Reinterpret this thing as float
-  auto twoToTheN = asFloat(biasedN);
-  // Handle both doubles and floats (hopefully eliding the copy for float)
-  auto elemtype2n = twoToTheN;
-  result *= elemtype2n;
-  result = select(overflow, cast_i2f(infBits), result);
-  result = select(underflow, 0., result);
-  return result;
-}
-
-// Range reduction for logarithms takes log(x) -> log(2^n * y) -> n
-// * log(2) + log(y) where y is the reduced range (usually in [1/2, 1)).
-template <typename T, typename R>
-__forceinline void __rangeReduceLog(const T &input,
-                                    T &reduced,
-                                    R &exponent)
-{
-  auto intVersion = asInt(input);
-  // single precision = SEEE EEEE EMMM MMMM MMMM MMMM MMMM MMMM
-  // exponent mask    = 0111 1111 1000 0000 0000 0000 0000 0000
-  //                    0x7  0xF  0x8  0x0  0x0  0x0  0x0  0x0
-  // non-exponent     = 1000 0000 0111 1111 1111 1111 1111 1111
-  //                  = 0x8  0x0  0x7  0xF  0xF  0xF  0xF  0xF
-
-  //const int exponentMask(0x7F800000)
-  static const int nonexponentMask = 0x807FFFFF;
-
-  // We want the reduced version to have an exponent of -1 which is
-  // -1 + 127 after biasing or 126
-  static const int exponentNeg1 = (126l << 23);
-  // NOTE(boulos): We don't need to mask anything out since we know
-  // the sign bit has to be 0. If it's 1, we need to return infinity/nan
-  // anyway (log(x), x = +-0 -> infinity, x < 0 -> NaN).
-  auto biasedExponent = intVersion >> 23; // This number is [0, 255] but it means [-127, 128]
-
-  auto offsetExponent = biasedExponent + 1; // Treat the number as if it were 2^{e+1} * (1.m)/2
-  exponent = offsetExponent - 127;          // get the real value
-
-  // Blend the offset_exponent with the original input (do this in
-  // int for now, until I decide if float can have & and &not)
-  auto blended = (intVersion & nonexponentMask) | (exponentNeg1);
-  reduced = asFloat(blended);
-}
-
-template <typename T> struct ExponentType            { };
-template <int N>      struct ExponentType<vfloat_impl<N>> { typedef vint<N> Ty; };
-template <>           struct ExponentType<float>     { typedef int     Ty; };
-
-template <typename T>
-__forceinline T log(const T &v)
-{
-  T reduced;
-  typename ExponentType<T>::Ty exponent;
-
-  const int nanBits = 0x7fc00000;
-  const int negInfBits = 0xFF800000;
-  const float nan = cast_i2f(nanBits);
-  const float negInf = cast_i2f(negInfBits);
-  auto useNan = v < 0.;
-  auto useInf = v == 0.;
-  auto exceptional = useNan | useInf;
-  const float one = 1.0;
-
-  auto patched = select(exceptional, one, v);
-  __rangeReduceLog(patched, reduced, exponent);
-
-  const float ln2 = 0.693147182464599609375;
-
-  auto x1 = one - reduced;
-  const float c1 = +0.50000095367431640625;
-  const float c2 = +0.33326041698455810546875;
-  const float c3 = +0.2519190013408660888671875;
-  const float c4 = +0.17541764676570892333984375;
-  const float c5 = +0.3424419462680816650390625;
-  const float c6 = -0.599632322788238525390625;
-  const float c7 = +1.98442304134368896484375;
-  const float c8 = -2.4899270534515380859375;
-  const float c9 = +1.7491014003753662109375;
-
-  auto result = x1 * c9 + c8;
-  result = x1 * result + c7;
-  result = x1 * result + c6;
-  result = x1 * result + c5;
-  result = x1 * result + c4;
-  result = x1 * result + c3;
-  result = x1 * result + c2;
-  result = x1 * result + c1;
-  result = x1 * result + one;
-
-  // Equation was for -(ln(red)/(1-red))
-  result *= -x1;
-  result += toFloat(exponent) * ln2;
-
-  return select(exceptional,
-                select(useNan, T(nan), T(negInf)),
-                result);
-}
-
-template <typename T>
-__forceinline T pow(const T &x, const T &y)
-{
-  auto x1 = abs(x);
-  auto z = exp(y * log(x1));
-
-  // Handle special cases
-  const float twoOver23 = 8388608.0f;
-  auto yInt = y == round(y);
-  auto yOddInt = select(yInt, asInt(abs(y) + twoOver23) << 31, 0); // set sign bit
-
-  // x == 0
-  z = select(x == 0.0f,
-      select(y < 0.0f, T(inf) | signmsk(x),
-      select(y == 0.0f, T(1.0f), asFloat(yOddInt) & x)), z);
-
-  // x < 0
-  auto xNegative = x < 0.0f;
-  if (any(xNegative))
-  {
-    auto z1 = z | asFloat(yOddInt);
-    z1 = select(yInt, z1, std::numeric_limits<float>::quiet_NaN());
-    z = select(xNegative, z1, z);
-  }
-
-  auto xFinite = isfinite(x);
-  auto yFinite = isfinite(y);
-  if (all(xFinite & yFinite))
-    return z;
-
-  // x finite and y infinite
-  z = select(andn(xFinite, yFinite),
-      select(x1 == 1.0f, 1.0f,
-      select((x1 > 1.0f) ^ (y < 0.0f), inf, T(0.0f))), z);
-
-  // x infinite
-  z = select(xFinite, z,
-      select(y == 0.0f, 1.0f,
-      select(y < 0.0f, T(0.0f), inf) | (asFloat(yOddInt) & x)));
-
-  return z;
-}
-
-template <typename T>
-__forceinline T pow(const T &x, float y)
-{
-  return pow(x, T(y));
-}
-
-} // namespace fastapprox
-
-} // namespace embree
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Sven Woop	8f3981132e	merged in devel	2017-04-05 11:07:13 +02:00
Sven Woop	1253547d8a	Merge branch 'devel' into swoop2	2017-04-03 11:43:16 +02:00
Sven Woop	ca3b00326a	cleanups	2017-04-03 11:27:17 +02:00
Sven Woop	ce0c2fb77c	cleanups, removed experimental multi-shared library mode	2017-04-03 11:26:49 +02:00
Sven Woop	aac076f7cc	cleanups	2017-04-03 11:25:06 +02:00
Sven Woop	084f06d119	cleanups	2017-04-03 11:24:47 +02:00
Sven Woop	7699138863	parsing user selected ISA properly	2017-04-03 11:24:00 +02:00
Sven Woop	7ad445b8d0	check_globals ignores static variable inside function	2017-04-03 10:38:47 +02:00
Sven Woop	740b9a7c3f	fixed globals of primitive types	2017-04-03 10:28:55 +02:00
Sven Woop	8eb0bdcd49	fixed globals	2017-04-03 09:35:43 +02:00
Sven Woop	f93e89e71f	fixed globals	2017-04-03 09:32:26 +02:00
Sven Woop	bdb09c0d4f	fixed globals	2017-04-03 09:30:19 +02:00
Sven Woop	ee784df60c	fixed globals	2017-04-03 09:24:02 +02:00
Sven Woop	35e1eb3558	fixed globals	2017-04-03 09:19:27 +02:00
Sven Woop	32076acc56	fixed globals	2017-04-03 09:12:19 +02:00
Sven Woop	949388966e	fixed globals	2017-04-03 09:08:51 +02:00
Sven Woop	badff91e8c	fixed globals	2017-04-03 08:49:17 +02:00
Sven Woop	ed71fc7ac0	moved global error state	2017-04-03 08:42:37 +02:00
Sven Woop	0a42e6db5b	enabled static multi isa again	2017-04-03 08:34:07 +02:00
Sven Woop	6100c25661	experimentally generating separate shared library for each ISA	2017-04-03 07:35:12 +02:00
Sven Woop	044820ea63	bugfix	2017-03-31 13:17:30 +02:00
Sven Woop	f58d9e7725	trying out new scheme to bind API to different ISAs	2017-03-31 13:13:35 +02:00
Sven Woop	4c43dc57d0	enabled global variable check again	2017-03-31 10:05:52 +02:00
Sven Woop	d536d1be7d	moved tessellation cache out of isa namespace	2017-03-31 10:02:18 +02:00
Sven Woop	82eb422d30	merging in devel	2017-03-31 09:27:56 +02:00
Sven Woop	17b3b601b5	compile fix	2017-03-30 13:40:56 +02:00
Sven Woop	60fa5c5c1d	updates to rtcore_main.cpp	2017-03-30 13:25:12 +02:00
Sven Woop	21ea9bb2e0	added rtcore_main.cpp	2017-03-30 12:51:55 +02:00
Sven Woop	02bdb32219	compile fixes	2017-03-30 10:28:53 +02:00
Sven Woop	451e69e389	adding isa namespace to all kernel files	2017-03-30 09:09:37 +02:00
				`@@ -1 +0,0 @@`
				`GFX_DRIVER_VERSION=neo-builds/ci/master/ci-neo-master-033051/artifacts/linux/ubuntu/22.04`
				`@@ -1 +0,0 @@`
				`GFX_DRIVER_VERSION=gfx-driver-ci-master-20127`