[REFACTOR] Introduce include/tvm/target

.gitignore

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

CMakeLists.txt

@@ -127,6 +127,7 @@ assign_source_group("Include" ${GROUP_INCLUDE})
 file(GLOB COMPILER_SRCS
     src/node/*.cc
     src/ir/*.cc
+    src/target/*.cc
     src/api/*.cc
     src/arithmetic/*.cc
     src/autotvm/*.cc

include/tvm/build_module.h

@@ -24,157 +24,20 @@
 #ifndef TVM_BUILD_MODULE_H_
 #define TVM_BUILD_MODULE_H_
 
+#include <tvm/target/target.h>
+
 #include <string>
 #include <vector>
 #include <utility>
 #include <unordered_map>
 #include <unordered_set>
+
 #include "runtime/packed_func.h"
 #include "schedule_pass.h"
 #include "lowered_func.h"
 
 namespace tvm {
 
-/*!
-* \brief Container for target device information.
-*   Use target::llvm, target::cuda etc functions instead of constructing directly.
-*/
-class TargetNode : public Object {
- public:
-  /*! \brief The name of the target device */
-  std::string target_name;
-  /*! \brief The name of the target device */
-  std::string device_name;
-  /*! \brief The type of the target device */
-  int device_type;
-  /*! \brief The maximum threads that a schedule should use for this device */
-  int max_num_threads = 1;
-  /*! \brief The warp size that should be used by the LowerThreadAllreduce pass */
-  int thread_warp_size = 1;
-  /*! \brief Keys for this target */
-  Array<PrimExpr> keys_array;
-  /*! \brief Options for this target */
-  Array<PrimExpr> options_array;
-  /*! \brief Collection of imported libs */
-  Array<PrimExpr> libs_array;
-
-  /*! \return the full device string to pass to codegen::Build */
-  TVM_DLL const std::string& str() const;
-
-  void VisitAttrs(AttrVisitor* v) {
-    v->Visit("target_name", &target_name);
-    v->Visit("device_name", &device_name);
-    v->Visit("device_type", &device_type);
-    v->Visit("max_num_threads", &max_num_threads);
-    v->Visit("thread_warp_size", &thread_warp_size);
-    v->Visit("keys_array", &keys_array);
-    v->Visit("options_array", &options_array);
-    v->Visit("libs_array", &libs_array);
-  }
-
-  /*! \brief Get the keys for this target as a vector of string */
-  TVM_DLL std::vector<std::string> keys() const;
-
-  /*! \brief Get the options for this target as a vector of string */
-  TVM_DLL std::vector<std::string> options() const;
-
-  /*! \brief Get the keys for this target as an unordered_set of string */
-  TVM_DLL std::unordered_set<std::string> libs() const;
-
-  static constexpr const char* _type_key = "Target";
-  TVM_DECLARE_FINAL_OBJECT_INFO(TargetNode, Object);
-
- private:
-  /*! \brief Internal string repr. */
-  mutable std::string str_repr_;
-};
-
-/*! \brief reference cpass to the target. */
-class Target : public ObjectRef {
- public:
-  Target() {}
-  explicit Target(ObjectPtr<Object> n) : ObjectRef(n) {}
-  /*!
-  * \brief Create a Target given a string
-  * \param target_str the string to parse
-  */
-  TVM_DLL static Target Create(const std::string& target_str);
-  /*!
-   * \brief Get the current target context from thread local storage.
-   * \param allow_not_defined If the context stack is empty and this is set to true, an
-   *   undefined Target will be returned. Otherwise, an empty context stack will cause a
-   *   runtime error.
-   * \return The target that is the current context. The target may not be defined if
-   * allow_not_defined is true.
-   */
-  TVM_DLL static tvm::Target Current(bool allow_not_defined = true);
-
-  const TargetNode* operator->() const {
-      return static_cast<const TargetNode*>(get());
-  }
-
-  using ContainerType = TargetNode;
-  class Internal;
- private:
-  // enable with syntax.
-  friend class Internal;
-  friend class With<Target>;
-  /*!
-   * \brief Push a new target context onto the thread local stack.
-   *  The Target on top of the stack is used to determine which
-   *  specialization to use when invoking a GenericFunc.
-   */
-  TVM_DLL void EnterWithScope();
-  /*!
-   * \brief Pop a target off the thread local context stack,
-   *  restoring the previous target as the current context.
-   */
-  TVM_DLL void ExitWithScope();
-};
-
-/*! \brief This namespace provides functions to construct Target instances */
-namespace target {
-/*! \return A target for LLVM */
-TVM_DLL Target llvm(const std::vector<std::string>& options =
-                   std::vector<std::string>());
-
-/*! \return A target for CUDA */
-TVM_DLL Target cuda(const std::vector<std::string>& options =
-                   std::vector<std::string>());
-
-/*! \return A target for ROCm */
-TVM_DLL Target rocm(const std::vector<std::string>& options =
-                   std::vector<std::string>());
-
-/*! \return A target for OpenCL */
-TVM_DLL Target opencl(const std::vector<std::string>& options =
-                     std::vector<std::string>());
-
-/*! \return A target for Metal */
-TVM_DLL Target metal(const std::vector<std::string>& options =
-                    std::vector<std::string>());
-
-/*! \return A target for rasp */
-TVM_DLL Target rasp(const std::vector<std::string>& options =
-                   std::vector<std::string>());
-
-/*! \return A target for Mali */
-TVM_DLL Target mali(const std::vector<std::string>& options =
-                   std::vector<std::string>());
-
-/*! \return A target for Intel Graphics */
-TVM_DLL Target intel_graphics(const std::vector<std::string>& options =
-                             std::vector<std::string>());
-
-/*! \return A target for stackvm */
-TVM_DLL Target stackvm(const std::vector<std::string>& options =
-                      std::vector<std::string>());
-
-/*! \return A target for external device */
-TVM_DLL Target ext_dev(const std::vector<std::string>& options =
-                   std::vector<std::string>());
-}  // namespace target
-
 /*!
  * \brief Container for build configuration options
  */

include/tvm/target/target.h

@@ -0,0 +1,181 @@
+/*
+ * 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/target/target.h
+ * \brief Compilation target object.
+ */
+#ifndef TVM_TARGET_TARGET_H_
+#define TVM_TARGET_TARGET_H_
+
+#include <tvm/support/with.h>
+#include <tvm/node/container.h>
+#include <tvm/ir/expr.h>
+
+#include <string>
+#include <vector>
+#include <unordered_set>
+
+namespace tvm {
+/*!
+ * \brief Compilation target.
+ * \note Use target::llvm, target::cuda etc functions.
+ * \sa Target
+ */
+class TargetNode : public Object {
+ public:
+  /*! \brief The name of the target device */
+  std::string target_name;
+  /*! \brief The name of the target device */
+  std::string device_name;
+  /*! \brief The type of the target device */
+  int device_type;
+  /*! \brief The maximum threads that a schedule should use for this device */
+  int max_num_threads = 1;
+  /*! \brief The warp size that should be used by the LowerThreadAllreduce pass */
+  int thread_warp_size = 1;
+  /*! \brief Keys for this target */
+  Array<PrimExpr> keys_array;
+  /*! \brief Options for this target */
+  Array<PrimExpr> options_array;
+  /*! \brief Collection of imported libs */
+  Array<PrimExpr> libs_array;
+
+  /*! \return the full device string to pass to codegen::Build */
+  TVM_DLL const std::string& str() const;
+
+  void VisitAttrs(AttrVisitor* v) {
+    v->Visit("target_name", &target_name);
+    v->Visit("device_name", &device_name);
+    v->Visit("device_type", &device_type);
+    v->Visit("max_num_threads", &max_num_threads);
+    v->Visit("thread_warp_size", &thread_warp_size);
+    v->Visit("keys_array", &keys_array);
+    v->Visit("options_array", &options_array);
+    v->Visit("libs_array", &libs_array);
+  }
+
+  /*! \brief Get the keys for this target as a vector of string */
+  TVM_DLL std::vector<std::string> keys() const;
+
+  /*! \brief Get the options for this target as a vector of string */
+  TVM_DLL std::vector<std::string> options() const;
+
+  /*! \brief Get the keys for this target as an unordered_set of string */
+  TVM_DLL std::unordered_set<std::string> libs() const;
+
+  static constexpr const char* _type_key = "Target";
+  TVM_DECLARE_FINAL_OBJECT_INFO(TargetNode, Object);
+
+ private:
+  /*! \brief Internal string repr. */
+  mutable std::string str_repr_;
+};
+
+/*!
+ * \brief Managed reference class to TargetNode.
+ * \sa TargetNode
+ */
+class Target : public ObjectRef {
+ public:
+  Target() {}
+  explicit Target(ObjectPtr<Object> n) : ObjectRef(n) {}
+  /*!
+  * \brief Create a Target given a string
+  * \param target_str the string to parse
+  */
+  TVM_DLL static Target Create(const std::string& target_str);
+  /*!
+   * \brief Get the current target context from thread local storage.
+   * \param allow_not_defined If the context stack is empty and this is set to true, an
+   *   undefined Target will be returned. Otherwise, an empty context stack will cause a
+   *   runtime error.
+   * \return The target that is the current context. The target may not be defined if
+   * allow_not_defined is true.
+   */
+  TVM_DLL static tvm::Target Current(bool allow_not_defined = true);
+
+  const TargetNode* operator->() const {
+      return static_cast<const TargetNode*>(get());
+  }
+
+  using ContainerType = TargetNode;
+  class Internal;
+ private:
+  // enable with syntax.
+  friend class Internal;
+  friend class With<Target>;
+  /*!
+   * \brief Push a new target context onto the thread local stack.
+   *  The Target on top of the stack is used to determine which
+   *  specialization to use when invoking a GenericFunc.
+   */
+  TVM_DLL void EnterWithScope();
+  /*!
+   * \brief Pop a target off the thread local context stack,
+   *  restoring the previous target as the current context.
+   */
+  TVM_DLL void ExitWithScope();
+};
+
+/*! \brief This namespace provides functions to construct Target instances */
+namespace target {
+
+/*! \return A target for LLVM */
+TVM_DLL Target llvm(const std::vector<std::string>& options =
+                    std::vector<std::string>());
+
+/*! \return A target for CUDA */
+TVM_DLL Target cuda(const std::vector<std::string>& options =
+                    std::vector<std::string>());
+
+/*! \return A target for ROCm */
+TVM_DLL Target rocm(const std::vector<std::string>& options =
+                    std::vector<std::string>());
+
+/*! \return A target for OpenCL */
+TVM_DLL Target opencl(const std::vector<std::string>& options =
+                      std::vector<std::string>());
+
+/*! \return A target for Metal */
+TVM_DLL Target metal(const std::vector<std::string>& options =
+                     std::vector<std::string>());
+
+/*! \return A target for rasp */
+TVM_DLL Target rasp(const std::vector<std::string>& options =
+                    std::vector<std::string>());
+
+/*! \return A target for Mali */
+TVM_DLL Target mali(const std::vector<std::string>& options =
+                    std::vector<std::string>());
+
+/*! \return A target for Intel Graphics */
+TVM_DLL Target intel_graphics(const std::vector<std::string>& options =
+                              std::vector<std::string>());
+
+/*! \return A target for stackvm */
+TVM_DLL Target stackvm(const std::vector<std::string>& options =
+                       std::vector<std::string>());
+
+/*! \return A target for external device */
+TVM_DLL Target ext_dev(const std::vector<std::string>& options =
+                       std::vector<std::string>());
+}  // namespace target
+}  // namespace tvm
+#endif  // TVM_TARGET_TARGET_H_

include/tvm/target_info.h → include/tvm/target/target_info.h

@@ -18,22 +18,23 @@
  */
 
 /*!
- * \file tvm/target_info.h
+ * \file tvm/target/target_info.h
  * \brief Various information about target.
  */
-#ifndef TVM_TARGET_INFO_H_
-#define TVM_TARGET_INFO_H_
+#ifndef TVM_TARGET_TARGET_INFO_H_
+#define TVM_TARGET_TARGET_INFO_H_
 
+#include <tvm/ir/expr.h>
 #include <string>
-#include "expr.h"
 
 namespace tvm {
 
 /*!
  * \brief Memory information of special memory region.
  *  Use MemoryInfo as its container type
  */
-struct MemoryInfoNode : public Object {
+class MemoryInfoNode : public Object {
+ public:
   /*! \brief The addressable unit */
   int unit_bits;
   /*! \brief Maximum number of bits supported in the memory */
@@ -71,4 +72,4 @@ class MemoryInfo : public ObjectRef {
 TVM_DLL MemoryInfo GetMemoryInfo(const std::string& scope);
 
 }  // namespace tvm
-#endif  // TVM_TARGET_INFO_H_
+#endif  // TVM_TARGET_TARGET_INFO_H_