Skip to content

Commit 40ba02a

Browse files
lin-hitonamiTaichi Gardener
lin-hitonami
authored and
Taichi Gardener
committed
[cc] Remove cc backend
ghstack-source-id: 999cb88 Pull Request resolved: taichi-dev#7836
1 parent cd94283 commit 40ba02a

Some content is hidden

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

75 files changed

+99
-2124
lines changed

‎.github/workflows/perf.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ jobs:
4949
-DTI_WITH_OPENGL:BOOL=ON
5050
-DTI_WITH_CUDA:BOOL=ON
5151
-DTI_WITH_VULKAN:BOOL=ON
52-
-DTI_WITH_CC:BOOL=OFF
5352
-DTI_BUILD_TESTS:BOOL=OFF
5453
-DTI_WITH_C_API=OFF
5554

‎.github/workflows/release.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@ jobs:
7878
PROJECT_NAME: ${{ matrix.name }}
7979
TAICHI_CMAKE_ARGS: >-
8080
-DTI_WITH_OPENGL:BOOL=ON
81-
-DTI_WITH_CC:BOOL=OFF
8281
-DTI_WITH_VULKAN:BOOL=ON
8382
-DTI_BUILD_TESTS:BOOL=ON
8483
@@ -131,7 +130,6 @@ jobs:
131130
PROJECT_NAME: ${{ matrix.name }}
132131
TAICHI_CMAKE_ARGS: >-
133132
-DTI_WITH_OPENGL:BOOL=OFF
134-
-DTI_WITH_CC:BOOL=OFF
135133
-DTI_WITH_VULKAN:BOOL=OFF
136134
-DTI_BUILD_TESTS:BOOL=ON
137135
@@ -186,7 +184,6 @@ jobs:
186184
TAICHI_CMAKE_ARGS: >-
187185
-DTI_WITH_VULKAN:BOOL=ON
188186
-DTI_WITH_OPENGL:BOOL=OFF
189-
-DTI_WITH_CC:BOOL=OFF
190187
-DTI_BUILD_TESTS:BOOL=ON
191188
steps:
192189
- uses: actions/checkout@v3
@@ -237,7 +234,6 @@ jobs:
237234
TAICHI_CMAKE_ARGS: >-
238235
-DTI_WITH_OPENGL:BOOL=OFF
239236
-DTI_WITH_CUDA:BOOL=OFF
240-
-DTI_WITH_CC:BOOL=OFF
241237
-DTI_WITH_VULKAN:BOOL=ON
242238
-DTI_BUILD_TESTS:BOOL=ON
243239
@@ -288,7 +284,6 @@ jobs:
288284
-DTI_WITH_VULKAN:BOOL=ON
289285
-DTI_WITH_DX11:BOOL=ON
290286
-DTI_WITH_DX12:BOOL=ON
291-
-DTI_WITH_CC:BOOL=OFF
292287
-DTI_BUILD_TESTS:BOOL=ON
293288
-DTI_WITH_C_API=ON
294289

‎.github/workflows/scripts/ti_build/ios.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ def setup_ios(python: Command, pip: Command) -> None:
5353
cmake_args["TI_WITH_CUDA"] = False
5454
cmake_args["TI_WITH_PYTHON"] = False
5555
cmake_args["TI_WITH_GGUI"] = False
56-
cmake_args["TI_WITH_CC"] = False
5756
cmake_args.writeback()
5857

5958

‎.github/workflows/scripts/unix_test.sh

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -89,12 +89,10 @@ N=$(nproc)
8989
if [ -z "$GPU_TEST" ]; then
9090
if [[ $PLATFORM == *"m1"* ]]; then
9191
run-it cpu 4
92-
run-it cc 4
9392
run-it vulkan 4
9493
run-it metal 2
9594

9695
run-it cpu 1 "torch"
97-
run-it cc 1 "torch"
9896
run-it vulkan 1 "torch"
9997
run-it metal 1 "torch"
10098
else
@@ -105,20 +103,16 @@ if [ -z "$GPU_TEST" ]; then
105103
fi
106104
run-it cpu $N
107105
run-it cpu 1 "torch"
108-
run-it cc $N
109-
run-it cc 1 "torch"
110106
fi
111107
else
112108
run-it cpu $N
113-
run-it cc $N
114109
run-it cuda 8
115110
run-it vulkan 8
116111
run-it opengl 4
117112
run-it gles 4
118113
run-it amdgpu 8
119114

