Skip to content

Commit 49929cd

Browse files
grimoiregrimoire
committed
Merge branch 'main' into fope
2 parents 807e733 + f53a22f commit 49929cd

File tree

150 files changed

+3849
-1858
lines changed

Some content is hidden

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

150 files changed

+3849
-1858
lines changed

‎.github/workflows/api_eval.yml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,18 @@ jobs:
6464
DOCKER_TAG: cuda12.8
6565
OUTPUT_FOLDER: cuda12.8_dist_${{ github.run_id }}
6666
steps:
67+
- name: Free disk space
68+
uses: jlumbroso/free-disk-space@main
69+
with:
70+
# This might remove tools that are actually needed, if set to "true" but frees about 6 GB
71+
tool-cache: false
72+
docker-images: false
73+
# All of these default to true, but feel free to set to "false" if necessary for your workflow
74+
android: true
75+
dotnet: true
76+
haskell: true
77+
large-packages: true
78+
swap-storage: false
6779
- name: Checkout repository
6880
uses: actions/checkout@v3
6981
with:

‎.github/workflows/benchmark.yml‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ on:
1515
default: 'main'
1616
benchmark_type:
1717
required: true
18-
description: 'Set benchmark type. Default is "["longtext", "throughput", "api_server"]"'
18+
description: 'Set benchmark type. Default is "["longtext", "throughput", "api_server", "prefixcache"]"'
1919
type: string
20-
default: "['apiserver', 'throughput', 'longtext']"
20+
default: "['apiserver', 'throughput', 'longtext', 'prefixcache']"
2121
offline_mode:
2222
required: true
2323
description: 'Whether start a offline mode, if true, you should prepare code and whl package by yourself'
@@ -46,6 +46,18 @@ jobs:
4646
PLAT_NAME: manylinux2014_x86_64
4747
DOCKER_TAG: cuda12.8
4848
steps:
49+
- name: Free disk space
50+
uses: jlumbroso/free-disk-space@main
51+
with:
52+
# This might remove tools that are actually needed, if set to "true" but frees about 6 GB
53+
tool-cache: false
54+
docker-images: false
55+
# All of these default to true, but feel free to set to "false" if necessary for your workflow
56+
android: true
57+
dotnet: true
58+
haskell: true
59+
large-packages: true
60+
swap-storage: false
4961
- name: Checkout repository
5062
uses: actions/checkout@v3
5163
with:

‎.github/workflows/daily_ete_test.yml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,18 @@ jobs:
6666
PLAT_NAME: manylinux2014_x86_64
6767
DOCKER_TAG: cuda12.8
6868
steps:
69+
- name: Free disk space
70+
uses: jlumbroso/free-disk-space@main
71+
with:
72+
# This might remove tools that are actually needed, if set to "true" but frees about 6 GB
73+
tool-cache: false
74+
docker-images: false
75+
# All of these default to true, but feel free to set to "false" if necessary for your workflow
76+
android: true
77+
dotnet: true
78+
haskell: true
79+
large-packages: true
80+
swap-storage: false
6981
- name: Checkout repository
7082
uses: actions/checkout@v3
7183
with:

‎.github/workflows/daily_ete_test_3090.yml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,18 @@ jobs:
6565
PLAT_NAME: manylinux2014_x86_64
6666
DOCKER_TAG: cuda12.4
6767
steps:
68+
- name: Free disk space
69+
uses: jlumbroso/free-disk-space@main
70+
with:
71+
# This might remove tools that are actually needed, if set to "true" but frees about 6 GB
72+
tool-cache: false
73+
docker-images: false
74+
# All of these default to true, but feel free to set to "false" if necessary for your workflow
75+
android: true
76+
dotnet: true
77+
haskell: true
78+
large-packages: true
79+
swap-storage: false
6880
- name: Checkout repository
6981
uses: actions/checkout@v3
7082
with:

