thek0tyara/llama-cpp-turboquant
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Sequence now exposed via shared_ptr instead of weak_ptr and memory release is done through destructor based on the isInit member variable

Browse source
This commit is contained in:
Alejandro Saucedo 2020-11-01 20:25:15 +00:00
parent b0d394a50b
commit 473031d1f3
3 changed files with 38 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/Manager.cpp
View file

@ -59,7 +59,10 @@ Manager::~Manager()
}
if (this->mManagedSequences.size()) {
SPDLOG_DEBUG("Releasing managed sequence");
SPDLOG_DEBUG("Kompute Manager explicitly running destructor for managed sequences");
for (const std::pair<std::string, std::shared_ptr<Sequence>> &sqPair : this->mManagedSequences) {
sqPair.second->~Sequence();
}
this->mManagedSequences.clear();
}
@ -91,7 +94,7 @@ Manager::~Manager()
}
}
std::weak_ptr<Sequence>
std::shared_ptr<Sequence>
Manager::getOrCreateManagedSequence(std::string sequenceName)
{
SPDLOG_DEBUG("Kompute Manager creating Sequence object");
@ -106,7 +109,7 @@ Manager::getOrCreateManagedSequence(std::string sequenceName)
}
}
std::weak_ptr<Sequence>
std::shared_ptr<Sequence>
Manager::createManagedSequence(std::string sequenceName, uint32_t queueIndex)
{

10
src/Sequence.cpp
View file

@ -27,9 +27,15 @@ Sequence::~Sequence()
{
SPDLOG_DEBUG("Kompute Sequence Destructor started");
if (!this->mIsInit) {
SPDLOG_WARN("Kompute Sequence destructor called but sequence is not initialized.");
return;
}
if (!this->mDevice) {
SPDLOG_ERROR(
"Kompute Sequence destructor reached with null Device pointer");
this->mIsInit = false;
return;
}
@ -38,6 +44,7 @@ Sequence::~Sequence()
if (!this->mCommandBuffer) {
SPDLOG_ERROR("Kompute Sequence destructor reached with null "
"CommandPool pointer");
this->mIsInit = false;
return;
}
this->mDevice->freeCommandBuffers(
@ -50,11 +57,14 @@ Sequence::~Sequence()
if (this->mCommandPool == nullptr) {
SPDLOG_ERROR("Kompute Sequence destructor reached with null "
"CommandPool pointer");
this->mIsInit = false;
return;
}
this->mDevice->destroy(*this->mCommandPool, (vk::Optional<const vk::AllocationCallbacks>)nullptr);
SPDLOG_DEBUG("Kompute Sequence Destroyed CommandPool");
}
this->mIsInit = false;
}
void

50
src/include/kompute/Manager.hpp
View file

@ -63,9 +63,9 @@ class Manager
*
* @param sequenceName The name for the named sequence to be retrieved or
* created
* @return Weak pointer to the manager owned sequence resource
* @return Shared pointer to the manager owned sequence resource
*/
std::weak_ptr<Sequence> getOrCreateManagedSequence(
std::shared_ptr<Sequence> getOrCreateManagedSequence(
std::string sequenceName);
/**
@ -77,7 +77,7 @@ class Manager
* @param queueIndex The queue to use from the available queues
* @return Weak pointer to the manager owned sequence resource
*/
std::weak_ptr<Sequence> createManagedSequence(std::string sequenceName = "",
std::shared_ptr<Sequence> createManagedSequence(std::string sequenceName = "",
uint32_t queueIndex = 0);
/**
@ -94,22 +94,21 @@ class Manager
TArgs&&... params)
{
SPDLOG_DEBUG("Kompute Manager evalOp triggered");
std::weak_ptr<Sequence> sqWeakPtr =
std::shared_ptr<kp::Sequence> sq =
this->getOrCreateManagedSequence(sequenceName);
if (std::shared_ptr<kp::Sequence> sq = sqWeakPtr.lock()) {
SPDLOG_DEBUG("Kompute Manager evalOp running sequence BEGIN");
sq->begin();
SPDLOG_DEBUG("Kompute Manager evalOp running sequence BEGIN");
sq->begin();
SPDLOG_DEBUG("Kompute Manager evalOp running sequence RECORD");
sq->record<T>(tensors, std::forward<TArgs>(params)...);
SPDLOG_DEBUG("Kompute Manager evalOp running sequence RECORD");
sq->record<T>(tensors, std::forward<TArgs>(params)...);
SPDLOG_DEBUG("Kompute Manager evalOp running sequence END");
sq->end();
SPDLOG_DEBUG("Kompute Manager evalOp running sequence END");
sq->end();
SPDLOG_DEBUG("Kompute Manager evalOp running sequence EVAL");
sq->eval();
SPDLOG_DEBUG("Kompute Manager evalOp running sequence EVAL");
sq->eval();
}
SPDLOG_DEBUG("Kompute Manager evalOp running sequence SUCCESS");
}
@ -147,26 +146,21 @@ class Manager
{
SPDLOG_DEBUG("Kompute Manager evalOpAsync triggered");
std::weak_ptr<Sequence> sqWeakPtr =
std::shared_ptr<kp::Sequence> sq =
this->getOrCreateManagedSequence(sequenceName);
if (std::shared_ptr<kp::Sequence> sq = sqWeakPtr.lock()) {
SPDLOG_DEBUG("Kompute Manager evalOpAsync running sequence BEGIN");
sq->begin();
SPDLOG_DEBUG("Kompute Manager evalOpAsync running sequence BEGIN");
sq->begin();
SPDLOG_DEBUG("Kompute Manager evalOpAsync running sequence RECORD");
sq->record<T>(tensors, std::forward<TArgs>(params)...);
SPDLOG_DEBUG("Kompute Manager evalOpAsync running sequence RECORD");
sq->record<T>(tensors, std::forward<TArgs>(params)...);
SPDLOG_DEBUG("Kompute Manager evalOpAsync running sequence END");
sq->end();
SPDLOG_DEBUG("Kompute Manager evalOpAsync running sequence END");
sq->end();
SPDLOG_DEBUG("Kompute Manager evalOpAsync running sequence EVAL");
sq->evalAsync();
SPDLOG_DEBUG("Kompute Manager evalOpAsync running sequence EVAL");
sq->evalAsync();
} else {
SPDLOG_ERROR("Kompute Manager evalOpAsync sequence [{}] not found",
sequenceName);
}
SPDLOG_DEBUG("Kompute Manager evalOpAsync running sequence SUCCESS");
}