[moco] Let Support use Lang (#8462)

This will update Support to use Lang target
- delete  migrated TFDataLayout and TFPadding
- use TFDataLayout and TFPadding from Lang
- update cmake build order

Signed-off-by: SaeHie Park <saehie.park@samsung.com>

diff --git a/compiler/moco/CMakeLists.txt b/compiler/moco/CMakeLists.txt
index e34c1f9..41c9304 100644 (file)
--- a/compiler/moco/CMakeLists.txt
+++ b/compiler/moco/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_subdirectory(support)
 add_subdirectory(lang)
+add_subdirectory(support)
 add_subdirectory(service)
 add_subdirectory(import)

diff --git a/compiler/moco/support/CMakeLists.txt b/compiler/moco/support/CMakeLists.txt
index 43e7236..d0cac86 100644 (file)
--- a/compiler/moco/support/CMakeLists.txt
+++ b/compiler/moco/support/CMakeLists.txt
@@ -4,4 +4,5 @@ add_library(moco_support SHARED ${SOURCES})
 target_include_directories(moco_support PRIVATE src)
 target_include_directories(moco_support PUBLIC include)
 target_link_libraries(moco_support PUBLIC loco)
+target_link_libraries(moco_support PUBLIC moco_lang)
 install(TARGETS moco_support DESTINATION lib)

diff --git a/compiler/moco/support/include/moco/Support/TFDataLayout.h b/compiler/moco/support/include/moco/Support/TFDataLayout.h
deleted file mode 100644 (file)
index 02da557..0000000
--- a/compiler/moco/support/include/moco/Support/TFDataLayout.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (c) 2019 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed 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.
- */
-
-#ifndef __MOCO_SUPPORT_TFDATALAYOUT_H__
-#define __MOCO_SUPPORT_TFDATALAYOUT_H__
-
-#include <string>
-
-namespace moco
-{
-
-using TFDataLayout = std::string;
-
-} // namespace moco
-
-#endif // __MOCO_SUPPORT_TFDATALAYOUT_H__

diff --git a/compiler/moco/support/include/moco/Support/TFPadding.h b/compiler/moco/support/include/moco/Support/TFPadding.h
deleted file mode 100644 (file)
index bbded2c..0000000
--- a/compiler/moco/support/include/moco/Support/TFPadding.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (c) 2019 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed 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.
- */
-
-#ifndef __MOCO_SUPPORT_TFPADDING_H__
-#define __MOCO_SUPPORT_TFPADDING_H__
-
-#include <string>
-
-namespace moco
-{
-
-using TFPadding = std::string;
-
-} // namespace moco
-
-#endif // __MOCO_SUPPORT_TFPADDING_H__

diff --git a/compiler/moco/support/include/moco/Support/TFShapeInferenceHelper.h b/compiler/moco/support/include/moco/Support/TFShapeInferenceHelper.h
index 3d574a5..5232470 100644 (file)
--- a/compiler/moco/support/include/moco/Support/TFShapeInferenceHelper.h
+++ b/compiler/moco/support/include/moco/Support/TFShapeInferenceHelper.h
@@ -17,8 +17,8 @@
 #ifndef __MOCO_SUPPORT_SHAPE_INFERENCE_HELPER_H__
 #define __MOCO_SUPPORT_SHAPE_INFERENCE_HELPER_H__
 
-#include "moco/Support/TFDataLayout.h"
-#include "moco/Support/TFPadding.h"
+#include <moco/IR/TFDataLayout.h>
+#include <moco/IR/TFPadding.h>
 
 #include <loco.h>
 #include <loco/IR/NodeShape.h>