Skip to content

Commit be865da

Browse files
Typographical Fixes (#70)
Co-authored-by: Matthew Whitlock <MatthewWhitlock.MW@gmail.com>
1 parent cf22917 commit be865da

File tree

11 files changed

+20
-19
lines changed

11 files changed

+20
-19
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,12 @@ if(BUILD_EXAMPLES)
4242
add_subdirectory(examples)
4343
endif()
4444

45+
4546
if(BUILD_TESTING)
4647
add_subdirectory(test)
4748
endif()
4849

4950

50-
5151
configure_file(
5252
${CMAKE_CURRENT_SOURCE_DIR}/include/fenix-config.h.in
5353
${CMAKE_CURRENT_BINARY_DIR}/include/fenix-config.h @ONLY

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ and to permit others to do so. The specific term of the license can be identifie
1919
inquiry made to Sandia Corporation or DOE.
2020

2121
NEITHER THE UNITED STATES GOVERNMENT, NOR THE UNITED STATES DEPARTMENT OF ENERGY, NOR
22-
SANDIA CORPORATION, RUTGERS UNIVERISTY NOR ANY OF THEIR EMPLOYEES, MAKES ANY WARRANTY,
22+
SANDIA CORPORATION, RUTGERS UNIVERSITY NOR ANY OF THEIR EMPLOYEES, MAKES ANY WARRANTY,
2323
EXPRESS OR IMPLIED, OR ASSUMES ANY LEGAL RESPONSIBILITY FOR THE ACCURACY, COMPLETENESS,
2424
OR USEFULNESS OF ANY INFORMATION, APPARATUS, PRODUCT, OR PROCESS DISCLOSED, OR REPRESENTS
2525
THAT ITS USE WOULD NOT INFRINGE PRIVATELY OWNED RIGHTS.

examples/02_send_recv/fenix/fenix_ring.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ int main(int argc, char **argv) {
121121

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

examples/02_send_recv/mpi/mpi_ring.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,13 +91,13 @@ int main(int argc, char **argv) {
9191
int msg;
9292
MPI_Status status;
9393
MPI_Recv(&msg, kCount, MPI_INT, (num_ranks - 1), kTag, MPI_COMM_WORLD, &status); // recv from last rank #
94-
printf("Process %d recieved msg %d from process %d\n", rank, msg, num_ranks-1);
94+
printf("Process %d received msg %d from process %d\n", rank, msg, num_ranks-1);
9595
} else {
9696
int msg;
9797
MPI_Status status;
9898
MPI_Recv(&msg, kCount, MPI_INT, rank - 1, kTag, MPI_COMM_WORLD, &status); // recv from prev rank
9999
MPI_Send(&msg, kCount, MPI_INT, ((rank + 1) % num_ranks), kTag, MPI_COMM_WORLD); // send to next rank
100-
printf("Process %d recieved msg %d from process %d\n", rank, msg, rank+1);
100+
printf("Process %d received msg %d from process %d\n", rank, msg, rank+1);
101101
}
102102

103103
MPI_Finalize();

include/fenix_process_recovery_global.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,6 @@
7070
#include "fenix_data_group.h"
7171

7272

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

7575
#endif // __FENIX_PROCES_RECOVERY_GLOBAL_H__

src/fenix_data_policy_in_memory_raid.c

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

813813
if(recv_size > 0){
814814
void* recv_buf = malloc(member_data.datatype_size * recv_size);
815-
//first recieve their data, so store in the resiliency section.
815+
//first receive their data, so store in the resiliency section.
816816
MPI_Recv(recv_buf, recv_size*member_data.datatype_size, MPI_BYTE, group->partners[0],
817817
RECOVER_MEMBER_ENTRY_TAG^group->base.groupid, group->base.comm, NULL);
818818
__fenix_data_subset_deserialize(mentry->data_regions + snapshot, recv_buf,

src/fenix_data_recovery.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -604,10 +604,11 @@ int __fenix_data_commit_barrier(int groupid, int *timestamp) {
604604
retval = group->vtbl.commit(group);
605605
}
606606

607+
607608
if(can_commit != 1 || ret != MPI_SUCCESS) {
608-
//A rank failure has happened, lets trigger error handling if enabled.
609-
int throwaway = 1;
610-
MPI_Allreduce(MPI_IN_PLACE, &throwaway, 1, MPI_INT, MPI_SUM, *fenix.user_world);
609+
//A rank failure has happened, lets trigger error handling if enabled.
610+
int throwaway = 1;
611+
MPI_Allreduce(MPI_IN_PLACE, &throwaway, 1, MPI_INT, MPI_SUM, *fenix.user_world);
611612
}
612613

613614

src/fenix_data_subset.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -523,7 +523,7 @@ void __fenix_data_subset_merge(Fenix_Data_subset* first_subset, Fenix_Data_subse
523523
}
524524

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

529529
//Simple cases first

src/fenix_opt.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
void __fenix_init_opt(int argc, char **argv) {
7575
int i;
7676

77-
/* Initalize the value */
77+
/* Initialize the value */
7878

7979
fenix.options.verbose = -1;
8080

test/subset_internal/fenix_subset_internal_test.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ int _verify_subset( double *data, int num_repeats, int start_offset, int end_off
9797
printf("stride set incorrectly\n");
9898
}
9999

100-
/* Itertate over the loop to see if any memory error occurs*/
100+
/* Iterate over the loop to see if any memory error occurs*/
101101
idx = start_offset;
102102
block_size = end_offset - start_offset;
103103
for ( i = 0; i < num_repeats; i++ ) {

0 commit comments

Comments
 (0)