Skip to content

Clean up of monarch_rdma/extension #528

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

Closed
wants to merge 1 commit into from
+40 −34
Closed

Clean up of monarch_rdma/extension #528

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 7 additions & 1 deletion monarch_hyperactor/src/mailbox.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,13 @@ use crate::shape::PyShape;
module = "monarch._rust_bindings.monarch_hyperactor.mailbox"
)]
pub struct PyMailbox {
pub inner: Mailbox,
pub(super) inner: Mailbox,
}

impl PyMailbox {
pub fn get_inner(&self) -> &Mailbox {
&self.inner
}
}

#[pymethods]
Expand Down
66 changes: 33 additions & 33 deletions monarch_rdma/extension/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,15 @@ use pyo3::types::PyType;
use serde::Deserialize;
use serde::Serialize;

macro_rules! setup_rdma_context {
($self:ident, $local_proc_id:expr) => {{
let proc_id: ProcId = $local_proc_id.parse().unwrap();
let local_owner_id = ActorId(proc_id, "rdma_manager".to_string(), 0);
let local_owner_ref: ActorRef<RdmaManagerActor> = ActorRef::attest(local_owner_id);
let buffer = $self.buffer.clone();
(local_owner_ref, buffer)
}};
fn setup_rdma_context(
rdma_buffer: &PyRdmaBuffer,
local_proc_id: String,
) -> (ActorRef<RdmaManagerActor>, RdmaBuffer) {
let proc_id: ProcId = local_proc_id.parse().unwrap();
let local_owner_id = ActorId(proc_id, "rdma_manager".to_string(), 0);
let local_owner_ref: ActorRef<RdmaManagerActor> = ActorRef::attest(local_owner_id);
let buffer = rdma_buffer.buffer.clone();
(local_owner_ref, buffer)
}

#[pyclass(name = "_RdmaBuffer", module = "monarch._rust_bindings.rdma")]
Expand All @@ -49,16 +50,16 @@ struct PyRdmaBuffer {
async fn create_rdma_buffer(
addr: usize,
size: usize,
proc_id: String,
proc_id: ProcId,
client: PyMailbox,
) -> PyResult<PyRdmaBuffer> {
// Get the owning RdmaManagerActor's ActorRef
let proc_id: ProcId = proc_id.parse().unwrap();
let owner_id = ActorId(proc_id, "rdma_manager".to_string(), 0);
let owner_ref: ActorRef<RdmaManagerActor> = ActorRef::attest(owner_id);

let caps = client.get_inner();
// Create the RdmaBuffer
let buffer = owner_ref.request_buffer(&client.inner, addr, size).await?;
let buffer = owner_ref.request_buffer(caps, addr, size).await?;
Ok(PyRdmaBuffer { buffer, owner_ref })
}

Expand All @@ -78,7 +79,10 @@ impl PyRdmaBuffer {
"ibverbs is not supported on this system",
));
}
signal_safe_block_on(py, create_rdma_buffer(addr, size, proc_id, client))?
signal_safe_block_on(
py,
create_rdma_buffer(addr, size, proc_id.parse().unwrap(), client),
)?
}

#[classmethod]
Expand All @@ -97,7 +101,7 @@ impl PyRdmaBuffer {
}
pyo3_async_runtimes::tokio::future_into_py(
py,
create_rdma_buffer(addr, size, proc_id, client),
create_rdma_buffer(addr, size, proc_id.parse().unwrap(), client),
)
}

Expand Down Expand Up @@ -133,13 +137,12 @@ impl PyRdmaBuffer {
client: PyMailbox,
timeout: u64,
) -> PyResult<Bound<'py, PyAny>> {
let (local_owner_ref, buffer) = setup_rdma_context!(self, local_proc_id);
let (local_owner_ref, buffer) = setup_rdma_context(self, local_proc_id);
pyo3_async_runtimes::tokio::future_into_py(py, async move {
let local_buffer = local_owner_ref
.request_buffer(&client.inner, addr, size)
.await?;
let caps = client.get_inner();
let local_buffer = local_owner_ref.request_buffer(caps, addr, size).await?;
let _result_ = local_buffer
.write_from(&client.inner, buffer, timeout)
.write_from(caps, buffer, timeout)
.await
.map_err(|e| PyException::new_err(format!("failed to read into buffer: {}", e)))?;
Ok(())
Expand Down Expand Up @@ -170,13 +173,12 @@ impl PyRdmaBuffer {
client: PyMailbox,
timeout: u64,
) -> PyResult<bool> {
let (local_owner_ref, buffer) = setup_rdma_context!(self, local_proc_id);
let (local_owner_ref, buffer) = setup_rdma_context(self, local_proc_id);
signal_safe_block_on(py, async move {
let local_buffer = local_owner_ref
.request_buffer(&client.inner, addr, size)
.await?;
let caps = client.get_inner();
let local_buffer = local_owner_ref.request_buffer(caps, addr, size).await?;
local_buffer
.write_from(&client.inner, buffer, timeout)
.write_from(caps, buffer, timeout)
.await
.map_err(|e| PyException::new_err(format!("failed to read into buffer: {}", e)))
})?
Expand Down Expand Up @@ -204,13 +206,12 @@ impl PyRdmaBuffer {
client: PyMailbox,
timeout: u64,
) -> PyResult<Bound<'py, PyAny>> {
let (local_owner_ref, buffer) = setup_rdma_context!(self, local_proc_id);
let (local_owner_ref, buffer) = setup_rdma_context(self, local_proc_id);
pyo3_async_runtimes::tokio::future_into_py(py, async move {
let local_buffer = local_owner_ref
.request_buffer(&client.inner, addr, size)
.await?;
let caps = client.get_inner();
let local_buffer = local_owner_ref.request_buffer(caps, addr, size).await?;
let _result_ = local_buffer
.read_into(&client.inner, buffer, timeout)
.read_into(caps, buffer, timeout)
.await
.map_err(|e| PyException::new_err(format!("failed to write from buffer: {}", e)))?;
Ok(())
Expand Down Expand Up @@ -241,13 +242,12 @@ impl PyRdmaBuffer {
client: PyMailbox,
timeout: u64,
) -> PyResult<bool> {
let (local_owner_ref, buffer) = setup_rdma_context!(self, local_proc_id);
let (local_owner_ref, buffer) = setup_rdma_context(self, local_proc_id);
signal_safe_block_on(py, async move {
let local_buffer = local_owner_ref
.request_buffer(&client.inner, addr, size)
.await?;
let caps = client.get_inner();
let local_buffer = local_owner_ref.request_buffer(caps, addr, size).await?;
local_buffer
.read_into(&client.inner, buffer, timeout)
.read_into(caps, buffer, timeout)
.await
.map_err(|e| PyException::new_err(format!("failed to write from buffer: {}", e)))
})?
Expand Down
Loading