Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[TVM] Update Submodule 2022-08-22-13-17-00 #122

Merged
merged 8 commits into from
Aug 23, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion 3rdparty/tvm
Submodule tvm updated from bb5138 to 7c318d
6 changes: 3 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ target_include_directories(raf_objs PRIVATE ${RAF_INCLUDE_DIRS})
target_include_directories(raf_objs SYSTEM PRIVATE ${RAF_BACKEND_INCLUDE_DIRS})
target_include_directories(raf_objs SYSTEM PRIVATE "3rdparty/tvm/3rdparty/compiler-rt")
target_compile_options(raf_objs PRIVATE ${RAF_CXX_FLAGS})
target_compile_features(raf_objs PRIVATE cxx_std_14)
target_compile_features(raf_objs PRIVATE cxx_std_17)
target_compile_definitions(raf_objs PRIVATE DMLC_USE_LOGGING_LIBRARY=<tvm/runtime/logging.h>)

if (${RAF_USE_CUDA} STREQUAL "OFF")
Expand All @@ -205,15 +205,15 @@ else()
target_include_directories(raf_cuda_objs SYSTEM PRIVATE ${RAF_BACKEND_INCLUDE_DIRS})
target_include_directories(raf_cuda_objs SYSTEM PRIVATE "3rdparty/tvm/3rdparty/compiler-rt")
target_compile_options(raf_cuda_objs PRIVATE ${RAF_CUDA_FLAGS})
target_compile_features(raf_cuda_objs PRIVATE cxx_std_14)
target_compile_features(raf_cuda_objs PRIVATE cxx_std_17)
target_compile_definitions(raf_cuda_objs PRIVATE DMLC_USE_LOGGING_LIBRARY=<tvm/runtime/logging.h>)

add_library(raf $<TARGET_OBJECTS:raf_objs> $<TARGET_OBJECTS:raf_cuda_objs>)
endif()

target_compile_options(raf PRIVATE ${RAF_CXX_FLAGS})
target_link_libraries(raf PRIVATE ${RAF_LINK_LIBS} ${RAF_BACKEND_LINK_LIBS})
target_compile_features(raf PRIVATE cxx_std_14)
target_compile_features(raf PRIVATE cxx_std_17)

