Просмотр исходного кода

There may not be memory objects for e.g. OpenCL devices

Samuel Thibault лет назад: 7
Родитель
Сommit
aace86be8b
1 измененных файлов с 3 добавлено и 3 удалено
  1. 3 3
      src/core/topology.c

+ 3 - 3
src/core/topology.c

@@ -1,7 +1,7 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
  *
  * Copyright (C) 2011-2017                                Inria
  * Copyright (C) 2011-2017                                Inria
- * Copyright (C) 2009-2017                                Université de Bordeaux
+ * Copyright (C) 2009-2018                                Université de Bordeaux
  * Copyright (C) 2010-2017                                CNRS
  * Copyright (C) 2010-2017                                CNRS
  * Copyright (C) 2013                                     Thibaut Lambert
  * Copyright (C) 2013                                     Thibaut Lambert
  * Copyright (C) 2016                                     Uppsala University
  * Copyright (C) 2016                                     Uppsala University
@@ -117,8 +117,8 @@ static hwloc_obj_t numa_get_obj(hwloc_obj_t obj)
 	while (obj->memory_first_child == NULL)
 	while (obj->memory_first_child == NULL)
 	{
 	{
 		obj = obj->parent;
 		obj = obj->parent;
-		/* There should always be memory objects with hwloc 2 */
-		STARPU_ASSERT(obj);
+		if (!obj)
+			return NULL;
 	}
 	}
 	return obj->memory_first_child;
 	return obj->memory_first_child;
 #else
 #else