fix the renaming issue after merge

Conflicts:
	test/datatype/Makefile.am

Conflicts:
	opal/mca/btl/smcuda/btl_smcuda.c

Author: eddy16112

opal/mca/btl/smcuda/btl_smcuda.c

@@ -1074,8 +1074,8 @@ static int mca_btl_smcuda_register_convertor (struct mca_btl_base_module_t* btl,
                                               struct mca_btl_base_registration_handle_t *handle,
                                               struct opal_convertor_t *convertor)
 {
- //   printf("Hello, i register convertor, %p\n", (void*)convertor);
-    mca_mpool_common_cuda_reg_t *cuda_reg = (mca_mpool_common_cuda_reg_t *)((intptr_t) handle - offsetof (mca_mpool_common_cuda_reg_t, data));
+    printf("Hello, i register convertor, %p\n", (void*)convertor);
+    mca_rcache_common_cuda_reg_t *cuda_reg = (mca_rcache_common_cuda_reg_t *)((intptr_t) handle - offsetof (mca_rcache_common_cuda_reg_t, data));
 
     int32_t local_device = 0;
     if (convertor->flags & CONVERTOR_CUDA) {
@@ -1234,10 +1234,10 @@ int mca_btl_smcuda_get_cuda (struct mca_btl_base_module_t *btl,
                 lindex = mca_btl_smcuda_alloc_cuda_ddt_clone(ep);
                 if (remote_device == local_device || OPAL_DATATYPE_DIRECT_COPY_GPUMEM) {
                     /* now we are able to let sender pack directly to my memory */
-                    mca_mpool_common_cuda_reg_t loc_reg;
-                    mca_mpool_common_cuda_reg_t *loc_reg_ptr = &loc_reg;
+                    mca_rcache_common_cuda_reg_t loc_reg;
+                    mca_rcache_common_cuda_reg_t *loc_reg_ptr = &loc_reg;
                     cuda_ddt_put_hdr_t put_msg;
-                    if (OPAL_SUCCESS != cuda_getmemhandle(local_address, size, (mca_mpool_base_registration_t *)&loc_reg, NULL)) {
+                    if (OPAL_SUCCESS != cuda_getmemhandle(local_address, size, (mca_rcache_base_registration_t *)&loc_reg, NULL)) {
                         mca_btl_smcuda_cuda_ddt_start_pack(btl, ep, pack_convertor, unpack_convertor, remote_memory_address, (mca_btl_base_descriptor_t *)frag, 
                                                            lindex, remote_device, local_device);
                     }

opal/mca/btl/smcuda/btl_smcuda_component.c

@@ -1086,12 +1086,12 @@ static void btl_smcuda_datatype_put(mca_btl_base_module_t* btl,
     endpoint = mca_btl_smcuda_component.sm_peers[frag->hdr->my_smp_rank];
 
     opal_cuda_free_gpu_buffer(convertor->gpu_buffer_ptr, 0);
-    mca_mpool_common_cuda_reg_t *rget_reg_ptr = NULL;
-    mca_mpool_common_cuda_reg_t rget_reg;
+    mca_rcache_common_cuda_reg_t *rget_reg_ptr = NULL;
+    mca_rcache_common_cuda_reg_t rget_reg;
     rget_reg_ptr= &rget_reg;
     memset(&rget_reg, 0, sizeof(rget_reg));
     memcpy(rget_reg.data.memHandle, recv_msg.mem_handle, sizeof(recv_msg.mem_handle));
-    cuda_openmemhandle(NULL, 0, (mca_mpool_base_registration_t *)&rget_reg, NULL);
+    cuda_openmemhandle(NULL, 0, (mca_rcache_base_registration_t *)&rget_reg, NULL);
     size_t offset = (size_t) ((intptr_t)remote_address - (intptr_t)remote_base);
     unsigned char *remote_memory_address = (unsigned char *)rget_reg_ptr->base.alloc_base + offset;
     convertor->gpu_buffer_ptr = remote_memory_address;

opal/mca/common/cuda/common_cuda.c

@@ -2002,7 +2002,7 @@ int mca_common_cuda_query_event(uint64_t *event)
     }
 }
 
-int mca_common_cuda_openeventhandle(uint64_t **event, int n, mca_mpool_common_cuda_reg_data_t *handle)
+int mca_common_cuda_openeventhandle(uint64_t **event, int n, mca_rcache_common_cuda_reg_data_t *handle)
 {
     // CUipcEventHandle evtHandle;
     // CUresult result;

opal/mca/common/cuda/common_cuda.h

@@ -99,7 +99,7 @@ OPAL_DECLSPEC void mca_common_cuda_fini(void);
 OPAL_DECLSPEC int mca_common_cuda_create_event(uint64_t **event);
 OPAL_DECLSPEC int mca_common_cuda_record_event(uint64_t *event);
 OPAL_DECLSPEC int mca_common_cuda_query_event(uint64_t *event);
-OPAL_DECLSPEC int mca_common_cuda_openeventhandle(uint64_t **event, int n, mca_mpool_common_cuda_reg_data_t *handle);
+OPAL_DECLSPEC int mca_common_cuda_openeventhandle(uint64_t **event, int n, mca_rcache_common_cuda_reg_data_t *handle);
 OPAL_DECLSPEC int mca_common_cuda_memp2pcpy(void *dest, const void *src, size_t size);
 #if OPAL_CUDA_GDR_SUPPORT
 OPAL_DECLSPEC bool mca_common_cuda_previously_freed_memory(mca_rcache_base_registration_t *reg);

test/datatype/Makefile.am

@@ -14,7 +14,7 @@
 #
 
 if PROJECT_OMPI
-    MPI_TESTS = checksum position position_noncontig ddt_test ddt_raw unpack_ooo ddt_pack ddt_benchmark external32
+    MPI_TESTS = checksum position position_noncontig ddt_test ddt_raw unpack_ooo ddt_pack external32 ddt_benchmark
     MPI_CHECKS = to_self
 endif
 TESTS = opal_datatype_test $(MPI_TESTS)