From: 박세희/On-Device Lab(SR)/Principal Engineer/삼성전자 Date: Mon, 28 Oct 2019 06:36:07 +0000 (+0900) Subject: [moco-tf] Update to use moco TFDialect (#8514) X-Git-Tag: submit/tizen/20191205.083104~555 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ca1e721f523141d93528782be5e5dd7466c40918;p=platform%2Fcore%2Fml%2Fnnfw.git [moco-tf] Update to use moco TFDialect (#8514) This will update to use TFDialect from moco project Signed-off-by: SaeHie Park --- diff --git a/compiler/moco-tf/src/Canonicalization/AddCanonicalizer.cpp b/compiler/moco-tf/src/Canonicalization/AddCanonicalizer.cpp index 23631b7..8028a87 100644 --- a/compiler/moco-tf/src/Canonicalization/AddCanonicalizer.cpp +++ b/compiler/moco-tf/src/Canonicalization/AddCanonicalizer.cpp @@ -16,8 +16,8 @@ #include "AddCanonicalizer.h" -#include "Dialect/TFDialect.h" -#include "Dialect/TFNodes.h" +#include +#include #include "TFEltwiseBinaryCanonicalzeHelper.h" diff --git a/compiler/moco-tf/src/Canonicalization/AddCanonicalizer.h b/compiler/moco-tf/src/Canonicalization/AddCanonicalizer.h index 3b3f11b..53ba9ed 100644 --- a/compiler/moco-tf/src/Canonicalization/AddCanonicalizer.h +++ b/compiler/moco-tf/src/Canonicalization/AddCanonicalizer.h @@ -19,7 +19,8 @@ #include "Transform.h" #include "SimpleNodeTransform.h" -#include "Dialect/TFNodes.h" + +#include #include diff --git a/compiler/moco-tf/src/Canonicalization/AvgPoolCanonicalizer.cpp b/compiler/moco-tf/src/Canonicalization/AvgPoolCanonicalizer.cpp index 749f386..924121c 100644 --- a/compiler/moco-tf/src/Canonicalization/AvgPoolCanonicalizer.cpp +++ b/compiler/moco-tf/src/Canonicalization/AvgPoolCanonicalizer.cpp @@ -17,10 +17,7 @@ #include "AvgPoolCanonicalizer.h" #include "TFShapeInferenceHelper.h" -#include "Dialect/TFDialect.h" -#include "Dialect/TFNodes.h" -#include "Dialect/TFNodeVisitor.h" -#include "Dialect/TFNodeImpl.h" +#include #include "CodecHelper.h" @@ -31,7 +28,7 @@ namespace { -bool canonicalize_avgpool2d(loco::Graph *graph, moco::tf::TFAvgPool *node) +bool canonicalize_avgpool2d(loco::Graph *graph, moco::TFAvgPool *node) { LOGGER(l); diff --git a/compiler/moco-tf/src/Canonicalization/AvgPoolCanonicalizer.h b/compiler/moco-tf/src/Canonicalization/AvgPoolCanonicalizer.h index 805c915..e9c56c8 100644 --- a/compiler/moco-tf/src/Canonicalization/AvgPoolCanonicalizer.h +++ b/compiler/moco-tf/src/Canonicalization/AvgPoolCanonicalizer.h @@ -19,7 +19,8 @@ #include "Transform.h" #include "SimpleNodeTransform.h" -#include "Dialect/TFNodes.h" + +#include #include @@ -31,7 +32,7 @@ namespace tf /** * @brief Convert TFAvgPool to Canonical AvgPool2D */ -class AvgPoolCanonicalizer : public SimpleNodeTransform +class AvgPoolCanonicalizer : public SimpleNodeTransform { public: const char *name(void) const final { return "AvgPoolCanonicalizer"; } diff --git a/compiler/moco-tf/src/Canonicalization/BiasAddCanonicalizer.cpp b/compiler/moco-tf/src/Canonicalization/BiasAddCanonicalizer.cpp index c05292e..dd2884c 100644 --- a/compiler/moco-tf/src/Canonicalization/BiasAddCanonicalizer.cpp +++ b/compiler/moco-tf/src/Canonicalization/BiasAddCanonicalizer.cpp @@ -16,10 +16,7 @@ #include "BiasAddCanonicalizer.h" -#include "Dialect/TFDialect.h" -#include "Dialect/TFNodes.h" -#include "Dialect/TFNodeVisitor.h" -#include "Dialect/TFNodeImpl.h" +#include #include #include @@ -29,7 +26,7 @@ namespace { using plier::tf::DataLayout; -bool canonicalize_biasadd(loco::Graph *graph, moco::tf::TFBiasAdd *node) +bool canonicalize_biasadd(loco::Graph *graph, moco::TFBiasAdd *node) { LOGGER(l); diff --git a/compiler/moco-tf/src/Canonicalization/BiasAddCanonicalizer.h b/compiler/moco-tf/src/Canonicalization/BiasAddCanonicalizer.h index 01e6d2a..ff4032c 100644 --- a/compiler/moco-tf/src/Canonicalization/BiasAddCanonicalizer.h +++ b/compiler/moco-tf/src/Canonicalization/BiasAddCanonicalizer.h @@ -19,7 +19,8 @@ #include "Transform.h" #include "SimpleNodeTransform.h" -#include "Dialect/TFNodes.h" + +#include #include @@ -31,7 +32,7 @@ namespace tf /** * @brief Convert TFBiasAdd to Canonical BiasAdd */ -class BiasAddCanonicalizer final : public SimpleNodeTransform +class BiasAddCanonicalizer final : public SimpleNodeTransform { public: const char *name(void) const final { return "BiasAddCanonicalizer"; } diff --git a/compiler/moco-tf/src/Canonicalization/ConcatV2Canonicalizer.cpp b/compiler/moco-tf/src/Canonicalization/ConcatV2Canonicalizer.cpp index 14493f1..8b2877a 100644 --- a/compiler/moco-tf/src/Canonicalization/ConcatV2Canonicalizer.cpp +++ b/compiler/moco-tf/src/Canonicalization/ConcatV2Canonicalizer.cpp @@ -18,10 +18,7 @@ #include "TFShapeInferenceHelper.h" #include "LogHelper.h" -#include "Dialect/TFDialect.h" -#include "Dialect/TFNodes.h" -#include "Dialect/TFNodeVisitor.h" -#include "Dialect/TFNodeImpl.h" +#include #include @@ -34,7 +31,7 @@ namespace using namespace moco::tf; -int32_t scala_value(moco::tf::TFConst *node) +int32_t scala_value(moco::TFConst *node) { auto nodeshape = node_shape(node); assert(node->dtype() == loco::DataType::S32); @@ -45,7 +42,7 @@ int32_t scala_value(moco::tf::TFConst *node) return node->at(0); } -bool canonicalize_concat(loco::Graph *graph, moco::tf::TFConcatV2 *node) +bool canonicalize_concat(loco::Graph *graph, moco::TFConcatV2 *node) { LOGGER(l); @@ -99,7 +96,7 @@ bool canonicalize_concat(loco::Graph *graph, moco::tf::TFConcatV2 *node) { // axis should be TFConst auto axis_node = node->axis(); - auto tfconst = dynamic_cast(axis_node); + auto tfconst = dynamic_cast(axis_node); assert(tfconst != nullptr); axis_value = scala_value(tfconst); } diff --git a/compiler/moco-tf/src/Canonicalization/ConcatV2Canonicalizer.h b/compiler/moco-tf/src/Canonicalization/ConcatV2Canonicalizer.h index a9d3f68..e6b471b 100644 --- a/compiler/moco-tf/src/Canonicalization/ConcatV2Canonicalizer.h +++ b/compiler/moco-tf/src/Canonicalization/ConcatV2Canonicalizer.h @@ -19,7 +19,8 @@ #include "Transform.h" #include "SimpleNodeTransform.h" -#include "Dialect/TFNodes.h" + +#include #include @@ -31,13 +32,13 @@ namespace tf /** * @brief Convert TFConcatV2 to Canonical TensorConcat */ -class ConcatV2Canonicalizer : public SimpleNodeTransform +class ConcatV2Canonicalizer : public SimpleNodeTransform { public: const char *name(void) const final { return "ConcatV2Canonicalizer"; } public: - bool transform(TFConcatV2 *node) const final; + bool transform(moco::TFConcatV2 *node) const final; }; } // namespace tf diff --git a/compiler/moco-tf/src/Canonicalization/ConstCanonicalizer.cpp b/compiler/moco-tf/src/Canonicalization/ConstCanonicalizer.cpp index 5dc5158..403024d 100644 --- a/compiler/moco-tf/src/Canonicalization/ConstCanonicalizer.cpp +++ b/compiler/moco-tf/src/Canonicalization/ConstCanonicalizer.cpp @@ -16,10 +16,7 @@ #include "ConstCanonicalizer.h" -#include "Dialect/TFDialect.h" -#include "Dialect/TFNodes.h" -#include "Dialect/TFNodeVisitor.h" -#include "Dialect/TFNodeImpl.h" +#include #include #include @@ -27,7 +24,7 @@ namespace { -bool canonicalize_const(loco::Graph *graph, moco::tf::TFConst *node) +bool canonicalize_const(loco::Graph *graph, moco::TFConst *node) { LOGGER(l); diff --git a/compiler/moco-tf/src/Canonicalization/ConstCanonicalizer.h b/compiler/moco-tf/src/Canonicalization/ConstCanonicalizer.h index 31f870e..1b0b2b8 100644 --- a/compiler/moco-tf/src/Canonicalization/ConstCanonicalizer.h +++ b/compiler/moco-tf/src/Canonicalization/ConstCanonicalizer.h @@ -19,7 +19,8 @@ #include "Transform.h" #include "SimpleNodeTransform.h" -#include "Dialect/TFNodes.h" + +#include #include @@ -31,13 +32,13 @@ namespace tf /** * @brief Convert TFConst to Canonical ConstGen */ -class ConstCanonicalizer : public SimpleNodeTransform +class ConstCanonicalizer : public SimpleNodeTransform { public: const char *name(void) const final { return "ConstCanonicalizer"; } public: - bool transform(TFConst *) const final; + bool transform(moco::TFConst *) const final; }; } // namespace tf diff --git a/compiler/moco-tf/src/Canonicalization/Conv2DBackpropInputCanonicalizer.cpp b/compiler/moco-tf/src/Canonicalization/Conv2DBackpropInputCanonicalizer.cpp index 3268c54..057caf5 100644 --- a/compiler/moco-tf/src/Canonicalization/Conv2DBackpropInputCanonicalizer.cpp +++ b/compiler/moco-tf/src/Canonicalization/Conv2DBackpropInputCanonicalizer.cpp @@ -16,8 +16,7 @@ #include "Conv2DBackpropInputCanonicalizer.h" -#include "Dialect/TFDialect.h" -#include "Dialect/TFNodes.h" +#include #include "CodecHelper.h" @@ -86,7 +85,7 @@ public: PlaneShape &output() { return _output; } loco::Stride<2> &stride() { return _stride; } loco::Window<2> &window() { return _window; } - moco::tf::TFPadding &padding() { return _padding; } + moco::TFPadding &padding() { return _padding; } private: /// @brief Check whether ingredients set by non-default values @@ -145,7 +144,7 @@ private: PlaneShape _output; loco::Stride<2> _stride; loco::Window<2> _window; - moco::tf::TFPadding _padding; + moco::TFPadding _padding; }; loco::Padding2D Padding2DInference::operator()(void) @@ -262,7 +261,7 @@ namespace { bool canonicalize_conv2d_backprop_input(loco::Graph *graph, - moco::tf::TFConv2DBackpropInput *conv2d_backprop) + moco::TFConv2DBackpropInput *conv2d_backprop) { /** * @note This will replace TFConv2DBackpropInput node with canonical diff --git a/compiler/moco-tf/src/Canonicalization/Conv2DBackpropInputCanonicalizer.h b/compiler/moco-tf/src/Canonicalization/Conv2DBackpropInputCanonicalizer.h index a5650c4..bc37bb9 100644 --- a/compiler/moco-tf/src/Canonicalization/Conv2DBackpropInputCanonicalizer.h +++ b/compiler/moco-tf/src/Canonicalization/Conv2DBackpropInputCanonicalizer.h @@ -19,7 +19,8 @@ #include "Transform.h" #include "SimpleNodeTransform.h" -#include "Dialect/TFNodes.h" + +#include #include @@ -29,13 +30,13 @@ namespace tf { /// @brief Convert TFConv2DBackpropInput to Canonical TransposedConv2D -class Conv2DBackpropInputCanonicalizer : public SimpleNodeTransform +class Conv2DBackpropInputCanonicalizer : public SimpleNodeTransform { public: const char *name(void) const final { return "Conv2DBackpropInputCanonicalizer"; } public: - bool transform(TFConv2DBackpropInput *) const final; + bool transform(moco::TFConv2DBackpropInput *) const final; }; } // namespace tf diff --git a/compiler/moco-tf/src/Canonicalization/Conv2DCanonicalizer.cpp b/compiler/moco-tf/src/Canonicalization/Conv2DCanonicalizer.cpp index 51188ed..ea8dde4 100644 --- a/compiler/moco-tf/src/Canonicalization/Conv2DCanonicalizer.cpp +++ b/compiler/moco-tf/src/Canonicalization/Conv2DCanonicalizer.cpp @@ -17,10 +17,7 @@ #include "Conv2DCanonicalizer.h" #include "TFShapeInferenceHelper.h" -#include "Dialect/TFDialect.h" -#include "Dialect/TFNodes.h" -#include "Dialect/TFNodeVisitor.h" -#include "Dialect/TFNodeImpl.h" +#include #include "CodecHelper.h" @@ -44,7 +41,7 @@ void set_filter_enc(loco::FilterEncode *filter_enc) filter_enc->encoder(std::move(enc)); } -bool canonicalize_conv2d(loco::Graph *graph, moco::tf::TFConv2D *node) +bool canonicalize_conv2d(loco::Graph *graph, moco::TFConv2D *node) { LOGGER(l); diff --git a/compiler/moco-tf/src/Canonicalization/Conv2DCanonicalizer.h b/compiler/moco-tf/src/Canonicalization/Conv2DCanonicalizer.h index 191e49f..ea39667 100644 --- a/compiler/moco-tf/src/Canonicalization/Conv2DCanonicalizer.h +++ b/compiler/moco-tf/src/Canonicalization/Conv2DCanonicalizer.h @@ -19,7 +19,8 @@ #include "Transform.h" #include "SimpleNodeTransform.h" -#include "Dialect/TFNodes.h" + +#include #include diff --git a/compiler/moco-tf/src/Canonicalization/DepthwiseConv2dNativeCanonicalizer.cpp b/compiler/moco-tf/src/Canonicalization/DepthwiseConv2dNativeCanonicalizer.cpp index 059b71b..abf77ce 100644 --- a/compiler/moco-tf/src/Canonicalization/DepthwiseConv2dNativeCanonicalizer.cpp +++ b/compiler/moco-tf/src/Canonicalization/DepthwiseConv2dNativeCanonicalizer.cpp @@ -17,10 +17,7 @@ #include "DepthwiseConv2dNativeCanonicalizer.h" #include "TFShapeInferenceHelper.h" -#include "Dialect/TFDialect.h" -#include "Dialect/TFNodes.h" -#include "Dialect/TFNodeVisitor.h" -#include "Dialect/TFNodeImpl.h" +#include #include "CodecHelper.h" @@ -45,7 +42,7 @@ void set_filter_enc(loco::DepthwiseFilterEncode *filter_enc) filter_enc->encoder(std::move(enc)); } -bool canonicalize_depthwiseconv2dnative(loco::Graph *graph, moco::tf::TFDepthwiseConv2dNative *node) +bool canonicalize_depthwiseconv2dnative(loco::Graph *graph, moco::TFDepthwiseConv2dNative *node) { LOGGER(l); diff --git a/compiler/moco-tf/src/Canonicalization/DepthwiseConv2dNativeCanonicalizer.h b/compiler/moco-tf/src/Canonicalization/DepthwiseConv2dNativeCanonicalizer.h index bdf8abf..704e1ad 100644 --- a/compiler/moco-tf/src/Canonicalization/DepthwiseConv2dNativeCanonicalizer.h +++ b/compiler/moco-tf/src/Canonicalization/DepthwiseConv2dNativeCanonicalizer.h @@ -19,7 +19,8 @@ #include "Transform.h" #include "SimpleNodeTransform.h" -#include "Dialect/TFNodes.h" + +#include namespace moco { @@ -29,13 +30,13 @@ namespace tf /** * @brief Convert TFDepthwiseConv2dNative to Canonical DepthwiseConv2D */ -class DepthwiseConv2dNativeCanonicalizer : public SimpleNodeTransform +class DepthwiseConv2dNativeCanonicalizer : public SimpleNodeTransform { public: const char *name(void) const final { return "DepthwiseConv2dNativeCanonicalizer"; } public: - bool transform(TFDepthwiseConv2dNative *) const final; + bool transform(moco::TFDepthwiseConv2dNative *) const final; }; } // namespace tf diff --git a/compiler/moco-tf/src/Canonicalization/IdentityCanonicalizer.cpp b/compiler/moco-tf/src/Canonicalization/IdentityCanonicalizer.cpp index 0b5329f..d5d75fa 100644 --- a/compiler/moco-tf/src/Canonicalization/IdentityCanonicalizer.cpp +++ b/compiler/moco-tf/src/Canonicalization/IdentityCanonicalizer.cpp @@ -18,10 +18,7 @@ #include "Convert.h" -#include "Dialect/TFDialect.h" -#include "Dialect/TFNodes.h" -#include "Dialect/TFNodeVisitor.h" -#include "Dialect/TFNodeImpl.h" +#include #include #include @@ -29,7 +26,7 @@ namespace { -bool canonicalize_identity(loco::Graph *graph, moco::tf::TFIdentity *node) +bool canonicalize_identity(loco::Graph *graph, moco::TFIdentity *node) { LOGGER(l); diff --git a/compiler/moco-tf/src/Canonicalization/IdentityCanonicalizer.h b/compiler/moco-tf/src/Canonicalization/IdentityCanonicalizer.h index 79d3270..59b2894 100644 --- a/compiler/moco-tf/src/Canonicalization/IdentityCanonicalizer.h +++ b/compiler/moco-tf/src/Canonicalization/IdentityCanonicalizer.h @@ -19,7 +19,8 @@ #include "Transform.h" #include "SimpleNodeTransform.h" -#include "Dialect/TFNodes.h" + +#include #include @@ -31,13 +32,13 @@ namespace tf /** * @brief Convert TFIdentity to Canonical Forward */ -class IdentityCanonicalizer : public SimpleNodeTransform +class IdentityCanonicalizer : public SimpleNodeTransform { public: const char *name(void) const final { return "IdentityCanonicalizer"; } public: - bool transform(TFIdentity *) const final; + bool transform(moco::TFIdentity *) const final; }; } // namespace tf diff --git a/compiler/moco-tf/src/Canonicalization/MaxPoolCanonicalizer.cpp b/compiler/moco-tf/src/Canonicalization/MaxPoolCanonicalizer.cpp index 9acd85e..0d8d8b4 100644 --- a/compiler/moco-tf/src/Canonicalization/MaxPoolCanonicalizer.cpp +++ b/compiler/moco-tf/src/Canonicalization/MaxPoolCanonicalizer.cpp @@ -17,10 +17,7 @@ #include "MaxPoolCanonicalizer.h" #include "TFShapeInferenceHelper.h" -#include "Dialect/TFDialect.h" -#include "Dialect/TFNodes.h" -#include "Dialect/TFNodeVisitor.h" -#include "Dialect/TFNodeImpl.h" +#include #include "CodecHelper.h" @@ -29,7 +26,7 @@ namespace { -bool canonicalize_maxpool2d(loco::Graph *graph, moco::tf::TFMaxPool *node) +bool canonicalize_maxpool2d(loco::Graph *graph, moco::TFMaxPool *node) { LOGGER(l); diff --git a/compiler/moco-tf/src/Canonicalization/MaxPoolCanonicalizer.h b/compiler/moco-tf/src/Canonicalization/MaxPoolCanonicalizer.h index b0caf0b..c58ade5 100644 --- a/compiler/moco-tf/src/Canonicalization/MaxPoolCanonicalizer.h +++ b/compiler/moco-tf/src/Canonicalization/MaxPoolCanonicalizer.h @@ -19,7 +19,8 @@ #include "Transform.h" #include "SimpleNodeTransform.h" -#include "Dialect/TFNodes.h" + +#include #include @@ -31,13 +32,13 @@ namespace tf /** * @brief Convert TFMaxPool to Canonical MaxPool2D */ -class MaxPoolCanonicalizer : public SimpleNodeTransform +class MaxPoolCanonicalizer : public SimpleNodeTransform { public: const char *name(void) const final { return "MaxPoolCanonicalizer"; } public: - bool transform(TFMaxPool *) const final; + bool transform(moco::TFMaxPool *) const final; }; } // namespace tf diff --git a/compiler/moco-tf/src/Canonicalization/MeanCanonicalizer.cpp b/compiler/moco-tf/src/Canonicalization/MeanCanonicalizer.cpp index d3123f7..69eaf79 100644 --- a/compiler/moco-tf/src/Canonicalization/MeanCanonicalizer.cpp +++ b/compiler/moco-tf/src/Canonicalization/MeanCanonicalizer.cpp @@ -22,7 +22,10 @@ namespace moco namespace tf { -bool MeanCanonicalizer::transform(TFMean *node) const { return canonicalize_reduce_node(node); } +bool MeanCanonicalizer::transform(moco::TFMean *node) const +{ + return canonicalize_reduce_node(node); +} } // namespace tf } // namespace moco diff --git a/compiler/moco-tf/src/Canonicalization/MeanCanonicalizer.h b/compiler/moco-tf/src/Canonicalization/MeanCanonicalizer.h index 1fe293c..469d7e3 100644 --- a/compiler/moco-tf/src/Canonicalization/MeanCanonicalizer.h +++ b/compiler/moco-tf/src/Canonicalization/MeanCanonicalizer.h @@ -19,7 +19,8 @@ #include "Transform.h" #include "SimpleNodeTransform.h" -#include "Dialect/TFNodes.h" + +#include #include @@ -31,13 +32,13 @@ namespace tf /** * @brief Canonicalize TF-dialect TFMean into canonical TensorReduce(Mean) node */ -class MeanCanonicalizer : public SimpleNodeTransform +class MeanCanonicalizer : public SimpleNodeTransform { public: const char *name(void) const final { return "MeanCanonicalizer"; } public: - bool transform(TFMean *) const final; + bool transform(moco::TFMean *) const final; }; } // namespace tf diff --git a/compiler/moco-tf/src/Canonicalization/MulCanonicalizer.cpp b/compiler/moco-tf/src/Canonicalization/MulCanonicalizer.cpp index fec4796..d02f713 100644 --- a/compiler/moco-tf/src/Canonicalization/MulCanonicalizer.cpp +++ b/compiler/moco-tf/src/Canonicalization/MulCanonicalizer.cpp @@ -16,8 +16,7 @@ #include "MulCanonicalizer.h" -#include "Dialect/TFDialect.h" -#include "Dialect/TFNodes.h" +#include #include "TFEltwiseBinaryCanonicalzeHelper.h" @@ -26,7 +25,7 @@ namespace moco namespace tf { -bool MulCanonicalizer::transform(TFMul *node) const +bool MulCanonicalizer::transform(moco::TFMul *node) const { return canonicalize_eltwise_binary_node(node); } diff --git a/compiler/moco-tf/src/Canonicalization/MulCanonicalizer.h b/compiler/moco-tf/src/Canonicalization/MulCanonicalizer.h index d014031..480eec7 100644 --- a/compiler/moco-tf/src/Canonicalization/MulCanonicalizer.h +++ b/compiler/moco-tf/src/Canonicalization/MulCanonicalizer.h @@ -19,7 +19,8 @@ #include "Transform.h" #include "SimpleNodeTransform.h" -#include "Dialect/TFNodes.h" + +#include #include @@ -31,13 +32,13 @@ namespace tf /** * @brief Convert TFMul to Canonical EltwiseMul */ -class MulCanonicalizer : public SimpleNodeTransform +class MulCanonicalizer : public SimpleNodeTransform { public: const char *name(void) const final { return "MulCanonicalizer"; } public: - bool transform(TFMul *) const final; + bool transform(moco::TFMul *) const final; }; } // namespace tf diff --git a/compiler/moco-tf/src/Canonicalization/PadCanonicalizer.cpp b/compiler/moco-tf/src/Canonicalization/PadCanonicalizer.cpp index 4296273..10816f4 100644 --- a/compiler/moco-tf/src/Canonicalization/PadCanonicalizer.cpp +++ b/compiler/moco-tf/src/Canonicalization/PadCanonicalizer.cpp @@ -16,10 +16,7 @@ #include "PadCanonicalizer.h" -#include "Dialect/TFDialect.h" -#include "Dialect/TFNodes.h" -#include "Dialect/TFNodeVisitor.h" -#include "Dialect/TFNodeImpl.h" +#include #include "loco/Service/TypeInference.h" @@ -28,7 +25,7 @@ namespace { -bool canonicalize_pad(loco::Graph *graph, moco::tf::TFPad *node) +bool canonicalize_pad(loco::Graph *graph, moco::TFPad *node) { /** * @note This will replace TFPad node with Canonical TensorConstantPad diff --git a/compiler/moco-tf/src/Canonicalization/PadCanonicalizer.h b/compiler/moco-tf/src/Canonicalization/PadCanonicalizer.h index 7909da0..64bb604 100644 --- a/compiler/moco-tf/src/Canonicalization/PadCanonicalizer.h +++ b/compiler/moco-tf/src/Canonicalization/PadCanonicalizer.h @@ -19,7 +19,8 @@ #include "Transform.h" #include "SimpleNodeTransform.h" -#include "Dialect/TFNodes.h" + +#include namespace moco { @@ -29,13 +30,13 @@ namespace tf /** * @brief Convert TFPad to Canonical TensorConstantPad */ -class PadCanonicalizer final : public SimpleNodeTransform +class PadCanonicalizer final : public SimpleNodeTransform { public: const char *name(void) const final { return "PadCanonicalizer"; } public: - bool transform(TFPad *) const final; + bool transform(moco::TFPad *) const final; }; } // namespace tf diff --git a/compiler/moco-tf/src/Canonicalization/PlaceholderCanonicalizer.cpp b/compiler/moco-tf/src/Canonicalization/PlaceholderCanonicalizer.cpp index e2ca20d..b021fca 100644 --- a/compiler/moco-tf/src/Canonicalization/PlaceholderCanonicalizer.cpp +++ b/compiler/moco-tf/src/Canonicalization/PlaceholderCanonicalizer.cpp @@ -16,10 +16,7 @@ #include "PlaceholderCanonicalizer.h" -#include "Dialect/TFDialect.h" -#include "Dialect/TFNodes.h" -#include "Dialect/TFNodeVisitor.h" -#include "Dialect/TFNodeImpl.h" +#include #include #include diff --git a/compiler/moco-tf/src/Canonicalization/RealDivCanonicalizer.cpp b/compiler/moco-tf/src/Canonicalization/RealDivCanonicalizer.cpp index 0c6b211..a448d85 100644 --- a/compiler/moco-tf/src/Canonicalization/RealDivCanonicalizer.cpp +++ b/compiler/moco-tf/src/Canonicalization/RealDivCanonicalizer.cpp @@ -16,8 +16,7 @@ #include "RealDivCanonicalizer.h" -#include "Dialect/TFDialect.h" -#include "Dialect/TFNodes.h" +#include #include "TFEltwiseBinaryCanonicalzeHelper.h" @@ -26,7 +25,7 @@ namespace moco namespace tf { -bool RealDivCanonicalizer::transform(TFRealDiv *node) const +bool RealDivCanonicalizer::transform(moco::TFRealDiv *node) const { return canonicalize_eltwise_binary_node(node); } diff --git a/compiler/moco-tf/src/Canonicalization/RealDivCanonicalizer.h b/compiler/moco-tf/src/Canonicalization/RealDivCanonicalizer.h index f5387f3..76e1bd3 100644 --- a/compiler/moco-tf/src/Canonicalization/RealDivCanonicalizer.h +++ b/compiler/moco-tf/src/Canonicalization/RealDivCanonicalizer.h @@ -19,7 +19,8 @@ #include "Transform.h" #include "SimpleNodeTransform.h" -#include "Dialect/TFNodes.h" + +#include #include @@ -31,13 +32,13 @@ namespace tf /** * @brief Convert TFRealDiv to Canonical EltwiseDiv */ -class RealDivCanonicalizer : public SimpleNodeTransform +class RealDivCanonicalizer : public SimpleNodeTransform { public: const char *name(void) const final { return "RealDivCanonicalizer"; } public: - bool transform(TFRealDiv *) const final; + bool transform(moco::TFRealDiv *) const final; }; } // namespace tf diff --git a/compiler/moco-tf/src/Canonicalization/Relu6Canonicalizer.cpp b/compiler/moco-tf/src/Canonicalization/Relu6Canonicalizer.cpp index fcd60c9..c53a880 100644 --- a/compiler/moco-tf/src/Canonicalization/Relu6Canonicalizer.cpp +++ b/compiler/moco-tf/src/Canonicalization/Relu6Canonicalizer.cpp @@ -16,17 +16,14 @@ #include "Relu6Canonicalizer.h" -#include "Dialect/TFDialect.h" -#include "Dialect/TFNodes.h" -#include "Dialect/TFNodeVisitor.h" -#include "Dialect/TFNodeImpl.h" +#include #include namespace { -bool canonicalize_relu6(loco::Graph *graph, moco::tf::TFRelu6 *node) +bool canonicalize_relu6(loco::Graph *graph, moco::TFRelu6 *node) { /** * @note This will replace TFRelu6 node with Canonical ReLU6 diff --git a/compiler/moco-tf/src/Canonicalization/Relu6Canonicalizer.h b/compiler/moco-tf/src/Canonicalization/Relu6Canonicalizer.h index 54c40d8..d8ad5db 100644 --- a/compiler/moco-tf/src/Canonicalization/Relu6Canonicalizer.h +++ b/compiler/moco-tf/src/Canonicalization/Relu6Canonicalizer.h @@ -19,7 +19,8 @@ #include "Transform.h" #include "SimpleNodeTransform.h" -#include "Dialect/TFNodes.h" + +#include #include @@ -31,13 +32,13 @@ namespace tf /** * @brief Convert TFRelu6 to Canonical ReLU6 */ -class Relu6Canonicalizer : public SimpleNodeTransform +class Relu6Canonicalizer : public SimpleNodeTransform { public: const char *name(void) const final { return "Relu6Canonicalizer"; } public: - bool transform(TFRelu6 *) const final; + bool transform(moco::TFRelu6 *) const final; }; } // namespace tf diff --git a/compiler/moco-tf/src/Canonicalization/ReluCanonicalizer.cpp b/compiler/moco-tf/src/Canonicalization/ReluCanonicalizer.cpp index 47c2d73..7965dc9 100644 --- a/compiler/moco-tf/src/Canonicalization/ReluCanonicalizer.cpp +++ b/compiler/moco-tf/src/Canonicalization/ReluCanonicalizer.cpp @@ -16,17 +16,14 @@ #include "ReluCanonicalizer.h" -#include "Dialect/TFDialect.h" -#include "Dialect/TFNodes.h" -#include "Dialect/TFNodeVisitor.h" -#include "Dialect/TFNodeImpl.h" +#include #include namespace { -bool canonicalize_relu(loco::Graph *graph, moco::tf::TFRelu *node) +bool canonicalize_relu(loco::Graph *graph, moco::TFRelu *node) { /** * @note This will replace TFRelu node with Canonical ReLU diff --git a/compiler/moco-tf/src/Canonicalization/ReluCanonicalizer.h b/compiler/moco-tf/src/Canonicalization/ReluCanonicalizer.h index c26820f..e27abe1 100644 --- a/compiler/moco-tf/src/Canonicalization/ReluCanonicalizer.h +++ b/compiler/moco-tf/src/Canonicalization/ReluCanonicalizer.h @@ -19,7 +19,8 @@ #include "Transform.h" #include "SimpleNodeTransform.h" -#include "Dialect/TFNodes.h" + +#include #include @@ -31,13 +32,13 @@ namespace tf /** * @brief Convert TFRelu to Canonical ReLU */ -class ReluCanonicalizer : public SimpleNodeTransform +class ReluCanonicalizer : public SimpleNodeTransform { public: const char *name(void) const final { return "ReluCanonicalizer"; } public: - bool transform(TFRelu *) const final; + bool transform(moco::TFRelu *) const final; }; } // namespace tf diff --git a/compiler/moco-tf/src/Canonicalization/ReshapeCanonicalizer.cpp b/compiler/moco-tf/src/Canonicalization/ReshapeCanonicalizer.cpp index 2449cb9..3fa6aae 100644 --- a/compiler/moco-tf/src/Canonicalization/ReshapeCanonicalizer.cpp +++ b/compiler/moco-tf/src/Canonicalization/ReshapeCanonicalizer.cpp @@ -16,8 +16,7 @@ #include "ReshapeCanonicalizer.h" -#include "Dialect/TFDialect.h" -#include "Dialect/TFNodeImpl.h" +#include #include #include @@ -31,7 +30,7 @@ using plier::tf::DataLayout; /** * @brief Check whether given 'new shape' arg is a fixed shape input for Reshape * - * ConstNode can be moco::tf::TFConst or loco::ConstGen + * ConstNode can be moco::TFConst or loco::ConstGen */ template bool is_fixed_shape_input(ConstNode *const_shape_input) { @@ -60,7 +59,7 @@ template bool is_fixed_shape_input(ConstNode *const_shape_i } /// @note Currently only supports to canonicalize Fixed Reshape -bool canonicalize_reshape(loco::Graph *graph, moco::tf::TFReshape *node) +bool canonicalize_reshape(loco::Graph *graph, moco::TFReshape *node) { LOGGER(l); INFO(l) << "TFNodeCanonicalize TFReshape begin"; @@ -99,7 +98,7 @@ bool canonicalize_reshape(loco::Graph *graph, moco::tf::TFReshape *node) // Supports 2 cases for Reshape's shape input: // TF-dialect TFConst or Canonical ConstGen loco::Node *shape_input = node->shape(); - auto tfconst_shape_input = dynamic_cast(shape_input); + auto tfconst_shape_input = dynamic_cast(shape_input); auto constgen_shape_input = dynamic_cast(shape_input); if (tfconst_shape_input) diff --git a/compiler/moco-tf/src/Canonicalization/ReshapeCanonicalizer.h b/compiler/moco-tf/src/Canonicalization/ReshapeCanonicalizer.h index 3d6635b..1a79202 100644 --- a/compiler/moco-tf/src/Canonicalization/ReshapeCanonicalizer.h +++ b/compiler/moco-tf/src/Canonicalization/ReshapeCanonicalizer.h @@ -19,7 +19,8 @@ #include "Transform.h" #include "SimpleNodeTransform.h" -#include "Dialect/TFNodes.h" + +#include #include @@ -31,13 +32,13 @@ namespace tf /** * @brief Convert TFReshape to Canonical Reshape */ -class ReshapeCanonicalizer : public SimpleNodeTransform +class ReshapeCanonicalizer : public SimpleNodeTransform { public: const char *name(void) const final { return "ReshapeCanonicalizer"; } public: - bool transform(TFReshape *) const final; + bool transform(moco::TFReshape *) const final; }; } // namespace tf diff --git a/compiler/moco-tf/src/Canonicalization/RsqrtCanonicalizer.cpp b/compiler/moco-tf/src/Canonicalization/RsqrtCanonicalizer.cpp index 5519069..740d087 100644 --- a/compiler/moco-tf/src/Canonicalization/RsqrtCanonicalizer.cpp +++ b/compiler/moco-tf/src/Canonicalization/RsqrtCanonicalizer.cpp @@ -17,10 +17,7 @@ #include "RsqrtCanonicalizer.h" #include "TFShapeInferenceHelper.h" -#include "Dialect/TFDialect.h" -#include "Dialect/TFNodes.h" -#include "Dialect/TFNodeVisitor.h" -#include "Dialect/TFNodeImpl.h" +#include #include @@ -68,7 +65,7 @@ void prepare_const_gen(loco::ConstGen *const_node, const loco::TensorShap } } -bool canonicalize_rsqrt(loco::Graph *graph, moco::tf::TFRsqrt *node) +bool canonicalize_rsqrt(loco::Graph *graph, moco::TFRsqrt *node) { /** * @note This will replace TFRsqrt node with Canonical EltwiseSqrt + EltwiseRealDiv diff --git a/compiler/moco-tf/src/Canonicalization/RsqrtCanonicalizer.h b/compiler/moco-tf/src/Canonicalization/RsqrtCanonicalizer.h index f90e510..7fd4ff6 100644 --- a/compiler/moco-tf/src/Canonicalization/RsqrtCanonicalizer.h +++ b/compiler/moco-tf/src/Canonicalization/RsqrtCanonicalizer.h @@ -19,7 +19,8 @@ #include "Transform.h" #include "SimpleNodeTransform.h" -#include "Dialect/TFNodes.h" + +#include #include @@ -31,13 +32,13 @@ namespace tf /** * @brief Convert TFRsqrt to Canonical EltwiseDiv + EltwiseSqrt */ -class RsqrtCanonicalizer : public SimpleNodeTransform +class RsqrtCanonicalizer : public SimpleNodeTransform { public: const char *name(void) const final { return "RsqrtCanonicalizer"; } public: - bool transform(TFRsqrt *) const final; + bool transform(moco::TFRsqrt *) const final; }; } // namespace tf diff --git a/compiler/moco-tf/src/Canonicalization/SoftmaxCanonicalizer.cpp b/compiler/moco-tf/src/Canonicalization/SoftmaxCanonicalizer.cpp index 7175768..1db4b9a 100644 --- a/compiler/moco-tf/src/Canonicalization/SoftmaxCanonicalizer.cpp +++ b/compiler/moco-tf/src/Canonicalization/SoftmaxCanonicalizer.cpp @@ -17,17 +17,14 @@ #include "SoftmaxCanonicalizer.h" #include "TFShapeInferenceHelper.h" -#include "Dialect/TFDialect.h" -#include "Dialect/TFNodes.h" -#include "Dialect/TFNodeVisitor.h" -#include "Dialect/TFNodeImpl.h" +#include #include namespace { -bool canonicalize_softmax(loco::Graph *graph, moco::tf::TFSoftmax *node) +bool canonicalize_softmax(loco::Graph *graph, moco::TFSoftmax *node) { LOGGER(l); diff --git a/compiler/moco-tf/src/Canonicalization/SoftmaxCanonicalizer.h b/compiler/moco-tf/src/Canonicalization/SoftmaxCanonicalizer.h index f774e85..ebaf04c 100644 --- a/compiler/moco-tf/src/Canonicalization/SoftmaxCanonicalizer.h +++ b/compiler/moco-tf/src/Canonicalization/SoftmaxCanonicalizer.h @@ -19,7 +19,8 @@ #include "Transform.h" #include "SimpleNodeTransform.h" -#include "Dialect/TFNodes.h" + +#include #include @@ -31,13 +32,13 @@ namespace tf /** * @brief Canonicalize TF-dialect TFSoftmax into canonical Softmax node */ -class SoftmaxCanonicalizer : public SimpleNodeTransform +class SoftmaxCanonicalizer : public SimpleNodeTransform { public: const char *name(void) const final { return "SoftmaxCanonicalizer"; } public: - bool transform(TFSoftmax *) const final; + bool transform(moco::TFSoftmax *) const final; }; } // namespace tf diff --git a/compiler/moco-tf/src/Canonicalization/SqrtCanonicalizer.cpp b/compiler/moco-tf/src/Canonicalization/SqrtCanonicalizer.cpp index e517445..89b9b8a 100644 --- a/compiler/moco-tf/src/Canonicalization/SqrtCanonicalizer.cpp +++ b/compiler/moco-tf/src/Canonicalization/SqrtCanonicalizer.cpp @@ -16,15 +16,12 @@ #include "SqrtCanonicalizer.h" -#include "Dialect/TFDialect.h" -#include "Dialect/TFNodes.h" -#include "Dialect/TFNodeVisitor.h" -#include "Dialect/TFNodeImpl.h" +#include namespace { -bool canonicalize_sqrt(loco::Graph *graph, moco::tf::TFSqrt *node) +bool canonicalize_sqrt(loco::Graph *graph, moco::TFSqrt *node) { /** * @note This will replace TFSqrt node with Canonical EltwiseSqrt diff --git a/compiler/moco-tf/src/Canonicalization/SqrtCanonicalizer.h b/compiler/moco-tf/src/Canonicalization/SqrtCanonicalizer.h index 4a92011..3f7ffea 100644 --- a/compiler/moco-tf/src/Canonicalization/SqrtCanonicalizer.h +++ b/compiler/moco-tf/src/Canonicalization/SqrtCanonicalizer.h @@ -19,7 +19,8 @@ #include "Transform.h" #include "SimpleNodeTransform.h" -#include "Dialect/TFNodes.h" + +#include #include @@ -31,13 +32,13 @@ namespace tf /** * @brief Convert TFsqrt to Canonical EltwiseSqrt */ -class SqrtCanonicalizer : public SimpleNodeTransform +class SqrtCanonicalizer : public SimpleNodeTransform { public: const char *name(void) const final { return "SqrtCanonicalizer"; } public: - bool transform(TFSqrt *) const final; + bool transform(moco::TFSqrt *) const final; }; } // namespace tf diff --git a/compiler/moco-tf/src/Canonicalization/SqueezeCanonicalizer.cpp b/compiler/moco-tf/src/Canonicalization/SqueezeCanonicalizer.cpp index c342866..7756985 100644 --- a/compiler/moco-tf/src/Canonicalization/SqueezeCanonicalizer.cpp +++ b/compiler/moco-tf/src/Canonicalization/SqueezeCanonicalizer.cpp @@ -17,17 +17,14 @@ #include "SqueezeCanonicalizer.h" #include "TFShapeInferenceHelper.h" -#include "Dialect/TFDialect.h" -#include "Dialect/TFNodes.h" -#include "Dialect/TFNodeVisitor.h" -#include "Dialect/TFNodeImpl.h" +#include #include namespace { -bool canonicalize_squeeze_to_reshape(loco::Graph *graph, moco::tf::TFSqueeze *node) +bool canonicalize_squeeze_to_reshape(loco::Graph *graph, moco::TFSqueeze *node) { LOGGER(l); diff --git a/compiler/moco-tf/src/Canonicalization/SqueezeCanonicalizer.h b/compiler/moco-tf/src/Canonicalization/SqueezeCanonicalizer.h index f62b92c..28a1442 100644 --- a/compiler/moco-tf/src/Canonicalization/SqueezeCanonicalizer.h +++ b/compiler/moco-tf/src/Canonicalization/SqueezeCanonicalizer.h @@ -19,7 +19,8 @@ #include "Transform.h" #include "SimpleNodeTransform.h" -#include "Dialect/TFNodes.h" + +#include #include @@ -33,13 +34,13 @@ namespace tf * * @note There is no canonical Squeeze node */ -class SqueezeCanonicalizer : public SimpleNodeTransform +class SqueezeCanonicalizer : public SimpleNodeTransform { public: const char *name(void) const final { return "SqueezeCanonicalizer"; } public: - bool transform(TFSqueeze *) const final; + bool transform(moco::TFSqueeze *) const final; }; } // namespace tf diff --git a/compiler/moco-tf/src/Canonicalization/StopGradientCanonicalizer.cpp b/compiler/moco-tf/src/Canonicalization/StopGradientCanonicalizer.cpp index 652e23b..574fa39 100644 --- a/compiler/moco-tf/src/Canonicalization/StopGradientCanonicalizer.cpp +++ b/compiler/moco-tf/src/Canonicalization/StopGradientCanonicalizer.cpp @@ -16,17 +16,14 @@ #include "StopGradientCanonicalizer.h" -#include "Dialect/TFDialect.h" -#include "Dialect/TFNodes.h" -#include "Dialect/TFNodeVisitor.h" -#include "Dialect/TFNodeImpl.h" +#include #include namespace { -bool canonicalize_stopgradient(loco::Graph *graph, moco::tf::TFStopGradient *node) +bool canonicalize_stopgradient(loco::Graph *graph, moco::TFStopGradient *node) { LOGGER(l); diff --git a/compiler/moco-tf/src/Canonicalization/StopGradientCanonicalizer.h b/compiler/moco-tf/src/Canonicalization/StopGradientCanonicalizer.h index faf9e39..6a17728 100644 --- a/compiler/moco-tf/src/Canonicalization/StopGradientCanonicalizer.h +++ b/compiler/moco-tf/src/Canonicalization/StopGradientCanonicalizer.h @@ -19,7 +19,8 @@ #include "Transform.h" #include "SimpleNodeTransform.h" -#include "Dialect/TFNodes.h" + +#include #include @@ -31,13 +32,13 @@ namespace tf /** * @brief Canonicalize TF-dialect TFStopGradient into canonical Forward node */ -class StopGradientCanonicalizer : public SimpleNodeTransform +class StopGradientCanonicalizer : public SimpleNodeTransform { public: const char *name(void) const final { return "StopGradientCanonicalizer"; } public: - bool transform(TFStopGradient *) const final; + bool transform(moco::TFStopGradient *) const final; }; } // namespace tf diff --git a/compiler/moco-tf/src/Canonicalization/SubCanonicalizer.cpp b/compiler/moco-tf/src/Canonicalization/SubCanonicalizer.cpp index dcf9bf5..c518b7d 100644 --- a/compiler/moco-tf/src/Canonicalization/SubCanonicalizer.cpp +++ b/compiler/moco-tf/src/Canonicalization/SubCanonicalizer.cpp @@ -16,8 +16,7 @@ #include "SubCanonicalizer.h" -#include "Dialect/TFDialect.h" -#include "Dialect/TFNodes.h" +#include #include "TFEltwiseBinaryCanonicalzeHelper.h" @@ -26,7 +25,7 @@ namespace moco namespace tf { -bool SubCanonicalizer::transform(TFSub *node) const +bool SubCanonicalizer::transform(moco::TFSub *node) const { return canonicalize_eltwise_binary_node(node); } diff --git a/compiler/moco-tf/src/Canonicalization/SubCanonicalizer.h b/compiler/moco-tf/src/Canonicalization/SubCanonicalizer.h index 6ca798a..f715cc8 100644 --- a/compiler/moco-tf/src/Canonicalization/SubCanonicalizer.h +++ b/compiler/moco-tf/src/Canonicalization/SubCanonicalizer.h @@ -19,7 +19,8 @@ #include "Transform.h" #include "SimpleNodeTransform.h" -#include "Dialect/TFNodes.h" + +#include #include @@ -31,13 +32,13 @@ namespace tf /** * @brief Convert TFSub to Canonical EltwiseSub */ -class SubCanonicalizer : public SimpleNodeTransform +class SubCanonicalizer : public SimpleNodeTransform { public: const char *name(void) const final { return "SubCanonicalizer"; } public: - bool transform(TFSub *) const final; + bool transform(moco::TFSub *) const final; }; } // namespace tf diff --git a/compiler/moco-tf/src/Canonicalization/TanhCanonicalizer.cpp b/compiler/moco-tf/src/Canonicalization/TanhCanonicalizer.cpp index eb29830..3f48a50f 100644 --- a/compiler/moco-tf/src/Canonicalization/TanhCanonicalizer.cpp +++ b/compiler/moco-tf/src/Canonicalization/TanhCanonicalizer.cpp @@ -16,17 +16,14 @@ #include "TanhCanonicalizer.h" -#include "Dialect/TFDialect.h" -#include "Dialect/TFNodes.h" -#include "Dialect/TFNodeVisitor.h" -#include "Dialect/TFNodeImpl.h" +#include #include namespace { -bool canonicalize_tanh(loco::Graph *graph, moco::tf::TFTanh *node) +bool canonicalize_tanh(loco::Graph *graph, moco::TFTanh *node) { /** * @note This will replace TFTanh node with Canonical Tanh diff --git a/compiler/moco-tf/src/Canonicalization/TanhCanonicalizer.h b/compiler/moco-tf/src/Canonicalization/TanhCanonicalizer.h index 248c0dc..af5e79f 100644 --- a/compiler/moco-tf/src/Canonicalization/TanhCanonicalizer.h +++ b/compiler/moco-tf/src/Canonicalization/TanhCanonicalizer.h @@ -19,7 +19,8 @@ #include "Transform.h" #include "SimpleNodeTransform.h" -#include "Dialect/TFNodes.h" + +#include #include @@ -31,13 +32,13 @@ namespace tf /** * @brief Convert TFTanh to Canonical Tanh */ -class TanhCanonicalizer : public SimpleNodeTransform +class TanhCanonicalizer : public SimpleNodeTransform { public: const char *name(void) const final { return "TanhCanonicalizer"; } public: - bool transform(TFTanh *) const override; + bool transform(moco::TFTanh *) const override; }; } // namespace tf diff --git a/compiler/moco-tf/src/Canonicalizer.cpp b/compiler/moco-tf/src/Canonicalizer.cpp index 700b7e2..5dc400b 100644 --- a/compiler/moco-tf/src/Canonicalizer.cpp +++ b/compiler/moco-tf/src/Canonicalizer.cpp @@ -48,8 +48,8 @@ #include "Canonicalization/SubCanonicalizer.h" #include "Canonicalization/TanhCanonicalizer.h" -#include "Dialect/TFDialect.h" -#include "Dialect/TFNodes.h" +#include +#include #include @@ -68,7 +68,7 @@ bool has_tf_nodes(loco::Graph *g) auto active_nodes = loco::active_nodes(loco::output_nodes(g)); for (auto node : active_nodes) { - if (node->dialect() == moco::tf::TFDialect::get()) + if (node->dialect() == moco::TFDialect::get()) { return true; } diff --git a/compiler/moco-tf/src/Transforms/ShapeInferencePass.cpp b/compiler/moco-tf/src/Transforms/ShapeInferencePass.cpp index de8a21b..64ba9df 100644 --- a/compiler/moco-tf/src/Transforms/ShapeInferencePass.cpp +++ b/compiler/moco-tf/src/Transforms/ShapeInferencePass.cpp @@ -16,7 +16,7 @@ #include "ShapeInferencePass.h" -#include "Dialect/TFDialect.h" +#include #include diff --git a/compiler/moco-tf/src/Transforms/TypeInferencePass.cpp b/compiler/moco-tf/src/Transforms/TypeInferencePass.cpp index 92bfd6d..db6cf75 100644 --- a/compiler/moco-tf/src/Transforms/TypeInferencePass.cpp +++ b/compiler/moco-tf/src/Transforms/TypeInferencePass.cpp @@ -16,7 +16,7 @@ #include "TypeInferencePass.h" -#include "Dialect/TFDialect.h" +#include #include