huggingface/text-generation-inference
5
0
Fork 0
mirror of https://github.com/huggingface/text-generation-inference.git synced 2025-09-11 12:24:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

misc(backend): indent

Browse Source
This commit is contained in:
Morgan Funtowicz 2024-12-13 15:38:04 +01:00
parent ab6591e759
commit 1640da7c08
1 changed files with 42 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
backends/trtllm/csrc/backend.hpp
View File

@ -39,21 +39,21 @@ namespace huggingface::tgi::backends::trtllm {
uint64_t seed; uint64_t seed;
constexpr explicit operator tle::SamplingConfig() const { constexpr explicit operator tle::SamplingConfig() const {
return tle::SamplingConfig { return tle::SamplingConfig{
1, 1,
top_k, top_k,
top_p, top_p,
std::nullopt, std::nullopt,
std::nullopt, std::nullopt,
std::nullopt, std::nullopt,
seed, seed,
temperature, temperature,
std::nullopt, std::nullopt,
std::nullopt, std::nullopt,
repetition_penalty, repetition_penalty,
std::nullopt, std::nullopt,
frequency_penalty, frequency_penalty,
std::nullopt std::nullopt
}; };
} }
}; };
@ -67,10 +67,10 @@ namespace huggingface::tgi::backends::trtllm {
float_t temperature; float_t temperature;
std::list<std::vector<int32_t>> stop_words; std::list<std::vector<int32_t>> stop_words;
constexpr explicit generation_config_t(const json &config): constexpr explicit generation_config_t(const json &config) :
top_p(config.value("top_p", 1.0f)), temperature( config.value("temperature", 1.0f)), stop_words(0) { top_p(config.value("top_p", 1.0f)), temperature(config.value("temperature", 1.0f)), stop_words(0) {
if(config.contains("/eos_token_id"_json_pointer) && config["/eos_token_id"_json_pointer].is_array()) { if (config.contains("/eos_token_id"_json_pointer) && config["/eos_token_id"_json_pointer].is_array()) {
const auto& eos_token_id = config["/eos_token_id"_json_pointer]; const auto &eos_token_id = config["/eos_token_id"_json_pointer];
std::for_each(eos_token_id.begin(), eos_token_id.end(), [this](const auto token_id) { std::for_each(eos_token_id.begin(), eos_token_id.end(), [this](const auto token_id) {
stop_words.emplace_back(1, token_id.template get<int32_t>()); stop_words.emplace_back(1, token_id.template get<int32_t>());
}); });
@ -97,13 +97,13 @@ namespace huggingface::tgi::backends::trtllm {
generation_config_t generation_config_; generation_config_t generation_config_;
public: public:
backend_workspace_t(std::filesystem::path &engines_folder, std::filesystem::path &executor_worker_path): backend_workspace_t(std::filesystem::path &engines_folder, std::filesystem::path &executor_worker_path) :
engines_folder_(engines_folder), engines_folder_(engines_folder),
executor_worker_path_(executor_worker_path), executor_worker_path_(executor_worker_path),
config_(as_json(engines_folder / "config.json")), config_(as_json(engines_folder / "config.json")),
generation_config_(as_json(engines_folder / "generation_config.json")) {}; generation_config_(as_json(engines_folder / "generation_config.json")) {};
backend_workspace_t(std::filesystem::path &&engines_folder, std::filesystem::path &&executor_worker_path): backend_workspace_t(std::filesystem::path &&engines_folder, std::filesystem::path &&executor_worker_path) :
engines_folder_(engines_folder), engines_folder_(engines_folder),
executor_worker_path_(executor_worker_path), executor_worker_path_(executor_worker_path),
config_(as_json(engines_folder / "config.json")), config_(as_json(engines_folder / "config.json")),
@ -120,9 +120,9 @@ namespace huggingface::tgi::backends::trtllm {
* `generation_config.json` holding default generation parameters. * `generation_config.json` holding default generation parameters.
* @return `generation_config_t` * @return `generation_config_t`
*/ */
[[nodiscard]] constexpr const generation_config_t& generation_config() const { return generation_config_; } [[nodiscard]] constexpr const generation_config_t &generation_config() const { return generation_config_; }
/** /**
* Factory method returning new `tensorrt_llm::executor::ParallelConfig` instance used * Factory method returning new `tensorrt_llm::executor::ParallelConfig` instance used
* to initialize `tensorrt_llm::executor::Executor` with multi-instance communication information * to initialize `tensorrt_llm::executor::Executor` with multi-instance communication information
* @return `tensorrt_llm::executor::ParallelConfig` instance * @return `tensorrt_llm::executor::ParallelConfig` instance
@ -159,8 +159,9 @@ namespace huggingface::tgi::backends::trtllm {
public: public:
backend_t(std::filesystem::path &engines_folder, std::filesystem::path &executor_worker_path); backend_t(std::filesystem::path &engines_folder, std::filesystem::path &executor_worker_path);
backend_t(std::filesystem::path &&engines_folder, std::filesystem::path &&executor_worker_path) backend_t(std::filesystem::path &&engines_folder, std::filesystem::path &&executor_worker_path)
: backend_t(engines_folder, executor_worker_path) {}; : backend_t(engines_folder, executor_worker_path) {};
/** /**
* Submit a new request to the executor * Submit a new request to the executor
@ -171,7 +172,8 @@ namespace huggingface::tgi::backends::trtllm {
*/ */
[[nodiscard("Discarded executor request_id needs to be assigned")]] [[nodiscard("Discarded executor request_id needs to be assigned")]]
std::expected<request_id_t, backend_error_t> std::expected<request_id_t, backend_error_t>
submit(std::span<const token_id_t> token_ids, generation_params_t generation_params, sampling_params_t sampling_params) noexcept; submit(std::span<const token_id_t> token_ids, generation_params_t generation_params,
sampling_params_t sampling_params) noexcept;
/** /**
* Query the number of tokens available across all in-flight generations * Query the number of tokens available across all in-flight generations
@ -198,21 +200,26 @@ namespace huggingface::tgi::backends::trtllm {
* Create a TensorRT-LLM executor from a workspace * Create a TensorRT-LLM executor from a workspace
*/ */
const auto executor_factory_initializer = [](const backend_workspace_t &workspace) -> tle::Executor { const auto executor_factory_initializer = [](const backend_workspace_t &workspace) -> tle::Executor {
return { workspace.engines_folder(), tensorrt_llm::executor::ModelType::kDECODER_ONLY, workspace.executor_config() }; return {workspace.engines_folder(), tensorrt_llm::executor::ModelType::kDECODER_ONLY,
workspace.executor_config()};
}; };
} }
/** /**
* Helper structures to define formatting strategies for various types in the backend * Helper structures to define formatting strategies for various types in the backend
*/ */
template <> struct fmt::formatter<huggingface::tgi::backends::trtllm::generation_params_t>: formatter<string_view> { template<>
auto format(huggingface::tgi::backends::trtllm::generation_params_t const& c, format_context& ctx) const -> format_context::iterator { struct fmt::formatter<huggingface::tgi::backends::trtllm::generation_params_t> : formatter<string_view> {
auto format(huggingface::tgi::backends::trtllm::generation_params_t const &c,
format_context &ctx) const -> format_context::iterator {
return fmt::format_to(ctx.out(), "generation_params_t{{ max_new_tokens={:d} }}", c.max_new_tokens); return fmt::format_to(ctx.out(), "generation_params_t{{ max_new_tokens={:d} }}", c.max_new_tokens);
} }
}; };
template <> struct fmt::formatter<huggingface::tgi::backends::trtllm::sampling_params_t>: formatter<string_view> { template<>
auto format(huggingface::tgi::backends::trtllm::sampling_params_t const& c, format_context& ctx) const -> format_context::iterator { struct fmt::formatter<huggingface::tgi::backends::trtllm::sampling_params_t> : formatter<string_view> {
auto format(huggingface::tgi::backends::trtllm::sampling_params_t const &c,
format_context &ctx) const -> format_context::iterator {
return fmt::format_to( return fmt::format_to(
ctx.out(), ctx.out(),
"sampling_params_t{{ top_k={:d}, top_p={:.3f}, repetition_penalty={:.3f}, frequency_penalty={:.3f}, temperature={:.3f}, seed={:d} }}", "sampling_params_t{{ top_k={:d}, top_p={:.3f}, repetition_penalty={:.3f}, frequency_penalty={:.3f}, temperature={:.3f}, seed={:d} }}",
@ -220,4 +227,5 @@ template <> struct fmt::formatter<huggingface::tgi::backends::trtllm::sampling_p
); );
} }
}; };
#endif #endif