From 0a0b856df38ec6ab0aa3c86ef360098ed88e005e Mon Sep 17 00:00:00 2001
From: Mathieu Faverge <mathieu.faverge@inria.fr>
Date: Sun, 14 Jan 2018 21:35:36 +0100
Subject: [PATCH] Silent warning about cuda registration when no GPUs are
involved
---
control/descriptor.c | 2 +-
runtime/starpu/control/runtime_descriptor.c | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/control/descriptor.c b/control/descriptor.c
index bec07637c..798c97f50 100644
--- a/control/descriptor.c
+++ b/control/descriptor.c
@@ -151,7 +151,7 @@ MORSE_desc_t morse_desc_init_user(MORSE_enum dtyp, int mb, int nb, int bsiz,
desc.occurences = 0;
desc.use_mat = 1;
desc.alloc_mat = 1;
- desc.register_mat = 1;
+ desc.register_mat = (morse->ncudas > 0) ? 1 : 0;
desc.ooc = 0;
desc.myrank = RUNTIME_comm_rank( morse );
diff --git a/runtime/starpu/control/runtime_descriptor.c b/runtime/starpu/control/runtime_descriptor.c
index 39282f386..16308ce3f 100644
--- a/runtime/starpu/control/runtime_descriptor.c
+++ b/runtime/starpu/control/runtime_descriptor.c
@@ -127,6 +127,8 @@ void RUNTIME_desc_create( MORSE_desc_t *desc )
rc = cudaHostRegister( desc->mat, size, cudaHostRegisterPortable );
if ( rc != cudaSuccess )
{
+ /* Disable the unregister as register failed */
+ desc->register_mat = 0;
morse_warning("RUNTIME_desc_create(StarPU): cudaHostRegister - ", cudaGetErrorString( rc ));
}
}
--
GitLab