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

Replaced set and list to string with fmt::join

Browse source 
Signed-off-by: Fabian Sauter <sauter.fabian@mailbox.org>
This commit is contained in:
Fabian Sauter 2022-07-26 13:39:42 +02:00
parent 089f258968
commit 7673db6959
3 changed files with 3 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/Manager.cpp
View file

@ -380,7 +380,7 @@ Manager::createDevice(const std::vector<uint32_t>& familyQueueIndices,
}
KP_LOG_DEBUG("Kompute Manager desired extension layers {}",
logger::vecToString(desiredExtensions));
fmt::join(desiredExtensions, ", "));
std::vector<vk::ExtensionProperties> deviceExtensions =
this->mPhysicalDevice->enumerateDeviceExtensionProperties();
@ -390,7 +390,7 @@ Manager::createDevice(const std::vector<uint32_t>& familyQueueIndices,
uniqueExtensionNames.insert(ext.extensionName);
}
KP_LOG_DEBUG("Kompute Manager available extensions {}",
logger::setToString(uniqueExtensionNames));
fmt::join(uniqueExtensionNames, ", "));
std::vector<const char*> validExtensions;
for (const std::string& ext : desiredExtensions) {
if (uniqueExtensionNames.count(ext) != 0) {
@ -399,7 +399,7 @@ Manager::createDevice(const std::vector<uint32_t>& familyQueueIndices,
}
if (desiredExtensions.size() != validExtensions.size()) {
KP_LOG_ERROR("Kompute Manager not all extensions were added: {}",
logger::vecToString(validExtensions));
fmt::join(validExtensions, ", "));
}
vk::DeviceCreateInfo deviceCreateInfo(vk::DeviceCreateFlags(),

9
src/include/kompute/logger/Logger.hpp
View file

@ -184,15 +184,6 @@ spdlog::level::level_enum
getLogLevel();
#endif // !KOMPUTE_OPT_USE_SPDLOG
std::string
setToString(const std::set<std::string>& set);
std::string
vecToString(const std::vector<const char*>& vec);
std::string
vecToString(const std::vector<std::string>& vec);
} // namespace logger
#endif // KOMPUTE_OPT_LOG_LEVEL_DISABLED

39
src/logger/Logger.cpp
View file

@ -93,45 +93,6 @@ setLogLevel(const spdlog::level::level_enum level)
spdlog::default_logger()->set_level(level);
}
#endif // !KOMPUTE_OPT_USE_SPDLOG
std::string
setToString(const std::set<std::string>& set)
{
std::string result;
for (const std::string& entry : set) {
result += entry + ", ";
}
if (result.empty()) {
return result;
}
return result.substr(0, result.size() - 2); // Remove the tailing ", "
}
std::string
vecToString(const std::vector<const char*>& vec)
{
std::string result;
for (const char* entry : vec) {
result += std::string(entry) + ", ";
}
if (result.empty()) {
return result;
}
return result.substr(0, result.size() - 2); // Remove the tailing ", "
}
std::string
vecToString(const std::vector<std::string>& vec)
{
std::string result;
for (const std::string& entry : vec) {
result += entry + ", ";
}
if (result.empty()) {
return result;
}
return result.substr(0, result.size() - 2); // Remove the tailing ", "
}
} // namespace logger
#endif