Skip to contentSkip to conversation

tvm: fix TVM runtime problem

PATCH In review Jianzhong Xu 2 participants 3 messages Oct 8, 2019 – Oct 10, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 tvm: fix TVM runtime problem

* add run-time depends of Python3 decorator
* use latest code (Mon Oct 7) from master branch
* update patch file accordingly

---
 .../0001-CMakeLists-install-unit-tests.patch  | 29 ++++++++++---------
 recipes-support/tvm/tvm_git.bb                |  7 +++--
 2 files changed, 21 insertions(+), 15 deletions(-)
recipes-support/tvm/tvm/0001-CMakeLists-install-unit-tests.patch +16 -13
index 6582d70..a79856f 100644
@@ -1,26 +1,29 @@
-From 2663c9682e427ce64f5bfa53e1ee389f80133cac Mon Sep 17 00:00:00 2001
-From: Jacob Stiffler <[email protected]>
-Date: Wed, 14 Aug 2019 16:27:51 -0400
-Subject: [PATCH] CMakeLists: install unit tests
+From 5904aa69d8f022678aa19dd4c1b5569d5fc243ee Mon Sep 17 00:00:00 2001
+From: Jianzhong Xu <[email protected]>
+Date: Tue, 8 Oct 2019 16:56:30 -0400
+Subject: [PATCH] [PATCH] CMakeLists: install unit tests
 
 * Install the unittests (cpptest) to /usr/share/tvm/cpptest
 * For simplicity, do not exclude cpptest from the default build.
 
 Upstream-Status: Innappropriate [Configuration]
 
-Signed-off-by: Jacob Stiffler <[email protected]>
+Signed-off-by: Jianzhong Xu <[email protected]>
 ---
  CMakeLists.txt | 5 +++--
  1 file changed, 3 insertions(+), 2 deletions(-)
+ mode change 100644 => 100755 CMakeLists.txt
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 494afbd..7e887f6 100644
+old mode 100644
+new mode 100755
+index 10730ac7..ea369a6e
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -233,10 +233,11 @@ if(GTEST_LIB)
+@@ -333,10 +333,11 @@ if(GTEST_INCLUDE_DIR AND GTEST_LIB)
      list(APPEND TEST_EXECS ${__execname})
-     target_link_libraries(${__execname}
-       tvm ${GTEST_LIB} pthread)
+     target_include_directories(${__execname} PUBLIC ${GTEST_INCLUDE_DIR})
+     target_link_libraries(${__execname} tvm ${GTEST_LIB} pthread dl)
 -    set_target_properties(${__execname} PROPERTIES EXCLUDE_FROM_ALL 1)
 -    set_target_properties(${__execname} PROPERTIES EXCLUDE_FROM_DEFAULT_BUILD 1)
 +    #set_target_properties(${__execname} PROPERTIES EXCLUDE_FROM_ALL 1)
@@ -28,9 +31,9 @@ index 494afbd..7e887f6 100644
    endforeach()
    add_custom_target(cpptest DEPENDS ${TEST_EXECS})
 +  install(TARGETS ${TEST_EXECS} DESTINATION share/tvm/cpptest)
