Skip to content

Commit

Permalink
used clang-format to format the code
Browse files Browse the repository at this point in the history
  • Loading branch information
@mdorier
mdorier committed Jul 3, 2023
1 parent 973cf2b commit 7f0fed8
Show file tree
Hide file tree
Showing 55 changed files with 1,784 additions and 1,834 deletions.
40 changes: 21 additions & 19 deletions examples/barrier.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,17 @@
#include <mona-coll.h>
#include <stdlib.h>

#define ASSERT_MESSAGE(__cond__, __msg__) \
if(!(__cond__)) { \
fprintf(stderr, "[%d] Assertion failed (%s): %s\n", rank, #__cond__, __msg__); \
exit(-1); \
#define ASSERT_MESSAGE(__cond__, __msg__) \
if (!(__cond__)) { \
fprintf(stderr, "[%d] Assertion failed (%s): %s\n", rank, #__cond__, \
__msg__); \
exit(-1); \
}

int main(int argc, char** argv) {
int main(int argc, char** argv)
{

int rank, size, i;
int rank, size, i;
na_return_t ret;

MPI_Init(&argc, &argv);
Expand All @@ -20,13 +22,14 @@ int main(int argc, char** argv) {
MPI_Comm_size(MPI_COMM_WORLD, &size);

mona_instance_t mona = mona_init("ofi+tcp", true, NULL);
ASSERT_MESSAGE(mona != MONA_INSTANCE_NULL, "Could not initialize Mona instance");
ASSERT_MESSAGE(mona != MONA_INSTANCE_NULL,
"Could not initialize Mona instance");
printf("[%d] Correctly instanciated Mona\n", rank);

char addr_str[128];
size_t addr_size = 128;
mona_addr_t addr = MONA_ADDR_NULL;
ret = mona_addr_self(mona, &addr);
char addr_str[128];
size_t addr_size = 128;
mona_addr_t addr = MONA_ADDR_NULL;
ret = mona_addr_self(mona, &addr);
ASSERT_MESSAGE(ret == NA_SUCCESS, "Could not get self address");

ret = mona_addr_to_string(mona, addr_str, &addr_size, addr);
Expand All @@ -36,13 +39,14 @@ int main(int argc, char** argv) {
ret = mona_addr_free(mona, addr);
ASSERT_MESSAGE(ret == NA_SUCCESS, "Could not free address");

char* all_addr_str = malloc(128*size);
mona_addr_t* all_addr = malloc(sizeof(mona_addr_t)*size);
char* all_addr_str = malloc(128 * size);
mona_addr_t* all_addr = malloc(sizeof(mona_addr_t) * size);

MPI_Allgather(addr_str, 128, MPI_BYTE, all_addr_str, 128, MPI_BYTE, MPI_COMM_WORLD);
MPI_Allgather(addr_str, 128, MPI_BYTE, all_addr_str, 128, MPI_BYTE,
MPI_COMM_WORLD);

for(i=0; i < size; i++) {
ret = mona_addr_lookup(mona, all_addr_str+(128*i), all_addr+i);
for (i = 0; i < size; i++) {
ret = mona_addr_lookup(mona, all_addr_str + (128 * i), all_addr + i);
ASSERT_MESSAGE(ret == NA_SUCCESS, "Could not lookup address");
}

Expand All @@ -57,9 +61,7 @@ int main(int argc, char** argv) {
ret = mona_comm_free(comm);
ASSERT_MESSAGE(ret == NA_SUCCESS, "Could not free communicator");

for(i=0; i < size; i++) {
mona_addr_free(mona, all_addr[i]);
}
for (i = 0; i < size; i++) { mona_addr_free(mona, all_addr[i]); }

mona_finalize(mona);

Expand Down
42 changes: 22 additions & 20 deletions examples/bcast.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,17 @@
#include <mona-coll.h>
#include <stdlib.h>

#define ASSERT_MESSAGE(__cond__, __msg__) \
if(!(__cond__)) { \
fprintf(stderr, "[%d] Assertion failed (%s): %s\n", rank, #__cond__, __msg__); \
exit(-1); \
#define ASSERT_MESSAGE(__cond__, __msg__) \
if (!(__cond__)) { \
fprintf(stderr, "[%d] Assertion failed (%s): %s\n", rank, #__cond__, \
__msg__); \
exit(-1); \
}

int main(int argc, char** argv) {
int main(int argc, char** argv)
{

int rank, size, i;
int rank, size, i;
na_return_t ret;

MPI_Init(&argc, &argv);
Expand All @@ -20,13 +22,14 @@ int main(int argc, char** argv) {
MPI_Comm_size(MPI_COMM_WORLD, &size);

mona_instance_t mona = mona_init("ofi+tcp", true, NULL);
ASSERT_MESSAGE(mona != MONA_INSTANCE_NULL, "Could not initialize Mona instance");
ASSERT_MESSAGE(mona != MONA_INSTANCE_NULL,
"Could not initialize Mona instance");
printf("[%d] Correctly instanciated Mona\n", rank);

char addr_str[128];
size_t addr_size = 128;
mona_addr_t addr = MONA_ADDR_NULL;
ret = mona_addr_self(mona, &addr);
char addr_str[128];
size_t addr_size = 128;
mona_addr_t addr = MONA_ADDR_NULL;
ret = mona_addr_self(mona, &addr);
ASSERT_MESSAGE(ret == NA_SUCCESS, "Could not get self address");

ret = mona_addr_to_string(mona, addr_str, &addr_size, addr);
Expand All @@ -36,13 +39,14 @@ int main(int argc, char** argv) {
ret = mona_addr_free(mona, addr);
ASSERT_MESSAGE(ret == NA_SUCCESS, "Could not free address");

char* all_addr_str = malloc(128*size);
mona_addr_t* all_addr = malloc(sizeof(mona_addr_t)*size);
char* all_addr_str = malloc(128 * size);
mona_addr_t* all_addr = malloc(sizeof(mona_addr_t) * size);

MPI_Allgather(addr_str, 128, MPI_BYTE, all_addr_str, 128, MPI_BYTE, MPI_COMM_WORLD);
MPI_Allgather(addr_str, 128, MPI_BYTE, all_addr_str, 128, MPI_BYTE,
MPI_COMM_WORLD);

for(i=0; i < size; i++) {
ret = mona_addr_lookup(mona, all_addr_str+(128*i), all_addr+i);
for (i = 0; i < size; i++) {
ret = mona_addr_lookup(mona, all_addr_str + (128 * i), all_addr + i);
ASSERT_MESSAGE(ret == NA_SUCCESS, "Could not lookup address");
}

Expand All @@ -53,15 +57,13 @@ int main(int argc, char** argv) {

uint64_t v[10000];

ret = mona_comm_bcast(comm, v, sizeof(*v)*10000, 0, 0);
ret = mona_comm_bcast(comm, v, sizeof(*v) * 10000, 0, 0);
ASSERT_MESSAGE(ret == NA_SUCCESS, "Barrier failed");

ret = mona_comm_free(comm);
ASSERT_MESSAGE(ret == NA_SUCCESS, "Could not free communicator");

for(i=0; i < size; i++) {
mona_addr_free(mona, all_addr[i]);
}
for (i = 0; i < size; i++) { mona_addr_free(mona, all_addr[i]); }

mona_finalize(mona);

Expand Down
54 changes: 30 additions & 24 deletions examples/example.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,17 @@
#include <mona.h>
#include <stdlib.h>

#define ASSERT_MESSAGE(__cond__, __msg__) \
if(!(__cond__)) { \
fprintf(stderr, "[%d] Assertion failed (%s): %s\n", rank, #__cond__, __msg__); \
exit(-1); \
#define ASSERT_MESSAGE(__cond__, __msg__) \
if (!(__cond__)) { \
fprintf(stderr, "[%d] Assertion failed (%s): %s\n", rank, #__cond__, \
__msg__); \
exit(-1); \
}

int main(int argc, char** argv) {
int main(int argc, char** argv)
{

int rank, size, i;
int rank, size, i;
na_return_t ret;

MPI_Init(&argc, &argv);
Expand All @@ -19,13 +21,14 @@ int main(int argc, char** argv) {
MPI_Comm_size(MPI_COMM_WORLD, &size);

mona_instance_t mona = mona_init("na+sm", true, NULL);
ASSERT_MESSAGE(mona != MONA_INSTANCE_NULL, "Could not initialize Mona instance");
ASSERT_MESSAGE(mona != MONA_INSTANCE_NULL,
"Could not initialize Mona instance");
printf("[%d] Correctly instanciated Mona\n", rank);

char addr_str[128];
size_t addr_size = 128;
mona_addr_t addr = MONA_ADDR_NULL;
ret = mona_addr_self(mona, &addr);
char addr_str[128];
size_t addr_size = 128;
mona_addr_t addr = MONA_ADDR_NULL;
ret = mona_addr_self(mona, &addr);
ASSERT_MESSAGE(ret == NA_SUCCESS, "Could not get self address");

ret = mona_addr_to_string(mona, addr_str, &addr_size, addr);
Expand All @@ -39,26 +42,28 @@ int main(int argc, char** argv) {
printf("[%d] Message size: %ld\n", rank, msg_len);

void* plugin_data = NULL;
char* buf = (char*)mona_msg_buf_alloc(mona, msg_len, &plugin_data);
char* buf = (char*)mona_msg_buf_alloc(mona, msg_len, &plugin_data);
ASSERT_MESSAGE(buf != NULL, "Could not allocate message buffer");

if(rank == 0) {
MPI_Recv(addr_str, 128, MPI_CHAR, 1, 0, MPI_COMM_WORLD, MPI_STATUS_IGNORE);
if (rank == 0) {
MPI_Recv(addr_str, 128, MPI_CHAR, 1, 0, MPI_COMM_WORLD,
MPI_STATUS_IGNORE);

ret = mona_addr_lookup(mona, addr_str, &addr);
ASSERT_MESSAGE(ret == NA_SUCCESS, "Could not lookup address");

printf("[0] Sending message to rank 1\n");

for(i = mona_msg_get_unexpected_header_size(mona); i < (int)msg_len; i++) {
for (i = mona_msg_get_unexpected_header_size(mona); i < (int)msg_len;
i++) {
buf[i] = i % 32;
}

ret = mona_msg_init_unexpected(mona, buf, msg_len);
ASSERT_MESSAGE(ret == NA_SUCCESS, "Could not initialize message");

ret = mona_msg_send_unexpected(
mona, buf, msg_len, plugin_data, addr, 0, 1234);
ret = mona_msg_send_unexpected(mona, buf, msg_len, plugin_data, addr, 0,
1234);
ASSERT_MESSAGE(ret == NA_SUCCESS, "Could not send message");

ret = mona_addr_free(mona, addr);
Expand All @@ -68,20 +73,21 @@ int main(int argc, char** argv) {
MPI_Send(addr_str, 128, MPI_CHAR, 0, 0, MPI_COMM_WORLD);

mona_addr_t source_addr = MONA_ADDR_NULL;
na_tag_t tag = 0;
size_t actual_size = 0;
na_tag_t tag = 0;
size_t actual_size = 0;

ret = mona_msg_recv_unexpected(
mona, buf, msg_len, plugin_data,
&source_addr, &tag, &actual_size);
ret = mona_msg_recv_unexpected(mona, buf, msg_len, plugin_data,
&source_addr, &tag, &actual_size);
ASSERT_MESSAGE(ret == NA_SUCCESS, "Could not receive message");

printf("[1] Receiving message from rank 0 with tag %d and size %ld\n", tag, actual_size);
printf("[1] Receiving message from rank 0 with tag %d and size %ld\n",
tag, actual_size);

ret = mona_addr_free(mona, source_addr);
ASSERT_MESSAGE(ret == NA_SUCCESS, "Could not free source address");

for(i = mona_msg_get_unexpected_header_size(mona); i < (int)msg_len; i++) {
for (i = mona_msg_get_unexpected_header_size(mona); i < (int)msg_len;
i++) {
ASSERT_MESSAGE(buf[i] == i % 32, "Incorrect byte received");
}
}
Expand Down
22 changes: 11 additions & 11 deletions include/mona-coll.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
extern "C" {
#endif

#define MONA_IN_PLACE ((void*)-1)
#define MONA_IN_PLACE ((void*)-1)
#define MONA_ANY_SOURCE ((int)-1)

/**
Expand Down Expand Up @@ -50,10 +50,10 @@ typedef void (*mona_op_t)(const void*, void*, size_t, size_t, void*);
*
* @return NA_SUCCESS or corresponding error code (see na.h)
*/
na_return_t mona_comm_create(mona_instance_t mona,
size_t count,
na_return_t mona_comm_create(mona_instance_t mona,
size_t count,
const mona_addr_t* peers,
mona_comm_t* comm);
mona_comm_t* comm);

/**
* @brief Free a communicator.
Expand Down Expand Up @@ -235,13 +235,13 @@ na_return_t mona_comm_probe(mona_comm_t comm,
/**
* @see Non-blocking version of mona_comm_probe.
*/
na_return_t mona_comm_iprobe(mona_comm_t comm,
int src,
na_tag_t tag,
int* flag,
size_t* actual_size,
int* actual_src,
na_tag_t* actual_tag);
na_return_t mona_comm_iprobe(mona_comm_t comm,
int src,
na_tag_t tag,
int* flag,
size_t* actual_size,
int* actual_src,
na_tag_t* actual_tag);
/**
* @brief Issue a send and a receive in parallel.
*
Expand Down
45 changes: 23 additions & 22 deletions include/mona.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ typedef struct mona_request* mona_request_t;
#define MONA_ADDR_NULL ((mona_addr_t)NULL)
#define MONA_MEM_HANDLE_NULL ((mona_mem_handle_t)NULL)

#define MONA_ANY_ADDR MONA_ADDR_NULL
#define MONA_ANY_TAG 0xFFFFFFFF
#define MONA_ANY_ADDR MONA_ADDR_NULL
#define MONA_ANY_TAG 0xFFFFFFFF

/**
* @brief Initialize a Mona instance.
Expand Down Expand Up @@ -581,25 +581,25 @@ na_return_t mona_uisend_nc(mona_instance_t mona,
*
* @return NA_SUCCESS or corresponding NA error code
*/
na_return_t mona_usend_mem(mona_instance_t mona,
na_return_t mona_usend_mem(mona_instance_t mona,
mona_mem_handle_t mem,
size_t size,
size_t offset,
mona_addr_t dest,
uint8_t dest_id,
na_tag_t tag);
size_t size,
size_t offset,
mona_addr_t dest,
uint8_t dest_id,
na_tag_t tag);

/**
* @see Non-blocking version of mona_usend_mem.
*/
na_return_t mona_uisend_mem(mona_instance_t mona,
na_return_t mona_uisend_mem(mona_instance_t mona,
mona_mem_handle_t mem,
size_t size,
size_t offset,
mona_addr_t dest,
uint8_t dest_id,
na_tag_t tag,
mona_request_t* req);
size_t size,
size_t offset,
mona_addr_t dest,
uint8_t dest_id,
na_tag_t tag,
mona_request_t* req);

/**
* @brief High-level blocking urecv function. This function will
Expand Down Expand Up @@ -1201,11 +1201,11 @@ na_return_t mona_mem_handle_create(mona_instance_t mona,
*
* \return NA_SUCCESS or corresponding NA error code
*/
na_return_t mona_mem_handle_create_segments(mona_instance_t mona,
struct na_segment* segments,
size_t segment_count,
unsigned long flags,
mona_mem_handle_t* mem_handle);
na_return_t mona_mem_handle_create_segments(mona_instance_t mona,
struct na_segment* segments,
size_t segment_count,
unsigned long flags,
mona_mem_handle_t* mem_handle);

/**
* Free memory handle.
Expand All @@ -1228,7 +1228,8 @@ na_return_t mona_mem_handle_free(mona_instance_t mona,
*
* \return NA_SUCCESS or corresponding NA error code
*/
na_return_t mona_mem_register(mona_instance_t mona, mona_mem_handle_t mem_handle);
na_return_t mona_mem_register(mona_instance_t mona,
mona_mem_handle_t mem_handle);

/**
* Unregister memory.
Expand All @@ -1238,7 +1239,7 @@ na_return_t mona_mem_register(mona_instance_t mona, mona_mem_handle_t mem_handle
*
* \return NA_SUCCESS or corresponding NA error code
*/
na_return_t mona_mem_deregister(mona_instance_t mona,
na_return_t mona_mem_deregister(mona_instance_t mona,
mona_mem_handle_t mem_handle);

/**
Expand Down
Loading

0 comments on commit 7f0fed8

Please sign in to comment.