[WIP] Merge apache/incubator-tvm

.asf.yaml

@@ -0,0 +1,34 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+github:
+  description: "Open deep learning compiler stack for cpu, gpu and specialized accelerators"
+  homepage: https://tvm.apache.org/
+  labels:
+    - tvm
+    - compiler
+    - tensor
+    - deep-learning
+    - gpu
+    - opencl
+    - metal
+    - performance
+    - javascript
+    - rocm
+    - vulkan
+    - spirv
+    - machine-learning

.github/workflows/main.yml

@@ -0,0 +1,79 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+# GH actions.
+# We use it to cover windows and mac builds
+# Jenkins is still the primary CI
+
+name: WinMacBuild
+
+on:
+  push:
+    branches:
+      - master
+
+  pull_request:
+    branches:
+      - master
+
+jobs:
+  Build:
+    strategy:
+      matrix:
+        os: [windows-latest, macOS-latest]
+
+    runs-on: ${{ matrix.os }}
+
+    steps:
+    - uses: actions/checkout@v2
+    - uses: actions/setup-python@v1
+    - name: Lint Python
+      if: matrix.os == 'macOS-latest'
+      run: |
+        pip install flake8
+        flake8 . --count --select=E9,F63,F7 --show-source --statistics
+    - name: Initialize submodules
+      run: git submodule update --recursive --init
+
+    - name: Make Build Directory
+      run: cmake -E make_directory build.common
+
+    # configuration for Windows
+    - name: CMake@Win
+      if: matrix.os == 'windows-latest'
+      working-directory: build.common
+      run: >-
+        cmake
+        "-DUSE_SORT=ON"
+        "-DUSE_RPC=ON"
+        "-DUSE_GRAPH_RUNTIME=ON"
+        ..
+
+    # configuration for Mac
+    - name: CMake@MacOS
+      if: matrix.os  == 'macOS-latest'
+      working-directory: build.common
+      run: >-
+        cmake
+        "-DUSE_SORT=ON"
+        "-DUSE_RPC=ON"
+        "-DUSE_GRAPH_RUNTIME=ON"
+        "-DUSE_METAL=ON"
+        ..
+
+    - name: Build
+      run: cmake --build build.common -j3

.gitignore

@@ -65,7 +65,7 @@ docs/_build/
 docs/gen_modules
 
 # PyBuilder
-target/
+/target/
 
 # IPython Notebook
 .ipynb_checkpoints

CMakeLists.txt

