root/llama.cpp
1
0
Fork 0
mirror of https://github.com/ggerganov/llama.cpp.git synced 2025-01-13 04:00:16 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

tool-call: add fs_list_files to common, w/ win32 impl for msys2 build

Browse Source
This commit is contained in:
ochafik 2024-09-29 00:34:07 +01:00
parent cb7912ee74
commit 9ac4b04aa2
3 changed files with 41 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
common/common.cpp
View File

@ -44,6 +44,7 @@
#include <fcntl.h>
#include <io.h>
#else
#include <dirent.h>
#include <sys/ioctl.h>
#include <sys/stat.h>
#include <unistd.h>
@ -777,6 +778,43 @@ bool fs_create_directory_with_parents(const std::string & path) {
#endif // _WIN32
}
std::vector<std::string> fs_list_files(const std::string & folder, const std::string & ext) {
std::vector<std::string> files;
// Note: once we can use C++17 this becomes:
// for (const auto & entry : std::filesystem::directory_iterator(folder))
// if (entry.path().extension() == ext) files.push_back(entry.path().string());
#ifdef _WIN32
std::string search_path = folder + "\\*" + ext;
WIN32_FIND_DATA fd;
HANDLE hFind = ::FindFirstFile(search_path.c_str(), &fd);
if (hFind != INVALID_HANDLE_VALUE) {
do {
if (!(fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) {
files.push_back(folder + "\\" + fd.cFileName);
}
} while (::FindNextFile(hFind, &fd));
::FindClose(hFind);
}
#else
DIR* dir = opendir(folder.c_str());
if (dir != nullptr) {
struct dirent* entry;
while ((entry = readdir(dir)) != nullptr) {
if (entry->d_type == DT_REG) { // If it's a regular file
std::string filename = entry->d_name;
if (filename.length() >= ext.length() &&
filename.compare(filename.length() - ext.length(), ext.length(), ext) == 0) {
files.push_back(folder + "/" + filename);
}
}
}
closedir(dir);
}
#endif
return files;
}
std::string fs_get_cache_directory() {
std::string cache_directory = "";
auto ensure_trailing_slash = [](std::string p) {

1
common/common.h
View File

@ -397,6 +397,7 @@ std::string string_from(const struct llama_context * ctx, const struct llama_bat
bool fs_validate_filename(const std::string & filename);
bool fs_create_directory_with_parents(const std::string & path);
std::vector<std::string> fs_list_files(const std::string & path, const std::string & ext);
std::string fs_get_cache_directory();
std::string fs_get_cache_file(const std::string & filename);

26
tests/test-chat-template.cpp
View File

@ -13,7 +13,6 @@
#include <iostream>
#include <string>
#include <json.hpp>
#include <dirent.h>
using json = nlohmann::ordered_json;
@ -39,30 +38,9 @@ static void assert_equals(const T & expected, const T & actual) {
}
static std::vector<std::string> find_files(const std::string & folder, const std::string & ext) {
auto do_find = [&](const std::string & folder) {
std::vector<std::string> files;
// Note: once we can use C++17 this becomes:
// for (const auto & entry : std::filesystem::directory_iterator(folder))
// if (entry.path().extension() == ext) files.push_back(entry.path().string());
DIR* dir = opendir(folder.c_str());
if (dir != nullptr) {
struct dirent* entry;
while ((entry = readdir(dir)) != nullptr) {
if (entry->d_type == DT_REG) { // If it's a regular file
std::string filename = entry->d_name;
if (filename.length() >= ext.length() &&
filename.compare(filename.length() - ext.length(), ext.length(), ext) == 0) {
files.push_back(folder + "/" + filename);
}
}
}
closedir(dir);
}
return files;
};
auto files = do_find(folder);
auto files = fs_list_files(folder, ext);
if (files.empty()) {
files = do_find("../" + folder);
files = fs_list_files("../" + folder, ext);
}
return files;
}