From d9eb27597eabe5b7c17520f4f9b3f8a282d72573 Mon Sep 17 00:00:00 2001 From: Georgios Pinitas Date: Tue, 3 Apr 2018 13:44:29 +0100 Subject: COMPMID-797: Switch to new graph. - Cleaned up build system Change-Id: If2faa27ee5b31fa8b972836960ab3ef671059c8d Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/126435 Tested-by: Jenkins Reviewed-by: Pablo Tello --- utils/GraphTypePrinter.h | 88 ------------------------------------------------ utils/GraphUtils.cpp | 5 --- utils/GraphUtils.h | 35 +++---------------- 3 files changed, 5 insertions(+), 123 deletions(-) delete mode 100644 utils/GraphTypePrinter.h (limited to 'utils') diff --git a/utils/GraphTypePrinter.h b/utils/GraphTypePrinter.h deleted file mode 100644 index 4ff1019cce..0000000000 --- a/utils/GraphTypePrinter.h +++ /dev/null @@ -1,88 +0,0 @@ -/* - * Copyright (c) 2017 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_TEST_GRAPH_TYPE_PRINTER_H__ -#define __ARM_COMPUTE_TEST_GRAPH_TYPE_PRINTER_H__ - -#include "arm_compute/graph/Types.h" - -#include -#include -#include - -namespace arm_compute -{ -namespace graph -{ -/** Formatted output of the @ref ConvolutionMethodHint type. */ -inline ::std::ostream &operator<<(::std::ostream &os, const ConvolutionMethodHint &conv_method) -{ - switch(conv_method) - { - case ConvolutionMethodHint::DIRECT: - os << "DIRECT"; - break; - case ConvolutionMethodHint::GEMM: - os << "GEMM"; - break; - default: - ARM_COMPUTE_ERROR("NOT_SUPPORTED!"); - } - - return os; -} - -inline std::string to_string(const ConvolutionMethodHint &conv_method) -{ - std::stringstream str; - str << conv_method; - return str.str(); -} - -/** Formatted output of the @ref TargetHint type. */ -inline ::std::ostream &operator<<(::std::ostream &os, const TargetHint &target_hint) -{ - switch(target_hint) - { - case TargetHint::NEON: - os << "NEON"; - break; - case TargetHint::OPENCL: - os << "OPENCL"; - break; - default: - ARM_COMPUTE_ERROR("NOT_SUPPORTED!"); - } - - return os; -} - -inline std::string to_string(const TargetHint &target_hint) -{ - std::stringstream str; - str << target_hint; - return str.str(); -} -} // namespace graph -} // namespace arm_compute -#endif /* __ARM_COMPUTE_TEST_GRAPH_TYPE_PRINTER_H__ */ diff --git a/utils/GraphUtils.cpp b/utils/GraphUtils.cpp index 448343a977..7912fd6b7d 100644 --- a/utils/GraphUtils.cpp +++ b/utils/GraphUtils.cpp @@ -27,11 +27,6 @@ #include "arm_compute/runtime/SubTensor.h" #include "utils/Utils.h" -#ifdef ARM_COMPUTE_CL -#include "arm_compute/core/CL/OpenCL.h" -#include "arm_compute/runtime/CL/CLTensor.h" -#endif /* ARM_COMPUTE_CL */ - #include using namespace arm_compute::graph_utils; diff --git a/utils/GraphUtils.h b/utils/GraphUtils.h index e70a1a275f..11f1e0590a 100644 --- a/utils/GraphUtils.h +++ b/utils/GraphUtils.h @@ -29,10 +29,6 @@ #include "arm_compute/graph/ITensorAccessor.h" #include "arm_compute/graph/Types.h" -#include "arm_compute/core/CL/OpenCL.h" - -#include "arm_compute/graph2/Types.h" - #include #include #include @@ -276,26 +272,6 @@ inline std::unique_ptr get_input_accessor(const std::str } } -/** Utility function to return the TargetHint - * - * @param[in] target Integer value which expresses the selected target. Must be 0 for NEON, 1 for OpenCL or 2 for OpenCL with Tuner - * - * @return the TargetHint - */ -inline graph::TargetHint set_target_hint(int target) -{ - ARM_COMPUTE_ERROR_ON_MSG(target > 2, "Invalid target. Target must be 0 (NEON), 1 (OpenCL) or 2 (OpenCL with Tuner)"); - if((target == 1 || target == 2) && graph::Graph::opencl_is_available()) - { - // If type of target is OpenCL, check if OpenCL is available and initialize the scheduler - return graph::TargetHint::OPENCL; - } - else - { - return graph::TargetHint::NEON; - } -} - /** Generates appropriate output accessor according to the specified labels_path * * @note If labels_path is empty will generate a DummyAccessor else will generate a TopNPredictionsAccessor @@ -324,21 +300,20 @@ inline std::unique_ptr get_output_accessor(const std::st * * @return the TargetHint */ -inline graph2::Target set_target_hint2(int target) +inline graph::Target set_target_hint(int target) { ARM_COMPUTE_ERROR_ON_MSG(target > 3, "Invalid target. Target must be 0 (NEON), 1 (OpenCL), 2 (OpenCL + Tuner), 3 (GLES)"); - if((target == 1 || target == 2) && arm_compute::opencl_is_available()) + if((target == 1 || target == 2)) { - // If type of target is OpenCL, check if OpenCL is available and initialize the scheduler - return graph2::Target::CL; + return graph::Target::CL; } else if(target == 3) { - return graph2::Target::GC; + return graph::Target::GC; } else { - return graph2::Target::NEON; + return graph::Target::NEON; } } } // namespace graph_utils -- cgit v1.2.1