neo-ai
diff --git a/‎CMakeLists.txt‎
Lines changed: 5 additions & 33 deletions b/‎CMakeLists.txt‎
Lines changed: 5 additions & 33 deletions
diff --git a/‎CONTRIBUTORS.md‎
Lines changed: 1 addition & 1 deletion b/‎CONTRIBUTORS.md‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎Jenkinsfile‎
Lines changed: 5 additions & 4 deletions b/‎Jenkinsfile‎
Lines changed: 5 additions & 4 deletions
diff --git a/‎Makefile‎
Lines changed: 0 additions & 2 deletions b/‎Makefile‎
Lines changed: 0 additions & 2 deletions
@@ -119,9 +119,8 @@ else(MSVC)
 endif(MSVC)
 
 # add source group
-FILE(GLOB_RECURSE GROUP_SOURCE "src/*.cc" "nnvm/src/*.cc")
-FILE(GLOB_RECURSE GROUP_INCLUDE "src/*.h" "include/*.h"
-                                "nnvm/src/*.h" "nnvm/include/*.h")
+FILE(GLOB_RECURSE GROUP_SOURCE "src/*.cc")
+FILE(GLOB_RECURSE GROUP_INCLUDE "src/*.h" "include/*.h")
 assign_source_group("Source" ${GROUP_SOURCE})
 assign_source_group("Include" ${GROUP_INCLUDE})
 
