Skip to content

Commit 6346348

Browse files
Qualcomm AI Engine Direct - Remove copy headers mechanism (#8877)
Summary - Remove redundant directory Co-authored-by: DannyYuyang-quic <quic_yuyazhua@quicinc.com>
1 parent cca6917 commit 6346348

File tree

2 files changed

+4
-62
lines changed

2 files changed

+4
-62
lines changed

backends/qualcomm/CMakeLists.txt

+4-11
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,6 @@ add_library(qnn_executorch_logging STATIC)
126126
add_library(qnn_factory STATIC)
127127
add_library(qnn_function_interface INTERFACE)
128128
add_library(qnn_graph STATIC)
129-
add_library(qnn_header INTERFACE)
130129
add_library(qnn_implementation STATIC)
131130
add_library(qnn_logger STATIC)
132131
add_library(qnn_manager STATIC)
@@ -143,16 +142,12 @@ add_library(utils STATIC)
143142
# declare dependency
144143
#
145144
target_link_libraries(qcir_utils PRIVATE qcir)
146-
target_link_libraries(wrappers PRIVATE qnn_header qnn_executorch_logging)
147-
target_link_libraries(qnn_function_interface INTERFACE qnn_header)
145+
target_link_libraries(wrappers PRIVATE qnn_executorch_logging)
148146
target_link_libraries(
149-
qnn_implementation PRIVATE qnn_function_interface qnn_header
150-
qnn_executorch_logging ${CMAKE_DL_LIBS}
147+
qnn_implementation PRIVATE qnn_function_interface qnn_executorch_logging ${CMAKE_DL_LIBS}
151148
)
152-
target_link_libraries(qnn_sys_function_interface INTERFACE qnn_header)
153149
target_link_libraries(
154-
qnn_sys_implementation PRIVATE qnn_sys_function_interface qnn_header
155-
qnn_executorch_logging ${CMAKE_DL_LIBS}
150+
qnn_sys_implementation PRIVATE qnn_sys_function_interface qnn_executorch_logging ${CMAKE_DL_LIBS}
156151
)
157152
target_link_libraries(qnn_executorch_logging PRIVATE qnn_schema)
158153
target_link_libraries(qnn_profiler PRIVATE qnn_executorch_logging)
@@ -178,9 +173,7 @@ target_link_libraries(
178173
)
179174

180175
target_link_libraries(
181-
qnn_factory
182-
PUBLIC qnn_header
183-
PRIVATE qnn_schema qnn_backend qnn_device qnn_context qnn_graph
176+
qnn_factory PRIVATE qnn_schema qnn_backend qnn_device qnn_context qnn_graph
184177
qnn_mem_manager qnn_custom_protocol
185178
)
186179
target_link_libraries(

backends/qualcomm/runtime/backends/CMakeLists.txt

-51
Original file line numberDiff line numberDiff line change
@@ -122,54 +122,3 @@ target_sources(
122122
PUBLIC ${CMAKE_CURRENT_LIST_DIR}/QnnCustomProtocol.h
123123
PRIVATE ${CMAKE_CURRENT_LIST_DIR}/QnnCustomProtocol.cpp
124124
)
125-
126-
set(qnn_header_basenames
127-
QnnBackend.h
128-
QnnCommon.h
129-
QnnContext.h
130-
QnnDevice.h
131-
GPU/QnnGpuBackend.h
132-
GPU/QnnGpuCommon.h
133-
GPU/QnnGpuContext.h
134-
GPU/QnnGpuGraph.h
135-
QnnGraph.h
136-
HTP/QnnHtpCommon.h
137-
HTP/QnnHtpDevice.h
138-
HTP/QnnHtpGraph.h
139-
HTP/QnnHtpMem.h
140-
HTP/QnnHtpPerfInfrastructure.h
141-
HTP/QnnHtpProfile.h
142-
HTP/QnnHtpProperty.h
143-
HTP/QnnHtpSystemContext.h
144-
QnnInterface.h
145-
QnnLog.h
146-
QnnMem.h
147-
QnnOpDef.h
148-
QnnOpPackage.h
149-
QnnProfile.h
150-
QnnProperty.h
151-
Saver/QnnSaver.h
152-
Saver/QnnSaverCommon.h
153-
QnnSdkBuildId.h
154-
QnnSignal.h
155-
QnnTensor.h
156-
QnnTypes.h
157-
System/QnnSystemCommon.h
158-
System/QnnSystemContext.h
159-
System/QnnSystemInterface.h
160-
)
161-
162-
set(QNN_HEADER_DIR_DST ${CMAKE_CURRENT_BINARY_DIR}/QNN/include)
163-
164-
# add the custom commands to copy each headers
165-
foreach(_qnn_header ${qnn_header_basenames})
166-
# copy at generation time to make below target_sources(qnn_header) happy.
167-
configure_file(
168-
${QNN_SDK_ROOT}/include/QNN/${_qnn_header}
169-
${QNN_HEADER_DIR_DST}/${_qnn_header} COPYONLY
170-
)
171-
list(APPEND qnn_header_files ${QNN_HEADER_DIR_DST}/${_qnn_header})
172-
endforeach()
173-
174-
# qnn_header
175-
target_sources(qnn_header INTERFACE ${qnn_header_files})

0 commit comments

Comments
 (0)