|
@@ -2,7 +2,7 @@
|
|
|
*
|
|
|
* Copyright (C) 2009-2016 Université de Bordeaux
|
|
|
* Copyright (C) 2010, 2011, 2012, 2013, 2014, 2015, 2016 CNRS
|
|
|
- * Copyright (C) 2011 INRIA
|
|
|
+ * Copyright (C) 2011, 2016 INRIA
|
|
|
*
|
|
|
* StarPU is free software; you can redistribute it and/or modify
|
|
|
* it under the terms of the GNU Lesser General Public License as published by
|
|
@@ -854,15 +854,11 @@ _starpu_init_mp_config (struct _starpu_machine_config *config,
|
|
|
if (reqmicdevices == -1 && user_conf)
|
|
|
reqmicdevices = user_conf->nmic;
|
|
|
if (reqmicdevices == -1)
|
|
|
- reqmicdevices = nhwmicdevices;
|
|
|
-
|
|
|
- if (reqmicdevices == -1)
|
|
|
- {
|
|
|
/* Nothing was specified, so let's use the number of
|
|
|
* detected mic devices. ! */
|
|
|
reqmicdevices = nhwmicdevices;
|
|
|
- }
|
|
|
- else
|
|
|
+
|
|
|
+ if (reqmicdevices != -1)
|
|
|
{
|
|
|
if ((unsigned) reqmicdevices > nhwmicdevices)
|
|
|
{
|