‎.github/workflows/daily_ete_test_5080.yml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,18 @@ jobs:
6565
PLAT_NAME: manylinux2014_x86_64
6666
DOCKER_TAG: cuda12.8
6767
steps:
68+
- name: Free disk space
69+
uses: jlumbroso/free-disk-space@main
70+
with:
71+
# This might remove tools that are actually needed, if set to "true" but frees about 6 GB
72+
tool-cache: false
73+
docker-images: false
74+
# All of these default to true, but feel free to set to "false" if necessary for your workflow
75+
android: true
76+
dotnet: true
77+
haskell: true
78+
large-packages: true
79+
swap-storage: false
6880
- name: Checkout repository
6981
uses: actions/checkout@v3
7082
with:

‎.github/workflows/daily_ete_test_h800.yml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,18 @@ jobs:
6565
PLAT_NAME: manylinux2014_x86_64
6666
DOCKER_TAG: cuda12.8
6767
steps:
68+
- name: Free disk space
69+
uses: jlumbroso/free-disk-space@main
70+
with:
71+
# This might remove tools that are actually needed, if set to "true" but frees about 6 GB
72+
tool-cache: false
73+
docker-images: false
74+
# All of these default to true, but feel free to set to "false" if necessary for your workflow
75+
android: true
76+
dotnet: true
77+
haskell: true
78+
large-packages: true
79+
swap-storage: false
6880
- name: Checkout repository
6981
uses: actions/checkout@v3
7082
with:

‎.github/workflows/evaluate.yml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,18 @@ jobs:
5656
DOCKER_TAG: cuda12.8
5757
OUTPUT_FOLDER: cuda12.8_dist_${{ github.run_id }}
5858
steps:
59+
- name: Free disk space
60+
uses: jlumbroso/free-disk-space@main
61+
with:
62+
# This might remove tools that are actually needed, if set to "true" but frees about 6 GB
63+
tool-cache: false
64+
docker-images: false
65+
# All of these default to true, but feel free to set to "false" if necessary for your workflow
66+
android: true
67+
dotnet: true
68+
haskell: true
69+
large-packages: true
70+
swap-storage: false
5971
- name: Checkout repository
6072
uses: actions/checkout@v3
6173
with:

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ wheels/
2626
.installed.cfg
2727
*.egg
2828
MANIFEST
29+
tmp/
2930

3031
# PyInstaller
3132
# Usually these files are written by a python script from a template

‎.pre-commit-config.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ repos:
33
rev: 5.0.4
44
hooks:
55
- id: flake8
6-
args: ["--max-line-length=120"]
6+
args: ['--extend-ignore=E231', "--max-line-length=120"]
77
- repo: https://github.com/PyCQA/isort
88
rev: 5.11.5
99
hooks:

‎CMakeLists.txt‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ project(TurboMind LANGUAGES CXX CUDA)
1919
if (MSVC)
2020
# use standard conformant preprocessor
2121
add_compile_options($<$<COMPILE_LANGUAGE:CXX>:/Zc:preprocessor>)
22+
add_compile_options($<$<COMPILE_LANGUAGE:CXX>:/Zc:__cplusplus>)
2223
set(CMAKE_CUDA_FLAGS "${CMAKE_CUDA_FLAGS} -Xcompiler=/Zc:preprocessor -Xcompiler=/Zc:__cplusplus")
2324
endif ()
2425

@@ -101,6 +102,10 @@ if(NOT xgrammar_POPULATED)
101102

102103
# Bring the populated content into the build
103104
add_subdirectory(${xgrammar_SOURCE_DIR} ${xgrammar_BINARY_DIR})
105+
if(TARGET xgrammar)
106+
target_compile_options(xgrammar PRIVATE $<$<CXX_COMPILER_ID:MSVC>:/utf-8>)
107+
target_compile_options(xgrammar PRIVATE $<$<C_COMPILER_ID:MSVC>:/utf-8>)
108+
endif()
104109
endif()
105110

106111
# the environment variable

0 commit comments

Comments
 (0)