Skip to content

Commit 2a9856b

Browse files
authored
Merge branch 'master' into sw/robust_node_intersections
2 parents 7fc448a + 02e73a7 commit 2a9856b

170 files changed

Lines changed: 5646 additions & 8340 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/continuous.yml

Lines changed: 368 additions & 82 deletions
Large diffs are not rendered by default.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
GFX_DRIVER_VERSION=gfx-driver-builds/ci/master/gfx-driver-ci-master-18656/artifacts/Windows
1+
GFX_DRIVER_VERSION=gfx-driver-ci-master-20127

.github/workflows/integrate.yml

Lines changed: 240 additions & 248 deletions
Large diffs are not rendered by default.

.github/workflows/nightly.yml

Lines changed: 1643 additions & 337 deletions
Large diffs are not rendered by default.

.github/workflows/performance.yml

Lines changed: 0 additions & 172 deletions
This file was deleted.

.github/workflows/public.continuous.yml

Lines changed: 63 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -32,40 +32,85 @@ jobs:
3232
dnf config-manager --set-enabled powertools
3333
dnf -y update
3434
dnf -y install ninja-build
35+
3536
- name: Checkout Repository
3637
uses: actions/checkout@v4
37-
with:
38-
submodules: true
3938

4039
- name: Build and Run
4140
run: |
42-
cmake --preset public-gcc-tbb -DEMBREE_TESTING_INTENSITY=3
43-
cmake --build build --target build
44-
cmake --build build --target test_package
41+
mkdir build
42+
cd build
43+
cmake -DBUILD_TESTING=ON -DEMBREE_TUTORIALS=ON -DEMBREE_ISPC_SUPPORT=OFF -DEMBREE_TESTING_INTENSITY=3 ..
44+
make -j$(nproc)
45+
ctest
4546
47+
ubuntu-24-tbb-and-ispc-from-os:
48+
runs-on: ubuntu-latest
49+
container:
50+
image: ubuntu:24.04
51+
steps:
52+
- name: Install packages (ubuntu 24.04)
53+
run: |
54+
apt-get update
55+
apt-get -y upgrade
56+
apt-get -y install g++ cmake git-lfs freeglut3-dev libglfw3-dev libxmu-dev libxi-dev unzip xorg-dev pip libtbb-dev ispc
57+
apt-get -y install libopenimageio-dev
4658
47-
ubuntu-22_04:
59+
- name: Checkout Repository
60+
uses: actions/checkout@v4
61+
62+
- name: Build and Run
63+
run: |
64+
mkdir build
65+
cd build
66+
cmake -DBUILD_TESTING=ON -DEMBREE_TUTORIALS=ON -DEMBREE_ISPC_SUPPORT=ON -DEMBREE_TESTING_INTENSITY=3 ..
67+
make -j$(nproc)
68+
ctest
69+
70+
ubuntu-24-tbb-and-ispc-prebuilt:
4871
runs-on: ubuntu-latest
4972
container:
50-
image: ubuntu:22.04
73+
image: ubuntu:24.04
5174
steps:
52-
- name: Install packages (ubuntu 22.04)
75+
- name: Install packages (ubuntu 24.04)
5376
run: |
5477
apt-get update
5578
apt-get -y upgrade
56-
apt-get -y install g++ python3 clang git-lfs libtbb-dev freeglut3-dev libglfw3-dev libxmu-dev libxi-dev unzip xorg-dev pip
57-
apt-get -y install libtinfo5
79+
apt-get -y install g++ cmake git-lfs freeglut3-dev libglfw3-dev libxmu-dev libxi-dev unzip xorg-dev pip
5880
apt-get -y install libopenimageio-dev
59-
apt-get -y install ninja-build
60-
pip install --upgrade cmake
61-
cmake --version
81+
82+
- name: Checkout Repository
83+
uses: actions/checkout@v4
84+
85+
- name: Build and Run
86+
run: |
87+
mkdir build
88+
cd build
89+
cmake -D EMBREE_EXTRA_OPTIONS="-DBUILD_TESTING=ON -DEMBREE_TUTORIALS=ON -DEMBREE_ISPC_SUPPORT=ON -DEMBREE_TESTING_INTENSITY=3" ../superbuild
90+
cmake --build .
91+
cd embree/build
92+
ctest
93+
94+
ubuntu-24-tbb-src-ispc-prebuilt:
95+
runs-on: ubuntu-latest
96+
container:
97+
image: ubuntu:24.04
98+
steps:
99+
- name: Install packages (ubuntu 24.04)
100+
run: |
101+
apt-get update
102+
apt-get -y upgrade
103+
apt-get -y install g++ cmake git-lfs freeglut3-dev libglfw3-dev libxmu-dev libxi-dev unzip xorg-dev pip
104+
apt-get -y install libopenimageio-dev
105+
62106
- name: Checkout Repository
63107
uses: actions/checkout@v4
64-
with:
65-
submodules: true
66108

67109
- name: Build and Run
68110
run: |
69-
cmake --preset public-gcc-tbb -DEMBREE_TESTING_INTENSITY=3
70-
cmake --build build --target build
71-
cmake --build build --target test_package
111+
mkdir build
112+
cd build
113+
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
114+
cmake --build .
115+
cd embree/build
116+
ctest

0 commit comments

Comments
 (0)