diff options
author | Moritz Pflanzer <moritz.pflanzer@arm.com> | 2017-07-18 14:39:55 +0100 |
---|---|---|
committer | Anthony Barbier <anthony.barbier@arm.com> | 2018-09-17 14:16:42 +0100 |
commit | fb5aabb532f612d2e1f021df4f02a57cdd19761f (patch) | |
tree | 2417a9ec7327f1eee124e4576cb27b55e79a112c | |
parent | 07a1533554c6afb4fb43067254b71c08d131378a (diff) | |
download | ComputeLibrary-fb5aabb532f612d2e1f021df4f02a57cdd19761f.tar.gz |
COMPMID-415: Rename TensorLibrary to AssetsLibrary
Change-Id: I0da73ae4b76a6778d3601ea5230dc5e17968deaf
Reviewed-on: http://mpd-gerrit.cambridge.arm.com/80936
Reviewed-by: Anthony Barbier <anthony.barbier@arm.com>
Tested-by: Kaizen <jeremy.johnson+kaizengerrit@arm.com>
71 files changed, 198 insertions, 245 deletions
diff --git a/tests/TensorLibrary.cpp b/tests/AssetsLibrary.cpp index 479c3e5f04..be565d9aaf 100644 --- a/tests/TensorLibrary.cpp +++ b/tests/AssetsLibrary.cpp @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -#include "TensorLibrary.h" +#include "AssetsLibrary.h" #include "TypePrinter.h" #include "UserConfiguration.h" @@ -186,42 +186,36 @@ RawTensor load_ppm(const std::string &path) } } // namespace -TensorLibrary::TensorLibrary(std::string path) //NOLINT - : _library_path(std::move(path)), - _seed{ std::random_device()() } -{ -} - -TensorLibrary::TensorLibrary(std::string path, std::random_device::result_type seed) //NOLINT +AssetsLibrary::AssetsLibrary(std::string path, std::random_device::result_type seed) //NOLINT : _library_path(std::move(path)), _seed{ seed } { } -std::random_device::result_type TensorLibrary::seed() const +std::random_device::result_type AssetsLibrary::seed() const { return _seed; } -void TensorLibrary::fill(RawTensor &raw, const std::string &name, Format format) const +void AssetsLibrary::fill(RawTensor &raw, const std::string &name, Format format) const { //FIXME: Should be done by swapping cached buffers const RawTensor &src = get(name, format); std::copy_n(src.data(), raw.size(), raw.data()); } -void TensorLibrary::fill(RawTensor &raw, const std::string &name, Channel channel) const +void AssetsLibrary::fill(RawTensor &raw, const std::string &name, Channel channel) const { fill(raw, name, get_format_for_channel(channel), channel); } -void TensorLibrary::fill(RawTensor &raw, const std::string &name, Format format, Channel channel) const +void AssetsLibrary::fill(RawTensor &raw, const std::string &name, Format format, Channel channel) const { const RawTensor &src = get(name, format, channel); std::copy_n(src.data(), raw.size(), raw.data()); } -const TensorLibrary::Loader &TensorLibrary::get_loader(const std::string &extension) const +const AssetsLibrary::Loader &AssetsLibrary::get_loader(const std::string &extension) const { static std::unordered_map<std::string, Loader> loaders = { @@ -240,7 +234,7 @@ const TensorLibrary::Loader &TensorLibrary::get_loader(const std::string &extens } } -const TensorLibrary::Converter &TensorLibrary::get_converter(Format src, Format dst) const +const AssetsLibrary::Converter &AssetsLibrary::get_converter(Format src, Format dst) const { static std::map<std::pair<Format, Format>, Converter> converters = { @@ -264,7 +258,7 @@ const TensorLibrary::Converter &TensorLibrary::get_converter(Format src, Format } } -const TensorLibrary::Converter &TensorLibrary::get_converter(DataType src, Format dst) const +const AssetsLibrary::Converter &AssetsLibrary::get_converter(DataType src, Format dst) const { static std::map<std::pair<DataType, Format>, Converter> converters = {}; @@ -282,7 +276,7 @@ const TensorLibrary::Converter &TensorLibrary::get_converter(DataType src, Forma } } -const TensorLibrary::Converter &TensorLibrary::get_converter(DataType src, DataType dst) const +const AssetsLibrary::Converter &AssetsLibrary::get_converter(DataType src, DataType dst) const { static std::map<std::pair<DataType, DataType>, Converter> converters = {}; @@ -300,7 +294,7 @@ const TensorLibrary::Converter &TensorLibrary::get_converter(DataType src, DataT } } -const TensorLibrary::Converter &TensorLibrary::get_converter(Format src, DataType dst) const +const AssetsLibrary::Converter &AssetsLibrary::get_converter(Format src, DataType dst) const { static std::map<std::pair<Format, DataType>, Converter> converters = {}; @@ -318,7 +312,7 @@ const TensorLibrary::Converter &TensorLibrary::get_converter(Format src, DataTyp } } -const TensorLibrary::Extractor &TensorLibrary::get_extractor(Format format, Channel channel) const +const AssetsLibrary::Extractor &AssetsLibrary::get_extractor(Format format, Channel channel) const { static std::map<std::pair<Format, Channel>, Extractor> extractors = { @@ -340,7 +334,7 @@ const TensorLibrary::Extractor &TensorLibrary::get_extractor(Format format, Chan } } -RawTensor TensorLibrary::load_image(const std::string &name) const +RawTensor AssetsLibrary::load_image(const std::string &name) const { #ifdef _WIN32 const std::string image_path = ("\\images\\"); @@ -353,7 +347,7 @@ RawTensor TensorLibrary::load_image(const std::string &name) const return (*get_loader(extension))(path); } -const RawTensor &TensorLibrary::find_or_create_raw_tensor(const std::string &name, Format format) const +const RawTensor &AssetsLibrary::find_or_create_raw_tensor(const std::string &name, Format format) const { std::lock_guard<std::mutex> guard(_format_lock); @@ -377,7 +371,7 @@ const RawTensor &TensorLibrary::find_or_create_raw_tensor(const std::string &nam return _cache.add(std::make_tuple(name, format), std::move(raw)); } -const RawTensor &TensorLibrary::find_or_create_raw_tensor(const std::string &name, Format format, Channel channel) const +const RawTensor &AssetsLibrary::find_or_create_raw_tensor(const std::string &name, Format format, Channel channel) const { std::lock_guard<std::mutex> guard(_channel_lock); @@ -397,66 +391,56 @@ const RawTensor &TensorLibrary::find_or_create_raw_tensor(const std::string &nam return _cache.add(std::make_tuple(name, format, channel), std::move(dst)); } -TensorShape TensorLibrary::get_image_shape(const std::string &name) +TensorShape AssetsLibrary::get_image_shape(const std::string &name) { return load_image(name).shape(); } -RawTensor TensorLibrary::get(const TensorShape &shape, DataType data_type, int num_channels, int fixed_point_position) -{ - return RawTensor(shape, data_type, num_channels, fixed_point_position); -} - -RawTensor TensorLibrary::get(const TensorShape &shape, Format format) -{ - return RawTensor(shape, format); -} - -const RawTensor &TensorLibrary::get(const std::string &name) const +const RawTensor &AssetsLibrary::get(const std::string &name) const { //FIXME: Format should be derived from the image name. Not be fixed to RGB. return find_or_create_raw_tensor(name, Format::RGB888); } -RawTensor TensorLibrary::get(const std::string &name) +RawTensor AssetsLibrary::get(const std::string &name) { //FIXME: Format should be derived from the image name. Not be fixed to RGB. return RawTensor(find_or_create_raw_tensor(name, Format::RGB888)); } -RawTensor TensorLibrary::get(const std::string &name, DataType data_type, int num_channels) const +RawTensor AssetsLibrary::get(const std::string &name, DataType data_type, int num_channels) const { const RawTensor &raw = get(name); return RawTensor(raw.shape(), data_type, num_channels); } -const RawTensor &TensorLibrary::get(const std::string &name, Format format) const +const RawTensor &AssetsLibrary::get(const std::string &name, Format format) const { return find_or_create_raw_tensor(name, format); } -RawTensor TensorLibrary::get(const std::string &name, Format format) +RawTensor AssetsLibrary::get(const std::string &name, Format format) { return RawTensor(find_or_create_raw_tensor(name, format)); } -const RawTensor &TensorLibrary::get(const std::string &name, Channel channel) const +const RawTensor &AssetsLibrary::get(const std::string &name, Channel channel) const { return get(name, get_format_for_channel(channel), channel); } -RawTensor TensorLibrary::get(const std::string &name, Channel channel) +RawTensor AssetsLibrary::get(const std::string &name, Channel channel) { return RawTensor(get(name, get_format_for_channel(channel), channel)); } -const RawTensor &TensorLibrary::get(const std::string &name, Format format, Channel channel) const +const RawTensor &AssetsLibrary::get(const std::string &name, Format format, Channel channel) const { return find_or_create_raw_tensor(name, format, channel); } -RawTensor TensorLibrary::get(const std::string &name, Format format, Channel channel) +RawTensor AssetsLibrary::get(const std::string &name, Format format, Channel channel) { return RawTensor(find_or_create_raw_tensor(name, format, channel)); } diff --git a/tests/TensorLibrary.h b/tests/AssetsLibrary.h index b0a0556583..6ecaccbd76 100644 --- a/tests/TensorLibrary.h +++ b/tests/AssetsLibrary.h @@ -57,22 +57,16 @@ namespace test * explicitly. Furthermore, provides methods to fill tensors with the content of * loaded images or with random values. */ -class TensorLibrary final +class AssetsLibrary final { public: /** Initialises the library with a @p path to the image directory. - * - * @param[in] path Path to load images from. - */ - TensorLibrary(std::string path); - - /** Initialises the library with a @p path to the image directory. * Furthermore, sets the seed for the random generator to @p seed. * * @param[in] path Path to load images from. * @param[in] seed Seed used to initialise the random number generator. */ - TensorLibrary(std::string path, std::random_device::result_type seed); + AssetsLibrary(std::string path, std::random_device::result_type seed); /** Seed that is used to fill tensors with random values. */ std::random_device::result_type seed() const; @@ -83,23 +77,6 @@ public: */ TensorShape get_image_shape(const std::string &name); - /** Creates an uninitialised raw tensor with the given @p shape, @p - * data_type and @p num_channels. - * - * @param[in] shape Shape used to initialise the tensor. - * @param[in] data_type Data type used to initialise the tensor. - * @param[in] num_channels (Optional) Number of channels used to initialise the tensor. - * @param[in] fixed_point_position (Optional) Number of bits for the fractional part of the fixed point numbers - */ - static RawTensor get(const TensorShape &shape, DataType data_type, int num_channels = 1, int fixed_point_position = 0); - - /** Creates an uninitialised raw tensor with the given @p shape and @p format. - * - * @param[in] shape Shape used to initialise the tensor. - * @param[in] format Format used to initialise the tensor. - */ - static RawTensor get(const TensorShape &shape, Format format); - /** Provides a contant raw tensor for the specified image. * * @param[in] name Image file used to look up the raw tensor. @@ -375,7 +352,7 @@ private: }; template <typename T, typename D> -void TensorLibrary::fill(T &&tensor, D &&distribution, std::random_device::result_type seed_offset) const +void AssetsLibrary::fill(T &&tensor, D &&distribution, std::random_device::result_type seed_offset) const { Window window; for(unsigned int d = 0; d < tensor.shape().num_dimensions(); ++d) @@ -396,7 +373,7 @@ void TensorLibrary::fill(T &&tensor, D &&distribution, std::random_device::resul } template <typename D> -void TensorLibrary::fill(RawTensor &raw, D &&distribution, std::random_device::result_type seed_offset) const +void AssetsLibrary::fill(RawTensor &raw, D &&distribution, std::random_device::result_type seed_offset) const { std::mt19937 gen(_seed + seed_offset); @@ -409,7 +386,7 @@ void TensorLibrary::fill(RawTensor &raw, D &&distribution, std::random_device::r } template <typename T> -void TensorLibrary::fill(T &&tensor, const std::string &name, Format format) const +void AssetsLibrary::fill(T &&tensor, const std::string &name, Format format) const { const RawTensor &raw = get(name, format); @@ -424,13 +401,13 @@ void TensorLibrary::fill(T &&tensor, const std::string &name, Format format) con } template <typename T> -void TensorLibrary::fill(T &&tensor, const std::string &name, Channel channel) const +void AssetsLibrary::fill(T &&tensor, const std::string &name, Channel channel) const { fill(std::forward<T>(tensor), name, get_format_for_channel(channel), channel); } template <typename T> -void TensorLibrary::fill(T &&tensor, const std::string &name, Format format, Channel channel) const +void AssetsLibrary::fill(T &&tensor, const std::string &name, Format format, Channel channel) const { const RawTensor &raw = get(name, format, channel); @@ -445,7 +422,7 @@ void TensorLibrary::fill(T &&tensor, const std::string &name, Format format, Cha } template <typename T> -void TensorLibrary::fill_tensor_uniform(T &&tensor, std::random_device::result_type seed_offset) const +void AssetsLibrary::fill_tensor_uniform(T &&tensor, std::random_device::result_type seed_offset) const { switch(tensor.data_type()) { @@ -528,7 +505,7 @@ void TensorLibrary::fill_tensor_uniform(T &&tensor, std::random_device::result_t } template <typename T, typename D> -void TensorLibrary::fill_tensor_uniform(T &&tensor, std::random_device::result_type seed_offset, D low, D high) const +void AssetsLibrary::fill_tensor_uniform(T &&tensor, std::random_device::result_type seed_offset, D low, D high) const { switch(tensor.data_type()) { @@ -625,7 +602,7 @@ void TensorLibrary::fill_tensor_uniform(T &&tensor, std::random_device::result_t } template <typename T> -void TensorLibrary::fill_layer_data(T &&tensor, std::string name) const +void AssetsLibrary::fill_layer_data(T &&tensor, std::string name) const { #ifdef _WIN32 const std::string path_separator("\\"); diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 3c4f5029b1..70dfd67728 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -44,13 +44,13 @@ include_directories("${CMAKE_SOURCE_DIR}") include_directories("${CMAKE_SOURCE_DIR}/..") include_directories("${CMAKE_SOURCE_DIR}/../3rdparty/include/") -# TensorLibrary +# AssetsLibrary set(tensor_library_SOURCE_FILES ${CMAKE_SOURCE_DIR}/RawTensor.h ${CMAKE_SOURCE_DIR}/RawTensor.cpp ${CMAKE_SOURCE_DIR}/TensorCache.h - ${CMAKE_SOURCE_DIR}/TensorLibrary.h - ${CMAKE_SOURCE_DIR}/TensorLibrary.cpp + ${CMAKE_SOURCE_DIR}/AssetsLibrary.h + ${CMAKE_SOURCE_DIR}/AssetsLibrary.cpp ) add_library(tensor_library OBJECT diff --git a/tests/Globals.h b/tests/Globals.h index 823b5d6df5..d94250bb82 100644 --- a/tests/Globals.h +++ b/tests/Globals.h @@ -24,7 +24,7 @@ #ifndef __ARM_COMPUTE_TEST_GLOBALS_H__ #define __ARM_COMPUTE_TEST_GLOBALS_H__ -#include "TensorLibrary.h" +#include "AssetsLibrary.h" #include <memory> @@ -32,7 +32,7 @@ namespace arm_compute { namespace test { -extern std::unique_ptr<TensorLibrary> library; +extern std::unique_ptr<AssetsLibrary> library; } // namespace test } // namespace arm_compute #endif /* __ARM_COMPUTE_TEST_GLOBALS_H__ */ diff --git a/tests/SConscript b/tests/SConscript index ec596a7b89..82f95c2099 100644 --- a/tests/SConscript +++ b/tests/SConscript @@ -142,7 +142,7 @@ Import("arm_compute_test_framework") benchmark_env.Append(LIBS = ['arm_compute_test_framework']) files_benchmark = Glob('new/DatasetManager.cpp') -files_benchmark += Glob('new/TensorLibrary.cpp') +files_benchmark += Glob('new/AssetsLibrary.cpp') files_benchmark += Glob('new/RawTensor.cpp') files_benchmark += Glob('new/benchmark_new/*.cpp') diff --git a/tests/benchmark_new/main.cpp b/tests/benchmark_new/main.cpp index 1058649ba0..29f5a6e419 100644 --- a/tests/benchmark_new/main.cpp +++ b/tests/benchmark_new/main.cpp @@ -28,7 +28,7 @@ #include "framework/instruments/Instruments.h" #include "framework/printers/Printers.h" #include "support/ToolchainSupport.h" -#include "tests/TensorLibrary.h" +#include "tests/AssetsLibrary.h" #ifdef ARM_COMPUTE_CL #include "arm_compute/runtime/CL/CLScheduler.h" @@ -49,7 +49,7 @@ namespace arm_compute { namespace test { -std::unique_ptr<TensorLibrary> library; +std::unique_ptr<AssetsLibrary> library; } // namespace test } // namespace arm_compute @@ -184,7 +184,7 @@ int main(int argc, char **argv) return 0; } - library = support::cpp14::make_unique<TensorLibrary>(assets->value(), seed->value()); + library = support::cpp14::make_unique<AssetsLibrary>(assets->value(), seed->value()); if(!parser.validate()) { diff --git a/tests/fixtures_new/AlexNetFixture.h b/tests/fixtures_new/AlexNetFixture.h index 0ebdae0091..75384e53f0 100644 --- a/tests/fixtures_new/AlexNetFixture.h +++ b/tests/fixtures_new/AlexNetFixture.h @@ -26,7 +26,7 @@ #include "framework/Fixture.h" #include "networks_new/AlexNetNetwork.h" -#include "tests/TensorLibrary.h" +#include "tests/AssetsLibrary.h" #include "tests/Utils.h" namespace arm_compute diff --git a/tests/fixtures_new/LeNet5Fixture.h b/tests/fixtures_new/LeNet5Fixture.h index d9173af048..9a2590b39b 100644 --- a/tests/fixtures_new/LeNet5Fixture.h +++ b/tests/fixtures_new/LeNet5Fixture.h @@ -26,7 +26,7 @@ #include "framework/Fixture.h" #include "networks_new/LeNet5Network.h" -#include "tests/TensorLibrary.h" +#include "tests/AssetsLibrary.h" #include "tests/Utils.h" namespace arm_compute diff --git a/tests/model_objects/AlexNet.h b/tests/model_objects/AlexNet.h index 672942d365..dad68324c1 100644 --- a/tests/model_objects/AlexNet.h +++ b/tests/model_objects/AlexNet.h @@ -24,8 +24,8 @@ #ifndef __ARM_COMPUTE_TEST_MODEL_OBJECTS_ALEXNET_H__ #define __ARM_COMPUTE_TEST_MODEL_OBJECTS_ALEXNET_H__ +#include "tests/AssetsLibrary.h" #include "tests/Globals.h" -#include "tests/TensorLibrary.h" #include "tests/Utils.h" #include <memory> diff --git a/tests/model_objects/LeNet5.h b/tests/model_objects/LeNet5.h index 3a9046c205..d3e72b0010 100644 --- a/tests/model_objects/LeNet5.h +++ b/tests/model_objects/LeNet5.h @@ -24,8 +24,8 @@ #ifndef __ARM_COMPUTE_TEST_MODEL_OBJECTS_LENET5_H__ #define __ARM_COMPUTE_TEST_MODEL_OBJECTS_LENET5_H__ +#include "tests/AssetsLibrary.h" #include "tests/Globals.h" -#include "tests/TensorLibrary.h" #include "tests/Utils.h" #include <memory> diff --git a/tests/networks_new/AlexNetNetwork.h b/tests/networks_new/AlexNetNetwork.h index 27b9ef43b5..7e1a855f07 100644 --- a/tests/networks_new/AlexNetNetwork.h +++ b/tests/networks_new/AlexNetNetwork.h @@ -24,8 +24,8 @@ #ifndef __ARM_COMPUTE_TEST_MODEL_OBJECTS_ALEXNET_H__ #define __ARM_COMPUTE_TEST_MODEL_OBJECTS_ALEXNET_H__ +#include "AssetsLibrary.h" #include "Globals.h" -#include "TensorLibrary.h" #include "Utils.h" #include <memory> diff --git a/tests/networks_new/LeNet5Network.h b/tests/networks_new/LeNet5Network.h index 17421d9047..33cb59bbd2 100644 --- a/tests/networks_new/LeNet5Network.h +++ b/tests/networks_new/LeNet5Network.h @@ -24,8 +24,8 @@ #ifndef __ARM_COMPUTE_TEST_MODEL_OBJECTS_LENET5_H__ #define __ARM_COMPUTE_TEST_MODEL_OBJECTS_LENET5_H__ +#include "AssetsLibrary.h" #include "Globals.h" -#include "TensorLibrary.h" #include "Utils.h" #include <memory> diff --git a/tests/validation/CL/ActivationLayer.cpp b/tests/validation/CL/ActivationLayer.cpp index ac1da5c8b4..ad1b433cd5 100644 --- a/tests/validation/CL/ActivationLayer.cpp +++ b/tests/validation/CL/ActivationLayer.cpp @@ -21,10 +21,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ +#include "AssetsLibrary.h" #include "CL/CLAccessor.h" #include "Globals.h" #include "PaddingCalculator.h" -#include "TensorLibrary.h" #include "TypePrinter.h" #include "Utils.h" #include "validation/Datasets.h" diff --git a/tests/validation/CL/ArithmeticAddition.cpp b/tests/validation/CL/ArithmeticAddition.cpp index 3390ed6ada..5f9664e246 100644 --- a/tests/validation/CL/ArithmeticAddition.cpp +++ b/tests/validation/CL/ArithmeticAddition.cpp @@ -21,9 +21,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ +#include "AssetsLibrary.h" #include "CL/CLAccessor.h" #include "PaddingCalculator.h" -#include "TensorLibrary.h" #include "TypePrinter.h" #include "tests/Globals.h" #include "tests/Utils.h" diff --git a/tests/validation/CL/ArithmeticSubtraction.cpp b/tests/validation/CL/ArithmeticSubtraction.cpp index 397e363590..8617618c81 100644 --- a/tests/validation/CL/ArithmeticSubtraction.cpp +++ b/tests/validation/CL/ArithmeticSubtraction.cpp @@ -21,9 +21,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ +#include "AssetsLibrary.h" #include "CL/CLAccessor.h" #include "PaddingCalculator.h" -#include "TensorLibrary.h" #include "TypePrinter.h" #include "tests/Globals.h" #include "tests/Utils.h" diff --git a/tests/validation/CL/BatchNormalizationLayer.cpp b/tests/validation/CL/BatchNormalizationLayer.cpp index 9b9df2e902..6ddc60dcb1 100644 --- a/tests/validation/CL/BatchNormalizationLayer.cpp +++ b/tests/validation/CL/BatchNormalizationLayer.cpp @@ -21,9 +21,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ +#include "AssetsLibrary.h" #include "CL/CLAccessor.h" #include "Globals.h" -#include "TensorLibrary.h" #include "TypePrinter.h" #include "Utils.h" #include "dataset/BatchNormalizationLayerDataset.h" diff --git a/tests/validation/CL/BitwiseAnd.cpp b/tests/validation/CL/BitwiseAnd.cpp index 12e63f84a8..bc6f38c8ef 100644 --- a/tests/validation/CL/BitwiseAnd.cpp +++ b/tests/validation/CL/BitwiseAnd.cpp @@ -21,10 +21,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ +#include "AssetsLibrary.h" #include "CL/CLAccessor.h" #include "Globals.h" #include "PaddingCalculator.h" -#include "TensorLibrary.h" #include "TypePrinter.h" #include "Utils.h" #include "validation/Datasets.h" diff --git a/tests/validation/CL/Box3x3.cpp b/tests/validation/CL/Box3x3.cpp index c4660a754a..d58348e8c9 100644 --- a/tests/validation/CL/Box3x3.cpp +++ b/tests/validation/CL/Box3x3.cpp @@ -21,10 +21,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ +#include "AssetsLibrary.h" #include "CL/CLAccessor.h" #include "Globals.h" #include "PaddingCalculator.h" -#include "TensorLibrary.h" #include "TypePrinter.h" #include "Utils.h" #include "validation/Datasets.h" diff --git a/tests/validation/CL/DepthConcatenateLayer.cpp b/tests/validation/CL/DepthConcatenateLayer.cpp index a9b727b769..1770d909a1 100644 --- a/tests/validation/CL/DepthConcatenateLayer.cpp +++ b/tests/validation/CL/DepthConcatenateLayer.cpp @@ -21,10 +21,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ +#include "AssetsLibrary.h" #include "CL/CLAccessor.h" #include "Globals.h" #include "PaddingCalculator.h" -#include "TensorLibrary.h" #include "TypePrinter.h" #include "Utils.h" #include "validation/Datasets.h" diff --git a/tests/validation/CL/DepthConvert.cpp b/tests/validation/CL/DepthConvert.cpp index 547820e5d7..ca6fc6b1ff 100644 --- a/tests/validation/CL/DepthConvert.cpp +++ b/tests/validation/CL/DepthConvert.cpp @@ -21,10 +21,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ +#include "AssetsLibrary.h" #include "CL/CLAccessor.h" #include "Globals.h" #include "PaddingCalculator.h" -#include "TensorLibrary.h" #include "TypePrinter.h" #include "Utils.h" #include "validation/Datasets.h" diff --git a/tests/validation/CL/FillBorder.cpp b/tests/validation/CL/FillBorder.cpp index 028bd20e1c..02e2fbfd8e 100644 --- a/tests/validation/CL/FillBorder.cpp +++ b/tests/validation/CL/FillBorder.cpp @@ -21,9 +21,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ +#include "AssetsLibrary.h" #include "CL/CLAccessor.h" #include "Globals.h" -#include "TensorLibrary.h" #include "TypePrinter.h" #include "Utils.h" #include "validation/Datasets.h" diff --git a/tests/validation/CL/FixedPoint/FixedPoint_QS8.cpp b/tests/validation/CL/FixedPoint/FixedPoint_QS8.cpp index fb6e6220d9..1a2389ee87 100644 --- a/tests/validation/CL/FixedPoint/FixedPoint_QS8.cpp +++ b/tests/validation/CL/FixedPoint/FixedPoint_QS8.cpp @@ -21,9 +21,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ +#include "AssetsLibrary.h" #include "CL/CLAccessor.h" #include "Globals.h" -#include "TensorLibrary.h" #include "TypePrinter.h" #include "Utils.h" #include "validation/Datasets.h" diff --git a/tests/validation/CL/GEMM.cpp b/tests/validation/CL/GEMM.cpp index a9b35a8f62..747ad00f5c 100644 --- a/tests/validation/CL/GEMM.cpp +++ b/tests/validation/CL/GEMM.cpp @@ -21,8 +21,8 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ +#include "AssetsLibrary.h" #include "CL/CLAccessor.h" -#include "TensorLibrary.h" #include "TypePrinter.h" #include "dataset/GEMMDataset.h" #include "tests/Globals.h" diff --git a/tests/validation/CL/Gaussian3x3.cpp b/tests/validation/CL/Gaussian3x3.cpp index 1a1bf82b61..a9c3a06a9a 100644 --- a/tests/validation/CL/Gaussian3x3.cpp +++ b/tests/validation/CL/Gaussian3x3.cpp @@ -21,10 +21,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ +#include "AssetsLibrary.h" #include "CL/CLAccessor.h" #include "Globals.h" #include "PaddingCalculator.h" -#include "TensorLibrary.h" #include "TypePrinter.h" #include "Utils.h" #include "validation/Datasets.h" diff --git a/tests/validation/CL/Gaussian5x5.cpp b/tests/validation/CL/Gaussian5x5.cpp index 2ed2d3eaba..7add061284 100644 --- a/tests/validation/CL/Gaussian5x5.cpp +++ b/tests/validation/CL/Gaussian5x5.cpp @@ -21,10 +21,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ +#include "AssetsLibrary.h" #include "CL/CLAccessor.h" #include "Globals.h" #include "PaddingCalculator.h" -#include "TensorLibrary.h" #include "TypePrinter.h" #include "Utils.h" #include "validation/Datasets.h" diff --git a/tests/validation/CL/IntegralImage.cpp b/tests/validation/CL/IntegralImage.cpp index c45c03e8ca..42a567c234 100644 --- a/tests/validation/CL/IntegralImage.cpp +++ b/tests/validation/CL/IntegralImage.cpp @@ -22,10 +22,10 @@ * SOFTWARE. */ +#include "AssetsLibrary.h" #include "CL/CLAccessor.h" #include "Globals.h" #include "PaddingCalculator.h" -#include "TensorLibrary.h" #include "TypePrinter.h" #include "Utils.h" #include "validation/Datasets.h" diff --git a/tests/validation/CL/NonLinearFilter.cpp b/tests/validation/CL/NonLinearFilter.cpp index f89b54c049..6d79ef1624 100644 --- a/tests/validation/CL/NonLinearFilter.cpp +++ b/tests/validation/CL/NonLinearFilter.cpp @@ -21,10 +21,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ +#include "AssetsLibrary.h" #include "CL/CLAccessor.h" #include "Globals.h" #include "PaddingCalculator.h" -#include "TensorLibrary.h" #include "TypePrinter.h" #include "Utils.h" #include "validation/Datasets.h" diff --git a/tests/validation/CL/Sobel3x3.cpp b/tests/validation/CL/Sobel3x3.cpp index a70ed803d4..ac1e2f22a9 100644 --- a/tests/validation/CL/Sobel3x3.cpp +++ b/tests/validation/CL/Sobel3x3.cpp @@ -22,10 +22,10 @@ * SOFTWARE. */ +#include "AssetsLibrary.h" #include "CL/CLAccessor.h" #include "Globals.h" #include "PaddingCalculator.h" -#include "TensorLibrary.h" #include "TypePrinter.h" #include "Utils.h" #include "validation/Datasets.h" diff --git a/tests/validation/CL/Sobel5x5.cpp b/tests/validation/CL/Sobel5x5.cpp index 3e02856f41..5057b38ccb 100644 --- a/tests/validation/CL/Sobel5x5.cpp +++ b/tests/validation/CL/Sobel5x5.cpp @@ -22,10 +22,10 @@ * SOFTWARE. */ +#include "AssetsLibrary.h" #include "CL/CLAccessor.h" #include "Globals.h" #include "PaddingCalculator.h" -#include "TensorLibrary.h" #include "TypePrinter.h" #include "Utils.h" #include "validation/Datasets.h" diff --git a/tests/validation/CL/SoftmaxLayer.cpp b/tests/validation/CL/SoftmaxLayer.cpp index 2680070e50..a07698ca94 100644 --- a/tests/validation/CL/SoftmaxLayer.cpp +++ b/tests/validation/CL/SoftmaxLayer.cpp @@ -21,10 +21,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ +#include "AssetsLibrary.h" #include "CL/CLAccessor.h" #include "Globals.h" #include "PaddingCalculator.h" -#include "TensorLibrary.h" #include "TypePrinter.h" #include "Utils.h" #include "validation/Datasets.h" diff --git a/tests/validation/CL/TableLookup.cpp b/tests/validation/CL/TableLookup.cpp index d3062259d8..7e7ddf4605 100644 --- a/tests/validation/CL/TableLookup.cpp +++ b/tests/validation/CL/TableLookup.cpp @@ -21,12 +21,12 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ +#include "AssetsLibrary.h" #include "CL/CLAccessor.h" #include "CL/CLLutAccessor.h" #include "Globals.h" #include "PaddingCalculator.h" #include "RawLutAccessor.h" -#include "TensorLibrary.h" #include "TypePrinter.h" #include "Utils.h" #include "validation/Datasets.h" diff --git a/tests/validation/CL/Threshold.cpp b/tests/validation/CL/Threshold.cpp index 42254c690b..4c10c3f471 100644 --- a/tests/validation/CL/Threshold.cpp +++ b/tests/validation/CL/Threshold.cpp @@ -21,10 +21,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ +#include "AssetsLibrary.h" #include "CL/CLAccessor.h" #include "Globals.h" #include "PaddingCalculator.h" -#include "TensorLibrary.h" #include "TypePrinter.h" #include "Utils.h" #include "dataset/ThresholdDataset.h" diff --git a/tests/validation/NEON/AbsoluteDifference.cpp b/tests/validation/NEON/AbsoluteDifference.cpp index e083b8d409..3ac9c99159 100644 --- a/tests/validation/NEON/AbsoluteDifference.cpp +++ b/tests/validation/NEON/AbsoluteDifference.cpp @@ -21,10 +21,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ +#include "AssetsLibrary.h" #include "Globals.h" #include "NEON/NEAccessor.h" #include "PaddingCalculator.h" -#include "TensorLibrary.h" #include "TypePrinter.h" #include "Utils.h" #include "validation/Datasets.h" diff --git a/tests/validation/NEON/Accumulate.cpp b/tests/validation/NEON/Accumulate.cpp index 249b08dc8e..2d2d9c22a1 100644 --- a/tests/validation/NEON/Accumulate.cpp +++ b/tests/validation/NEON/Accumulate.cpp @@ -21,10 +21,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ +#include "AssetsLibrary.h" #include "Globals.h" #include "NEON/NEAccessor.h" #include "PaddingCalculator.h" -#include "TensorLibrary.h" #include "TypePrinter.h" #include "Utils.h" #include "validation/Datasets.h" diff --git a/tests/validation/NEON/AccumulateSquared.cpp b/tests/validation/NEON/AccumulateSquared.cpp index 770ed8f9c3..19b930fb25 100644 --- a/tests/validation/NEON/AccumulateSquared.cpp +++ b/tests/validation/NEON/AccumulateSquared.cpp @@ -21,10 +21,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ +#include "AssetsLibrary.h" #include "Globals.h" #include "NEON/NEAccessor.h" #include "PaddingCalculator.h" -#include "TensorLibrary.h" #include "TypePrinter.h" #include "Utils.h" #include "validation/Datasets.h" diff --git a/tests/validation/NEON/AccumulateWeighted.cpp b/tests/validation/NEON/AccumulateWeighted.cpp index 2d7f12aeb3..4dfa2b8fc7 100644 --- a/tests/validation/NEON/AccumulateWeighted.cpp +++ b/tests/validation/NEON/AccumulateWeighted.cpp @@ -21,10 +21,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ +#include "AssetsLibrary.h" #include "Globals.h" #include "NEON/NEAccessor.h" #include "PaddingCalculator.h" -#include "TensorLibrary.h" #include "TypePrinter.h" #include "Utils.h" #include "validation/Datasets.h" diff --git a/tests/validation/NEON/ActivationLayer.cpp b/tests/validation/NEON/ActivationLayer.cpp index b8827a5324..5ddb9e05be 100644 --- a/tests/validation/NEON/ActivationLayer.cpp +++ b/tests/validation/NEON/ActivationLayer.cpp @@ -21,10 +21,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ +#include "AssetsLibrary.h" #include "Globals.h" #include "NEON/NEAccessor.h" #include "PaddingCalculator.h" -#include "TensorLibrary.h" #include "TypePrinter.h" #include "Utils.h" #include "validation/Datasets.h" diff --git a/tests/validation/NEON/ArithmeticAddition.cpp b/tests/validation/NEON/ArithmeticAddition.cpp index 6feb15ad34..c98df7a8df 100644 --- a/tests/validation/NEON/ArithmeticAddition.cpp +++ b/tests/validation/NEON/ArithmeticAddition.cpp @@ -21,10 +21,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ +#include "AssetsLibrary.h" #include "Globals.h" #include "NEON/NEAccessor.h" #include "PaddingCalculator.h" -#include "TensorLibrary.h" #include "TypePrinter.h" #include "Utils.h" #include "validation/Datasets.h" diff --git a/tests/validation/NEON/ArithmeticSubtraction.cpp b/tests/validation/NEON/ArithmeticSubtraction.cpp index 23a320a84d..cc6dbcdbf8 100644 --- a/tests/validation/NEON/ArithmeticSubtraction.cpp +++ b/tests/validation/NEON/ArithmeticSubtraction.cpp @@ -21,10 +21,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ +#include "AssetsLibrary.h" #include "Globals.h" #include "NEON/NEAccessor.h" #include "PaddingCalculator.h" -#include "TensorLibrary.h" #include "TypePrinter.h" #include "Utils.h" #include "validation/Datasets.h" diff --git a/tests/validation/NEON/BitwiseAnd.cpp b/tests/validation/NEON/BitwiseAnd.cpp index 130c94bcbb..9ef6fc18a2 100644 --- a/tests/validation/NEON/BitwiseAnd.cpp +++ b/tests/validation/NEON/BitwiseAnd.cpp @@ -21,10 +21,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ +#include "AssetsLibrary.h" #include "Globals.h" #include "NEON/NEAccessor.h" #include "PaddingCalculator.h" -#include "TensorLibrary.h" #include "TypePrinter.h" #include "Utils.h" #include "validation/Datasets.h" diff --git a/tests/validation/NEON/BitwiseNot.cpp b/tests/validation/NEON/BitwiseNot.cpp index 3897101165..f04a789e22 100644 --- a/tests/validation/NEON/BitwiseNot.cpp +++ b/tests/validation/NEON/BitwiseNot.cpp @@ -21,10 +21,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ +#include "AssetsLibrary.h" #include "Globals.h" #include "NEON/NEAccessor.h" #include "PaddingCalculator.h" -#include "TensorLibrary.h" #include "TypePrinter.h" #include "Utils.h" #include "validation/Datasets.h" diff --git a/tests/validation/NEON/BitwiseOr.cpp b/tests/validation/NEON/BitwiseOr.cpp index 78e81dd94c..6b97de5112 100644 --- a/tests/validation/NEON/BitwiseOr.cpp +++ b/tests/validation/NEON/BitwiseOr.cpp @@ -21,10 +21,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ +#include "AssetsLibrary.h" #include "Globals.h" #include "NEON/NEAccessor.h" #include "PaddingCalculator.h" -#include "TensorLibrary.h" #include "TypePrinter.h" #include "Utils.h" #include "validation/Datasets.h" diff --git a/tests/validation/NEON/BitwiseXor.cpp b/tests/validation/NEON/BitwiseXor.cpp index 41825a5dcb..cb2eed1d69 100644 --- a/tests/validation/NEON/BitwiseXor.cpp +++ b/tests/validation/NEON/BitwiseXor.cpp @@ -21,10 +21,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ +#include "AssetsLibrary.h" #include "Globals.h" #include "NEON/NEAccessor.h" #include "PaddingCalculator.h" -#include "TensorLibrary.h" #include "TypePrinter.h" #include "Utils.h" #include "validation/Datasets.h" diff --git a/tests/validation/NEON/Box3x3.cpp b/tests/validation/NEON/Box3x3.cpp index 00326c36fc..32fbbd8f2a 100644 --- a/tests/validation/NEON/Box3x3.cpp +++ b/tests/validation/NEON/Box3x3.cpp @@ -21,10 +21,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ +#include "AssetsLibrary.h" #include "Globals.h" #include "NEON/NEAccessor.h" #include "PaddingCalculator.h" -#include "TensorLibrary.h" #include "TypePrinter.h" #include "Utils.h" #include "validation/Datasets.h" diff --git a/tests/validation/NEON/ConvolutionLayerDirect.cpp b/tests/validation/NEON/ConvolutionLayerDirect.cpp index aeac73c1d6..7b0f711eee 100644 --- a/tests/validation/NEON/ConvolutionLayerDirect.cpp +++ b/tests/validation/NEON/ConvolutionLayerDirect.cpp @@ -21,9 +21,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ +#include "AssetsLibrary.h" #include "Globals.h" #include "NEON/NEAccessor.h" -#include "TensorLibrary.h" #include "TypePrinter.h" #include "Utils.h" #include "validation/Datasets.h" diff --git a/tests/validation/NEON/DepthConcatenateLayer.cpp b/tests/validation/NEON/DepthConcatenateLayer.cpp index 6ab5885868..40c2ada210 100644 --- a/tests/validation/NEON/DepthConcatenateLayer.cpp +++ b/tests/validation/NEON/DepthConcatenateLayer.cpp @@ -21,10 +21,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ +#include "AssetsLibrary.h" #include "Globals.h" #include "NEON/NEAccessor.h" #include "PaddingCalculator.h" -#include "TensorLibrary.h" #include "TypePrinter.h" #include "Utils.h" #include "validation/Datasets.h" diff --git a/tests/validation/NEON/DepthConvert.cpp b/tests/validation/NEON/DepthConvert.cpp index 8a30c746e9..9588d18cf3 100644 --- a/tests/validation/NEON/DepthConvert.cpp +++ b/tests/validation/NEON/DepthConvert.cpp @@ -21,10 +21,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ +#include "AssetsLibrary.h" #include "Globals.h" #include "NEON/NEAccessor.h" #include "PaddingCalculator.h" -#include "TensorLibrary.h" #include "TypePrinter.h" #include "Utils.h" #include "validation/Datasets.h" diff --git a/tests/validation/NEON/FillBorder.cpp b/tests/validation/NEON/FillBorder.cpp index 3ce4c6ffc9..797098e133 100644 --- a/tests/validation/NEON/FillBorder.cpp +++ b/tests/validation/NEON/FillBorder.cpp @@ -21,9 +21,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ +#include "AssetsLibrary.h" #include "Globals.h" #include "NEON/NEAccessor.h" -#include "TensorLibrary.h" #include "TypePrinter.h" #include "Utils.h" #include "validation/Datasets.h" diff --git a/tests/validation/NEON/Fixedpoint/Exp_QS16.cpp b/tests/validation/NEON/Fixedpoint/Exp_QS16.cpp index f882508756..fe38a99d95 100644 --- a/tests/validation/NEON/Fixedpoint/Exp_QS16.cpp +++ b/tests/validation/NEON/Fixedpoint/Exp_QS16.cpp @@ -21,9 +21,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ +#include "AssetsLibrary.h" #include "Globals.h" #include "NEON/NEAccessor.h" -#include "TensorLibrary.h" #include "TypePrinter.h" #include "Utils.h" #include "validation/Datasets.h" diff --git a/tests/validation/NEON/Fixedpoint/Exp_QS8.cpp b/tests/validation/NEON/Fixedpoint/Exp_QS8.cpp index 8f01721bc6..8955099d81 100644 --- a/tests/validation/NEON/Fixedpoint/Exp_QS8.cpp +++ b/tests/validation/NEON/Fixedpoint/Exp_QS8.cpp @@ -21,9 +21,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ +#include "AssetsLibrary.h" #include "Globals.h" #include "NEON/NEAccessor.h" -#include "TensorLibrary.h" #include "TypePrinter.h" #include "Utils.h" #include "validation/Datasets.h" diff --git a/tests/validation/NEON/Fixedpoint/Invsqrt_QS16.cpp b/tests/validation/NEON/Fixedpoint/Invsqrt_QS16.cpp index dd51421072..1d16ed5dd0 100644 --- a/tests/validation/NEON/Fixedpoint/Invsqrt_QS16.cpp +++ b/tests/validation/NEON/Fixedpoint/Invsqrt_QS16.cpp @@ -21,9 +21,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ +#include "AssetsLibrary.h" #include "Globals.h" #include "NEON/NEAccessor.h" -#include "TensorLibrary.h" #include "TypePrinter.h" #include "Utils.h" #include "validation/Datasets.h" diff --git a/tests/validation/NEON/Fixedpoint/Invsqrt_QS8.cpp b/tests/validation/NEON/Fixedpoint/Invsqrt_QS8.cpp index 0af86debcb..69805a0859 100644 --- a/tests/validation/NEON/Fixedpoint/Invsqrt_QS8.cpp +++ b/tests/validation/NEON/Fixedpoint/Invsqrt_QS8.cpp @@ -21,9 +21,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ +#include "AssetsLibrary.h" #include "Globals.h" #include "NEON/NEAccessor.h" -#include "TensorLibrary.h" #include "TypePrinter.h" #include "Utils.h" #include "validation/Datasets.h" diff --git a/tests/validation/NEON/Fixedpoint/Log_QS16.cpp b/tests/validation/NEON/Fixedpoint/Log_QS16.cpp index f81f35967e..0b5bc3a7cc 100644 --- a/tests/validation/NEON/Fixedpoint/Log_QS16.cpp +++ b/tests/validation/NEON/Fixedpoint/Log_QS16.cpp @@ -21,9 +21,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ +#include "AssetsLibrary.h" #include "Globals.h" #include "NEON/NEAccessor.h" -#include "TensorLibrary.h" #include "TypePrinter.h" #include "Utils.h" #include "validation/Datasets.h" diff --git a/tests/validation/NEON/Fixedpoint/Log_QS8.cpp b/tests/validation/NEON/Fixedpoint/Log_QS8.cpp index 4a4738e105..685d0f1230 100644 --- a/tests/validation/NEON/Fixedpoint/Log_QS8.cpp +++ b/tests/validation/NEON/Fixedpoint/Log_QS8.cpp @@ -21,9 +21,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ +#include "AssetsLibrary.h" #include "Globals.h" #include "NEON/NEAccessor.h" -#include "TensorLibrary.h" #include "TypePrinter.h" #include "Utils.h" #include "validation/Datasets.h" diff --git a/tests/validation/NEON/Fixedpoint/Reciprocal_QS16.cpp b/tests/validation/NEON/Fixedpoint/Reciprocal_QS16.cpp index 4c531e085a..9b62d3a8cf 100644 --- a/tests/validation/NEON/Fixedpoint/Reciprocal_QS16.cpp +++ b/tests/validation/NEON/Fixedpoint/Reciprocal_QS16.cpp @@ -21,9 +21,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ +#include "AssetsLibrary.h" #include "Globals.h" #include "NEON/NEAccessor.h" -#include "TensorLibrary.h" #include "TypePrinter.h" #include "Utils.h" #include "validation/Datasets.h" diff --git a/tests/validation/NEON/Fixedpoint/Reciprocal_QS8.cpp b/tests/validation/NEON/Fixedpoint/Reciprocal_QS8.cpp index b42f13ae47..527ce722ea 100644 --- a/tests/validation/NEON/Fixedpoint/Reciprocal_QS8.cpp +++ b/tests/validation/NEON/Fixedpoint/Reciprocal_QS8.cpp @@ -21,9 +21,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ +#include "AssetsLibrary.h" #include "Globals.h" #include "NEON/NEAccessor.h" -#include "TensorLibrary.h" #include "TypePrinter.h" #include "Utils.h" #include "validation/Datasets.h" diff --git a/tests/validation/NEON/GEMM.cpp b/tests/validation/NEON/GEMM.cpp index 0b608902a3..b7b6bf46f6 100644 --- a/tests/validation/NEON/GEMM.cpp +++ b/tests/validation/NEON/GEMM.cpp @@ -21,9 +21,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ +#include "AssetsLibrary.h" #include "Globals.h" #include "NEON/NEAccessor.h" -#include "TensorLibrary.h" #include "TypePrinter.h" #include "Utils.h" #include "dataset/GEMMDataset.h" diff --git a/tests/validation/NEON/Gaussian3x3.cpp b/tests/validation/NEON/Gaussian3x3.cpp index b303d5a6d4..b17d572761 100644 --- a/tests/validation/NEON/Gaussian3x3.cpp +++ b/tests/validation/NEON/Gaussian3x3.cpp @@ -21,10 +21,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ +#include "AssetsLibrary.h" #include "Globals.h" #include "NEON/NEAccessor.h" #include "PaddingCalculator.h" -#include "TensorLibrary.h" #include "TypePrinter.h" #include "Utils.h" #include "validation/Datasets.h" diff --git a/tests/validation/NEON/Gaussian5x5.cpp b/tests/validation/NEON/Gaussian5x5.cpp index e094ee57b9..7a2a52b10f 100644 --- a/tests/validation/NEON/Gaussian5x5.cpp +++ b/tests/validation/NEON/Gaussian5x5.cpp @@ -21,10 +21,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ +#include "AssetsLibrary.h" #include "Globals.h" #include "NEON/NEAccessor.h" #include "PaddingCalculator.h" -#include "TensorLibrary.h" #include "TypePrinter.h" #include "Utils.h" #include "validation/Datasets.h" diff --git a/tests/validation/NEON/IntegralImage.cpp b/tests/validation/NEON/IntegralImage.cpp index ad6ba4b618..f03d37b77d 100644 --- a/tests/validation/NEON/IntegralImage.cpp +++ b/tests/validation/NEON/IntegralImage.cpp @@ -22,10 +22,10 @@ * SOFTWARE. */ +#include "AssetsLibrary.h" #include "Globals.h" #include "NEON/NEAccessor.h" #include "PaddingCalculator.h" -#include "TensorLibrary.h" #include "TypePrinter.h" #include "Utils.h" #include "validation/Datasets.h" diff --git a/tests/validation/NEON/MeanStdDev.cpp b/tests/validation/NEON/MeanStdDev.cpp index cb92988e31..c42ca46cb7 100644 --- a/tests/validation/NEON/MeanStdDev.cpp +++ b/tests/validation/NEON/MeanStdDev.cpp @@ -21,10 +21,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ +#include "AssetsLibrary.h" #include "Globals.h" #include "NEON/NEAccessor.h" #include "PaddingCalculator.h" -#include "TensorLibrary.h" #include "TypePrinter.h" #include "Utils.h" #include "validation/Datasets.h" diff --git a/tests/validation/NEON/MinMaxLocation.cpp b/tests/validation/NEON/MinMaxLocation.cpp index bbb4589d30..11e96e3ff9 100644 --- a/tests/validation/NEON/MinMaxLocation.cpp +++ b/tests/validation/NEON/MinMaxLocation.cpp @@ -22,11 +22,11 @@ * SOFTWARE. */ +#include "AssetsLibrary.h" #include "Globals.h" #include "NEON/Helper.h" #include "NEON/NEAccessor.h" #include "PaddingCalculator.h" -#include "TensorLibrary.h" #include "TypePrinter.h" #include "Utils.h" #include "validation/Datasets.h" diff --git a/tests/validation/NEON/NonLinearFilter.cpp b/tests/validation/NEON/NonLinearFilter.cpp index eb2e80712a..4666cdf31b 100644 --- a/tests/validation/NEON/NonLinearFilter.cpp +++ b/tests/validation/NEON/NonLinearFilter.cpp @@ -21,10 +21,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ +#include "AssetsLibrary.h" #include "Globals.h" #include "NEON/NEAccessor.h" #include "PaddingCalculator.h" -#include "TensorLibrary.h" #include "TypePrinter.h" #include "Utils.h" #include "validation/Datasets.h" diff --git a/tests/validation/NEON/PixelWiseMultiplication.cpp b/tests/validation/NEON/PixelWiseMultiplication.cpp index 4bc4d6ca06..5cff90c112 100644 --- a/tests/validation/NEON/PixelWiseMultiplication.cpp +++ b/tests/validation/NEON/PixelWiseMultiplication.cpp @@ -21,10 +21,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ +#include "AssetsLibrary.h" #include "Globals.h" #include "NEON/NEAccessor.h" #include "PaddingCalculator.h" -#include "TensorLibrary.h" #include "TypePrinter.h" #include "Utils.h" #include "validation/Datasets.h" diff --git a/tests/validation/NEON/Sobel3x3.cpp b/tests/validation/NEON/Sobel3x3.cpp index ded9e737f3..d7f3fec452 100644 --- a/tests/validation/NEON/Sobel3x3.cpp +++ b/tests/validation/NEON/Sobel3x3.cpp @@ -22,9 +22,9 @@ * SOFTWARE. */ +#include "AssetsLibrary.h" #include "Globals.h" #include "NEON/NEAccessor.h" -#include "TensorLibrary.h" #include "TypePrinter.h" #include "Utils.h" #include "validation/Datasets.h" diff --git a/tests/validation/NEON/Sobel5x5.cpp b/tests/validation/NEON/Sobel5x5.cpp index d0d252f214..e3ef8316cf 100644 --- a/tests/validation/NEON/Sobel5x5.cpp +++ b/tests/validation/NEON/Sobel5x5.cpp @@ -22,10 +22,10 @@ * SOFTWARE. */ +#include "AssetsLibrary.h" #include "Globals.h" #include "NEON/NEAccessor.h" #include "PaddingCalculator.h" -#include "TensorLibrary.h" #include "TypePrinter.h" #include "Utils.h" #include "validation/Datasets.h" diff --git a/tests/validation/NEON/SoftmaxLayer.cpp b/tests/validation/NEON/SoftmaxLayer.cpp index 9ac81af278..020efc0419 100644 --- a/tests/validation/NEON/SoftmaxLayer.cpp +++ b/tests/validation/NEON/SoftmaxLayer.cpp @@ -21,10 +21,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ +#include "AssetsLibrary.h" #include "Globals.h" #include "NEON/NEAccessor.h" #include "PaddingCalculator.h" -#include "TensorLibrary.h" #include "TypePrinter.h" #include "Utils.h" #include "validation/Datasets.h" diff --git a/tests/validation/NEON/TableLookup.cpp b/tests/validation/NEON/TableLookup.cpp index f8f56a6fab..862e13a8b6 100644 --- a/tests/validation/NEON/TableLookup.cpp +++ b/tests/validation/NEON/TableLookup.cpp @@ -21,13 +21,13 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ +#include "AssetsLibrary.h" #include "Globals.h" #include "NEON/Helper.h" #include "NEON/NEAccessor.h" #include "NEON/NELutAccessor.h" #include "PaddingCalculator.h" #include "RawLutAccessor.h" -#include "TensorLibrary.h" #include "TypePrinter.h" #include "Utils.h" #include "validation/Datasets.h" diff --git a/tests/validation/NEON/Threshold.cpp b/tests/validation/NEON/Threshold.cpp index 0ae495a4e3..e5305eec6e 100644 --- a/tests/validation/NEON/Threshold.cpp +++ b/tests/validation/NEON/Threshold.cpp @@ -21,10 +21,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ +#include "AssetsLibrary.h" #include "Globals.h" #include "NEON/NEAccessor.h" #include "PaddingCalculator.h" -#include "TensorLibrary.h" #include "TypePrinter.h" #include "Utils.h" #include "dataset/ThresholdDataset.h" diff --git a/tests/validation/Reference.cpp b/tests/validation/Reference.cpp index 0ce25c5567..c0d5a20c16 100644 --- a/tests/validation/Reference.cpp +++ b/tests/validation/Reference.cpp @@ -23,10 +23,10 @@ */ #include "Reference.h" +#include "AssetsLibrary.h" #include "Globals.h" #include "Helpers.h" #include "ReferenceCPP.h" -#include "TensorLibrary.h" #include "validation/Helpers.h" #include <random> @@ -44,9 +44,9 @@ namespace validation std::pair<RawTensor, RawTensor> Reference::compute_reference_sobel_3x3(const TensorShape &shape, BorderMode border_mode, uint8_t constant_border_value) { // Create reference - RawTensor ref_src = library->get(shape, Format::U8); - RawTensor ref_dst_x = library->get(shape, Format::S16); - RawTensor ref_dst_y = library->get(shape, Format::S16); + RawTensor ref_src(shape, Format::U8); + RawTensor ref_dst_x(shape, Format::S16); + RawTensor ref_dst_y(shape, Format::S16); // Fill reference library->fill_tensor_uniform(ref_src, 0); @@ -59,9 +59,9 @@ std::pair<RawTensor, RawTensor> Reference::compute_reference_sobel_3x3(const Ten std::pair<RawTensor, RawTensor> Reference::compute_reference_sobel_5x5(const TensorShape &shape, BorderMode border_mode, uint8_t constant_border_value) { // Create reference - RawTensor ref_src = library->get(shape, Format::U8); - RawTensor ref_dst_x = library->get(shape, Format::S16); - RawTensor ref_dst_y = library->get(shape, Format::S16); + RawTensor ref_src(shape, Format::U8); + RawTensor ref_dst_x(shape, Format::S16); + RawTensor ref_dst_y(shape, Format::S16); // Fill reference library->fill_tensor_uniform(ref_src, 0); @@ -75,7 +75,7 @@ void Reference::compute_reference_min_max_location(const TensorShape &shape, Dat uint32_t &min_count, uint32_t &max_count) { // Create reference - RawTensor ref_src = library->get(shape, dt_in); + RawTensor ref_src(shape, dt_in); // Fill reference library->fill_tensor_uniform(ref_src, 0); @@ -86,7 +86,7 @@ void Reference::compute_reference_min_max_location(const TensorShape &shape, Dat std::pair<float, float> Reference::compute_reference_mean_and_standard_deviation(const TensorShape &shape) { // Create reference - RawTensor ref_src = library->get(shape, DataType::U8); + RawTensor ref_src(shape, DataType::U8); // Create output variables float mean; @@ -103,8 +103,8 @@ std::pair<float, float> Reference::compute_reference_mean_and_standard_deviation RawTensor Reference::compute_reference_integral_image(const TensorShape &shape) { // Create reference - RawTensor ref_src = library->get(shape, DataType::U8); - RawTensor ref_dst = library->get(shape, DataType::U32); + RawTensor ref_src(shape, DataType::U8); + RawTensor ref_dst(shape, DataType::U32); // Fill reference library->fill_tensor_uniform(ref_src, 0); @@ -117,9 +117,9 @@ RawTensor Reference::compute_reference_integral_image(const TensorShape &shape) RawTensor Reference::compute_reference_absolute_difference(const TensorShape &shape, DataType dt_in0, DataType dt_in1, DataType dt_out) { // Create reference - RawTensor ref_src1 = library->get(shape, dt_in0); - RawTensor ref_src2 = library->get(shape, dt_in1); - RawTensor ref_dst = library->get(shape, dt_out); + RawTensor ref_src1(shape, dt_in0); + RawTensor ref_src2(shape, dt_in1); + RawTensor ref_dst(shape, dt_out); // Fill reference library->fill_tensor_uniform(ref_src1, 0); @@ -134,8 +134,8 @@ RawTensor Reference::compute_reference_absolute_difference(const TensorShape &sh RawTensor Reference::compute_reference_accumulate(const TensorShape &shape) { // Create reference - RawTensor ref_src = library->get(shape, DataType::U8); - RawTensor ref_dst = library->get(shape, DataType::S16); + RawTensor ref_src(shape, DataType::U8); + RawTensor ref_dst(shape, DataType::S16); // Fill reference library->fill_tensor_uniform(ref_src, 0); @@ -150,8 +150,8 @@ RawTensor Reference::compute_reference_accumulate(const TensorShape &shape) RawTensor Reference::compute_reference_accumulate_squared(const TensorShape &shape, uint32_t shift) { // Create reference - RawTensor ref_src = library->get(shape, DataType::U8); - RawTensor ref_dst = library->get(shape, DataType::S16); + RawTensor ref_src(shape, DataType::U8); + RawTensor ref_dst(shape, DataType::S16); // Fill reference // ref_dst tensor filled with non-negative values @@ -167,8 +167,8 @@ RawTensor Reference::compute_reference_accumulate_squared(const TensorShape &sha RawTensor Reference::compute_reference_accumulate_weighted(const TensorShape &shape, float alpha) { // Create reference - RawTensor ref_src = library->get(shape, DataType::U8); - RawTensor ref_dst = library->get(shape, DataType::U8); + RawTensor ref_src(shape, DataType::U8); + RawTensor ref_dst(shape, DataType::U8); // Fill reference library->fill_tensor_uniform(ref_src, 0); @@ -183,9 +183,9 @@ RawTensor Reference::compute_reference_accumulate_weighted(const TensorShape &sh RawTensor Reference::compute_reference_arithmetic_addition(const TensorShape &shape, DataType dt_in0, DataType dt_in1, DataType dt_out, ConvertPolicy convert_policy, int fixed_point_position) { // Create reference - RawTensor ref_src1 = library->get(shape, dt_in0, 1, fixed_point_position); - RawTensor ref_src2 = library->get(shape, dt_in1, 1, fixed_point_position); - RawTensor ref_dst = library->get(shape, dt_out, 1, fixed_point_position); + RawTensor ref_src1(shape, dt_in0, 1, fixed_point_position); + RawTensor ref_src2(shape, dt_in1, 1, fixed_point_position); + RawTensor ref_dst(shape, dt_out, 1, fixed_point_position); // Fill reference library->fill_tensor_uniform(ref_src1, 0); @@ -200,9 +200,9 @@ RawTensor Reference::compute_reference_arithmetic_addition(const TensorShape &sh RawTensor Reference::compute_reference_arithmetic_subtraction(const TensorShape &shape, DataType dt_in0, DataType dt_in1, DataType dt_out, ConvertPolicy convert_policy, int fixed_point_position) { // Create reference - RawTensor ref_src1 = library->get(shape, dt_in0, 1, fixed_point_position); - RawTensor ref_src2 = library->get(shape, dt_in1, 1, fixed_point_position); - RawTensor ref_dst = library->get(shape, dt_out, 1, fixed_point_position); + RawTensor ref_src1(shape, dt_in0, 1, fixed_point_position); + RawTensor ref_src2(shape, dt_in1, 1, fixed_point_position); + RawTensor ref_dst(shape, dt_out, 1, fixed_point_position); // Fill reference library->fill_tensor_uniform(ref_src1, 0); @@ -217,9 +217,9 @@ RawTensor Reference::compute_reference_arithmetic_subtraction(const TensorShape RawTensor Reference::compute_reference_bitwise_and(const TensorShape &shape) { // Create reference - RawTensor ref_src1 = library->get(shape, DataType::U8); - RawTensor ref_src2 = library->get(shape, DataType::U8); - RawTensor ref_dst = library->get(shape, DataType::U8); + RawTensor ref_src1(shape, DataType::U8); + RawTensor ref_src2(shape, DataType::U8); + RawTensor ref_dst(shape, DataType::U8); // Fill reference library->fill_tensor_uniform(ref_src1, 0); @@ -234,9 +234,9 @@ RawTensor Reference::compute_reference_bitwise_and(const TensorShape &shape) RawTensor Reference::compute_reference_bitwise_or(const TensorShape &shape) { // Create reference - RawTensor ref_src1 = library->get(shape, DataType::U8); - RawTensor ref_src2 = library->get(shape, DataType::U8); - RawTensor ref_dst = library->get(shape, DataType::U8); + RawTensor ref_src1(shape, DataType::U8); + RawTensor ref_src2(shape, DataType::U8); + RawTensor ref_dst(shape, DataType::U8); // Fill reference library->fill_tensor_uniform(ref_src1, 0); @@ -251,9 +251,9 @@ RawTensor Reference::compute_reference_bitwise_or(const TensorShape &shape) RawTensor Reference::compute_reference_bitwise_xor(const TensorShape &shape) { // Create reference - RawTensor ref_src1 = library->get(shape, DataType::U8); - RawTensor ref_src2 = library->get(shape, DataType::U8); - RawTensor ref_dst = library->get(shape, DataType::U8); + RawTensor ref_src1(shape, DataType::U8); + RawTensor ref_src2(shape, DataType::U8); + RawTensor ref_dst(shape, DataType::U8); // Fill reference library->fill_tensor_uniform(ref_src1, 0); @@ -268,8 +268,8 @@ RawTensor Reference::compute_reference_bitwise_xor(const TensorShape &shape) RawTensor Reference::compute_reference_bitwise_not(const TensorShape &shape) { // Create reference - RawTensor ref_src = library->get(shape, DataType::U8); - RawTensor ref_dst = library->get(shape, DataType::U8); + RawTensor ref_src(shape, DataType::U8); + RawTensor ref_dst(shape, DataType::U8); // Fill reference library->fill_tensor_uniform(ref_src, 0); @@ -283,8 +283,8 @@ RawTensor Reference::compute_reference_bitwise_not(const TensorShape &shape) RawTensor Reference::compute_reference_box3x3(const TensorShape &shape, BorderMode border_mode, uint8_t constant_border_value) { // Create reference - RawTensor ref_src = library->get(shape, DataType::U8); - RawTensor ref_dst = library->get(shape, DataType::U8); + RawTensor ref_src(shape, DataType::U8); + RawTensor ref_dst(shape, DataType::U8); // Fill reference library->fill_tensor_uniform(ref_src, 0); @@ -298,8 +298,8 @@ RawTensor Reference::compute_reference_box3x3(const TensorShape &shape, BorderMo RawTensor Reference::compute_reference_depth_convert(const TensorShape &shape, DataType dt_in, DataType dt_out, ConvertPolicy policy, uint32_t shift, uint32_t fixed_point_position_in, uint32_t fixed_point_position_out) { - RawTensor ref_src = library->get(shape, dt_in, 1, fixed_point_position_in); - RawTensor ref_dst = library->get(shape, dt_out, 1, fixed_point_position_out); + RawTensor ref_src(shape, dt_in, 1, fixed_point_position_in); + RawTensor ref_dst(shape, dt_out, 1, fixed_point_position_out); // Fill reference library->fill_tensor_uniform(ref_src, 0); @@ -313,8 +313,8 @@ RawTensor Reference::compute_reference_depth_convert(const TensorShape &shape, D RawTensor Reference::compute_reference_gaussian3x3(const TensorShape &shape, BorderMode border_mode, uint8_t constant_border_value) { // Create reference - RawTensor ref_src = library->get(shape, DataType::U8); - RawTensor ref_dst = library->get(shape, DataType::U8); + RawTensor ref_src(shape, DataType::U8); + RawTensor ref_dst(shape, DataType::U8); // Fill reference library->fill_tensor_uniform(ref_src, 0); @@ -328,8 +328,8 @@ RawTensor Reference::compute_reference_gaussian3x3(const TensorShape &shape, Bor RawTensor Reference::compute_reference_gaussian5x5(const TensorShape &shape, BorderMode border_mode, uint8_t constant_border_value) { // Create reference - RawTensor ref_src = library->get(shape, DataType::U8); - RawTensor ref_dst = library->get(shape, DataType::U8); + RawTensor ref_src(shape, DataType::U8); + RawTensor ref_dst(shape, DataType::U8); // Fill reference library->fill_tensor_uniform(ref_src, 0); @@ -343,10 +343,10 @@ RawTensor Reference::compute_reference_gaussian5x5(const TensorShape &shape, Bor RawTensor Reference::compute_reference_gemm(const TensorShape &src_shape1, const TensorShape &src_shape2, const TensorShape &src_shape3, const TensorShape &dst_shape, float alpha, float beta, DataType dt, int fixed_point_position) { - RawTensor src1 = library->get(src_shape1, dt, 1, fixed_point_position); - RawTensor src2 = library->get(src_shape2, dt, 1, fixed_point_position); - RawTensor src3 = library->get(src_shape3, dt, 1, fixed_point_position); - RawTensor dst = library->get(dst_shape, dt, 1, fixed_point_position); + RawTensor src1(src_shape1, dt, 1, fixed_point_position); + RawTensor src2(src_shape2, dt, 1, fixed_point_position); + RawTensor src3(src_shape3, dt, 1, fixed_point_position); + RawTensor dst(dst_shape, dt, 1, fixed_point_position); // Fill reference if(dt == DataType::F16 || dt == DataType::F32) @@ -373,8 +373,8 @@ RawTensor Reference::compute_reference_non_linear_filter(const TensorShape &shap MatrixPattern pattern, const uint8_t *mask, BorderMode border_mode, uint8_t constant_border_value) { // Create reference - RawTensor ref_src = library->get(shape, DataType::U8); - RawTensor ref_dst = library->get(shape, DataType::U8); + RawTensor ref_src(shape, DataType::U8); + RawTensor ref_dst(shape, DataType::U8); // Fill reference library->fill_tensor_uniform(ref_src, 0); @@ -389,9 +389,9 @@ RawTensor Reference::compute_reference_pixel_wise_multiplication(const TensorSha RoundingPolicy rounding_policy) { // Create reference - RawTensor ref_src1 = library->get(shape, dt_in0); - RawTensor ref_src2 = library->get(shape, dt_in1); - RawTensor ref_dst = library->get(shape, dt_out); + RawTensor ref_src1(shape, dt_in0); + RawTensor ref_src2(shape, dt_in1); + RawTensor ref_dst(shape, dt_out); // Fill reference library->fill_tensor_uniform(ref_src1, 0); @@ -407,9 +407,9 @@ RawTensor Reference::compute_reference_fixed_point_pixel_wise_multiplication(con ConvertPolicy convert_policy, RoundingPolicy rounding_policy) { // Create reference - RawTensor ref_src1 = library->get(shape, dt_in0, 1, fixed_point_position); - RawTensor ref_src2 = library->get(shape, dt_in1, 1, fixed_point_position); - RawTensor ref_dst = library->get(shape, dt_out, 1, fixed_point_position); + RawTensor ref_src1(shape, dt_in0, 1, fixed_point_position); + RawTensor ref_src2(shape, dt_in1, 1, fixed_point_position); + RawTensor ref_dst(shape, dt_out, 1, fixed_point_position); // Fill reference library->fill_tensor_uniform(ref_src1, 0); @@ -425,8 +425,8 @@ template <typename T> RawTensor Reference::compute_reference_table_lookup(const TensorShape &shape, DataType dt_inout, std::map<T, T> &lut) { // Create reference - RawTensor ref_src = library->get(shape, dt_inout); - RawTensor ref_dst = library->get(shape, dt_inout); + RawTensor ref_src(shape, dt_inout); + RawTensor ref_dst(shape, dt_inout); // Fill reference library->fill_tensor_uniform(ref_src, 0); @@ -441,8 +441,8 @@ template RawTensor arm_compute::test::validation::Reference::compute_reference_t RawTensor Reference::compute_reference_threshold(const TensorShape &shape, uint8_t threshold, uint8_t false_value, uint8_t true_value, ThresholdType type, uint8_t upper) { // Create reference - RawTensor ref_src = library->get(shape, DataType::U8); - RawTensor ref_dst = library->get(shape, DataType::U8); + RawTensor ref_src(shape, DataType::U8); + RawTensor ref_dst(shape, DataType::U8); // Fill reference library->fill_tensor_uniform(ref_src, 0); @@ -456,8 +456,8 @@ RawTensor Reference::compute_reference_threshold(const TensorShape &shape, uint8 RawTensor Reference::compute_reference_activation_layer(const TensorShape &shape, DataType dt, ActivationLayerInfo act_info, int fixed_point_position) { // Create reference - RawTensor ref_src = library->get(shape, dt, 1, fixed_point_position); - RawTensor ref_dst = library->get(shape, dt, 1, fixed_point_position); + RawTensor ref_src(shape, dt, 1, fixed_point_position); + RawTensor ref_dst(shape, dt, 1, fixed_point_position); // Fill tensors switch(dt) @@ -508,12 +508,12 @@ RawTensor Reference::compute_reference_activation_layer(const TensorShape &shape RawTensor Reference::compute_reference_batch_normalization_layer(const TensorShape &shape0, const TensorShape &shape1, DataType dt, float epsilon, int fixed_point_position) { // Create reference - RawTensor ref_src = library->get(shape0, dt, 1, fixed_point_position); - RawTensor ref_dst = library->get(shape0, dt, 1, fixed_point_position); - RawTensor ref_mean = library->get(shape1, dt, 1, fixed_point_position); - RawTensor ref_var = library->get(shape1, dt, 1, fixed_point_position); - RawTensor ref_beta = library->get(shape1, dt, 1, fixed_point_position); - RawTensor ref_gamma = library->get(shape1, dt, 1, fixed_point_position); + RawTensor ref_src(shape0, dt, 1, fixed_point_position); + RawTensor ref_dst(shape0, dt, 1, fixed_point_position); + RawTensor ref_mean(shape1, dt, 1, fixed_point_position); + RawTensor ref_var(shape1, dt, 1, fixed_point_position); + RawTensor ref_beta(shape1, dt, 1, fixed_point_position); + RawTensor ref_gamma(shape1, dt, 1, fixed_point_position); // Fill tensors with values from -1 to 1. if(dt == DataType::F32) @@ -560,10 +560,10 @@ RawTensor Reference::compute_reference_convolution_layer(const TensorShape &inpu const PadStrideInfo &conv_info, int fixed_point_position) { // Create reference - RawTensor ref_src = library->get(input_shape, dt, 1, fixed_point_position); - RawTensor ref_weights = library->get(weights_shape, dt, 1, fixed_point_position); - RawTensor ref_bias = library->get(bias_shape, dt, 1, fixed_point_position); - RawTensor ref_dst = library->get(output_shape, dt, 1, fixed_point_position); + RawTensor ref_src(input_shape, dt, 1, fixed_point_position); + RawTensor ref_weights(weights_shape, dt, 1, fixed_point_position); + RawTensor ref_bias(bias_shape, dt, 1, fixed_point_position); + RawTensor ref_dst(output_shape, dt, 1, fixed_point_position); // Fill reference switch(dt) @@ -608,7 +608,7 @@ RawTensor Reference::compute_reference_depth_concatenate_layer(const std::vector { ref_srcs.push_back(support::cpp14::make_unique<RawTensor>(RawTensor(shapes[i], dt, 1, fixed_point_position))); } - RawTensor ref_dst = library->get(dst_shape, dt, 1, fixed_point_position); + RawTensor ref_dst(dst_shape, dt, 1, fixed_point_position); // Fill references for(unsigned int i = 0; i < ref_srcs.size(); ++i) @@ -626,9 +626,9 @@ RawTensor Reference::compute_reference_fully_connected_layer(const TensorShape & DataType dt, bool transpose_weights, int fixed_point_position) { // Create reference - RawTensor ref_src = library->get(input_shape, dt, 1, fixed_point_position); - RawTensor ref_bias = library->get(bias_shape, dt, 1, fixed_point_position); - RawTensor ref_dst = library->get(output_shape, dt, 1, fixed_point_position); + RawTensor ref_src(input_shape, dt, 1, fixed_point_position); + RawTensor ref_bias(bias_shape, dt, 1, fixed_point_position); + RawTensor ref_dst(output_shape, dt, 1, fixed_point_position); // Swap the first and second dimension of weights' shape if transpose_weights is true TensorShape ws = weights_shape; @@ -639,7 +639,7 @@ RawTensor Reference::compute_reference_fully_connected_layer(const TensorShape & ws.set(1, dimx); } - RawTensor ref_weights = library->get(ws, dt, 1, fixed_point_position); + RawTensor ref_weights(ws, dt, 1, fixed_point_position); // Fill reference if(dt == DataType::F16 || dt == DataType::F32) @@ -665,8 +665,8 @@ RawTensor Reference::compute_reference_fully_connected_layer(const TensorShape & RawTensor Reference::compute_reference_normalization_layer(const TensorShape &shape, DataType dt, NormalizationLayerInfo norm_info, int fixed_point_position) { // Create reference - RawTensor ref_src = library->get(shape, dt, 1, fixed_point_position); - RawTensor ref_dst = library->get(shape, dt, 1, fixed_point_position); + RawTensor ref_src(shape, dt, 1, fixed_point_position); + RawTensor ref_dst(shape, dt, 1, fixed_point_position); // Fill reference if(dt == DataType::QS8) @@ -689,8 +689,8 @@ RawTensor Reference::compute_reference_normalization_layer(const TensorShape &sh RawTensor Reference::compute_reference_pooling_layer(const TensorShape &shape_in, const TensorShape &shape_out, DataType dt, PoolingLayerInfo pool_info, int fixed_point_position) { // Create reference - RawTensor ref_src = library->get(shape_in, dt, 1, fixed_point_position); - RawTensor ref_dst = library->get(shape_out, dt, 1, fixed_point_position); + RawTensor ref_src(shape_in, dt, 1, fixed_point_position); + RawTensor ref_dst(shape_out, dt, 1, fixed_point_position); // Fill reference int min = 0; @@ -726,8 +726,8 @@ RawTensor Reference::compute_reference_roi_pooling_layer(const TensorShape &shap shape_dst.set(3, rois.size()); // Create reference - RawTensor ref_src = library->get(shape, dt); - RawTensor ref_dst = library->get(shape_dst, dt); + RawTensor ref_src(shape, dt); + RawTensor ref_dst(shape_dst, dt); // Fill reference std::uniform_real_distribution<> distribution(-1, 1); @@ -742,8 +742,8 @@ RawTensor Reference::compute_reference_roi_pooling_layer(const TensorShape &shap RawTensor Reference::compute_reference_softmax_layer(const TensorShape &shape, DataType dt, int fixed_point_position) { // Create reference - RawTensor ref_src = library->get(shape, dt, 1, fixed_point_position); - RawTensor ref_dst = library->get(shape, dt, 1, fixed_point_position); + RawTensor ref_src(shape, dt, 1, fixed_point_position); + RawTensor ref_dst(shape, dt, 1, fixed_point_position); // Fill reference if(arm_compute::is_data_type_float(dt)) @@ -767,8 +767,8 @@ RawTensor Reference::compute_reference_softmax_layer(const TensorShape &shape, D RawTensor Reference::compute_reference_fixed_point_operation(const TensorShape &shape, DataType dt_in, DataType dt_out, FixedPointOp op, int fixed_point_position) { // Create reference - RawTensor ref_src = library->get(shape, dt_in, 1, fixed_point_position); - RawTensor ref_dst = library->get(shape, dt_out, 1, fixed_point_position); + RawTensor ref_src(shape, dt_in, 1, fixed_point_position); + RawTensor ref_dst(shape, dt_out, 1, fixed_point_position); // Fill reference int min = 0; diff --git a/tests/validation/main.cpp b/tests/validation/main.cpp index 6ec6885159..a6c02ed4dd 100644 --- a/tests/validation/main.cpp +++ b/tests/validation/main.cpp @@ -23,8 +23,8 @@ */ #define BOOST_TEST_ALTERNATIVE_INIT_API +#include "AssetsLibrary.h" #include "Globals.h" -#include "TensorLibrary.h" #include "Utils.h" #include "ValidationProgramOptions.h" #include "ValidationUserConfiguration.h" @@ -46,7 +46,7 @@ namespace arm_compute namespace test { ValidationUserConfiguration user_config; -std::unique_ptr<TensorLibrary> library; +std::unique_ptr<AssetsLibrary> library; } // namespace test } // namespace arm_compute @@ -54,15 +54,7 @@ struct GlobalFixture { GlobalFixture() { - if(user_config.seed.is_set()) - { - library = arm_compute::support::cpp14::make_unique<TensorLibrary>(user_config.path.get(), user_config.seed); - } - else - { - library = arm_compute::support::cpp14::make_unique<TensorLibrary>(user_config.path.get()); - } - + library = arm_compute::support::cpp14::make_unique<AssetsLibrary>(user_config.path.get(), user_config.seed); std::cout << "Seed: " << library->seed() << "\n"; } }; |