Skip to content

Commit

Permalink
Typographical Fixes (#70)
Browse files Browse the repository at this point in the history
Co-authored-by: Matthew Whitlock <[email protected]>
  • Loading branch information
davis-matthew and Matthew-Whitlock authored Aug 27, 2024
1 parent cf22917 commit be865da
Show file tree
Hide file tree
Showing 11 changed files with 20 additions and 19 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,12 @@ if(BUILD_EXAMPLES)
add_subdirectory(examples)
endif()


if(BUILD_TESTING)
add_subdirectory(test)
endif()



configure_file(
${CMAKE_CURRENT_SOURCE_DIR}/include/fenix-config.h.in
${CMAKE_CURRENT_BINARY_DIR}/include/fenix-config.h @ONLY
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ and to permit others to do so. The specific term of the license can be identifie
inquiry made to Sandia Corporation or DOE.

NEITHER THE UNITED STATES GOVERNMENT, NOR THE UNITED STATES DEPARTMENT OF ENERGY, NOR
SANDIA CORPORATION, RUTGERS UNIVERISTY NOR ANY OF THEIR EMPLOYEES, MAKES ANY WARRANTY,
SANDIA CORPORATION, RUTGERS UNIVERSITY NOR ANY OF THEIR EMPLOYEES, MAKES ANY WARRANTY,
EXPRESS OR IMPLIED, OR ASSUMES ANY LEGAL RESPONSIBILITY FOR THE ACCURACY, COMPLETENESS,
OR USEFULNESS OF ANY INFORMATION, APPARATUS, PRODUCT, OR PROCESS DISCLOSED, OR REPRESENTS
THAT ITS USE WOULD NOT INFRINGE PRIVATELY OWNED RIGHTS.
Expand Down
2 changes: 1 addition & 1 deletion examples/02_send_recv/fenix/fenix_ring.c
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ int main(int argc, char **argv) {

/* This is called even for recovered/survived ranks */
/* If called by SURVIVED ranks, make sure the group has been exist */
/* Recovered rank needs to initalize the data */
/* Recovered rank needs to initialize the data */
Fenix_Data_group_create( my_group, new_comm, my_timestamp, my_depth, FENIX_DATA_POLICY_IN_MEMORY_RAID,
(int[]){1, num_ranks/2}, &error);

Expand Down
4 changes: 2 additions & 2 deletions examples/02_send_recv/mpi/mpi_ring.c
Original file line number Diff line number Diff line change
Expand Up @@ -91,13 +91,13 @@ int main(int argc, char **argv) {
int msg;
MPI_Status status;
MPI_Recv(&msg, kCount, MPI_INT, (num_ranks - 1), kTag, MPI_COMM_WORLD, &status); // recv from last rank #
printf("Process %d recieved msg %d from process %d\n", rank, msg, num_ranks-1);
printf("Process %d received msg %d from process %d\n", rank, msg, num_ranks-1);
} else {
int msg;
MPI_Status status;
MPI_Recv(&msg, kCount, MPI_INT, rank - 1, kTag, MPI_COMM_WORLD, &status); // recv from prev rank
MPI_Send(&msg, kCount, MPI_INT, ((rank + 1) % num_ranks), kTag, MPI_COMM_WORLD); // send to next rank
printf("Process %d recieved msg %d from process %d\n", rank, msg, rank+1);
printf("Process %d received msg %d from process %d\n", rank, msg, rank+1);
}

MPI_Finalize();
Expand Down
2 changes: 1 addition & 1 deletion include/fenix_process_recovery_global.h
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,6 @@
#include "fenix_data_group.h"


/* This header file is intended to provide global variable defintiions for fenix_process_recovery.c only */
/* This header file is intended to provide global variable definitions for fenix_process_recovery.c only */

#endif // __FENIX_PROCES_RECOVERY_GLOBAL_H__
10 changes: 5 additions & 5 deletions src/fenix_data_policy_in_memory_raid.c
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@ void __imr_alloc_data_region(void** region, int raid_mode, int local_data_size,
*region = (void*) malloc(2*local_data_size);
} else if(raid_mode == 5){
//We need space for our own local data, as well as space for the parity data
//We add two just in case the data size isn't evenly divisble by set_size-1
//We add two just in case the data size isn't evenly divisible by set_size-1
// 3 is needed because making the parity one larger on some nodes requires
// extra bits of "data" on the other nodes
*region = (void*) malloc(local_data_size + local_data_size/(set_size - 1) + 3);
Expand Down Expand Up @@ -482,14 +482,14 @@ int __imr_member_store(fenix_group_t* g, int member_id,
// all of the data in the corresponding blocks and the parity for those blocks
//Standard RAID does this by having one disk store parity for a given block instead of data, but this assumes
// that there is no benefit to data locality - in our case we want each node to have a local copy of its own
// data, preferably in a single (virtually) continuous memory range for data movement optomization. So we'll
// data, preferably in a single (virtually) continuous memory range for data movement optimization. So we'll
// store the local data, then put 1/N of the parity data at the bottom of the commit.
//The weirdness comes from the fact that a given node CANNOT contribute to the data being checked for parity which
// will be stored on itself. IE, a node cannot save both a portion of the data and the parity for that data portion -
// doing so would mean if that node fails it is as if we lost two nodes for recovery semantics, making every failure
// non-recoverable.
// This means we need to do an XOR reduction across every node but myself, then store the result on myself - this is
// a little awkward with MPI's reductions which require full comm participation and do not recieve any information about
// a little awkward with MPI's reductions which require full comm participation and do not receive any information about
// the source of a given chunk of data (IE we can't exclude data from node X, as we want to).
//This is easily doable using MPI send/recvs, but doing it that way neglects all of the data/comm size optimizations,
// as well as any block XOR optimizations from MPI's reduction operations.
Expand Down Expand Up @@ -683,7 +683,7 @@ int __imr_get_snapshot_at_position(fenix_group_t* g, int position,
retval = FENIX_ERROR_INVALID_POSITION;
} else {
//Each member ought to have the same snapshots, in the same order.
//If this isn't true, some other bug has occured. Thus, we will just
//If this isn't true, some other bug has occurred. Thus, we will just
//query the first member.
*time_stamp = group->entries[0].timestamp[group->entries[0].current_head - 1 - position];
retval = FENIX_SUCCESS;
Expand Down Expand Up @@ -812,7 +812,7 @@ int __imr_member_restore(fenix_group_t* g, int member_id,

if(recv_size > 0){
void* recv_buf = malloc(member_data.datatype_size * recv_size);
//first recieve their data, so store in the resiliency section.
//first receive their data, so store in the resiliency section.
MPI_Recv(recv_buf, recv_size*member_data.datatype_size, MPI_BYTE, group->partners[0],
RECOVER_MEMBER_ENTRY_TAG^group->base.groupid, group->base.comm, NULL);
__fenix_data_subset_deserialize(mentry->data_regions + snapshot, recv_buf,
Expand Down
7 changes: 4 additions & 3 deletions src/fenix_data_recovery.c
Original file line number Diff line number Diff line change
Expand Up @@ -604,10 +604,11 @@ int __fenix_data_commit_barrier(int groupid, int *timestamp) {
retval = group->vtbl.commit(group);
}


if(can_commit != 1 || ret != MPI_SUCCESS) {
//A rank failure has happened, lets trigger error handling if enabled.
int throwaway = 1;
MPI_Allreduce(MPI_IN_PLACE, &throwaway, 1, MPI_INT, MPI_SUM, *fenix.user_world);
//A rank failure has happened, lets trigger error handling if enabled.
int throwaway = 1;
MPI_Allreduce(MPI_IN_PLACE, &throwaway, 1, MPI_INT, MPI_SUM, *fenix.user_world);
}


Expand Down
2 changes: 1 addition & 1 deletion src/fenix_data_subset.c
Original file line number Diff line number Diff line change
Expand Up @@ -523,7 +523,7 @@ void __fenix_data_subset_merge(Fenix_Data_subset* first_subset, Fenix_Data_subse
}

//Merge second subset into first subset
//This reasonably assumes both subsets are already intialized.
//This reasonably assumes both subsets are already initialized.
void __fenix_data_subset_merge_inplace(Fenix_Data_subset* first_subset, Fenix_Data_subset* second_subset){

//Simple cases first
Expand Down
2 changes: 1 addition & 1 deletion src/fenix_opt.c
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
void __fenix_init_opt(int argc, char **argv) {
int i;

/* Initalize the value */
/* Initialize the value */

fenix.options.verbose = -1;

Expand Down
2 changes: 1 addition & 1 deletion test/subset_internal/fenix_subset_internal_test.c
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ int _verify_subset( double *data, int num_repeats, int start_offset, int end_off
printf("stride set incorrectly\n");
}

/* Itertate over the loop to see if any memory error occurs*/
/* Iterate over the loop to see if any memory error occurs*/
idx = start_offset;
block_size = end_offset - start_offset;
for ( i = 0; i < num_repeats; i++ ) {
Expand Down
4 changes: 2 additions & 2 deletions test/subset_merging/fenix_subset_merging_test.c
Original file line number Diff line number Diff line change
Expand Up @@ -115,13 +115,13 @@ int main(int argc, char **argv) {
__fenix_data_subset_merge(&sub1, &sub2, &sub3);
failure += test_subset_create(&sub1, &sub2, &sub3, 1, 5, (int[]){12}, (int[]){15}, (int[]){2});

printf("Testing equivalent create subsets in non-overlapping, continous regions: ");
printf("Testing equivalent create subsets in non-overlapping, continuous regions: ");
Fenix_Data_subset_create(1, 22, 25, 5, &sub1);
Fenix_Data_subset_create(2, 12, 15, 5, &sub2);
__fenix_data_subset_merge(&sub1, &sub2, &sub3);
failure += test_subset_create(&sub1, &sub2, &sub3, 1, 5, (int[]){12}, (int[]){15}, (int[]){2});

printf("Testing equivalent create subsets in non-overlapping, non-continous regions: ");
printf("Testing equivalent create subsets in non-overlapping, non-continuous regions: ");
Fenix_Data_subset_create(1, 22, 25, 5, &sub1);
Fenix_Data_subset_create(1, 12, 15, 5, &sub2);
__fenix_data_subset_merge(&sub1, &sub2, &sub3);
Expand Down

0 comments on commit be865da

Please sign in to comment.