Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
OpenDAS
vllm_cscc
Commits
1b32e026
Unverified
Commit
1b32e026
authored
Aug 21, 2024
by
sasha0552
Committed by
GitHub
Aug 21, 2024
Browse files
[Bugfix] Pass PYTHONPATH from setup.py to CMake (#7730)
parent
f7e3b0c5
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
1 deletion
+5
-1
CMakeLists.txt
CMakeLists.txt
+1
-1
setup.py
setup.py
+4
-0
No files found.
CMakeLists.txt
View file @
1b32e026
...
@@ -233,7 +233,7 @@ if(VLLM_GPU_LANG STREQUAL "CUDA")
...
@@ -233,7 +233,7 @@ if(VLLM_GPU_LANG STREQUAL "CUDA")
# Generate sources:
# Generate sources:
execute_process
(
execute_process
(
COMMAND
${
CMAKE_COMMAND
}
-E env
COMMAND
${
CMAKE_COMMAND
}
-E env
PYTHONPATH=
${
CMAKE_CURRENT_SOURCE_DIR
}
/csrc/cutlass_extensions/:
${
CUTLASS_DIR
}
/python/:$PYTHONPATH
PYTHONPATH=
${
CMAKE_CURRENT_SOURCE_DIR
}
/csrc/cutlass_extensions/:
${
CUTLASS_DIR
}
/python/:
$
{
VLLM_PYTHON_PATH
}
:$
PYTHONPATH
${
Python_EXECUTABLE
}
${
CMAKE_CURRENT_SOURCE_DIR
}
/csrc/quantization/machete/generate.py
${
Python_EXECUTABLE
}
${
CMAKE_CURRENT_SOURCE_DIR
}
/csrc/quantization/machete/generate.py
RESULT_VARIABLE machete_generation_result
RESULT_VARIABLE machete_generation_result
OUTPUT_VARIABLE machete_generation_output
OUTPUT_VARIABLE machete_generation_output
...
...
setup.py
View file @
1b32e026
...
@@ -184,6 +184,10 @@ class cmake_build_ext(build_ext):
...
@@ -184,6 +184,10 @@ class cmake_build_ext(build_ext):
# match.
# match.
cmake_args
+=
[
'-DVLLM_PYTHON_EXECUTABLE={}'
.
format
(
sys
.
executable
)]
cmake_args
+=
[
'-DVLLM_PYTHON_EXECUTABLE={}'
.
format
(
sys
.
executable
)]
# Pass the python path to cmake so it can reuse the build dependencies
# on subsequent calls to python.
cmake_args
+=
[
'-DVLLM_PYTHON_PATH={}'
.
format
(
":"
.
join
(
sys
.
path
))]
#
#
# Setup parallelism and build tool
# Setup parallelism and build tool
#
#
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment