diff --git a/.gitignore b/.gitignore index af2117f7..7e4b82bc 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ __pycache__ .*.swp .idea/ *.so +.venv/ diff --git a/include/mscclpp/core.hpp b/include/mscclpp/core.hpp index 0bccd25d..d9596803 100644 --- a/include/mscclpp/core.hpp +++ b/include/mscclpp/core.hpp @@ -523,21 +523,6 @@ class Context { friend class Endpoint; }; -/// A base class for objects that can be set up during @ref Communicator::setup(). -struct Setuppable { - /// Called inside @ref Communicator::setup() before any call to @ref endSetup() of any @ref Setuppable object that is - /// being set up within the same @ref Communicator::setup() call. - /// - /// @param bootstrap A shared pointer to the bootstrap implementation. - virtual void beginSetup(std::shared_ptr bootstrap); - - /// Called inside @ref Communicator::setup() after all calls to @ref beginSetup() of all @ref Setuppable objects that - /// are being set up within the same @ref Communicator::setup() call. - /// - /// @param bootstrap A shared pointer to the bootstrap implementation. - virtual void endSetup(std::shared_ptr bootstrap); -}; - /// A class that sets up all registered memories and connections between processes. /// /// A typical way to use this class: diff --git a/src/core.cc b/src/core.cc index 4d89250d..aef2ffd1 100644 --- a/src/core.cc +++ b/src/core.cc @@ -89,10 +89,6 @@ const TransportFlags AllIBTransports = Transport::IB0 | Transport::IB1 | Transpo const TransportFlags AllTransports = AllIBTransports | Transport::CudaIpc; -void Setuppable::beginSetup(std::shared_ptr) {} - -void Setuppable::endSetup(std::shared_ptr) {} - } // namespace mscclpp namespace std { diff --git a/src/include/communicator.hpp b/src/include/communicator.hpp index 55b5d572..016a17d1 100644 --- a/src/include/communicator.hpp +++ b/src/include/communicator.hpp @@ -22,7 +22,6 @@ struct Communicator::Impl { std::shared_ptr bootstrap_; std::shared_ptr context_; std::unordered_map connectionInfos_; - std::vector> toSetup_; Impl(std::shared_ptr bootstrap, std::shared_ptr context); diff --git a/test/unit/core_tests.cc b/test/unit/core_tests.cc index f2bd7020..d2a53d43 100644 --- a/test/unit/core_tests.cc +++ b/test/unit/core_tests.cc @@ -18,12 +18,6 @@ class LocalCommunicatorTest : public ::testing::Test { std::shared_ptr comm; }; -class MockSetuppable : public mscclpp::Setuppable { - public: - MOCK_METHOD(void, beginSetup, (std::shared_ptr bootstrap), (override)); - MOCK_METHOD(void, endSetup, (std::shared_ptr bootstrap), (override)); -}; - TEST_F(LocalCommunicatorTest, RegisterMemory) { int dummy[42]; auto memory = comm->registerMemory(&dummy, sizeof(dummy), mscclpp::NoTransports);