mirror of
https://github.com/NVIDIA/TensorRT-LLM.git
synced 2026-01-14 06:27:45 +08:00
* refactor: Update ExecutorConfig to use AdditionalModelOutput type - Changed function signatures and member variables across multiple files to replace std::optional<std::vector<std::string>> with std::optional<std::vector<executor::AdditionalModelOutput>> to include gatherContext flag for each additional output. - Updated related serialization and deserialization methods to accommodate the new type. - Adjusted tests to reflect the changes in the output handling structure. This refactor enhances the flexibility and maintainability of the output configuration in the executor and batch manager components. Signed-off-by: Robin Kobus <19427718+Funatiq@users.noreply.github.com> * refactor: Remove equality operator from TrtGptModelOptionalParams - Deleted the operator== implementation from TrtGptModelOptionalParams to simplify the class. - Updated the pybind11 bindings to remove the exposure of the equality operator to Python. This change streamlines the class definition and reduces unnecessary complexity in the bindings. Signed-off-by: Robin Kobus <19427718+Funatiq@users.noreply.github.com> * refactor: Enhance copyAdditionalOutputs to utilize AdditionalModelOutput - Updated the copyAdditionalOutputs function to accept a vector of AdditionalModelOutput, allowing for the inclusion of the gatherContext flag. - Adjusted the logic to handle context and non-context outputs separately, improving the output handling mechanism. - Modified related unit tests to incorporate the new gatherContext parameter, ensuring comprehensive testing of the updated functionality. This refactor improves the flexibility and clarity of output management in the batch processing workflow. Signed-off-by: Robin Kobus <19427718+Funatiq@users.noreply.github.com> * refactor: Introduce findOutputTensor utility function for output tensor retrieval - Added a new utility function, findOutputTensor, to encapsulate the logic for finding output tensors and checking their validity. - Refactored copyAdditionalOutputs to utilize findOutputTensor, reducing code duplication and improving clarity. - Enhanced error checking for additional context and generation output tensors. This change streamlines the output tensor retrieval process, enhancing maintainability and readability in the batch processing workflow. Signed-off-by: Robin Kobus <19427718+Funatiq@users.noreply.github.com> * refactor: Check final indices of additional output tensors and update tests - Added checks to verify the final indices of additional output tensors for context and generation outputs. - Updated unit tests to verify the changes. - Add lastTokenIds input tensor to test engines. - Logits output depends on gatherContextLogits parameter. - Removed gatherContextOutputs parameter from the validate method in LlmRequest. - Context outputs do not depend on computeContextLogits parameter. Signed-off-by: Robin Kobus <19427718+Funatiq@users.noreply.github.com> * fixup! refactor: Check final indices of additional output tensors and update tests Signed-off-by: Robin Kobus <19427718+Funatiq@users.noreply.github.com> * fixup! refactor: Update ExecutorConfig to use AdditionalModelOutput type Signed-off-by: Robin Kobus <19427718+Funatiq@users.noreply.github.com> * fixup! refactor: Remove equality operator from TrtGptModelOptionalParams Signed-off-by: Robin Kobus <19427718+Funatiq@users.noreply.github.com> * docs: Update executor.md Signed-off-by: Robin Kobus <19427718+Funatiq@users.noreply.github.com> * chore: Clean up includes Signed-off-by: Robin Kobus <19427718+Funatiq@users.noreply.github.com> --------- Signed-off-by: Robin Kobus <19427718+Funatiq@users.noreply.github.com>
128 lines
6.0 KiB
C++
128 lines
6.0 KiB
C++
/*
|
|
* SPDX-FileCopyrightText: Copyright (c) 2022-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
|
|
* SPDX-License-Identifier: Apache-2.0
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#include "tensorrt_llm/batch_manager/kvCacheConfig.h"
|
|
#include "tensorrt_llm/batch_manager/peftCacheManagerConfig.h"
|
|
#include "tensorrt_llm/executor/executor.h"
|
|
#include "tensorrt_llm/runtime/common.h"
|
|
|
|
#include <cstdint>
|
|
#include <optional>
|
|
#include <utility>
|
|
#include <vector>
|
|
|
|
namespace tensorrt_llm::batch_manager
|
|
{
|
|
|
|
class TrtGptModelOptionalParams
|
|
{
|
|
using KvCacheConfig = kv_cache_manager::KvCacheConfig;
|
|
|
|
public:
|
|
using SizeType32 = tensorrt_llm::runtime::SizeType32;
|
|
|
|
explicit TrtGptModelOptionalParams(KvCacheConfig kvCacheConfig = KvCacheConfig{}, bool enableTrtOverlap = false,
|
|
std::optional<std::vector<SizeType32>> deviceIds = std::nullopt, bool normalizeLogProbs = true,
|
|
bool enableChunkedContext = true,
|
|
PeftCacheManagerConfig const& peftCacheManagerConfig = PeftCacheManagerConfig{},
|
|
executor::DecodingConfig decodingConfig = executor::DecodingConfig{}, float gpuWeightsPercent = 1,
|
|
std::optional<SizeType32> maxBeamWidth = std::nullopt, std::optional<SizeType32> maxBatchSize = std::nullopt,
|
|
std::optional<SizeType32> maxNumTokens = std::nullopt,
|
|
executor::SchedulerConfig schedulerConfig = executor::SchedulerConfig{},
|
|
executor::ExtendedRuntimePerfKnobConfig const& extendedRuntimePerfKnobConfig
|
|
= executor::ExtendedRuntimePerfKnobConfig{},
|
|
std::optional<executor::DebugConfig> debugConfig = std::nullopt,
|
|
uint64_t maxSeqIdleMicroseconds = executor::ExecutorConfig::kDefaultMaxSeqIdleMicroseconds,
|
|
std::optional<executor::SpeculativeDecodingConfig> specDecConfig = std::nullopt,
|
|
std::optional<executor::GuidedDecodingConfig> guidedDecodingConfig = std::nullopt,
|
|
bool isLeaderInOrchMode = false,
|
|
std::optional<std::vector<executor::AdditionalModelOutput>> additionalModelOutputs = std::nullopt,
|
|
bool gatherGenerationLogits = false)
|
|
: kvCacheConfig{std::move(kvCacheConfig)}
|
|
, enableTrtOverlap{enableTrtOverlap}
|
|
, deviceIds(std::move(deviceIds))
|
|
, normalizeLogProbs{normalizeLogProbs}
|
|
, enableChunkedContext{enableChunkedContext}
|
|
, peftCacheManagerConfig(peftCacheManagerConfig)
|
|
, decodingConfig(std::move(decodingConfig))
|
|
, gpuWeightsPercent(gpuWeightsPercent)
|
|
, maxBeamWidth(maxBeamWidth)
|
|
, maxBatchSize(maxBatchSize)
|
|
, maxNumTokens(maxNumTokens)
|
|
, schedulerConfig{std::move(schedulerConfig)}
|
|
, extendedRuntimePerfKnobConfig(extendedRuntimePerfKnobConfig)
|
|
, debugConfig{std::move(debugConfig)}
|
|
, maxSeqIdleMicroseconds{maxSeqIdleMicroseconds}
|
|
, speculativeDecodingConfig{specDecConfig}
|
|
, guidedDecodingConfig{std::move(guidedDecodingConfig)}
|
|
, isLeaderInOrchMode{isLeaderInOrchMode}
|
|
, additionalModelOutputs{std::move(additionalModelOutputs)}
|
|
, gatherGenerationLogits{gatherGenerationLogits}
|
|
{
|
|
if (guidedDecodingConfig)
|
|
{
|
|
guidedDecodingConfig->validate();
|
|
}
|
|
}
|
|
|
|
explicit TrtGptModelOptionalParams(executor::ExecutorConfig const& executorConfig, bool isLeaderInOrchMode)
|
|
: TrtGptModelOptionalParams(KvCacheConfig(executorConfig.getKvCacheConfig()), false,
|
|
executorConfig.getParallelConfig().value_or(executor::ParallelConfig()).getDeviceIds(),
|
|
executorConfig.getNormalizeLogProbs(), executorConfig.getEnableChunkedContext(),
|
|
PeftCacheManagerConfig(executorConfig.getPeftCacheConfig().value_or(executor::PeftCacheConfig())),
|
|
executorConfig.getDecodingConfig().value_or(executor::DecodingConfig{}),
|
|
executorConfig.getGpuWeightsPercent(), executorConfig.getMaxBeamWidth(), executorConfig.getMaxBatchSize(),
|
|
executorConfig.getMaxNumTokens(), executorConfig.getSchedulerConfig(),
|
|
executorConfig.getExtendedRuntimePerfKnobConfig(), executorConfig.getDebugConfig(),
|
|
executorConfig.getMaxSeqIdleMicroseconds(), executorConfig.getSpecDecConfig(),
|
|
executorConfig.getGuidedDecodingConfig(), isLeaderInOrchMode, executorConfig.getAdditionalModelOutputs(),
|
|
executorConfig.getGatherGenerationLogits())
|
|
{
|
|
}
|
|
|
|
friend std::ostream& operator<<(std::ostream& os, TrtGptModelOptionalParams const& self);
|
|
|
|
KvCacheConfig kvCacheConfig;
|
|
|
|
bool enableTrtOverlap;
|
|
std::optional<std::vector<SizeType32>> deviceIds;
|
|
bool normalizeLogProbs;
|
|
bool enableChunkedContext;
|
|
PeftCacheManagerConfig peftCacheManagerConfig;
|
|
executor::DecodingConfig decodingConfig;
|
|
// Percentage of weights on the gpu at runtime
|
|
float gpuWeightsPercent;
|
|
std::optional<SizeType32> maxBeamWidth;
|
|
std::optional<SizeType32> maxBatchSize;
|
|
std::optional<SizeType32> maxNumTokens;
|
|
executor::SchedulerConfig schedulerConfig;
|
|
executor::ExtendedRuntimePerfKnobConfig extendedRuntimePerfKnobConfig;
|
|
std::optional<executor::DebugConfig> debugConfig;
|
|
// Sequence is considered idle if not updated for this amount of time.
|
|
uint64_t maxSeqIdleMicroseconds;
|
|
std::optional<executor::SpeculativeDecodingConfig> speculativeDecodingConfig;
|
|
std::optional<executor::GuidedDecodingConfig> guidedDecodingConfig;
|
|
// This rank is the leader worker in orchestrator mode
|
|
bool isLeaderInOrchMode;
|
|
std::optional<std::vector<executor::AdditionalModelOutput>> additionalModelOutputs;
|
|
bool gatherGenerationLogits;
|
|
};
|
|
|
|
} // namespace tensorrt_llm::batch_manager
|