120115
run-it cpu 1 "torch"
121-
run-it cc 1 "torch"
122116
run-it cuda 1 "torch"
123117
run-it vulkan 1 "torch"
124118
run-it opengl 1 "torch"

‎.github/workflows/testing.yml

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ jobs:
108108
docker exec --user dev check_clang_tidy /home/dev/taichi/.github/workflows/scripts/check_clang_tidy.sh "$CI_SETUP_CMAKE_ARGS"
109109
env:
110110
CR_PAT: ${{ secrets.GITHUB_TOKEN }}
111-
CI_SETUP_CMAKE_ARGS: -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DTI_WITH_OPENGL:BOOL=ON -DTI_WITH_CC:BOOL=ON -DTI_WITH_VULKAN:BOOL=ON -DTI_BUILD_TESTS:BOOL=ON -DTI_WITH_BACKTRACE:BOOL=ON
111+
CI_SETUP_CMAKE_ARGS: -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DTI_WITH_OPENGL:BOOL=ON -DTI_WITH_VULKAN:BOOL=ON -DTI_BUILD_TESTS:BOOL=ON -DTI_WITH_BACKTRACE:BOOL=ON
112112

113113
build_and_test_cpu_mac:
114114
name: Build and Test macos (CPU)
@@ -119,7 +119,6 @@ jobs:
119119
include:
120120
- os: macos-10.15
121121
python: 3.7
122-
with_cc: OFF
123122
with_cpp_tests: ON
124123
wanted_archs: 'cpu,vulkan'
125124
runs-on:
@@ -129,7 +128,6 @@ jobs:
129128
PY: ${{ matrix.python }}
130129
TAICHI_CMAKE_ARGS: >-
131130
-DTI_WITH_OPENGL:BOOL=OFF
132-
-DTI_WITH_CC:BOOL=${{ matrix.with_cc }}
133131
-DTI_WITH_VULKAN:BOOL=ON
134132
-DTI_WITH_C_API=ON
135133
-DTI_BUILD_TESTS:BOOL=${{ matrix.with_cpp_tests }}
@@ -205,11 +203,10 @@ jobs:
205203
PROJECT_NAME: taichi
206204
TAICHI_CMAKE_ARGS: >-
207205
-DTI_WITH_OPENGL:BOOL=ON
208-
-DTI_WITH_CC:BOOL=ON
209206
-DTI_WITH_VULKAN:BOOL=ON
210207
-DTI_WITH_BACKTRACE:BOOL=ON
211208
-DTI_BUILD_TESTS:BOOL=ON
212-
TI_WANTED_ARCHS: 'cc,cpu,cuda,vulkan,opengl,gles'
209+
TI_WANTED_ARCHS: 'cpu,cuda,vulkan,opengl,gles'
213210
TI_DEVICE_MEMORY_GB: '1'
214211
TI_RUN_RELEASE_TESTS: '1'
215212

