Samuel Thibault %!s(int64=8) %!d(string=hai) anos
pai
achega
b643914328

+ 5 - 4
src/datawizard/coherency.c

@@ -483,7 +483,7 @@ struct _starpu_data_request *_starpu_create_request_to_fetch_data(starpu_data_ha
 	/* This function is called with handle's header lock taken */
 	_starpu_spin_checklocked(&handle->header_lock);
 
-	unsigned requesting_node = dst_replicate ? dst_replicate->memory_node : -1;
+	int requesting_node = dst_replicate ? dst_replicate->memory_node : -1;
 	unsigned nwait = 0;
 
 	if (mode & STARPU_W)
@@ -527,8 +527,8 @@ struct _starpu_data_request *_starpu_create_request_to_fetch_data(starpu_data_ha
 				_starpu_memory_handle_stats_shared_to_owner(handle, requesting_node);
 #endif
 
-		if (dst_replicate->mc)
-			_starpu_memchunk_recently_used(dst_replicate->mc, requesting_node);
+			if (dst_replicate->mc)
+				_starpu_memchunk_recently_used(dst_replicate->mc, requesting_node);
 		}
 
 		_starpu_spin_unlock(&handle->header_lock);
@@ -540,7 +540,8 @@ struct _starpu_data_request *_starpu_create_request_to_fetch_data(starpu_data_ha
 		return NULL;
 	}
 
-	_starpu_msi_cache_miss(requesting_node);
+	if (dst_replicate)
+		_starpu_msi_cache_miss(requesting_node);
 
 	/* the only remaining situation is that the local copy was invalid */
 	STARPU_ASSERT((dst_replicate && dst_replicate->state == STARPU_INVALID) || nwait);

+ 1 - 1
src/datawizard/coherency.h

@@ -153,7 +153,7 @@ struct _starpu_data_state
 	/* Switch codelet for asynchronous partitioning */
 	struct starpu_codelet *switch_cl;
 	/* size of dyn_nodes recorded in switch_cl */
-	int switch_cl_nparts;
+	unsigned switch_cl_nparts;
 	/* Whether a partition plan is currently submitted and the
 	 * corresponding unpartition has not been yet
 	 *

+ 1 - 1
src/datawizard/data_request.c

@@ -132,7 +132,7 @@ static void _starpu_data_request_destroy(struct _starpu_data_request *r)
 struct _starpu_data_request *_starpu_create_data_request(starpu_data_handle_t handle,
 							 struct _starpu_data_replicate *src_replicate,
 							 struct _starpu_data_replicate *dst_replicate,
-							 unsigned handling_node,
+							 int handling_node,
 							 enum starpu_data_access_mode mode,
 							 unsigned ndeps,
 							 unsigned is_prefetch,

+ 1 - 1
src/datawizard/data_request.h

@@ -135,7 +135,7 @@ int _starpu_check_that_no_data_request_is_pending(unsigned node);
 struct _starpu_data_request *_starpu_create_data_request(starpu_data_handle_t handle,
 							 struct _starpu_data_replicate *src_replicate,
 							 struct _starpu_data_replicate *dst_replicate,
-							 unsigned handling_node,
+							 int handling_node,
 							 enum starpu_data_access_mode mode,
 							 unsigned ndeps,
 							 unsigned is_prefetch,

+ 1 - 1
src/datawizard/filters.c

@@ -139,7 +139,7 @@ starpu_data_handle_t fstarpu_data_get_sub_data(starpu_data_handle_t root_handle,
 		STARPU_ASSERT(next_child >= 0);
 
 		STARPU_ASSERT_MSG(current_handle->nchildren != 0, "Data %p has to be partitioned before accessing children", current_handle);
-		STARPU_ASSERT_MSG(next_child < current_handle->nchildren, "Bogus child number %u, data %p only has %u children", next_child, current_handle, current_handle->nchildren);
+		STARPU_ASSERT_MSG((unsigned) next_child < current_handle->nchildren, "Bogus child number %u, data %p only has %u children", next_child, current_handle, current_handle->nchildren);
 
 		current_handle = &current_handle->children[next_child];
 	}

+ 1 - 1
src/datawizard/interfaces/data_interface.c

@@ -333,7 +333,7 @@ static void _starpu_register_new_data(starpu_data_handle_t handle,
 		replicate->relaxed_coherency = 0;
 		replicate->refcnt = 0;
 
-		if (node == home_node)
+		if ((int) node == home_node)
 		{
 			/* this is the home node with the only valid copy */
 			replicate->state = STARPU_OWNER;

+ 1 - 1
src/sched_policies/parallel_eager.c

@@ -182,7 +182,7 @@ static struct starpu_task *pop_task_peager_policy(unsigned sched_ctx_id)
 {
 	struct _starpu_peager_data *data = (struct _starpu_peager_data*)starpu_sched_ctx_get_policy_data(sched_ctx_id);
 
-	unsigned workerid = starpu_worker_get_id_check();
+	int workerid = starpu_worker_get_id_check();
 
 	/* If this is not a CPU or a MIC, then the worker simply grabs tasks from the fifo */
 	if (starpu_worker_get_type(workerid) != STARPU_CPU_WORKER && starpu_worker_get_type(workerid) != STARPU_MIC_WORKER)

+ 5 - 5
src/util/fstarpu.c

@@ -247,7 +247,7 @@ void fstarpu_codelet_add_cpu_func(struct starpu_codelet *cl, void *f_ptr)
 void fstarpu_codelet_add_cuda_func(struct starpu_codelet *cl, void *f_ptr)
 {
 	const size_t max_cuda_funcs = sizeof(cl->cuda_funcs)/sizeof(cl->cuda_funcs[0])-1;
-	int i;
+	unsigned i;
 	for (i = 0; i < max_cuda_funcs; i++)
 	{
 		if (cl->cuda_funcs[i] == NULL)
@@ -262,7 +262,7 @@ void fstarpu_codelet_add_cuda_func(struct starpu_codelet *cl, void *f_ptr)
 void fstarpu_codelet_add_opencl_func(struct starpu_codelet *cl, void *f_ptr)
 {
 	const size_t max_opencl_funcs = sizeof(cl->opencl_funcs)/sizeof(cl->opencl_funcs[0])-1;
-	int i;
+	unsigned i;
 	for (i = 0; i < max_opencl_funcs; i++)
 	{
 		if (cl->opencl_funcs[i] == NULL)
@@ -277,7 +277,7 @@ void fstarpu_codelet_add_opencl_func(struct starpu_codelet *cl, void *f_ptr)
 void fstarpu_codelet_add_mic_func(struct starpu_codelet *cl, void *f_ptr)
 {
 	const size_t max_mic_funcs = sizeof(cl->mic_funcs)/sizeof(cl->mic_funcs[0])-1;
-	int i;
+	unsigned i;
 	for (i = 0; i < max_mic_funcs; i++)
 	{
 		if (cl->mic_funcs[i] == NULL)
@@ -292,7 +292,7 @@ void fstarpu_codelet_add_mic_func(struct starpu_codelet *cl, void *f_ptr)
 void fstarpu_codelet_add_scc_func(struct starpu_codelet *cl, void *f_ptr)
 {
 	const size_t max_scc_funcs = sizeof(cl->scc_funcs)/sizeof(cl->scc_funcs[0])-1;
-	int i;
+	unsigned i;
 	for (i = 0; i < max_scc_funcs; i++)
 	{
 		if (cl->scc_funcs[i] == NULL)
@@ -313,7 +313,7 @@ void fstarpu_codelet_add_buffer(struct starpu_codelet *cl, intptr_t _mode)
 	{
 		_FSTARPU_ERROR("fstarpu: invalid data mode");
 	}
-	if  (cl->nbuffers < max_modes)
+	if  (cl->nbuffers < (int) max_modes)
 	{
 		cl->modes[cl->nbuffers] = (unsigned int)mode;
 		cl->nbuffers++;

+ 2 - 2
src/worker_collection/worker_tree.c

@@ -268,8 +268,8 @@ static int tree_remove(struct starpu_worker_collection *workers, int worker)
 {
 	if(workers->present[worker])
 	{
-		int i;
-		for (i = 0; i < workers->nworkers--; i++)
+		unsigned i;
+		for (i = 0; i < workers->nworkers; i++)
 			if (workers->workerids[i] == worker)
 			{
 				memmove(&workers->workerids[i], &workers->workerids[i+1], (workers->nworkers-1-i) * sizeof(workers->workerids[i]));