Huawei_Technology
/
mindspore
Not watched
1
0
Fork 0
Code
Releases 13 Wiki evaluate Activity
Issues 0 Pull Requests 0 Datasets Model Cloudbrain HPC
You can not select more than 25 topics Topics must start with a chinese character,a letter or number, can include dashes ('-') and can be up to 35 characters long.
Tree: 645f11fa59
Branches Tags
${ item.name }
Create branch ${ searchTerm }
from '645f11fa59'
${ noResults }
mindspore/third_party/patch/incubator-tvm/cmake.patch

202 lines
8.9 kB
Raw Blame History 

  1. diff -Npur tvm/cmake/modules/ANTLR.cmake tvm_new/cmake/modules/ANTLR.cmake

  2. --- tvm/cmake/modules/ANTLR.cmake	2019-12-14 15:11:37.562418441 +0800

  3. +++ tvm_new/cmake/modules/ANTLR.cmake	2019-12-14 11:28:49.161977599 +0800

  4. @@ -14,12 +14,15 @@

  5.  # KIND, either express or implied.  See the License for the

  6.  # specific language governing permissions and limitations

  7.  # under the License.

  8. +

  9. +# 2019.12.30 - Modify current directory of tvm.

  10. +

  11.  if(USE_ANTLR)

  12.    find_antlr(${USE_ANTLR})

  13.    if(ANTLR4)

  14.  

  15.      set(RELAY_PARSER_DIR

  16. -      ${CMAKE_CURRENT_SOURCE_DIR}/python/tvm/relay/grammar)

  17. +      ${TVM_DIR}/python/tvm/relay/grammar)

  18.  

  19.      set(RELAY_PARSER

  20.        ${RELAY_PARSER_DIR}/py3/RelayVisitor.py

  21. diff -Npur tvm/cmake/modules/CUDA.cmake tvm_new/cmake/modules/CUDA.cmake

  22. --- tvm/cmake/modules/CUDA.cmake	2019-12-14 15:11:37.562418441 +0800

  23. +++ tvm_new/cmake/modules/CUDA.cmake	2019-12-14 11:28:49.161977599 +0800

  24. @@ -15,6 +15,8 @@

  25.  # specific language governing permissions and limitations

  26.  # under the License.

  27.  

  28. +# 2019.12.30 - Modify current directory of tvm.

  29. +

  30.  # CUDA Module

  31.  find_cuda(${USE_CUDA})

  32.  

  33. @@ -29,9 +31,9 @@ if(USE_CUDA)

  34.      message(FATAL_ERROR "Cannot find CUDA, USE_CUDA=" ${USE_CUDA})

  35.    endif()

  36.    message(STATUS "Build with CUDA support")

  37. -  file(GLOB RUNTIME_CUDA_SRCS src/runtime/cuda/*.cc)

  38. +  file(GLOB RUNTIME_CUDA_SRCS ${TVM_DIR}/src/runtime/cuda/*.cc)

  39.    list(APPEND RUNTIME_SRCS ${RUNTIME_CUDA_SRCS})

  40. -  list(APPEND COMPILER_SRCS src/codegen/opt/build_cuda_on.cc)

  41. +  list(APPEND COMPILER_SRCS ${TVM_DIR}/src/codegen/opt/build_cuda_on.cc)

  42.  

  43.    list(APPEND TVM_LINKER_LIBS ${CUDA_NVRTC_LIBRARY})

  44.    list(APPEND TVM_RUNTIME_LINKER_LIBS ${CUDA_CUDART_LIBRARY})

  45. @@ -40,18 +42,18 @@ if(USE_CUDA)

  46.  

  47.    if(USE_CUDNN)

  48.      message(STATUS "Build with cuDNN support")

  49. -    file(GLOB CONTRIB_CUDNN_SRCS src/runtime/contrib/cudnn/*.cc)

  50. +    file(GLOB CONTRIB_CUDNN_SRCS ${TVM_DIR}/src/runtime/contrib/cudnn/*.cc)

  51.      list(APPEND RUNTIME_SRCS ${CONTRIB_CUDNN_SRCS})

  52.      list(APPEND TVM_RUNTIME_LINKER_LIBS ${CUDA_CUDNN_LIBRARY})

  53.    endif(USE_CUDNN)

  54.  

  55.    if(USE_CUBLAS)

  56.      message(STATUS "Build with cuBLAS support")

  57. -    file(GLOB CONTRIB_CUBLAS_SRCS src/runtime/contrib/cublas/*.cc)

  58. +    file(GLOB CONTRIB_CUBLAS_SRCS ${TVM_DIR}/src/runtime/contrib/cublas/*.cc)

  59.      list(APPEND RUNTIME_SRCS ${CONTRIB_CUBLAS_SRCS})

  60.      list(APPEND TVM_RUNTIME_LINKER_LIBS ${CUDA_CUBLAS_LIBRARY})

  61.    endif(USE_CUBLAS)

  62.  

  63.  else(USE_CUDA)

  64. -  list(APPEND COMPILER_SRCS src/codegen/opt/build_cuda_off.cc)

  65. +  list(APPEND COMPILER_SRCS ${TVM_DIR}/src/codegen/opt/build_cuda_off.cc)

  66.  endif(USE_CUDA)

  67. diff -Npur tvm/cmake/modules/LLVM.cmake tvm_new/cmake/modules/LLVM.cmake

  68. --- tvm/cmake/modules/LLVM.cmake	2019-12-14 15:11:37.562418441 +0800

  69. +++ tvm_new/cmake/modules/LLVM.cmake	2019-12-14 11:28:49.161977599 +0800

  70. @@ -15,6 +15,8 @@

  71.  # specific language governing permissions and limitations

  72.  # under the License.

  73.  

  74. +# 2019.12.30 - Modify current directory of tvm.

  75. +

  76.  # LLVM rules

  77.  add_definitions(-DDMLC_USE_FOPEN64=0)

  78.  

  79. @@ -26,7 +28,7 @@ if(NOT USE_LLVM STREQUAL "OFF")

  80.    message(STATUS "Set TVM_LLVM_VERSION=" ${TVM_LLVM_VERSION})

  81.    # Set flags that are only needed for LLVM target

  82.    add_definitions(-DTVM_LLVM_VERSION=${TVM_LLVM_VERSION})

  83. -  file(GLOB COMPILER_LLVM_SRCS src/codegen/llvm/*.cc)

  84. +  file(GLOB COMPILER_LLVM_SRCS ${TVM_DIR}/src/codegen/llvm/*.cc)

  85.    list(APPEND TVM_LINKER_LIBS ${LLVM_LIBS})

  86.    list(APPEND COMPILER_SRCS ${COMPILER_LLVM_SRCS})

  87.    if(NOT MSVC)

  88. diff -Npur tvm/cmake/modules/Micro.cmake tvm_new/cmake/modules/Micro.cmake

  89. --- tvm/cmake/modules/Micro.cmake	2019-12-14 15:11:37.562418441 +0800

  90. +++ tvm_new/cmake/modules/Micro.cmake	2019-12-14 11:28:49.161977599 +0800

  91. @@ -15,8 +15,10 @@

  92.  # specific language governing permissions and limitations

  93.  # under the License.

  94.  

  95. +# 2019.12.30 - Modify current directory of tvm.

  96. +

  97.  if(USE_MICRO)

  98.    message(STATUS "Build with Micro support")

  99. -  file(GLOB RUNTIME_MICRO_SRCS src/runtime/micro/*.cc)

  100. +  file(GLOB RUNTIME_MICRO_SRCS ${TVM_DIR}/src/runtime/micro/*.cc)

  101.    list(APPEND RUNTIME_SRCS ${RUNTIME_MICRO_SRCS})

  102.  endif(USE_MICRO)

  103. diff -Npur tvm/cmake/modules/VTA.cmake tvm_new/cmake/modules/VTA.cmake

  104. --- tvm/cmake/modules/VTA.cmake	2019-12-14 15:11:37.562418441 +0800

  105. +++ tvm_new/cmake/modules/VTA.cmake	2019-12-14 14:42:32.358381133 +0800

  106. @@ -15,17 +15,19 @@

  107.  # specific language governing permissions and limitations

  108.  # under the License.

  109.  

  110. +# 2019.12.30 - Modify current directory of tvm.

  111. +

  112.  # CMake Build rules for VTA

  113.  find_program(PYTHON NAMES python python3 python3.6)

  114.  

  115.  if(MSVC)

  116.    message(STATUS "VTA build is skipped in Windows..")

  117.  elseif(PYTHON)

  118. -  set(VTA_CONFIG ${PYTHON} ${CMAKE_CURRENT_SOURCE_DIR}/vta/config/vta_config.py)

  119. +  set(VTA_CONFIG ${PYTHON} ${TVM_DIR}/vta/config/vta_config.py)

  120.  

  121.    if(EXISTS ${CMAKE_CURRENT_BINARY_DIR}/vta_config.json)

  122.      message(STATUS "Use VTA config " ${CMAKE_CURRENT_BINARY_DIR}/vta_config.json)

  123. -    set(VTA_CONFIG ${PYTHON} ${CMAKE_CURRENT_SOURCE_DIR}/vta/config/vta_config.py

  124. +    set(VTA_CONFIG ${PYTHON} ${TVM_DIR}/vta/config/vta_config.py

  125.        --use-cfg=${CMAKE_CURRENT_BINARY_DIR}/vta_config.json)

  126.    endif()

  127.  

  128. @@ -40,18 +42,18 @@ elseif(PYTHON)

  129.    # Fast simulator driver build

  130.    if(USE_VTA_FSIM)

  131.      # Add fsim driver sources

  132. -    file(GLOB FSIM_RUNTIME_SRCS vta/src/*.cc)

  133. -    list(APPEND FSIM_RUNTIME_SRCS vta/src/sim/sim_driver.cc)

  134. -    list(APPEND FSIM_RUNTIME_SRCS vta/src/vmem/virtual_memory.cc vta/src/vmem/virtual_memory.h)

  135. -    list(APPEND FSIM_RUNTIME_SRCS vta/src/sim/sim_tlpp.cc)

  136. +    file(GLOB FSIM_RUNTIME_SRCS ${TVM_DIR}/vta/src/*.cc)

  137. +    list(APPEND FSIM_RUNTIME_SRCS ${TVM_DIR}/vta/src/sim/sim_driver.cc)

  138. +    list(APPEND FSIM_RUNTIME_SRCS ${TVM_DIR}/vta/src/vmem/virtual_memory.cc ${TVM_DIR}/vta/src/vmem/virtual_memory.h)

  139. +    list(APPEND FSIM_RUNTIME_SRCS ${TVM_DIR}/vta/src/sim/sim_tlpp.cc)

  140.      # Target lib: vta_fsim

  141.      add_library(vta_fsim SHARED ${FSIM_RUNTIME_SRCS})

  142. -    target_include_directories(vta_fsim PUBLIC vta/include)

  143. +    target_include_directories(vta_fsim PUBLIC ${TVM_DIR}/vta/include)

  144.      foreach(__def ${VTA_DEFINITIONS})

  145.        string(SUBSTRING ${__def} 3 -1 __strip_def)

  146.        target_compile_definitions(vta_fsim PUBLIC ${__strip_def})

  147.      endforeach()

  148. -    include_directories("vta/include")

  149. +    include_directories("${TVM_DIR}/vta/include")

  150.      if(APPLE)

  151.        set_target_properties(vta_fsim PROPERTIES LINK_FLAGS "-undefined dynamic_lookup")

  152.      endif(APPLE)

  153. @@ -61,18 +63,18 @@ elseif(PYTHON)

  154.    # Cycle accurate simulator driver build

  155.    if(USE_VTA_TSIM)

  156.      # Add tsim driver sources

  157. -    file(GLOB TSIM_RUNTIME_SRCS vta/src/*.cc)

  158. -    list(APPEND TSIM_RUNTIME_SRCS vta/src/tsim/tsim_driver.cc)

  159. -    list(APPEND TSIM_RUNTIME_SRCS vta/src/dpi/module.cc)

  160. -    list(APPEND TSIM_RUNTIME_SRCS vta/src/vmem/virtual_memory.cc vta/src/vmem/virtual_memory.h)

  161. +    file(GLOB TSIM_RUNTIME_SRCS ${TVM_DIR}/vta/src/*.cc)

  162. +    list(APPEND TSIM_RUNTIME_SRCS ${TVM_DIR}/vta/src/tsim/tsim_driver.cc)

  163. +    list(APPEND TSIM_RUNTIME_SRCS ${TVM_DIR}/vta/src/dpi/module.cc)

  164. +    list(APPEND TSIM_RUNTIME_SRCS ${TVM_DIR}/vta/src/vmem/virtual_memory.cc ${TVM_DIR}/vta/src/vmem/virtual_memory.h)

  165.      # Target lib: vta_tsim

  166.      add_library(vta_tsim SHARED ${TSIM_RUNTIME_SRCS})

  167. -    target_include_directories(vta_tsim PUBLIC vta/include)

  168. +    target_include_directories(vta_tsim PUBLIC ${TVM_DIR}/vta/include)

  169.      foreach(__def ${VTA_DEFINITIONS})

  170.        string(SUBSTRING ${__def} 3 -1 __strip_def)

  171.        target_compile_definitions(vta_tsim PUBLIC ${__strip_def})

  172.      endforeach()

  173. -    include_directories("vta/include")

  174. +    include_directories("${TVM_DIR}/vta/include")

  175.      if(APPLE)

  176.        set_target_properties(vta_tsim PROPERTIES LINK_FLAGS "-undefined dynamic_lookup")

  177.      endif(APPLE)

  178. @@ -80,19 +82,19 @@ elseif(PYTHON)

  179.  

  180.    # VTA FPGA driver sources

  181.    if(USE_VTA_FPGA)

  182. -    file(GLOB FPGA_RUNTIME_SRCS vta/src/*.cc)

  183. +    file(GLOB FPGA_RUNTIME_SRCS ${TVM_DIR}/vta/src/*.cc)

  184.      # Rules for Zynq-class FPGAs with pynq OS support (see pynq.io)

  185.      if(${VTA_TARGET} STREQUAL "pynq" OR

  186.         ${VTA_TARGET} STREQUAL "ultra96")

  187. -      list(APPEND FPGA_RUNTIME_SRCS vta/src/pynq/pynq_driver.cc)

  188. +      list(APPEND FPGA_RUNTIME_SRCS ${TVM_DIR}/vta/src/pynq/pynq_driver.cc)

  189.        # Rules for Pynq v2.4

  190.        find_library(__cma_lib NAMES cma PATH /usr/lib)

  191.      elseif(${VTA_TARGET} STREQUAL "de10nano")  # DE10-Nano rules

  192. -      file(GLOB FPGA_RUNTIME_SRCS vta/src/de10nano/*.cc vta/src/*.cc)

  193. +      file(GLOB FPGA_RUNTIME_SRCS ${TVM_DIR}/vta/src/de10nano/*.cc ${TVM_DIR}/vta/src/*.cc)

  194.      endif()

  195.      # Target lib: vta

  196.      add_library(vta SHARED ${FPGA_RUNTIME_SRCS})

  197. -    target_include_directories(vta PUBLIC vta/include)

  198. +    target_include_directories(vta PUBLIC ${TVM_DIR}/vta/include)

  199.      foreach(__def ${VTA_DEFINITIONS})

  200.        string(SUBSTRING ${__def} 3 -1 __strip_def)

  201.        target_compile_definitions(vta PUBLIC ${__strip_def})