@@ -101,8 +101,8 @@ if(MSVC)
 else(MSVC)
   if ("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
     message("Build in Debug mode")
-    set(CMAKE_C_FLAGS "-O0 -g -Wall -fPIC ${CMAKE_C_FLAGS} -rdynamic")
-    set(CMAKE_CXX_FLAGS "-O0 -g -Wall -fPIC ${CMAKE_CXX_FLAGS} -rdynamic")
+    set(CMAKE_C_FLAGS "-O0 -g -Wall -fPIC ${CMAKE_C_FLAGS}")
+    set(CMAKE_CXX_FLAGS "-O0 -g -Wall -fPIC ${CMAKE_CXX_FLAGS}")
   else()
     set(CMAKE_C_FLAGS "-O2 -Wall -fPIC ${CMAKE_C_FLAGS}")
     set(CMAKE_CXX_FLAGS "-O2 -Wall -fPIC ${CMAKE_CXX_FLAGS}")
@@ -125,18 +125,25 @@ assign_source_group("Source" ${GROUP_SOURCE})
 assign_source_group("Include" ${GROUP_INCLUDE})
 
 # Source file lists
-file(GLOB COMPILER_SRCS
-    src/api/*.cc
-    src/arithmetic/*.cc
-    src/autotvm/*.cc
-    src/codegen/*.cc
-    src/lang/*.cc
-    src/pass/*.cc
-    src/op/*.cc
+file(GLOB_RECURSE COMPILER_SRCS
     src/node/*.cc
-    src/schedule/*.cc
+    src/ir/*.cc
+    src/arith/*.cc
+    src/te/*.cc
+    src/autotvm/*.cc
+    src/tir/*.cc
+    src/driver/*.cc
+    src/printer/*.cc
+    src/support/*.cc
     )
 
+file(GLOB CODEGEN_SRCS
+  src/target/*.cc
+  src/target/source/*.cc
+    )
+
+list(APPEND COMPILER_SRCS ${CODEGEN_SRCS})
+
 file(GLOB_RECURSE RELAY_OP_SRCS
     src/relay/op/*.cc
     )
@@ -166,7 +173,7 @@ if(USE_VM_PROFILER)
   list(APPEND COMPILER_SRCS ${BACKEND_VM_PROFILER_SRCS})
 endif(USE_VM_PROFILER)
 
-file(GLOB DATATYPE_SRCS src/codegen/datatype/*.cc)
+file(GLOB DATATYPE_SRCS src/target/datatype/*.cc)
 list(APPEND COMPILER_SRCS ${DATATYPE_SRCS})
 
 file(GLOB TOPI_SRCS
@@ -192,7 +199,7 @@ if(USE_RPC)
 endif(USE_RPC)
 
 file(GLOB STACKVM_RUNTIME_SRCS src/runtime/stackvm/*.cc)
-file(GLOB STACKVM_CODEGEN_SRCS src/codegen/stackvm/*.cc)
+file(GLOB STACKVM_CODEGEN_SRCS src/target/stackvm/*.cc)
 list(APPEND COMPILER_SRCS ${STACKVM_CODEGEN_SRCS})
 if(USE_STACKVM_RUNTIME)
   message(STATUS "Build with stackvm support in runtime...")

CONTRIBUTORS.md

@@ -41,10 +41,13 @@ We do encourage everyone to work anything they are interested in.
 
 - [Aditya Atluri](https://github.com/adityaatluri): @adityaatluri - rocm
 - [Tianqi Chen](https://github.com/tqchen) (PPMC): @tqchen - topi, compiler, relay, docs
+- [Wei Chen](https://github.com/wweic): @wweic - runtime, relay, vm
 - [Zhi Chen](https://github.com/zhiics): @zhiics - relay, quantization, pass manager
 - [Yuwei Hu](https://github.com/Huyuwei): @Huyuwei - topi, frontends
 - [Nick Hynes](https://github.com/nhynes): @nhynes: - sgx, rust
+- [Animesh Jain](https://github.com/anijain2305): @anijain2305 - quantization, relay
 - [Ziheng Jiang](https://github.com/ZihengJiang) (PPMC): @ZihengJiang - relay, compiler
+- [Marisa Kirisame](https://github.com/MarisaKirisame): @MarisaKirisame - relay
 - [Wuwei Lin](https://github.com/vinx13): @vinx13 - relay, topi
 - [Yizhi Liu](https://github.com/yzhliu) (PPMC): @yzhliu - jvm, topi, relay
 - [Hao Lu](https://github.com/hlu1): @hlu1 - nnpack, frontends
@@ -59,6 +62,7 @@ We do encourage everyone to work anything they are interested in.
 - [Leyuan Wang](https://github.com/Laurawly): @Laurawly: - topi
 - [Yao Wang](https://github.com/kevinthesun): @kevinthesun: - topi, vision
 - [Jian Weng](https://github.com/were): @were: - hybrid script
+- [Zhao Wu](https://github.com/FrozenGene): @FrozenGene - runtime, topi, frontends
 - [Eddie Yan](https://github.com/eqy) (PPMC): @eqy - runtime, autotvm, rpc, topi
 - [Lianmin Zheng](https://github.com/merrymercy) (PPMC): @merrymercy - autotvm, topi, relay
 
@@ -67,7 +71,6 @@ We do encourage everyone to work anything they are interested in.
 - [Aditya Atluri](https://github.com/adityaatluri): @adityaatluri
 - [Tianqi Chen](https://github.com/tqchen): @tqchen
 - [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
@@ -110,6 +113,7 @@ We do encourage everyone to work anything they are interested in.
 - [Zhao Wu](https://github.com/FrozenGene): @FrozenGene
 - [Bing Xu](https://github.com/antinucleon): @antinucleon
 - [Eddie Yan](https://github.com/eqy): @eqy
+- [Hao Yu](https://github.com/comaniac): @comaniac
 - [Joshua Z. Zhang](https://github.com/zhreshold): @zhreshold
 - [Lianmin Zheng](https://github.com/merrymercy): @merrymercy
 

Jenkinsfile

@@ -41,12 +41,12 @@
 
 // Hashtag in the source to build current CI docker builds
 //
-// - ci-cpu:v0.54: e7c88a99f830de30814df14eaa980547ecbd61c1
+// - ci-cpu:v0.55: 07b45d958d4af91ec1bab66f6cf391d1ce12ddaf
 //
 
-ci_lint = "tvmai/ci-lint:v0.51"
-ci_gpu = "tvmai/ci-gpu:v0.56"
-ci_cpu = "tvmai/ci-cpu:v0.54"
+ci_lint = "tvmai/ci-lint:v0.60"
+ci_gpu = "tvmai/ci-gpu:v0.61"
+ci_cpu = "tvmai/ci-cpu:v0.60"
 ci_i386 = "tvmai/ci-i386:v0.52"
 
 // tvm libraries
@@ -216,7 +216,8 @@ stage('Build') {
         timeout(time: max_time, unit: 'MINUTES') {
           sh "${docker_run} ${ci_cpu} ./tests/scripts/task_python_unittest.sh"
           sh "${docker_run} ${ci_cpu} ./tests/scripts/task_python_integration.sh"
-          sh "${docker_run} ${ci_cpu} ./tests/scripts/task_python_vta.sh"
+          sh "${docker_run} ${ci_cpu} ./tests/scripts/task_python_vta_fsim.sh"
+          sh "${docker_run} ${ci_cpu} ./tests/scripts/task_python_vta_tsim.sh"
           sh "${docker_run} ${ci_cpu} ./tests/scripts/task_golang.sh"
         }
       }
@@ -268,7 +269,7 @@ stage('Unit Test') {
         timeout(time: max_time, unit: 'MINUTES') {
           sh "${docker_run} ${ci_i386} ./tests/scripts/task_python_unittest.sh"
           sh "${docker_run} ${ci_i386} ./tests/scripts/task_python_integration.sh"
-          sh "${docker_run} ${ci_i386} ./tests/scripts/task_python_vta.sh"
+          sh "${docker_run} ${ci_i386} ./tests/scripts/task_python_vta_fsim.sh"
         }
       }
     }

Makefile

@@ -17,7 +17,7 @@
 
 ROOTDIR = $(CURDIR)
 
-.PHONY: clean all test doc pylint cpplint lint\
+.PHONY: clean all test doc pylint cpplint scalalint lint\
 	 cython cython2 cython3 web runtime vta
 
 ifndef DMLC_CORE_PATH
@@ -80,7 +80,10 @@ pylint:
 jnilint:
 	python3 3rdparty/dmlc-core/scripts/lint.py tvm4j-jni cpp jvm/native/src
 
-lint: cpplint pylint jnilint
+scalalint:
+	make -C vta/hardware/chisel lint
+
+lint: cpplint pylint jnilint scalalint
 
 doc:
 	doxygen docs/Doxyfile
@@ -91,10 +94,7 @@ javadoc:
 
 # Cython build
 cython:
-	cd python; python setup.py build_ext --inplace
-
-cython2:
-	cd python; python2 setup.py build_ext --inplace
+	cd python; python3 setup.py build_ext --inplace
 
 cython3:
 	cd python; python3 setup.py build_ext --inplace

apps/benchmark/util.py

@@ -34,7 +34,7 @@ def get_network(name, batch_size, dtype='float32'):
 
     Returns
     -------
-    net: relay.Module
+    net: tvm.IRModule
         The relay function of network definition
     params: dict
         The random parameters for benchmark
@@ -70,7 +70,7 @@ def get_network(name, batch_size, dtype='float32'):
         net, params = relay.frontend.from_mxnet(block, shape={'data': input_shape}, dtype=dtype)
         net = net["main"]
         net = relay.Function(net.params, relay.nn.softmax(net.body), None, net.type_params, net.attrs)
-        net = relay.Module.from_expr(net)
+        net = tvm.IRModule.from_expr(net)
     else:
         raise ValueError("Unsupported network: " + name)
 

apps/bundle_deploy/bundle.cc

@@ -34,7 +34,7 @@ TVM_BUNDLE_FUNCTION void *tvm_runtime_create() {
   const std::string json_data(&build_graph_json[0],
                               &build_graph_json[0] + build_graph_json_len);
   tvm::runtime::Module mod_syslib =
-      (*tvm::runtime::Registry::Get("module._GetSystemLib"))();
+      (*tvm::runtime::Registry::Get("runtime.SystemLib"))();
   int device_type = kDLCPU;
   int device_id = 0;
   tvm::runtime::Module mod =

apps/cpp_rpc/main.cc

@@ -31,13 +31,13 @@
 #include <vector>
 #include <sstream>
 
-#include "../../src/common/util.h"
-#include "../../src/common/socket.h"
+#include "../../src/support/util.h"
+#include "../../src/support/socket.h"
 #include "rpc_server.h"
 
 using namespace std;
 using namespace tvm::runtime;
-using namespace tvm::common;
+using namespace tvm::support;
 
 static const string kUSAGE = \
 "Command line usage\n" \

apps/cpp_rpc/rpc_env.cc

@@ -36,7 +36,7 @@
 #include <cstring>
 
 #include "rpc_env.h"
-#include "../../src/common/util.h"
+#include "../../src/support/util.h"
 #include "../../src/runtime/file_util.h"
 
 namespace tvm {
@@ -164,7 +164,7 @@ void LinuxShared(const std::string output,
     }
     cmd += " " + options;
     std::string err_msg;
-    auto executed_status = common::Execute(cmd, &err_msg);
+    auto executed_status = support::Execute(cmd, &err_msg);
     if (executed_status) {
       LOG(FATAL) << err_msg;
     }
@@ -195,22 +195,22 @@ void CreateShared(const std::string output, const std::vector<std::string> &file
  */
 Module Load(std::string *fileIn, const std::string fmt) {
   std::string file = *fileIn;
-  if (common::EndsWith(file, ".so")) {
+  if (support::EndsWith(file, ".so")) {
       return Module::LoadFromFile(file, fmt);
   }
 
   #if defined(__linux__) || defined(__ANDROID__)
     std::string file_name = file + ".so";
-    if (common::EndsWith(file, ".o")) {
+    if (support::EndsWith(file, ".o")) {
       std::vector<std::string> files;
       files.push_back(file);
       CreateShared(file_name, files);
-    } else if (common::EndsWith(file, ".tar")) {
+    } else if (support::EndsWith(file, ".tar")) {
       std::string tmp_dir = "./rpc/tmp/";
       mkdir(&tmp_dir[0], 0777);
       std::string cmd = "tar -C " + tmp_dir + " -zxf " + file;
       std::string err_msg;
-      int executed_status = common::Execute(cmd, &err_msg);
+      int executed_status = support::Execute(cmd, &err_msg);
       if (executed_status) {
         LOG(FATAL) << err_msg;
       }