Turn off QNN in cuda.yml

Author: larryliu0820

.github/workflows/cuda.yml

@@ -44,7 +44,7 @@ jobs:
 
         # Test ExecuTorch CUDA build - ExecuTorch will automatically detect CUDA version
         # and install the appropriate PyTorch wheel
-        source .ci/scripts/test-cuda-build.sh "${{ matrix.cuda-version }}"
+        CMAKE_ARGS="-DEXECUTORCH_BUILD_QNN=OFF" source .ci/scripts/test-cuda-build.sh "${{ matrix.cuda-version }}"
 
   # This job will fail if any of the CUDA versions fail
   check-all-cuda-builds:
@@ -83,7 +83,7 @@ jobs:
       script: |
         set -eux
 
-        PYTHON_EXECUTABLE=python ./install_executorch.sh
+        CMAKE_ARGS="-DEXECUTORCH_BUILD_QNN=OFF" PYTHON_EXECUTABLE=python ./install_executorch.sh
         export LD_LIBRARY_PATH=/opt/conda/lib:$LD_LIBRARY_PATH
         PYTHON_EXECUTABLE=python source .ci/scripts/test_model.sh "${{ matrix.model }}" cmake cuda
 
@@ -132,7 +132,7 @@ jobs:
         set -eux
 
         echo "::group::Setup ExecuTorch"
-        ./install_executorch.sh
+        CMAKE_ARGS="-DEXECUTORCH_BUILD_QNN=OFF" ./install_executorch.sh
         echo "::endgroup::"
 
         echo "::group::Setup Huggingface"

backends/qualcomm/CMakeLists.txt

@@ -34,12 +34,11 @@ if(EXECUTORCH_BUILD_PYBIND)
         ${_qnn_default_sdk_dir}
         CACHE PATH "Qualcomm SDK root directory" FORCE
     )
-<<<<<<< HEAD
   else()
     message(STATUS "Downloading Qualcomm SDK")
     execute_process(
       COMMAND
-        ${Python3_EXECUTABLE}
+        ${PYTHON_EXECUTABLE}
         ${EXECUTORCH_SOURCE_DIR}/backends/qualcomm/scripts/download_qnn_sdk.py
         --dst-folder ${_qnn_default_sdk_dir}
         --print-sdk-path
@@ -56,39 +55,6 @@ if(EXECUTORCH_BUILD_PYBIND)
         FATAL_ERROR
           "Failed to download Qualcomm SDK. stdout: ${_qnn_sdk_download_output}\n"
           "stderr: ${_qnn_sdk_download_error}"
-=======
-      message(STATUS "Found cached Qualcomm SDK at ${_qnn_default_sdk_dir}")
-      set(QNN_SDK_ROOT
-          ${_qnn_default_sdk_dir}
-          CACHE PATH "Qualcomm SDK root directory" FORCE
-      )
-    else()
-      message(STATUS "QNN_SDK_ROOT not provided, downloading Qualcomm SDK")
-      execute_process(
-        COMMAND
-          ${PYTHON_EXECUTABLE}
-          ${EXECUTORCH_SOURCE_DIR}/backends/qualcomm/scripts/download_qnn_sdk.py
-          --dst-folder ${_qnn_default_sdk_dir}
-          --print-sdk-path
-        WORKING_DIRECTORY ${EXECUTORCH_SOURCE_DIR}
-        RESULT_VARIABLE _qnn_sdk_download_result
-        OUTPUT_VARIABLE _qnn_sdk_download_output
-        ERROR_VARIABLE _qnn_sdk_download_error
-        OUTPUT_STRIP_TRAILING_WHITESPACE
-      )
-      if(NOT _qnn_sdk_download_result EQUAL 0 OR _qnn_sdk_download_output
-                                                 STREQUAL ""
-      )
-        message(
-          FATAL_ERROR
-            "Failed to download Qualcomm SDK. stdout: ${_qnn_sdk_download_output}\n"
-            "stderr: ${_qnn_sdk_download_error}"
-        )
-      endif()
-      set(QNN_SDK_ROOT
-          ${_qnn_sdk_download_output}
-          CACHE PATH "Qualcomm SDK root directory" FORCE
->>>>>>> e13507fb51 (Retry)
       )
     endif()
     set(QNN_SDK_ROOT