diff --git a/.github/workflows/continuous.yml b/.github/workflows/continuous.yml index 018fe235c3..3546823eec 100644 --- a/.github/workflows/continuous.yml +++ b/.github/workflows/continuous.yml @@ -5,7 +5,9 @@ name: continuous permissions: read-all -on: [push, workflow_dispatch] +on: + workflow_dispatch: + push: jobs: ################################################################################ @@ -28,8 +30,25 @@ jobs: artifact-out: linux-GPU-JIT-build artifact-path: ./build/*.tar.gz cmd: | - cmake --preset linux-DG2-JIT-PUBLIC -DCMAKE_BUILD_TYPE=Release -DEMBREE_TESTING_INTENSITY=3 - cmake --build build --config Release --target build + 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 @@ -42,8 +61,8 @@ jobs: env-from-files: ./.github/workflows/dpcpp-sycl-nightly.env ./.github/workflows/gfx-ubuntu24-public.env artifact-in: linux-GPU-JIT-build cmd: | - cmake --preset linux-DG2-JIT-PUBLIC -DCMAKE_BUILD_TYPE=Release -DEMBREE_TESTING_INTENSITY=3 - cmake --build build --config Release --target test_package + 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 @@ -56,8 +75,8 @@ jobs: env-from-files: ./.github/workflows/dpcpp-sycl-nightly.env ./.github/workflows/gfx-ubuntu24-public.env artifact-in: linux-GPU-JIT-build cmd: | - cmake --preset linux-DG2-JIT-PUBLIC -DCMAKE_BUILD_TYPE=Release -DEMBREE_TESTING_INTENSITY=3 - cmake --build build --config Release --target test_package + 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 @@ -69,8 +88,25 @@ jobs: artifact-out: linux-DG2-JIT-PUBLIC-ICX-build artifact-path: ./build/*.tar.gz cmd: | - cmake --preset linux-DG2-JIT-PUBLIC-ICX -DCMAKE_BUILD_TYPE=Release -DEMBREE_TESTING_INTENSITY=3 - cmake --build build --config Release --target build + 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 @@ -84,8 +120,8 @@ jobs: dpcpp-version: intel/2025.2 artifact-in: linux-DG2-JIT-PUBLIC-ICX-build cmd: | - cmake --preset linux-DG2-JIT-PUBLIC-ICX -DCMAKE_BUILD_TYPE=Release -DEMBREE_TESTING_INTENSITY=3 - cmake --build build --config Release --target test_package + 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: @@ -98,8 +134,23 @@ jobs: artifact-out: linux-DG2-JIT-PUBLIC-debug-build artifact-path: ./build/*.tar.gz cmd: | - cmake --preset linux-DG2-JIT-PUBLIC-debug -DCMAKE_BUILD_TYPE=Debug -DEMBREE_TESTING_INTENSITY=3 - cmake --build build --config Debug --target build + 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 @@ -110,13 +161,30 @@ jobs: uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/windows.yml@main with: force-delete: true - runs-on: '[ "Windows", "NAS", "build" ]' + runs-on: '[ "Windows", "build" ]' env-from-files: ./.github/workflows/dpcpp-sycl-nightly.env artifact-out: windows-JIT-build artifact-path: ./build/*.zip cmd: | - cmake --preset windows-DG2-JIT-INTERNAL-L0RTAS -DCMAKE_BUILD_TYPE=Release -DEMBREE_TESTING_INTENSITY=3 - cmake --build build --config Release --target build + $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 @@ -127,8 +195,8 @@ jobs: env-from-files: ./.github/workflows/dpcpp-sycl-nightly.env ./.github/workflows/gfx-windows-public.env artifact-in: windows-JIT-build cmd: | - cmake --preset windows-DG2-JIT-INTERNAL-L0RTAS -DCMAKE_BUILD_TYPE=Release -DEMBREE_TESTING_INTENSITY=3 - cmake --build build --config Release --target test_package + $EmbreeDir = .\\scripts\\prepare-test-files.ps1 -TestType ctest + .\\scripts\\run-tests.ps1 -TestType ctest -EmbreeDir $EmbreeDir -CtestConfig Release windows-BMG-JIT-test: secrets: inherit @@ -139,8 +207,8 @@ jobs: env-from-files: ./.github/workflows/dpcpp-sycl-nightly.env ./.github/workflows/gfx-windows-public.env artifact-in: windows-JIT-build cmd: | - cmake --preset windows-DG2-JIT-INTERNAL-L0RTAS -DCMAKE_BUILD_TYPE=Release -DEMBREE_TESTING_INTENSITY=3 - cmake --build build --config Release --target test_package + $EmbreeDir = .\\scripts\\prepare-test-files.ps1 -TestType ctest + .\\scripts\\run-tests.ps1 -TestType ctest -EmbreeDir $EmbreeDir -CtestConfig Release windows-LNL-JIT-test: secrets: inherit @@ -151,44 +219,75 @@ jobs: env-from-files: ./.github/workflows/dpcpp-sycl-nightly.env ./.github/workflows/gfx-windows-public.env artifact-in: windows-JIT-build cmd: | - cmake --preset windows-DG2-JIT-INTERNAL-L0RTAS -DCMAKE_BUILD_TYPE=Release -DEMBREE_TESTING_INTENSITY=3 - cmake --build build --config Release --target test_package + $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", "NAS", "dg2" ]' + 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: | - cmake --preset windows-DG2-JIT-INTERNAL-L0RTAS -DCMAKE_BUILD_TYPE=Release -DEMBREE_TESTING_INTENSITY=3 - cmake --build build --config Release --target test_package + $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", "NAS", "dg2" ]' + runs-on: '[ "Windows", "build" ]' dpcpp-version: intel/2025.2 - env-from-files: ./.github/workflows/gfx-windows-public.env artifact-out: windows-DG2-JIT-ICX-build artifact-path: ./build/*.zip cmd: | - cmake --preset nightly-windows-DG2-JIT-ICX -DCMAKE_BUILD_TYPE=Release -DEMBREE_TESTING_INTENSITY=3 - cmake --build build --config Release --target build + $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", "NAS", "build" ]' + runs-on: '[ "Windows", "build" ]' env-from-files: ./.github/workflows/dpcpp-sycl-nightly.env cmd: | - cmake --preset windows-DG2-JIT-INTERNAL-L0RTAS-debug -DCMAKE_BUILD_TYPE=Debug -DEMBREE_TESTING_INTENSITY=3 - cmake --build build --config Debug --target build + $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 # ################################################################################ # ################################################################################ @@ -207,9 +306,26 @@ jobs: image: embree/fedora:42 runs-on: '[ "Linux", "docker", "avx512" ]' cmd: | - cmake --preset linux-fedora42-CLANG -DCMAKE_BUILD_TYPE=RelWithDebInfo -DEMBREE_TESTING_INTENSITY=2 - cmake --build build --config RelWithDebInfo --target build - cmake --build build --config RelWithDebInfo --target test_package + 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 @@ -218,9 +334,28 @@ jobs: image: embree/fedora:42 runs-on: '[ "Linux", "docker", "build" ]' cmd: | - cmake --preset linux-fedora42-CLANG-INT-ADDRSANITIZER -DCMAKE_BUILD_TYPE=RelWithDebInfo -DEMBREE_TESTING_INTENSITY=1 - cmake --build build --config RelWithDebInfo --target build - cmake --build build --config RelWithDebInfo --target test_package + 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 @@ -230,9 +365,26 @@ jobs: runs-on: '[ "Linux", "docker", "avx512" ]' dpcpp-version: intel/2025.2 cmd: | - cmake --preset linux-fedora42-ICX -DCMAKE_BUILD_TYPE=RelWithDebInfo -DEMBREE_TESTING_INTENSITY=2 - cmake --build build --config RelWithDebInfo --target build - cmake --build build --config RelWithDebInfo --target test_package + 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 @@ -241,9 +393,24 @@ jobs: image: embree/ubuntu:24.04 runs-on: '[ "Linux", "docker", "avx512" ]' cmd: | - cmake -B build -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=ON -DEMBREE_TESTING_INSTALL_TESTS=ON -DCMAKE_INSTALL_TESTDIR="testing" -DEMBREE_TESTING_INTENSITY=3 - cmake --build build --config Release --target build - cmake --build build --config Release --target test_package + 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 @@ -253,9 +420,26 @@ jobs: runs-on: '[ "Linux", "docker", "avx512" ]' dpcpp-version: intel/2025.2 cmd: | - cmake --preset linux-ubuntu24_04-ICX -DCMAKE_BUILD_TYPE=RelWithDebInfo -DEMBREE_TESTING_INTENSITY=2 - cmake --build build --config RelWithDebInfo --target build - cmake --build build --config RelWithDebInfo --target test_package + 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 @@ -265,25 +449,27 @@ jobs: uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/windows.yml@main with: force-delete: true - runs-on: '[ "Windows", "NAS", "build" ]' - dpcpp-version: none + runs-on: '[ "Windows", "build" ]' + msvc-version: 2019 cmd: | - cmake --preset windows-V142 -D CMAKE_BUILD_TYPE=RelWithDebInfo -D EMBREE_TESTING_INTENSITY=2 - cmake --build build --config RelWithDebInfo --target build - cmake --build build --target test_package - - #TODO: spontaneous build error with icx on windows - #windows-ICX: - # secrets: inherit - # uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/windows.yml@main - # with: - # force-delete: true - # runs-on: '[ "Windows", "NAS", "build", "avx512" ]' - # dpcpp-version: intel/2025.2 - # cmd: | - # cmake --preset windows-ICX -DCMAKE_BUILD_TYPE=RelWithDebInfo -DEMBREE_TESTING_INTENSITY=2 - # cmake --build build --config RelWithDebInfo --target build - # cmake --build build --config RelWithDebInfo --target test_package + $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 @@ -295,9 +481,34 @@ jobs: with: runs-on: '[ "macOS", "build", "arm" ]' cmd: | - cmake --preset macos-ARM-CLANG-NEON-AVX2 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DEMBREE_TESTING_INTENSITY=2 - cmake --build build --config RelWithDebInfo --target build - cmake --build build --config RelWithDebInfo --target test_package + 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 @@ -305,9 +516,34 @@ jobs: with: runs-on: '[ "macOS", "build", "arm" ]' cmd: | - cmake --preset macos-ARM-CLANG-NEON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DEMBREE_TESTING_INTENSITY=2 - cmake --build build --config RelWithDebInfo --target build - cmake --build build --config RelWithDebInfo --target test_package + 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 @@ -315,9 +551,34 @@ jobs: with: runs-on: '[ "macOS", "build", "x86_64" ]' cmd: | - cmake --preset macos-x64-CLANG -DCMAKE_BUILD_TYPE=RelWithDebInfo -DEMBREE_TESTING_INTENSITY=2 - cmake --build build --config RelWithDebInfo --target build - cmake --build build --config RelWithDebInfo --target test_package + 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 @@ -325,9 +586,35 @@ jobs: with: runs-on: '[ "macOS", "build", "arm" ]' cmd: | - cmake --preset macos-ARM-CLANG-NEON-AVX2-UB -DCMAKE_BUILD_TYPE=RelWithDebInfo -DEMBREE_TESTING_INTENSITY=2 -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64" -DEMBREE_BUILD_GLFW_FROM_SOURCE=ON -DEMBREE_ISPC_SUPPORT=OFF - cmake --build build --config RelWithDebInfo --target build - cmake --build build --config RelWithDebInfo --target test_package + 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 @@ -339,8 +626,7 @@ jobs: with: os: Linux project: Embree - submodules: true - prebuild: > - export NAS_LINUX=$STORAGE_PATH/packages/apps && - cmake --preset linux-coverity - build: sh scripts/coverity.sh + prebuild: | + cmake -S superbuild -B build -D EMBREE_EXTRA_OPTIONS="-DCMAKE_BUILD_TYPE=Release -DEMBREE_MAX_ISA=SSE2" + build: | + cmake --build build --config Release diff --git a/.github/workflows/gfx-windows-internal.env b/.github/workflows/gfx-windows-internal.env index 106b063c10..045975e2e1 100644 --- a/.github/workflows/gfx-windows-internal.env +++ b/.github/workflows/gfx-windows-internal.env @@ -1 +1 @@ -GFX_DRIVER_VERSION=gfx-driver-builds/ci/master/gfx-driver-ci-master-18656/artifacts/Windows \ No newline at end of file +GFX_DRIVER_VERSION=gfx-driver-ci-master-20127 \ No newline at end of file diff --git a/.github/workflows/integrate.yml b/.github/workflows/integrate.yml index f2d260224b..c6a6aced71 100644 --- a/.github/workflows/integrate.yml +++ b/.github/workflows/integrate.yml @@ -11,176 +11,6 @@ on: workflow_dispatch: jobs: -##################################################################### -# Integration Tests -#################################################################### - -# TODO: investigate windows integration tests not working -##################################################################### -## Windows -##################################################################### -# integrate-windows-ICX: -# secrets: inherit -# uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/windows.yml@main -# with: -# runs-on: '[ "Windows", "NAS", "build", "avx512" ]' -# artifact-out: integrate-windows-ICX -# artifact-path: ./build/embree-*.zip -# dpcpp-version: oneAPI/compiler/2024.1 -# cmd: | -# cmake --preset integrate-windows-icx -# cmake --build build --config Release --target package -j8 -# cmake --build build --config Release --target post_package -# -# integrate-windows-ICX-test: -# secrets: inherit -# uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/windows.yml@main -# needs: ["integrate-windows-ICX"] -# with: -# runs-on: '[ "Windows", "NAS", "build", "avx512" ]' -# artifact-in: integrate-windows-ICX -# dpcpp-version: oneAPI/compiler/2024.1 -# cmd: | -# cd build -# . ..\tests\integration\test_embree_release\unpack-windows.ps1 -# cd ..\tests\integration\test_embree_release -# cmake --preset test-windows-icx -# cmake --build build --config Release -# .\build\test.exe -# -# -# -# -# -# integrate-windows-v142: -# secrets: inherit -# uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/windows.yml@main -# with: -# runs-on: '[ "Windows", "NAS", "build", "avx512" ]' -# artifact-out: integrate-windows-v142 -# artifact-path: ./build/embree-*.zip -# cmd: | -# cmake --preset integrate-windows-v142 -# cmake --build build --config Release --target package -j8 -# cmake --build build --config Release --target post_package -# -# integrate-windows-v142-test-v142: -# secrets: inherit -# uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/windows.yml@main -# needs: ["integrate-windows-v142"] -# with: -# runs-on: '[ "Windows", "NAS", "build", "avx512" ]' -# artifact-in: integrate-windows-v142 -# cmd: | -# cd build -# . ..\tests\integration\test_embree_release\unpack-windows.ps1 -# cd ..\tests\integration\test_embree_release -# cmake --preset test-windows-v142 -# cmake --build build --config Release -# .\build\Release\test.exe -# -# integrate-windows-v142-test-ICX: -# secrets: inherit -# uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/windows.yml@main -# needs: ["integrate-windows-v142"] -# with: -# runs-on: '[ "Windows", "NAS", "build", "avx512" ]' -# artifact-in: integrate-windows-v142 -# dpcpp-version: oneAPI/compiler/2024.1 -# cmd: | -# cd build -# . ..\tests\integration\test_embree_release\unpack-windows.ps1 -# cd ..\tests\integration\test_embree_release -# cmake --preset test-windows-icx -# cmake --build build --config Release -# .\build\test.exe -# -# -# -# -# -##################################################################### -## Windows STATIC -##################################################################### -# integrate-static-windows-ICX: -# secrets: inherit -# uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/windows.yml@main -# with: -# runs-on: '[ "Windows", "NAS", "build", "avx512" ]' -# artifact-out: integrate-static-windows-ICX -# artifact-path: ./build/embree-*.zip -# dpcpp-version: oneAPI/compiler/2024.1 -# cmd: | -# cmake --preset integrate-static-windows-icx -# cmake --build build --config Release --target package -j8 -# cmake --build build --config Release --target post_package -# -# integrate-static-windows-ICX-test: -# secrets: inherit -# uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/windows.yml@main -# needs: ["integrate-static-windows-ICX"] -# with: -# runs-on: '[ "Windows", "NAS", "build", "avx512" ]' -# artifact-in: integrate-static-windows-ICX -# dpcpp-version: oneAPI/compiler/2024.1 -# cmd: | -# cd build -# . ..\tests\integration\test_embree_release\unpack-windows.ps1 -# cd ..\tests\integration\test_embree_release -# cmake --preset test-windows-icx -# cmake --build build --config Release -# .\build\test.exe -# -# -# -# -# -# integrate-static-windows-v142: -# secrets: inherit -# uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/windows.yml@main -# with: -# runs-on: '[ "Windows", "NAS", "build", "avx512" ]' -# artifact-out: integrate-static-windows-v142 -# artifact-path: ./build/embree-*.zip -# cmd: | -# cmake --preset integrate-windows-v142 -# cmake --build build --config Release --target package -j8 -# cmake --build build --config Release --target post_package -# -# integrate-static-windows-v142-test-v142: -# secrets: inherit -# uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/windows.yml@main -# needs: ["integrate-static-windows-v142"] -# with: -# runs-on: '[ "Windows", "NAS", "build", "avx512" ]' -# artifact-in: integrate-static-windows-v142 -# cmd: | -# cd build -# . ..\tests\integration\test_embree_release\unpack-windows.ps1 -# cd ..\tests\integration\test_embree_release -# cmake --preset test-windows-v142 -# cmake --build build --config Release -# .\build\Release\test.exe -# -# integrate-static-windows-v142-test-ICX: -# secrets: inherit -# uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/windows.yml@main -# needs: ["integrate-static-windows-v142"] -# with: -# runs-on: '[ "Windows", "NAS", "build", "avx512" ]' -# artifact-in: integrate-static-windows-v142 -# dpcpp-version: oneAPI/compiler/2024.1 -# cmd: | -# cd build -# . ..\tests\integration\test_embree_release\unpack-windows.ps1 -# cd ..\tests\integration\test_embree_release -# cmake --preset test-windows-icx -# cmake --build build --config Release -# .\build\test.exe - - - - #################################################################### # Linux @@ -194,8 +24,20 @@ jobs: artifact-out: integrate-linux-GCC artifact-path: ./build/*.tar.gz cmd: | - cmake --preset integrate-linux-gcc -DCMAKE_BUILD_TYPE=Release - cmake --build build --config Release --target build + 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 @@ -206,8 +48,8 @@ jobs: runs-on: '[ "Linux", "docker", "avx512" ]' artifact-in: integrate-linux-GCC cmd: | - cmake --preset integrate-linux-gcc -DCMAKE_BUILD_TYPE=Release -DEMBREE_TESTING_INTEGRATION_PRESET=test-linux-gcc - cmake --build build --config Release --target test_integration + 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 @@ -218,8 +60,8 @@ jobs: runs-on: '[ "Linux", "docker", "avx512" ]' artifact-in: integrate-linux-GCC cmd: | - cmake --preset integrate-linux-gcc -DCMAKE_BUILD_TYPE=Release -DEMBREE_TESTING_INTEGRATION_PRESET=test-linux-clang - cmake --build build --config Release --target test_integration + 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 @@ -231,8 +73,8 @@ jobs: dpcpp-version: intel/2025.2 artifact-in: integrate-linux-GCC cmd: | - cmake --preset integrate-linux-gcc -DCMAKE_BUILD_TYPE=Release -DEMBREE_TESTING_INTEGRATION_PRESET=test-linux-icx - cmake --build build --config Release --target test_integration + 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 @@ -244,8 +86,22 @@ jobs: artifact-out: integrate-linux-ICX artifact-path: ./build/*.tar.gz cmd: | - cmake --preset integrate-linux-icx -DCMAKE_BUILD_TYPE=Release - cmake --build build --config Release --target build + 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 @@ -256,8 +112,8 @@ jobs: runs-on: '[ "Linux", "docker", "avx512" ]' artifact-in: integrate-linux-ICX cmd: | - cmake --preset integrate-linux-gcc -DCMAKE_BUILD_TYPE=Release -DEMBREE_TESTING_INTEGRATION_PRESET=test-linux-gcc - cmake --build build --config Release --target test_integration + 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 @@ -269,8 +125,8 @@ jobs: dpcpp-version: intel/2025.2 artifact-in: integrate-linux-ICX cmd: | - cmake --preset integrate-linux-icx -DCMAKE_BUILD_TYPE=Release -DEMBREE_TESTING_INTEGRATION_PRESET=test-linux-clang - cmake --build build --config Release --target test_integration + 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 @@ -282,13 +138,9 @@ jobs: dpcpp-version: intel/2025.2 artifact-in: integrate-linux-ICX cmd: | - cmake --preset integrate-linux-icx -DCMAKE_BUILD_TYPE=Release -DEMBREE_TESTING_INTEGRATION_PRESET=test-linux-icx - cmake --build build --config Release --target test_integration + 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 @@ -298,8 +150,22 @@ jobs: artifact-out: integrate-static-linux-CLANG artifact-path: ./build/*.tar.gz cmd: | - cmake --preset integrate-static-linux-clang -DCMAKE_BUILD_TYPE=Release - cmake --build build --config Release --target build + 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 @@ -310,8 +176,8 @@ jobs: runs-on: '[ "Linux", "docker", "avx512" ]' artifact-in: integrate-static-linux-CLANG cmd: | - cmake --preset integrate-static-linux-clang -DCMAKE_BUILD_TYPE=Release -DEMBREE_TESTING_INTEGRATION_PRESET=test-linux-gcc - cmake --build build --config Release --target test_integration + 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 @@ -322,8 +188,8 @@ jobs: runs-on: '[ "Linux", "docker", "avx512" ]' artifact-in: integrate-static-linux-CLANG cmd: | - cmake --preset integrate-static-linux-clang -DCMAKE_BUILD_TYPE=Release -DEMBREE_TESTING_INTEGRATION_PRESET=test-linux-clang - cmake --build build --config Release --target test_integration + 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 @@ -335,8 +201,8 @@ jobs: dpcpp-version: intel/2025.2 artifact-in: integrate-static-linux-CLANG cmd: | - cmake --preset integrate-static-linux-clang -DCMAKE_BUILD_TYPE=Release -DEMBREE_TESTING_INTEGRATION_PRESET=test-linux-icx - cmake --build build --config Release --target test_integration + 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 @@ -352,8 +218,20 @@ jobs: artifact-out: integrate-static-linux-GCC artifact-path: ./build/*.tar.gz cmd: | - cmake --preset integrate-static-linux-gcc -DCMAKE_BUILD_TYPE=Release - cmake --build build --config Release --target build + 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 @@ -364,8 +242,8 @@ jobs: runs-on: '[ "Linux", "docker", "avx512" ]' artifact-in: integrate-static-linux-GCC cmd: | - cmake --preset integrate-static-linux-gcc -DCMAKE_BUILD_TYPE=Release -DEMBREE_TESTING_INTEGRATION_PRESET=test-linux-gcc - cmake --build build --config Release --target test_integration + 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 @@ -376,8 +254,8 @@ jobs: runs-on: '[ "Linux", "docker", "avx512" ]' artifact-in: integrate-static-linux-GCC cmd: | - cmake --preset integrate-static-linux-gcc -DCMAKE_BUILD_TYPE=Release -DEMBREE_TESTING_INTEGRATION_PRESET=test-linux-clang - cmake --build build --config Release --target test_integration + 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 @@ -389,8 +267,8 @@ jobs: dpcpp-version: intel/2025.2 artifact-in: integrate-static-linux-GCC cmd: | - cmake --preset integrate-static-linux-gcc -DCMAKE_BUILD_TYPE=Release -DEMBREE_TESTING_INTEGRATION_PRESET=test-linux-icx - cmake --build build --config Release --target test_integration + 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: @@ -403,8 +281,22 @@ jobs: artifact-out: integrate-static-linux-ICX artifact-path: ./build/*.tar.gz cmd: | - cmake --preset integrate-static-linux-icx -DCMAKE_BUILD_TYPE=Release - cmake --build build --config Release --target build + 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 @@ -416,8 +308,8 @@ jobs: dpcpp-version: intel/2025.2 artifact-in: integrate-static-linux-ICX cmd: | - cmake --preset integrate-static-linux-icx -DCMAKE_BUILD_TYPE=Release -DEMBREE_TESTING_INTEGRATION_PRESET=test-linux-gcc - cmake --build build --config Release --target test_integration + 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 @@ -429,8 +321,8 @@ jobs: dpcpp-version: intel/2025.2 artifact-in: integrate-static-linux-ICX cmd: | - cmake --preset integrate-static-linux-icx -DCMAKE_BUILD_TYPE=Release -DEMBREE_TESTING_INTEGRATION_PRESET=test-linux-clang - cmake --build build --config Release --target test_integration + 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 @@ -442,8 +334,8 @@ jobs: dpcpp-version: intel/2025.2 artifact-in: integrate-static-linux-ICX cmd: | - cmake --preset integrate-static-linux-icx -DCMAKE_BUILD_TYPE=Release -DEMBREE_TESTING_INTEGRATION_PRESET=test-linux-icx - cmake --build build --config Release --target test_integration + 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 @@ -454,8 +346,22 @@ jobs: artifact-out: integrate-linux-CLANG artifact-path: ./build/*.tar.gz cmd: | - cmake --preset integrate-linux-clang -DCMAKE_BUILD_TYPE=Release - cmake --build build --config Release --target build + 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 @@ -466,8 +372,8 @@ jobs: runs-on: '[ "Linux", "docker", "avx512" ]' artifact-in: integrate-linux-CLANG cmd: | - cmake --preset integrate-linux-clang -DCMAKE_BUILD_TYPE=Release -DEMBREE_TESTING_INTEGRATION_PRESET=test-linux-gcc - cmake --build build --config Release --target test_integration + 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 @@ -478,8 +384,8 @@ jobs: runs-on: '[ "Linux", "docker", "avx512" ]' artifact-in: integrate-linux-CLANG cmd: | - cmake --preset integrate-linux-clang -DCMAKE_BUILD_TYPE=Release -DEMBREE_TESTING_INTEGRATION_PRESET=test-linux-clang - cmake --build build --config Release --target test_integration + 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 @@ -491,9 +397,8 @@ jobs: dpcpp-version: intel/2025.2 artifact-in: integrate-linux-CLANG cmd: | - cmake --preset integrate-linux-clang -DCMAKE_BUILD_TYPE=Release -DEMBREE_TESTING_INTEGRATION_PRESET=test-linux-icx - cmake --build build --config Release --target test_integration - + 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 @@ -511,8 +416,24 @@ jobs: artifact-out: integrate-sycl-linux-ICX artifact-path: ./build/*.tar.gz cmd: | - cmake --preset integrate-sycl-linux-icx -DCMAKE_BUILD_TYPE=Release - cmake --build build --config Release --target build + 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 @@ -526,8 +447,11 @@ jobs: dpcpp-version: intel/2025.2 artifact-in: integrate-sycl-linux-ICX cmd: | - cmake --preset integrate-sycl-linux-icx -DCMAKE_BUILD_TYPE=Release -DEMBREE_TESTING_INTEGRATION_PRESET=test-linux-icx - cmake --build build --config Release --target test_integration + 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 @@ -539,8 +463,24 @@ jobs: artifact-out: integrate-sycl-linux-DPCPP artifact-path: ./build/*.tar.gz cmd: | - cmake --preset integrate-sycl-linux-dpcpp -DCMAKE_BUILD_TYPE=Release - cmake --build build --config Release --target build + 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 @@ -553,8 +493,11 @@ jobs: env-from-files: ./.github/workflows/dpcpp-sycl-nightly.env ./.github/workflows/gfx-ubuntu24-public.env artifact-in: integrate-sycl-linux-DPCPP cmd: | - cmake --preset integrate-sycl-linux-dpcpp -DCMAKE_BUILD_TYPE=Release -DEMBREE_TESTING_INTEGRATION_PRESET=test-linux-clang - cmake --build build --config Release --target test_integration + 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 @@ -571,9 +514,28 @@ jobs: artifact-out: integrate-macos-GCC artifact-path: ./build/*.zip cmd: | - cmake --preset integrate-macos-gcc -DCMAKE_BUILD_TYPE=Release - cmake --build build --config Release --target build -# cmake --build build --config Release --target post_package_notarize TODO: reactivate this when notarization problems are solved + 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 @@ -583,8 +545,11 @@ jobs: runs-on: '[ "macOS", "build", "x86_64" ]' artifact-in: integrate-macos-GCC cmd: | - cmake --preset integrate-macos-gcc -DCMAKE_BUILD_TYPE=Release -DEMBREE_TESTING_INTEGRATION_PRESET=test-macos-gcc - cmake --build build --config Release --target test_integration + 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 @@ -594,12 +559,12 @@ jobs: runs-on: '[ "macOS", "build", "x86_64" ]' artifact-in: integrate-macos-GCC cmd: | - cmake --preset integrate-macos-gcc -DCMAKE_BUILD_TYPE=Release -DEMBREE_TESTING_INTEGRATION_PRESET=test-macos-clang - cmake --build build --config Release --target test_integration + 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 - - -# TODO: cant find tbb/tbb.h ??? integrate-macos-CLANG: secrets: inherit uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/macos.yml@main @@ -608,9 +573,30 @@ jobs: artifact-out: integrate-macos-CLANG artifact-path: ./build/*.zip cmd: | - cmake --preset integrate-macos-clang -DCMAKE_BUILD_TYPE=Release - cmake --build build --config Release --target build -# cmake --build build --config Release --target post_package_notarize TODO: reactivate this when notarization problems are solved + 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 @@ -620,8 +606,11 @@ jobs: runs-on: '[ "macOS", "build", "x86_64" ]' artifact-in: integrate-macos-CLANG cmd: | - cmake --preset integrate-macos-clang -DCMAKE_BUILD_TYPE=Release -DEMBREE_TESTING_INTEGRATION_PRESET=test-macos-gcc - cmake --build build --config Release --target test_integration + 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 @@ -631,5 +620,8 @@ jobs: runs-on: '[ "macOS", "build", "x86_64" ]' artifact-in: integrate-macos-CLANG cmd: | - cmake --preset integrate-macos-clang -DCMAKE_BUILD_TYPE=Release -DEMBREE_TESTING_INTEGRATION_PRESET=test-macos-clang - cmake --build build --config Release --target test_integration + 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 diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index f54ca6bc9c..0b237d2089 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -11,28 +11,36 @@ on: workflow_dispatch: jobs: - ################################################################################ - ################################################################################ - # GPU tests - ################################################################################ - ############################################################################### - - ######################################## - # Linux - ######################################## nightly-linux-DG2-JIT-MULTILEVEL-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" ]' - project: embree env-from-files: ./.github/workflows/dpcpp-sycl-nightly.env artifact-out: nightly-linux-DG2-JIT-MULTILEVEL-build artifact-path: ./build/*.tar.gz cmd: | - cmake --preset nightly-linux-DG2-JIT-MULTILEVEL -DCMAKE_BUILD_TYPE=Release -DEMBREE_TESTING_INTENSITY=3 - cmake --build build --config Release --target build + 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=SSE2" + opts+=" -DEMBREE_MAX_INSTANCE_LEVEL_COUNT=2" + 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/ nightly-linux-DG2-JIT-MULTILEVEL-test: secrets: inherit @@ -42,12 +50,11 @@ jobs: image: embree/ubuntu:24.04 options: --device=/dev/dri:/dev/dri runs-on: '[ "Linux", "docker", "dg2" ]' - project: embree env-from-files: ./.github/workflows/dpcpp-sycl-nightly.env ./.github/workflows/gfx-ubuntu24-public.env artifact-in: nightly-linux-DG2-JIT-MULTILEVEL-build cmd: | - cmake --preset nightly-linux-DG2-JIT-MULTILEVEL -DCMAKE_BUILD_TYPE=Release -DEMBREE_TESTING_INTENSITY=3 - cmake --build build --config Release --target test_package + EMBREE_PATH=$(./scripts/prepare-test-files.sh --type ctest) + ./scripts/run-tests.sh --type ctest --embree-dir "$EMBREE_PATH" --ctest-config Release nightly-linux-DG2-JIT-PUBLIC-build: secrets: inherit @@ -55,13 +62,29 @@ jobs: with: image: embree/ubuntu:24.04 runs-on: '[ "Linux", "docker", "build" ]' - project: embree env-from-files: ./.github/workflows/dpcpp-sycl-nightly.env artifact-out: nightly-linux-DG2-JIT-PUBLIC-build artifact-path: ./build/*.tar.gz cmd: | - cmake --preset linux-DG2-JIT-PUBLIC -DCMAKE_BUILD_TYPE=Release -DEMBREE_TESTING_INTENSITY=3 - cmake --build build --config Release --target build + 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=SSE2" + 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/ nightly-linux-DG2-JIT-PUBLIC-test: secrets: inherit @@ -71,62 +94,80 @@ jobs: image: embree/ubuntu:24.04 options: --device=/dev/dri:/dev/dri runs-on: '[ "Linux", "docker", "dg2" ]' - project: embree - env-from-files: ./.github/workflows/dpcpp-sycl-nightly.env ./.github/workflows/gfx-ubuntu24-public.env + env-from-files: ./.github/workflows/gfx-ubuntu24-public.env + dpcpp-version: intel-llvm/v6.2.0 artifact-in: nightly-linux-DG2-JIT-PUBLIC-build cmd: | - cmake --preset linux-DG2-JIT-PUBLIC -DCMAKE_BUILD_TYPE=Release -DEMBREE_TESTING_INTENSITY=3 - cmake --build build --config Release --target test_package + EMBREE_PATH=$(./scripts/prepare-test-files.sh --type ctest) + ./scripts/run-tests.sh --type ctest --embree-dir "$EMBREE_PATH" --ctest-config Release nightly-linux-PVC-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" ]' - project: embree - env-from-files: ./.github/workflows/dpcpp-sycl-nightly.env - artifact-out: nightly-linux-PVC-JIT-build - artifact-path: ./build/*.tar.gz - cmd: | - cmake --preset nightly-linux-PVC-JIT -DCMAKE_BUILD_TYPE=Release -DEMBREE_TESTING_INTENSITY=4 - cmake --build build --config Release --target 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: nightly-linux-PVC-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=4" + opts+=" -DEMBREE_SYCL_SUPPORT=ON" + opts+=" -DEMBREE_SYCL_AOT_DEVICES=none" + 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" + 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/ nightly-linux-PVC-JIT-test-1T: - secrets: inherit - uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main - needs: ["nightly-linux-PVC-JIT-build"] - with: - image: embree/ubuntu:24.04 - options: --device=/dev/dri:/dev/dri - runs-on: '[ "Linux", "docker", "pvc" ]' - project: embree - env-from-files: ./.github/workflows/dpcpp-sycl-nightly.env ./.github/workflows/gfx-ubuntu24-public.env - artifact-in: nightly-linux-PVC-JIT-build - cmd: | - export NEOReadDebugKeys=1 - export EnableImplicitScaling=0 - export ZE_FLAT_DEVICE_HIERARCHY=COMPOSITE - cmake --preset nightly-linux-PVC-JIT -DCMAKE_BUILD_TYPE=Release -DEMBREE_TESTING_INTENSITY=4 - cmake --build build --config Release --target test_package + secrets: inherit + uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main + needs: ["nightly-linux-PVC-JIT-build"] + with: + image: embree/ubuntu:24.04 + options: --device=/dev/dri:/dev/dri + runs-on: '[ "Linux", "docker", "pvc" ]' + env-from-files: ./.github/workflows/gfx-ubuntu24-public.env + dpcpp-version: intel-llvm/v6.2.0 + artifact-in: nightly-linux-PVC-JIT-build + cmd: | + export NEOReadDebugKeys=1 + export EnableImplicitScaling=0 + export ZE_FLAT_DEVICE_HIERARCHY=COMPOSITE + + EMBREE_PATH=$(./scripts/prepare-test-files.sh --type ctest) + ./scripts/run-tests.sh --type ctest --embree-dir "$EMBREE_PATH" --ctest-config Release nightly-linux-PVC-JIT-test-2T: - secrets: inherit - uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main - needs: ["nightly-linux-PVC-JIT-build"] - with: - image: embree/ubuntu:24.04 - options: --device=/dev/dri:/dev/dri - runs-on: '[ "Linux", "docker", "pvc" ]' - project: embree - env-from-files: ./.github/workflows/dpcpp-sycl-nightly.env ./.github/workflows/gfx-ubuntu24-public.env - artifact-in: nightly-linux-PVC-JIT-build - cmd: | - export NEOReadDebugKeys=1 - export EnableImplicitScaling=1 - export ZE_FLAT_DEVICE_HIERARCHY=COMPOSITE - cmake --preset nightly-linux-PVC-JIT -DCMAKE_BUILD_TYPE=Release -DEMBREE_TESTING_INTENSITY=4 - cmake --build build --config Release --target test_package + secrets: inherit + uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main + needs: ["nightly-linux-PVC-JIT-build"] + with: + image: embree/ubuntu:24.04 + options: --device=/dev/dri:/dev/dri + runs-on: '[ "Linux", "docker", "pvc" ]' + env-from-files: ./.github/workflows/gfx-ubuntu24-public.env + dpcpp-version: intel-llvm/v6.2.0 + artifact-in: nightly-linux-PVC-JIT-build + cmd: | + export NEOReadDebugKeys=1 + export EnableImplicitScaling=1 + export ZE_FLAT_DEVICE_HIERARCHY=COMPOSITE + + EMBREE_PATH=$(./scripts/prepare-test-files.sh --type ctest) + ./scripts/run-tests.sh --type ctest --embree-dir "$EMBREE_PATH" --ctest-config Release ######################################## # Windows @@ -136,133 +177,159 @@ jobs: secrets: inherit uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/windows.yml@main with: - runs-on: '[ "Windows", "NAS", "build" ]' - project: embree + runs-on: '[ "Windows", "build" ]' dpcpp-version: intel/2025.2 artifact-out: nightly-windows-DG2-JIT-ICX-RC-build artifact-path: ./build/*.zip cmd: | - cmake --preset nightly-windows-DG2-JIT-ICX -DCMAKE_BUILD_TYPE=Release -DEMBREE_TESTING_INTENSITY=2 - cmake --build build --config Release --target build - - nightly-windows-DG2-JIT-NIGHTLY-RK-bulid: + $opts = "-DCMAKE_BUILD_TYPE=Release" + $opts += " -DBUILD_TESTING=ON" + $opts += " -DEMBREE_TUTORIALS=ON" + $opts += " -DEMBREE_ISPC_SUPPORT=ON" + $opts += " -DEMBREE_TESTING_INTENSITY=2" + $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 + + nightly-windows-DG2-JIT-INTELLLVM-bulid: secrets: inherit uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/windows.yml@main with: - runs-on: '[ "Windows", "NAS", "dg2" ]' - project: embree + runs-on: '[ "Windows", "dg2" ]' env-from-files: ./.github/workflows/gfx-windows-public.env dpcpp-version: intel-llvm/v6.2.0 - artifact-out: nightly-windows-DG2-JIT-NIGHTLY-RK-bulid + artifact-out: nightly-windows-DG2-JIT-INTELLLVM-bulid artifact-path: ./build/*.zip cmd: | - cmake --preset nightly-windows-DG2-JIT-NIGHTLY -DCMAKE_BUILD_TYPE=Release -DEMBREE_TESTING_INTENSITY=2 - cmake --build build --config Release --target build - - nightly-windows-DG2-JIT-NIGHTLY-RK-test: + $opts = "-DCMAKE_BUILD_TYPE=Release" + $opts += " -DBUILD_TESTING=ON" + $opts += " -DEMBREE_TUTORIALS=ON" + $opts += " -DEMBREE_ISPC_SUPPORT=ON" + $opts += " -DEMBREE_TESTING_INTENSITY=2" + $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 + + nightly-windows-DG2-JIT-INTELLLVM-test: secrets: inherit uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/windows.yml@main - needs: ["nightly-windows-DG2-JIT-NIGHTLY-RK-bulid"] + needs: ["nightly-windows-DG2-JIT-INTELLLVM-bulid"] with: - runs-on: '[ "Windows", "NAS", "dg2" ]' - project: embree - env-from-files: ./.github/workflows/dpcpp-sycl-nightly.env ./.github/workflows/gfx-windows-public.env + runs-on: '[ "Windows", "dg2" ]' + env-from-files: ./.github/workflows/gfx-windows-public.env dpcpp-version: intel-llvm/v6.2.0 - artifact-in: nightly-windows-DG2-JIT-NIGHTLY-RK-bulid - cmd: | - cmake --preset nightly-windows-DG2-JIT-NIGHTLY -DCMAKE_BUILD_TYPE=Release -DEMBREE_TESTING_INTENSITY=2 - cmake --build build --config Release --target test_package - - #TODO: enable internal driver tests again - #nightly-windows-DG2-JIT-INTERNAL-build: - # secrets: inherit - # uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/windows.yml@main - # with: - # runs-on: '[ "Windows", "NAS", "dg2" ]' - # project: embree - # env-from-files: ./.github/workflows/dpcpp-sycl-nightly.env ./.github/workflows/gfx-windows-internal.env - # artifact-out: nightly-windows-DG2-JIT-INTERNAL-build - # artifact-path: ./build/*.zip - # cmd: | - # cmake --preset nightly-windows-DG2-JIT -DCMAKE_BUILD_TYPE=Release -DEMBREE_TESTING_INTENSITY=4 - # cmake --build build --config Release --target build - - #nightly-windows-DG2-JIT-INTERNAL-test: - # secrets: inherit - # uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/windows.yml@main - # needs: ["nightly-windows-DG2-JIT-INTERNAL-build"] - # with: - # runs-on: '[ "Windows", "NAS", "dg2" ]' - # project: embree - # env-from-files: ./.github/workflows/dpcpp-sycl-nightly.env ./.github/workflows/gfx-windows-internal.env - # artifact-in: nightly-windows-DG2-JIT-INTERNAL-build - # cmd: | - # cmake --preset nightly-windows-DG2-JIT -DCMAKE_BUILD_TYPE=Release -DEMBREE_TESTING_INTENSITY=4 - # cmake --build build --config Release --target test_package + artifact-in: nightly-windows-DG2-JIT-INTELLLVM-bulid + cmd: | + $EmbreeDir = .\scripts\prepare-test-files.ps1 -TestType ctest + .\scripts\run-tests.ps1 -TestType ctest -EmbreeDir $EmbreeDir -CtestConfig Release nightly-windows-DG2-JIT-PUBLIC-build: secrets: inherit uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/windows.yml@main with: - runs-on: '[ "Windows", "NAS", "dg2" ]' - project: embree - env-from-files: ./.github/workflows/dpcpp-sycl-nightly.env ./.github/workflows/gfx-windows-internal.env + runs-on: '[ "Windows", "dg2" ]' + env-from-files: ./.github/workflows/gfx-windows-public.env + dpcpp-version: intel-llvm/v6.2.0 artifact-out: nightly-windows-DG2-JIT-PUBLIC-build artifact-path: ./build/*.zip cmd: | - cmake --preset nightly-windows-DG2-JIT -DCMAKE_BUILD_TYPE=Release -DEMBREE_TESTING_INTENSITY=4 - cmake --build build --config Release --target build - + $opts = "-DCMAKE_BUILD_TYPE=Release" + $opts += " -DBUILD_TESTING=ON" + $opts += " -DEMBREE_TUTORIALS=ON" + $opts += " -DEMBREE_ISPC_SUPPORT=ON" + $opts += " -DEMBREE_TESTING_INTENSITY=4" + $opts += " -DEMBREE_SYCL_SUPPORT=ON" + $opts += " -DEMBREE_SYCL_AOT_DEVICES=none" + $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" + $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 + nightly-windows-DG2-JIT-PUBLIC-test: secrets: inherit uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/windows.yml@main needs: ["nightly-windows-DG2-JIT-PUBLIC-build"] with: - runs-on: '[ "Windows", "NAS", "dg2" ]' - project: embree - env-from-files: ./.github/workflows/dpcpp-sycl-nightly.env ./.github/workflows/gfx-windows-public.env + runs-on: '[ "Windows", "dg2" ]' + env-from-files: ./.github/workflows/gfx-windows-public.env + dpcpp-version: intel-llvm/v6.2.0 artifact-in: nightly-windows-DG2-JIT-PUBLIC-build cmd: | - cmake --preset nightly-windows-DG2-JIT -DCMAKE_BUILD_TYPE=Release -DEMBREE_TESTING_INTENSITY=4 - cmake --build build --config Release --target test_package + $EmbreeDir = .\scripts\prepare-test-files.ps1 -TestType ctest + .\scripts\run-tests.ps1 -TestType ctest -EmbreeDir $EmbreeDir -CtestConfig Release nightly-windows-DG2-MULTILEVEL-build: secrets: inherit uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/windows.yml@main with: - runs-on: '[ "Windows", "NAS", "dg2" ]' - project: embree - env-from-files: ./.github/workflows/dpcpp-sycl-nightly.env ./.github/workflows/gfx-windows-public.env + runs-on: '[ "Windows", "dg2" ]' + env-from-files: ./.github/workflows/dpcpp-sycl-nightly.env artifact-out: nightly-windows-DG2-MULTILEVEL-build artifact-path: ./build/*.zip cmd: | - cmake --preset nightly-windows-DG2-MULTILEVEL -DCMAKE_BUILD_TYPE=Release -DEMBREE_TESTING_INTENSITY=2 - cmake --build build --config Release --target build + $opts = "-DCMAKE_BUILD_TYPE=Release" + $opts += " -DBUILD_TESTING=ON" + $opts += " -DEMBREE_TUTORIALS=ON" + $opts += " -DEMBREE_ISPC_SUPPORT=ON" + $opts += " -DEMBREE_TESTING_INTENSITY=2" + $opts += " -DEMBREE_SYCL_SUPPORT=ON" + $opts += " -DEMBREE_SYCL_AOT_DEVICES=none" + $opts += " -DEMBREE_MAX_ISA=SSE2" + $opts += " -DEMBREE_MAX_INSTANCE_LEVEL_COUNT=2" + $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 nightly-windows-DG2-MULTILEVEL-test: secrets: inherit uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/windows.yml@main needs: ["nightly-windows-DG2-MULTILEVEL-build"] with: - runs-on: '[ "Windows", "NAS", "dg2" ]' - project: embree - env-from-files: ./.github/workflows/dpcpp-sycl-nightly.env ./.github/workflows/gfx-windows-public.env + runs-on: '[ "Windows", "dg2" ]' + env-from-files: ./.github/workflows/gfx-windows-public.env artifact-in: nightly-windows-DG2-MULTILEVEL-build cmd: | - cmake --preset nightly-windows-DG2-MULTILEVEL -DCMAKE_BUILD_TYPE=Release -DEMBREE_TESTING_INTENSITY=2 - cmake --build build --config Release --target test_package - - ################################################################################ - ################################################################################ - # CPU tests - ################################################################################ - ################################################################################ - - ######################################## - # Linux - ######################################## + $EmbreeDir = .\scripts\prepare-test-files.ps1 -TestType ctest + .\scripts\run-tests.ps1 -TestType ctest -EmbreeDir $EmbreeDir -CtestConfig Release - # CLANG nightly-linux-DEBUG-CLANG-SSE2-NAMESPACE: secrets: inherit @@ -270,86 +337,305 @@ jobs: with: image: embree/fedora:42 cmd: | - cmake --preset nightly-linux-DEBUG-CLANG-SSE2-NAMESPACE -DCMAKE_BUILD_TYPE=RelWithDebInfo -DEMBREE_TESTING_INTENSITY=4 - cmake --build build --target build - cmake --build build --target test_package - - nightly-linux-DEBUG-CLANG-ISPC1_14_1-AVX2-INT-ADDRSANITIZER: + opts="-DCMAKE_BUILD_TYPE=RelWithDebInfo" + opts+=" -DBUILD_TESTING=ON" + opts+=" -DEMBREE_TUTORIALS=ON" + opts+=" -DEMBREE_TESTING_INTENSITY=4" + opts+=" -DEMBREE_MAX_ISA=SSE2" + opts+=" -DEMBREE_MAX_INSTANCE_LEVEL_COUNT=8" + opts+=" -DEMBREE_API_NAMESPACE=myembree" + opts+=" -DEMBREE_LIBRARY_NAME=myembree" + 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/ + + # Merge binaries & testing packages + dest="./build/embree-release" + mkdir -p "$dest" + for archive in ./build/*.tar.gz; do + tar -xzf "$archive" -C "$dest" + done + + # Run testing + cd $dest + cmake -S testing -B build + cd build + ctest -C RelWithDebInfo --output-on-failure -VV + + nightly-linux-DEBUG-CLANG-AVX2-INT-ADDRSANITIZER: secrets: inherit uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main with: image: embree/fedora:42 cmd: | - cmake --preset nightly-linux-DEBUG-CLANG-ISPC1_14_1-AVX2-INT-ADDRSANITIZER -DCMAKE_BUILD_TYPE=RelWithDebInfo -DEMBREE_TESTING_INTENSITY=4 - cmake --build build --target build - cmake --build build --target test_package - - nightly-linux-DEBUG-CLANG-ISPC1_16_1-AVX2-TBB2021_9_0-STATIC: + opts="-DCMAKE_BUILD_TYPE=RelWithDebInfo" + opts+=" -DBUILD_TESTING=ON" + opts+=" -DEMBREE_TUTORIALS=ON" + opts+=" -DEMBREE_ISPC_SUPPORT=ON" + opts+=" -DEMBREE_TESTING_INTENSITY=4" + opts+=" -DEMBREE_MAX_ISA=AVX2" + opts+=" -DEMBREE_ADDRESS_SANITIZER=ON" + opts+=" -DEMBREE_TASKING_SYSTEM=INTERNAL" + 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/ + + # Merge binaries & testing packages + dest="./build/embree-release" + mkdir -p "$dest" + for archive in ./build/*.tar.gz; do + tar -xzf "$archive" -C "$dest" + done + + # Run testing + cd $dest + cmake -S testing -B build + cd build + ctest -C RelWithDebInfo --output-on-failure -VV + + nightly-linux-DEBUG-CLANG-AVX2-STATIC: secrets: inherit uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main with: image: embree/fedora:42 cmd: | - cmake --preset nightly-linux-DEBUG-CLANG-ISPC1_16_1-AVX2-TBB2021_9_0-STATIC -DCMAKE_BUILD_TYPE=RelWithDebInfo -DEMBREE_TESTING_INTENSITY=4 - cmake --build build --target build - cmake --build build --target test_package + opts="-DCMAKE_BUILD_TYPE=RelWithDebInfo" + opts+=" -DBUILD_TESTING=ON" + opts+=" -DEMBREE_TUTORIALS=ON" + opts+=" -DEMBREE_ISPC_SUPPORT=ON" + opts+=" -DEMBREE_TESTING_INTENSITY=4" + opts+=" -DEMBREE_MAX_ISA=AVX2" + opts+=" -DEMBREE_CONFIG=frequency_level=simd128" + opts+=" -DEMBREE_STATIC_LIB=ON" + 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++" + + # Turn off superbuild TBB, get TBB from OS package manager to avoid static linking issues + 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/ + + # Merge binaries & testing packages + dest="./build/embree-release" + mkdir -p "$dest" + for archive in ./build/*.tar.gz; do + tar -xzf "$archive" -C "$dest" + done + + # Run testing + cd $dest + cmake -S testing -B build + cd build + ctest -C RelWithDebInfo --output-on-failure -VV # CLANG - nightly-linux-DEBUG-CLANG-ISPC1_16_1-AVX512VL-TBB2020_2: + nightly-linux-DEBUG-CLANG-AVX512: 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: | - cmake --preset nightly-linux-DEBUG-CLANG-ISPC1_16_1-AVX512VL-TBB2020_2 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DEMBREE_TESTING_INTENSITY=3 - cmake --build build --target build - cmake --build build --target test_package - - nightly-linux-DEBUG-GCC-ISPC1_16_1-SSE2-TBB2021_2: + opts="-DCMAKE_BUILD_TYPE=RelWithDebInfo" + 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_CONFIG=frequency_level=simd256" + 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++" + + # Turn off superbuild TBB, get TBB from OS package manager to avoid static linking issues + 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/ + + # Merge binaries & testing packages + dest="./build/embree-release" + mkdir -p "$dest" + for archive in ./build/*.tar.gz; do + tar -xzf "$archive" -C "$dest" + done + + # Run testing + cd $dest + cmake -S testing -B build + cd build + ctest -C RelWithDebInfo --output-on-failure -VV + + nightly-linux-DEBUG-GCC-SSE2: secrets: inherit uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main with: image: embree/fedora:42 cmd: | - cmake --preset nightly-linux-DEBUG-GCC-ISPC1_16_1-SSE2-TBB2021_2 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DEMBREE_TESTING_INTENSITY=4 - cmake --build build --target build - cmake --build build --target test_package - - nightly-linux-DEBUG-GCC-ISPC1_16_1-AVX-TBB2019_9: + opts="-DCMAKE_BUILD_TYPE=RelWithDebInfo" + opts+=" -DBUILD_TESTING=ON" + opts+=" -DEMBREE_TUTORIALS=ON" + opts+=" -DEMBREE_ISPC_SUPPORT=ON" + opts+=" -DEMBREE_TESTING_INTENSITY=4" + 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 -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/ + + # Merge binaries & testing packages + dest="./build/embree-release" + mkdir -p "$dest" + for archive in ./build/*.tar.gz; do + tar -xzf "$archive" -C "$dest" + done + + # Run testing + cd $dest + cmake -S testing -B build + cd build + ctest -C RelWithDebInfo --output-on-failure -VV + + nightly-linux-DEBUG-GCC-AVX: secrets: inherit uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main with: image: embree/fedora:42 cmd: | - cmake --preset nightly-linux-DEBUG-GCC-ISPC1_16_1-AVX-TBB2019_9 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DEMBREE_TESTING_INTENSITY=4 - cmake --build build --target build - cmake --build build --target test_package - - nightly-linux-DEBUG-GCC-ISPC1_17_0-AVX2-TBB2021_2_0: + opts="-DCMAKE_BUILD_TYPE=RelWithDebInfo" + opts+=" -DBUILD_TESTING=ON" + opts+=" -DEMBREE_TUTORIALS=ON" + opts+=" -DEMBREE_ISPC_SUPPORT=ON" + opts+=" -DEMBREE_TESTING_INTENSITY=4" + opts+=" -DEMBREE_MAX_ISA=AVX" + 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 RelWithDebInfo + cmake --build build/embree/build --config RelWithDebInfo --target build + cp build/embree/build/embree-*.tar.gz build/ + + # Merge binaries & testing packages + dest="./build/embree-release" + mkdir -p "$dest" + for archive in ./build/*.tar.gz; do + tar -xzf "$archive" -C "$dest" + done + + # Run testing + cd $dest + cmake -S testing -B build + cd build + ctest -C RelWithDebInfo --output-on-failure -VV + + nightly-linux-DEBUG-GCC-AVX2: secrets: inherit uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main with: image: embree/fedora:42 cmd: | - cmake --preset nightly-linux-DEBUG-GCC-ISPC1_17_0-AVX2-TBB2021_2_0 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DEMBREE_TESTING_INTENSITY=4 - cmake --build build --target build - cmake --build build --target test_package + opts="-DCMAKE_BUILD_TYPE=RelWithDebInfo" + opts+=" -DBUILD_TESTING=ON" + opts+=" -DEMBREE_TUTORIALS=ON" + opts+=" -DEMBREE_ISPC_SUPPORT=ON" + opts+=" -DEMBREE_TESTING_INTENSITY=4" + opts+=" -DEMBREE_MAX_ISA=AVX2" + 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 RelWithDebInfo + cmake --build build/embree/build --config RelWithDebInfo --target build + cp build/embree/build/embree-*.tar.gz build/ + + # Merge binaries & testing packages + dest="./build/embree-release" + mkdir -p "$dest" + for archive in ./build/*.tar.gz; do + tar -xzf "$archive" -C "$dest" + done + + # Run testing + cd $dest + cmake -S testing -B build + cd build + ctest -C RelWithDebInfo --output-on-failure -VV # ICX - nightly-linux-DEBUG-ICX2025_0-ISPC1_16_1-AVX-TBB2019_2: + nightly-linux-DEBUG-ICX-AVX: secrets: inherit uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main with: image: embree/rockylinux:8.7 dpcpp-version: intel/2025.2 cmd: | - cmake --preset nightly-linux-DEBUG-ICX-ISPC1_16_1-AVX-TBB2019_2 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DEMBREE_TESTING_INTENSITY=4 - cmake --build build --target build - cmake --build build --target test_package - - nightly-linux-DEBUG-ICX2025_0-ISPC1_16_1-AVX512VL-TBB2019_2: + opts="-DCMAKE_BUILD_TYPE=RelWithDebInfo" + opts+=" -DBUILD_TESTING=ON" + opts+=" -DEMBREE_TUTORIALS=ON" + opts+=" -DEMBREE_ISPC_SUPPORT=ON" + opts+=" -DEMBREE_TESTING_INTENSITY=4" + opts+=" -DEMBREE_MAX_ISA=AVX" + 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/ + + # Merge binaries & testing packages + dest="./build/embree-release" + mkdir -p "$dest" + for archive in ./build/*.tar.gz; do + tar -xzf "$archive" -C "$dest" + done + + # Run testing + cd $dest + cmake -S testing -B build + cd build + ctest -C RelWithDebInfo --output-on-failure -VV + + nightly-linux-DEBUG-ICX-AVX512-rocky: secrets: inherit uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main with: @@ -357,11 +643,39 @@ jobs: runs-on: '[ "Linux", "docker", "avx512" ]' dpcpp-version: intel/2025.2 cmd: | - cmake --preset nightly-linux-DEBUG-ICX-ISPC1_16_1-AVX512VL-TBB2019_2 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DEMBREE_TESTING_INTENSITY=4 - cmake --build build --target build - cmake --build build --target test_package - - nightly-linux-DEBUG-ICX2025_0-ISPC1_16_1-AVX512-TBB2019_9: + opts="-DCMAKE_BUILD_TYPE=RelWithDebInfo" + opts+=" -DBUILD_TESTING=ON" + opts+=" -DEMBREE_TUTORIALS=ON" + opts+=" -DEMBREE_ISPC_SUPPORT=ON" + opts+=" -DEMBREE_TESTING_INTENSITY=4" + opts+=" -DEMBREE_MAX_ISA=AVX512" + opts+=" -DEMBREE_CONFIG=frequency_level=simd256" + 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/ + + # Merge binaries & testing packages + dest="./build/embree-release" + mkdir -p "$dest" + for archive in ./build/*.tar.gz; do + tar -xzf "$archive" -C "$dest" + done + + # Run testing + cd $dest + cmake -S testing -B build + cd build + ctest -C RelWithDebInfo --output-on-failure -VV + + nightly-linux-DEBUG-ICX-AVX512-fedora: secrets: inherit uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main with: @@ -369,33 +683,115 @@ jobs: runs-on: '[ "Linux", "docker", "avx512" ]' dpcpp-version: intel/2025.2 cmd: | - cmake --preset nightly-linux-DEBUG-ICX-ISPC1_16_1-AVX512-TBB2019_9 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DEMBREE_TESTING_INTENSITY=4 - cmake --build build --target build - cmake --build build --target test_package - - nightly-linux-DEBUG-ICX2025_0-ISPC1_16_1-AVX2-TBB2021_2_0: + opts="-DCMAKE_BUILD_TYPE=RelWithDebInfo" + opts+=" -DBUILD_TESTING=ON" + opts+=" -DEMBREE_TUTORIALS=ON" + opts+=" -DEMBREE_ISPC_SUPPORT=ON" + opts+=" -DEMBREE_TESTING_INTENSITY=4" + opts+=" -DEMBREE_MAX_ISA=AVX512" + opts+=" -DEMBREE_CONFIG=frequency_level=simd256" + 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/ + + # Merge binaries & testing packages + dest="./build/embree-release" + mkdir -p "$dest" + for archive in ./build/*.tar.gz; do + tar -xzf "$archive" -C "$dest" + done + + # Run testing + cd $dest + cmake -S testing -B build + cd build + ctest -C RelWithDebInfo --output-on-failure -VV + + nightly-linux-DEBUG-ICX-AVX2-fedora: secrets: inherit uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main with: image: embree/fedora:42 dpcpp-version: intel/2025.2 cmd: | - cmake --preset nightly-linux-DEBUG-ICX-ISPC1_16_1-AVX2-TBB2021_2_0 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DEMBREE_TESTING_INTENSITY=4 - cmake --build build --target build - cmake --build build --target test_package - - nightly-linux-DEBUG-ICX2025_0-ISPC1_17_0-AVX2-TBB2019_9: + opts="-DCMAKE_BUILD_TYPE=RelWithDebInfo" + opts+=" -DBUILD_TESTING=ON" + opts+=" -DEMBREE_TUTORIALS=ON" + opts+=" -DEMBREE_ISPC_SUPPORT=ON" + opts+=" -DEMBREE_TESTING_INTENSITY=4" + opts+=" -DEMBREE_MAX_ISA=AVX2" + 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/ + + # Merge binaries & testing packages + dest="./build/embree-release" + mkdir -p "$dest" + for archive in ./build/*.tar.gz; do + tar -xzf "$archive" -C "$dest" + done + + # Run testing + cd $dest + cmake -S testing -B build + cd build + ctest -C RelWithDebInfo --output-on-failure -VV + + nightly-linux-DEBUG-ICX-AVX2-rocky: secrets: inherit uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main with: image: embree/rockylinux:8.7 dpcpp-version: intel/2025.2 cmd: | - cmake --preset nightly-linux-DEBUG-ICX-ISPC1_17_0-AVX2-TBB2019_9 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DEMBREE_TESTING_INTENSITY=4 - cmake --build build --target build - cmake --build build --target test_package - - nightly-linux-DEBUG-ICX2025_0-ISPC1_17_0-AVX512VL-TBB2021_5_0: + opts="-DCMAKE_BUILD_TYPE=RelWithDebInfo" + opts+=" -DBUILD_TESTING=ON" + opts+=" -DEMBREE_TUTORIALS=ON" + opts+=" -DEMBREE_ISPC_SUPPORT=ON" + opts+=" -DEMBREE_TESTING_INTENSITY=4" + opts+=" -DEMBREE_MAX_ISA=AVX2" + 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/ + + # Merge binaries & testing packages + dest="./build/embree-release" + mkdir -p "$dest" + for archive in ./build/*.tar.gz; do + tar -xzf "$archive" -C "$dest" + done + + # Run testing + cd $dest + cmake -S testing -B build + cd build + ctest -C RelWithDebInfo --output-on-failure -VV + + nightly-linux-DEBUG-ICX-AVX512-ubuntu: secrets: inherit uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main with: @@ -403,9 +799,37 @@ jobs: runs-on: '[ "Linux", "docker", "avx512" ]' dpcpp-version: intel/2025.2 cmd: | - cmake --preset nightly-linux-DEBUG-ICX-ISPC1_17_0-AVX512VL-TBB2021_5_0 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DEMBREE_TESTING_INTENSITY=2 - cmake --build build --target build - cmake --build build --target test_package + 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_CONFIG=frequency_level=simd256" + 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/ + + # Merge binaries & testing packages + dest="./build/embree-release" + mkdir -p "$dest" + for archive in ./build/*.tar.gz; do + tar -xzf "$archive" -C "$dest" + done + + # Run testing + cd $dest + cmake -S testing -B build + cd build + ctest -C RelWithDebInfo --output-on-failure -VV # Testing different distros @@ -416,22 +840,81 @@ jobs: image: embree/fedora:42 runs-on: '[ "Linux", "docker", "avx512" ]' cmd: | - cmake --preset nightly-distrotest-AVX512 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DEMBREE_TESTING_INTENSITY=2 - cmake --build build --target build - cmake --build build --target test_package - + 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" + + 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/ + + # Merge binaries & testing packages + dest="./build/embree-release" + mkdir -p "$dest" + for archive in ./build/*.tar.gz; do + tar -xzf "$archive" -C "$dest" + done + + # Run testing + cd $dest + cmake -S testing -B build + cd build + ctest -C RelWithDebInfo --output-on-failure -VV # Testing single primitive types - nightly-linux-DEBUG-CLANG-TRI: secrets: inherit uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main with: image: embree/fedora:42 cmd: | - cmake --preset nightly-singleprimitive-TRI -DCMAKE_BUILD_TYPE=RelWithDebInfo -DEMBREE_TESTING_INTENSITY=1 - cmake --build build --target build - cmake --build build --target test_package + 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=AVX2" + opts+=" -DEMBREE_GEOMETRY_TRIANGLE=ON" + opts+=" -DEMBREE_GEOMETRY_QUAD=OFF" + opts+=" -DEMBREE_GEOMETRY_GRID=OFF" + opts+=" -DEMBREE_GEOMETRY_CURVE=OFF" + opts+=" -DEMBREE_GEOMETRY_POINT=OFF" + opts+=" -DEMBREE_GEOMETRY_SUBDIVISION=OFF" + opts+=" -DEMBREE_GEOMETRY_USER=OFF" + opts+=" -DEMBREE_GEOMETRY_INSTANCE=OFF" + opts+=" -DEMBREE_GEOMETRY_INSTANCE_ARRAY=OFF" + 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/ + + # Merge binaries & testing packages + dest="./build/embree-release" + mkdir -p "$dest" + for archive in ./build/*.tar.gz; do + tar -xzf "$archive" -C "$dest" + done + + # Run testing + cd $dest + cmake -S testing -B build + cd build + ctest -C RelWithDebInfo --output-on-failure -VV nightly-linux-DEBUG-CLANG-QUAD: secrets: inherit @@ -439,9 +922,45 @@ jobs: with: image: embree/fedora:42 cmd: | - cmake --preset nightly-singleprimitive-QUAD -DCMAKE_BUILD_TYPE=RelWithDebInfo -DEMBREE_TESTING_INTENSITY=1 - cmake --build build --target build - cmake --build build --target test_package + 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=AVX2" + opts+=" -DEMBREE_GEOMETRY_TRIANGLE=OFF" + opts+=" -DEMBREE_GEOMETRY_QUAD=ON" + opts+=" -DEMBREE_GEOMETRY_GRID=OFF" + opts+=" -DEMBREE_GEOMETRY_CURVE=OFF" + opts+=" -DEMBREE_GEOMETRY_POINT=OFF" + opts+=" -DEMBREE_GEOMETRY_SUBDIVISION=OFF" + opts+=" -DEMBREE_GEOMETRY_USER=OFF" + opts+=" -DEMBREE_GEOMETRY_INSTANCE=OFF" + opts+=" -DEMBREE_GEOMETRY_INSTANCE_ARRAY=OFF" + 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/ + + # Merge binaries & testing packages + dest="./build/embree-release" + mkdir -p "$dest" + for archive in ./build/*.tar.gz; do + tar -xzf "$archive" -C "$dest" + done + + # Run testing + cd $dest + cmake -S testing -B build + cd build + ctest -C RelWithDebInfo --output-on-failure -VV nightly-linux-DEBUG-CLANG-GRID: secrets: inherit @@ -449,9 +968,45 @@ jobs: with: image: embree/fedora:42 cmd: | - cmake --preset nightly-singleprimitive-GRID -DCMAKE_BUILD_TYPE=RelWithDebInfo -DEMBREE_TESTING_INTENSITY=1 - cmake --build build --target build - cmake --build build --target test_package + 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=AVX2" + opts+=" -DEMBREE_GEOMETRY_TRIANGLE=ON" + opts+=" -DEMBREE_GEOMETRY_QUAD=OFF" + opts+=" -DEMBREE_GEOMETRY_GRID=ON" + opts+=" -DEMBREE_GEOMETRY_CURVE=OFF" + opts+=" -DEMBREE_GEOMETRY_POINT=OFF" + opts+=" -DEMBREE_GEOMETRY_SUBDIVISION=ON" + opts+=" -DEMBREE_GEOMETRY_USER=OFF" + opts+=" -DEMBREE_GEOMETRY_INSTANCE=OFF" + opts+=" -DEMBREE_GEOMETRY_INSTANCE_ARRAY=OFF" + 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/ + + # Merge binaries & testing packages + dest="./build/embree-release" + mkdir -p "$dest" + for archive in ./build/*.tar.gz; do + tar -xzf "$archive" -C "$dest" + done + + # Run testing + cd $dest + cmake -S testing -B build + cd build + ctest -C RelWithDebInfo --output-on-failure -VV nightly-linux-DEBUG-CLANG-CURVE: secrets: inherit @@ -459,9 +1014,45 @@ jobs: with: image: embree/fedora:42 cmd: | - cmake --preset nightly-singleprimitive-CURVE -DCMAKE_BUILD_TYPE=RelWithDebInfo -DEMBREE_TESTING_INTENSITY=1 - cmake --build build --target build - cmake --build build --target test_package + 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=AVX2" + opts+=" -DEMBREE_GEOMETRY_TRIANGLE=ON" + opts+=" -DEMBREE_GEOMETRY_QUAD=OFF" + opts+=" -DEMBREE_GEOMETRY_GRID=OFF" + opts+=" -DEMBREE_GEOMETRY_CURVE=ON" + opts+=" -DEMBREE_GEOMETRY_POINT=OFF" + opts+=" -DEMBREE_GEOMETRY_SUBDIVISION=OFF" + opts+=" -DEMBREE_GEOMETRY_USER=OFF" + opts+=" -DEMBREE_GEOMETRY_INSTANCE=OFF" + opts+=" -DEMBREE_GEOMETRY_INSTANCE_ARRAY=OFF" + 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/ + + # Merge binaries & testing packages + dest="./build/embree-release" + mkdir -p "$dest" + for archive in ./build/*.tar.gz; do + tar -xzf "$archive" -C "$dest" + done + + # Run testing + cd $dest + cmake -S testing -B build + cd build + ctest -C RelWithDebInfo --output-on-failure -VV nightly-linux-DEBUG-CLANG-SUBDIV: secrets: inherit @@ -469,9 +1060,45 @@ jobs: with: image: embree/fedora:42 cmd: | - cmake --preset nightly-singleprimitive-SUBDIV -DCMAKE_BUILD_TYPE=RelWithDebInfo -DEMBREE_TESTING_INTENSITY=1 - cmake --build build --target build - cmake --build build --target test_package + 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=AVX2" + opts+=" -DEMBREE_GEOMETRY_TRIANGLE=ON" + opts+=" -DEMBREE_GEOMETRY_QUAD=OFF" + opts+=" -DEMBREE_GEOMETRY_GRID=OFF" + opts+=" -DEMBREE_GEOMETRY_CURVE=OFF" + opts+=" -DEMBREE_GEOMETRY_POINT=OFF" + opts+=" -DEMBREE_GEOMETRY_SUBDIVISION=ON" + opts+=" -DEMBREE_GEOMETRY_USER=OFF" + opts+=" -DEMBREE_GEOMETRY_INSTANCE=OFF" + opts+=" -DEMBREE_GEOMETRY_INSTANCE_ARRAY=OFF" + 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/ + + # Merge binaries & testing packages + dest="./build/embree-release" + mkdir -p "$dest" + for archive in ./build/*.tar.gz; do + tar -xzf "$archive" -C "$dest" + done + + # Run testing + cd $dest + cmake -S testing -B build + cd build + ctest -C RelWithDebInfo --output-on-failure -VV nightly-linux-DEBUG-CLANG-USERGEOM: secrets: inherit @@ -479,9 +1106,45 @@ jobs: with: image: embree/fedora:42 cmd: | - cmake --preset nightly-singleprimitive-USERGEOM -DCMAKE_BUILD_TYPE=RelWithDebInfo -DEMBREE_TESTING_INTENSITY=1 - cmake --build build --target build - cmake --build build --target test_package + 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=AVX2" + opts+=" -DEMBREE_GEOMETRY_TRIANGLE=ON" + opts+=" -DEMBREE_GEOMETRY_QUAD=OFF" + opts+=" -DEMBREE_GEOMETRY_GRID=OFF" + opts+=" -DEMBREE_GEOMETRY_CURVE=OFF" + opts+=" -DEMBREE_GEOMETRY_POINT=OFF" + opts+=" -DEMBREE_GEOMETRY_SUBDIVISION=OFF" + opts+=" -DEMBREE_GEOMETRY_USER=ON" + opts+=" -DEMBREE_GEOMETRY_INSTANCE=OFF" + opts+=" -DEMBREE_GEOMETRY_INSTANCE_ARRAY=OFF" + 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/ + + # Merge binaries & testing packages + dest="./build/embree-release" + mkdir -p "$dest" + for archive in ./build/*.tar.gz; do + tar -xzf "$archive" -C "$dest" + done + + # Run testing + cd $dest + cmake -S testing -B build + cd build + ctest -C RelWithDebInfo --output-on-failure -VV nightly-linux-DEBUG-CLANG-INSTANCE: secrets: inherit @@ -489,9 +1152,45 @@ jobs: with: image: embree/fedora:42 cmd: | - cmake --preset nightly-singleprimitive-INSTANCE -DCMAKE_BUILD_TYPE=RelWithDebInfo -DEMBREE_TESTING_INTENSITY=1 - cmake --build build --target build - cmake --build build --target test_package + 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=AVX2" + opts+=" -DEMBREE_GEOMETRY_TRIANGLE=ON" + opts+=" -DEMBREE_GEOMETRY_QUAD=OFF" + opts+=" -DEMBREE_GEOMETRY_GRID=OFF" + opts+=" -DEMBREE_GEOMETRY_CURVE=OFF" + opts+=" -DEMBREE_GEOMETRY_POINT=OFF" + opts+=" -DEMBREE_GEOMETRY_SUBDIVISION=OFF" + opts+=" -DEMBREE_GEOMETRY_USER=OFF" + opts+=" -DEMBREE_GEOMETRY_INSTANCE=ON" + opts+=" -DEMBREE_GEOMETRY_INSTANCE_ARRAY=OFF" + 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/ + + # Merge binaries & testing packages + dest="./build/embree-release" + mkdir -p "$dest" + for archive in ./build/*.tar.gz; do + tar -xzf "$archive" -C "$dest" + done + + # Run testing + cd $dest + cmake -S testing -B build + cd build + ctest -C RelWithDebInfo --output-on-failure -VV nightly-linux-Debug-CLANG-INSTANCE_ARRAY: secrets: inherit @@ -499,9 +1198,45 @@ jobs: with: image: embree/fedora:42 cmd: | - cmake --preset nightly-singleprimitive-INSTANCE_ARRAY -DCMAKE_BUILD_TYPE=RelWithDebInfo -DEMBREE_TESTING_INTENSITY=1 - cmake --build build --target build - cmake --build build --target test_package + 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=AVX2" + opts+=" -DEMBREE_GEOMETRY_TRIANGLE=ON" + opts+=" -DEMBREE_GEOMETRY_QUAD=OFF" + opts+=" -DEMBREE_GEOMETRY_GRID=OFF" + opts+=" -DEMBREE_GEOMETRY_CURVE=OFF" + opts+=" -DEMBREE_GEOMETRY_POINT=OFF" + opts+=" -DEMBREE_GEOMETRY_SUBDIVISION=OFF" + opts+=" -DEMBREE_GEOMETRY_USER=OFF" + opts+=" -DEMBREE_GEOMETRY_INSTANCE=OFF" + opts+=" -DEMBREE_GEOMETRY_INSTANCE_ARRAY=ON" + 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/ + + # Merge binaries & testing packages + dest="./build/embree-release" + mkdir -p "$dest" + for archive in ./build/*.tar.gz; do + tar -xzf "$archive" -C "$dest" + done + + # Run testing + cd $dest + cmake -S testing -B build + cd build + ctest -C RelWithDebInfo --output-on-failure -VV nightly-linux-DEBUG-CLANG-INSTANCE-INSTANCE_ARRAY: secrets: inherit @@ -509,9 +1244,45 @@ jobs: with: image: embree/fedora:42 cmd: | - cmake --preset nightly-singleprimitive-INSTANCE-INSTANCE_ARRAY -DCMAKE_BUILD_TYPE=RelWithDebInfo -DEMBREE_TESTING_INTENSITY=1 - cmake --build build --target build - cmake --build build --target test_package + 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=AVX2" + opts+=" -DEMBREE_GEOMETRY_TRIANGLE=ON" + opts+=" -DEMBREE_GEOMETRY_QUAD=OFF" + opts+=" -DEMBREE_GEOMETRY_GRID=OFF" + opts+=" -DEMBREE_GEOMETRY_CURVE=OFF" + opts+=" -DEMBREE_GEOMETRY_POINT=OFF" + opts+=" -DEMBREE_GEOMETRY_SUBDIVISION=OFF" + opts+=" -DEMBREE_GEOMETRY_USER=OFF" + opts+=" -DEMBREE_GEOMETRY_INSTANCE=ON" + opts+=" -DEMBREE_GEOMETRY_INSTANCE_ARRAY=ON" + 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/ + + # Merge binaries & testing packages + dest="./build/embree-release" + mkdir -p "$dest" + for archive in ./build/*.tar.gz; do + tar -xzf "$archive" -C "$dest" + done + + # Run testing + cd $dest + cmake -S testing -B build + cd build + ctest -C RelWithDebInfo --output-on-failure -VV # Compilation test of disabled features # just building - not running tests for this @@ -521,9 +1292,35 @@ jobs: with: image: embree/fedora:42 cmd: | - cmake --preset nightly-linux-feature-NO_ISPC -DCMAKE_BUILD_TYPE=RelWithDebInfo -DEMBREE_TESTING_INTENSITY=1 - cmake --build build --target build - cmake --build build --target test_package + opts="-DCMAKE_BUILD_TYPE=RelWithDebInfo" + opts+=" -DBUILD_TESTING=ON" + opts+=" -DEMBREE_TUTORIALS=ON" + opts+=" -DEMBREE_TESTING_INTENSITY=1" + opts+=" -DEMBREE_MAX_ISA=AVX2" + 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/ + + # Merge binaries & testing packages + dest="./build/embree-release" + mkdir -p "$dest" + for archive in ./build/*.tar.gz; do + tar -xzf "$archive" -C "$dest" + done + + # Run testing + cd $dest + cmake -S testing -B build + cd build + ctest -C RelWithDebInfo --output-on-failure -VV nightly-linux-feature-NO_TUTORIALS: secrets: inherit @@ -531,8 +1328,21 @@ jobs: with: image: embree/fedora:42 cmd: | - cmake --preset nightly-linux-feature-NO_TUTORIALS -DCMAKE_BUILD_TYPE=RelWithDebInfo - cmake --build build --target build + opts="-DCMAKE_BUILD_TYPE=RelWithDebInfo" + opts+=" -DBUILD_TESTING=ON" + opts+=" -DEMBREE_TUTORIALS=OFF" + opts+=" -DEMBREE_ISPC_SUPPORT=ON" + opts+=" -DEMBREE_MAX_ISA=AVX2" + 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 nightly-linux-feature-BACKFACECULLING: secrets: inherit @@ -540,8 +1350,23 @@ jobs: with: image: embree/fedora:42 cmd: | - cmake --preset nightly-linux-feature-BACKFACECULLING -DCMAKE_BUILD_TYPE=RelWithDebInfo -DEMBREE_TESTING_INTENSITY=1 - cmake --build build --target build + 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=AVX2" + opts+=" -DEMBREE_BACKFACE_CULLING=ON" + 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 nightly-linux-feature-IGNORE-INVALID-RAYS: secrets: inherit @@ -549,8 +1374,23 @@ jobs: with: image: embree/fedora:42 cmd: | - cmake --preset nightly-linux-feature-IGNORE-INVALID-RAYS -DCMAKE_BUILD_TYPE=RelWithDebInfo -DEMBREE_TESTING_INTENSITY=1 - cmake --build build --target build + 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=AVX2" + opts+=" -DEMBREE_BACKFACE_CULLING=IGNORE_INVALID_RAYS" + 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 nightly-linux-feature-NO-FILTER-FUNCTION: secrets: inherit @@ -558,8 +1398,23 @@ jobs: with: image: embree/fedora:42 cmd: | - cmake --preset nightly-linux-feature-NO-FILTER-FUNCTION -DCMAKE_BUILD_TYPE=RelWithDebInfo -DEMBREE_TESTING_INTENSITY=1 - cmake --build build --target build + 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=AVX2" + opts+=" -DEMBREE_FILTER_FUNCTION=OFF" + 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 nightly-linux-feature-RAYMASKS: secrets: inherit @@ -567,9 +1422,37 @@ jobs: with: image: embree/fedora:42 cmd: | - cmake --preset nightly-linux-feature-RAYMASKS -DCMAKE_BUILD_TYPE=RelWithDebInfo -DEMBREE_TESTING_INTENSITY=1 - cmake --build build --target build - cmake --build build --target test_package + 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=AVX2" + opts+=" -DEMBREE_RAY_MASK=ON" + 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/ + + # Merge binaries & testing packages + dest="./build/embree-release" + mkdir -p "$dest" + for archive in ./build/*.tar.gz; do + tar -xzf "$archive" -C "$dest" + done + + # Run testing + cd $dest + cmake -S testing -B build + cd build + ctest -C RelWithDebInfo --output-on-failure -VV nightly-linux-feature-NO-PACKETS: secrets: inherit @@ -577,8 +1460,23 @@ jobs: with: image: embree/fedora:42 cmd: | - cmake --preset nightly-linux-feature-NO-PACKETS -DCMAKE_BUILD_TYPE=RelWithDebInfo -DEMBREE_TESTING_INTENSITY=1 - cmake --build build --target build + 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=AVX2" + opts+=" -DEMBREE_RAY_PACKETS=OFF" + 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 nightly-linux-feature-STATCOUNTER: secrets: inherit @@ -586,9 +1484,37 @@ jobs: with: image: embree/fedora:42 cmd: | - cmake --preset nightly-linux-feature-STATCOUNTER -DCMAKE_BUILD_TYPE=RelWithDebInfo -DEMBREE_TESTING_INTENSITY=1 - cmake --build build --target build - cmake --build build --target test_package + 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=AVX2" + opts+=" -DEMBREE_STAT_COUNTERS=ON" + 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/ + + # Merge binaries & testing packages + dest="./build/embree-release" + mkdir -p "$dest" + for archive in ./build/*.tar.gz; do + tar -xzf "$archive" -C "$dest" + done + + # Run testing + cd $dest + cmake -S testing -B build + cd build + ctest -C RelWithDebInfo --output-on-failure -VV # Compilation test of individual ISAs @@ -598,9 +1524,40 @@ jobs: with: image: embree/fedora:42 cmd: | - cmake --preset nightly-linux-individualisa-SSE2 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DEMBREE_TESTING_INTENSITY=1 - cmake --build build --target build - cmake --build build --target test_package + 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_ISA_SSE2=ON" + opts+=" -DEMBREE_ISA_SSE42=OFF" + opts+=" -DEMBREE_ISA_AVX=OFF" + opts+=" -DEMBREE_ISA_AVX2=OFF" + opts+=" -DEMBREE_ISA_AVX512=OFF" + 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/ + + # Merge binaries & testing packages + dest="./build/embree-release" + mkdir -p "$dest" + for archive in ./build/*.tar.gz; do + tar -xzf "$archive" -C "$dest" + done + + # Run testing + cd $dest + cmake -S testing -B build + cd build + ctest -C RelWithDebInfo --output-on-failure -VV nightly-linux-individualisa-SSE42: secrets: inherit @@ -608,9 +1565,40 @@ jobs: with: image: embree/fedora:42 cmd: | - cmake --preset nightly-linux-individualisa-SSE42 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DEMBREE_TESTING_INTENSITY=1 - cmake --build build --target build - cmake --build build --target test_package + 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_ISA_SSE2=OFF" + opts+=" -DEMBREE_ISA_SSE42=ON" + opts+=" -DEMBREE_ISA_AVX=OFF" + opts+=" -DEMBREE_ISA_AVX2=OFF" + opts+=" -DEMBREE_ISA_AVX512=OFF" + 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/ + + # Merge binaries & testing packages + dest="./build/embree-release" + mkdir -p "$dest" + for archive in ./build/*.tar.gz; do + tar -xzf "$archive" -C "$dest" + done + + # Run testing + cd $dest + cmake -S testing -B build + cd build + ctest -C RelWithDebInfo --output-on-failure -VV nightly-linux-individualisa-AVX: secrets: inherit @@ -618,9 +1606,40 @@ jobs: with: image: embree/fedora:42 cmd: | - cmake --preset nightly-linux-individualisa-AVX -DCMAKE_BUILD_TYPE=RelWithDebInfo -DEMBREE_TESTING_INTENSITY=1 - cmake --build build --target build - cmake --build build --target test_package + 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_ISA_SSE2=OFF" + opts+=" -DEMBREE_ISA_SSE42=OFF" + opts+=" -DEMBREE_ISA_AVX=ON" + opts+=" -DEMBREE_ISA_AVX2=OFF" + opts+=" -DEMBREE_ISA_AVX512=OFF" + 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/ + + # Merge binaries & testing packages + dest="./build/embree-release" + mkdir -p "$dest" + for archive in ./build/*.tar.gz; do + tar -xzf "$archive" -C "$dest" + done + + # Run testing + cd $dest + cmake -S testing -B build + cd build + ctest -C RelWithDebInfo --output-on-failure -VV nightly-linux-individualisa-AVX2: secrets: inherit @@ -628,9 +1647,40 @@ jobs: with: image: embree/fedora:42 cmd: | - cmake --preset nightly-linux-individualisa-AVX2 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DEMBREE_TESTING_INTENSITY=1 - cmake --build build --target build - cmake --build build --target test_package + 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_ISA_SSE2=OFF" + opts+=" -DEMBREE_ISA_SSE42=OFF" + opts+=" -DEMBREE_ISA_AVX=OFF" + opts+=" -DEMBREE_ISA_AVX2=ON" + opts+=" -DEMBREE_ISA_AVX512=OFF" + 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/ + + # Merge binaries & testing packages + dest="./build/embree-release" + mkdir -p "$dest" + for archive in ./build/*.tar.gz; do + tar -xzf "$archive" -C "$dest" + done + + # Run testing + cd $dest + cmake -S testing -B build + cd build + ctest -C RelWithDebInfo --output-on-failure -VV nightly-linux-individualisa-AVX512: secrets: inherit @@ -638,54 +1688,139 @@ jobs: with: image: embree/fedora:42 cmd: | - cmake --preset nightly-linux-individualisa-AVX512 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DEMBREE_TESTING_INTENSITY=1 - cmake --build build --target build - cmake --build build --target test_package - - + 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_ISA_SSE2=OFF" + opts+=" -DEMBREE_ISA_SSE42=OFF" + opts+=" -DEMBREE_ISA_AVX=OFF" + opts+=" -DEMBREE_ISA_AVX2=OFF" + opts+=" -DEMBREE_ISA_AVX512=ON" + 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/ + + # Merge binaries & testing packages + dest="./build/embree-release" + mkdir -p "$dest" + for archive in ./build/*.tar.gz; do + tar -xzf "$archive" -C "$dest" + done + + # Run testing + cd $dest + cmake -S testing -B build + cd build + ctest -C RelWithDebInfo --output-on-failure -VV -######################################## -# Windows -######################################## - - - ######################################## - # MacOS - ######################################## - -# nightly-macosx-ARM-NEON: -# secrets: inherit -# uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/macos.yml@main -# with: -# runs-on: '[ "macOS", "arm", "build" ]' -# cmd: | -# cmake --preset nightly-macosx-ARM-NEON -D EMBREE_TESTING_INTENSITY=2 -# cmake --build build --target package -j8 -# cd build -# ctest -VV - nightly-macosx-x64: secrets: inherit uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/macos.yml@main with: runs-on: '[ "macOS", "build", "x86_64" ]' cmd: | - cmake --preset nightly-macosx-x64 -DCMAKE_BUILD_TYPE=Release -DEMBREE_TESTING_INTENSITY=2 - cmake --build build --target build - cmake --build build --target test_package + opts="-DCMAKE_BUILD_TYPE=Release" + 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 Release + cmake --build build/embree/build --config Release --target build + cp build/embree/build/embree-*.zip build/ + + # Merge binaries & testing packages + dest="./build/embree-release" + mkdir -p "$dest" + for archive in ./build/*.zip; do + unzip -o "$archive" -d "$dest" + done + + # Run testing + cd $dest + cmake -S testing -B build + cd build + ctest -C Release --output-on-failure -VV # CLANG compilation and testing of different ISAs - nightly-macosx-individualisa-CLANG-SSE2: secrets: inherit uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/macos.yml@main with: runs-on: '[ "macOS", "build", "x86_64" ]' cmd: | - cmake --preset nightly-macosx-individualisa-CLANG-SSE2 -DCMAKE_BUILD_TYPE=Release -DEMBREE_TESTING_INTENSITY=4 - cmake --build build --target build - cmake --build build --target test_package + opts="-DCMAKE_BUILD_TYPE=Release" + opts+=" -DBUILD_TESTING=ON" + opts+=" -DEMBREE_TUTORIALS=ON" + opts+=" -DEMBREE_TESTING_INTENSITY=4" + 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=NONE" + opts+=" -DEMBREE_ISA_SSE2=ON" + opts+=" -DEMBREE_ISA_SSE42=OFF" + opts+=" -DEMBREE_ISA_AVX=OFF" + opts+=" -DEMBREE_ISA_AVX2=OFF" + opts+=" -DEMBREE_ISA_AVX512=OFF" + opts+=" -DEMBREE_API_NAMESPACE=myembree" + opts+=" -DEMBREE_LIBRARY_NAME=myembree" + opts+=" -DEMBREE_MAX_INSTANCE_LEVEL_COUNT=4" + 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/ + + # Merge binaries & testing packages + dest="./build/embree-release" + mkdir -p "$dest" + for archive in ./build/*.zip; do + unzip -o "$archive" -d "$dest" + done + + # Run testing + cd $dest + cmake -S testing -B build + cd build + ctest -C Release --output-on-failure -VV nightly-macosx-individualisa-CLANG-AVX: secrets: inherit @@ -693,9 +1828,49 @@ jobs: with: runs-on: '[ "macOS", "build", "x86_64" ]' cmd: | - cmake --preset nightly-macosx-individualisa-CLANG-AVX -DCMAKE_BUILD_TYPE=Release -DEMBREE_TESTING_INTENSITY=4 - cmake --build build --target build - cmake --build build --target test_package + opts="-DCMAKE_BUILD_TYPE=Release" + opts+=" -DBUILD_TESTING=ON" + opts+=" -DEMBREE_TUTORIALS=ON" + opts+=" -DEMBREE_ISPC_SUPPORT=ON" + opts+=" -DEMBREE_TESTING_INTENSITY=4" + 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=NONE" + opts+=" -DEMBREE_ISA_SSE2=OFF" + opts+=" -DEMBREE_ISA_SSE42=OFF" + opts+=" -DEMBREE_ISA_AVX=ON" + opts+=" -DEMBREE_ISA_AVX2=OFF" + opts+=" -DEMBREE_ISA_AVX512=OFF" + opts+=" -DEMBREE_PATCH_GLFW_SOURCE=ON" + opts+=" -DEMBREE_TASKING_SYSTEM=INTERNAL" + 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/ + + # Merge binaries & testing packages + dest="./build/embree-release" + mkdir -p "$dest" + for archive in ./build/*.zip; do + unzip -o "$archive" -d "$dest" + done + + # Run testing + cd $dest + cmake -S testing -B build + cd build + ctest -C Release --output-on-failure -VV nightly-macosx-individualisa-CLANG-SSE2-STATIC: secrets: inherit @@ -703,21 +1878,97 @@ jobs: with: runs-on: '[ "macOS", "build", "x86_64" ]' cmd: | - cmake --preset nightly-macosx-individualisa-CLANG-SSE2-STATIC -DCMAKE_BUILD_TYPE=Release -DEMBREE_TESTING_INTENSITY=4 - cmake --build build --target build - cmake --build build --target test_package + opts="-DCMAKE_BUILD_TYPE=Release" + opts+=" -DBUILD_TESTING=ON" + opts+=" -DEMBREE_TUTORIALS=ON" + opts+=" -DEMBREE_ISPC_SUPPORT=ON" + opts+=" -DEMBREE_TESTING_INTENSITY=4" + 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=NONE" + opts+=" -DEMBREE_ISA_SSE2=ON" + opts+=" -DEMBREE_ISA_SSE42=OFF" + opts+=" -DEMBREE_ISA_AVX=OFF" + opts+=" -DEMBREE_ISA_AVX2=OFF" + opts+=" -DEMBREE_ISA_AVX512=OFF" + opts+=" -DEMBREE_STATIC_LIB=ON" + opts+=" -DEMBREE_PATCH_GLFW_SOURCE=ON" + opts+=" -DEMBREE_TASKING_SYSTEM=INTERNAL" + 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/ + + # Merge binaries & testing packages + dest="./build/embree-release" + mkdir -p "$dest" + for archive in ./build/*.zip; do + unzip -o "$archive" -d "$dest" + done + + # Run testing + cd $dest + cmake -S testing -B build + cd build + ctest -C Release --output-on-failure -VV # AppleClang compilation and testing of different ISAs - nightly-macosx-AVX: secrets: inherit uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/macos.yml@main with: runs-on: '[ "macOS", "build", "x86_64" ]' cmd: | - cmake --preset nightly-macosx-AVX -DCMAKE_BUILD_TYPE=Release -DEMBREE_TESTING_INTENSITY=4 - cmake --build build --target build - cmake --build build --target test_package + opts="-DCMAKE_BUILD_TYPE=Release" + opts+=" -DBUILD_TESTING=ON" + opts+=" -DEMBREE_TUTORIALS=ON" + opts+=" -DEMBREE_ISPC_SUPPORT=ON" + opts+=" -DEMBREE_TESTING_INTENSITY=4" + 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=NONE" + opts+=" -DEMBREE_ISA_AVX=ON" + opts+=" -DEMBREE_PATCH_GLFW_SOURCE=ON" + opts+=" -DEMBREE_TASKING_SYSTEM=INTERNAL" + 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/ + + # Merge binaries & testing packages + dest="./build/embree-release" + mkdir -p "$dest" + for archive in ./build/*.zip; do + unzip -o "$archive" -d "$dest" + done + + # Run testing + cd $dest + cmake -S testing -B build + cd build + ctest -C Release --output-on-failure -VV nightly-macosx-AVX2-SIMD256: secrets: inherit @@ -725,9 +1976,46 @@ jobs: with: runs-on: '[ "macOS", "avx2", "build", "x86_64" ]' cmd: | - cmake --preset nightly-macosx-AVX2-SIMD256 -DCMAKE_BUILD_TYPE=Release -DEMBREE_TESTING_INTENSITY=4 - cmake --build build --target build - cmake --build build --target test_package + opts="-DCMAKE_BUILD_TYPE=Release" + opts+=" -DBUILD_TESTING=ON" + opts+=" -DEMBREE_TUTORIALS=ON" + opts+=" -DEMBREE_ISPC_SUPPORT=ON" + opts+=" -DEMBREE_TESTING_INTENSITY=4" + 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=NONE" + opts+=" -DEMBREE_ISA_AVX2=ON" + opts+=" -DEMBREE_CONFIG=frequency_level=simd256" + 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/ + + # Merge binaries & testing packages + dest="./build/embree-release" + mkdir -p "$dest" + for archive in ./build/*.zip; do + unzip -o "$archive" -d "$dest" + done + + # Run testing + cd $dest + cmake -S testing -B build + cd build + ctest -C Release --output-on-failure -VV nightly-macosx-AVX2: secrets: inherit @@ -735,26 +2023,44 @@ jobs: with: runs-on: '[ "macOS", "avx2", "build", "x86_64" ]' cmd: | - cmake --preset nightly-macosx-AVX2 -DCMAKE_BUILD_TYPE=Release -DEMBREE_TESTING_INTENSITY=4 - cmake --build build --target build - cmake --build build --target test_package - - - - + opts="-DCMAKE_BUILD_TYPE=Release" + opts+=" -DBUILD_TESTING=ON" + opts+=" -DEMBREE_TUTORIALS=ON" + opts+=" -DEMBREE_ISPC_SUPPORT=ON" + opts+=" -DEMBREE_TESTING_INTENSITY=4" + 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=NONE" + opts+=" -DEMBREE_ISA_AVX2=ON" + opts+=" -DEMBREE_CONFIG=frequency_level=simd128" + 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/ + + # Merge binaries & testing packages + dest="./build/embree-release" + mkdir -p "$dest" + for archive in ./build/*.zip; do + unzip -o "$archive" -d "$dest" + done + + # Run testing + cd $dest + cmake -S testing -B build + cd build + ctest -C Release --output-on-failure -VV -### ######################################## -### # ARM EMULATION -### ######################################## -### -### nightly-linux-arm-emulation: -### secrets: inherit -### uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main -### with: -### image: embree/arm64v8-ubuntu:22.04 -### runs-on: '[ "Linux", "docker-arm", "ARM64" ]' -### cmd: | -### cmake --preset nightly-linux-arm-emulation -D EMBREE_TESTING_INTENSITY=2 -### cmake --build build --target package -j8 -### cd build -### ctest -VV diff --git a/.github/workflows/performance.yml b/.github/workflows/performance.yml deleted file mode 100644 index 8b49e7a1e7..0000000000 --- a/.github/workflows/performance.yml +++ /dev/null @@ -1,172 +0,0 @@ -## Copyright 2022 Intel Corporation -## SPDX-License-Identifier: Apache-2.0 - -name: performance - -permissions: read-all - -on: - schedule: - - cron: '02 00 * * *' - workflow_dispatch: - -jobs: - perf-linux-SYCL-DPCPP-build: - secrets: inherit - uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main - with: - image: embree/ubuntu:22.04 - options: --device=/dev/dri:/dev/dri - runs-on: '[ "Linux", "docker", "dg2" ]' - project: embree - env-from-files: ./.github/workflows/gfx-ubuntu22-public.env - dpcpp-version: intel/2023.0 - artifact-out: perf-linux-SYCL-DPCPP - artifact-path: ./build/*.tar.gz - cmd: | - cmake --preset perf-linux-icx-sycl -DCMAKE_BUILD_TYPE=Release - cmake --build build --config Release --target build - - perf-linux-DG2-A770-test: - secrets: inherit - uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main - needs: ["perf-linux-SYCL-DPCPP-build"] - with: - image: embree/ubuntu:22.04 - options: --device=/dev/dri:/dev/dri - runs-on: '[ "Linux", "docker", "dg2", "perf", "A770" ]' - project: embree - env-from-files: ./.github/workflows/gfx-ubuntu22-public.env - artifact-in: perf-linux-SYCL-DPCPP - setup-benny: true - cmd: | - cd build - ls *.tar.gz - tar -xzf embree-?.?.?.sycl.x86_64.linux.tar.gz - cd bin - source ../embree-vars.sh - $GITHUB_WORKSPACE/scripts/run-perf.sh gpu - - perf-linux-PVC-test: - secrets: inherit - uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main - needs: ["perf-linux-SYCL-DPCPP-build"] - with: - image: embree/ubuntu:22.04 - options: --device=/dev/dri:/dev/dri - runs-on: '[ "Linux", "docker", "pvc", "perf" ]' - project: embree - env-from-files: ./.github/workflows/gfx-ubuntu22-public.env - artifact-in: perf-linux-SYCL-DPCPP - setup-benny: true - cmd: | - # Run it on single tile (disable implicit scaling) - export EnableImplicitScaling=0 - export NEOReadDebugKeys=1 - export ZE_FLAT_DEVICE_HIERARCHY=COMPOSITE - cd build - ls *.tar.gz - tar -xzf embree-?.?.?.sycl.x86_64.linux.tar.gz - cd bin - source ../embree-vars.sh - $GITHUB_WORKSPACE/scripts/run-perf.sh gpu - - perf-linux-x86-ICX-ISPC-build: - 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: perf-linux-x86-ICX-ISPC-build - artifact-path: ./build/*.tar.gz - cmd: | - cmake --preset perf-linux-icx -DCMAKE_BUILD_TYPE=Release - cmake --build build --config Release --target build - - perf-linux-i9-12900k-test: - secrets: inherit - uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/perf.yml@main - needs: ["perf-linux-x86-ICX-ISPC-build"] - with: - runs-on: '[ "Linux", "perf", "vis-perf-i9-12900k-1" ]' - artifact-in: perf-linux-x86-ICX-ISPC-build - setup-benny: true - cmd: | - cd build - tar -xzf embree-?.?.?.x86_64.linux.tar.gz - cd bin - $GITHUB_WORKSPACE/scripts/run-perf.sh cpu - - - perf-linux-x8380-1-test: - secrets: inherit - uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/perf.yml@main - needs: ["perf-linux-x86-ICX-ISPC-build"] - with: - runs-on: '[ "Linux", "perf", "vis-perf-x8380-1" ]' - artifact-in: perf-linux-x86-ICX-ISPC-build - setup-benny: true - cmd: | - cd build - tar -xzf embree-?.?.?.x86_64.linux.tar.gz - cd bin - $GITHUB_WORKSPACE/scripts/run-perf.sh cpu - - - perf-linux-x8280-1-test: - secrets: inherit - uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/perf.yml@main - needs: ["perf-linux-x86-ICX-ISPC-build"] - with: - runs-on: '[ "Linux", "perf", "vis-perf-x8280-1" ]' - artifact-in: perf-linux-x86-ICX-ISPC-build - setup-benny: true - cmd: | - cd build - tar -xzf embree-?.?.?.x86_64.linux.tar.gz - cd bin - $GITHUB_WORKSPACE/scripts/run-perf.sh cpu - - - perf-linux-a3970x-1-test: - secrets: inherit - uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/perf.yml@main - needs: ["perf-linux-x86-ICX-ISPC-build"] - with: - runs-on: '[ "Linux", "perf", "vis-perf-a3970x-1" ]' - artifact-in: perf-linux-x86-ICX-ISPC-build - setup-benny: true - cmd: | - cd build - tar -xzf embree-?.?.?.x86_64.linux.tar.gz - cd bin - $GITHUB_WORKSPACE/scripts/run-perf.sh cpu - - linux-DG2-A770-buildbench: - secrets: inherit - uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main - needs: ["perf-linux-SYCL-DPCPP-build"] - with: - image: embree/ubuntu:22.04 - options: --device=/dev/dri:/dev/dri - runs-on: '[ "Linux", "docker", "dg2", "perf", "A770" ]' - project: embree - env-from-files: ./.github/workflows/gfx-ubuntu22-public.env - artifact-in: perf-linux-SYCL-DPCPP - setup-benny: true - cmd: | - cd build - ls *.tar.gz - tar -xzf embree-?.?.?.sycl.x86_64.linux.tar.gz - git clone https://github.com/intel-innersource/libraries.graphics.renderkit.embree.models.git embree-models - ls -al - source embree-vars.sh - echo "bin/embree_buildbench --legacy" - bin/embree_buildbench --legacy - echo "bin/embree_buildbench_sycl --legacy" - bin/embree_buildbench_sycl --legacy - echo "bin/embree_buildbench --legacy -c embree-models/crown/crown.ecs" - bin/embree_buildbench --legacy -c embree-models/crown/crown.ecs - echo "bin/embree_buildbench_sycl --legacy -c embree-models/crown/crown.ecs" - bin/embree_buildbench_sycl --legacy -c embree-models/crown/crown.ecs \ No newline at end of file diff --git a/.github/workflows/public.continuous.yml b/.github/workflows/public.continuous.yml index e4fe7f3f9a..3e87839644 100644 --- a/.github/workflows/public.continuous.yml +++ b/.github/workflows/public.continuous.yml @@ -32,40 +32,85 @@ jobs: dnf config-manager --set-enabled powertools dnf -y update dnf -y install ninja-build + - name: Checkout Repository uses: actions/checkout@v4 - with: - submodules: true - name: Build and Run run: | - cmake --preset public-gcc-tbb -DEMBREE_TESTING_INTENSITY=3 - cmake --build build --target build - cmake --build build --target test_package + 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 - ubuntu-22_04: + - 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:22.04 + image: ubuntu:24.04 steps: - - name: Install packages (ubuntu 22.04) + - name: Install packages (ubuntu 24.04) run: | apt-get update apt-get -y upgrade - apt-get -y install g++ python3 clang git-lfs libtbb-dev freeglut3-dev libglfw3-dev libxmu-dev libxi-dev unzip xorg-dev pip - apt-get -y install libtinfo5 + 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 - apt-get -y install ninja-build - pip install --upgrade cmake - cmake --version + + - 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 - with: - submodules: true - name: Build and Run run: | - cmake --preset public-gcc-tbb -DEMBREE_TESTING_INTENSITY=3 - cmake --build build --target build - cmake --build build --target test_package \ No newline at end of file + 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 \ No newline at end of file diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a5341cdb71..9598583ee0 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -24,8 +24,21 @@ jobs: artifact-path: ./build/embree-*.zip dpcpp-version: intel-llvm/v6.2.0 cmd: | - cmake --preset release-windows -DCMAKE_BUILD_TYPE=Release - cmake --build build --config Release --target build + $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 @@ -39,17 +52,8 @@ jobs: runs-on: '[ "Windows", "${{ matrix.platform }}" ]' artifact-in: build-windows cmd: | - # Merge binaries & testing packages - $dest = "./build/embree-release" - New-Item -ItemType Directory -Path $dest -Force | Out-Null - Get-ChildItem -Path "./build/*.zip" | - ForEach-Object { Expand-Archive -Path $_.FullName -DestinationPath $dest -Force } - - # Run testing - cd $dest - cmake -S testing -B build - cd build - ctest -C Release --output-on-failure -VV + $EmbreeDir = .\\scripts\\prepare-test-files.ps1 -TestType ctest + .\\scripts\\run-tests.ps1 -TestType ctest -EmbreeDir $EmbreeDir -CtestConfig Release build-macosx-x86_64: secrets: inherit @@ -57,9 +61,32 @@ jobs: with: runs-on: '[ "macOS", "build", "x86_64" ]' cmd: | - source scripts/cmake-presets/macos-env.sh - cmake --preset release-macos -DCMAKE_BUILD_TYPE=Release - cmake --build build --config Release --target build + 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 @@ -76,18 +103,8 @@ jobs: runs-on: '[ "macOS", "${{ matrix.platform }}" ]' artifact-in: build-macosx-x86_64 cmd: | - # Merge binaries & testing packages - dest="./build/embree-release" - mkdir -p "$dest" - for archive in ./build/*.zip; do - unzip -o "$archive" -d "$dest" - done - - # Run testing - cd $dest - cmake -S testing -B build - cd build - ctest -C Release --output-on-failure -VV + 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 @@ -95,12 +112,35 @@ jobs: with: runs-on: '[ "macOS", "build", "arm" ]' cmd: | - source scripts/cmake-presets/macos-env.sh - cmake --preset release-macos-arm -DCMAKE_BUILD_TYPE=Release - cmake --build build --config Release --target build + 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/*.zip + artifact-path: ./build/embree-*.zip test-macosx-arm: secrets: inherit @@ -114,18 +154,8 @@ jobs: runs-on: '[ "macOS", "${{ matrix.platform }}" ]' artifact-in: build-macosx-arm cmd: | - # Merge binaries & testing packages - dest="./build/embree-release" - mkdir -p "$dest" - for archive in ./build/*.zip; do - unzip -o "$archive" -d "$dest" - done - - # Run testing - cd $dest - cmake -S testing -B build - cd build - ctest -C Release --output-on-failure -VV + 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 @@ -141,8 +171,21 @@ jobs: dnf -y config-manager --set-enabled powertools dnf -y install ninja-build cmd: | - cmake --preset release-linux -DCMAKE_BUILD_TYPE=Release - cmake --build build --config Release --target build + 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 @@ -157,21 +200,11 @@ jobs: runs-on: '[ "Linux", "${{ matrix.platform }}" ]' artifact-in: build-linux cmd: | - # Merge binaries & testing packages - dest="./build/embree-release" - mkdir -p "$dest" - for archive in ./build/*.tar.gz; do - tar -xzf "$archive" -C "$dest" - done + EMBREE_PATH=$(./scripts/prepare-test-files.sh --type ctest | tail -1) + ./scripts/run-tests.sh --type ctest --embree-dir "$EMBREE_PATH" --ctest-config Release - # Run testing - cd $dest - cmake -S testing -B build - cd build - ctest -C Release --output-on-failure -VV - -##################################################################### +#################################################################### # SYCL Builds and Tests #################################################################### build-windows-sycl: @@ -183,8 +216,23 @@ jobs: artifact-out: build-windows-sycl artifact-path: ./build/*.zip cmd: | - cmake --preset release-windows-sycl -DCMAKE_BUILD_TYPE=Release - cmake --build build --config Release --target build + $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 @@ -200,8 +248,23 @@ jobs: dnf -y config-manager --set-enabled powertools dnf -y install ninja-build cmd: | - cmake --preset release-linux-sycl -DCMAKE_BUILD_TYPE=Release - cmake --build build --config Release --target build + 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 @@ -216,17 +279,8 @@ jobs: env-from-files: ./.github/workflows/gfx-windows-public.env artifact-in: build-windows-sycl cmd: | - # Merge binaries & testing packages - $dest = "./build/embree-release" - New-Item -ItemType Directory -Path $dest -Force | Out-Null - Get-ChildItem -Path "./build/*.zip" | - ForEach-Object { Expand-Archive -Path $_.FullName -DestinationPath $dest -Force } - - # Run testing - cd $dest - cmake -S testing -B build - cd build - ctest -C Release --output-on-failure -VV + $EmbreeDir = .\\scripts\\prepare-test-files.ps1 -TestType ctest + .\\scripts\\run-tests.ps1 -TestType ctest -EmbreeDir $EmbreeDir -CtestConfig Release linux-sycl-test: secrets: inherit @@ -243,23 +297,13 @@ jobs: env-from-files: ./.github/workflows/gfx-ubuntu24-public.env artifact-in: build-linux-sycl cmd: | - # Merge binaries & testing packages - dest="./build/embree-release" - mkdir -p "$dest" - for archive in ./build/*.tar.gz; do - tar -xzf "$archive" -C "$dest" - done + EMBREE_PATH=$(./scripts/prepare-test-files.sh --type ctest | tail -1) + ./scripts/run-tests.sh --type ctest --embree-dir "$EMBREE_PATH" --ctest-config Release - # Run testing - cd $dest - cmake -S testing -B build - cd build - ctest -C Release --output-on-failure -VV - -##################################################################### +#################################################################### # Release binaries scans -##################################################################### +#################################################################### binary-analysis: needs: - build-windows diff --git a/CMakePresets.json b/CMakePresets.json deleted file mode 100644 index db547d9609..0000000000 --- a/CMakePresets.json +++ /dev/null @@ -1,102 +0,0 @@ -{ - "version": 4, - "cmakeMinimumRequired": { - "major": 3, - "minor": 11, - "patch": 0 - }, - "include": [ - "scripts/cmake-presets/os.json", - "scripts/cmake-presets/package.json", - "scripts/cmake-presets/compiler.json", - "scripts/cmake-presets/tbb.json", - "scripts/cmake-presets/continuous.json", - "scripts/cmake-presets/nightly.json", - "scripts/cmake-presets/release.json", - "scripts/cmake-presets/integrate.json", - "scripts/cmake-presets/performance.json", - "scripts/cmake-presets/public.json" - ], - "configurePresets": [ - - { - "name": "package-linux-icx-ispc1_19_0-tbb2021_9_0-perf", - "inherits": ["package-linux", "env", "icx", "ispc1_19_0", "tbb2021_9_0"], - "binaryDir": "${sourceDir}/build", - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Release", - "EMBREE_MAX_ISA": "AVX512", - "EMBREE_USE_GOOGLE_BENCHMARK": "ON", - "EMBREE_BUILD_GOOGLE_BENCHMARK_FROM_SOURCE": "ON" - } - }, - - - - { - "name": "package-linux-icx-sycl-ispc1_19_0-tbb2021_9_0-perf", - "inherits": ["package-linux", "env", "icx", "ispc1_19_0", "tbb2021_9_0"], - "binaryDir": "${sourceDir}/build", - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Release", - "EMBREE_SYCL_SUPPORT": "ON", - "EMBREE_SYCL_AOT_DEVICES": "none", - "EMBREE_MAX_ISA": "AVX512", - "EMBREE_USE_GOOGLE_BENCHMARK": "ON", - "EMBREE_BUILD_GOOGLE_BENCHMARK_FROM_SOURCE": "ON" - } - }, - - - - - - - - - { - "name": "package-windows-v141-ispc1_19_0-tbb2021_9_0", - "inherits": ["package-windows", "env", "v141", "ispc1_19_0", "tbb2021_9_0"], - "binaryDir": "${sourceDir}/build", - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Release", - "EMBREE_MAX_ISA": "SSE2" - } - }, - - { - "name": "package-windows-v140-ispc1_19_0-tbb2021_9_0", - "inherits": ["package-windows", "env", "v140", "ispc1_19_0", "tbb2021_9_0"], - "binaryDir": "${sourceDir}/build", - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Release", - "EMBREE_MAX_ISA": "SSE2" - } - }, - - - { - "name": "package-windows-icx-sycl-ispc1_19_0-tbb2021_9_0", - "inherits": ["package-windows", "env", "icx-windows", "ispc1_19_0", "tbb2021_9_0"], - "binaryDir": "${sourceDir}/build", - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Release", - "EMBREE_SYCL_SUPPORT": "ON", - "EMBREE_SYCL_AOT_DEVICES": "none", - "EMBREE_MAX_ISA": "AVX512" - } - }, - - - - { - "name": "linux-coverity", - "inherits": ["package-linux", "env", "gcc", "tasking_internal"], - "binaryDir": "${sourceDir}/build", - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Release", - "EMBREE_MAX_ISA": "SSE2" - } - } - ] -} diff --git a/common/cmake/test.cmake b/common/cmake/test.cmake index 6d59b51c24..0bef2728e6 100644 --- a/common/cmake/test.cmake +++ b/common/cmake/test.cmake @@ -90,7 +90,7 @@ if (BUILD_TESTING OR EMBREE_TESTING_INSTALL_TESTS) COMMAND ${executable}_sycl ${ARGN}) SET(testnamedef EMBREE_TEST_${testname}_sycl_DEFINED) SET(${testnamedef} 1 CACHE INTERNAL "") - SET_TESTS_PROPERTIES(${testname}_sycl PROPERTIES TIMEOUT 50) + SET_TESTS_PROPERTIES(${testname}_sycl PROPERTIES TIMEOUT 150) ENDIF() ENDMACRO() diff --git a/scripts/cmake-presets/compiler.json b/scripts/cmake-presets/compiler.json deleted file mode 100644 index f88f6f0222..0000000000 --- a/scripts/cmake-presets/compiler.json +++ /dev/null @@ -1,239 +0,0 @@ -{ - "version": 4, - "cmakeMinimumRequired": { - "major": 3, - "minor": 23, - "patch": 0 - }, - "configurePresets": [ - { - "name": "gcc", - "cacheVariables": { - "CMAKE_CXX_COMPILER": "g++", - "CMAKE_C_COMPILER": "gcc" - } - }, - { - "name": "clang", - "cacheVariables": { - "CMAKE_CXX_COMPILER": "clang++", - "CMAKE_C_COMPILER": "clang" - } - }, - { - "name": "clang4", - "cacheVariables": { - "CMAKE_CXX_COMPILER": "$env{EMBREE_CLANG_4_0_0_PP}", - "CMAKE_C_COMPILER": "$env{EMBREE_CLANG_4_0_0}" - } - }, - { - "name": "clang5", - "cacheVariables": { - "CMAKE_CXX_COMPILER": "$env{EMBREE_CLANG_5_0_0_PP}", - "CMAKE_C_COMPILER": "$env{EMBREE_CLANG_5_0_0}" - } - }, - { - "name": "dpcpp", - "generator": "Ninja", - "cacheVariables": { - "CMAKE_CXX_COMPILER": "clang++", - "CMAKE_C_COMPILER": "clang" - } - }, - { - "name": "icx", - "generator": "Ninja", - "cacheVariables": { - "CMAKE_CXX_COMPILER": "icpx", - "CMAKE_C_COMPILER": "icx" - } - }, - { - "name": "icx-windows", - "generator": "Ninja", - "cacheVariables": { - "CMAKE_CXX_COMPILER": "icx", - "CMAKE_C_COMPILER": "icx" - } - }, - { - "name": "dpcpp-windows", - "generator": "Ninja", - "cacheVariables": { - "CMAKE_CXX_COMPILER": "clang++", - "CMAKE_C_COMPILER": "clang" - } - }, - { - "name": "v143", - "generator": "Visual Studio 17 2022", - "architecture": "x64", - "toolset": "V143" - }, - { - "name": "v142", - "generator": "Visual Studio 16 2019", - "architecture": "x64", - "toolset": "V142" - }, - { - "name": "v142-clang", - "generator": "Visual Studio 16 2019", - "architecture": "x64", - "toolset": "LLVM_v142" - }, - { - "name": "v141", - "generator": "Visual Studio 15 2017Win64", - "toolset": "V141" - }, - { - "name": "v141-icc19", - "generator": "Visual Studio 15 2017Win64", - "toolset": "Intel C++ Compiler 19.0" - }, - { - "name": "v141-icc18", - "generator": "Visual Studio 15 2017Win64", - "toolset": "Intel C++ Compiler 18.0" - }, - { - "name": "v141-clang", - "generator": "Visual Studio 15 2017Win64", - "toolset": "v141_clang_c2" - }, - { - "name": "v140", - "generator": "Visual Studio 14 2015Win64", - "toolset": "V140" - }, - { - "name": "v140-icc19", - "generator": "Visual Studio 14 2015Win64", - "toolset": "Intel C++ Compiler 19.0" - }, - { - "name": "v140-icc18", - "generator": "Visual Studio 14 2015Win64", - "toolset": "Intel C++ Compiler 18.0" - }, - { - "name": "v140-icc17", - "generator": "Visual Studio 14 2015Win64", - "toolset": "Intel C++ Compiler 17.0" - }, - { - "name": "v120", - "generator": "Visual Studio 12 2013Win64", - "toolset": "V120" - }, - { - "name": "v120-icc17", - "generator": "Visual Studio 12 2013Win64", - "toolset": "Intel C++ Compiler 17.0" - }, - { - "name": "v120-icc16", - "generator": "Visual Studio 12 2013Win64", - "toolset": "Intel C++ Compiler 16.0" - }, - { - "name": "v120-icc15", - "generator": "Visual Studio 12 2013Win64", - "toolset": "Intel C++ Compiler XE 15.0" - }, - { - "name": "v110", - "generator": "Visual Studio 11 2012Win64", - "toolset": "V110" - }, - - { - "name": "ispc1_13_0", - "hidden": true, - "cacheVariables": { - "EMBREE_ISPC_SUPPORT": "ON", - "EMBREE_ISPC_EXECUTABLE": "$env{EMBREE_ISPC_1_13_0_PATH}" - } - }, - { - "name": "ispc1_14_1", - "hidden": true, - "cacheVariables": { - "EMBREE_ISPC_SUPPORT": "ON", - "EMBREE_ISPC_EXECUTABLE": "$env{EMBREE_ISPC_1_14_1_PATH}" - } - }, - { - "name": "ispc1_16_1", - "hidden": true, - "cacheVariables": { - "EMBREE_ISPC_SUPPORT": "ON", - "EMBREE_ISPC_EXECUTABLE": "$env{EMBREE_ISPC_1_16_1_PATH}" - } - }, - { - "name": "ispc1_17_0", - "hidden": true, - "cacheVariables": { - "EMBREE_ISPC_SUPPORT": "ON", - "EMBREE_ISPC_EXECUTABLE": "$env{EMBREE_ISPC_1_17_0_PATH}" - } - }, - { - "name": "ispc1_18_1", - "hidden": true, - "cacheVariables": { - "EMBREE_ISPC_SUPPORT": "ON", - "EMBREE_ISPC_EXECUTABLE": "$env{EMBREE_ISPC_1_18_1_PATH}" - } - }, - { - "name": "ispc1_19_0", - "hidden": true, - "cacheVariables": { - "EMBREE_ISPC_SUPPORT": "ON", - "EMBREE_ISPC_EXECUTABLE": "$env{EMBREE_ISPC_1_19_0_PATH}" - } - }, - { - "name": "ispc1_20_0", - "hidden": true, - "cacheVariables": { - "EMBREE_ISPC_SUPPORT": "ON", - "EMBREE_ISPC_EXECUTABLE": "$env{EMBREE_ISPC_1_20_0_PATH}" - } - }, - { - "name": "ispc1_21_0", - "hidden": true, - "cacheVariables": { - "EMBREE_ISPC_SUPPORT": "ON", - "EMBREE_ISPC_EXECUTABLE": "$env{EMBREE_ISPC_1_21_0_PATH}" - } - }, - { - "name": "ispc1_22_0", - "hidden": true, - "cacheVariables": { - "EMBREE_ISPC_SUPPORT": "ON", - "EMBREE_ISPC_EXECUTABLE": "$env{EMBREE_ISPC_1_22_0_PATH}" - } - }, - { - "name": "ispc1_23_0", - "hidden": true, - "cacheVariables": { - "EMBREE_ISPC_SUPPORT": "ON", - "EMBREE_ISPC_EXECUTABLE": "$env{EMBREE_ISPC_1_23_0_PATH}" - } - }, - { - "name": "ispc_NEWEST", - "hidden": true, - "inherits": "ispc1_23_0" - } - ] -} diff --git a/scripts/cmake-presets/continuous.json b/scripts/cmake-presets/continuous.json deleted file mode 100644 index adae841b59..0000000000 --- a/scripts/cmake-presets/continuous.json +++ /dev/null @@ -1,254 +0,0 @@ -{ - "version": 4, - "cmakeMinimumRequired": { - "major": 3, - "minor": 11, - "patch": 0 - }, - "include": [ - "os.json", - "package.json", - "compiler.json", - "tbb.json" - ], - "configurePresets": [ - { - "name": "linux-DG2-JIT-INTERNAL", - "inherits": ["package-linux", "env", "dpcpp", "ispc_NEWEST", "tbb_NEWEST"], - "cacheVariables": { - "CMAKE_BUILD_TYPE": "RelWithDebInfo", - "EMBREE_SYCL_SUPPORT": "ON", - "EMBREE_SYCL_AOT_DEVICES": "none", - "EMBREE_MAX_ISA": "SSE2" - } - }, - { - "name": "linux-DG2-JIT-PUBLIC", - "inherits": "linux-DG2-JIT-INTERNAL" - }, - { - "name": "linux-DG2-JIT-PUBLIC-debug", - "inherits": ["package-linux", "env", "dpcpp", "tbb_NEWEST"], - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Debug", - "EMBREE_SYCL_SUPPORT": "ON", - "EMBREE_SYCL_AOT_DEVICES": "none", - "EMBREE_MAX_ISA": "SSE2" - } - }, - { - "name": "linux-DG2-JIT-EMBARGO", - "inherits": ["package-linux", "env", "dpcpp", "ispc_NEWEST", "tbb_NEWEST"], - "cacheVariables": { - "CMAKE_BUILD_TYPE": "RelWithDebInfo", - "EMBREE_SYCL_SUPPORT": "ON", - "EMBREE_SYCL_AOT_DEVICES": "none", - "EMBREE_MAX_ISA": "SSE2" - } - }, - { - "name": "linux-DG2-JIT-PUBLIC-sycl-nightly-RK", - "inherits": "linux-DG2-JIT-INTERNAL", - "cacheVariables": { - "EMBREE_MAX_ISA": "AVX512" - } - }, - { - "name": "linux-DG2-JIT-PUBLIC-ICX", - "inherits": ["package-linux", "env", "icx", "ispc_NEWEST", "tbb_NEWEST"], - "cacheVariables": { - "CMAKE_BUILD_TYPE": "RelWithAssert", - "EMBREE_SYCL_SUPPORT": "ON", - "EMBREE_SYCL_AOT_DEVICES": "none", - "EMBREE_MAX_ISA": "AVX512" - } - }, - { - "name": "linux-DG2-JIT-PUBLIC-ICX-debug", - "inherits": ["package-linux", "env", "icx", "tbb_NEWEST"], - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Debug", - "EMBREE_SYCL_SUPPORT": "ON", - "EMBREE_SYCL_AOT_DEVICES": "none", - "EMBREE_MAX_ISA": "SSE2" - } - }, - { - "name": "linux-DG2-JIT-PUBLIC-ICX-RC", - "inherits": "linux-DG2-JIT-PUBLIC-ICX" - }, - { - "name": "linux-PVC-JIT-INTERNAL", - "inherits": ["package-linux", "env", "icx", "ispc_NEWEST", "tbb_SYSTEM"], - "cacheVariables": { - "CMAKE_BUILD_TYPE": "RelWithAssert", - "EMBREE_SYCL_SUPPORT": "ON", - "EMBREE_SYCL_AOT_DEVICES": "none", - "EMBREE_MAX_ISA": "SSE2" - } - }, - { - "name": "linux-PVC-JIT-INTERNAL-SYCL-RC", - "inherits": ["package-linux", "env", "dpcpp", "ispc_NEWEST", "tbb_SYSTEM"], - "cacheVariables": { - "CMAKE_BUILD_TYPE": "RelWithAssert", - "EMBREE_SYCL_SUPPORT": "ON", - "EMBREE_SYCL_AOT_DEVICES": "none", - "EMBREE_MAX_ISA": "SSE2" - } - }, - { - "name": "windows-DG2-JIT-INTERNAL", - "inherits": ["package-windows", "env", "dpcpp-windows", "ispc_NEWEST", "tbb_NEWEST"], - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Release", - "EMBREE_SYCL_SUPPORT": "ON", - "EMBREE_SYCL_AOT_DEVICES": "none", - "EMBREE_MAX_ISA": "SSE2" - } - }, - { - "name": "windows-DG2-JIT-INTERNAL-L0RTAS", - "inherits": ["package-windows", "env", "dpcpp-windows", "ispc_NEWEST", "tbb_NEWEST"], - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Release", - "EMBREE_SYCL_SUPPORT": "ON", - "EMBREE_SYCL_AOT_DEVICES": "none", - "EMBREE_MAX_ISA": "SSE2" - } - }, - { - "name": "windows-DG2-JIT-INTERNAL-L0RTAS-debug", - "inherits": ["package-windows", "env", "dpcpp-windows", "tbb_NEWEST"], - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Debug", - "EMBREE_SYCL_SUPPORT": "ON", - "EMBREE_SYCL_AOT_DEVICES": "none", - "EMBREE_MAX_ISA": "SSE2" - } - }, - { - "name": "linux-fedora42-CLANG", - "inherits": ["package-linux", "env", "clang", "ispc_NEWEST", "tbb_NEWEST"], - "cacheVariables": { - "CMAKE_BUILD_TYPE": "RelWithDebInfo", - "EMBREE_CONFIG": "frequency_level=simd128", - "EMBREE_MAX_ISA": "AVX512", - "EMBREE_TUTORIALS_GLFW": "OFF" - } - }, - { - "name": "linux-fedora42-CLANG-INT-ADDRSANITIZER", - "inherits": ["package-linux", "env", "clang", "ispc_NEWEST", "tasking_internal"], - "cacheVariables": { - "CMAKE_BUILD_TYPE": "RelWithDebInfo", - "EMBREE_MAX_ISA": "SSE2", - "EMBREE_ADDRESS_SANITIZER": "ON", - "EMBREE_TUTORIALS_GLFW": "OFF" - } - }, - { - "name": "linux-fedora42-ICX", - "inherits": ["package-linux", "env", "dpcpp", "ispc_NEWEST", "tbb_NEWEST"], - "cacheVariables": { - "CMAKE_BUILD_TYPE": "RelWithDebInfo", - "EMBREE_BUILD_GLFW_FROM_SOURCE": "OFF", - "EMBREE_CONFIG": "frequency_level=simd256", - "EMBREE_MAX_ISA": "AVX512", - "EMBREE_MAX_INSTANCE_LEVEL_COUNT": "4" - } - }, - { - "name": "linux-fedora42-GCC", - "inherits": ["package-linux", "env", "gcc", "ispc_NEWEST", "tbb_NEWEST"], - "cacheVariables": { - "CMAKE_BUILD_TYPE": "RelWithDebInfo", - "EMBREE_CONFIG": "frequency_level=simd256", - "EMBREE_MAX_ISA": "AVX512", - "EMBREE_COMPACT_POLYS": "ON", - "EMBREE_MIN_WIDTH": "ON" - } - }, - { - "name": "linux-ubuntu24_04-ICX", - "inherits": ["package-linux", "env", "icx", "ispc_NEWEST", "tbb_SYSTEM"], - "cacheVariables": { - "CMAKE_BUILD_TYPE": "RelWithDebInfo", - "EMBREE_CONFIG": "frequency_level=simd256", - "EMBREE_MAX_ISA": "AVX512" - } - }, - { - "name": "linux-ubuntu24_04-ICX-RC", - "inherits": "linux-ubuntu24_04-ICX" - }, - { - "name": "linux-centos7_4-GCC", - "inherits": ["package-linux", "env", "gcc", "ispc1_21_0", "tbb_SYSTEM"], - "cacheVariables": { - "CMAKE_BUILD_TYPE": "RelWithDebInfo", - "EMBREE_CONFIG": "frequency_level=simd128", - "EMBREE_MAX_ISA": "AVX2", - "EMBREE_COMPACT_POLYS": "ON", - "EMBREE_MIN_WIDTH": "ON" - } - }, - { - "name": "windows-V142", - "inherits": ["package-windows", "env", "v142", "tbb_SYSTEM"], - "cacheVariables": { - "CMAKE_BUILD_TYPE": "RelWithDebInfo", - "EMBREE_MAX_ISA": "SSE2", - "EMBREE_MAX_INSTANCE_LEVEL_COUNT": "8" - } - }, - { - "name": "windows-ICX", - "inherits": ["package-windows", "env", "icx-windows", "ispc_NEWEST", "tbb_NEWEST"], - "cacheVariables": { - "CMAKE_BUILD_TYPE": "RelWithDebInfo", - "EMBREE_MAX_ISA": "AVX512" - } - }, - { - "name": "windows-ICX-RC", - "inherits": "windows-ICX" - }, - { - "name": "macos-ARM-CLANG-NEON-AVX2", - "binaryDir": "${sourceDir}/build", - "inherits": ["package-macos", "env", "clang", "ispc_NEWEST", "tbb_HOMEBREW"], - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Release", - "EMBREE_MAX_ISA": "NEON2X" - } - }, - { - "name": "macos-ARM-CLANG-NEON-AVX2-UB", - "binaryDir": "${sourceDir}/build", - "inherits": ["package-macos", "env", "clang", "ispc_NEWEST", "tbb_NEWEST"], - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Release", - "EMBREE_MAX_ISA": "NEON2X" - } - }, - { - "name": "macos-ARM-CLANG-NEON", - "binaryDir": "${sourceDir}/build", - "inherits": ["package-macos", "env", "clang", "ispc_NEWEST", "tbb_HOMEBREW"], - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Release", - "EMBREE_MAX_ISA": "NEON" - } - }, - { - "name": "macos-x64-CLANG", - "binaryDir": "${sourceDir}/build", - "inherits": ["package-macos", "env", "clang", "ispc_NEWEST", "tbb_NEWEST"], - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Release", - "EMBREE_MAX_ISA": "AVX512" - } - } - ] -} diff --git a/scripts/cmake-presets/integrate.json b/scripts/cmake-presets/integrate.json deleted file mode 100644 index 09904eb13a..0000000000 --- a/scripts/cmake-presets/integrate.json +++ /dev/null @@ -1,156 +0,0 @@ -{ - "version": 4, - "cmakeMinimumRequired": { - "major": 3, - "minor": 11, - "patch": 0 - }, - "include": [ - "os.json", - "package.json", - "compiler.json", - "tbb.json" - ], - "configurePresets": [ - { - "name": "integrate-windows-icx", - "inherits": ["package-windows", "env", "icx-windows", "ispc_NEWEST", "tbb_NEWEST"], - "binaryDir": "${sourceDir}/build", - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Release", - "EMBREE_MAX_ISA": "AVX512" - } - }, - { - "name": "integrate-windows-v142", - "inherits": ["package-windows", "env", "v142", "ispc_NEWEST", "tbb_NEWEST"], - "binaryDir": "${sourceDir}/build", - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Release", - "EMBREE_MAX_ISA": "SSE2" - } - }, - - { - "name": "integrate-static-windows-icx", - "inherits": ["package-static-windows", "env", "icx-windows", "ispc_NEWEST", "tbb_NEWEST"], - "binaryDir": "${sourceDir}/build", - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Release", - "EMBREE_MAX_ISA": "AVX512" - } - }, - { - "name": "integrate-static-windows-v142", - "inherits": ["package-static-windows", "env", "v142", "ispc_NEWEST", "tbb_NEWEST"], - "binaryDir": "${sourceDir}/build", - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Release", - "EMBREE_MAX_ISA": "SSE2" - } - }, - - - - { - "name": "integrate-linux-gcc", - "inherits": ["package-linux", "env", "gcc", "ispc_NEWEST", "tbb_NEWEST"], - "binaryDir": "${sourceDir}/build", - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Release", - "EMBREE_MAX_ISA": "AVX512" - } - }, - { - "name": "integrate-linux-icx", - "inherits": ["package-linux", "env", "icx", "ispc_NEWEST", "tbb_NEWEST"], - "binaryDir": "${sourceDir}/build", - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Release", - "EMBREE_MAX_ISA": "AVX512" - } - }, - { - "name": "integrate-linux-clang", - "inherits": ["package-linux", "env", "clang", "ispc_NEWEST", "tbb_NEWEST"], - "binaryDir": "${sourceDir}/build", - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Release", - "EMBREE_MAX_ISA": "AVX512" - } - }, - - { - "name": "integrate-static-linux-gcc", - "inherits": ["package-linux", "env", "gcc", "ispc_NEWEST", "tbb_NEWEST"], - "binaryDir": "${sourceDir}/build", - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Release", - "EMBREE_MAX_ISA": "AVX512" - } - }, - { - "name": "integrate-static-linux-icx", - "inherits": ["package-linux", "env", "icx", "ispc_NEWEST", "tbb_NEWEST"], - "binaryDir": "${sourceDir}/build", - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Release", - "EMBREE_MAX_ISA": "AVX512" - } - }, - { - "name": "integrate-static-linux-clang", - "inherits": ["package-linux", "env", "clang", "ispc_NEWEST", "tbb_NEWEST"], - "binaryDir": "${sourceDir}/build", - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Release", - "EMBREE_MAX_ISA": "AVX512" - } - }, - - { - "name": "integrate-sycl-linux-icx", - "inherits": ["package-linux", "env", "icx", "ispc_NEWEST", "tbb_NEWEST"], - "binaryDir": "${sourceDir}/build", - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Release", - "EMBREE_SYCL_SUPPORT": "ON", - "EMBREE_SYCL_AOT_DEVICES": "none", - "EMBREE_MAX_ISA": "AVX512" - } - }, - { - "name": "integrate-sycl-linux-dpcpp", - "inherits": ["package-linux", "env", "dpcpp", "ispc_NEWEST", "tbb_NEWEST"], - "binaryDir": "${sourceDir}/build", - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Release", - "EMBREE_SYCL_SUPPORT": "ON", - "EMBREE_SYCL_AOT_DEVICES": "none", - "EMBREE_MAX_ISA": "SSE2" - } - }, - - - - { - "name": "integrate-macos-gcc", - "inherits": ["package-macos", "env", "gcc", "ispc_NEWEST", "tbb_NEWEST"], - "binaryDir": "${sourceDir}/build", - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Release", - "EMBREE_MAX_ISA": "AVX512" - } - }, - { - "name": "integrate-macos-clang", - "inherits": ["package-macos", "env", "clang", "ispc_NEWEST", "tbb_NEWEST"], - "binaryDir": "${sourceDir}/build", - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Release", - "EMBREE_MAX_ISA": "AVX512" - } - } - ] -} - diff --git a/scripts/cmake-presets/linux-env.sh b/scripts/cmake-presets/linux-env.sh deleted file mode 100644 index 38d72b2cb0..0000000000 --- a/scripts/cmake-presets/linux-env.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -## Copyright 2019-2021 Intel Corporation -## SPDX-License-Identifier: Apache-2.0 - -echo $STORAGE_PATH -export NAS_LINUX=$STORAGE_PATH/packages/apps -export CMAKE_EXE=${NAS_LINUX}/cmake/cmake-3.25.3-linux-x86_64/bin/cmake \ No newline at end of file diff --git a/scripts/cmake-presets/macos-env.sh b/scripts/cmake-presets/macos-env.sh deleted file mode 100644 index b502feed02..0000000000 --- a/scripts/cmake-presets/macos-env.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -## Copyright 2019-2021 Intel Corporation -## SPDX-License-Identifier: Apache-2.0 - -export NAS_MACOS=$STORAGE_PATH/packages/apps -export CMAKE_EXE=cmake \ No newline at end of file diff --git a/scripts/cmake-presets/nightly.json b/scripts/cmake-presets/nightly.json deleted file mode 100644 index d2f76fc1c9..0000000000 --- a/scripts/cmake-presets/nightly.json +++ /dev/null @@ -1,595 +0,0 @@ -{ - "version": 4, - "cmakeMinimumRequired": { - "major": 3, - "minor": 11, - "patch": 0 - }, - "include": [ - "os.json", - "package.json", - "compiler.json", - "tbb.json" - ], - "configurePresets": [ - { - "name": "nightly-linux-DG2-JIT-MULTILEVEL", - "inherits": ["package-linux", "env", "dpcpp", "ispc_NEWEST", "tbb_NEWEST"], - "cacheVariables": { - "CMAKE_BUILD_TYPE": "RelWithDebInfo", - "EMBREE_SYCL_SUPPORT": "ON", - "EMBREE_SYCL_AOT_DEVICES": "none", - "EMBREE_MAX_ISA": "SSE2", - "EMBREE_MAX_INSTANCE_LEVEL_COUNT": "2" - } - }, - { - "name": "nightly-linux-PVC-JIT", - "inherits": ["package-linux", "env", "dpcpp", "ispc_NEWEST", "tbb_NEWEST"], - "cacheVariables": { - "CMAKE_BUILD_TYPE": "RelWithDebInfo", - "EMBREE_SYCL_SUPPORT": "ON", - "EMBREE_SYCL_AOT_DEVICES": "none", - "EMBREE_MAX_ISA": "SSE2" - } - }, - { - "name": "nightly-windows-DG2-MULTILEVEL", - "inherits": ["package-windows", "env", "dpcpp-windows", "ispc_NEWEST", "tbb_NEWEST"], - "cacheVariables": { - "CMAKE_BUILD_TYPE": "RelWithDebInfo", - "EMBREE_SYCL_SUPPORT": "ON", - "EMBREE_SYCL_AOT_DEVICES": "none", - "EMBREE_MAX_ISA": "SSE2", - "EMBREE_MAX_INSTANCE_LEVEL_COUNT": "2" - } - }, - { - "name": "nightly-windows-DG2-JIT", - "inherits": ["package-windows", "env", "dpcpp-windows", "ispc_NEWEST", "tbb_NEWEST"], - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Release", - "EMBREE_SYCL_SUPPORT": "ON", - "EMBREE_SYCL_AOT_DEVICES": "none", - "EMBREE_MAX_ISA": "SSE2" - } - }, - { - "name": "nightly-windows-DG2-JIT-ICX", - "inherits": ["package-windows", "env", "icx-windows", "ispc_NEWEST", "tbb_NEWEST"], - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Release", - "EMBREE_SYCL_SUPPORT": "ON", - "EMBREE_SYCL_AOT_DEVICES": "none", - "EMBREE_MAX_ISA": "AVX512" - } - }, - { - "name": "nightly-windows-DG2-JIT-NIGHTLY", - "inherits": ["package-windows", "env", "dpcpp-windows", "ispc_NEWEST", "tbb_NEWEST"], - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Release", - "EMBREE_SYCL_SUPPORT": "ON", - "EMBREE_SYCL_AOT_DEVICES": "none", - "EMBREE_MAX_ISA": "AVX512" - } - }, - - { - "name": "nightly-linux-DEBUG-CLANG-SSE2-NAMESPACE", - "inherits": ["package-linux", "env", "clang", "tbb_NEWEST"], - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Debug", - "EMBREE_MAX_ISA": "SSE2", - "EMBREE_TUTORIALS_GLFW": "OFF", - "EMBREE_MAX_INSTANCE_LEVEL_COUNT": "8", - "EMBREE_API_NAMESPACE": "myembree", - "EMBREE_LIBRARY_NAME": "myembree" - } - }, - { - "name": "nightly-linux-DEBUG-CLANG-ISPC1_14_1-AVX2-INT-ADDRSANITIZER", - "inherits": ["package-linux", "env", "clang", "ispc1_14_1", "tasking_internal"], - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Debug", - "EMBREE_MAX_ISA": "AVX2", - "EMBREE_ADDRESS_SANITIZER": "ON", - "EMBREE_TUTORIALS_GLFW": "OFF" - } - }, - { - "name": "nightly-linux-DEBUG-CLANG-ISPC1_16_1-AVX2-TBB2021_9_0-STATIC", - "inherits": ["package-static-linux", "env", "clang", "ispc1_16_1", "tbb2021_9_0"], - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Debug", - "EMBREE_CONFIG": "frequency_level=simd128", - "EMBREE_MAX_ISA": "AVX2", - "EMBREE_TUTORIALS_GLFW": "OFF" - } - }, - { - "name": "nightly-linux-DEBUG-CLANG-ISPC1_16_1-AVX512VL-TBB2020_2", - "inherits": ["package-linux", "env", "clang", "ispc1_16_1", "tbb2020_2_0"], - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Debug", - "EMBREE_CONFIG": "frequency_level=simd256", - "EMBREE_MAX_ISA": "AVX512", - "EMBREE_TUTORIALS_GLFW": "OFF" - } - }, - { - "name": "nightly-linux-DEBUG-GCC-ISPC1_16_1-SSE2-TBB2021_2", - "inherits": ["package-linux", "env", "gcc", "ispc1_16_1", "tbb2021_2_0"], - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Debug", - "EMBREE_MAX_ISA": "SSE2", - "EMBREE_TUTORIALS_GLFW": "OFF" - } - }, - { - "name": "nightly-linux-DEBUG-GCC-ISPC1_16_1-AVX-TBB2019_9", - "inherits": ["package-linux", "env", "gcc", "ispc1_16_1", "tbb2019_9_0"], - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Debug", - "EMBREE_MAX_ISA": "AVX", - "EMBREE_TUTORIALS_GLFW": "OFF" - } - }, - { - "name": "nightly-linux-DEBUG-GCC-ISPC1_17_0-AVX2-TBB2021_2_0", - "inherits": ["package-linux", "env", "gcc", "ispc1_17_0", "tbb2021_2_0"], - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Debug", - "EMBREE_MAX_ISA": "AVX2", - "EMBREE_TUTORIALS_GLFW": "OFF" - } - }, - { - "name": "nightly-linux-DEBUG-ICX-ISPC1_16_1-AVX-TBB2019_2", - "inherits": ["package-linux", "env", "icx", "ispc1_16_1", "tbb2019_2_0"], - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Debug", - "EMBREE_MAX_ISA": "AVX", - "EMBREE_TUTORIALS_GLFW": "OFF" - } - }, - { - "name": "nightly-linux-DEBUG-ICX-ISPC1_16_1-AVX512VL-TBB2019_2", - "inherits": ["package-linux", "env", "icx", "ispc1_16_1", "tbb2019_2_0"], - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Debug", - "EMBREE_MAX_ISA": "AVX512", - "EMBREE_CONFIG": "frequency_level=simd256", - "EMBREE_TUTORIALS_GLFW": "OFF" - } - }, - { - "name": "nightly-linux-DEBUG-ICX-ISPC1_16_1-AVX512-TBB2019_9", - "inherits": ["package-linux", "env", "icx", "ispc1_16_1", "tbb2019_9_0"], - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Debug", - "EMBREE_MAX_ISA": "AVX512", - "EMBREE_CONFIG": "frequency_level=simd256", - "EMBREE_TUTORIALS_GLFW": "OFF" - } - }, - { - "name": "nightly-linux-DEBUG-ICX-ISPC1_16_1-AVX2-TBB2021_2_0", - "inherits": ["package-linux", "env", "icx", "ispc1_16_1", "tbb2021_2_0"], - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Debug", - "EMBREE_MAX_ISA": "AVX2", - "EMBREE_TUTORIALS_GLFW": "OFF" - } - }, - { - "name": "nightly-linux-DEBUG-ICX-ISPC1_17_0-AVX2-TBB2019_9", - "inherits": ["package-linux", "env", "icx", "ispc1_17_0", "tbb2019_9_0"], - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Debug", - "EMBREE_MAX_ISA": "AVX2", - "EMBREE_TUTORIALS_GLFW": "OFF" - } - }, - { - "name": "nightly-linux-DEBUG-ICX-ISPC1_17_0-AVX512VL-TBB2021_5_0", - "inherits": ["package-linux", "env", "icx", "ispc1_17_0", "tbb2021_5_0"], - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Debug", - "EMBREE_MAX_ISA": "AVX512", - "EMBREE_CONFIG": "frequency_level=simd256", - "EMBREE_TUTORIALS_GLFW": "OFF" - } - }, - { - "name": "nightly-distrotest", - "inherits": ["package-linux", "env", "gcc", "ispc_NEWEST", "tbb_SYSTEM"], - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Debug", - "EMBREE_MAX_ISA": "AVX2", - "EMBREE_TUTORIALS_GLFW": "OFF" - } - }, - { - "name": "nightly-distrotest-ISPC1_14_1-TBB2021_2", - "inherits": ["package-linux", "env", "gcc", "ispc1_14_1", "tbb2021_2_0"], - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Debug", - "EMBREE_MAX_ISA": "AVX2", - "EMBREE_TUTORIALS_GLFW": "OFF" - } - }, - { - "name": "nightly-distrotest-AVX512", - "inherits": ["package-linux", "env", "gcc", "ispc_NEWEST", "tbb_SYSTEM"], - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Debug", - "EMBREE_MAX_ISA": "AVX512", - "EMBREE_TUTORIALS_GLFW": "OFF" - } - }, - { - "name": "nightly-singleprimitive", - "inherits": ["package-linux", "env", "clang", "ispc_NEWEST", "tbb_NEWEST"], - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Debug", - "EMBREE_MAX_ISA": "AVX2", - "EMBREE_TUTORIALS_GLFW": "OFF", - "EMBREE_GEOMETRY_TRIANGLE": "OFF", - "EMBREE_GEOMETRY_QUAD": "OFF", - "EMBREE_GEOMETRY_GRID": "OFF", - "EMBREE_GEOMETRY_CURVE": "OFF", - "EMBREE_GEOMETRY_POINT": "OFF", - "EMBREE_GEOMETRY_SUBDIVISION": "OFF", - "EMBREE_GEOMETRY_USER": "OFF", - "EMBREE_GEOMETRY_INSTANCE": "OFF", - "EMBREE_GEOMETRY_INSTANCE_ARRAY": "OFF" - } - }, - { - "name": "nightly-singleprimitive-TRI", - "inherits": ["nightly-singleprimitive"], - "cacheVariables": { - "EMBREE_GEOMETRY_TRIANGLE": "ON" - } - }, - { - "name": "nightly-singleprimitive-QUAD", - "inherits": ["nightly-singleprimitive"], - "cacheVariables": { - "EMBREE_GEOMETRY_QUAD": "ON" - } - }, - { - "name": "nightly-singleprimitive-GRID", - "inherits": ["nightly-singleprimitive"], - "cacheVariables": { - "EMBREE_GEOMETRY_TRIANGLE": "ON", - "EMBREE_GEOMETRY_SUBDIVISION": "ON", - "EMBREE_GEOMETRY_GRID": "ON" - } - }, - { - "name": "nightly-singleprimitive-CURVE", - "inherits": ["nightly-singleprimitive"], - "cacheVariables": { - "EMBREE_GEOMETRY_TRIANGLE": "ON", - "EMBREE_GEOMETRY_CURVE": "ON" - } - }, - { - "name": "nightly-singleprimitive-SUBDIV", - "inherits": ["nightly-singleprimitive"], - "cacheVariables": { - "EMBREE_GEOMETRY_TRIANGLE": "ON", - "EMBREE_GEOMETRY_SUBDIVISION": "ON" - } - }, - { - "name": "nightly-singleprimitive-USERGEOM", - "inherits": ["nightly-singleprimitive"], - "cacheVariables": { - "EMBREE_GEOMETRY_TRIANGLE": "ON", - "EMBREE_GEOMETRY_USER": "ON" - } - }, - { - "name": "nightly-singleprimitive-INSTANCE", - "inherits": ["nightly-singleprimitive"], - "cacheVariables": { - "EMBREE_GEOMETRY_TRIANGLE": "ON", - "EMBREE_GEOMETRY_INSTANCE": "ON" - } - }, - { - "name": "nightly-singleprimitive-INSTANCE_ARRAY", - "inherits": ["nightly-singleprimitive"], - "cacheVariables": { - "EMBREE_GEOMETRY_TRIANGLE": "ON", - "EMBREE_GEOMETRY_INSTANCE_ARRAY": "ON" - } - }, - { - "name": "nightly-singleprimitive-INSTANCE-INSTANCE_ARRAY", - "inherits": ["nightly-singleprimitive"], - "cacheVariables": { - "EMBREE_GEOMETRY_TRIANGLE": "ON", - "EMBREE_GEOMETRY_INSTANCE": "ON", - "EMBREE_GEOMETRY_INSTANCE_ARRAY": "ON" - } - }, - { - "name": "nightly-linux-feature-NO_ISPC", - "inherits": ["package-linux", "env", "clang", "tbb_NEWEST"], - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Debug", - "EMBREE_MAX_ISA": "AVX2", - "EMBREE_TUTORIALS_GLFW": "OFF" - } - }, - { - "name": "nightly-linux-feature-NO_TUTORIALS", - "inherits": ["package-linux", "env", "clang", "ispc_NEWEST", "tbb_NEWEST"], - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Debug", - "EMBREE_MAX_ISA": "AVX2", - "EMBREE_TUTORIALS_GLFW": "OFF", - "EMBREE_TUTORIALS": "OFF" - } - }, - { - "name": "nightly-linux-feature-BACKFACECULLING", - "inherits": ["package-linux", "env", "clang", "ispc_NEWEST", "tbb_NEWEST"], - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Debug", - "EMBREE_MAX_ISA": "AVX2", - "EMBREE_TUTORIALS_GLFW": "OFF", - "EMBREE_BACKFACE_CULLING": "ON" - } - }, - { - "name": "nightly-linux-feature-IGNORE-INVALID-RAYS", - "inherits": ["package-linux", "env", "clang", "ispc_NEWEST", "tbb_NEWEST"], - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Debug", - "EMBREE_MAX_ISA": "AVX2", - "EMBREE_TUTORIALS_GLFW": "OFF", - "EMBREE_BACKFACE_CULLING": "IGNORE_INVALID_RAYS" - } - }, - { - "name": "nightly-linux-feature-NO-FILTER-FUNCTION", - "inherits": ["package-linux", "env", "clang", "ispc_NEWEST", "tbb_NEWEST"], - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Debug", - "EMBREE_MAX_ISA": "AVX2", - "EMBREE_TUTORIALS_GLFW": "OFF", - "EMBREE_FILTER_FUNCTION": "OFF" - } - }, - { - "name": "nightly-linux-feature-RAYMASKS", - "inherits": ["package-linux", "env", "clang", "ispc_NEWEST", "tbb_NEWEST"], - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Debug", - "EMBREE_MAX_ISA": "AVX2", - "EMBREE_TUTORIALS_GLFW": "OFF", - "EMBREE_RAY_MASK": "ON" - } - }, - { - "name": "nightly-linux-feature-NO-PACKETS", - "inherits": ["package-linux", "env", "clang", "ispc_NEWEST", "tbb_NEWEST"], - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Debug", - "EMBREE_MAX_ISA": "AVX2", - "EMBREE_TUTORIALS_GLFW": "OFF", - "EMBREE_RAY_PACKETS": "OFF" - } - }, - { - "name": "nightly-linux-feature-STATCOUNTER", - "inherits": ["package-linux", "env", "clang", "ispc_NEWEST", "tbb_NEWEST"], - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Debug", - "EMBREE_MAX_ISA": "AVX2", - "EMBREE_TUTORIALS_GLFW": "OFF", - "EMBREE_STAT_COUNTERS": "ON" - } - }, - { - "name": "nightly-linux-individualisa", - "inherits": ["package-linux", "env", "clang", "ispc_NEWEST", "tbb_NEWEST"], - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Debug", - "EMBREE_TUTORIALS_GLFW": "OFF", - "EMBREE_ISA_SSE2": "OFF", - "EMBREE_ISA_SSE42": "OFF", - "EMBREE_AVX": "OFF", - "EMBREE_AVX2": "OFF", - "EMBREE_AVX512": "OFF" - } - }, - { - "name": "nightly-linux-individualisa-SSE2", - "inherits": ["nightly-linux-individualisa"], - "cacheVariables": { - "EMBREE_ISA_SSE2": "ON" - } - }, - { - "name": "nightly-linux-individualisa-SSE42", - "inherits": ["nightly-linux-individualisa"], - "cacheVariables": { - "EMBREE_ISA_SSE42": "ON" - } - }, - { - "name": "nightly-linux-individualisa-AVX", - "inherits": ["nightly-linux-individualisa"], - "cacheVariables": { - "EMBREE_ISA_AVX": "ON" - } - }, - { - "name": "nightly-linux-individualisa-AVX2", - "inherits": ["nightly-linux-individualisa"], - "cacheVariables": { - "EMBREE_ISA_AVX2": "ON" - } - }, - { - "name": "nightly-linux-individualisa-AVX512", - "inherits": ["nightly-linux-individualisa"], - "cacheVariables": { - "EMBREE_ISA_AVX512": "ON" - } - }, - - - { - "name": "nightly-windows-RELEASE-ICX-ISPC1_13_0-AVX2-TBB2021_5_0", - "inherits": ["package-windows", "env", "icx-windows", "ispc1_13_0", "tbb2021_5_0"], - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Release", - "EMBREE_MAX_ISA": "AVX2", - "EMBREE_CONFIG": "frequency_level=simd128", - "EMBREE_TUTORIALS_GLFW": "OFF" - } - }, - { - "name": "nightly-windows-RELEASE-ICX-ISPC1_13_0-AVX512-TBB2019_9", - "inherits": ["package-windows", "env", "icx-windows", "ispc1_13_0", "tbb2019_9_0"], - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Release", - "EMBREE_MAX_ISA": "AVX512", - "EMBREE_TUTORIALS_GLFW": "OFF" - } - }, - { - "name": "nightly-windows-RELEASE-ICX-ISPC1_14_1-AVX2-TBB2021_2_0", - "inherits": ["package-windows", "env", "icx-windows", "ispc1_14_1", "tbb2021_2_0"], - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Release", - "EMBREE_MAX_ISA": "AVX2", - "EMBREE_TUTORIALS_GLFW": "OFF" - } - }, - - { - "name": "nightly-macosx-ARM-NEON", - "binaryDir": "${sourceDir}/build", - "inherits": ["macos", "env", "clang", "ispc_NEWEST", "tbb_HOMEBREW"], - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Debug", - "EMBREE_TUTORIALS_GLFW": "OFF", - "EMBREE_MAX_ISA": "NEON" - } - }, - { - "name": "nightly-macosx-x64", - "binaryDir": "${sourceDir}/build", - "inherits": ["package-macos", "env", "clang", "ispc_NEWEST", "tbb_NEWEST"], - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Debug", - "EMBREE_TUTORIALS_GLFW": "OFF" - } - }, - { - "name": "nightly-macosx-individualisa-CLANG-SSE2", - "binaryDir": "${sourceDir}/build", - "inherits": ["package-macos", "env", "clang", "tbb_NEWEST"], - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Debug", - "EMBREE_TUTORIALS_GLFW": "OFF", - "EMBREE_MAX_ISA": "NONE", - "EMBREE_ISA_SSE2": "ON", - "EMBREE_ISA_SSE42": "OFF", - "EMBREE_ISA_AVX": "OFF", - "EMBREE_ISA_AVX2": "OFF", - "EMBREE_ISA_AVX512": "OFF", - "EMBREE_API_NAMESPACE": "myembree", - "EMBREE_LIBRARY_NAME": "myembree", - "EMBREE_MAX_INSTANCE_LEVEL_COUNT": "4" - } - }, - { - "name": "nightly-macosx-individualisa-CLANG-AVX", - "binaryDir": "${sourceDir}/build", - "inherits": ["package-macos", "env", "clang", "ispc_NEWEST", "tasking_internal"], - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Debug", - "EMBREE_TUTORIALS_GLFW": "OFF", - "EMBREE_MAX_ISA": "NONE", - "EMBREE_ISA_SSE2": "OFF", - "EMBREE_ISA_SSE42": "OFF", - "EMBREE_ISA_AVX": "ON", - "EMBREE_ISA_AVX2": "OFF", - "EMBREE_ISA_AVX512": "OFF" - } - }, - { - "name": "nightly-macosx-individualisa-CLANG-SSE2-STATIC", - "binaryDir": "${sourceDir}/build", - "inherits": ["package-macos", "env", "clang", "ispc_NEWEST", "tasking_internal"], - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Debug", - "EMBREE_TUTORIALS_GLFW": "OFF", - "EMBREE_MAX_ISA": "NONE", - "EMBREE_ISA_SSE2": "ON", - "EMBREE_ISA_SSE42": "OFF", - "EMBREE_ISA_AVX": "OFF", - "EMBREE_ISA_AVX2": "OFF", - "EMBREE_ISA_AVX512": "OFF", - "EMBREE_STATIC_LIB": "ON" - } - }, - { - "name": "nightly-macosx-AVX", - "binaryDir": "${sourceDir}/build", - "inherits": ["package-macos", "env", "clang", "ispc_NEWEST", "tasking_internal"], - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Debug", - "EMBREE_TUTORIALS_GLFW": "OFF", - "EMBREE_MAX_ISA": "NONE", - "EMBREE_ISA_AVX": "ON" - } - }, - { - "name": "nightly-macosx-AVX2-SIMD256", - "binaryDir": "${sourceDir}/build", - "inherits": ["package-macos", "env", "clang", "ispc_NEWEST", "tbb_NEWEST"], - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Debug", - "EMBREE_TUTORIALS_GLFW": "OFF", - "EMBREE_MAX_ISA": "NONE", - "EMBREE_ISA_AVX2": "ON", - "EMBREE_CONFIG": "frequency_level=simd256" - } - }, - { - "name": "nightly-macosx-AVX2", - "binaryDir": "${sourceDir}/build", - "inherits": ["package-macos", "env", "clang", "ispc_NEWEST", "tbb_NEWEST"], - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Debug", - "EMBREE_TUTORIALS_GLFW": "OFF", - "EMBREE_MAX_ISA": "NONE", - "EMBREE_ISA_AVX2": "ON", - "EMBREE_CONFIG": "frequency_level=simd128" - } - }, - { - "name": "nightly-linux-arm-emulation", - "binaryDir": "${sourceDir}/build", - "inherits": ["package-linux", "env", "gcc", "tasking_internal"], - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Debug", - "EMBREE_TUTORIALS_GLFW": "OFF", - "EMBREE_MAX_ISA": "NONE" - } - } - - ] -} - diff --git a/scripts/cmake-presets/os.json b/scripts/cmake-presets/os.json deleted file mode 100644 index b595c58cd5..0000000000 --- a/scripts/cmake-presets/os.json +++ /dev/null @@ -1,99 +0,0 @@ -{ - "version": 4, - "cmakeMinimumRequired": { - "major": 3, - "minor": 23, - "patch": 0 - }, - "configurePresets": [ - { - "name": "windows", - "hidden": true, - "condition": { - "type": "equals", - "lhs": "${hostSystemName}", - "rhs": "Windows" - }, - "environment": { - "BINARY_EXTENSION": ".exe", - "APPS_PATH": "$env{STORAGE_PATH}\\packages\\apps", - "EMBREE_ISPC_VERSION_SUFFIX": "windows", - "EMBREE_TBB_VERSION_SUFFIX": "windows" - } - }, - - { - "name": "macos", - "hidden": true, - "condition": { - "type": "equals", - "lhs": "${hostSystemName}", - "rhs": "Darwin" - }, - "environment": { - "BINARY_EXTENSION": "", - "APPS_PATH": "$env{STORAGE_PATH}/packages/apps", - "EMBREE_ISPC_VERSION_SUFFIX": "osx", - "EMBREE_TBB_VERSION_SUFFIX": "osx" - } - }, - - { - "name": "linux", - "hidden": true, - "condition": { - "type": "equals", - "lhs": "${hostSystemName}", - "rhs": "Linux" - }, - "environment": { - "BINARY_EXTENSION": "", - "APPS_PATH": "$env{STORAGE_PATH}/packages/apps", - "EMBREE_ISPC_VERSION_SUFFIX": "linux", - "EMBREE_TBB_VERSION_SUFFIX": "linux" - } - }, - - { - "name": "env", - "hidden": true, - "environment": { - "EMBREE_CLANG_4_0_0_PP": "$env{APPS_PATH}/clang/v4.0.0/bin/clang++", - "EMBREE_CLANG_4_0_0": "$env{APPS_PATH}/clang/v4.0.0/bin/clang", - "EMBREE_CLANG_5_0_0_PP": "$env{APPS_PATH}/clang/v5.0.0/bin/clang++", - "EMBREE_CLANG_5_0_0": "$env{APPS_PATH}/clang/v5.0.0/bin/clang", - "EMBREE_CLANG_PP": "clang++", - "EMBREE_CLANG": "clang", - - "EMBREE_ISPC_1_13_0_PATH": "$env{APPS_PATH}/ispc/1.13.0-$env{EMBREE_ISPC_VERSION_SUFFIX}/bin/ispc$env{BINARY_EXTENSION}", - "EMBREE_ISPC_1_14_1_PATH": "$env{APPS_PATH}/ispc/1.14.1-$env{EMBREE_ISPC_VERSION_SUFFIX}/bin/ispc$env{BINARY_EXTENSION}", - "EMBREE_ISPC_1_15_0_PATH": "$env{APPS_PATH}/ispc/1.15.0-$env{EMBREE_ISPC_VERSION_SUFFIX}/bin/ispc$env{BINARY_EXTENSION}", - "EMBREE_ISPC_1_16_1_PATH": "$env{APPS_PATH}/ispc/1.16.1-$env{EMBREE_ISPC_VERSION_SUFFIX}/bin/ispc$env{BINARY_EXTENSION}", - "EMBREE_ISPC_1_17_0_PATH": "$env{APPS_PATH}/ispc/1.17.0-$env{EMBREE_ISPC_VERSION_SUFFIX}/bin/ispc$env{BINARY_EXTENSION}", - "EMBREE_ISPC_1_18_1_PATH": "$env{APPS_PATH}/ispc/1.18.1-$env{EMBREE_ISPC_VERSION_SUFFIX}/bin/ispc$env{BINARY_EXTENSION}", - "EMBREE_ISPC_1_19_0_PATH": "$env{APPS_PATH}/ispc/1.19.0-$env{EMBREE_ISPC_VERSION_SUFFIX}/bin/ispc$env{BINARY_EXTENSION}", - "EMBREE_ISPC_1_20_0_PATH": "$env{APPS_PATH}/ispc/1.20.0-$env{EMBREE_ISPC_VERSION_SUFFIX}/bin/ispc$env{BINARY_EXTENSION}", - "EMBREE_ISPC_1_21_0_PATH": "$env{APPS_PATH}/ispc/1.21.0-$env{EMBREE_ISPC_VERSION_SUFFIX}/bin/ispc$env{BINARY_EXTENSION}", - "EMBREE_ISPC_1_22_0_PATH": "$env{APPS_PATH}/ispc/1.22.0-$env{EMBREE_ISPC_VERSION_SUFFIX}/bin/ispc$env{BINARY_EXTENSION}", - "EMBREE_ISPC_1_23_0_PATH": "$env{APPS_PATH}/ispc/1.23.0-$env{EMBREE_ISPC_VERSION_SUFFIX}/bin/ispc$env{BINARY_EXTENSION}", - "EMBREE_ISPC_PATH": "", - - - "EMBREE_TBB_2019_2_DIR": "$env{APPS_PATH}/tbb/tbb-2019.2-$env{EMBREE_TBB_VERSION_SUFFIX}/cmake", - "EMBREE_TBB_2019_9_DIR": "$env{APPS_PATH}/tbb/tbb-2019.9-$env{EMBREE_TBB_VERSION_SUFFIX}/cmake", - "EMBREE_TBB_2020_2_DIR": "$env{APPS_PATH}/tbb/tbb-2020.2-$env{EMBREE_TBB_VERSION_SUFFIX}/cmake", - "EMBREE_TBB_2021_1_1_DIR": "$env{APPS_PATH}/tbb/tbb-2021.1.1-$env{EMBREE_TBB_VERSION_SUFFIX}/lib/cmake/tbb", - "EMBREE_TBB_2021_2_0_DIR": "$env{APPS_PATH}/tbb/tbb-2021.2.0-$env{EMBREE_TBB_VERSION_SUFFIX}/lib/cmake/tbb", - "EMBREE_TBB_2021_3_0_DIR": "$env{APPS_PATH}/tbb/tbb-2021.3.0-$env{EMBREE_TBB_VERSION_SUFFIX}/lib/cmake/tbb", - "EMBREE_TBB_2021_5_0_DIR": "$env{APPS_PATH}/tbb/tbb-2021.5.0-$env{EMBREE_TBB_VERSION_SUFFIX}/lib/cmake/tbb", - "EMBREE_TBB_2021_7_0_DIR": "$env{APPS_PATH}/tbb/tbb-2021.7.0-$env{EMBREE_TBB_VERSION_SUFFIX}/lib/cmake/tbb", - "EMBREE_TBB_2021_9_0_DIR": "$env{APPS_PATH}/tbb/tbb-2021.9.0-$env{EMBREE_TBB_VERSION_SUFFIX}/lib/cmake/tbb", - "EMBREE_TBB_2021_10_0_DIR": "$env{APPS_PATH}/tbb/tbb-2021.10.0-$env{EMBREE_TBB_VERSION_SUFFIX}/lib/cmake/tbb", - "EMBREE_TBB_2021_11_0_DIR": "$env{APPS_PATH}/tbb/tbb-2021.11.0-$env{EMBREE_TBB_VERSION_SUFFIX}/lib/cmake/tbb", - "EMBREE_TBB_2021_12_0_DIR": "$env{APPS_PATH}/tbb/tbb-2021.12.0-$env{EMBREE_TBB_VERSION_SUFFIX}/lib/cmake/tbb", - "EMBREE_TBB_DIR": "" - } - } - ] -} - diff --git a/scripts/cmake-presets/package.json b/scripts/cmake-presets/package.json deleted file mode 100644 index e218cea8d3..0000000000 --- a/scripts/cmake-presets/package.json +++ /dev/null @@ -1,112 +0,0 @@ -{ - "version": 4, - "cmakeMinimumRequired": { - "major": 3, - "minor": 23, - "patch": 0 - }, - "include": ["os.json"], - "configurePresets": [ - { - "name": "package", - "hidden": true, - "binaryDir": "${sourceDir}/build", - "cacheVariables": { - "BUILD_TESTING": "ON", - "EMBREE_TESTING_INSTALL_TESTS": "ON", - "EMBREE_ZIP_MODE": "ON", - "EMBREE_INSTALL_DEPENDENCIES": "ON", - "EMBREE_BUILD_GLFW_FROM_SOURCE": "ON", - "EMBREE_PATCH_GLFW_SOURCE": "ON", - "CMAKE_INSTALL_INCLUDEDIR": "include", - "CMAKE_INSTALL_LIBDIR": "lib", - "CMAKE_INSTALL_DOCDIR": "doc", - "CMAKE_INSTALL_BINDIR": "bin", - "CMAKE_INSTALL_TESTDIR": "testing" - } - }, - { - "name": "package-static", - "hidden": true, - "inherits": "package", - "cacheVariables": { - "EMBREE_STATIC_LIB": "ON" - } - }, - - - { - "name": "package-linux", - "hidden": true, - "inherits": ["package", "linux"], - "cacheVariables": { - "CMAKE_SKIP_INSTALL_RPATH": "OFF" - } - }, - { - "name": "package-static-linux", - "hidden": true, - "inherits": ["package-static", "linux"], - "cacheVariables": { - "CMAKE_SKIP_INSTALL_RPATH": "OFF" - } - }, - - - { - "name": "package-macos", - "hidden": true, - "inherits": ["package", "macos"], - "cacheVariables": { - "CMAKE_SKIP_INSTALL_RPATH": "OFF", - "CMAKE_MACOSX_RPATH": "ON" - } - }, - { - "name": "package-macos-signed", - "hidden": true, - "inherits": ["package", "macos"], - "cacheVariables": { - "CMAKE_SKIP_INSTALL_RPATH": "OFF", - "CMAKE_MACOSX_RPATH": "ON", - "EMBREE_SIGN_FILE": "$env{SIGN_FILE_MAC}" - } - }, - { - "name": "package-static-macos", - "hidden": true, - "inherits": ["package-static", "macos"], - "cacheVariables": { - "CMAKE_SKIP_INSTALL_RPATH": "OFF", - "CMAKE_MACOSX_RPATH": "ON", - "EMBREE_SIGN_FILE": "$env{SIGN_FILE_MAC}" - } - }, - { - "name": "package-windows", - "hidden": true, - "inherits": ["package", "windows"], - "cacheVariables": { - "CMAKE_INSTALL_DATAROOTDIR": "" - } - }, - { - "name": "package-windows-signed", - "hidden": true, - "inherits": ["package", "windows"], - "cacheVariables": { - "CMAKE_INSTALL_DATAROOTDIR": "", - "EMBREE_SIGN_FILE": "$env{SIGN_FILE_WINDOWS}" - } - }, - { - "name": "package-static-windows", - "hidden": true, - "inherits": ["package-static", "windows"], - "cacheVariables": { - "CMAKE_INSTALL_DATAROOTDIR": "" - } - } - ] -} - diff --git a/scripts/cmake-presets/performance.json b/scripts/cmake-presets/performance.json deleted file mode 100644 index 7fe6fbe398..0000000000 --- a/scripts/cmake-presets/performance.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "version": 4, - "cmakeMinimumRequired": { - "major": 3, - "minor": 11, - "patch": 0 - }, - "include": [ - "os.json", - "package.json", - "compiler.json", - "tbb.json" - ], - "configurePresets": [ - { - "name": "perf-linux-icx", - "inherits": ["package-linux", "env", "icx", "ispc1_19_0", "tbb2021_9_0"], - "binaryDir": "${sourceDir}/build", - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Release", - "EMBREE_MAX_ISA": "AVX512", - "EMBREE_USE_GOOGLE_BENCHMARK": "ON", - "EMBREE_BUILD_GOOGLE_BENCHMARK_FROM_SOURCE": "ON" - } - }, - { - "name": "perf-linux-icx-sycl", - "inherits": ["perf-linux-icx"], - "binaryDir": "${sourceDir}/build", - "cacheVariables": { - "EMBREE_SYCL_SUPPORT": "ON", - "EMBREE_SYCL_AOT_DEVICES": "none" - } - } - ] -} - - diff --git a/scripts/cmake-presets/public.json b/scripts/cmake-presets/public.json deleted file mode 100644 index 2356e88efa..0000000000 --- a/scripts/cmake-presets/public.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "version": 4, - "cmakeMinimumRequired": { - "major": 3, - "minor": 23, - "patch": 0 - }, - "include": [ - "package.json", - "compiler.json", - "tbb.json" - ], - "configurePresets": [ - { - "name": "public-gcc-tbb", - "inherits": ["package", "gcc", "tbb_SYSTEM"], - "binaryDir": "${sourceDir}/build", - "cacheVariables": { - "EMBREE_MAX_ISA": "AVX2" - } - }, - - { - "name": "public-clang-tbbhomebrew-sse2", - "inherits": ["package", "clang", "tbb_HOMEBREW"], - "binaryDir": "${sourceDir}/build", - "cacheVariables": { - "EMBREE_MAX_ISA": "SSE2" - } - }, - - - { - "name": "public-v143-int-sse2", - "inherits": ["package", "tasking_internal"], - "binaryDir": "${sourceDir}/build", - "generator": "Visual Studio 17 2022", - "architecture": "x64" - } - ] -} diff --git a/scripts/cmake-presets/release.json b/scripts/cmake-presets/release.json deleted file mode 100644 index 895b75424a..0000000000 --- a/scripts/cmake-presets/release.json +++ /dev/null @@ -1,78 +0,0 @@ -{ - "version": 4, - "cmakeMinimumRequired": { - "major": 3, - "minor": 11, - "patch": 0 - }, - "include": [ - "os.json", - "package.json", - "compiler.json", - "tbb.json" - ], - "configurePresets": [ - { - "name": "release-windows", - "inherits": ["package-windows-signed", "env", "dpcpp-windows", "ispc1_23_0", "tbb2021_11_0"], - "binaryDir": "${sourceDir}/build", - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Release", - "EMBREE_MAX_ISA": "AVX512" - } - }, - { - "name": "release-macos", - "inherits": ["package-macos", "env", "clang", "ispc1_23_0", "tbb2021_11_0"], - "binaryDir": "${sourceDir}/build", - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Release", - "EMBREE_MAX_ISA": "AVX512", - "CPACK_PRE_BUILD_SCRIPTS": "$env{CPACK_PRE_BUILD_SIGNING_SCRIPT}" - } - }, - { - "name": "release-macos-arm", - "inherits": ["package-macos", "env", "clang", "ispc1_23_0", "tbb2021_11_0"], - "binaryDir": "${sourceDir}/build", - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Release", - "EMBREE_MAX_ISA": "NEON2X", - "CPACK_PRE_BUILD_SCRIPTS": "$env{CPACK_PRE_BUILD_SIGNING_SCRIPT}" - } - }, - { - "name": "release-linux", - "inherits": ["package-linux", "env", "dpcpp", "ispc_NEWEST", "tbb_NEWEST"], - "binaryDir": "${sourceDir}/build", - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Release", - "EMBREE_MAX_ISA": "AVX512" - } - }, - - { - "name": "release-windows-sycl", - "inherits": ["package-windows-signed", "env", "dpcpp-windows", "ispc1_23_0", "tbb2021_11_0"], - "binaryDir": "${sourceDir}/build", - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Release", - "EMBREE_SYCL_SUPPORT": "ON", - "EMBREE_SYCL_AOT_DEVICES": "none", - "EMBREE_MAX_ISA": "AVX512" - } - }, - { - "name": "release-linux-sycl", - "inherits": ["package-linux", "env", "dpcpp", "ispc1_23_0", "tbb2021_11_0"], - "binaryDir": "${sourceDir}/build", - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Release", - "EMBREE_SYCL_SUPPORT": "ON", - "EMBREE_SYCL_AOT_DEVICES": "none", - "EMBREE_MAX_ISA": "AVX512" - } - } - ] -} - diff --git a/scripts/cmake-presets/tbb.json b/scripts/cmake-presets/tbb.json deleted file mode 100644 index 3ccfeb07aa..0000000000 --- a/scripts/cmake-presets/tbb.json +++ /dev/null @@ -1,96 +0,0 @@ -{ - "version": 4, - "cmakeMinimumRequired": { - "major": 3, - "minor": 23, - "patch": 0 - }, - "configurePresets": [ - { - "name": "tasking_internal", - "cacheVariables": { - "EMBREE_TASKING_SYSTEM": "INTERNAL" - } - }, - { - "name": "tbb_SYSTEM", - "cacheVariables": { - "EMBREE_TASKING_SYSTEM": "TBB" - } - }, - { - "name": "tbb_HOMEBREW", - "cacheVariables": { - "EMBREE_TASKING_SYSTEM": "TBB", - "EMBREE_TBB_ROOT": "/opt/homebrew" - } - }, - { - "name": "tbb2019_2_0", - "inherits": "tbb_SYSTEM", - "cacheVariables": { - "TBB_DIR": "$env{EMBREE_TBB_2019_2_0_DIR}" - } - }, - { - "name": "tbb2019_9_0", - "inherits": "tbb_SYSTEM", - "cacheVariables": { - "TBB_DIR": "$env{EMBREE_TBB_2019_9_0_DIR}" - } - }, - { - "name": "tbb2020_2_0", - "inherits": "tbb_SYSTEM", - "cacheVariables": { - "TBB_DIR": "$env{EMBREE_TBB_2020_2_0_DIR}" - } - }, - { - "name": "tbb2021_2_0", - "inherits": "tbb_SYSTEM", - "cacheVariables": { - "TBB_DIR": "$env{EMBREE_TBB_2021_2_0_DIR}" - } - }, - { - "name": "tbb2021_5_0", - "inherits": "tbb_SYSTEM", - "cacheVariables": { - "TBB_DIR": "$env{EMBREE_TBB_2021_5_0_DIR}" - } - }, - { - "name": "tbb2021_9_0", - "inherits": "tbb_SYSTEM", - "cacheVariables": { - "TBB_DIR": "$env{EMBREE_TBB_2021_9_0_DIR}" - } - }, - { - "name": "tbb2021_10_0", - "inherits": "tbb_SYSTEM", - "cacheVariables": { - "TBB_DIR": "$env{EMBREE_TBB_2021_10_0_DIR}" - } - }, - { - "name": "tbb2021_11_0", - "inherits": "tbb_SYSTEM", - "cacheVariables": { - "TBB_DIR": "$env{EMBREE_TBB_2021_11_0_DIR}" - } - }, - { - "name": "tbb2021_12_0", - "inherits": "tbb_SYSTEM", - "cacheVariables": { - "TBB_DIR": "$env{EMBREE_TBB_2021_12_0_DIR}" - } - }, - { - "name": "tbb_NEWEST", - "inherits": "tbb2021_12_0" - } - ] -} \ No newline at end of file diff --git a/scripts/cmake-presets/windows-env.ps1 b/scripts/cmake-presets/windows-env.ps1 deleted file mode 100644 index 76b0d3bd8f..0000000000 --- a/scripts/cmake-presets/windows-env.ps1 +++ /dev/null @@ -1,5 +0,0 @@ -## Copyright 2019-2021 Intel Corporation -## SPDX-License-Identifier: Apache-2.0 - - -$env:CMAKE_EXE=cmake \ No newline at end of file diff --git a/scripts/coverity.sh b/scripts/coverity.sh deleted file mode 100644 index 0c6864c1fe..0000000000 --- a/scripts/coverity.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!\bin\bash - -# needed, because coverity build command must be single call from workflow - -# module load cmake/3.25.3 -export NAS_LINUX=$STORAGE_PATH/packages/apps -cmake --build build --config Release --target build \ No newline at end of file diff --git a/scripts/download_dpcpp.sh b/scripts/download_dpcpp.sh deleted file mode 100755 index a19c31095c..0000000000 --- a/scripts/download_dpcpp.sh +++ /dev/null @@ -1,86 +0,0 @@ -#!/usr/bin/env bash - -if [ -z $3 ]; then - echo "ERROR: usage $0 version target-directory platform " - echo " platform: either WIN or LINUX" - echo " : optional github access token. without the token api request rate limit can be exceeded quickly" - exit 1 -fi - -if [ -z $4 ]; then - DPCPP_VERSION=$1 - DST_DIR=$2 - PLATFORM=$3 - TOKEN="" -else - DPCPP_VERSION=$1 - DST_DIR=$2 - PLATFORM=$3 - TOKEN=$4 -fi - -CUR_DIR=$(pwd) -mkdir -p ${DST_DIR} -cd ${DST_DIR} - -if [ -d "${DPCPP_VERSION}" ]; then - echo "DPCPP compiler ${DPCPP_VERSION} already downloaded" - exit 0 -fi - -echo "Downloading DPCPP compiler with" -echo " DPCPP_VERSION: ${DPCPP_VERSION}" -echo " DST_DIR: ${DST_DIR}" -echo " PLATFORM: ${PLATFORM}" -echo " TOKEN: ${TOKEN}" - -GH_REPO="https://api.github.com/repos/intel/llvm" -GH_TAGS="${GH_REPO}/releases/tags/${DPCPP_VERSION}" -AUTH="-u ${TOKEN}:x-oauth-basic" - -# get asset tags. -response=$(curl ${AUTH} ${GH_TAGS}) - -# check for errors wrong URL or API request limit exceeded are the most common -error=$(echo $response | grep message) -if [ ! -z "${error}" ]; then - echo "ERROR:" - echo ${error} - exit 1 -fi - -ARCHIVE_NAME="sycl_linux.tar.gz" -if [ "$PLATFORM" = "WIN" ]; then - ARCHIVE_NAME="sycl_windows.tar.gz" -fi - -# get id of compiler archive -eval $(echo "${response}" | grep -C3 "name.:.\+${ARCHIVE_NAME}" | grep -w id | tr : = | tr -cd '[[:alnum:]]=') -[ "$id" ] || { echo "Error: Failed to get asset id, response: ${response}" | awk 'length($0)<100' >&2; exit 1; } - -# Download asset file. -echo "Downloading dpcpp compiler archive ${ARCHIVE_NAME} to ${DST_DIR}" >&2 -curl -LJO# ${AUTH} -H 'Accept: application/octet-stream' "$GH_REPO/releases/assets/$id" - -echo "Unpacking archive" -mkdir -p ${DPCPP_VERSION} -mv ${ARCHIVE_NAME} ${DPCPP_VERSION} -cd ${DPCPP_VERSION} -tar -xzf ${ARCHIVE_NAME} -rm -rf ${ARCHIVE_NAME} - -# add startup script to Windows version of the compiler -if [ "$PLATFORM" = "WIN" ]; then -echo '@echo off -set "DPCPP_DIR=%~dp0" -set "PATH=%DPCPP_DIR%\bin;%PATH%" -set "PATH=%DPCPP_DIR%\lib;%PATH%" -set "CPATH=%DPCPP_DIR%\include;%CPATH%" -set "INCLUDE=%DPCPP_DIR%\include;%INCLUDE%" -set "LIB=%DPCPP_DIR%\lib;%LIB%"' > ${DST_DIR}/${DPCPP_VERSION}/startup.bat -fi - - -echo "dpcpp compiler available here ${DST_DIR}/${DPCPP_VERSION}" - -cd ${CUR_DIR} diff --git a/scripts/download_gfx.sh b/scripts/download_gfx.sh deleted file mode 100755 index 9bd9b7536e..0000000000 --- a/scripts/download_gfx.sh +++ /dev/null @@ -1,96 +0,0 @@ -#!/usr/bin/env bash -set -e - -if [ -z $3 ]; then - echo "ERROR: usage $0 gfx-driver target-directory token" - echo " gfx-driver: URL to the driver packages relative to artifactory URL (e.g. gfx-driver-builds/ci/master/gfx-driver-ci-master-9999/artifacts/Linux/Ubuntu/22.04/Release" - echo " token: access token to (artifactory) repository" - exit 1 -fi - -ARTIFACTORY_URL="https://gfx-assets-build.igk.intel.com/artifactory" -GFX_DRIVER=$1 -DST_DIR=$2 -TOKEN=$3 - -if [[ -d "${DST_DIR}/${GFX_DRIVER}" ]]; then - echo "GFX driver ${GFX_DRIVER} already downloaded in ${DST_DIR}" - exit 0 -fi - -URL=${ARTIFACTORY_URL}"/"${GFX_DRIVER}/ - -CUR_DIR=$(pwd) -mkdir -p /tmp/${GFX_DRIVER} -cd /tmp/${GFX_DRIVER} - -if [[ $GFX_DRIVER == *"linux"* ]] || [[ $GFX_DRIVER == *"Linux"* ]] ; then - echo "Downloading Linux driver packages using" - echo " ARTIFACTORY_URL=${ARTIFACTORY_URL}" - echo " GFX_DRIVER=${GFX_DRIVER}" - echo " DST_DIR=${DST_DIR}" - echo " TOKEN=${TOKEN}" - - if [[ $GFX_DRIVER == *"open-linux"* ]] ; then - DEBS="*" - elif [[ $GFX_DRIVER == *"neo-releases"* ]] ; then - DEBS="*" - elif [[ $GFX_DRIVER == *"neo-master"* ]] ; then - DEBS="*" - else - DEBS="level-zero|intel-level-zero-gpu|intel-opencl-icd|libigc1|libigc-tools|libigdfcl1|libigdgmm" - fi - - PACKAGES=$(curl -H "X-JFrog-Art-Api:$TOKEN" -s $URL | - sed 's/ ${DST_DIR}/${GFX_DRIVER}/install/etc/OpenCL/vendors/intel.icd - - echo "Driver installed to ${DST_DIR}/${GFX_DRIVER}/install" - -elif [[ $GFX_DRIVER == *"Windows"* ]]; then - echo "Downloading Windows driver packages using" - echo " ARTIFACTORY_URL=${ARTIFACTORY_URL}" - echo " GFX_DRIVER=${GFX_DRIVER}" - echo " DST_DIR=${DST_DIR}" - echo " TOKEN=${TOKEN}" - - echo "Download Installer-Release" - curl -H "X-JFrog-Art-Api:${TOKEN}" -s -O ${URL}Installer-Release-64-bit.7z - echo "Download Ocloc-Release" - curl -H "X-JFrog-Art-Api:${TOKEN}" -s -O ${URL}Ocloc-Release-64-bit.7z - - echo "Unpacking Installer-Release" - 7z x Installer-Release-64-bit.7z - echo "Unpacking Ocloc-Release" - 7z x Ocloc-Release-64-bit.7z - - rm Installer-Release-64-bit.7z Ocloc-Release-64-bit.7z - mkdir -p ${DST_DIR}/${GFX_DRIVER} - cp -r * ${DST_DIR}/${GFX_DRIVER} - - chmod -R +x ${DST_DIR}/${GFX_DRIVER} - - echo "Driver installed to ${DST_DIR}/${GFX_DRIVER}" -else - echo "Platform could not be detected from gfx-driver URL" -fi - -cd ${CUR_DIR} -rm -rf /tmp/${GFX_DRIVER} - - diff --git a/scripts/prepare-test-files-macos.sh b/scripts/prepare-test-files-macos.sh new file mode 100755 index 0000000000..162301f1af --- /dev/null +++ b/scripts/prepare-test-files-macos.sh @@ -0,0 +1,77 @@ +#!/bin/bash +# Prepare Embree test files from build artifacts (macOS) +set -e + +# Default values - macOS uses ZIP files instead of TAR.GZ +DEST_DIR="./build/embree-release" +ARCHIVE_PATTERN="./build/*.zip" +TEST_TYPE="ctest" + +# Parse command line arguments +while [[ $# -gt 0 ]]; do + case $1 in + --dest) + DEST_DIR="$2" + shift 2 + ;; + --pattern) + ARCHIVE_PATTERN="$2" + shift 2 + ;; + --type) + TEST_TYPE="$2" + shift 2 + ;; + *) + echo "Unknown argument: $1" + exit 1 + ;; + esac +done + +echo "Preparing test files (macOS)..." >&2 +echo "Destination: $DEST_DIR" >&2 +echo "Archive pattern: $ARCHIVE_PATTERN" >&2 +echo "Test type: $TEST_TYPE" >&2 + +# Create destination directory +mkdir -p "$DEST_DIR" + +# Extract archives using unzip for macOS +if [[ "$TEST_TYPE" == "integration" ]]; then + # For integration tests, extract to embree_install + DEST_DIR="./build/embree_install" + mkdir -p "$DEST_DIR" + for archive in $ARCHIVE_PATTERN; do + if [[ -f "$archive" ]]; then + unzip -o "$archive" -d "$DEST_DIR" >&2 + echo "Extracted: $archive" >&2 + fi + done + + # Find embree-config.cmake and export path + EMBREE_CONFIG=$(find "$DEST_DIR" -name "embree-config.cmake" -print -quit) + if [[ -n "$EMBREE_CONFIG" ]]; then + EMBREE_DIR=$(dirname "$EMBREE_CONFIG") + # Convert to absolute path for integration tests since they change directories + EMBREE_DIR=$(cd "$EMBREE_DIR" && pwd) + echo "EMBREE_DIR=$EMBREE_DIR" >> "$GITHUB_ENV" + echo "Found embree-config.cmake at: $EMBREE_DIR" >&2 + echo "$EMBREE_DIR" # Output for immediate use + else + echo "Error: embree-config.cmake not found" >&2 + exit 1 + fi +else + # For CTest, extract to embree-release + for archive in $ARCHIVE_PATTERN; do + if [[ -f "$archive" ]]; then + unzip -o "$archive" -d "$DEST_DIR" >&2 + echo "Extracted: $archive" >&2 + fi + done + echo "EMBREE_DIR=$DEST_DIR" >> "$GITHUB_ENV" + echo "$DEST_DIR" # Output for immediate use +fi + +echo "Test files prepared successfully (macOS)" >&2 \ No newline at end of file diff --git a/scripts/prepare-test-files.ps1 b/scripts/prepare-test-files.ps1 new file mode 100644 index 0000000000..522c534873 --- /dev/null +++ b/scripts/prepare-test-files.ps1 @@ -0,0 +1,47 @@ +# Prepare Embree test files from build artifacts (PowerShell) +param( + [string]$DestDir = "./build/embree-release", + [string]$Pattern = "./build/*.zip", + [string]$TestType = "ctest" +) + +Write-Host "Preparing test files..." +Write-Host "Destination: $DestDir" +Write-Host "Archive pattern: $Pattern" +Write-Host "Test type: $TestType" + +# Create destination directory +New-Item -ItemType Directory -Path $DestDir -Force | Out-Null + +if ($TestType -eq "integration") { + # For integration tests, extract to embree_install + $DestDir = "./build/embree_install" + New-Item -ItemType Directory -Path $DestDir -Force | Out-Null + + Get-ChildItem -Path $Pattern | ForEach-Object { + Expand-Archive -Path $_.FullName -DestinationPath $DestDir -Force + Write-Host "Extracted: $($_.Name)" + } + + # Find embree-config.cmake and set environment variable + $EmbreeConfig = Get-ChildItem -Path $DestDir -Recurse -Name "embree-config.cmake" | Select-Object -First 1 + if ($EmbreeConfig) { + $EmbreeDir = Split-Path -Parent (Get-ChildItem -Path $DestDir -Recurse -Filter "embree-config.cmake" | Select-Object -First 1).FullName + $EmbreeDir = $EmbreeDir -replace [regex]::Escape((Get-Location).Path + "\"), "" + Write-Host "EMBREE_DIR=$EmbreeDir" | Out-File -FilePath $env:GITHUB_ENV -Append + Write-Host "Found embree-config.cmake at: $EmbreeDir" + } else { + Write-Error "embree-config.cmake not found" + exit 1 + } +} else { + # For CTest, extract to embree-release + Get-ChildItem -Path $Pattern | ForEach-Object { + Expand-Archive -Path $_.FullName -DestinationPath $DestDir -Force + Write-Host "Extracted: $($_.Name)" + } + Write-Host "EMBREE_DIR=$DestDir" | Out-File -FilePath $env:GITHUB_ENV -Append + Write-Output $DestDir # Output for immediate use +} + +Write-Host "Test files prepared successfully" \ No newline at end of file diff --git a/scripts/prepare-test-files.sh b/scripts/prepare-test-files.sh new file mode 100755 index 0000000000..48c99e042f --- /dev/null +++ b/scripts/prepare-test-files.sh @@ -0,0 +1,77 @@ +#!/bin/bash +# Prepare Embree test files from build artifacts +set -e + +# Default values +DEST_DIR="./build/embree-release" +ARCHIVE_PATTERN="./build/*.tar.gz" +TEST_TYPE="ctest" + +# Parse command line arguments +while [[ $# -gt 0 ]]; do + case $1 in + --dest) + DEST_DIR="$2" + shift 2 + ;; + --pattern) + ARCHIVE_PATTERN="$2" + shift 2 + ;; + --type) + TEST_TYPE="$2" + shift 2 + ;; + *) + echo "Unknown argument: $1" + exit 1 + ;; + esac +done + +echo "Preparing test files..." >&2 +echo "Destination: $DEST_DIR" >&2 +echo "Archive pattern: $ARCHIVE_PATTERN" >&2 +echo "Test type: $TEST_TYPE" >&2 + +# Create destination directory +mkdir -p "$DEST_DIR" + +# Extract archives +if [[ "$TEST_TYPE" == "integration" ]]; then + # For integration tests, extract to embree_install + DEST_DIR="./build/embree_install" + mkdir -p "$DEST_DIR" + for archive in $ARCHIVE_PATTERN; do + if [[ -f "$archive" ]]; then + tar -xzf "$archive" -C "$DEST_DIR" + echo "Extracted: $archive" >&2 + fi + done + + # Find embree-config.cmake and export path + EMBREE_CONFIG=$(find "$DEST_DIR" -name "embree-config.cmake" -print -quit) + if [[ -n "$EMBREE_CONFIG" ]]; then + EMBREE_DIR=$(dirname "$EMBREE_CONFIG") + # Convert to absolute path for integration tests since they change directories + EMBREE_DIR=$(cd "$EMBREE_DIR" && pwd) + echo "EMBREE_DIR=$EMBREE_DIR" >> "$GITHUB_ENV" + echo "Found embree-config.cmake at: $EMBREE_DIR" >&2 + echo "$EMBREE_DIR" # Output for immediate use + else + echo "Error: embree-config.cmake not found" >&2 + exit 1 + fi +else + # For CTest, extract to embree-release + for archive in $ARCHIVE_PATTERN; do + if [[ -f "$archive" ]]; then + tar -xzf "$archive" -C "$DEST_DIR" >&2 + echo "Extracted: $archive" >&2 + fi + done + echo "EMBREE_DIR=$DEST_DIR" >> "$GITHUB_ENV" + echo "$DEST_DIR" # Output for immediate use +fi + +echo "Test files prepared successfully" >&2 \ No newline at end of file diff --git a/scripts/run-tests.ps1 b/scripts/run-tests.ps1 new file mode 100644 index 0000000000..efe24292f9 --- /dev/null +++ b/scripts/run-tests.ps1 @@ -0,0 +1,72 @@ +# Run Embree tests (integration or CTest) - PowerShell +param( + [string]$TestType = "ctest", + [string]$BuildType = "Release", + [string]$CCompiler = "", + [string]$CxxCompiler = "", + [string]$EmbreeDir = "", + [string]$CtestConfig = "Release" +) + +Write-Host "Running tests..." +Write-Host "Test type: $TestType" +Write-Host "Build type: $BuildType" +Write-Host "Embree directory: $EmbreeDir" + +if ($TestType -eq "integration") { + Write-Host "Running integration tests..." + + if (-not $EmbreeDir) { + Write-Error "EMBREE_DIR not specified for integration tests" + exit 1 + } + + Set-Location "tests/integration/test_embree_release" + + # Build cmake command with compiler options + $CmakeOpts = @("-B", "build", "-DCMAKE_BUILD_TYPE=$BuildType") + + if ($CCompiler) { + $CmakeOpts += "-DCMAKE_C_COMPILER=$CCompiler" + } + + if ($CxxCompiler) { + $CmakeOpts += "-DCMAKE_CXX_COMPILER=$CxxCompiler" + } + + # Use absolute path for embree_DIR + $RootDir = (Get-Location).Path + "/../../../" + $CmakeOpts += "-Dembree_DIR=$RootDir/$EmbreeDir" + + Write-Host "CMake command: cmake $($CmakeOpts -join ' ')" + & cmake @CmakeOpts + if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE } + + & cmake --build build --config $BuildType + if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE } + + & "./build/test" + if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE } + +} elseif ($TestType -eq "ctest") { + Write-Host "Running CTest..." + + if (-not $EmbreeDir) { + Write-Error "EMBREE_DIR not specified for CTest" + exit 1 + } + + Set-Location $EmbreeDir + & cmake -S testing -B build + if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE } + + Set-Location build + & ctest -C $CtestConfig --output-on-failure -VV + if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE } + +} else { + Write-Error "Unknown test type '$TestType'. Use 'integration' or 'ctest'" + exit 1 +} + +Write-Host "Tests completed successfully" \ No newline at end of file diff --git a/scripts/run-tests.sh b/scripts/run-tests.sh new file mode 100755 index 0000000000..d41edb4daf --- /dev/null +++ b/scripts/run-tests.sh @@ -0,0 +1,106 @@ +#!/bin/bash +# Run Embree tests (integration or CTest) +set -e + +# Default values +TEST_TYPE="ctest" +BUILD_TYPE="Release" +C_COMPILER="" +CXX_COMPILER="" +EMBREE_DIR="" +CTEST_CONFIG="Release" + +# Parse command line arguments +while [[ $# -gt 0 ]]; do + case $1 in + --type) + TEST_TYPE="$2" + shift 2 + ;; + --build-type) + BUILD_TYPE="$2" + shift 2 + ;; + --c-compiler) + C_COMPILER="$2" + shift 2 + ;; + --cxx-compiler) + CXX_COMPILER="$2" + shift 2 + ;; + --embree-dir) + EMBREE_DIR="$2" + shift 2 + ;; + --ctest-config) + CTEST_CONFIG="$2" + shift 2 + ;; + *) + echo "Unknown argument: $1" + exit 1 + ;; + esac +done + +echo "Running tests..." +echo "Test type: $TEST_TYPE" +echo "Build type: $BUILD_TYPE" +echo "Embree directory: $EMBREE_DIR" + +if [[ "$TEST_TYPE" == "integration" ]]; then + echo "Running integration tests..." + + if [[ -z "$EMBREE_DIR" ]]; then + echo "Error: EMBREE_DIR not specified for integration tests" + exit 1 + fi + + cd tests/integration/test_embree_release + + # Build cmake command with compiler options + CMAKE_OPTS="-B build -DCMAKE_BUILD_TYPE=$BUILD_TYPE" + + if [[ -n "$C_COMPILER" ]]; then + CMAKE_OPTS+=" -DCMAKE_C_COMPILER=$C_COMPILER" + fi + + if [[ -n "$CXX_COMPILER" ]]; then + CMAKE_OPTS+=" -DCMAKE_CXX_COMPILER=$CXX_COMPILER" + fi + + # Use absolute path for embree_DIR + if [[ "$EMBREE_DIR" = /* ]]; then + # Already absolute path + CMAKE_OPTS+=" -Dembree_DIR=$EMBREE_DIR" + else + # Relative path, make it absolute from original directory + ROOT_DIR="$PWD/../../../" + CMAKE_OPTS+=" -Dembree_DIR=$ROOT_DIR/$EMBREE_DIR" + fi + + echo "CMake command: cmake $CMAKE_OPTS" + cmake $CMAKE_OPTS + cmake --build build --config "$BUILD_TYPE" + ./build/test + +elif [[ "$TEST_TYPE" == "ctest" ]]; then + echo "Running CTest..." + + if [[ -z "$EMBREE_DIR" ]]; then + echo "Error: EMBREE_DIR not specified for CTest" + exit 1 + fi + + cd "$EMBREE_DIR" + cmake -S testing -B build + cd build + ctest -C "$CTEST_CONFIG" --output-on-failure -VV + +else + echo "Error: Unknown test type '$TEST_TYPE'. Use 'integration' or 'ctest'" + exit 1 +fi + +echo "Tests completed successfully" \ No newline at end of file diff --git a/scripts/source_sycl_env.sh b/scripts/source_sycl_env.sh deleted file mode 100644 index d5b7e81d09..0000000000 --- a/scripts/source_sycl_env.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/usr/bin/env bash - -## Copyright 2009-2021 Intel Corporation -## SPDX-License-Identifier: Apache-2.0 - -if [ -z $2 ]; then - echo "ERROR: usage $0 dpcpp_dir igc_install_dir" - exit 1 -fi - -DPCPP_DIR=$1 -IGC_DIR=$2 - -# FIXME: for whatever reason this is still needed for the official compute runtime -# otherwise some sycl_test test fail. -export PATH=${DPCPP_DIR}/bin:${IGC_DIR}/usr/bin:${IGC_DIR}/usr/local/bin:${PATH} -export CPATH=${DPCPP_DIR}/include/sycl:${DPCPP_DIR}/include -export LIBRARY_PATH=${DPCPP_DIR}/lib:${LIBRARY_PATH} -export LD_LIBRARY_PATH=${DPCPP_DIR}/lib:${IGC_DIR}/usr/lib/x86_64-linux-gnu:${IGC_DIR}/usr/local/lib:${LD_LIBRARY_PATH} - -# FIXME: this might be unnecessary because we directly tell libOpenCL which .ibigdrcl to load using OCL_ICD_VENDORS. -# However, some IGC versions on the NAS don't have a properly modified intel.icd yet. -export OCL_ICD_FILENAMES=${IGC_DIR}/usr/lib/x86_64-linux-gnu/intel-opencl/libigdrcl.so:${IGC_DIR}/usr/local/lib/intel-opencl/libigdrcl.so - -export OCL_ICD_VENDORS=${IGC_DIR}/etc/OpenCL/vendors/intel.icd - -export CXX=${DPCPP_DIR}/bin/clang++ -export CC=${DPCPP_DIR}/bin/clang \ No newline at end of file diff --git a/superbuild/CMakeLists.txt b/superbuild/CMakeLists.txt new file mode 100644 index 0000000000..70e1a02774 --- /dev/null +++ b/superbuild/CMakeLists.txt @@ -0,0 +1,187 @@ +## Copyright 2025 Intel Corporation +## SPDX-License-Identifier: Apache-2.0 + +## Global settings ## + +cmake_minimum_required(VERSION 3.1) + +set(CMAKE_MODULE_PATH + ${CMAKE_MODULE_PATH} + ${CMAKE_CURRENT_SOURCE_DIR}/dependencies +) + +if(NOT CMAKE_INSTALL_PREFIX) + set(CMAKE_INSTALL_PREFIX + "${CMAKE_BINARY_DIR}/install" + CACHE STRING "Final install location." FORCE) +endif() + +if (NOT CMAKE_BUILD_TYPE) + set(CMAKE_BUILD_TYPE Release) +endif() + +## ======================================================================== ## +## Project setup. +## ======================================================================== ## + +project(Embree_superbuild) + +include(ExternalProject) +include(GNUInstallDirs) +include(ProcessorCount) + +## Setup top-level variables ## + +set(installDir ${CMAKE_INSTALL_PREFIX}) + +get_filename_component(INSTALL_DIR_ABSOLUTE + ${installDir} ABSOLUTE BASE_DIR ${CMAKE_CURRENT_BINARY_DIR}) + +ProcessorCount(PROCESSOR_COUNT) + +if(NOT PROCESSOR_COUNT EQUAL 0) + set(BUILD_JOBS ${PROCESSOR_COUNT} CACHE STRING "Number of build jobs '-j '") +else() + set(BUILD_JOBS 4 CACHE STRING "Number of build jobs '-j '") +endif() + +if (${CMAKE_VERSION} VERSION_GREATER 3.11.4) + set(PARALLEL_JOBS_OPTS -j ${BUILD_JOBS}) +endif() + +set(DEFAULT_BUILD_COMMAND ${CMAKE_COMMAND} --build . --config Release ${PARALLEL_JOBS_OPTS}) + +# We must replace separators so that ExternalProject_Add can work with the +# paths we generate. +macro(add_to_prefix_path PATH) + list(APPEND CMAKE_PREFIX_PATH ${PATH}) + string(REPLACE ";" "|" CMAKE_PREFIX_PATH "${CMAKE_PREFIX_PATH}") +endmacro() + +## ======================================================================== ## +## Superbuild options. +## ======================================================================== ## + +option(INSTALL_IN_SEPARATE_DIRECTORIES + "Install libraries into their own directories under CMAKE_INSTALL_PREFIX" + OFF +) + +option(BUILD_DEPENDENCIES_ONLY + "Do not build Embree itself, only its dependencies" + OFF +) + +## ======================================================================== ## +## Build dependencies. +## +## Use the BUILD_* options to enable or disable building in superbuild. If +## These options are OFF, then required dependencies must be available in the +## environment. +## +## For most of the dependencies, you may override the *_URL and *_HASH +## variables to select different versions. +## ======================================================================== ## + +option(BUILD_ISPC "Build the Intel SPMD Program Compiler or search in environment?" ON) +if (BUILD_ISPC) + set(ISPC_VERSION "1.28.2") + set(ISPC_BASE_URL "https://github.com/ispc/ispc/releases/download/v${ISPC_VERSION}") + if (APPLE) + set(_ISPC_URL "${ISPC_BASE_URL}/ispc-v${ISPC_VERSION}-macOS.universal.tar.gz") + set(_ISPC_HASH "14ea495a2e3725438bdaa0bf26e4e16082872069d3d5567901af3e25403e5f1f") + elseif(WIN32) + set(_ISPC_URL "${ISPC_BASE_URL}/ispc-v${ISPC_VERSION}-windows.zip") + set(_ISPC_HASH "25966868d97a6f9bc38501b864883558994189446476584e5e491476d540de17") + else() + set(_ISPC_URL "${ISPC_BASE_URL}/ispc-v${ISPC_VERSION}-linux.tar.gz") + set(_ISPC_HASH "32e611de1252cf1e09a6a13327f5746b8477f99e15ffa4cbd1b422386776688c") + endif() + set(ISPC_URL "${_ISPC_URL}" CACHE STRING "URL of the ISPC archive.") + set(ISPC_HASH "${_ISPC_HASH}" CACHE STRING "SHA256 hash of the ISPC archive.") + include(dep_ispc) +endif() + +option(BUILD_TBB "Build Intel Threading Building Blocks or search in environment?" ON) +option(BUILD_TBB_FROM_SOURCE "Build Intel Threading Building Blocks from source or use pre-built version?" OFF) +if (BUILD_TBB) + set(TBB_VERSION "2022.3.0" CACHE STRING "TBB version to download") + if (BUILD_TBB_FROM_SOURCE) + if (TBB_VERSION VERSION_LESS 2021) + message(FATAL_ERROR "Only TBB 2021 and later are supported when building TBB from source") + endif() + + string(REGEX REPLACE "(^[0-9]+\.[0-9]+\.[0-9]+$)" "v\\1" TBB_ARCHIVE ${TBB_VERSION}) + set(_TBB_URL "https://github.com/oneapi-src/oneTBB/archive/refs/tags/${TBB_ARCHIVE}.zip") + set(_TBB_HASH "4f47379064f99cc50da8dde85e27651d3609ac6c3e0941b1c728a1b2dd1e4b68") + else() + if (TBB_VERSION VERSION_LESS 2021) + set(TBB_BASE_URL "https://github.com/oneapi-src/oneTBB/releases/download/v${TBB_VERSION}/tbb-${TBB_VERSION}") + else() + set(TBB_BASE_URL "https://github.com/oneapi-src/oneTBB/releases/download/v${TBB_VERSION}/oneapi-tbb-${TBB_VERSION}") + endif() + if (APPLE) + set(_TBB_URL "${TBB_BASE_URL}-mac.tgz") + set(_TBB_HASH "f9f9369e956bd1cb1efbe6eab400291970e55fad1f3ae2a33bc96d991882ed38") + set(TBB_LIB_SUBDIR "") + elseif(WIN32) + set(_TBB_URL "${TBB_BASE_URL}-win.zip") + set(_TBB_HASH "e1b2373f25558bf47d16b4c89cf0a31e6689aaf7221400d209e8527afc7c9eee") + set(TBB_LIB_SUBDIR "intel64/vc14") + else() + set(_TBB_URL "${TBB_BASE_URL}-lin.tgz") + set(_TBB_HASH "7be34b376c9bdba9afe1ebacaf94ed6dc15af8377d73b539ec932f141195f6ec") + set(TBB_LIB_SUBDIR "intel64/gcc4.8") + endif() + endif() + set(TBB_URL "${_TBB_URL}" CACHE STRING "URL of the TBB archive.") + set(TBB_HASH "${_TBB_HASH}" CACHE STRING "SHA256 hash of the TBB archive.") + include(dep_tbb) +endif() + + +## ======================================================================== ## +## Build Embree +## ======================================================================== ## + +set(COMPONENT_NAME embree) + +set(COMPONENT_PATH ${INSTALL_DIR_ABSOLUTE}) +if (INSTALL_IN_SEPARATE_DIRECTORIES) + set(COMPONENT_PATH ${INSTALL_DIR_ABSOLUTE}/${COMPONENT_NAME}) +endif() + +if (NOT BUILD_DEPENDENCIES_ONLY) + # needed to support multiple CMake options provided in a single quoted string + separate_arguments(EMBREE_EXTRA_OPTIONS UNIX_COMMAND "${EMBREE_EXTRA_OPTIONS}") + + ExternalProject_Add(embree + PREFIX embree + DOWNLOAD_COMMAND "" + STAMP_DIR embree/stamp + SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/.. + BINARY_DIR embree/build + LIST_SEPARATOR | # CMAKE_PREFIX_PATH uses alternate separator. + CMAKE_ARGS + -DCMAKE_PREFIX_PATH:PATH=${CMAKE_PREFIX_PATH} + -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} + -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} + -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} + -DCMAKE_INSTALL_PREFIX=${COMPONENT_PATH} + -DCMAKE_INSTALL_INCLUDEDIR=${CMAKE_INSTALL_INCLUDEDIR} + -DCMAKE_INSTALL_LIBDIR=${CMAKE_INSTALL_LIBDIR} + -DCMAKE_INSTALL_DOCDIR=${CMAKE_INSTALL_DOCDIR} + -DCMAKE_INSTALL_BINDIR=${CMAKE_INSTALL_BINDIR} + $<$:-DEMBREE_ISPC_EXECUTABLE=${ISPC_PATH}> + $<$:-DEMBREE_TBB_ROOT=${TBB_PATH}> + ${EMBREE_EXTRA_OPTIONS} + BUILD_COMMAND ${DEFAULT_BUILD_COMMAND} + BUILD_ALWAYS OFF + ) + + ExternalProject_Add_StepDependencies(embree + configure + $<$:ispc> + $<$:tbb> + ) +endif() \ No newline at end of file diff --git a/superbuild/dependencies/dep_ispc.cmake b/superbuild/dependencies/dep_ispc.cmake new file mode 100644 index 0000000000..457d7e1fda --- /dev/null +++ b/superbuild/dependencies/dep_ispc.cmake @@ -0,0 +1,24 @@ +## Copyright 2019 Intel Corporation +## SPDX-License-Identifier: Apache-2.0 + +set(COMPONENT_NAME ispc) + +set(COMPONENT_PATH ${INSTALL_DIR_ABSOLUTE}) +if (INSTALL_IN_SEPARATE_DIRECTORIES) + set(COMPONENT_PATH ${INSTALL_DIR_ABSOLUTE}/${COMPONENT_NAME}) +endif() + +ExternalProject_Add(${COMPONENT_NAME} + PREFIX ${COMPONENT_NAME} + STAMP_DIR ${COMPONENT_NAME}/stamp + URL ${ISPC_URL} + URL_HASH SHA256=${ISPC_HASH} + CONFIGURE_COMMAND "" + BUILD_COMMAND "" + INSTALL_COMMAND "${CMAKE_COMMAND}" -E copy_if_different + /bin/ispc${CMAKE_EXECUTABLE_SUFFIX} + ${COMPONENT_PATH}/bin/ispc${CMAKE_EXECUTABLE_SUFFIX} + BUILD_ALWAYS OFF +) + +set(ISPC_PATH "${COMPONENT_PATH}/bin/ispc${CMAKE_EXECUTABLE_SUFFIX}") \ No newline at end of file diff --git a/superbuild/dependencies/dep_tbb.cmake b/superbuild/dependencies/dep_tbb.cmake new file mode 100644 index 0000000000..2ba1695c45 --- /dev/null +++ b/superbuild/dependencies/dep_tbb.cmake @@ -0,0 +1,91 @@ +## Copyright 2019 Intel Corporation +## SPDX-License-Identifier: Apache-2.0 + +set(COMPONENT_NAME tbb) + +set(COMPONENT_PATH ${INSTALL_DIR_ABSOLUTE}) +if (INSTALL_IN_SEPARATE_DIRECTORIES) + set(COMPONENT_PATH ${INSTALL_DIR_ABSOLUTE}/${COMPONENT_NAME}) +endif() + +set(TBB_HASH_ARGS "") +if (NOT "${TBB_HASH}" STREQUAL "") + set(TBB_HASH_ARGS URL_HASH SHA256=${TBB_HASH}) +endif() + +if (BUILD_TBB_FROM_SOURCE) + ExternalProject_Add(${COMPONENT_NAME} + PREFIX ${COMPONENT_NAME} + DOWNLOAD_DIR ${COMPONENT_NAME} + STAMP_DIR ${COMPONENT_NAME}/stamp + SOURCE_DIR ${COMPONENT_NAME}/src + BINARY_DIR ${COMPONENT_NAME}/build + LIST_SEPARATOR | # Use the alternate list separator + URL ${TBB_URL} + ${TBB_HASH_ARGS} + CMAKE_ARGS + -DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH} + -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} + -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} + -DCMAKE_INSTALL_PREFIX:PATH=${COMPONENT_PATH} + -DCMAKE_INSTALL_INCLUDEDIR=${CMAKE_INSTALL_INCLUDEDIR} + -DCMAKE_INSTALL_LIBDIR=${CMAKE_INSTALL_LIBDIR} + -DCMAKE_INSTALL_DOCDIR=${CMAKE_INSTALL_DOCDIR} + -DCMAKE_INSTALL_BINDIR=${CMAKE_INSTALL_BINDIR} + -DCMAKE_BUILD_TYPE=${DEPENDENCIES_BUILD_TYPE} + -DTBB_TEST=OFF + -DTBB_STRICT=OFF + -DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES} + -DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET} + BUILD_COMMAND ${DEFAULT_BUILD_COMMAND} + BUILD_ALWAYS ${ALWAYS_REBUILD} + ) +else() + # handle changed paths in TBB 2021 + if (TBB_VERSION VERSION_LESS 2021) + set(TBB_SOURCE_INCLUDE_DIR tbb/include) + set(TBB_SOURCE_LIB_DIR tbb/lib/${TBB_LIB_SUBDIR}) + set(TBB_SOURCE_BIN_DIR tbb/bin/${TBB_LIB_SUBDIR}) + else() + set(TBB_SOURCE_INCLUDE_DIR include) + set(TBB_SOURCE_LIB_DIR lib/${TBB_LIB_SUBDIR}) + set(TBB_SOURCE_BIN_DIR redist/${TBB_LIB_SUBDIR}) + endif() + + ExternalProject_Add(${COMPONENT_NAME} + PREFIX ${COMPONENT_NAME} + DOWNLOAD_DIR ${COMPONENT_NAME} + STAMP_DIR ${COMPONENT_NAME}/stamp + SOURCE_DIR ${COMPONENT_NAME}/src + BINARY_DIR ${COMPONENT_NAME} + URL ${TBB_URL} + ${TBB_HASH_ARGS} + CONFIGURE_COMMAND "" + BUILD_COMMAND "" + INSTALL_COMMAND "${CMAKE_COMMAND}" -E copy_directory + /${TBB_SOURCE_INCLUDE_DIR} + ${COMPONENT_PATH}/include + BUILD_ALWAYS OFF + ) + + # We copy the libraries into the main lib dir. This makes it easier + # to set the correct library path. + ExternalProject_Add_Step(${COMPONENT_NAME} install_lib + COMMAND "${CMAKE_COMMAND}" -E copy_directory + /${TBB_SOURCE_LIB_DIR} ${COMPONENT_PATH}/lib + DEPENDEES install + ) + + if (WIN32) + # DLLs on Windows are in the bin subdirectory. + ExternalProject_Add_Step(${COMPONENT_NAME} install_dll + COMMAND "${CMAKE_COMMAND}" -E copy_directory + /${TBB_SOURCE_BIN_DIR} ${COMPONENT_PATH}/bin + DEPENDEES install_lib + ) + endif() +endif() + +set(TBB_PATH ${COMPONENT_PATH}) + +add_to_prefix_path(${COMPONENT_PATH}) \ No newline at end of file diff --git a/tests/integration/test_embree_release/CMakePresets.json b/tests/integration/test_embree_release/CMakePresets.json deleted file mode 100644 index 3adfc4e208..0000000000 --- a/tests/integration/test_embree_release/CMakePresets.json +++ /dev/null @@ -1,82 +0,0 @@ -{ - "version": 4, - "cmakeMinimumRequired": { - "major": 3, - "minor": 11, - "patch": 0 - }, - "include": [ - "../../../scripts/cmake-presets/os.json", - "../../../scripts/cmake-presets/package.json", - "../../../scripts/cmake-presets/compiler.json", - "../../../scripts/cmake-presets/tbb.json" - ], - "configurePresets": [ - { - "name": "test-linux-gcc", - "inherits": ["linux", "env", "gcc", "tbb_NEWEST"], - "binaryDir": "${sourceDir}/build", - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Release", - "embree_DIR": "$env{EMBREE_CONFIG_DIR}" - } - }, - { - "name": "test-linux-icx", - "inherits": ["linux", "env", "icx", "tbb_NEWEST"], - "binaryDir": "${sourceDir}/build", - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Release", - "embree_DIR": "$env{EMBREE_CONFIG_DIR}" - } - }, - { - "name": "test-linux-clang", - "inherits": ["linux", "env", "clang", "tbb_NEWEST"], - "binaryDir": "${sourceDir}/build", - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Release", - "embree_DIR": "$env{EMBREE_CONFIG_DIR}" - } - }, - - { - "name": "test-macos-gcc", - "inherits": ["macos", "env", "gcc", "tbb_NEWEST"], - "binaryDir": "${sourceDir}/build", - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Release", - "embree_DIR": "$env{EMBREE_CONFIG_DIR}" - } - }, - { - "name": "test-macos-clang", - "inherits": ["macos", "env", "clang", "tbb_NEWEST"], - "binaryDir": "${sourceDir}/build", - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Release", - "embree_DIR": "$env{EMBREE_CONFIG_DIR}" - } - }, - - - { - "name": "test-windows-icx", - "inherits": ["windows", "env", "icx-windows", "tbb_NEWEST"], - "binaryDir": "${sourceDir}/build", - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Release", - "embree_DIR": "$env{EMBREE_CONFIG_DIR}" - } - }, - { - "name": "test-windows-v142", - "inherits": ["windows", "env", "v142", "tbb_NEWEST"], - "binaryDir": "${sourceDir}/build", - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Release", - "embree_DIR": "$env{EMBREE_CONFIG_DIR}" - } - } - ] -}