Package dependency for peachpy (#5201)
author오형석/On-Device Lab(SR)/Staff Engineer/삼성전자 <hseok82.oh@samsung.com>
Mon, 20 May 2019 02:02:58 +0000 (11:02 +0900)
committer이춘석/On-Device Lab(SR)/Staff Engineer/삼성전자 <chunseok.lee@samsung.com>
Mon, 20 May 2019 02:02:58 +0000 (11:02 +0900)
External peachpy source need for NNPACK
In peachpy source download configuration, it need additional download to execute python setup script - six, enum, opcode
Instead of using setup.py, direct code generation script run with python path setting

Signed-off-by: Hyeongseok Oh <hseok82.oh@samsung.com>
cmake/packages/PeachpySourceConfig.cmake

index 4745909..b8467ac 100644 (file)
@@ -8,9 +8,13 @@ function(_PeachpySource_import)
     ExternalSource_Get("python_peachpy" ${DOWNLOAD_NNPACK} ${PEACHPY_URL})
     FIND_PACKAGE(PythonInterp)
 
+    nnfw_find_package(SixSource REQUIRED)
+    nnfw_find_package(Enum34Source REQUIRED)
+    nnfw_find_package(OpcodesSource REQUIRED)
+
     # Generate opcodes:
-    SET(ENV{PYTHONPATH} ${PYTHON_SIX_SOURCE_DIR}:${PYTHON_ENUM_SOURCE_DIR}:${PYTHON_OPCODES_SOURCE_DIR})
-    EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} ./setup.py generate
+    SET(ENV{PYTHONPATH} ${python_peachpy_SOURCE_DIR}:${PYTHON_SIX_SOURCE_DIR}:${PYTHON_ENUM_SOURCE_DIR}:${PYTHON_OPCODES_SOURCE_DIR})
+    EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} ./codegen/x86_64.py
             WORKING_DIRECTORY ${python_peachpy_SOURCE_DIR}
             RESULT_VARIABLE BUILT_PP)
     set(PYTHON_PEACHPY_SOURCE_DIR ${python_peachpy_SOURCE_DIR} PARENT_SCOPE)