Makefile hacking (#8)

* Makefile hacking

Modify CI to execute Relay

Fix header guards

Fix linting for Relay

Fix linting for Relay

Add Python 3.6 to install script

* Tweak CMake and Makefiles for Relay.

* Fix linting errors

* Fixing namespaces, and trying to restore build

* Remove Jenkinsfile

* Restore to test execution

* Restore all tests

* Tests are green

* Fix C++ lint

* Fix PyLint

Author: jroesch

CMakeLists.txt

@@ -49,6 +49,10 @@ tvm_option(USE_RANDOM "Build with random support" OFF)
 
 # include directories
 include_directories("include")
+include_directories("nnvm/include")
+include_directories("dmlc-core/include")
+include_directories(BEFORE "relay/include")
+include_directories("HalideIR/src")
 include_directories("dlpack/include")
 include_directories("dmlc-core/include")
 
@@ -86,9 +90,9 @@ else(MSVC)
 endif(MSVC)
 
 # add source group
-FILE(GLOB_RECURSE GROUP_SOURCE "src/*.cc" "HalideIR/src/*.cpp" "nnvm/src/*.cc")
+FILE(GLOB_RECURSE GROUP_SOURCE "src/*.cc" "HalideIR/src/*.cpp" "nnvm/src/*.cc" "relay/src/tvm/*.cc")
 FILE(GLOB_RECURSE GROUP_INCLUDE "src/*.h" "include/*.h" "HalideIR/src/*.h"
-                                "nnvm/src/*.h" "nnvm/include/*.h")
+                                "nnvm/src/*.h" "nnvm/include/*.h" "relay/src/*.h" "relay/include/*.h")
 assign_source_group("Source" ${GROUP_SOURCE})
 assign_source_group("Include" ${GROUP_INCLUDE})
 
@@ -117,6 +121,12 @@ file(GLOB_RECURSE NNVM_COMPILER_SRCS
     nnvm/src/top/*.cc
     )
 
+file(GLOB_RECURSE RELAY_SRCS
+    relay/src/tvm/relay/*.cc
+    relay/src/tvm/relay/ir/*.cc
+    relay/src/tvm/relay/tyck/*.cc
+    )
+
 file(GLOB TOPI_SRCS
     topi/src/*.cc
 )
@@ -174,11 +184,13 @@ add_library(tvm SHARED ${COMPILER_SRCS} ${RUNTIME_SRCS})
 add_library(tvm_topi SHARED ${TOPI_SRCS})
 add_library(tvm_runtime SHARED ${RUNTIME_SRCS})
 add_library(nnvm_compiler SHARED ${NNVM_COMPILER_SRCS})
+add_library(relay SHARED ${RELAY_SRCS})
 
 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(nnvm_compiler tvm)
+target_link_libraries(relay tvm)
 
 # Related headers
 target_include_directories(
@@ -247,6 +259,11 @@ if (INSTALL_DEV)
     FILES_MATCHING
     PATTERN "*.h"
     )
+  install(
+    DIRECTORY "relay/include/." DESTINATION "include"
+    FILES_MATCHING
+    PATTERN "*.h"
+    )
 else(INSTALL_DEV)
   install(
     DIRECTORY "include/tvm/runtime/." DESTINATION "include/tvm/runtime"
@@ -262,4 +279,5 @@ 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)
+  target_compile_definitions(relay PRIVATE -DRELAY_EXPORTS)
 endif()

Jenkinsfile

@@ -220,6 +220,7 @@ stage('Integration Test') {
         unpack_lib('gpu', tvm_multilib)
         timeout(time: max_time, unit: 'MINUTES') {
           sh "${docker_run} tvmai/ci-gpu ./tests/scripts/task_python_nnvm.sh"
+          sh "${docker_run} gpu ./tests/scripts/task_python_relay.sh"
         }
       }
     }

Makefile

@@ -53,6 +53,7 @@ cpplint:
 	python3 dmlc-core/scripts/lint.py vta cpp vta/include vta/src
 	python3 dmlc-core/scripts/lint.py topi cpp topi/include;
 	python3 dmlc-core/scripts/lint.py nnvm cpp nnvm/include nnvm/src;
+	python3 dmlc-core/scripts/lint.py relay cpp relay/include relay/src;
 	python3 dmlc-core/scripts/lint.py tvm cpp include src verilog\
 	 examples/extension/src examples/graph_executor/src
 
@@ -61,6 +62,7 @@ pylint:
 	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
+    python3 -m pylint relay/python/relay --rcfile=$(ROOTDIR)/tests/lint/pylintrc
 
 jnilint:
 	python3 dmlc-core/scripts/lint.py tvm4j-jni cpp jvm/native/src