Unverified Commit 1b32e026 authored by sasha0552's avatar sasha0552 Committed by GitHub
Browse files

[Bugfix] Pass PYTHONPATH from setup.py to CMake (#7730)

parent f7e3b0c5
...@@ -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
......
...@@ -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
# #
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment