Skip to content
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ option(TRITON_CORE_HEADERS_ONLY "Build only headers and stub" ON)
#
# Specifying min required C++ standard
#
set(TRITON_MIN_CXX_STANDARD 17 CACHE STRING "The minimum C++ standard which features are requested to build this target.")
set(TRITON_MIN_CXX_STANDARD 20 CACHE STRING "The minimum C++ standard which features are requested to build this target.")
Comment thread
mc-nv marked this conversation as resolved.

#
# Triton Server API
Expand Down
4 changes: 2 additions & 2 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ set(
infer_trace.cc
instance_queue.cc
label_provider.cc
memory.cc
triton_memory.cc
metric_model_reporter.cc
metrics.cc
metric_family.cc
Expand Down Expand Up @@ -180,7 +180,7 @@ set(
infer_trace.h
instance_queue.h
label_provider.h
memory.h
triton_memory.h
metric_model_reporter.h
metrics.h
metric_family.h
Expand Down
2 changes: 1 addition & 1 deletion src/backend_model.cc
Original file line number Diff line number Diff line change
Expand Up @@ -682,7 +682,7 @@ TritonModel::PrepareInstances(

// Note that the local variables should be captured by value
creation_results.emplace_back(
std::async(launch_policy, [=, &instance_mu]() {
std::async(launch_policy, [=, this, &instance_mu]() {
// The requested instance did not match an existing instance.
// Create a new instance.
std::shared_ptr<TritonModelInstance> new_instance;
Expand Down
4 changes: 2 additions & 2 deletions src/backend_model_instance.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2020-2022, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
// Copyright 2020-2026, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions
Expand Down Expand Up @@ -33,13 +33,13 @@
#include <thread>

#include "constants.h"
#include "memory.h"
#include "metric_model_reporter.h"
#include "model_config.pb.h"
#include "model_config_utils.h"
#include "server_message.h"
#include "status.h"
#include "triton/common/sync_queue.h"
#include "triton_memory.h"

namespace triton { namespace core {

Expand Down
2 changes: 1 addition & 1 deletion src/infer_request.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,12 @@
#include "infer_response.h"
#include "infer_stats.h"
#include "infer_trace.h"
#include "memory.h"
#include "response_allocator.h"
#include "sequence_state.h"
#include "status.h"
#include "triton/common/logging.h"
#include "triton/common/model_config.h"
#include "triton_memory.h"
#include "tritonserver_apis.h"

namespace triton { namespace core {
Expand Down
2 changes: 1 addition & 1 deletion src/sequence_state.cc
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@
#include <cstdint>

#include "cuda_utils.h"
#include "memory.h"
#include "model_config_utils.h"
#include "triton/common/logging.h"
#include "triton_memory.h"

namespace triton { namespace core {

Expand Down
2 changes: 1 addition & 1 deletion src/sequence_state.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@
#include <map>
#include <memory>

#include "memory.h"
#include "status.h"
#include "triton/common/model_config.h"
#include "triton_memory.h"

#pragma once

Expand Down
4 changes: 2 additions & 2 deletions src/test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -75,13 +75,13 @@ set(
set(
MEMORY_SRCS
../buffer_attributes.cc
../memory.cc
../triton_memory.cc
)

set(
MEMORY_HDRS
../buffer_attributes.h
../memory.h
../triton_memory.h
)

#
Expand Down
5 changes: 2 additions & 3 deletions src/test/memory_test.cc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2020-2022, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
// Copyright 2020-2026, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions
Expand All @@ -23,8 +23,6 @@
// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "memory.h"

#include <cuda_runtime_api.h>

#include "cuda_block_manager.h"
Expand All @@ -33,6 +31,7 @@
#include "gtest/gtest.h"
#include "pinned_memory_manager.h"
#include "triton/core/tritonserver.h"
#include "triton_memory.h"

namespace tc = triton::core;

Expand Down
4 changes: 2 additions & 2 deletions src/test/response_cache_test.cc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2021-2024, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
// Copyright 2021-2026, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions
Expand Down Expand Up @@ -29,8 +29,8 @@
#include "cache_manager.h"
#include "gtest/gtest-spi.h"
#include "gtest/gtest.h"
#include "memory.h"
#include "triton/common/logging.h"
#include "triton_memory.h"

namespace tc = triton::core;

Expand Down
4 changes: 2 additions & 2 deletions src/memory.cc → src/triton_memory.cc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2018-2022, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
// Copyright 2018-2026, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions
Expand All @@ -24,7 +24,7 @@
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

#include "memory.h"
#include "triton_memory.h"

#include "pinned_memory_manager.h"
#include "triton/common/logging.h"
Expand Down
2 changes: 1 addition & 1 deletion src/memory.h → src/triton_memory.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2018-2022, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
// Copyright 2018-2026, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions
Expand Down
Loading