[rt/misc] Merge str.h into string_helper.h (#9257)

`str.h` was moved from another module and this commit merges it into
`string_helper.h`

Signed-off-by: Hanjoung Lee <hanjoung.lee@samsung.com>

diff --git a/runtime/contrib/xtrace/src/EventCollectingListener.cc b/runtime/contrib/xtrace/src/EventCollectingListener.cc
index 03c7ed9..7c29ac6 100644 (file)
--- a/runtime/contrib/xtrace/src/EventCollectingListener.cc
+++ b/runtime/contrib/xtrace/src/EventCollectingListener.cc
@@ -20,7 +20,7 @@
 #include <xdata.h>
 
 #include "benchmark_event.h"
-#include "misc/str.h"
+#include "misc/string_helpers.h"
 
 namespace
 {
@@ -61,11 +61,13 @@ void EventCollectingListener::notify(const xray::event *e)
   // Record benchmark events
   if (e->cat() == BMCategory::get())
   {
-    auto make_head = [](const BMPhase &phase, uint32_t iter) { return str(phase, " ", iter); };
+    auto make_head = [](const BMPhase &phase, uint32_t iter) {
+      return nnfw::misc::str(phase, " ", iter);
+    };
 
     if (auto info = dynamic_cast<const BMBegin *>(BMCategory::get()->event()))
     {
-      auto name = str(info->phase, info->cur_iter);
+      auto name = nnfw::misc::str(info->phase, info->cur_iter);
       _ec.onEvent({EventCollector::Edge::BEGIN, name});
 
       auto head = make_head(info->phase, info->cur_iter);
@@ -74,7 +76,7 @@ void EventCollectingListener::notify(const xray::event *e)
 
     if (auto info = dynamic_cast<const BMEnd *>(BMCategory::get()->event()))
     {
-      auto name = str(info->phase, info->cur_iter);
+      auto name = nnfw::misc::str(info->phase, info->cur_iter);
       _ec.onEvent({EventCollector::Edge::END, name});
 
       auto head = make_head(info->phase, info->cur_iter);

diff --git a/runtime/libs/misc/include/misc/str.h b/runtime/libs/misc/include/misc/str.h
deleted file mode 100644 (file)
index a6d53a5..0000000
--- a/runtime/libs/misc/include/misc/str.h
+++ /dev/null
@@ -1,38 +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 __STR_H__
-#define __STR_H__
-
-#include <ostream>
-#include <sstream>
-
-template <typename Arg> void _str(std::ostream &os, Arg &&arg) { os << std::forward<Arg>(arg); }
-
-template <typename Arg, typename... Args> void _str(std::ostream &os, Arg &&arg, Args &&... args)
-{
-  _str(os, std::forward<Arg>(arg));
-  _str(os, std::forward<Args>(args)...);
-}
-
-template <typename... Args> std::string str(Args &&... args)
-{
-  std::stringstream ss;
-  _str(ss, std::forward<Args>(args)...);
-  return ss.str();
-}
-
-#endif // __STR_H__

diff --git a/runtime/libs/misc/include/misc/string_helpers.h b/runtime/libs/misc/include/misc/string_helpers.h
index 57d0006..5bf5939 100644 (file)
--- a/runtime/libs/misc/include/misc/string_helpers.h
+++ b/runtime/libs/misc/include/misc/string_helpers.h
@@ -20,6 +20,7 @@
  * @brief This file contains helper functions for std::string
  */
 
+#include <ostream>
 #include <string>
 #include <sstream>
 #include <vector>
@@ -41,5 +42,20 @@ inline std::vector<std::string> split(const std::string &s, char delim)
   return elems;
 }
 
+template <typename Arg> void _str(std::ostream &os, Arg &&arg) { os << std::forward<Arg>(arg); }
+
+template <typename Arg, typename... Args> void _str(std::ostream &os, Arg &&arg, Args &&... args)
+{
+  _str(os, std::forward<Arg>(arg));
+  _str(os, std::forward<Args>(args)...);
+}
+
+template <typename... Args> std::string str(Args &&... args)
+{
+  std::stringstream ss;
+  _str(ss, std::forward<Args>(args)...);
+  return ss.str();
+}
+
 } // namespace misc
 } // namespace nnfw

diff --git a/runtime/libs/misc/src/EventCollector.cpp b/runtime/libs/misc/src/EventCollector.cpp
index f8ec96d..8a77100 100644 (file)
--- a/runtime/libs/misc/src/EventCollector.cpp
+++ b/runtime/libs/misc/src/EventCollector.cpp
@@ -16,9 +16,6 @@
 
 #include "misc/EventCollector.h"
 
-// xtrace-internal libraries
-#include "misc/str.h"
-
 // C++ standard libraries
 #include <chrono>