diff options
Diffstat (limited to 'src/armnn/test')
-rw-r--r-- | src/armnn/test/CreateWorkload.hpp | 1 | ||||
-rw-r--r-- | src/armnn/test/GraphTests.cpp | 4 | ||||
-rw-r--r-- | src/armnn/test/SubgraphViewTests.cpp | 15 | ||||
-rw-r--r-- | src/armnn/test/TensorHelpers.hpp | 1 | ||||
-rw-r--r-- | src/armnn/test/UnitTests.cpp | 3 |
5 files changed, 12 insertions, 12 deletions
diff --git a/src/armnn/test/CreateWorkload.hpp b/src/armnn/test/CreateWorkload.hpp index b13b9b538e..3f3cdc3986 100644 --- a/src/armnn/test/CreateWorkload.hpp +++ b/src/armnn/test/CreateWorkload.hpp @@ -19,7 +19,6 @@ #include <backendsCommon/CpuTensorHandle.hpp> #include <boost/test/unit_test.hpp> -#include <boost/cast.hpp> #include <utility> diff --git a/src/armnn/test/GraphTests.cpp b/src/armnn/test/GraphTests.cpp index 5a17c1c227..55a01fcc94 100644 --- a/src/armnn/test/GraphTests.cpp +++ b/src/armnn/test/GraphTests.cpp @@ -9,6 +9,7 @@ #include <armnn/TypesUtils.hpp> #include <armnn/Exceptions.hpp> +#include <armnn/utility/NumericCast.hpp> #include <armnn/utility/PolymorphicDowncast.hpp> #include <armnn/backends/IBackendInternal.hpp> @@ -16,7 +17,6 @@ #include <backendsCommon/CpuTensorHandle.hpp> #include <backendsCommon/TensorHandleFactoryRegistry.hpp> -#include <boost/cast.hpp> #include <boost/test/unit_test.hpp> BOOST_AUTO_TEST_SUITE(Graph) @@ -299,7 +299,7 @@ static void TestGraphAfterAddingCopyLayers(const armnn::Graph& graph, const armn if (origEdge.first->GetNameStr() == edge.first->GetNameStr() && origEdge.second->GetNameStr() == edge.second->GetNameStr()) { - originalEdge = boost::numeric_cast<int>(i); + originalEdge = armnn::numeric_cast<int>(i); } } diff --git a/src/armnn/test/SubgraphViewTests.cpp b/src/armnn/test/SubgraphViewTests.cpp index a9467fb062..a8cb797d17 100644 --- a/src/armnn/test/SubgraphViewTests.cpp +++ b/src/armnn/test/SubgraphViewTests.cpp @@ -4,11 +4,12 @@ // #include <boost/test/unit_test.hpp> - #include <Graph.hpp> #include <SubgraphView.hpp> #include <SubgraphViewSelector.hpp> +#include <armnn/utility/NumericCast.hpp> + #include <backendsCommon/CpuTensorHandle.hpp> #include <fstream> #include <map> @@ -1374,8 +1375,8 @@ BOOST_AUTO_TEST_CASE(SingleSubgraph) if (subgraphs[0].get() != nullptr) { - unsigned int numInputSlots = boost::numeric_cast<unsigned int>(subgraphs[0]->GetInputSlots().size()); - unsigned int numOutputSlots = boost::numeric_cast<unsigned int>(subgraphs[0]->GetOutputSlots().size()); + unsigned int numInputSlots = armnn::numeric_cast<unsigned int>(subgraphs[0]->GetInputSlots().size()); + unsigned int numOutputSlots = armnn::numeric_cast<unsigned int>(subgraphs[0]->GetOutputSlots().size()); BOOST_TEST((numInputSlots == 1)); BOOST_TEST((numOutputSlots == 1)); @@ -1456,11 +1457,11 @@ BOOST_AUTO_TEST_CASE(MultipleSubgraphs) } ); - unsigned int numInputSlots1 = boost::numeric_cast<unsigned int>(subgraphs[0]->GetInputSlots().size()); - unsigned int numOutputSlots1 = boost::numeric_cast<unsigned int>(subgraphs[0]->GetOutputSlots().size()); + unsigned int numInputSlots1 = armnn::numeric_cast<unsigned int>(subgraphs[0]->GetInputSlots().size()); + unsigned int numOutputSlots1 = armnn::numeric_cast<unsigned int>(subgraphs[0]->GetOutputSlots().size()); - unsigned int numInputSlots2 = boost::numeric_cast<unsigned int>(subgraphs[1]->GetInputSlots().size()); - unsigned int numOutputSlots2 = boost::numeric_cast<unsigned int>(subgraphs[1]->GetOutputSlots().size()); + unsigned int numInputSlots2 = armnn::numeric_cast<unsigned int>(subgraphs[1]->GetInputSlots().size()); + unsigned int numOutputSlots2 = armnn::numeric_cast<unsigned int>(subgraphs[1]->GetOutputSlots().size()); // Save sub-graph connections for comparison after substitution IOutputSlot* subgraph1InputConn = subgraphs[0]->GetInputSlot(0)->GetConnection(); diff --git a/src/armnn/test/TensorHelpers.hpp b/src/armnn/test/TensorHelpers.hpp index 45360350dd..d67cd5b979 100644 --- a/src/armnn/test/TensorHelpers.hpp +++ b/src/armnn/test/TensorHelpers.hpp @@ -10,7 +10,6 @@ #include <QuantizeHelper.hpp> #include <boost/multi_array.hpp> -#include <boost/numeric/conversion/cast.hpp> #include <boost/random/uniform_real_distribution.hpp> #include <boost/random/mersenne_twister.hpp> #include <boost/test/tools/floating_point_comparison.hpp> diff --git a/src/armnn/test/UnitTests.cpp b/src/armnn/test/UnitTests.cpp index 032a49fb90..7b5ba37ae2 100644 --- a/src/armnn/test/UnitTests.cpp +++ b/src/armnn/test/UnitTests.cpp @@ -7,6 +7,7 @@ #include "UnitTests.hpp" #include <armnn/Logging.hpp> +#include <armnn/utility/NumericCast.hpp> struct ConfigureLoggingFixture { @@ -34,7 +35,7 @@ struct DebugOutputSink : boost::iostreams::sink std::streamsize write(const char* s, std::streamsize n) { // The given string is not null-terminated, so we need to copy it. - std::string s2(s, boost::numeric_cast<size_t>(n)); + std::string s2(s, armnn::numeric_cast<size_t>(n)); OutputDebugString(s2.c_str()); return n; } |