Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into ci_update
Browse files Browse the repository at this point in the history
Conflicts:
	README.md
	examples/01_hello_world/fenix/CMakeLists.txt
	examples/02_send_recv/fenix/CMakeLists.txt
	examples/05_subset_create/CMakeLists.txt
	examples/06_subset_createv/CMakeLists.txt
	src/fenix_data_recovery.c
	src/fenix_process_recovery.c
	test/failed_spares/CMakeLists.txt
	test/issend/CMakeLists.txt
	test/no_jump/CMakeLists.txt
	test/request_cancelled/CMakeLists.txt
  • Loading branch information
Matthew-Whitlock committed Apr 17, 2023
2 parents 087f57e + 0a5b8f6 commit 490ce70
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 7 deletions.
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,8 @@
These instructions assume you are in your home directory.

1. Checkout Fenix sources
* For example: ` git clone <address of this repo> && cd fenix`
* For example: ` git clone <address of this repo> && cd Fenix`
2. Create a build directory.
* For example: ` mkdir build && cd build `
3. Specify the MPI C compiler to use. [Open MPI 5+](https://github.com/open-mpi/ompi/tree/v5.0.x) is the required version.
* Check out the CMake documentation for the best information on how to do this, but in general:
* Set the CC environment variable to the correct `mpicc`,
Expand Down
2 changes: 1 addition & 1 deletion src/fenix_data_recovery.c
Original file line number Diff line number Diff line change
Expand Up @@ -583,7 +583,6 @@ int __fenix_data_commit_barrier(int groupid, int *timestamp) {
} else {
fenix_group_t *group = (fenix.data_recovery->group[group_index]);


//We want to make sure there aren't any failed MPI operations (IE unfinished stores)
//But we don't want to fail to commit if a failure has happened since a successful store.
int old_failure_handling = fenix.ignore_errs;
Expand Down Expand Up @@ -611,6 +610,7 @@ int __fenix_data_commit_barrier(int groupid, int *timestamp) {
MPI_Allreduce(MPI_IN_PLACE, &throwaway, 1, MPI_INT, MPI_SUM, *fenix.user_world);
}


if (timestamp != NULL) {
*timestamp = group->timestamp;
}
Expand Down
4 changes: 0 additions & 4 deletions src/fenix_process_recovery.c
Original file line number Diff line number Diff line change
Expand Up @@ -286,10 +286,6 @@ int __fenix_create_new_world_from(MPI_Comm from_comm)
ret = PMPI_Comm_split(from_comm, 0, current_rank, &fenix.new_world);
fenix.new_world_exists = 1;
if (ret != MPI_SUCCESS){
//int len;
//char errstr[MPI_MAX_ERROR_STRING];
//MPI_Error_string(ret, errstr, &len);
//debug_print("MPI_Comm_split err %d: %s\n", ret, errstr);
fenix.new_world_exists = 0;
}

Expand Down

0 comments on commit 490ce70

Please sign in to comment.