diff --git a/.github/workflows/continuous.yml b/.github/workflows/continuous.yml index 3546823eec..aa464dcd17 100644 --- a/.github/workflows/continuous.yml +++ b/.github/workflows/continuous.yml @@ -162,6 +162,7 @@ jobs: with: force-delete: true runs-on: '[ "Windows", "build" ]' + msvc-version: 2022 env-from-files: ./.github/workflows/dpcpp-sycl-nightly.env artifact-out: windows-JIT-build artifact-path: ./build/*.zip @@ -192,6 +193,7 @@ jobs: needs: ["windows-JIT-build"] with: runs-on: '[ "Windows", "dg2" ]' + msvc-version: 2022 env-from-files: ./.github/workflows/dpcpp-sycl-nightly.env ./.github/workflows/gfx-windows-public.env artifact-in: windows-JIT-build cmd: | @@ -204,6 +206,7 @@ jobs: needs: ["windows-JIT-build"] with: runs-on: '[ "Windows", "bmg" ]' + msvc-version: 2022 env-from-files: ./.github/workflows/dpcpp-sycl-nightly.env ./.github/workflows/gfx-windows-public.env artifact-in: windows-JIT-build cmd: | @@ -216,6 +219,7 @@ jobs: needs: ["windows-JIT-build"] with: runs-on: '[ "Windows", "lnl" ]' + msvc-version: 2022 env-from-files: ./.github/workflows/dpcpp-sycl-nightly.env ./.github/workflows/gfx-windows-public.env artifact-in: windows-JIT-build cmd: | @@ -228,6 +232,7 @@ jobs: needs: ["windows-JIT-build"] with: runs-on: '[ "Windows", "dg2" ]' + msvc-version: 2022 env-from-files: ./.github/workflows/dpcpp-sycl-nightly.env ./.github/workflows/gfx-windows-internal.env artifact-in: windows-JIT-build cmd: | @@ -239,6 +244,7 @@ jobs: uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/windows.yml@main with: runs-on: '[ "Windows", "build" ]' + msvc-version: 2022 dpcpp-version: intel/2025.2 artifact-out: windows-DG2-JIT-ICX-build artifact-path: ./build/*.zip @@ -269,6 +275,7 @@ jobs: with: force-delete: true runs-on: '[ "Windows", "build" ]' + msvc-version: 2022 env-from-files: ./.github/workflows/dpcpp-sycl-nightly.env cmd: | $opts = "-DCMAKE_BUILD_TYPE=Debug" @@ -471,6 +478,33 @@ jobs: $EmbreeDir = .\\scripts\\prepare-test-files.ps1 -TestType ctest .\\scripts\\run-tests.ps1 -TestType ctest -EmbreeDir $EmbreeDir -CtestConfig RelWithDebInfo + windows-V144: + secrets: inherit + uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/windows.yml@main + with: + force-delete: true + runs-on: '[ "Windows", "build" ]' + msvc-version: 2022 + cmd: | + $opts = "-DCMAKE_BUILD_TYPE=RelWithDebInfo" + $opts += " -DBUILD_TESTING=ON" + $opts += " -DEMBREE_TUTORIALS=ON" + $opts += " -DEMBREE_ISPC_SUPPORT=ON" + $opts += " -DEMBREE_MAX_INSTANCE_LEVEL_COUNT=8" + $opts += " -DEMBREE_MAX_ISA=SSE2" + $opts += " -DEMBREE_INSTALL_DEPENDENCIES=ON" + $opts += " -DEMBREE_TESTING_INSTALL_TESTS=ON" + $opts += " -DCMAKE_INSTALL_TESTDIR=testing" + $opts += " -DEMBREE_ZIP_MODE=ON" + + cmake -S superbuild -B build -G Ninja -D EMBREE_EXTRA_OPTIONS="$opts" + cmake --build build --config RelWithDebInfo + cmake --build build/embree/build --config RelWithDebInfo --target build + Copy-Item build/embree/build/embree-*.zip build/ -Force + + $EmbreeDir = .\\scripts\\prepare-test-files.ps1 -TestType ctest + .\\scripts\\run-tests.ps1 -TestType ctest -EmbreeDir $EmbreeDir -CtestConfig RelWithDebInfo + ######################################## # MacOS ######################################## diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 0b237d2089..efa11b1543 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -178,6 +178,7 @@ jobs: uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/windows.yml@main with: runs-on: '[ "Windows", "build" ]' + msvc-version: 2022 dpcpp-version: intel/2025.2 artifact-out: nightly-windows-DG2-JIT-ICX-RC-build artifact-path: ./build/*.zip @@ -208,6 +209,7 @@ jobs: with: runs-on: '[ "Windows", "dg2" ]' env-from-files: ./.github/workflows/gfx-windows-public.env + msvc-version: 2022 dpcpp-version: intel-llvm/v6.2.0 artifact-out: nightly-windows-DG2-JIT-INTELLLVM-bulid artifact-path: ./build/*.zip @@ -239,6 +241,7 @@ jobs: with: runs-on: '[ "Windows", "dg2" ]' env-from-files: ./.github/workflows/gfx-windows-public.env + msvc-version: 2022 dpcpp-version: intel-llvm/v6.2.0 artifact-in: nightly-windows-DG2-JIT-INTELLLVM-bulid cmd: | @@ -251,6 +254,7 @@ jobs: with: runs-on: '[ "Windows", "dg2" ]' env-from-files: ./.github/workflows/gfx-windows-public.env + msvc-version: 2022 dpcpp-version: intel-llvm/v6.2.0 artifact-out: nightly-windows-DG2-JIT-PUBLIC-build artifact-path: ./build/*.zip @@ -282,6 +286,7 @@ jobs: with: runs-on: '[ "Windows", "dg2" ]' env-from-files: ./.github/workflows/gfx-windows-public.env + msvc-version: 2022 dpcpp-version: intel-llvm/v6.2.0 artifact-in: nightly-windows-DG2-JIT-PUBLIC-build cmd: | @@ -293,6 +298,7 @@ jobs: uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/windows.yml@main with: runs-on: '[ "Windows", "dg2" ]' + msvc-version: 2022 env-from-files: ./.github/workflows/dpcpp-sycl-nightly.env artifact-out: nightly-windows-DG2-MULTILEVEL-build artifact-path: ./build/*.zip @@ -324,6 +330,8 @@ jobs: needs: ["nightly-windows-DG2-MULTILEVEL-build"] with: runs-on: '[ "Windows", "dg2" ]' + msvc-version: 2022 + dpcpp-version: intel/2025.2 env-from-files: ./.github/workflows/gfx-windows-public.env artifact-in: nightly-windows-DG2-MULTILEVEL-build cmd: | diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9598583ee0..c2e63edbb5 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -22,6 +22,7 @@ jobs: runs-on: '[ "Windows", "build"]' artifact-out: build-windows artifact-path: ./build/embree-*.zip + msvc-version: 2019 dpcpp-version: intel-llvm/v6.2.0 cmd: | $opts = "-DCMAKE_BUILD_TYPE=Release" @@ -50,6 +51,7 @@ jobs: platform: [avx2, avx512] with: runs-on: '[ "Windows", "${{ matrix.platform }}" ]' + msvc-version: 2019 artifact-in: build-windows cmd: | $EmbreeDir = .\\scripts\\prepare-test-files.ps1 -TestType ctest @@ -212,6 +214,7 @@ jobs: uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/windows.yml@main with: runs-on: '[ "Windows", "build" ]' + msvc-version: 2019 dpcpp-version: intel-llvm/v6.2.0 artifact-out: build-windows-sycl artifact-path: ./build/*.zip @@ -276,6 +279,8 @@ jobs: platform: [dg2, bmg, lnl] with: runs-on: '[ "Windows", "${{ matrix.platform }}" ]' + msvc-version: 2022 + dpcpp-version: intel/2025.2 env-from-files: ./.github/workflows/gfx-windows-public.env artifact-in: build-windows-sycl cmd: | diff --git a/superbuild/CMakeLists.txt b/superbuild/CMakeLists.txt index 70e1a02774..1ca64a4207 100644 --- a/superbuild/CMakeLists.txt +++ b/superbuild/CMakeLists.txt @@ -3,7 +3,7 @@ ## Global settings ## -cmake_minimum_required(VERSION 3.1) +cmake_minimum_required(VERSION 3.10) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}