- endif()
- 
- # Custom targets
+ elseif(NOT GTEST_INCLUDE_DIR)
+   add_custom_target(cpptest
+       COMMAND echo "Missing Google Test headers in include path"
 -- 
-2.7.4
+2.17.1
 
recipes-support/tvm/tvm_git.bb +5 -2
index 9750726..5bbdd36 100644
@@ -8,9 +8,12 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e \
                     file://3rdparty/HalideIR/LICENSE;md5=9910386e68f0616e1ecf1037479fa97e \
 "
 
+RDEPENDS_${PN} = " python3-decorator \
+"
+
 PV = "0.5"
 
-BRANCH ?= "v${PV}"
+BRANCH = "master"
 
 # Main TVM sources plus submodules.
 SRC_URI = "git://github.com/dmlc/tvm;protocol=https;branch=${BRANCH};name=tvm \
@@ -21,7 +24,7 @@ SRC_URI = "git://github.com/dmlc/tvm;protocol=https;branch=${BRANCH};name=tvm \
            file://0001-CMakeLists-install-unit-tests.patch \
 "
 
-SRCREV_tvm = "f08015e7fde92c835907d4c9b7ad6d3f634e94a5"
+SRCREV_tvm = "76c239269935288e51fbce14f135d75ad9742b2a"
 SRCREV_dmlc-core = "d07fb7a443b5db8a89d65a15a024af6a425615a5"
 SRCREV_halideir = "b257a9221ee1e5180d994b3488ddcc259b0ac157"
 SRCREV_dlpack = "5c792cef3aee54ad8b7000111c9dc1797f327b59"
Signature · 1 line
2.17.1
#1 lore raw

This fails for nativesdk-tvm.

ERROR: Nothing RPROVIDES 'nativesdk-python3-decorator' (but virtual:nativesdk:/oe/bld/sources/meta-processor-sdk/recipes-support/tvm/tvm_git.bb RDEPENDS on or otherwise requires it)

Quoted 94 lines · Jianzhong Xu

* add run-time depends of Python3 decorator
* use latest code (Mon Oct 7) from master branch
* update patch file accordingly

---
  .../0001-CMakeLists-install-unit-tests.patch  | 29 ++++++++++---------
  recipes-support/tvm/tvm_git.bb                |  7 +++--
  2 files changed, 21 insertions(+), 15 deletions(-)
recipes-support/tvm/tvm/0001-CMakeLists-install-unit-tests.patch +16 -13
index 6582d70..a79856f 100644
@@ -1,26 +1,29 @@
-From 2663c9682e427ce64f5bfa53e1ee389f80133cac Mon Sep 17 00:00:00 2001
-From: Jacob Stiffler <[email protected]>
-Date: Wed, 14 Aug 2019 16:27:51 -0400
-Subject: [PATCH] CMakeLists: install unit tests
+From 5904aa69d8f022678aa19dd4c1b5569d5fc243ee Mon Sep 17 00:00:00 2001
+From: Jianzhong Xu <[email protected]>
+Date: Tue, 8 Oct 2019 16:56:30 -0400
+Subject: [PATCH] [PATCH] CMakeLists: install unit tests
 
  * Install the unittests (cpptest) to /usr/share/tvm/cpptest
  * For simplicity, do not exclude cpptest from the default build.
 
  Upstream-Status: Innappropriate [Configuration]
 
-Signed-off-by: Jacob Stiffler <[email protected]>
+Signed-off-by: Jianzhong Xu <[email protected]>
  ---
   CMakeLists.txt | 5 +++--
   1 file changed, 3 insertions(+), 2 deletions(-)
+ mode change 100644 => 100755 CMakeLists.txt
 
  diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 494afbd..7e887f6 100644
+old mode 100644
+new mode 100755
+index 10730ac7..ea369a6e
  --- a/CMakeLists.txt
  +++ b/CMakeLists.txt
-@@ -233,10 +233,11 @@ if(GTEST_LIB)
+@@ -333,10 +333,11 @@ if(GTEST_INCLUDE_DIR AND GTEST_LIB)
       list(APPEND TEST_EXECS ${__execname})
-     target_link_libraries(${__execname}
-       tvm ${GTEST_LIB} pthread)
+     target_include_directories(${__execname} PUBLIC ${GTEST_INCLUDE_DIR})
+     target_link_libraries(${__execname} tvm ${GTEST_LIB} pthread dl)
  -    set_target_properties(${__execname} PROPERTIES EXCLUDE_FROM_ALL 1)
  -    set_target_properties(${__execname} PROPERTIES EXCLUDE_FROM_DEFAULT_BUILD 1)
  +    #set_target_properties(${__execname} PROPERTIES EXCLUDE_FROM_ALL 1)
@@ -28,9 +31,9 @@ index 494afbd..7e887f6 100644
     endforeach()
     add_custom_target(cpptest DEPENDS ${TEST_EXECS})
  +  install(TARGETS ${TEST_EXECS} DESTINATION share/tvm/cpptest)
- endif()
-
- # Custom targets
+ elseif(NOT GTEST_INCLUDE_DIR)
+   add_custom_target(cpptest
+       COMMAND echo "Missing Google Test headers in include path"
  --
-2.7.4
+2.17.1
 
recipes-support/tvm/tvm_git.bb +5 -2
index 9750726..5bbdd36 100644
@@ -8,9 +8,12 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e \
                      file://3rdparty/HalideIR/LICENSE;md5=9910386e68f0616e1ecf1037479fa97e \
  "
 
+RDEPENDS_${PN} = " python3-decorator \
+"
+
  PV = "0.5"
 
-BRANCH ?= "v${PV}"
+BRANCH = "master"
 
  # Main TVM sources plus submodules.
  SRC_URI = "git://github.com/dmlc/tvm;protocol=https;branch=${BRANCH};name=tvm \
@@ -21,7 +24,7 @@ SRC_URI = "git://github.com/dmlc/tvm;protocol=https;branch=${BRANCH};name=tvm \
             file://0001-CMakeLists-install-unit-tests.patch \
  "
 
-SRCREV_tvm = "f08015e7fde92c835907d4c9b7ad6d3f634e94a5"
+SRCREV_tvm = "76c239269935288e51fbce14f135d75ad9742b2a"
  SRCREV_dmlc-core = "d07fb7a443b5db8a89d65a15a024af6a425615a5"
  SRCREV_halideir = "b257a9221ee1e5180d994b3488ddcc259b0ac157"
  SRCREV_dlpack = "5c792cef3aee54ad8b7000111c9dc1797f327b59"
#2 lore raw

Here's the fix: http://arago-project.org/pipermail/meta-arago/2019-October/012007.html

Quoted 99 lines · Jacob Stiffler

This fails for nativesdk-tvm.

ERROR: Nothing RPROVIDES 'nativesdk-python3-decorator' (but virtual:nativesdk:/oe/bld/sources/meta-processor-sdk/recipes-support/tvm/tvm_git.bb RDEPENDS on or otherwise requires it)

Quoted 82 lines · Jianzhong Xu

* add run-time depends of Python3 decorator
* use latest code (Mon Oct 7) from master branch
* update patch file accordingly

---
  .../0001-CMakeLists-install-unit-tests.patch  | 29 ++++++++++--------- recipes-support/tvm/tvm_git.bb                |  7 +++--

  2 files changed, 21 insertions(+), 15 deletions(-)
recipes-support/tvm/tvm/0001-CMakeLists-install-unit-tests.patch +4 -4
index 6582d70..a79856f 100644
@@ -1,26 +1,29 @@
-From 2663c9682e427ce64f5bfa53e1ee389f80133cac Mon Sep 17 00:00:00 2001
-From: Jacob Stiffler <[email protected]>
-Date: Wed, 14 Aug 2019 16:27:51 -0400
-Subject: [PATCH] CMakeLists: install unit tests
+From 5904aa69d8f022678aa19dd4c1b5569d5fc243ee Mon Sep 17 00:00:00 2001
+From: Jianzhong Xu <[email protected]>
+Date: Tue, 8 Oct 2019 16:56:30 -0400
+Subject: [PATCH] [PATCH] CMakeLists: install unit tests
     * Install the unittests (cpptest) to /usr/share/tvm/cpptest
   * For simplicity, do not exclude cpptest from the default build.

    Upstream-Status: Innappropriate [Configuration] -Signed-off-by: Jacob Stiffler <[email protected]> +Signed-off-by: Jianzhong Xu <[email protected]>
  ---
   CMakeLists.txt | 5 +++--

   1 file changed, 3 insertions(+), 2 deletions(-)

+ mode change 100644 => 100755 CMakeLists.txt
    diff --git a/CMakeLists.txt b/CMakeLists.txt

recipes-support/tvm/tvm/0001-CMakeLists-install-unit-tests.patch +3 -1
-index 494afbd..7e887f6 100644
+old mode 100644
+new mode 100755
+index 10730ac7..ea369a6e

  --- a/CMakeLists.txt
  +++ b/CMakeLists.txt
-@@ -233,10 +233,11 @@ if(GTEST_LIB)
+@@ -333,10 +333,11 @@ if(GTEST_INCLUDE_DIR AND GTEST_LIB)
       list(APPEND TEST_EXECS ${__execname})
-     target_link_libraries(${__execname}
-       tvm ${GTEST_LIB} pthread)
+     target_include_directories(${__execname} PUBLIC ${GTEST_INCLUDE_DIR})
+     target_link_libraries(${__execname} tvm ${GTEST_LIB} pthread dl) -    set_target_properties(${__execname} PROPERTIES EXCLUDE_FROM_ALL 1) -    set_target_properties(${__execname} PROPERTIES EXCLUDE_FROM_DEFAULT_BUILD 1) +    #set_target_properties(${__execname} PROPERTIES EXCLUDE_FROM_ALL 1)

recipes-support/tvm/tvm/0001-CMakeLists-install-unit-tests.patch +3 -3
@@ -28,9 +31,9 @@ index 494afbd..7e887f6 100644
      endforeach()
      add_custom_target(cpptest DEPENDS ${TEST_EXECS})
   +  install(TARGETS ${TEST_EXECS} DESTINATION share/tvm/cpptest)
- endif()
-
- # Custom targets
+ elseif(NOT GTEST_INCLUDE_DIR)
+   add_custom_target(cpptest
+       COMMAND echo "Missing Google Test headers in include path"

  --
-2.7.4
+2.17.1
  diff --git a/recipes-support/tvm/tvm_git.bb b/recipes-support/tvm/tvm_git.bb index 9750726..5bbdd36 100644

recipes-support/tvm/tvm_git.bb +0 -0
@@ -8,9 +8,12 @@ LIC_FILES_CHKSUM = 
 "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e \
 file://3rdparty/HalideIR/LICENSE;md5=9910386e68f0616e1ecf1037479fa97e \

  "
  +RDEPENDS_${PN} = " python3-decorator \
+"
+
  PV = "0.5"
  -BRANCH ?= "v${PV}"
+BRANCH = "master"
    # Main TVM sources plus submodules.
  SRC_URI = "git://github.com/dmlc/tvm;protocol=https;branch=${BRANCH};name=tvm \

recipes-support/tvm/tvm_git.bb +0 -0
@@ -21,7 +24,7 @@ SRC_URI = 
 "git://github.com/dmlc/tvm;protocol=https;branch=${BRANCH};name=tvm \
              file://0001-CMakeLists-install-unit-tests.patch \
Quoted 6 lines

  "
  -SRCREV_tvm = "f08015e7fde92c835907d4c9b7ad6d3f634e94a5" +SRCREV_tvm = "76c239269935288e51fbce14f135d75ad9742b2a" SRCREV_dmlc-core = "d07fb7a443b5db8a89d65a15a024af6a425615a5" SRCREV_halideir = "b257a9221ee1e5180d994b3488ddcc259b0ac157" SRCREV_dlpack = "5c792cef3aee54ad8b7000111c9dc1797f327b59"

_______________________________________________
meta-arago mailing list
[email protected]
http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago