Skip to content
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

Update includes in header files #448

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Update includes in header files #448

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1af0cc2
Update includes in header files
chhwang Jan 9, 2025
30c6c72
Merge branch 'main' into chhwang/macro
chhwang Jan 9, 2025
59f727c
Merge branch 'main' into chhwang/macro
chhwang Jan 11, 2025
ac5f17d
Merge branch 'main' into chhwang/macro
chhwang Jan 18, 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 include/mscclpp/atomic_device.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#ifndef MSCCLPP_ATOMIC_DEVICE_HPP_
#define MSCCLPP_ATOMIC_DEVICE_HPP_

#include "device.hpp"
#include <mscclpp/device.hpp>

#if defined(MSCCLPP_DEVICE_CUDA)
#include <cuda/atomic>
Expand Down
8 changes: 6 additions & 2 deletions include/mscclpp/concurrency_device.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,12 @@
#ifndef MSCCLPP_CONCURRENCY_DEVICE_HPP_
#define MSCCLPP_CONCURRENCY_DEVICE_HPP_

#include "atomic_device.hpp"
#include "poll_device.hpp"
#include <mscclpp/device.hpp>

#if defined(MSCCLPP_DEVICE_COMPILE)
#include <mscclpp/atomic_device.hpp>
#include <mscclpp/poll_device.hpp>
#endif // defined(MSCCLPP_DEVICE_COMPILE)

