From 2ea3761416aab259d9d84620dba2e011bcb5d880 Mon Sep 17 00:00:00 2001 From: Isabella Gottardi Date: Tue, 16 Jul 2019 11:48:51 +0100 Subject: COMPMID-2336: Fix InPlaceMutator condition and add SaveNumpyAccessor Change-Id: I223a688cfc19465f8581f691b32891cefd375907 Signed-off-by: Isabella Gottardi Reviewed-on: https://review.mlplatform.org/c/1555 Tested-by: Arm Jenkins Reviewed-by: Pablo Marquez Comments-Addressed: Arm Jenkins Reviewed-by: Michalis Spyrou --- utils/GraphUtils.h | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) (limited to 'utils/GraphUtils.h') diff --git a/utils/GraphUtils.h b/utils/GraphUtils.h index 88221c7dc8..fe19eb3196 100644 --- a/utils/GraphUtils.h +++ b/utils/GraphUtils.h @@ -167,6 +167,31 @@ private: std::ostream &_output_stream; }; +/** SaveNumPy accessor class */ +class SaveNumPyAccessor final : public graph::ITensorAccessor +{ +public: + /** Constructor + * + * @param[in] npy_name Npy file name. + * @param[in] is_fortran (Optional) If true, save tensor in fortran order. + */ + SaveNumPyAccessor(const std::string npy_name, const bool is_fortran = false); + /** Allow instances of this class to be move constructed */ + SaveNumPyAccessor(SaveNumPyAccessor &&) = default; + /** Prevent instances of this class from being copied (As this class contains pointers) */ + SaveNumPyAccessor(const SaveNumPyAccessor &) = delete; + /** Prevent instances of this class from being copied (As this class contains pointers) */ + SaveNumPyAccessor &operator=(const SaveNumPyAccessor &) = delete; + + // Inherited methods overriden: + bool access_tensor(ITensor &tensor) override; + +private: + const std::string _npy_name; + const bool _is_fortran; +}; + /** Image accessor class */ class ImageAccessor final : public graph::ITensorAccessor { @@ -558,6 +583,27 @@ inline std::unique_ptr get_npy_output_accessor(const std } } +/** Generates appropriate npy output accessor according to the specified npy_path + * + * @note If npy_path is empty will generate a DummyAccessor else will generate a SaveNpyAccessor + * + * @param[in] npy_name Npy filename. + * @param[in] is_fortran (Optional) If true, save tensor in fortran order. + * + * @return An appropriate tensor accessor + */ +inline std::unique_ptr get_save_npy_output_accessor(const std::string &npy_name, const bool is_fortran = false) +{ + if(npy_name.empty()) + { + return arm_compute::support::cpp14::make_unique(0); + } + else + { + return arm_compute::support::cpp14::make_unique(npy_name, is_fortran); + } +} + /** Permutes a given tensor shape given the input and output data layout * * @param[in] tensor_shape Tensor shape to permute -- cgit v1.2.1