浏览代码

Make some warnings clearer. Avoid a very odd warning when the codelet has more parameters than allowed

Samuel Thibault 12 年之前
父节点
当前提交
a3f27f08ad

+ 1 - 1
src/common/utils.c

@@ -134,7 +134,7 @@ char *_starpu_get_home_path(void)
 		static int warn;
 		if (!warn) {
 			warn = 1;
-			_STARPU_DISP("couldn't find a home place to put starpu data, using /tmp\n");
+			_STARPU_DISP("couldn't find a $STARPU_HOME place to put .starpu data, using /tmp\n");
 		}
 		path = "/tmp";
 	}

+ 1 - 1
src/core/perfmodel/perfmodel_history.c

@@ -963,7 +963,7 @@ int starpu_perfmodel_list(FILE *output)
         }
         else
 	{
-		_STARPU_DISP("Could not open the perfmodel directory <%s>\n", path);
+		_STARPU_DISP("Could not open the perfmodel directory <%s>: \n", path, strerror(errno));
         }
 	return 0;
 }

+ 1 - 1
src/core/task.c

@@ -363,7 +363,7 @@ void _starpu_task_check_deprecated_fields(struct starpu_task *task)
 	if (task->cl)
 	{
 		unsigned i;
-		for(i=0; i<task->cl->nbuffers ; i++)
+		for(i=0; i<MIN(task->cl->nbuffers, STARPU_NMAXBUFS) ; i++)
 		{
 			if (task->buffers[i].handle && task->handles[i])
 			{

+ 1 - 1
src/datawizard/data_request.c

@@ -162,7 +162,7 @@ int _starpu_wait_data_request_completion(struct _starpu_data_request *r, unsigne
 
 	retval = r->retval;
 	if (retval)
-		_STARPU_DISP("REQUEST %p COMPLETED (retval %d) !\n", r, r->retval);
+		_STARPU_DISP("REQUEST %p completed with retval %d!\n", r, r->retval);
 
 
 	r->refcnt--;

+ 1 - 1
src/drivers/cpu/driver_cpu.c

@@ -68,7 +68,7 @@ _starpu_cpu_discover_devices(struct _starpu_machine_config *config)
 
 	if (config->cpu_depth == HWLOC_TYPE_DEPTH_UNKNOWN) {
 		/* unknown, using logical procesors as fallback */
-		_STARPU_DISP("Warning: OS did not report CPU cores. Assuming there is only one thread per core.\n");
+		_STARPU_DISP("Warning: The OS did not report CPU cores. Assuming there is only one hardware thread per core.\n");
 		config->cpu_depth = hwloc_get_type_depth(topology->hwtopology,
 							 HWLOC_OBJ_PU);
 	}

+ 1 - 1
src/drivers/cuda/driver_cuda.c

@@ -481,7 +481,7 @@ int _starpu_cuda_driver_run_once(struct starpu_driver *d)
 		switch (res)
 		{
 			case -EAGAIN:
-				_STARPU_DISP("ouch, put the codelet %p back ... \n", j);
+				_STARPU_DISP("ouch, CUDA could not actually run task %p, putting it back...\n", task);
 				_starpu_push_task_to_workers(task);
 				STARPU_ABORT();
 			default:

+ 1 - 1
src/drivers/mic/driver_mic_source.c

@@ -685,7 +685,7 @@ void *_starpu_mic_src_worker(void *arg)
 			switch (res)
 			{
 				case -EAGAIN:
-					_STARPU_DISP("ouch, put the codelet %p back ... \n", j);
+					_STARPU_DISP("ouch, Xeon Phi could not actually run task %p, putting it back...\n", task);
 					_starpu_push_task_to_workers(task);
 					STARPU_ABORT();
 					continue;

+ 1 - 1
src/drivers/mp_common/source_common.c

@@ -65,7 +65,7 @@ int _starpu_src_common_lookup(struct _starpu_mp_node *node,
 						&arg_size);
 
 	if (answer == STARPU_ERROR_LOOKUP) {
-		_STARPU_DISP("Error looking up %s\n", func_name);
+		_STARPU_DISP("Error looking up symbol %s\n", func_name);
 		return -ESPIPE;
 	}
 

+ 1 - 1
src/drivers/opencl/driver_opencl.c

@@ -677,7 +677,7 @@ int _starpu_opencl_driver_run_once(struct starpu_driver *d)
 		switch (res)
 		{
 			case -EAGAIN:
-				_STARPU_DISP("ouch, put the codelet %p back ... \n", j);
+				_STARPU_DISP("ouch, OpenCL could not actually run task %p, putting it back...\n", task);
 				_starpu_push_task_to_workers(task);
 				STARPU_ABORT();
 				return 0;

+ 2 - 2
src/drivers/opencl/driver_opencl_utils.c

@@ -1,7 +1,7 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
  * Copyright (C) 2010, 2011, 2012  Centre National de la Recherche Scientifique
- * Copyright (C) 2010-2012  Université de Bordeaux 1
+ * Copyright (C) 2010-2013  Université de Bordeaux 1
  *
  * 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
@@ -271,7 +271,7 @@ int _starpu_opencl_compile_or_load_opencl_from_string(const char *opencl_program
 		// Create the compute program from the source buffer
 		program = clCreateProgramWithSource(context, 1, (const char **) &opencl_program_source, NULL, &err);
 		if (!program || err != CL_SUCCESS) {
-			_STARPU_DISP("Error: Failed to load program source!\n");
+			_STARPU_DISP("Error: Failed to load program source with options %s!\n", build_options);
 			return EXIT_FAILURE;
 		}
 

+ 1 - 1
src/drivers/scc/driver_scc_source.c

@@ -387,7 +387,7 @@ void *_starpu_scc_src_worker(void *arg)
 			switch (res)
 			{
 				case -EAGAIN:
-					_STARPU_DISP("ouch, put the codelet %p back ... \n", j);
+					_STARPU_DISP("ouch, SCC could not actually run task %p, putting it back...\n", task);
 					_starpu_push_task_to_workers(task);
 					STARPU_ABORT();
 					continue;