Skip to content

Rename nvls* files #660

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chhwang merged 3 commits into from
Oct 24, 2025
Merged

Rename nvls* files #660

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
beb8f93
Rename nvls* files
chhwang Oct 23, 2025
ac6dd13
Merge branch 'main' into chhwang/switch-channel
chhwang Oct 23, 2025
c24f5fe
Merge branch 'main' into chhwang/switch-channel
chhwang Oct 24, 2025
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 apps/nccl/src/allreduce.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
#include <mscclpp/gpu_data_types.hpp>
#include <mscclpp/memory_channel.hpp>
#include <mscclpp/memory_channel_device.hpp>
#include <mscclpp/nvls.hpp>
#include <mscclpp/packet_device.hpp>
#include <mscclpp/switch_channel.hpp>
#include <type_traits>

#if defined(ENABLE_NPKIT)
Expand Down
6 changes: 3 additions & 3 deletions apps/nccl/src/common.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include <algorithm>
#include <mscclpp/core.hpp>
#include <mscclpp/memory_channel.hpp>
#include <mscclpp/nvls.hpp>
#include <mscclpp/switch_channel.hpp>

#include "common.hpp"

Expand Down Expand Up @@ -98,8 +98,8 @@ std::vector<mscclpp::SwitchChannel> setupNvlsChannels(std::vector<std::shared_pt

for (int idx = 0; idx < nSwitchChannels; ++idx) {
std::shared_ptr<mscclpp::NvlsConnection> nvlsConnection = conns[idx];
mscclpp::SwitchChannel SwitchChannel = nvlsConnection->bindAllocatedMemory((CUdeviceptr)buffer, bufferSize);
channels.push_back(SwitchChannel);
mscclpp::SwitchChannel switchChannel = nvlsConnection->bindAllocatedMemory((CUdeviceptr)buffer, bufferSize);
channels.push_back(switchChannel);
}
return channels;
}
Expand Down
2 changes: 1 addition & 1 deletion apps/nccl/src/common.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#include <mscclpp/core.hpp>
#include <mscclpp/env.hpp>
#include <mscclpp/memory_channel.hpp>
#include <mscclpp/nvls.hpp>
#include <mscclpp/switch_channel.hpp>
#include <vector>

#if defined(__HIP_PLATFORM_AMD__)
Expand Down
6 changes: 0 additions & 6 deletions apps/nccl/src/nccl.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,10 @@
#include <algorithm>
#include <filesystem>
#include <functional>
#include <mscclpp/concurrency_device.hpp>
#include <mscclpp/core.hpp>
#include <mscclpp/env.hpp>
#include <mscclpp/executor.hpp>
#include <mscclpp/memory_channel.hpp>
#include <mscclpp/memory_channel_device.hpp>
#include <mscclpp/nvls.hpp>
#include <mscclpp/utils.hpp>
#include <queue>
#include <sstream>
#include <unordered_map>
#include <vector>
#if defined(ENABLE_NPKIT)
Expand Down
2 changes: 1 addition & 1 deletion include/mscclpp/algorithm.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@

#include <memory>
#include <mscclpp/memory_channel.hpp>
#include <mscclpp/nvls.hpp>
#include <mscclpp/port_channel.hpp>
#include <mscclpp/switch_channel.hpp>
#include <vector>

namespace mscclpp {
Expand Down
6 changes: 3 additions & 3 deletions include/mscclpp/nvls.hpp → include/mscclpp/switch_channel.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT license.

#ifndef MSCCLPP_NVLS_HPP_
#define MSCCLPP_NVLS_HPP_
#ifndef MSCCLPP_SWITCH_CHANNEL_HPP_
#define MSCCLPP_SWITCH_CHANNEL_HPP_

#include <mscclpp/gpu_utils.hpp>
#include <mscclpp/switch_channel_device.hpp>
Expand Down Expand Up @@ -68,4 +68,4 @@ std::shared_ptr<NvlsConnection> connectNvlsCollective(std::shared_ptr<Communicat

} // namespace mscclpp

#endif // MSCCLPP_NVLS_HPP_
#endif // MSCCLPP_SWITCH_CHANNEL_HPP_
2 changes: 1 addition & 1 deletion python/mscclpp/nvls_py.cpp → python/mscclpp/switch_channel_py.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#include <nanobind/stl/vector.h>

#include <mscclpp/core.hpp>
#include <mscclpp/nvls.hpp>
#include <mscclpp/switch_channel.hpp>

namespace nb = nanobind;
using namespace mscclpp;
Expand Down
3 changes: 1 addition & 2 deletions src/executor/executor.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,8 @@

#include <mscclpp/executor.hpp>
#include <mscclpp/memory_channel.hpp>
#include <mscclpp/nvls.hpp>
#include <mscclpp/port_channel.hpp>
#include <set>
#include <mscclpp/switch_channel.hpp>

#include "debug.h"
#include "execution_kernel.hpp"
Expand Down
2 changes: 1 addition & 1 deletion src/include/execution_common.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
#define MSCCLPP_EXECUTION_COMMON_HPP_

#include <mscclpp/memory_channel.hpp>
#include <mscclpp/nvls.hpp>
#include <mscclpp/port_channel.hpp>
#include <mscclpp/switch_channel.hpp>

namespace mscclpp {

Expand Down
2 changes: 1 addition & 1 deletion src/nvls.cc → src/switch_channel.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

#include <algorithm>
#include <mscclpp/core.hpp>
#include <mscclpp/nvls.hpp>
#include <mscclpp/switch_channel.hpp>
#include <mscclpp/utils.hpp>

#include "api.h"
Expand Down
2 changes: 1 addition & 1 deletion test/mp_unit/switch_channel_tests.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Licensed under the MIT license.

#include <algorithm>
#include <mscclpp/nvls.hpp>
#include <mscclpp/switch_channel.hpp>
#include <mscclpp/switch_channel_device.hpp>

#include "mp_unit_tests.hpp"
Expand Down
Loading