Merge pull request #10311 from akesandgren/main_fix_missing_gdr_protection

Add missing "#if OPAL_CUDA_GDR_SUPPORT" protection.

Author: jsquyres

ompi/mca/pml/ob1/pml_ob1_cuda.c

@@ -127,7 +127,10 @@ size_t mca_pml_ob1_rdma_cuda_btls(
             if( NULL != bml_btl->btl->btl_register_mem ) {
                 /* register the memory */
                 handle = bml_btl->btl->btl_register_mem (bml_btl->btl, bml_btl->btl_endpoint,
-                                                         base, size, MCA_BTL_REG_FLAG_CUDA_GPU_MEM |
+                                                         base, size,
+#if OPAL_CUDA_GDR_SUPPORT
+                                                         MCA_BTL_REG_FLAG_CUDA_GPU_MEM |
+#endif
                                                          MCA_BTL_REG_FLAG_REMOTE_READ);
             }
 

opal/mca/btl/smcuda/btl_smcuda.c

@@ -1006,9 +1006,11 @@ mca_btl_smcuda_register_mem(struct mca_btl_base_module_t *btl,
     int access_flags = flags & MCA_BTL_REG_FLAG_ACCESS_ANY;
     int rcache_flags = 0;
 
+#if OPAL_CUDA_GDR_SUPPORT
     if (MCA_BTL_REG_FLAG_CUDA_GPU_MEM & flags) {
         rcache_flags |= MCA_RCACHE_FLAGS_CUDA_GPU_MEM;
     }
+#endif
 
     smcuda_module->rcache->rcache_register(smcuda_module->rcache, base, size, rcache_flags,
                                            access_flags, (mca_rcache_base_registration_t **) &reg);

opal/mca/btl/smcuda/btl_smcuda_component.c

@@ -212,11 +212,13 @@ static int smcuda_register(void)
     if (0 == mca_btl_smcuda.super.btl_cuda_max_send_size) {
         mca_btl_smcuda.super.btl_cuda_max_send_size = 128 * 1024;
     }
+#if OPAL_CUDA_GDR_SUPPORT
     /* If user has not set the value, then set to magic number which will be converted to the
      * minimum size needed to fit the PML header (see pml_ob1.c) */
     if (0 == mca_btl_smcuda.super.btl_cuda_eager_limit) {
         mca_btl_smcuda.super.btl_cuda_eager_limit = SIZE_MAX; /* magic number */
     }
+#endif
     mca_common_cuda_register_mca_variables();
 #endif /* OPAL_CUDA_SUPPORT */
     return mca_btl_smcuda_component_verify();