From 423317437805bf2227da48957878bd62f36cab68 Mon Sep 17 00:00:00 2001 From: davis-matthew Date: Tue, 31 Oct 2023 17:48:52 -0400 Subject: [PATCH] Typographical Fixes --- CMakeLists.txt | 2 +- LICENSE | 2 +- examples/02_send_recv/fenix/fenix_ring.c | 2 +- examples/02_send_recv/mpi/mpi_ring.c | 4 ++-- include/fenix_process_recovery_global.h | 2 +- src/fenix_data_policy_in_memory_raid.c | 10 +++++----- src/fenix_data_recovery.c | 6 +++--- src/fenix_data_subset.c | 2 +- src/fenix_opt.c | 2 +- test/subset_internal/fenix_subset_internal_test.c | 2 +- test/subset_merging/fenix_subset_merging_test.c | 4 ++-- 11 files changed, 19 insertions(+), 19 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b866e11..43cba16 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -58,7 +58,7 @@ endif() #Helper function for linking with MPI only if needed function(linkMPI TOLINK) - #We only want to try to find MPI outrselves if it wasn't provided in MPICC by user + #We only want to try to find MPI ourselves if it wasn't provided in MPICC by user if("a$ENV{MPICC}" STREQUAL "a") #find_package(MPI REQUIRED) target_link_libraries(${TOLINK} MPI::MPI_C) diff --git a/LICENSE b/LICENSE index b53c22c..078ef6f 100644 --- a/LICENSE +++ b/LICENSE @@ -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. diff --git a/examples/02_send_recv/fenix/fenix_ring.c b/examples/02_send_recv/fenix/fenix_ring.c index f0058fd..ed44218 100644 --- a/examples/02_send_recv/fenix/fenix_ring.c +++ b/examples/02_send_recv/fenix/fenix_ring.c @@ -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); diff --git a/examples/02_send_recv/mpi/mpi_ring.c b/examples/02_send_recv/mpi/mpi_ring.c index 3c91e51..2a0b476 100644 --- a/examples/02_send_recv/mpi/mpi_ring.c +++ b/examples/02_send_recv/mpi/mpi_ring.c @@ -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(); diff --git a/include/fenix_process_recovery_global.h b/include/fenix_process_recovery_global.h index bd06cc8..4116369 100644 --- a/include/fenix_process_recovery_global.h +++ b/include/fenix_process_recovery_global.h @@ -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__ diff --git a/src/fenix_data_policy_in_memory_raid.c b/src/fenix_data_policy_in_memory_raid.c index 40b265d..a6fbc19 100644 --- a/src/fenix_data_policy_in_memory_raid.c +++ b/src/fenix_data_policy_in_memory_raid.c @@ -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); @@ -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. @@ -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; @@ -810,7 +810,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, diff --git a/src/fenix_data_recovery.c b/src/fenix_data_recovery.c index da87c30..709825e 100644 --- a/src/fenix_data_recovery.c +++ b/src/fenix_data_recovery.c @@ -587,12 +587,12 @@ int __fenix_data_commit_barrier(int groupid, int *timestamp) { //We want to make sure there aren't any revocations and also do a barrier. - //Start by disabling Fenix error handling so we don't generate any new revokations here. + //Start by disabling Fenix error handling so we don't generate any new revocations here. int old_failure_handling = fenix.ignore_errs; fenix.ignore_errs = 1; //We'll use comm_agree as a resilient barrier, which should also give time for - //any revocations to propogate + //any revocations to propagate int tmp_throwaway = 1; MPIX_Comm_agree(group->comm, &tmp_throwaway); //Now use iprobe to check for revocations. @@ -608,7 +608,7 @@ int __fenix_data_commit_barrier(int groupid, int *timestamp) { } - //Now that we've (hopefully) commited, we want to handle any errors we've + //Now that we've (hopefully) committed, we want to handle any errors we've //learned about w.r.t failures or revocations. No reason to put handling those off. if(ret != MPI_SUCCESS){ retval = ret; diff --git a/src/fenix_data_subset.c b/src/fenix_data_subset.c index 26fc203..ffbb864 100644 --- a/src/fenix_data_subset.c +++ b/src/fenix_data_subset.c @@ -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 diff --git a/src/fenix_opt.c b/src/fenix_opt.c index 8d5bfcb..f6f6fac 100644 --- a/src/fenix_opt.c +++ b/src/fenix_opt.c @@ -74,7 +74,7 @@ void __fenix_init_opt(int argc, char **argv) { int i; - /* Initalize the value */ + /* Initialize the value */ fenix.options.verbose = -1; diff --git a/test/subset_internal/fenix_subset_internal_test.c b/test/subset_internal/fenix_subset_internal_test.c index bd37d38..5dab905 100644 --- a/test/subset_internal/fenix_subset_internal_test.c +++ b/test/subset_internal/fenix_subset_internal_test.c @@ -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++ ) { diff --git a/test/subset_merging/fenix_subset_merging_test.c b/test/subset_merging/fenix_subset_merging_test.c index 807adf6..8ed6cd6 100644 --- a/test/subset_merging/fenix_subset_merging_test.c +++ b/test/subset_merging/fenix_subset_merging_test.c @@ -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);