@@ -170,19 +169,6 @@ endif(USE_VM_PROFILER)
 file(GLOB DATATYPE_SRCS src/codegen/datatype/*.cc)
 list(APPEND COMPILER_SRCS ${DATATYPE_SRCS})
 
-if(NOT MSVC)
-  file(GLOB COMPILER_VERILOG_SRCS src/codegen/verilog/*.cc)
-  list(APPEND COMPILER_SRCS ${COMPILER_VERILOG_SRCS})
-endif()
-
-file(GLOB_RECURSE NNVM_COMPILER_SRCS
-    nnvm/src/c_api/*.cc
-    nnvm/src/core/*.cc
-    nnvm/src/pass/*.cc
-    nnvm/src/compiler/*.cc
-    nnvm/src/top/*.cc
-)
-
 file(GLOB TOPI_SRCS
     topi/src/*.cc
 )
@@ -255,6 +241,8 @@ include(cmake/modules/LLVM.cmake)
 include(cmake/modules/Micro.cmake)
 include(cmake/modules/ANTLR.cmake)
 include(cmake/modules/contrib/BLAS.cmake)
+include(cmake/modules/contrib/CODEGENC.cmake)
+include(cmake/modules/contrib/DNNL.cmake)
 include(cmake/modules/contrib/Random.cmake)
 include(cmake/modules/contrib/MicroStandaloneRuntime.cmake)
 include(cmake/modules/contrib/Sort.cmake)
@@ -295,7 +283,6 @@ if(NOT USE_SGX STREQUAL "OFF")
   add_dependencies(tvm_runtime sgx_edl tvm_t)
   install(TARGETS tvm_t ARCHIVE DESTINATION lib${LIB_SUFFIX})
 endif()
-add_library(nnvm_compiler SHARED ${NNVM_COMPILER_SRCS})
 
 if(USE_THREADS)
   message(STATUS "Build with thread support...")
@@ -305,14 +292,11 @@ if(USE_THREADS)
   target_link_libraries(tvm Threads::Threads)
   target_link_libraries(tvm_topi Threads::Threads)
   target_link_libraries(tvm_runtime Threads::Threads)
-  target_link_libraries(nnvm_compiler Threads::Threads)
 endif(USE_THREADS)
 
 target_link_libraries(tvm ${TVM_LINKER_LIBS} ${TVM_RUNTIME_LINKER_LIBS})
 target_link_libraries(tvm_topi tvm ${TVM_LINKER_LIBS} ${TVM_RUNTIME_LINKER_LIBS})
 target_link_libraries(tvm_runtime ${TVM_RUNTIME_LINKER_LIBS})
-target_link_libraries(tvm_runtime_static ${TVM_RUNTIME_LINKER_LIBS})
-target_link_libraries(nnvm_compiler tvm)
 
 if (HIDE_PRIVATE_SYMBOLS AND NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
   set(HIDE_SYMBOLS_LINKER_FLAGS "-Wl,--exclude-libs,ALL")
@@ -322,7 +306,6 @@ if (HIDE_PRIVATE_SYMBOLS AND NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
   target_link_libraries(tvm ${HIDE_SYMBOLS_LINKER_FLAGS})
   target_link_libraries(tvm_topi ${HIDE_SYMBOLS_LINKER_FLAGS})
   target_link_libraries(tvm_runtime ${HIDE_SYMBOLS_LINKER_FLAGS})
-  target_link_libraries(nnvm_compiler ${HIDE_SYMBOLS_LINKER_FLAGS})
 endif()
 
 # Related headers
@@ -332,10 +315,7 @@ target_include_directories(
 target_include_directories(
   tvm_topi
   PUBLIC "topi/include")
-target_include_directories(
-  nnvm_compiler
-  PUBLIC "nnvm/include"
-  PUBLIC "topi/include")
+
 
 # Tests
 set(TEST_EXECS "")
@@ -374,8 +354,6 @@ add_custom_target(runtime DEPENDS tvm_runtime)
 install(TARGETS tvm DESTINATION lib${LIB_SUFFIX})
 install(TARGETS tvm_topi DESTINATION lib${LIB_SUFFIX})
 install(TARGETS tvm_runtime DESTINATION lib${LIB_SUFFIX})
-install(TARGETS tvm_runtime_static DESTINATION lib${LIB_SUFFIX})
-install(TARGETS nnvm_compiler DESTINATION lib${LIB_SUFFIX})
 
 if (INSTALL_DEV)
   install(
@@ -398,11 +376,6 @@ if (INSTALL_DEV)
     FILES_MATCHING
     PATTERN "*.h"
     )
-  install(
-    DIRECTORY "nnvm/include/." DESTINATION "include"
-    FILES_MATCHING
-    PATTERN "*.h"
-    )
 else(INSTALL_DEV)
   install(
     DIRECTORY "include/tvm/runtime/." DESTINATION "include/tvm/runtime"
@@ -415,5 +388,4 @@ endif(INSTALL_DEV)
 if(MSVC)
   target_compile_definitions(tvm PRIVATE -DTVM_EXPORTS)
   target_compile_definitions(tvm_runtime PRIVATE -DTVM_EXPORTS)
-  target_compile_definitions(nnvm_compiler PRIVATE -DNNVM_EXPORTS)
 endif()
@@ -69,6 +69,7 @@ We do encourage everyone to work anything they are interested in.
 - [Liangfu Chen](https://github.com/liangfu): @liangfu
 - [Wei Chen](https://github.com/wweic): @wweic
 - [Zhi Chen](https://github.com/zhiics): @zhiics
+- [Neo Chien](https://github.com/cchung100m): @cchung100m
 - [Meghan Cowan](https://github.com/cowanmeg): @cowanmeg
 - [Balint Cristian](https://github.com/cbalint13): @cbalint13
 - [Sergei Grechanik](https://github.com/sgrechanik-h): @sgrechanik-h
@@ -120,4 +121,3 @@ We do encourage everyone to work anything they are interested in.
 - [Cody Hao Yu](https://github.com/comaniac)
 - [Chris Nuernberger](https://github.com/cnuernber)
 - [Shoubhik Bhattacharya](https://github.com/shoubhik)
-- [Neo Chien](https://github.com/cchung100m)
@@ -57,7 +57,7 @@ tvm_multilib = "build/libtvm.so, " +
                "build/libvta_tsim.so, " +
                "build/libvta_fsim.so, " +
                "build/libtvm_topi.so, " +
-               "build/libnnvm_compiler.so, " + tvm_runtime
+               tvm_runtime
 
 // command to start a docker container
 docker_run = 'docker/bash.sh'
@@ -309,14 +309,15 @@ stage('Integration Test') {
       }
     }
   },
-  'legacy: GPU': {
+  'docs: GPU': {
     node('GPU') {
-      ws(per_exec_ws("tvm/legacy-python-gpu")) {
+      ws(per_exec_ws("tvm/docs-python-gpu")) {
         init_git()
         unpack_lib('gpu', tvm_multilib)
         timeout(time: max_time, unit: 'MINUTES') {
-          sh "${docker_run} ${ci_gpu} ./tests/scripts/task_python_legacy.sh"
+          sh "${docker_run} ${ci_gpu} ./tests/scripts/task_python_docs.sh"
         }
+        pack_lib('mydocs', 'docs.tgz')
       }
     }
   }
 
@@ -69,14 +69,12 @@ build/libtvm_web_runtime.js: build/libtvm_web_runtime.bc
 cpplint:
 	python3 3rdparty/dmlc-core/scripts/lint.py vta cpp vta/include vta/src
 	python3 3rdparty/dmlc-core/scripts/lint.py topi cpp topi/include;
-	python3 3rdparty/dmlc-core/scripts/lint.py nnvm cpp nnvm/include nnvm/src;
 	python3 3rdparty/dmlc-core/scripts/lint.py tvm cpp include src \
 	 examples/extension/src examples/graph_executor/src
 
 pylint:
 	python3 -m pylint python/tvm --rcfile=$(ROOTDIR)/tests/lint/pylintrc
 	python3 -m pylint topi/python/topi --rcfile=$(ROOTDIR)/tests/lint/pylintrc
-	python3 -m pylint nnvm/python/nnvm --rcfile=$(ROOTDIR)/tests/lint/pylintrc
 	python3 -m pylint vta/python/vta --rcfile=$(ROOTDIR)/tests/lint/pylintrc
 
 jnilint:
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ tvm_multilib = "build/libtvm.so, " +`
`57`	`57`	`"build/libvta_tsim.so, " +`
`58`	`58`	`"build/libvta_fsim.so, " +`
`59`	`59`	`"build/libtvm_topi.so, " +`
`60`		`- "build/libnnvm_compiler.so, " + tvm_runtime`
	`60`	`+ tvm_runtime`
`61`	`61`
`62`	`62`	`// command to start a docker container`
`63`	`63`	`docker_run = 'docker/bash.sh'`
`@@ -309,14 +309,15 @@ stage('Integration Test') {`
`309`	`309`	`}`
`310`	`310`	`}`
`311`	`311`	`},`
`312`		`- 'legacy: GPU': {`
	`312`	`+ 'docs: GPU': {`
`313`	`313`	`node('GPU') {`
`314`		`- ws(per_exec_ws("tvm/legacy-python-gpu")) {`
	`314`	`+ ws(per_exec_ws("tvm/docs-python-gpu")) {`
`315`	`315`	`init_git()`
`316`	`316`	`unpack_lib('gpu', tvm_multilib)`
`317`	`317`	`timeout(time: max_time, unit: 'MINUTES') {`
`318`		`- sh "${docker_run} ${ci_gpu} ./tests/scripts/task_python_legacy.sh"`
	`318`	`+ sh "${docker_run} ${ci_gpu} ./tests/scripts/task_python_docs.sh"`
`319`	`319`	`}`
	`320`	`+ pack_lib('mydocs', 'docs.tgz')`
`320`	`321`	`}`
`321`	`322`	`}`
`322`	`323`	`}`