Changeset 1356 for XIOS/dev/branch_openmp/extern
- Timestamp:
- 12/05/17 17:40:02 (7 years ago)
- Location:
- XIOS/dev/branch_openmp/extern/src_ep_dev
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
XIOS/dev/branch_openmp/extern/src_ep_dev/ep_create.cpp
r1355 r1356 179 179 180 180 181 int MPI_Comm_create_endpoints( int* base_comm_ptr, int num_ep, MPI_Info info, MPI_Comm *& out_comm_hdls)181 int MPI_Comm_create_endpoints(void* base_comm_ptr, int num_ep, MPI_Info info, MPI_Comm *& out_comm_hdls) 182 182 { 183 183 … … 200 200 out_comm_hdls[idx].is_intercomm = false; 201 201 out_comm_hdls[idx].ep_comm_ptr = new ep_communicator; 202 *( out_comm_hdls[idx].mpi_comm) = *base_comm_ptr;202 *(static_cast< ::MPI_Comm*>(out_comm_hdls[idx].mpi_comm)) = *(static_cast< ::MPI_Comm*>(base_comm_ptr)); 203 203 out_comm_hdls[idx].ep_comm_ptr->comm_list = out_comm_hdls; 204 204 out_comm_hdls[idx].ep_comm_ptr->comm_label = 0; -
XIOS/dev/branch_openmp/extern/src_ep_dev/ep_free.cpp
r1354 r1356 80 80 81 81 } 82 82 83 return 0; 83 84 } … … 142 143 } 143 144 144 // if(comm->ep_comm_ptr->intercomm->mpi_inter_comm != MPI_COMM_NULL_STD)145 //{146 // ::MPI_Comm mpi_comm = static_cast< ::MPI_Comm>(comm->ep_comm_ptr->comm_list->ep_comm_ptr->intercomm->mpi_inter_comm);147 //::MPI_Comm_free(&mpi_comm);148 //Debug("mpi_intercomm freed\n");149 //}145 if(comm->ep_comm_ptr->intercomm->mpi_inter_comm != static_cast< ::MPI_Comm*>(MPI_COMM_NULL.mpi_comm)) 146 { 147 ::MPI_Comm mpi_comm = to_mpi_comm(comm->ep_comm_ptr->comm_list->ep_comm_ptr->intercomm->mpi_inter_comm); 148 ::MPI_Comm_free(&mpi_comm); 149 Debug("mpi_intercomm freed\n"); 150 } 150 151 151 152 if(comm != NULL) {delete[] comm->ep_comm_ptr->comm_list; Debug("comm freed\n");} 152 153 153 154 } 155 156 154 157 155 158 return 0; -
XIOS/dev/branch_openmp/extern/src_ep_dev/ep_intercomm_world.cpp
r1355 r1356 538 538 539 539 // #elif _intelmpi 540 int MPI_Intercomm_create_from_world(MPI_Comm local_comm, int local_leader, int* peer_comm_ptr, int mpi_remote_leader, int tag, MPI_Comm *newintercomm)540 int MPI_Intercomm_create_from_world(MPI_Comm local_comm, int local_leader, void* peer_comm_ptr, int mpi_remote_leader, int tag, MPI_Comm *newintercomm) 541 541 { 542 542 int ep_rank, ep_rank_loc, mpi_rank; -
XIOS/dev/branch_openmp/extern/src_ep_dev/ep_lib.cpp
r1355 r1356 246 246 } 247 247 248 MPI_Comm to_mpi_comm( int* comm)248 MPI_Comm to_mpi_comm(void* comm) 249 249 { 250 return static_cast< MPI_Comm >(*comm);250 return *(static_cast< MPI_Comm* >(comm)); 251 251 } 252 252 -
XIOS/dev/branch_openmp/extern/src_ep_dev/ep_lib.hpp
r1355 r1356 49 49 // #endif 50 50 51 int MPI_Comm_create_endpoints( int* base_comm_ptr, int num_ep, MPI_Info info, MPI_Comm *& out_comm_hdls); // from EP to create endpoints51 int MPI_Comm_create_endpoints(void* base_comm_ptr, int num_ep, MPI_Info info, MPI_Comm *& out_comm_hdls); // from EP to create endpoints 52 52 53 53 int MPI_Send(void *buf, int count, MPI_Datatype datatype, int dest, int tag, MPI_Comm comm); -
XIOS/dev/branch_openmp/extern/src_ep_dev/ep_lib_intercomm.hpp
r1355 r1356 41 41 // #endif 42 42 43 int MPI_Intercomm_create_from_world(MPI_Comm local_comm, int local_leader, int* peer_comm_ptr, int mpi_remote_leader, int tag, MPI_Comm *newintercomm);43 int MPI_Intercomm_create_from_world(MPI_Comm local_comm, int local_leader, void* peer_comm_ptr, int mpi_remote_leader, int tag, MPI_Comm *newintercomm); 44 44 45 45 int MPI_Intercomm_create_unique_leader(MPI_Comm local_comm, int local_leader, MPI_Comm peer_comm, int remote_leader, int tag, MPI_Comm *newintercomm); -
XIOS/dev/branch_openmp/extern/src_ep_dev/ep_mpi.hpp
r1355 r1356 6 6 MPI_Datatype to_mpi_type(ep_lib::MPI_Datatype type); 7 7 MPI_Op to_mpi_op(ep_lib::MPI_Op op); 8 MPI_Comm to_mpi_comm( int* comm);8 MPI_Comm to_mpi_comm(void* comm); 9 9 10 10 #endif // EP_MPI_HPP_INCLUDED -
XIOS/dev/branch_openmp/extern/src_ep_dev/ep_type.hpp
r1355 r1356 134 134 public: 135 135 136 int*mpi_inter_comm;136 void *mpi_inter_comm; 137 137 138 138 RANK_MAP *intercomm_rank_map; … … 148 148 149 149 ep_intercomm(); 150 //~ep_intercomm(){delete mpi_inter_comm;} 150 151 bool operator == (ep_intercomm right); 151 152 bool operator != (ep_intercomm right); … … 197 198 OMPbarrier *ep_barrier; 198 199 RANK_MAP *rank_map; 199 int* mpi_comm;200 void* mpi_comm; 200 201 EP_Comm ep_comm_ptr; 201 202 MPI_Comm *mem_bridge; … … 203 204 204 205 MPI_Comm(); 205 //MPI_Comm(const MPI_Comm &comm);206 MPI_Comm(int* comm);206 MPI_Comm(void* comm); 207 //~MPI_Comm(){delete mpi_comm;} 207 208 208 209
Note: See TracChangeset
for help on using the changeset viewer.