Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[misc] Downgrade clang version to 14.0.6 on CI #8417

Merged
merged 6 commits into from
Nov 22, 2023
Merged

[misc] Downgrade clang version to 14.0.6 on CI #8417

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ea4dd51
[misc] Downgrade clang version to 14.0.6 on CI
jim19930609 Nov 22, 2023
c4be618
fix
jim19930609 Nov 22, 2023
6af53d8
fix
jim19930609 Nov 22, 2023
407b4b9
test
jim19930609 Nov 22, 2023
a15790e
fix
jim19930609 Nov 22, 2023
4957aaf
update linux
jim19930609 Nov 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/scripts/ti_build/compiler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ def setup_clang(as_compiler=True) -> None:
"""
u = platform.uname()
if u.system in ("Linux", "Darwin"):
for v in ("", "-15", "-14", "-13", "-12", "-11", "-10"):
for v in ("", "-14", "-13", "-12", "-11", "-10"):
clang = shutil.which(f"clang{v}")
if clang is not None:
clangpp = shutil.which(f"clang++{v}")
Expand All @@ -36,8 +36,8 @@ def setup_clang(as_compiler=True) -> None:
return

elif (u.system, u.machine) == ("Windows", "AMD64"):
out = get_cache_home() / "clang-15-v2"
url = "https://github.com/taichi-dev/taichi_assets/releases/download/llvm15/clang-15.0.0-win-complete.zip"
out = get_cache_home() / "clang-14-v2"
url = "https://github.com/taichi-dev/taichi_assets/releases/download/llvm15/clang-14.0.6-win-complete.zip"
download_dep(url, out, force=True)
clang = str(out / "bin" / "clang++.exe").replace("\\", "\\\\")
clangpp = clang
Expand Down
4 changes: 0 additions & 4 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,10 +197,6 @@ if (TI_WITH_LLVM)

check_clang_version()

if (${CLANG_VERSION_MAJOR} VERSION_GREATER ${CLANG_HIGHEST_VERSION})
message(FATAL_ERROR "${CLANG_EXECUTABLE} version: ${CLANG_VERSION}, required: <=${CLANG_HIGHEST_VERSION}. Consider passing -DCLANG_EXECUTABLE=/path/to/clang to cmake to use a specific clang.")
endif()

add_subdirectory(taichi/runtime/llvm/runtime_module)
endif()

Expand Down
Loading