@@ -275,7 +272,6 @@ jobs:
275272
TI_WANTED_ARCHS: "cuda,cpu"
276273
TAICHI_CMAKE_ARGS: >-
277274
-DTI_WITH_OPENGL:BOOL=OFF
278-
-DTI_WITH_CC:BOOL=OFF
279275
-DTI_WITH_VULKAN:BOOL=OFF
280276
-DTI_BUILD_TESTS:BOOL=ON
281277
@@ -399,7 +395,6 @@ jobs:
399395
-DTI_WITH_VULKAN:BOOL=ON
400396
-DTI_WITH_DX11:BOOL=ON
401397
-DTI_WITH_DX12:BOOL=ON
402-
-DTI_WITH_CC:BOOL=OFF
403398
-DTI_BUILD_TESTS:BOOL=ON
404399
-DTI_WITH_BACKTRACE=ON
405400
-DTI_WITH_C_API=ON
@@ -474,7 +469,6 @@ jobs:
474469
TAICHI_CMAKE_ARGS: >-
475470
-DTI_WITH_OPENGL:BOOL=OFF
476471
-DTI_WITH_CUDA:BOOL=OFF
477-
-DTI_WITH_CC:BOOL=OFF
478472
-DTI_WITH_VULKAN:BOOL=ON
479473
-DTI_BUILD_TESTS:BOOL=ON
480474
-DTI_WITH_C_API=ON
@@ -568,12 +562,11 @@ jobs:
568562
env:
569563
PY: '3.8'
570564
PROJECT_NAME: taichi
571-
TI_WANTED_ARCHS: 'cc,cpu,cuda,vulkan,opengl,gles'
565+
TI_WANTED_ARCHS: 'cpu,cuda,vulkan,opengl,gles'
572566
TI_DEVICE_MEMORY_GB: '1'
573567
TI_RUN_RELEASE_TESTS: '1'
574568
TAICHI_CMAKE_ARGS: >-
575569
-DTI_WITH_OPENGL:BOOL=ON
576-
-DTI_WITH_CC:BOOL=ON
577570
-DTI_WITH_VULKAN:BOOL=ON
578571
-DTI_WITH_BACKTRACE:BOOL=ON
579572
-DTI_BUILD_TESTS:BOOL=ON
@@ -680,7 +673,6 @@ jobs:
680673
env:
681674
TAICHI_CMAKE_ARGS: >-
682675
-DTI_WITH_OPENGL:BOOL=ON
683-
-DTI_WITH_CC:BOOL=OFF
684676
-DTI_WITH_VULKAN:BOOL=ON
685677
-DTI_WITH_C_API=OFF
686678
@@ -695,7 +687,6 @@ jobs:
695687
env:
696688
TAICHI_CMAKE_ARGS: >-
697689
-DTI_WITH_OPENGL:BOOL=ON
698-
-DTI_WITH_CC:BOOL=OFF
699690
-DTI_WITH_VULKAN:BOOL=ON
700691
-DTI_WITH_LLVM:BOOL=OFF
701692
-DTI_WITH_C_API:BOOL=ON
@@ -761,7 +752,6 @@ jobs:
761752
env:
762753
TAICHI_CMAKE_ARGS: >-
763754
-DTI_WITH_OPENGL:BOOL=ON
764-
-DTI_WITH_CC:BOOL=OFF
765755
-DTI_WITH_VULKAN:BOOL=ON
766756
-DTI_WITH_C_API=OFF
767757
@@ -776,7 +766,6 @@ jobs:
776766
env:
777767
TAICHI_CMAKE_ARGS: >-
778768
-DTI_WITH_OPENGL:BOOL=ON
779-
-DTI_WITH_CC:BOOL=OFF
780769
-DTI_WITH_VULKAN:BOOL=ON
781770
-DTI_WITH_LLVM:BOOL=OFF
782771
-DTI_WITH_C_API=ON
@@ -841,7 +830,6 @@ jobs:
841830
env:
842831
TAICHI_CMAKE_ARGS: >-
843832
-DTI_WITH_OPENGL:BOOL=ON
844-
-DTI_WITH_CC:BOOL=OFF
845833
-DTI_WITH_VULKAN:BOOL=ON
846834
-DTI_WITH_C_API=OFF
847835
@@ -856,7 +844,6 @@ jobs:
856844
env:
857845
TAICHI_CMAKE_ARGS: >-
858846
-DTI_WITH_OPENGL:BOOL=ON
859-
-DTI_WITH_CC:BOOL=OFF
860847
-DTI_WITH_VULKAN:BOOL=ON
861848
-DTI_WITH_LLVM:BOOL=OFF
862849
-DTI_WITH_C_API=ON
@@ -900,7 +887,6 @@ jobs:
900887
PROJECT_NAME: taichi
901888
TAICHI_CMAKE_ARGS: >-
902889
-DTI_WITH_OPENGL:BOOL=ON
903-
-DTI_WITH_CC:BOOL=OFF
904890
-DTI_WITH_VULKAN:BOOL=ON
905891
-DTI_WITH_BACKTRACE:BOOL=ON
906892
-DTI_BUILD_TESTS:BOOL=ON

