From aa75fdae47e128395f6f6c0ae7220e2ca73d105c Mon Sep 17 00:00:00 2001 From: Alejandro Saucedo Date: Mon, 8 Feb 2021 19:43:50 +0000 Subject: [PATCH] format --- single_include/kompute/Kompute.hpp | 26 ++++++++++++-------------- src/Manager.cpp | 6 +++--- src/Tensor.cpp | 6 ++++-- src/include/kompute/Manager.hpp | 23 ++++++++++++----------- test/TestManager.cpp | 6 ++++-- test/TestMultipleAlgoExecutions.cpp | 6 ++++-- 6 files changed, 39 insertions(+), 34 deletions(-) mode change 100755 => 100644 src/Manager.cpp diff --git a/single_include/kompute/Kompute.hpp b/single_include/kompute/Kompute.hpp index 62037c91d..b63b766a0 100755 --- a/single_include/kompute/Kompute.hpp +++ b/single_include/kompute/Kompute.hpp @@ -697,8 +697,8 @@ static const unsigned int shaders_glsl_logisticregression_comp_spv_len = 4920; } #endif // define SHADEROP_SHADERLOGISTICREGRESSION_HPP -#include #include +#include #define KP_MAX_DIM_SIZE 1 @@ -1361,10 +1361,8 @@ class Manager { SPDLOG_DEBUG("Kompute Manager evalOp Default triggered"); this->mCurrentSequenceIndex++; - this->evalOp(tensors, - KP_DEFAULT_SESSION + - std::to_string(this->mCurrentSequenceIndex), - std::forward(params)...); + this->evalOp( + tensors, KP_DEFAULT_SESSION, std::forward(params)...); } /** @@ -1414,10 +1412,8 @@ class Manager { SPDLOG_DEBUG("Kompute Manager evalOpAsyncDefault triggered"); this->mCurrentSequenceIndex++; - this->evalOpAsync(tensors, - KP_DEFAULT_SESSION + - std::to_string(this->mCurrentSequenceIndex), - std::forward(params)...); + this->evalOpAsync( + tensors, KP_DEFAULT_SESSION, std::forward(params)...); } /** @@ -1458,9 +1454,7 @@ class Manager void evalOpAwaitDefault(uint64_t waitFor = UINT64_MAX) { SPDLOG_DEBUG("Kompute Manager evalOpAwaitDefault triggered"); - this->evalOpAwait(KP_DEFAULT_SESSION + - std::to_string(this->mCurrentSequenceIndex), - waitFor); + this->evalOpAwait(KP_DEFAULT_SESSION, waitFor); } /** @@ -1493,7 +1487,10 @@ class Manager } /** - * Function that simplifies the common workflow of tensor initialisation. It will take the constructor parameters for a Tensor and will will us it to create a new Tensor. The tensor memory will then be managed and owned by the manager. + * Function that simplifies the common workflow of tensor initialisation. It + * will take the constructor parameters for a Tensor and will will us it to + * create a new Tensor. The tensor memory will then be managed and owned by + * the manager. * * @param data The data to initialize the tensor with * @param tensorType The type of tensor to initialize @@ -1513,7 +1510,8 @@ class Manager tensor->mapDataIntoHostMemory(); } - std::set>::iterator it = this->mManagedTensors.find(tensor); + std::set>::iterator it = + this->mManagedTensors.find(tensor); if (it == this->mManagedTensors.end()) { this->mManagedTensors.insert(tensor); } diff --git a/src/Manager.cpp b/src/Manager.cpp old mode 100755 new mode 100644 index 1db452d5b..98d07e49a --- a/src/Manager.cpp +++ b/src/Manager.cpp @@ -62,7 +62,8 @@ Manager::~Manager() SPDLOG_DEBUG("Kompute Manager explicitly freeing tensors"); for (const std::shared_ptr& tensor : this->mManagedTensors) { if (!tensor->isInit()) { - SPDLOG_ERROR("Kompute Manager attempted to free managed tensor but not tensor is not initialised"); + SPDLOG_ERROR("Kompute Manager attempted to free managed tensor " + "but not tensor is not initialised"); } tensor->freeMemoryDestroyGPUResources(); } @@ -142,8 +143,7 @@ Manager::createManagedSequence(std::string sequenceName, uint32_t queueIndex) if (sequenceName.empty()) { this->mCurrentSequenceIndex++; - this->mManagedSequences.insert( - { KP_DEFAULT_SESSION, sq }); + this->mManagedSequences.insert({ KP_DEFAULT_SESSION, sq }); } else { // TODO: Check if sequence doesn't already exist this->mManagedSequences.insert({ sequenceName, sq }); diff --git a/src/Tensor.cpp b/src/Tensor.cpp index 7400dfff4..a1ba15441 100644 --- a/src/Tensor.cpp +++ b/src/Tensor.cpp @@ -232,7 +232,8 @@ Tensor::mapDataFromHostMemory() } else if (this->mTensorType == TensorTypes::eDevice) { hostVisibleMemory = this->mStagingMemory; } else { - SPDLOG_WARN("Kompute Tensor mapping data not supported on storage tensor"); + SPDLOG_WARN( + "Kompute Tensor mapping data not supported on storage tensor"); return; } @@ -258,7 +259,8 @@ Tensor::mapDataIntoHostMemory() } else if (this->mTensorType == TensorTypes::eDevice) { hostVisibleMemory = this->mStagingMemory; } else { - SPDLOG_WARN("Kompute Tensor mapping data not supported on storage tensor"); + SPDLOG_WARN( + "Kompute Tensor mapping data not supported on storage tensor"); return; } diff --git a/src/include/kompute/Manager.hpp b/src/include/kompute/Manager.hpp index d7a08c49c..758206b95 100644 --- a/src/include/kompute/Manager.hpp +++ b/src/include/kompute/Manager.hpp @@ -1,7 +1,7 @@ #pragma once -#include #include +#include #include "kompute/Core.hpp" @@ -125,9 +125,8 @@ class Manager { SPDLOG_DEBUG("Kompute Manager evalOp Default triggered"); this->mCurrentSequenceIndex++; - this->evalOp(tensors, - KP_DEFAULT_SESSION, - std::forward(params)...); + this->evalOp( + tensors, KP_DEFAULT_SESSION, std::forward(params)...); } /** @@ -177,9 +176,8 @@ class Manager { SPDLOG_DEBUG("Kompute Manager evalOpAsyncDefault triggered"); this->mCurrentSequenceIndex++; - this->evalOpAsync(tensors, - KP_DEFAULT_SESSION, - std::forward(params)...); + this->evalOpAsync( + tensors, KP_DEFAULT_SESSION, std::forward(params)...); } /** @@ -220,8 +218,7 @@ class Manager void evalOpAwaitDefault(uint64_t waitFor = UINT64_MAX) { SPDLOG_DEBUG("Kompute Manager evalOpAwaitDefault triggered"); - this->evalOpAwait(KP_DEFAULT_SESSION, - waitFor); + this->evalOpAwait(KP_DEFAULT_SESSION, waitFor); } /** @@ -254,7 +251,10 @@ class Manager } /** - * Function that simplifies the common workflow of tensor initialisation. It will take the constructor parameters for a Tensor and will will us it to create a new Tensor. The tensor memory will then be managed and owned by the manager. + * Function that simplifies the common workflow of tensor initialisation. It + * will take the constructor parameters for a Tensor and will will us it to + * create a new Tensor. The tensor memory will then be managed and owned by + * the manager. * * @param data The data to initialize the tensor with * @param tensorType The type of tensor to initialize @@ -274,7 +274,8 @@ class Manager tensor->mapDataIntoHostMemory(); } - std::set>::iterator it = this->mManagedTensors.find(tensor); + std::set>::iterator it = + this->mManagedTensors.find(tensor); if (it == this->mManagedTensors.end()) { this->mManagedTensors.insert(tensor); } diff --git a/test/TestManager.cpp b/test/TestManager.cpp index 3e1db7b16..d822a13d3 100644 --- a/test/TestManager.cpp +++ b/test/TestManager.cpp @@ -17,7 +17,8 @@ TEST(TestManager, EndToEndOpMultFlow) mgr.rebuildTensors({ tensorOutput }); - mgr.evalOpDefault({ tensorLHS, tensorRHS, tensorOutput }); + mgr.evalOpDefault( + { tensorLHS, tensorRHS, tensorOutput }); mgr.evalOpDefault({ tensorLHS, tensorRHS, tensorOutput }); @@ -105,7 +106,8 @@ TEST(TestManager, TestMultipleTensorsAtOnce) sq->begin(); - sq->record({ tensorLHS, tensorRHS, tensorOutput }); + sq->record( + { tensorLHS, tensorRHS, tensorOutput }); sq->record({ tensorLHS, tensorRHS, tensorOutput }); diff --git a/test/TestMultipleAlgoExecutions.cpp b/test/TestMultipleAlgoExecutions.cpp index 9d696d55e..c98ba178b 100644 --- a/test/TestMultipleAlgoExecutions.cpp +++ b/test/TestMultipleAlgoExecutions.cpp @@ -248,7 +248,8 @@ TEST(TestMultipleAlgoExecutions, ManagerEvalMultSourceStrOpCreate) mgr.rebuildTensors({ tensorInA, tensorInB, tensorOut }); - mgr.evalOpDefault({ tensorInA, tensorInB, tensorOut }); + mgr.evalOpDefault( + { tensorInA, tensorInB, tensorOut }); std::string shader(R"( // The version to use @@ -306,7 +307,8 @@ TEST(TestMultipleAlgoExecutions, ManagerEvalMultSourceStrMgrCreate) } )"); - mgr.evalOpDefault({ tensorInA, tensorInB, tensorOut }); + mgr.evalOpDefault( + { tensorInA, tensorInB, tensorOut }); mgr.evalOpDefault( { tensorInA, tensorInB, tensorOut },