Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
28 changes: 14 additions & 14 deletions .github/workflows/manylinux_wheel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -88,29 +88,29 @@ jobs:
needs: build_wheel
concurrency:
# group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.ref }}-${{ matrix.PYTHON_CP_VERSION }}-${{ matrix.PYTHON_CP_VERSION != 'cp310' && 'all' || github.sha }}-test
group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.event_name }}-${{ github.head_ref || github.ref }}-${{ matrix.PYTHON_CP_VERSION }}-test
group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.event_name }}-${{ github.head_ref || github.ref }}-${{ matrix.PYTHON_VERSION }}-test
cancel-in-progress: ${{ github.event_name != 'release' }}
strategy:
matrix:
include:
- PYTHON_CP_VERSION: 'cp310'
PYTHON_VERSION: '3.10'
- PYTHON_CP_VERSION: 'cp311'
PYTHON_VERSION: '3.11'
- PYTHON_CP_VERSION: 'cp312'
PYTHON_VERSION: '3.12'
- PYTHON_CP_VERSION: 'cp313'
PYTHON_VERSION: '3.13'
PYTHON_VERSION: ['3.10', '3.11', '3.12', '3.13']

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I cleaned this up a bit. This isnt necessary, but seemed worth doing.

os: ['ubuntu-22.04']
fail-fast: false
steps:
- uses: actions/checkout@v4
- uses: actions/download-artifact@v4
with:
name: manylinux_wheel_${{ matrix.PYTHON_CP_VERSION }}
- name: Python check
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.PYTHON_VERSION }}
- name: Set Python CP version
id: set_cp_version
run: |
pip install packaging
cp=$(python -c "from packaging import tags; print(next(tags.sys_tags()).interpreter)")
echo "PYTHON_CP_VERSION=${cp}"
echo "PYTHON_CP_VERSION=${cp}" >> $GITHUB_OUTPUT
- uses: actions/download-artifact@v4
with:
name: manylinux_wheel_${{ steps.set_cp_version.outputs.PYTHON_CP_VERSION }}
- name: manylinux install wheel
run: |
set -x
Expand Down Expand Up @@ -142,7 +142,7 @@ jobs:
contents: read
concurrency:
# group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}-${{ matrix.PYTHON_CP_VERSION }}-${{ matrix.PYTHON_CP_VERSION != 'cp310' && 'all' || github.sha }}-test
group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}-${{ matrix.PYTHON_CP_VERSION }}-test
group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}-${{ matrix.PYTHON_CP_VERSION }}-publish-pypi
cancel-in-progress: true
strategy:
matrix:
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/scripts/ti_build/entry.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@ def setup_basic_build_env():
# Use MSVC on Windows
setup_clang(as_compiler=False)
setup_msvc()
elif u.system == "Linux":
setup_clang(as_compiler=False)
else:
# Use Clang on all other platforms
setup_clang()
Expand Down
27 changes: 16 additions & 11 deletions .github/workflows/scripts/ti_build/llvm.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,25 +19,30 @@ def setup_llvm() -> None:
Download and install LLVM.
"""
u = platform.uname()

llvm_version = "15.0.7"
build_version = "202510071403"
release_url_template = "https://github.com/Genesis-Embodied-AI/gstaichi-sdk-builds/releases/download/llvm-{llvm_version}-{build_version}/taichi-llvm-{llvm_version}-{platform}.zip".format(
llvm_version=llvm_version,
build_version=build_version,
platform="{platform}",
)

if u.system == "Linux":
if cmake_args.get_effective("TI_WITH_AMDGPU"):
out = get_cache_home() / "llvm15-amdgpu-005"
out = get_cache_home() / f"llvm-{llvm_version}-amdgpu-{build_version}"
url = "https://github.com/GaleSeLee/assets/releases/download/v0.0.5/taichi-llvm-15.0.0-linux.zip"
else:
out = get_cache_home() / "llvm15"
url = "https://github.com/taichi-dev/taichi_assets/releases/download/llvm15/taichi-llvm-15-linux.zip"
out = get_cache_home() / f"llvm-{llvm_version}-x86-{build_version}"
url = release_url_template.format(platform="linux-x86_64")
download_dep(url, out, strip=1)
elif (u.system, u.machine) == ("Darwin", "arm64"):
out = get_cache_home() / "llvm15-m1-nozstd"
url = "https://github.com/taichi-dev/taichi_assets/releases/download/llvm15/taichi-llvm-15-m1-nozstd.zip"
download_dep(url, out, strip=1)
elif (u.system, u.machine) == ("Darwin", "x86_64"):
out = get_cache_home() / "llvm15-mac"
url = "https://github.com/taichi-dev/taichi_assets/releases/download/llvm15/llvm-15-mac10.15.zip"
out = get_cache_home() / f"llvm-{llvm_version}-{build_version}"
url = release_url_template.format(platform="macos-arm64")
download_dep(url, out, strip=1)
elif (u.system, u.machine) == ("Windows", "AMD64"):
out = get_cache_home() / "llvm15"
url = "https://github.com/python3kgae/taichi_assets/releases/download/llvm15_vs2019_clang/taichi-llvm-15.0.0-msvc2019.zip"
out = get_cache_home() / f"llvm-{llvm_version}-{build_version}"
url = release_url_template.format(platform="windows-amd64")
download_dep(url, out, strip=0)
else:
raise RuntimeError(f"Unsupported platform: {u.system} {u.machine}")
Expand Down
2 changes: 1 addition & 1 deletion cmake/GsTaichiCore.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ if (APPLE)
endif ()

if (LINUX)
target_link_libraries(${CORE_LIBRARY_NAME} PRIVATE X11 pthread)
target_link_libraries(${CORE_LIBRARY_NAME} PRIVATE pthread)

@hughperkins hughperkins Sep 21, 2025

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

removed superflous x11. not strictly necesssary, but since. I noticed it.

if (${CMAKE_HOST_SYSTEM_PROCESSOR} STREQUAL "x86_64")
# Avoid glibc dependencies
if (TI_WITH_VULKAN)
Expand Down