Skip to content

Commit c0e2ec9

Browse files
committed
debug
1 parent 64cf82e commit c0e2ec9

File tree

4 files changed

+7
-19
lines changed

4 files changed

+7
-19
lines changed

.github/workflows/build-wheels-linux.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ on:
2424

2525
jobs:
2626
generate-matrix:
27-
uses: pytorch/test-infra/.github/workflows/linux_job_v2.yml@main
27+
uses: pytorch/test-infra/.github/workflows/generate_binary_build_matrix.yml@main
2828
with:
2929
package-type: wheel
3030
os: linux

backends/qualcomm/__init__.py

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,13 @@
11
import os
22

3-
from .scripts.download_qnn_sdk import (
4-
check_glibc_exist_and_validate,
5-
install_qnn_sdk,
6-
is_linux_x86,
7-
)
3+
from .scripts.download_qnn_sdk import install_qnn_sdk, is_linux_x86
84

95

106
env_flag = os.getenv("EXECUTORCH_BUILDING_WHEEL", "0").lower()
117
# If users have preinstalled QNN_SDK_ROOT, we will use it.
128
qnn_sdk_root_flag = os.getenv("QNN_SDK_ROOT", None)
139

14-
if (
15-
env_flag not in ("1", "true", "yes")
16-
and not qnn_sdk_root_flag
17-
and is_linux_x86()
18-
and check_glibc_exist_and_validate()
19-
):
10+
if env_flag not in ("1", "true", "yes") and not qnn_sdk_root_flag and is_linux_x86():
2011
ok = install_qnn_sdk()
21-
2212
if not ok:
2313
raise RuntimeError("Failed to install QNN SDK. Please check the logs above.")

backends/qualcomm/scripts/download_qnn_sdk.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -437,8 +437,7 @@ def install_qnn_sdk() -> bool:
437437
Returns:
438438
True if both steps succeeded (or were already satisfied), else False.
439439
"""
440-
if check_glibc_exist_and_validate():
441-
if _ensure_libcxx_stack():
442-
if _ensure_qnn_sdk_lib():
443-
return True
440+
if _ensure_libcxx_stack():
441+
if _ensure_qnn_sdk_lib():
442+
return True
444443
return False

setup.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -467,11 +467,10 @@ def run(self):
467467
# Following code is for building the Qualcomm backend.
468468
from backends.qualcomm.scripts.download_qnn_sdk import (
469469
_download_qnn_sdk,
470-
check_glibc_exist_and_validate,
471470
is_linux_x86,
472471
)
473472

474-
if is_linux_x86() and check_glibc_exist_and_validate():
473+
if is_linux_x86():
475474
os.environ["EXECUTORCH_BUILDING_WHEEL"] = "1"
476475

477476
with tempfile.TemporaryDirectory() as tmpdir:

0 commit comments

Comments
 (0)