update upstream 20190628

3rdparty/compiler-rt/builtin_fp16.h

@@ -73,7 +73,9 @@ static inline DST_T __truncXfYf2__(SRC_T a) {
   const DST_REP_T dstNaNCode = dstQNaN - 1;
 
   // Break a into a sign and representation of the absolute value
-  const union { SRC_T f; SRC_REP_T i; } src_rep = {.f = a};
+  union SrcExchangeType { SRC_T f; SRC_REP_T i; };
+  SrcExchangeType src_rep;
+  src_rep.f = a;
   const SRC_REP_T aRep = src_rep.i;
   const SRC_REP_T aAbs = aRep & srcAbsMask;
   const SRC_REP_T sign = aRep & srcSignMask;
@@ -134,7 +136,9 @@ static inline DST_T __truncXfYf2__(SRC_T a) {
 
   // Apply the signbit to (DST_T)abs(a).
   const DST_REP_T result = absResult | sign >> (srcBits - dstBits);
-  const union { DST_T f; DST_REP_T i; } dst_rep = {.i = result};
+  union DstExchangeType { DST_T f; DST_REP_T i; };
+  DstExchangeType dst_rep;
+  dst_rep.i = result;
   return dst_rep.f;
 }
 
@@ -163,7 +167,9 @@ static inline DST_T __extendXfYf2__(SRC_T a) {
   const DST_REP_T dstMinNormal = DST_REP_T(1) << DST_SIG_BITS;
 
   // Break a into a sign and representation of the absolute value
-  const union { SRC_T f; SRC_REP_T i; } src_rep = {.f = a};
+  union SrcExchangeType { SRC_T f; SRC_REP_T i; };
+  SrcExchangeType src_rep;
+  src_rep.f = a;
   const SRC_REP_T aRep = src_rep.i;
   const SRC_REP_T aAbs = aRep & srcAbsMask;
   const SRC_REP_T sign = aRep & srcSignMask;
@@ -205,6 +211,8 @@ static inline DST_T __extendXfYf2__(SRC_T a) {
 
   // Apply the signbit to (DST_T)abs(a).
   const DST_REP_T result = absResult | (DST_REP_T)sign << (dstBits - srcBits);
-  const union { DST_T f; DST_REP_T i; } dst_rep = {.i = result};
+  union DstExchangeType { DST_T f; DST_REP_T i; };
+  DstExchangeType dst_rep;
+  dst_rep.i = result;
   return dst_rep.f;
 }

README.md

@@ -17,15 +17,14 @@
 
 <img src=https://raw.githubusercontent.com/tqchen/tvm.ai/master/images/logo/tvm-logo-small.png width=128/> Open Deep Learning Compiler Stack
 ==============================================
-
-[![GitHub license](https://dmlc.github.io/img/apache2.svg)](./LICENSE)
-[![Build Status](http://ci.tvm.ai:8080/buildStatus/icon?job=tvm/master)](http://ci.tvm.ai:8080/job/tvm/job/master/)
-
 [Documentation](https://docs.tvm.ai) |
 [Contributors](CONTRIBUTORS.md) |
 [Community](https://tvm.ai/community.html) |
 [Release Notes](NEWS.md)
 
+[![Build Status](http://ci.tvm.ai:8080/buildStatus/icon?job=tvm/master)](http://ci.tvm.ai:8080/job/tvm/job/master/)
+[![Azure Pipeline](https://dev.azure.com/tvmai/tvm/_apis/build/status/windows_mac_build?branchName=master)](https://dev.azure.com/tvmai/tvm/_build/latest?definitionId=2&branchName=master)
+
 TVM is a compiler stack for deep learning systems. It is designed to close the gap between the
 productivity-focused deep learning frameworks, and the performance- and efficiency-focused hardware backends.
 TVM works with deep learning frameworks to provide end to end compilation to different backends.

vta/python/vta/top/arm_conv2d.py → apps/pynq_rpc/start_rpc_server_to_tracker.sh

@@ -1,3 +1,4 @@
+#!/bin/bash
 # 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
@@ -14,24 +15,9 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-"""Reuse conv2d schedule from ARM CPU"""
+PROJROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../../" && pwd )"
 
-import tvm
 
-from topi.nn import conv2d, conv2d_alter_layout
-from topi import generic
-
-@conv2d.register(["vtacpu", "vta"])
-def compute(*args, **kwargs):
-    with tvm.target.arm_cpu("vtacpu"):
-        return conv2d(*args, **kwargs)
-
-@generic.schedule_conv2d_nchw.register(["vtacpu", "vta"])
-def schedule(*args, **kwargs):
-    with tvm.target.arm_cpu("vtacpu"):
-        return generic.schedule_conv2d_nchw(*args, **kwargs)
-
-@conv2d_alter_layout.register(["vtacpu", "vta"])
-def alter(*args, **kwargs):
-    with tvm.target.arm_cpu("vtacpu"):
-        return conv2d_alter_layout(*args, **kwargs)
+export PYTHONPATH=${PYTHONPATH}:${PROJROOT}/python:${PROJROOT}/vta/python
+export PYTHONPATH=${PYTHONPATH}:/home/xilinx/pynq
+python3 -m vta.exec.rpc_server --tracker fleet:9190 --key pynq

cmake/modules/ANTLR.cmake

@@ -16,44 +16,19 @@
 # under the License.
 
 if(USE_ANTLR)
-  file(GLOB_RECURSE ANTLR4
-        /usr/local/lib/antlr-*-complete.jar
-        /usr/local/Cellar/*antlr-*-complete.jar)
+  set(RELAY_PARSER_DIR
+    ${CMAKE_CURRENT_SOURCE_DIR}/python/tvm/relay/grammar)
 
-if(ANTLR4)
-    # Get the first element of the list of antlr jars.
-    # Sort and reverse the list so the item selected is the highest
-    #   version in lib or else in Cellar if no lib installation exists.
-    list(SORT ANTLR4)
-    list(REVERSE ANTLR4)
-    list(GET ANTLR4 0 ANTLR4)
-    set(RELAY_PARSER_DIR
-      ${CMAKE_CURRENT_SOURCE_DIR}/python/tvm/relay/grammar)
+  set(RELAY_PARSER
+    ${RELAY_PARSER_DIR}/py3/RelayVisitor.py
+    ${RELAY_PARSER_DIR}/py3/RelayParser.py
+    ${RELAY_PARSER_DIR}/py3/RelayLexer.py)
 
-    set(RELAY_PARSER
-      ${RELAY_PARSER_DIR}/py2/RelayVisitor.py
-      ${RELAY_PARSER_DIR}/py2/RelayParser.py
-      ${RELAY_PARSER_DIR}/py2/RelayLexer.py
+  # Generate ANTLR grammar for parsing.
+  add_custom_command(OUTPUT ${RELAY_PARSER}
+    COMMAND antlr4 -visitor -no-listener -Dlanguage=Python3 ${RELAY_PARSER_DIR}/Relay.g4 -o ${RELAY_PARSER_DIR}/py3
+    DEPENDS ${RELAY_PARSER_DIR}/Relay.g4
+    WORKING_DIRECTORY ${RELAY_PARSER_DIR})
 
-      ${RELAY_PARSER_DIR}/py3/RelayVisitor.py
-      ${RELAY_PARSER_DIR}/py3/RelayParser.py
-      ${RELAY_PARSER_DIR}/py3/RelayLexer.py)
-
-    set(JAVA_HOME $ENV{JAVA_HOME})
-    if (NOT DEFINED JAVA_HOME)
-      # Hack to get system to search for Java itself.
-      set(JAVA_HOME "/usr")
-    endif()
-
-    # Generate ANTLR grammar for parsing.
-    add_custom_command(OUTPUT ${RELAY_PARSER}
-      COMMAND ${JAVA_HOME}/bin/java -jar ${ANTLR4} -visitor -no-listener -Dlanguage=Python2 ${RELAY_PARSER_DIR}/Relay.g4 -o ${RELAY_PARSER_DIR}/py2
-      COMMAND ${JAVA_HOME}/bin/java -jar ${ANTLR4} -visitor -no-listener -Dlanguage=Python3 ${RELAY_PARSER_DIR}/Relay.g4 -o ${RELAY_PARSER_DIR}/py3
-      DEPENDS ${RELAY_PARSER_DIR}/Relay.g4
-      WORKING_DIRECTORY ${RELAY_PARSER_DIR})
-
-    add_custom_target(relay_parser ALL DEPENDS ${RELAY_PARSER})
-  else()
-    message(FATAL_ERROR "Can't find ANTLR4: ANTLR4=" ${ANTLR4})
-  endif()
+  add_custom_target(relay_parser ALL DEPENDS ${RELAY_PARSER})
 endif(USE_ANTLR)

dmlc_tvm_commit_id.txt

@@ -1 +1 @@
-cbec5b94b87455f07918f7f4488c9a82a2d26708
+3247d3172eb9d0c753e54511598286b9e8b91c1b

docs/api/python/topi.rst

@@ -101,6 +101,7 @@ List of operators
    topi.image.resize
    topi.argsort
    topi.topk
+   topi.sequence_mask
 
 
 List of schedules
@@ -167,6 +168,7 @@ topi
 .. autofunction:: topi.layout_transform
 .. autofunction:: topi.argsort
 .. autofunction:: topi.topk
+.. autofunction:: topi.sequence_mask
 
 topi.nn
 ~~~~~~~

docs/conf.py

@@ -215,7 +215,10 @@ def run_doxygen(folder):
      '../tutorials/autotvm',
      '../tutorials/dev',
      '../tutorials/topi',
-     '../tutorials/deployment'])
+     '../tutorials/deployment',
+     '../vta/tutorials/frontend',
+     '../vta/tutorials/optimize',
+     '../vta/tutorials/autotvm'])
 
 def generate_doxygen_xml(app):
     """Run the doxygen make commands if we're on the ReadTheDocs server"""

docs/langref/relay_op.rst

@@ -190,6 +190,7 @@ This level support backpropagation of broadcast operators. It is temporary.
    tvm.relay.device_copy
    tvm.relay.annotation.on_device
    tvm.relay.reverse_reshape
+   tvm.relay.sequence_mask
    tvm.relay.nn.batch_matmul
    tvm.relay.contrib.adaptive_max_pool2d
    tvm.relay.contrib.adaptive_avg_pool2d
@@ -323,6 +324,7 @@ Level 10 Definitions
 .. autofunction:: tvm.relay.device_copy
 .. autofunction:: tvm.relay.annotation.on_device
 .. autofunction:: tvm.relay.reverse_reshape
+.. autofunction:: tvm.relay.sequence_mask
 .. autofunction:: tvm.relay.nn.batch_matmul
 .. autofunction:: tvm.relay.contrib.adaptive_max_pool2d
 .. autofunction:: tvm.relay.contrib.adaptive_avg_pool2d

include/tvm/expr.h

@@ -140,7 +140,7 @@ class Integer : public Expr {
    */
   operator int64_t() const {
     CHECK(node_ != nullptr)
-        << " Trying get reference a null Integer";
+        << " Trying to reference a null Integer";
     return (*this)->value;
   }
   /*! \brief type indicate the container type */

include/tvm/relay/attrs/transform.h

@@ -275,6 +275,18 @@ struct ShapeOfAttrs : public tvm::AttrsNode<ShapeOfAttrs> {
   }
 };
 
+struct SequenceMaskAttrs : public tvm::AttrsNode<SequenceMaskAttrs> {
+  double mask_value;
+  int axis;
+
+  TVM_DECLARE_ATTRS(SequenceMaskAttrs, "relay.attrs.SequenceMaskAttrs") {
+    TVM_ATTR_FIELD(mask_value).set_default(0)
+      .describe("The masking value.");
+    TVM_ATTR_FIELD(axis).set_default(0)
+      .describe("The axis of the length dimension. Can only be 0 or 1.");
+  }
+};  // struct SequenceMaskAttrs.
+
 }  // namespace relay
 }  // namespace tvm
 #endif  // TVM_RELAY_ATTRS_TRANSFORM_H_

include/tvm/relay/expr_functor.h

@@ -237,17 +237,6 @@ class ExprMutator
  */
 void PostOrderVisit(const Expr& node, std::function<void(const Expr&)> fvisit);
 
-/*
- * \brief Bind function parameters or free variables.
- *
- * Parameter binding can only happen if expr is a Function.
- * binds cannot change internal arguments of internal functions.
- *
- * \param expr The function to be binded.
- * \param binds The map of arguments to
- */
-Expr Bind(const Expr& expr, const tvm::Map<Var, Expr>& binds);
-
 }  // namespace relay
 }  // namespace tvm
 #endif  // TVM_RELAY_EXPR_FUNCTOR_H_