set_target_properties(raf PROPERTIES
CXX_STANDARD 14
Expand Down
2 changes: 1 addition & 1 deletion cmake/utils/RAFTest.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ macro(raf_test TESTNAME)
${RAF_BACKEND_LINK_LIBS}
)
target_compile_options(${TESTNAME} PRIVATE ${RAF_CXX_FLAGS})
target_compile_features(${TESTNAME} PRIVATE cxx_std_14)
target_compile_features(${TESTNAME} PRIVATE cxx_std_17)
set_target_properties(${TESTNAME} PROPERTIES
CXX_STANDARD 14
CXX_STANDARD_REQUIRED ON
Expand Down
2 changes: 1 addition & 1 deletion include/raf/analysis.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#include <relay/analysis/dependency_graph.h>
#include "support/arena.h"

#include "raf/ir.h"
#include "raf/ir_ext.h"

namespace raf {
namespace analysis {
Expand Down
1 change: 1 addition & 0 deletions include/raf/dialect.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
#include <vector>
#include <unordered_map>

#include "./dataflow_pattern.h"
#include "./ir.h"
#include "./registry.h"

Expand Down
3 changes: 0 additions & 3 deletions include/raf/ir.h
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,3 @@ constexpr const char* kPatternName = "PatternName";
#define RAF_REGISTER_OBJECT_NO_REFLECT(TypeName) TVM_REGISTER_OBJECT_TYPE(TypeName)

#define RAF_REGISTER_OBJECT_REFLECT(TypeName) TVM_REGISTER_NODE_TYPE(TypeName)

#include "./ir_ext.h"
#include "./dataflow_pattern.h"
1 change: 1 addition & 0 deletions include/raf/op_profiler.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

#pragma once
#include "raf/cache.h"
#include "raf/ir_ext.h"
#include "op.h"
#include "op_utils.h"
#include <unordered_map>
Expand Down
2 changes: 1 addition & 1 deletion include/raf/pass.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#include "tvm/relay/analysis.h"
#include "tvm/relay/dataflow_matcher.h"
#include "tvm/relay/transform.h"
#include "raf/ir.h"
#include "raf/ir_ext.h"
#include "raf/value.h"
#include "raf/ir_ext.h"
#include "raf/pass_manager.h"
Expand Down
2 changes: 1 addition & 1 deletion include/raf/serialization.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#include <tvm/node/structural_hash.h>
#include <tvm/runtime/object.h>
#include <string>
#include "./ir.h"
#include "./ir_ext.h"
#include "./value.h"

namespace raf {
Expand Down
2 changes: 1 addition & 1 deletion include/raf/vm/bytecode.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#include <unordered_map>
#include <utility>
#include <vector>
#include "raf/ir.h"
#include "raf/ir_ext.h"
#include "raf/registry.h"
#include "raf/value.h"

Expand Down
2 changes: 1 addition & 1 deletion include/raf/vm/executable.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#include <unordered_map>
#include <utility>
#include <vector>
#include "raf/ir.h"
#include "raf/ir_ext.h"
#include "raf/registry.h"
#include "raf/value.h"

Expand Down
2 changes: 1 addition & 1 deletion include/raf/vm/value.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
* \brief The values that are specific to VM.
*/
#pragma once
#include "raf/ir.h"
#include "raf/ir_ext.h"
#include "raf/memory_pool.h"
#include "raf/value.h"

Expand Down
2 changes: 1 addition & 1 deletion include/raf/vm/vm.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#include <vector>
#include "bytecode.h"
#include "executable.h"
#include "raf/ir.h"
#include "raf/ir_ext.h"
#include "raf/registry.h"
#include "raf/value.h"
#include "raf/op.h"
Expand Down
2 changes: 1 addition & 1 deletion scripts/src_codegen/main_cxx_tvm_op.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ def gen_file(filename):
* \\file {FILENAME}
* \\brief Register TVM ops.
*/
#include "raf/ir.h"
#include "raf/ir_ext.h"
#include "raf/op.h"
namespace raf {{
namespace op {{
Expand Down
2 changes: 1 addition & 1 deletion src/common/shape_utils.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
*/
#pragma once
#include <vector>
#include "raf/ir.h"
#include "raf/ir_ext.h"
#include "raf/op.h"
#include "raf/value.h"

Expand Down
2 changes: 1 addition & 1 deletion src/impl/dialect.cc
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#include <dmlc/thread_local.h>

#include "raf/executor.h"
#include "raf/ir.h"
#include "raf/ir_ext.h"
#include "raf/op.h"
#include "raf/dialect.h"
#include "raf/dialect.h"
Expand Down
2 changes: 1 addition & 1 deletion src/impl/interpreter.cc
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
* \brief RAF interpreter, a naive implementation of executor
*/
#include "raf/executor.h"
#include "raf/ir.h"
#include "raf/ir_ext.h"
#include "raf/memory_pool.h"
#include "raf/op.h"
#include "raf/pass.h"
Expand Down
2 changes: 1 addition & 1 deletion src/impl/model.cc
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
* \brief Helpers for running models.
*/
#include "raf/binding.h"
#include "raf/ir.h"
#include "raf/ir_ext.h"
#include "raf/value.h"
#include "raf/registry.h"
#include "raf/executor.h"
Expand Down
2 changes: 1 addition & 1 deletion src/impl/op.cc
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#include <tvm/runtime/device_api.h>
#include "dmlc/registry.h"
#include "raf/executor.h"
#include "raf/ir.h"
#include "raf/ir_ext.h"
#include "raf/op.h"
#include "raf/dialect.h"
#include "raf/registry.h"
Expand Down
2 changes: 1 addition & 1 deletion src/impl/sharding.cc
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
* \brief Description of RAF sharding specifications
*/
#include <tvm/runtime/data_type.h>
#include "raf/ir.h"
#include "raf/ir_ext.h"
#include "raf/op.h"
#include "raf/op_utils.h"
#include "raf/type.h"
Expand Down
2 changes: 1 addition & 1 deletion src/impl/value.cc
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#include <tvm/node/functor.h>
#include <tvm/ir/module.h>
#include "raf/executor.h"
#include "raf/ir.h"
#include "raf/ir_ext.h"
#include "raf/registry.h"
#include "raf/tensor.h"
#include "raf/value.h"
Expand Down
2 changes: 1 addition & 1 deletion src/impl/vm/compiler.cc
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#include <tvm/relay/analysis.h>
#include <tvm/relay/attrs/memory.h>
#include "raf/op.h"
#include "raf/ir.h"
#include "raf/ir_ext.h"
#include "raf/binding.h"
#include "raf/type.h"
#include "raf/pass.h"
Expand Down
2 changes: 1 addition & 1 deletion src/impl/vm/compiler.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#include <utility>
#include <vector>
#include "raf/device.h"
#include "raf/ir.h"
#include "raf/ir_ext.h"
#include "raf/registry.h"
#include "raf/vm/bytecode.h"
#include "raf/vm/executable.h"
Expand Down
2 changes: 1 addition & 1 deletion src/impl/vm/vm.cc
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

#include "raf/communicator.h"
#include "raf/memory_pool.h"
#include "raf/ir.h"
#include "raf/ir_ext.h"
#include "raf/op.h"
#include "raf/op_utils.h"
#include "raf/value.h"
Expand Down
2 changes: 1 addition & 1 deletion src/op/dialect/cublas/cublas_utils.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#include <cublas_v2.h>
#include "raf/device.h"
#include "raf/enum_base.h"
#include "raf/ir.h"
#include "raf/ir_ext.h"
#include "raf/pass.h"
#include "../../../common/cuda_utils.h"

Expand Down
2 changes: 1 addition & 1 deletion src/op/dialect/cudnn/activation.cc
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
*/
#include "../../schema/ufunc.h"
#include "./cudnn_utils.h"
#include "raf/ir.h"
#include "raf/ir_ext.h"
#include "raf/op_utils.h"

namespace raf {
Expand Down
2 changes: 1 addition & 1 deletion src/op/dialect/cudnn/batch_norm.cc
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
*/
#include "../../schema/nn.h"
#include "./cudnn_utils.h"
#include "raf/ir.h"
#include "raf/ir_ext.h"
#include "raf/op_utils.h"

namespace raf {
Expand Down
2 changes: 1 addition & 1 deletion src/op/dialect/cudnn/conv.cc
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#include "../../schema/nn.h"
#include "../3rdparty/tvm/src/runtime/file_utils.h"
#include "./cudnn_utils.h"
#include "raf/ir.h"
#include "raf/ir_ext.h"
#include "raf/memory_pool.h"
#include "raf/op_utils.h"
#include "raf/profiler.h"
Expand Down
2 changes: 1 addition & 1 deletion src/op/dialect/cudnn/cudnn_utils.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#include "raf/device.h"
#include "raf/op.h"
#include "raf/enum_base.h"
#include "raf/ir.h"
#include "raf/ir_ext.h"
#include "raf/value.h"
#include "../../../common/cuda_utils.h"
#include "../../../common/shape_utils.h"
Expand Down
2 changes: 1 addition & 1 deletion src/op/dialect/cudnn/dropout.cc
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
* \brief cuDNN dropout operators.
*/
#include <tvm/support/random_engine.h>
#include "raf/ir.h"
#include "raf/ir_ext.h"
#include "raf/registry.h"
#include "raf/op_utils.h"
#include "raf/device.h"
Expand Down
2 changes: 1 addition & 1 deletion src/op/dialect/cudnn/pool.cc
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
*/
#include "../../schema/nn.h"
#include "./cudnn_utils.h"
#include "raf/ir.h"
#include "raf/ir_ext.h"
#include "raf/op_utils.h"

namespace raf {
Expand Down
2 changes: 1 addition & 1 deletion src/op/dialect/cudnn/softmax.cc
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
*/
#include "../../schema/nn.h"
#include "./cudnn_utils.h"
#include "raf/ir.h"
#include "raf/ir_ext.h"
#include "raf/op_utils.h"

namespace raf {
Expand Down
2 changes: 1 addition & 1 deletion src/op/dialect/cutlass/cutlass_utils.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#include "cutlass_ext/library/operation_table_ext.h"
#include "cutlass_ext/library/singleton_ext.h"

#include "raf/ir.h"
#include "raf/ir_ext.h"
#include "raf/value.h"
#include "raf/registry.h"
#include "raf/op.h"
Expand Down
2 changes: 1 addition & 1 deletion src/op/dialect/cutlass/pattern_utils.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#include <cutlass/library/operation_table.h>
#include <cutlass_ext/library/library_ext.h>

#include "raf/ir.h"
#include "raf/ir_ext.h"
#include "raf/value.h"
#include "raf/registry.h"
#include "raf/op.h"
Expand Down
2 changes: 1 addition & 1 deletion src/op/dialect/nccl/communication_utils.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#include "raf/device.h"
#include "raf/op.h"
#include "raf/enum_base.h"
#include "raf/ir.h"
#include "raf/ir_ext.h"
#include "raf/value.h"
#include "raf/tensor.h"
#include "raf/communicator.h"
Expand Down
2 changes: 1 addition & 1 deletion src/op/dialect/tvm/attrs/optimizer.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
*/
#pragma once
#include <tvm/ir/attrs.h>
#include "raf/ir.h"
#include "raf/ir_ext.h"

namespace raf {
namespace op {
Expand Down
2 changes: 1 addition & 1 deletion src/op/dialect/tvm/attrs/reduce.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
*/
#pragma once
#include <tvm/ir/attrs.h>
#include "raf/ir.h"
#include "raf/ir_ext.h"

namespace raf {
namespace op {
Expand Down
2 changes: 1 addition & 1 deletion src/op/dialect/tvm/attrs/transform.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
*/
#pragma once
#include <tvm/ir/attrs.h>
#include "raf/ir.h"
#include "raf/ir_ext.h"

namespace raf {
namespace op {
Expand Down
2 changes: 1 addition & 1 deletion src/op/dialect/tvm/tvm_attrs.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#include <tvm/relay/attrs/random.h>
#include <tvm/relay/attrs/reduce.h>
#include <tvm/relay/attrs/transform.h>
#include "raf/ir.h"
#include "raf/ir_ext.h"
#include "raf/value.h"
#include "raf/op.h"
#include "./attrs/nn.h"
Expand Down
2 changes: 1 addition & 1 deletion src/op/dialect/tvm/tvm_utils.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#include "relay/backend/te_compiler.h"
#include "relay/backend/te_compiler_cache.h"
#include "raf/cache.h"
#include "raf/ir.h"
#include "raf/ir_ext.h"
#include "raf/value.h"
#include "raf/registry.h"
#include "raf/op.h"
Expand Down
2 changes: 1 addition & 1 deletion src/op/from_relay/binary.cc
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* \file ./src/op/from_relay/binary.cc
* \brief Operators bridged from Relay.
*/
#include "raf/ir.h"
#include "raf/ir_ext.h"
#include "./from_relay_utils.h"

namespace raf {
Expand Down
2 changes: 1 addition & 1 deletion src/op/from_relay/from_relay_utils.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
*/
#pragma once
#include "raf/op.h"
#include "raf/ir.h"
#include "raf/ir_ext.h"
#include "raf/tensor.h"

namespace raf {
Expand Down
2 changes: 1 addition & 1 deletion src/op/grad/algorithm.cc
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
*/
#include "./grad_utils.h"
#include "raf/pass.h"
#include "raf/ir.h"
#include "raf/ir_ext.h"

namespace raf {
namespace op {
Expand Down
Loading