diff --git a/cmake/onnxruntime_providers_qnn.cmake b/cmake/onnxruntime_providers_qnn.cmake index 748e3de843bab..f499c83d5f6c0 100644 --- a/cmake/onnxruntime_providers_qnn.cmake +++ b/cmake/onnxruntime_providers_qnn.cmake @@ -66,10 +66,10 @@ COMMAND ${CMAKE_COMMAND} -E copy ${QNN_LIB_FILES} $ ) endif() - if (EXISTS "${onnxruntime_QNN_HOME}/Qualcomm AI Hub Proprietary License.pdf") + if (EXISTS "${onnxruntime_QNN_HOME}/LICENSE.pdf") add_custom_command( TARGET ${onnxruntime_providers_qnn_target} POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy "${onnxruntime_QNN_HOME}/Qualcomm AI Hub Proprietary License.pdf" $ + COMMAND ${CMAKE_COMMAND} -E copy "${onnxruntime_QNN_HOME}/LICENSE.pdf" $/Qualcomm_LICENSE.pdf ) endif() else() @@ -154,10 +154,10 @@ COMMAND ${CMAKE_COMMAND} -E copy ${QNN_LIB_FILES} $ ) endif() - if (EXISTS "${onnxruntime_QNN_HOME}/Qualcomm AI Hub Proprietary License.pdf") + if (EXISTS "${onnxruntime_QNN_HOME}/LICENSE.pdf") add_custom_command( TARGET ${onnxruntime_providers_qnn_target} POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy "${onnxruntime_QNN_HOME}/Qualcomm AI Hub Proprietary License.pdf" $ + COMMAND ${CMAKE_COMMAND} -E copy "${onnxruntime_QNN_HOME}/LICENSE.pdf" $/Qualcomm_LICENSE.pdf ) endif() endif() diff --git a/cmake/onnxruntime_python.cmake b/cmake/onnxruntime_python.cmake index b177074a1bc02..c5c85dff96411 100644 --- a/cmake/onnxruntime_python.cmake +++ b/cmake/onnxruntime_python.cmake @@ -1068,12 +1068,10 @@ if (onnxruntime_USE_QNN) ${QNN_LIB_FILES} $/onnxruntime/capi/ ) - if (EXISTS "${onnxruntime_QNN_HOME}/Qualcomm AI Hub Proprietary License.pdf") + if (EXISTS "${onnxruntime_QNN_HOME}/LICENSE.pdf") add_custom_command( TARGET onnxruntime_pybind11_state POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy - "${onnxruntime_QNN_HOME}/Qualcomm AI Hub Proprietary License.pdf" - $/onnxruntime/ + COMMAND ${CMAKE_COMMAND} -E copy "${onnxruntime_QNN_HOME}/LICENSE.pdf" $/onnxruntime/Qualcomm_LICENSE.pdf ) endif() endif() diff --git a/setup.py b/setup.py index 1893e18b8aab6..5ab1ac5b840d4 100644 --- a/setup.py +++ b/setup.py @@ -478,7 +478,7 @@ def finalize_options(self): examples = [path.join("datasets", x) for x in examples_names] # Extra files such as EULA and ThirdPartyNotices (and Qualcomm License, only for QNN release packages) -extra = ["LICENSE", "ThirdPartyNotices.txt", "Privacy.md", "Qualcomm AI Hub Proprietary License.pdf"] +extra = ["LICENSE", "ThirdPartyNotices.txt", "Privacy.md", "Qualcomm_LICENSE.pdf"] # Description readme_file = "docs/python/ReadMeOV.rst" if is_openvino else "docs/python/README.rst" diff --git a/tools/ci_build/github/azure-pipelines/templates/jobs/download_linux_qnn_sdk.yml b/tools/ci_build/github/azure-pipelines/templates/jobs/download_linux_qnn_sdk.yml index 930dc83b73460..57703239fc594 100644 --- a/tools/ci_build/github/azure-pipelines/templates/jobs/download_linux_qnn_sdk.yml +++ b/tools/ci_build/github/azure-pipelines/templates/jobs/download_linux_qnn_sdk.yml @@ -39,10 +39,6 @@ steps: fi displayName: "Sanity Check: QnnSDKVersion vs sdk.yaml version" - - script: | - azcopy cp --recursive 'https://lotusscus.blob.core.windows.net/models/qnnsdk/Qualcomm AI Hub Proprietary License.pdf' $(QnnSDKRootDir) - displayName: 'Download Qualcomm AI Hub license' - - script: | ls -al $(QnnSDKRootDir) displayName: 'Print contents of QNN SDK' diff --git a/tools/ci_build/github/azure-pipelines/templates/jobs/download_win_qnn_sdk.yml b/tools/ci_build/github/azure-pipelines/templates/jobs/download_win_qnn_sdk.yml index 96eea6cd6d2fb..d2e401f3f6ab4 100644 --- a/tools/ci_build/github/azure-pipelines/templates/jobs/download_win_qnn_sdk.yml +++ b/tools/ci_build/github/azure-pipelines/templates/jobs/download_win_qnn_sdk.yml @@ -18,10 +18,6 @@ steps: echo $(QnnSDKRootDir) displayName: 'Print QnnSDKRootDir after downloading QNN SDK' - - powershell: | - azcopy.exe cp --recursive 'https://lotusscus.blob.core.windows.net/models/qnnsdk/Qualcomm AI Hub Proprietary License.pdf' $(QnnSDKRootDir) - displayName: 'Download Qualcomm AI Hub license' - - task: CmdLine@2 displayName: 'Print contents of QNN SDK' inputs: diff --git a/tools/nuget/generate_nuspec_for_native_nuget.py b/tools/nuget/generate_nuspec_for_native_nuget.py index c5a204b6cb958..211cb7a2a8a75 100644 --- a/tools/nuget/generate_nuspec_for_native_nuget.py +++ b/tools/nuget/generate_nuspec_for_native_nuget.py @@ -1081,8 +1081,8 @@ def generate_files(line_list, args): files_list.append( "' + + os.path.join(args.native_build_path, "Qualcomm_LICENSE.pdf") + + '" target="Qualcomm_LICENSE.pdf" />' ) files_list.append("")