Skip to content

Qualcomm AI Engine Direct - Remove copy headers mechanism #8877

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 5, 2025
Merged

Qualcomm AI Engine Direct - Remove copy headers mechanism #8877

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 4 additions & 11 deletions backends/qualcomm/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,6 @@ add_library(qnn_executorch_logging STATIC)
add_library(qnn_factory STATIC)
add_library(qnn_function_interface INTERFACE)
add_library(qnn_graph STATIC)
add_library(qnn_header INTERFACE)
add_library(qnn_implementation STATIC)
add_library(qnn_logger STATIC)
add_library(qnn_manager STATIC)
Expand All @@ -143,16 +142,12 @@ add_library(utils STATIC)
# declare dependency
#
target_link_libraries(qcir_utils PRIVATE qcir)
target_link_libraries(wrappers PRIVATE qnn_header qnn_executorch_logging)
target_link_libraries(qnn_function_interface INTERFACE qnn_header)
target_link_libraries(wrappers PRIVATE qnn_executorch_logging)
target_link_libraries(
qnn_implementation PRIVATE qnn_function_interface qnn_header
qnn_executorch_logging ${CMAKE_DL_LIBS}
qnn_implementation PRIVATE qnn_function_interface qnn_executorch_logging ${CMAKE_DL_LIBS}
)
target_link_libraries(qnn_sys_function_interface INTERFACE qnn_header)
target_link_libraries(
qnn_sys_implementation PRIVATE qnn_sys_function_interface qnn_header
qnn_executorch_logging ${CMAKE_DL_LIBS}
qnn_sys_implementation PRIVATE qnn_sys_function_interface qnn_executorch_logging ${CMAKE_DL_LIBS}
)
target_link_libraries(qnn_executorch_logging PRIVATE qnn_schema)
target_link_libraries(qnn_profiler PRIVATE qnn_executorch_logging)
Expand All @@ -178,9 +173,7 @@ target_link_libraries(
)

target_link_libraries(
qnn_factory
PUBLIC qnn_header
PRIVATE qnn_schema qnn_backend qnn_device qnn_context qnn_graph
qnn_factory PRIVATE qnn_schema qnn_backend qnn_device qnn_context qnn_graph
qnn_mem_manager qnn_custom_protocol
)
target_link_libraries(
Expand Down
51 changes: 0 additions & 51 deletions backends/qualcomm/runtime/backends/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,54 +122,3 @@ target_sources(
PUBLIC ${CMAKE_CURRENT_LIST_DIR}/QnnCustomProtocol.h
PRIVATE ${CMAKE_CURRENT_LIST_DIR}/QnnCustomProtocol.cpp
)

set(qnn_header_basenames
QnnBackend.h
QnnCommon.h
QnnContext.h
QnnDevice.h
GPU/QnnGpuBackend.h
GPU/QnnGpuCommon.h
GPU/QnnGpuContext.h
GPU/QnnGpuGraph.h
QnnGraph.h
HTP/QnnHtpCommon.h
HTP/QnnHtpDevice.h
HTP/QnnHtpGraph.h
HTP/QnnHtpMem.h
HTP/QnnHtpPerfInfrastructure.h
HTP/QnnHtpProfile.h
HTP/QnnHtpProperty.h
HTP/QnnHtpSystemContext.h
QnnInterface.h
QnnLog.h
QnnMem.h
QnnOpDef.h
QnnOpPackage.h
QnnProfile.h
QnnProperty.h
Saver/QnnSaver.h
Saver/QnnSaverCommon.h
QnnSdkBuildId.h
QnnSignal.h
QnnTensor.h
QnnTypes.h
System/QnnSystemCommon.h
System/QnnSystemContext.h
System/QnnSystemInterface.h
)

set(QNN_HEADER_DIR_DST ${CMAKE_CURRENT_BINARY_DIR}/QNN/include)

# add the custom commands to copy each headers
foreach(_qnn_header ${qnn_header_basenames})
# copy at generation time to make below target_sources(qnn_header) happy.
configure_file(
${QNN_SDK_ROOT}/include/QNN/${_qnn_header}
${QNN_HEADER_DIR_DST}/${_qnn_header} COPYONLY
)
list(APPEND qnn_header_files ${QNN_HEADER_DIR_DST}/${_qnn_header})
endforeach()

# qnn_header
target_sources(qnn_header INTERFACE ${qnn_header_files})
Loading