‎cmake/TaichiCore.cmake

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ option(TI_WITH_CUDA "Build with the CUDA backend" ON)
55
option(TI_WITH_CUDA_TOOLKIT "Build with the CUDA toolkit" OFF)
66
option(TI_WITH_AMDGPU "Build with the AMDGPU backend" OFF)
77
option(TI_WITH_OPENGL "Build with the OpenGL backend" ON)
8-
option(TI_WITH_CC "Build with the C backend" ON)
98
option(TI_WITH_VULKAN "Build with the Vulkan backend" OFF)
109
option(TI_WITH_DX11 "Build with the DX11 backend" OFF)
1110
option(TI_WITH_DX12 "Build with the DX12 backend" OFF)
@@ -42,10 +41,6 @@ if (APPLE)
4241
set(TI_WITH_OPENGL OFF)
4342
message(WARNING "OpenGL backend not supported on OS X. Setting TI_WITH_OPENGL to OFF.")
4443
endif()
45-
if (TI_WITH_CC)
46-
set(TI_WITH_CC OFF)
47-
message(WARNING "C backend not supported on OS X. Setting TI_WITH_CC to OFF.")
48-
endif()
4944
if (TI_WITH_AMDGPU)
5045
set(TI_WITH_AMDGPU OFF)
5146
message(WARNING "AMDGPU backend not supported on OS X. Setting TI_WITH_AMDGPU to OFF.")
@@ -58,10 +53,6 @@ else()
5853
endif()
5954

6055
if (WIN32)
61-
if (TI_WITH_CC)
62-
set(TI_WITH_CC OFF)
63-
message(WARNING "C backend not supported on Windows. Setting TI_WITH_CC to OFF.")
64-
endif()
6556
if (TI_WITH_AMDGPU)
6657
set(TI_WITH_AMDGPU OFF)
6758
message(WARNING "AMDGPU backend not supported on Windows. Setting TI_WITH_AMDGPU to OFF.")
@@ -124,13 +115,6 @@ if (TI_WITH_DX12)
124115
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DTI_WITH_DX12")
125116
endif()
126117

127-
## TODO: Remove CC backend
128-
if (TI_WITH_CC)
129-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DTI_WITH_CC")
130-
file(GLOB TAICHI_CC_SOURCE "taichi/codegen/cc/*.h" "taichi/codegen/cc/*.cpp")
131-
list(APPEND TAICHI_CORE_SOURCE ${TAICHI_CC_SOURCE})
132-
endif()
133-
134118
if (TI_WITH_METAL)
135119
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DTI_WITH_METAL")
136120
endif()

‎misc/demo_record_kernel_group.py

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

‎misc/prtags.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040
"docker" : "Docker container",
4141
"perf" : "Performance improvements",
4242
"ipython" : "IPython and other shells",
43-
"cc" : "C source backend",
4443
"error" : "Error messages",
4544
"blender" : "Blender integration",
4645
"export" : "Exporting kernels",

‎python/taichi/_main.py

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
from taichi._lib import core as _ti_core
2020
from taichi._lib import utils
2121
from taichi.lang import impl
22-
from taichi.tools import cc_compose, diagnose, video
22+
from taichi.tools import diagnose, video
2323

2424
import taichi as ti
2525

@@ -800,20 +800,6 @@ def diagnose(arguments: list = sys.argv[2:]):
800800
"""System diagnose information"""
801801
diagnose.main()
802802

803-
@register
804-
def cc_compose(self, arguments: list = sys.argv[2:]):
805-
"""Compose C backend action record into a complete C file"""
806-
parser = argparse.ArgumentParser(prog="ti cc_compose", description=f"{self.cc_compose.__doc__}")
807-
parser.add_argument(
808-
"fin_name",
809-
help="Action record YAML file name from C backend, e.g. program.yml",
810-
)
811-
parser.add_argument("fout_name", help="The output C source file name, e.g. program.c")
812-
parser.add_argument("hdrout_name", help="The output C header file name, e.g. program.h")
813-
args = parser.parse_args(arguments)
814-
815-
cc_compose.main(args.fin_name, args.fout_name, args.hdrout_name)
816-
817803
@staticmethod
818804
@register
819805
def repl(arguments: list = sys.argv[2:]):

‎python/taichi/aot/__init__.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,3 @@
77
from taichi.aot._export import export, export_as
88
from taichi.aot.conventions.gfxruntime140 import GfxRuntime140
99
from taichi.aot.module import Module
10-
from taichi.aot.record import *

0 commit comments

Comments
 (0)