[GitHub] [tvm] ZihengJiang commented on a change in pull request #8200: [RUNTIME] ShapeTuple Container
ZihengJiang commented on a change in pull request #8200:
URL: https://github.com/apache/tvm/pull/8200#discussion_r648739431
##
File path: include/tvm/runtime/container/shape_tuple.h
##
@@ -0,0 +1,180 @@
+/*
+ * 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.
+ */
+
+/*!
+ * \file tvm/runtime/container/shape_tuple.h
+ * \brief Runtime ShapeTuple container types.
+ */
+#ifndef TVM_RUNTIME_CONTAINER_SHAPE_TUPLE_H_
+#define TVM_RUNTIME_CONTAINER_SHAPE_TUPLE_H_
+
+#include
+#include
+
+#include "./base.h"
+
+namespace tvm {
+namespace runtime {
+
+/*! \brief An object representing a shape tuple. */
+class ShapeTupleObj : public Object {
+ public:
+ /*! \brief The type of shape index element. */
+ using index_type = int64_t;
+ /*! \brief The pointer to shape tuple data. */
+ index_type* data;
Review comment:
To make sure that the memory layout is POD. Actually the memory will be
managed by std::vector (see FromStd).
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[GitHub] [tvm] ZihengJiang commented on a change in pull request #8200: [RUNTIME] ShapeTuple Container
ZihengJiang commented on a change in pull request #8200:
URL: https://github.com/apache/tvm/pull/8200#discussion_r647965266
##
File path: src/relay/transforms/partial_eval.cc
##
@@ -753,7 +753,7 @@ class PartialEvaluator : public ExprFunctor
size_t GetFTValue(const PStatic& ps) {
if (ps->pstatic.defined()) {
if (auto* st = ps->pstatic.as()) {
-if (st->data.Shape().empty()) {
+if (st->data.Shape().size() == 0) {
Review comment:
sounds good
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[GitHub] [tvm] ZihengJiang commented on a change in pull request #8200: [RUNTIME] ShapeTuple Container
ZihengJiang commented on a change in pull request #8200:
URL: https://github.com/apache/tvm/pull/8200#discussion_r647965117
##
File path: python/tvm/runtime/container.py
##
@@ -137,3 +137,24 @@ def __from_tvm_object__(cls, obj):
val = str.__new__(cls, content)
val.__tvm_object__ = obj
return val
+
+
+@tvm._ffi.register_object("runtime.ShapeTuple")
+class ShapeTuple(Object):
Review comment:
the iteration has been supported by `__getitem__`, see the test case
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[GitHub] [tvm] ZihengJiang commented on a change in pull request #8200: [RUNTIME] ShapeTuple Container
ZihengJiang commented on a change in pull request #8200:
URL: https://github.com/apache/tvm/pull/8200#discussion_r647964668
##
File path: src/relay/transforms/pattern_utils.h
##
@@ -441,7 +441,7 @@ static inline long double ToScalar(const runtime::NDArray&
array, size_t i = 0)
static inline Array ToVector(const runtime::NDArray& array) {
size_t ndim = array.Shape().size();
ICHECK_EQ(ndim, 1) << "This function should only be used for 1D NDArrays";
- size_t len = array.Shape().front();
+ size_t len = array.Shape().at(0);
Review comment:
not sure whether we need those for a tuple object
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[GitHub] [tvm] ZihengJiang commented on a change in pull request #8200: [RUNTIME] ShapeTuple Container
ZihengJiang commented on a change in pull request #8200:
URL: https://github.com/apache/tvm/pull/8200#discussion_r647861397
##
File path: src/runtime/container.cc
##
@@ -185,7 +184,32 @@
TVM_REGISTER_GLOBAL("runtime.MapItems").set_body([](TVMArgs args, TVMRetValue* r
TVM_DLL constexpr uint64_t DenseMapNode::kNextProbeLocation[];
#endif
+// Closure
TVM_REGISTER_OBJECT_TYPE(ClosureObj);
+// ShapeTuple
+TVM_REGISTER_OBJECT_TYPE(ShapeTupleObj);
+
+TVM_REGISTER_GLOBAL("runtime.ShapeTuple").set_body([](TVMArgs args,
TVMRetValue* rv) {
Review comment:
we cannot use set_body_typed here since we need to unwrap variable
length argument?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[GitHub] [tvm] ZihengJiang commented on a change in pull request #8200: [RUNTIME] ShapeTuple Container
ZihengJiang commented on a change in pull request #8200:
URL: https://github.com/apache/tvm/pull/8200#discussion_r646215772
##
File path: include/tvm/runtime/container/shape_tuple.h
##
@@ -0,0 +1,96 @@
+/*
+ * 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.
+ */
+
+/*!
+ * \file tvm/runtime/container/shape_tuple.h
+ * \brief Runtime ShapeTuple container types.
+ */
+#ifndef TVM_RUNTIME_CONTAINER_SHAPE_TUPLE_H_
+#define TVM_RUNTIME_CONTAINER_SHAPE_TUPLE_H_
+
+#include
+#include
+
+#include "./base.h"
+
+namespace tvm {
+namespace runtime {
+
+class ShapeTupleObj : public Object {
+ public:
+ using index_type = int64_t;
+ index_type* data;
+ uint64_t size;
+
+ static constexpr const uint32_t _type_index =
runtime::TypeIndex::kRuntimeShapeTuple;
+ static constexpr const char* _type_key = "runtime.ShapeTuple";
+ TVM_DECLARE_FINAL_OBJECT_INFO(ShapeTupleObj, Object);
+
+ private:
+ class FromStd;
+ friend class ShapeTuple;
+};
+
+class ShapeTupleObj::FromStd : public ShapeTupleObj {
+ public:
+ using index_type = ShapeTupleObj::index_type;
+ explicit FromStd(std::vector other) : data_container{other} {}
+
+ private:
+ /*! \brief Container that holds the memory. */
+ std::vector data_container;
+
+ friend class ShapeTuple;
+};
+
+class ShapeTuple : public ObjectRef {
+ public:
+ using index_type = ShapeTupleObj::index_type;
+ ShapeTuple() : ShapeTuple(std::vector()) {}
+ template
+ ShapeTuple(Iterator begin, Iterator end) :
ShapeTuple(std::vector(begin, end)) {}
+ ShapeTuple(std::initializer_list shape) :
ShapeTuple(shape.begin(), shape.end()) {}
+
+ ShapeTuple(std::vector shape); // NOLINT(*)
+
+ const index_type* data() const { return get()->data; }
+ size_t size() const { return get()->size; }
+ index_type operator[](size_t idx) const { return this->data()[idx]; }
Review comment:
Do we need to only allow read-only access here? That might mean we need
a proxy class for it.
##
File path: include/tvm/runtime/container/shape_tuple.h
##
@@ -0,0 +1,96 @@
+/*
+ * 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.
+ */
+
+/*!
+ * \file tvm/runtime/container/shape_tuple.h
+ * \brief Runtime ShapeTuple container types.
+ */
+#ifndef TVM_RUNTIME_CONTAINER_SHAPE_TUPLE_H_
+#define TVM_RUNTIME_CONTAINER_SHAPE_TUPLE_H_
+
+#include
+#include
+
+#include "./base.h"
+
+namespace tvm {
+namespace runtime {
+
+class ShapeTupleObj : public Object {
+ public:
+ using index_type = int64_t;
+ index_type* data;
+ uint64_t size;
+
+ static constexpr const uint32_t _type_index =
runtime::TypeIndex::kRuntimeShapeTuple;
+ static constexpr const char* _type_key = "runtime.ShapeTuple";
+ TVM_DECLARE_FINAL_OBJECT_INFO(ShapeTupleObj, Object);
+
+ private:
+ class FromStd;
+ friend class ShapeTuple;
+};
+
+class ShapeTupleObj::FromStd : public ShapeTupleObj {
+ public:
+ using index_type = ShapeTupleObj::index_type;
+ explicit FromStd(std::vector other) : data_container{other} {}
+
+ private:
+ /*! \brief Container that holds the memory. */
+ std::vector data_container;
+
+ friend class ShapeTuple;
+};
+
+class ShapeTuple : public ObjectRef {
+ public:
+ using index_type = ShapeTupleObj::index_type;
+ ShapeTuple() : ShapeTuple(std::vector()) {}
+ template
+ ShapeTuple(Iterator begin, Iterator end) :
ShapeTuple(std::vector(begin, end)) {}
+ ShapeTuple(std::initializer_list shape) :
ShapeTuple(shape.begin(), shape.end()) {}
+
+
