Skip to content

Commit 898df1a

Browse files
authored
[Build] Revert "Drop OpenGL build (#8751)" (#8753)
1 parent 7d45eb7 commit 898df1a

File tree

5 files changed

+16
-12
lines changed

5 files changed

+16
-12
lines changed

.github/actionlint.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ self-hosted-runner:
22
labels:
33
- cn
44
- cuda
5+
- OpenGL
56
- vulkan
67
- m1
78
- driver550

.github/workflows/perf.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
PY: '3.13'
4747
PROJECT_NAME: taichi
4848
TAICHI_CMAKE_ARGS: >-
49-
-DTI_WITH_OPENGL:BOOL=OFF
49+
-DTI_WITH_OPENGL:BOOL=ON
5050
-DTI_WITH_CUDA:BOOL=ON
5151
-DTI_WITH_VULKAN:BOOL=ON
5252
-DTI_BUILD_TESTS:BOOL=OFF

.github/workflows/release.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ jobs:
7474
PY: ${{ matrix.python }}
7575
PROJECT_NAME: ${{ matrix.name }}
7676
TAICHI_CMAKE_ARGS: >-
77-
-DTI_WITH_OPENGL:BOOL=OFF
77+
-DTI_WITH_OPENGL:BOOL=ON
7878
-DTI_WITH_VULKAN:BOOL=ON
7979
-DTI_BUILD_TESTS:BOOL=ON
8080
@@ -231,12 +231,12 @@ jobs:
231231
fail-fast: false
232232
matrix: ${{ fromJson(needs.matrix_prep.outputs.matrix) }}
233233
# FIXME: force running on sm70 for now. Should be refactored out
234-
runs-on: [self-hosted, windows, cuda, sm70]
234+
runs-on: [self-hosted, windows, cuda, OpenGL, sm70]
235235
env:
236236
PY: ${{ matrix.python }}
237237
PROJECT_NAME: ${{ matrix.name }}
238238
TAICHI_CMAKE_ARGS: >-
239-
-DTI_WITH_OPENGL:BOOL=OFF
239+
-DTI_WITH_OPENGL:BOOL=ON
240240
-DTI_WITH_VULKAN:BOOL=ON
241241
-DTI_WITH_DX11:BOOL=ON
242242
-DTI_WITH_DX12:BOOL=ON
@@ -288,7 +288,7 @@ jobs:
288288
.\.github\workflows\scripts\win_test.ps1
289289
env:
290290
PY: ${{ matrix.python }}
291-
TI_WANTED_ARCHS: "cpu,cuda,vulkan"
291+
TI_WANTED_ARCHS: "cpu,cuda,opengl,vulkan"
292292
TI_SKIP_VERSION_CHECK: ON
293293

294294
- name: Cleanup Git Cache Configs

.github/workflows/scripts/unix_test.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,12 +114,14 @@ else
114114
run-it cpu $N
115115
run-it cuda 8
116116
run-it vulkan 8
117+
run-it opengl 4
117118
run-it gles 4
118119
run-it amdgpu 8
119120

120121
run-it cpu 1 "torch"
121122
run-it cuda 1 "torch"
122123
run-it vulkan 1 "torch"
124+
run-it opengl 1 "torch"
123125
run-it gles 1 "torch"
124126
# run-it amdgpu 1 "torch"
125127

.github/workflows/testing.yml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ jobs:
206206
PY: '3.13'
207207
PROJECT_NAME: taichi
208208
TAICHI_CMAKE_ARGS: >-
209-
-DTI_WITH_OPENGL:BOOL=OFF
209+
-DTI_WITH_OPENGL:BOOL=ON
210210
-DTI_WITH_VULKAN:BOOL=ON
211211
-DTI_WITH_BACKTRACE:BOOL=ON
212212
-DTI_BUILD_TESTS:BOOL=ON
@@ -352,6 +352,7 @@ jobs:
352352
- cn
353353
- windows
354354
- cuda
355+
- OpenGL
355356
- ${{ matrix.extra_markers == 'sm70' && 'sm70' || 'windows' }}
356357
timeout-minutes: ${{ github.event.schedule != '0 18 * * *' && 90 || 180 }}
357358
env:
@@ -642,7 +643,7 @@ jobs:
642643
# /home/dev/taichi/.github/workflows/scripts/build.py
643644
# env:
644645
# TAICHI_CMAKE_ARGS: >-
645-
# -DTI_WITH_OPENGL:BOOL=OFF
646+
# -DTI_WITH_OPENGL:BOOL=ON
646647
# -DTI_WITH_VULKAN:BOOL=ON
647648
# -DTI_WITH_C_API=OFF
648649

@@ -656,7 +657,7 @@ jobs:
656657
# /home/dev/taichi/.github/workflows/scripts/build.py android
657658
# env:
658659
# TAICHI_CMAKE_ARGS: >-
659-
# -DTI_WITH_OPENGL:BOOL=OFF
660+
# -DTI_WITH_OPENGL:BOOL=ON
660661
# -DTI_WITH_VULKAN:BOOL=ON
661662
# -DTI_WITH_LLVM:BOOL=OFF
662663
# -DTI_WITH_C_API:BOOL=ON
@@ -721,7 +722,7 @@ jobs:
721722
# /home/dev/taichi/.github/workflows/scripts/build.py
722723
# env:
723724
# TAICHI_CMAKE_ARGS: >-
724-
# -DTI_WITH_OPENGL:BOOL=OFF
725+
# -DTI_WITH_OPENGL:BOOL=ON
725726
# -DTI_WITH_VULKAN:BOOL=ON
726727
# -DTI_WITH_C_API=OFF
727728

@@ -735,7 +736,7 @@ jobs:
735736
# /home/dev/taichi/.github/workflows/scripts/build.py android
736737
# env:
737738
# TAICHI_CMAKE_ARGS: >-
738-
# -DTI_WITH_OPENGL:BOOL=OFF
739+
# -DTI_WITH_OPENGL:BOOL=ON
739740
# -DTI_WITH_VULKAN:BOOL=ON
740741
# -DTI_WITH_LLVM:BOOL=OFF
741742
# -DTI_WITH_C_API=ON
@@ -799,7 +800,7 @@ jobs:
799800
# /home/dev/taichi/.github/workflows/scripts/build.py
800801
# env:
801802
# TAICHI_CMAKE_ARGS: >-
802-
# -DTI_WITH_OPENGL:BOOL=OFF
803+
# -DTI_WITH_OPENGL:BOOL=ON
803804
# -DTI_WITH_VULKAN:BOOL=ON
804805
# -DTI_WITH_C_API=OFF
805806

@@ -813,7 +814,7 @@ jobs:
813814
# /home/dev/taichi/.github/workflows/scripts/build.py android
814815
# env:
815816
# TAICHI_CMAKE_ARGS: >-
816-
# -DTI_WITH_OPENGL:BOOL=OFF
817+
# -DTI_WITH_OPENGL:BOOL=ON
817818
# -DTI_WITH_VULKAN:BOOL=ON
818819
# -DTI_WITH_LLVM:BOOL=OFF
819820
# -DTI_WITH_C_API=ON

0 commit comments

Comments
 (0)