diff options
Diffstat (limited to 'arm_compute/graph')
-rw-r--r-- | arm_compute/graph/Graph.h | 7 | ||||
-rw-r--r-- | arm_compute/graph/Types.h | 2 | ||||
-rw-r--r-- | arm_compute/graph/detail/CrossLayerMemoryManagerHelpers.h | 4 | ||||
-rw-r--r-- | arm_compute/graph/detail/ExecutionHelpers.h | 4 |
4 files changed, 10 insertions, 7 deletions
diff --git a/arm_compute/graph/Graph.h b/arm_compute/graph/Graph.h index 878976f0af..92507e74e9 100644 --- a/arm_compute/graph/Graph.h +++ b/arm_compute/graph/Graph.h @@ -35,10 +35,13 @@ #include <map> #include <memory> #include <string> -#include <thread> #include <utility> #include <vector> +#ifndef BARE_METAL +#include <thread> +#endif /* BARE_METAL */ + namespace arm_compute { namespace graph @@ -231,7 +234,7 @@ private: template <typename NT, typename... Ts> inline NodeID Graph::add_node(Ts &&... args) { - std::lock_guard<arm_compute::Mutex> lock(_mtx); + arm_compute::lock_guard<arm_compute::Mutex> lock(_mtx); // Create node NodeID nid = _nodes.size(); diff --git a/arm_compute/graph/Types.h b/arm_compute/graph/Types.h index 63b1c94ac8..5b82f93686 100644 --- a/arm_compute/graph/Types.h +++ b/arm_compute/graph/Types.h @@ -73,7 +73,7 @@ constexpr NodeID EmptyNodeID = std::numeric_limits<NodeID>::max(); constexpr EdgeID EmptyEdgeID = std::numeric_limits<EdgeID>::max(); // Forward declarations -class TensorDescriptor; +struct TensorDescriptor; /** Graph configuration structure */ struct GraphConfig { diff --git a/arm_compute/graph/detail/CrossLayerMemoryManagerHelpers.h b/arm_compute/graph/detail/CrossLayerMemoryManagerHelpers.h index b7424c8e88..da17806011 100644 --- a/arm_compute/graph/detail/CrossLayerMemoryManagerHelpers.h +++ b/arm_compute/graph/detail/CrossLayerMemoryManagerHelpers.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 ARM Limited. + * Copyright (c) 2018-2019 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -33,7 +33,7 @@ namespace graph // Forward declarations class Graph; class GraphContext; -class ExecutionWorkload; +struct ExecutionWorkload; class ITransMemoryManager; class ITensorHandle; diff --git a/arm_compute/graph/detail/ExecutionHelpers.h b/arm_compute/graph/detail/ExecutionHelpers.h index fd8d082770..955e6d5e1e 100644 --- a/arm_compute/graph/detail/ExecutionHelpers.h +++ b/arm_compute/graph/detail/ExecutionHelpers.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 ARM Limited. + * Copyright (c) 2018-2019 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -33,7 +33,7 @@ namespace graph // Forward declarations class Graph; class GraphContext; -class ExecutionWorkload; +struct ExecutionWorkload; class Tensor; class INode; |