namespace mscclpp {

Expand Down
5 changes: 4 additions & 1 deletion include/mscclpp/core.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,13 @@
#include <bitset>
#include <future>
#include <memory>
#include <mscclpp/errors.hpp>
#include <string>
#include <vector>

// clang-format off
#include <mscclpp/errors.hpp>
// clang-format on

namespace mscclpp {

#define MSCCLPP_UNIQUE_ID_BYTES 128
Expand Down
4 changes: 3 additions & 1 deletion include/mscclpp/executor.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,11 @@
#define MSCCLPP_EXECUTOR_HPP_

#include <memory>

// clang-format off
#include <mscclpp/core.hpp>
#include <mscclpp/gpu.hpp>
#include <unordered_map>
// clang-format on

namespace mscclpp {

Expand Down
6 changes: 3 additions & 3 deletions include/mscclpp/fifo.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
#ifndef MSCCLPP_FIFO_HPP_
#define MSCCLPP_FIFO_HPP_

#include <cstdint>
#include <functional>
#include <memory>

#include "fifo_device.hpp"
// clang-format off
#include <mscclpp/fifo_device.hpp>
// clang-format on

namespace mscclpp {

Expand Down
9 changes: 5 additions & 4 deletions include/mscclpp/fifo_device.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,13 @@

#include <cstdint>

#include "device.hpp"

// clang-format off
#include <mscclpp/device.hpp>
#if defined(MSCCLPP_DEVICE_COMPILE)
#include "atomic_device.hpp"
#include "poll_device.hpp"
#include <mscclpp/atomic_device.hpp>
#include <mscclpp/poll_device.hpp>
#endif // defined(MSCCLPP_DEVICE_COMPILE)
// clang-format on

namespace mscclpp {

Expand Down
8 changes: 5 additions & 3 deletions include/mscclpp/gpu_utils.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,11 @@

#include <memory>

#include "errors.hpp"
#include "gpu.hpp"
#include "utils.hpp"
// clang-format off
#include <mscclpp/errors.hpp>
#include <mscclpp/gpu.hpp>
#include <mscclpp/utils.hpp>
// clang-format on

/// Throw @ref mscclpp::CudaError if @p cmd does not return cudaSuccess.
/// @param cmd The command to execute.
Expand Down
11 changes: 4 additions & 7 deletions include/mscclpp/nvls_device.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,13 @@
#ifndef MSCCLPP_NVLS_DEVICE_HPP_
#define MSCCLPP_NVLS_DEVICE_HPP_

#include <mscclpp/gpu.hpp>
#include <type_traits>

#if defined(MSCCLPP_DEVICE_CUDA)
#include <cuda_fp16.h>
#endif // defined(MSCCLPP_DEVICE_CUDA)

// clang-format off
#include <mscclpp/device.hpp>
#include <mscclpp/gpu.hpp>
#include <mscclpp/gpu_data_types.hpp>

#include "device.hpp"
// clang-format on

namespace mscclpp {

Expand Down
9 changes: 5 additions & 4 deletions include/mscclpp/packet_device.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,13 @@
#include <cstdint>
#include <type_traits>

#include "device.hpp"

// clang-format off
#include <mscclpp/device.hpp>
#if defined(MSCCLPP_DEVICE_COMPILE)
#include "atomic_device.hpp"
#include "poll_device.hpp"
#include <mscclpp/atomic_device.hpp>
#include <mscclpp/poll_device.hpp>
#endif // defined(MSCCLPP_DEVICE_COMPILE)
// clang-format on

namespace mscclpp {
/// LL (low latency) protocol packet.
Expand Down
2 changes: 1 addition & 1 deletion include/mscclpp/poll_device.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#ifndef MSCCLPP_POLL_DEVICE_HPP_
#define MSCCLPP_POLL_DEVICE_HPP_

#include "device.hpp"
#include <mscclpp/device.hpp>

#if defined(MSCCLPP_DEVICE_COMPILE)

Expand Down
4 changes: 3 additions & 1 deletion include/mscclpp/proxy.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@
#include <functional>
#include <memory>

#include "fifo.hpp"
// clang-format off
#include <mscclpp/fifo.hpp>
// clang-format on

namespace mscclpp {

Expand Down
8 changes: 4 additions & 4 deletions include/mscclpp/proxy_channel.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
#ifndef MSCCLPP_PROXY_CHANNEL_HPP_
#define MSCCLPP_PROXY_CHANNEL_HPP_

#include "core.hpp"
#include "proxy.hpp"
#include "proxy_channel_device.hpp"
#include "semaphore.hpp"
#include <mscclpp/core.hpp>
#include <mscclpp/proxy.hpp>
#include <mscclpp/proxy_channel_device.hpp>
#include <mscclpp/semaphore.hpp>

namespace mscclpp {

Expand Down
4 changes: 2 additions & 2 deletions include/mscclpp/proxy_channel_device.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
#ifndef MSCCLPP_PROXY_CHANNEL_DEVICE_HPP_
#define MSCCLPP_PROXY_CHANNEL_DEVICE_HPP_

#include "fifo_device.hpp"
#include "semaphore_device.hpp"
#include <mscclpp/fifo_device.hpp>
#include <mscclpp/semaphore_device.hpp>

namespace mscclpp {

Expand Down
8 changes: 5 additions & 3 deletions include/mscclpp/semaphore.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,11 @@

#include <memory>

#include "core.hpp"
#include "gpu_utils.hpp"
#include "semaphore_device.hpp"
// clang-format off
#include <mscclpp/core.hpp>
#include <mscclpp/gpu_utils.hpp>
#include <mscclpp/semaphore_device.hpp>
// clang-format on

namespace mscclpp {

Expand Down
6 changes: 3 additions & 3 deletions include/mscclpp/semaphore_device.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
#ifndef MSCCLPP_SEMAPHORE_DEVICE_HPP_
#define MSCCLPP_SEMAPHORE_DEVICE_HPP_

#include "device.hpp"
#include <mscclpp/device.hpp>

#if defined(MSCCLPP_DEVICE_COMPILE)
#include "atomic_device.hpp"
#include "poll_device.hpp"
#include <mscclpp/atomic_device.hpp>
#include <mscclpp/poll_device.hpp>
#endif // defined(MSCCLPP_DEVICE_COMPILE)

namespace mscclpp {
Expand Down
8 changes: 3 additions & 5 deletions include/mscclpp/sm_channel.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,9 @@
#ifndef MSCCLPP_SM_CHANNEL_HPP_
#define MSCCLPP_SM_CHANNEL_HPP_

#include <type_traits>

#include "core.hpp"
#include "semaphore.hpp"
#include "sm_channel_device.hpp"
#include <mscclpp/core.hpp>
#include <mscclpp/semaphore.hpp>
#include <mscclpp/sm_channel_device.hpp>

namespace mscclpp {

Expand Down
4 changes: 2 additions & 2 deletions include/mscclpp/sm_channel_device.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
#ifndef MSCCLPP_SM_CHANNEL_DEVICE_HPP_
#define MSCCLPP_SM_CHANNEL_DEVICE_HPP_

#include "semaphore_device.hpp"
#include <mscclpp/semaphore_device.hpp>
#if defined(MSCCLPP_DEVICE_COMPILE)
#include "packet_device.hpp"
#include <mscclpp/packet_device.hpp>
#endif // defined(MSCCLPP_DEVICE_COMPILE)

namespace mscclpp {
Expand Down
5 changes: 4 additions & 1 deletion include/mscclpp/utils.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,12 @@
#define MSCCLPP_UTILS_HPP_

#include <chrono>
#include <mscclpp/core.hpp>
#include <string>

// clang-format off
#include <mscclpp/core.hpp>
// clang-format on

namespace mscclpp {

struct Timer {
Expand Down
Loading