mirror of
https://github.com/saymrwulf/onnxruntime.git
synced 2026-07-30 20:18:08 +00:00
[Fix] USE_NCCL -> ORT_USE_NCCL (#21136)
### Description Correct the macro used when NCCL enabled.
This commit is contained in:
parent
3a917e49fb
commit
adaf0e8116
5 changed files with 6 additions and 6 deletions
|
|
@ -29,7 +29,7 @@ namespace onnxruntime {
|
|||
namespace cuda {
|
||||
namespace collective {
|
||||
|
||||
#if defined(USE_MPI) || defined(USE_NCCL)
|
||||
#if defined(USE_MPI) || defined(ORT_USE_NCCL)
|
||||
|
||||
using namespace onnxruntime;
|
||||
using namespace onnxruntime::cuda;
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ namespace onnxruntime {
|
|||
namespace cuda {
|
||||
namespace collective {
|
||||
|
||||
#if defined(USE_MPI) || defined(USE_NCCL)
|
||||
#if defined(USE_MPI) || defined(ORT_USE_NCCL)
|
||||
|
||||
constexpr size_t WARP_SIZE = 32;
|
||||
constexpr size_t MAX_ALL_REDUCE_BLOCKS = 24;
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ namespace onnxruntime {
|
|||
namespace cuda {
|
||||
namespace collective {
|
||||
|
||||
#if defined(USE_MPI) || defined(USE_NCCL)
|
||||
#if defined(USE_MPI) || defined(ORT_USE_NCCL)
|
||||
|
||||
using namespace onnxruntime;
|
||||
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ namespace onnxruntime {
|
|||
namespace cuda {
|
||||
namespace collective {
|
||||
|
||||
#if defined(USE_MPI) || defined(USE_NCCL)
|
||||
#if defined(USE_MPI) || defined(ORT_USE_NCCL)
|
||||
|
||||
struct CudaDeleter {
|
||||
void operator()(void* ptr) const noexcept {
|
||||
|
|
@ -86,4 +86,4 @@ GetCustomAllReduceWorkspace(int rank, int world_size, size_t input_size, IPCMemo
|
|||
|
||||
} // namespace collective
|
||||
} // namespace cuda
|
||||
} // namespace onnxruntime
|
||||
} // namespace onnxruntime
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
|
||||
#include "core/providers/cuda/cuda_kernel.h"
|
||||
|
||||
#if defined(ORT_USE_NCCL) || defined(ORT_USE_MPI)
|
||||
#if defined(ORT_USE_NCCL) || defined(USE_MPI)
|
||||
#ifndef USE_ROCM
|
||||
#include "custom_reduce_impl.h"
|
||||
#include "ipc_utils.h"
|
||||
|
|
|
|||
Loading…
Reference in a new issue