aboutsummaryrefslogtreecommitdiff
path: root/arm_compute
diff options
context:
space:
mode:
authorGeorgios Pinitas <georgios.pinitas@arm.com>2018-11-05 12:16:15 +0000
committerAnthony Barbier <Anthony.barbier@arm.com>2018-11-09 09:04:32 +0000
commit54c92fde9ec2fc7526331fc3bed79ccfe50ac85d (patch)
tree330383c3f252c3d61d9058f286c195b447675d70 /arm_compute
parentcfcc41ca30ebf0239af731ca8a3e3749947a5fb1 (diff)
downloadComputeLibrary-54c92fde9ec2fc7526331fc3bed79ccfe50ac85d.tar.gz
COMPMID-1451: Remove unused code.
Change-Id: If5be77602e37b14aea63d7ec6d8adab324628f04
Diffstat (limited to 'arm_compute')
-rw-r--r--arm_compute/core/utils/misc/Signal.h99
-rw-r--r--arm_compute/core/utils/strong_type/StrongType.h77
-rw-r--r--arm_compute/core/utils/strong_type/StrongTypeAttributes.h66
-rw-r--r--arm_compute/graph/Types.h8
4 files changed, 1 insertions, 249 deletions
diff --git a/arm_compute/core/utils/misc/Signal.h b/arm_compute/core/utils/misc/Signal.h
deleted file mode 100644
index 71f13951b9..0000000000
--- a/arm_compute/core/utils/misc/Signal.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright (c) 2018 ARM Limited.
- *
- * SPDX-License-Identifier: MIT
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to
- * deal in the Software without restriction, including without limitation the
- * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
- * sell copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-#ifndef __ARM_COMPUTE_MISC_SIGNAL_H__
-#define __ARM_COMPUTE_MISC_SIGNAL_H__
-
-#include <functional>
-
-namespace arm_compute
-{
-namespace utils
-{
-namespace signal
-{
-namespace detail
-{
-/** Base signal class */
-template <typename SignalType>
-class SignalImpl;
-
-/** Signal class function specialization */
-template <typename ReturnType, typename... Args>
-class SignalImpl<ReturnType(Args...)>
-{
-public:
- using Callback = std::function<ReturnType(Args...)>;
-
-public:
- /** Default Constructor */
- SignalImpl() = default;
-
- /** Connects signal
- *
- * @param[in] cb Callback to connect the signal with
- */
- void connect(const Callback &cb)
- {
- _cb = cb;
- }
-
- /** Disconnects the signal */
- void disconnect()
- {
- _cb = nullptr;
- }
-
- /** Checks if the signal is connected
- *
- * @return True if there is a connection else false
- */
- bool connected() const
- {
- return (_cb != nullptr);
- }
-
- /** Calls the connected callback
- *
- * @param[in] args Callback arguments
- */
- void operator()(Args &&... args)
- {
- if(_cb)
- {
- _cb(std::forward<Args>(args)...);
- }
- }
-
-private:
- Callback _cb{}; /**< Signal callback */
-};
-} // namespace detail
-
-/** Signal alias */
-template <class T>
-using Signal = detail::SignalImpl<T>;
-} // namespace signal
-} // namespace utils
-} // namespace arm_compute
-#endif /* __ARM_COMPUTE_MISC_SIGNAL_H__ */
diff --git a/arm_compute/core/utils/strong_type/StrongType.h b/arm_compute/core/utils/strong_type/StrongType.h
deleted file mode 100644
index 5a38edbbd6..0000000000
--- a/arm_compute/core/utils/strong_type/StrongType.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright (c) 2018 ARM Limited.
- *
- * SPDX-License-Identifier: MIT
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to
- * deal in the Software without restriction, including without limitation the
- * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
- * sell copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-#ifndef __ARM_COMPUTE_STRONG_TYPE_STRONG_TYPE_H__
-#define __ARM_COMPUTE_STRONG_TYPE_STRONG_TYPE_H__
-
-#include <type_traits>
-
-namespace arm_compute
-{
-namespace strong_type
-{
-/** Strong type
- *
- * @tparam T Exact type of the Strong Type
- * @tparam Tag Tag used to distinguish between types with same T
- * @tparam Attributes Attributes of the Strong Type
- */
-template <typename T, typename Tag, template <typename> class... Attributes>
-class StrongType : public Attributes<StrongType<T, Tag, Attributes...>>...
-{
-public:
- /** Exact underlying type **/
- using ExactType = T;
-
-public:
- /** Default Constructor
- *
- * @param[in] val Initialization value
- */
- StrongType(T val)
- : _val(val)
- {
- }
- /** Accessor of the value of the exact type
- *
- * @return Exact type value
- */
- T &get()
- {
- return _val;
- }
- /** Accessor of the value of the exact type
- *
- * @return Exact type value
- */
- const T &get() const
- {
- return _val;
- }
-
-private:
- T _val = {};
-};
-} // namespace strong_type
-} // namespace arm_compute
-#endif /* __ARM_COMPUTE_STRONG_TYPE_STRONG_TYPE_H__ */
diff --git a/arm_compute/core/utils/strong_type/StrongTypeAttributes.h b/arm_compute/core/utils/strong_type/StrongTypeAttributes.h
deleted file mode 100644
index 78a4032da7..0000000000
--- a/arm_compute/core/utils/strong_type/StrongTypeAttributes.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (c) 2018 ARM Limited.
- *
- * SPDX-License-Identifier: MIT
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to
- * deal in the Software without restriction, including without limitation the
- * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
- * sell copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-#ifndef __ARM_COMPUTE_STRONG_TYPE_STRONG_TYPE_ATTRIBUTES_H__
-#define __ARM_COMPUTE_STRONG_TYPE_STRONG_TYPE_ATTRIBUTES_H__
-
-#include "arm_compute/core/utils/misc/CRTP.h"
-
-namespace arm_compute
-{
-namespace strong_type
-{
-/** Comparable attribute */
-template <typename T>
-struct Comparable : misc::CRTP<T, Comparable>
-{
-#ifndef DOXYGEN_SKIP_THIS
- bool operator==(T const &other) const
- {
- return this->impl().get() == other.get();
- }
- bool operator!=(T const &other) const
- {
- return !(*this == other);
- }
- bool operator>(T const &other) const
- {
- return this->impl().get() > other.get();
- }
- bool operator<(T const &other) const
- {
- return this->impl().get() < other.get();
- }
- bool operator>=(T const &other) const
- {
- return !(*this < other);
- }
- bool operator<=(T const &other) const
- {
- return !(*this > other);
- }
-#endif /* DOXYGEN_SKIP_THIS */
-};
-} // namespace strong_type
-} // namespace arm_compute
-#endif /* __ARM_COMPUTE_STRONG_TYPE_STRONG_TYPE_ATTRIBUTES_H__ */
diff --git a/arm_compute/graph/Types.h b/arm_compute/graph/Types.h
index 005b4074c6..b9589b753c 100644
--- a/arm_compute/graph/Types.h
+++ b/arm_compute/graph/Types.h
@@ -26,8 +26,6 @@
#include "arm_compute/core/Error.h"
#include "arm_compute/core/Types.h"
-#include "arm_compute/core/utils/strong_type/StrongType.h"
-#include "arm_compute/core/utils/strong_type/StrongTypeAttributes.h"
#include <limits>
#include <string>
@@ -56,16 +54,12 @@ using arm_compute::PoolingType;
using arm_compute::DimensionRoundingType;
using arm_compute::InterpolationPolicy;
-/** TODO (geopin01): Make ids strongly typed */
+using GraphID = unsigned int;
using TensorID = unsigned int;
using NodeID = unsigned int;
using EdgeID = unsigned int;
using Activation = arm_compute::ActivationLayerInfo::ActivationFunction;
-/**< GraphID strong type */
-using GraphID = strong_type::StrongType<unsigned int, struct graph_id_t, strong_type::Comparable>;
-/* TODO (geopin01): Strong types for NodeID */
-
/**< Constant TensorID specifying an equivalent of null tensor */
constexpr TensorID NullTensorID = std::numeric_limits<TensorID>::max();
/**< Constant NodeID specifying an equivalent of null node */