merge trunk

src/core/perfmodel/perfmodel_history.c

@@ -966,14 +966,13 @@ void _starpu_load_history_based_model(struct starpu_perfmodel *model, unsigned s
 
 				fclose(f);
 			}
+			_STARPU_DEBUG("Performance model file %s for model %s is loaded\n", path, model->symbol);
 		}
 		else
 		{
-			_STARPU_DEBUG("File does not exists\n");
+			_STARPU_DEBUG("Performance model file %s does not exist\n", path);
 		}
 
-		_STARPU_DEBUG("Performance model file %s for model %s is loaded\n", path, model->symbol);
-
 		model->is_loaded = 1;
 	}
 	STARPU_PTHREAD_RWLOCK_UNLOCK(&model->state->model_rwlock);

src/datawizard/memalloc.c

@@ -701,7 +701,7 @@ size_t _starpu_memory_reclaim_generic(unsigned node, unsigned force, size_t recl
 		char name[32];
 		_starpu_memory_node_get_name(node, name, sizeof(name));
 		if (!warned) {
-			_STARPU_DISP("Not enough memory left on node %s. Your application working set is probably simply just hard to fit in the devices, but StarPU will cope with it by trying to purge %lu bytes out. This message will not be printed again for further purges\n", name, (unsigned long) reclaim);
+			_STARPU_DISP("Not enough memory left on node %s. Your application data set seems to huge to fit on the device, StarPU will cope by trying to purge %lu bytes out. This message will not be printed again for further purges\n", name, (unsigned long) reclaim);
 			warned = 1;
 		}
 	}

src/datawizard/memory_nodes.c

@@ -136,7 +136,7 @@ void _starpu_memory_node_get_name(unsigned node, char *name, int size)
 		prefix = "unknown";
 		STARPU_ASSERT(0);
 	}
-	snprintf(name, size, "%s %u\n", prefix, descr.devid[node]);
+	snprintf(name, size, "%s %u", prefix, descr.devid[node]);
 }
 
 unsigned _starpu_memory_node_register(enum starpu_node_kind kind, int devid)

tests/disk/disk_copy.c

@@ -42,14 +42,20 @@ int main(int argc, char **argv)
 
 int main(int argc, char **argv)
 {
-	double * A,*B,*C,*D,*E,*F;
+	double *A,*B,*C,*D,*E,*F;
+	int ret;
 
 	/* limit main ram to force to push in disk */
 	setenv("STARPU_LIMIT_CPU_MEM", "160", 1);
 
-	/* Initialize StarPU with default configuration */
-	int ret = starpu_init(NULL);
-
+	/* Initialize StarPU without GPU devices to make sure the memory of the GPU devices will not be used */
+	struct starpu_conf conf;
+	ret = starpu_conf_init(&conf);
+	if (ret == -EINVAL)
+		return EXIT_FAILURE;
+	conf.ncuda = 0;
+	conf.nopencl = 0;
+	ret = starpu_init(&conf);
 	if (ret == -ENODEV) goto enodev;
 
 	/* register a disk */