From cbb43d5ac3e5fa96a001097f2b4c680ffef74798 Mon Sep 17 00:00:00 2001 From: rolfv Date: Fri, 7 Nov 2014 11:00:45 -0800 Subject: [PATCH] Make sure initialization happens --- opal/mca/btl/sm/btl_sm_component.c | 8 ++++---- opal/mca/btl/smcuda/btl_smcuda_component.c | 4 ++++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/opal/mca/btl/sm/btl_sm_component.c b/opal/mca/btl/sm/btl_sm_component.c index 4417d44f65..8dc8f2a28b 100644 --- a/opal/mca/btl/sm/btl_sm_component.c +++ b/opal/mca/btl/sm/btl_sm_component.c @@ -734,6 +734,10 @@ mca_btl_sm_component_init(int *num_btls, mca_btl_sm_component.sm_mpool = NULL; mca_btl_sm_component.sm_mpool_base = NULL; +#if OPAL_CUDA_SUPPORT + mca_common_cuda_stage_one_init(); +#endif /* OPAL_CUDA_SUPPORT */ + /* if no session directory was created, then we cannot be used */ if (NULL == opal_process_info.job_session_dir) { /* SKG - this isn't true anymore. Some backing facilities don't require a @@ -927,10 +931,6 @@ mca_btl_sm_component_init(int *num_btls, } #endif /* OPAL_BTL_SM_HAVE_CMA */ -#if OPAL_CUDA_SUPPORT - mca_common_cuda_stage_one_init(); -#endif /* OPAL_CUDA_SUPPORT */ - return btls; no_knem: diff --git a/opal/mca/btl/smcuda/btl_smcuda_component.c b/opal/mca/btl/smcuda/btl_smcuda_component.c index 3a6281a674..32914e96ea 100644 --- a/opal/mca/btl/smcuda/btl_smcuda_component.c +++ b/opal/mca/btl/smcuda/btl_smcuda_component.c @@ -845,6 +845,10 @@ mca_btl_smcuda_component_init(int *num_btls, mca_btl_smcuda_component.sm_mpool = NULL; mca_btl_smcuda_component.sm_mpool_base = NULL; +#if OPAL_CUDA_SUPPORT + mca_common_cuda_stage_one_init(); +#endif /* OPAL_CUDA_SUPPORT */ + /* if no session directory was created, then we cannot be used */ if (NULL == opal_process_info.job_session_dir) { /* SKG - this isn't true anymore. Some backing facilities don't require a