Skip to content

Commit dde987a

Browse files
committed
Define Python_FIND_VIRTUALENV in addition to Python3_FIND_VIRTUALENV
MLIR searches for both Python3 and Python. If both variables are not defined equally and there multiple python version on the system, CMake may behave really weirdly. More details here: llvm/llvm-project#126162
1 parent fd65a66 commit dde987a

File tree

4 files changed

+7
-0
lines changed

4 files changed

+7
-0
lines changed

build_tools/e2eshark_build.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ cmake -S "$repo_root/externals/llvm-project/llvm" -B "$build_dir" \
2121
-GNinja \
2222
-DCMAKE_BUILD_TYPE=Release \
2323
-DPython3_FIND_VIRTUALENV=ONLY \
24+
-DPython_FIND_VIRTUALENV=ONLY \
2425
-DLLVM_ENABLE_PROJECTS=mlir \
2526
-DLLVM_EXTERNAL_PROJECTS="torch-mlir" \
2627
-DLLVM_EXTERNAL_TORCH_MLIR_SOURCE_DIR="$PWD" \

build_tools/python_deploy/build_windows_ci.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ cmake -GNinja -Bbuild \
1111
-DLLVM_TARGETS_TO_BUILD=host \
1212
-DMLIR_ENABLE_BINDINGS_PYTHON=ON \
1313
-DPython3_FIND_VIRTUALENV=ONLY \
14+
-DPython_FIND_VIRTUALENV=ONLY \
1415
-DLLVM_EXTERNAL_PROJECTS="torch-mlir" \
1516
-DLLVM_EXTERNAL_TORCH_MLIR_SOURCE_DIR="$PWD" \
1617
-DPython3_EXECUTABLE="$(which python)" \

docs/development.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ cmake -GNinja -Bbuild \
6161
-DCMAKE_BUILD_TYPE=Release \
6262
-DLLVM_ENABLE_ASSERTIONS=ON \
6363
-DPython3_FIND_VIRTUALENV=ONLY \
64+
-DPython_FIND_VIRTUALENV=ONLY \
6465
-DLLVM_ENABLE_PROJECTS=mlir \
6566
-DLLVM_EXTERNAL_PROJECTS="torch-mlir" \
6667
-DLLVM_EXTERNAL_TORCH_MLIR_SOURCE_DIR="$PWD" \
@@ -93,6 +94,7 @@ If you're running into issues with the above build command, consider using the f
9394
cmake -GNinja -Bbuild \
9495
-DCMAKE_BUILD_TYPE=Release \
9596
-DPython3_FIND_VIRTUALENV=ONLY \
97+
-DPython_FIND_VIRTUALENV=ONLY \
9698
-DLLVM_ENABLE_PROJECTS=mlir \
9799
-DLLVM_EXTERNAL_PROJECTS="torch-mlir" \
98100
-DLLVM_EXTERNAL_TORCH_MLIR_SOURCE_DIR="$PWD" \
@@ -125,6 +127,7 @@ If you have built llvm-project separately in the directory `$LLVM_INSTALL_DIR`,
125127
cmake -GNinja -Bbuild \
126128
-DCMAKE_BUILD_TYPE=Release \
127129
-DPython3_FIND_VIRTUALENV=ONLY \
130+
-DPython_FIND_VIRTUALENV=ONLY \
128131
-DMLIR_DIR="$LLVM_INSTALL_DIR/lib/cmake/mlir/" \
129132
-DLLVM_DIR="$LLVM_INSTALL_DIR/lib/cmake/llvm/" \
130133
-DMLIR_ENABLE_BINDINGS_PYTHON=ON \

setup.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,8 @@ def cmake_build(self, cmake_build_dir):
113113
f"-DCMAKE_BUILD_TYPE={CMAKE_BUILD_TYPE}",
114114
f"-DPython3_EXECUTABLE={sys.executable}",
115115
f"-DPython3_FIND_VIRTUALENV=ONLY",
116+
f"-DPython_EXECUTABLE={sys.executable}",
117+
f"-DPython_FIND_VIRTUALENV=ONLY",
116118
f"-DMLIR_ENABLE_BINDINGS_PYTHON=ON",
117119
f"-DLLVM_TARGETS_TO_BUILD=host",
118120
f"-DLLVM_ENABLE_ZSTD=OFF",

0 commit comments

Comments
 (0)