Merge branch 'fpga' of gitlab.inria.fr:starpu/starpu into fpga

src/core/perfmodel/perfmodel_history.c

@@ -1559,6 +1559,9 @@ char* starpu_perfmodel_get_archtype_name(enum starpu_worker_archtype archtype)
 		case(STARPU_OPENCL_WORKER):
 			return "opencl";
 			break;
+		case(STARPU_FPGA_WORKER):
+			return "fpga";
+			break;
 		case(STARPU_MIC_WORKER):
 			return "mic";
 			break;

src/core/workers.c

@@ -1200,6 +1200,7 @@ int starpu_conf_noworker(struct starpu_conf *conf)
 	conf->nfpga = 0;
 	conf->nmic = 0;
 	conf->nmpi_ms = 0;
+	return 0;
 }
 
 static void _starpu_conf_set_value_against_environment(char *name, int *value, int precedence_over_env)

src/drivers/cpu/driver_cpu.c

@@ -546,7 +546,7 @@ struct _starpu_node_ops _starpu_driver_cpu_node_ops =
 	.copy_interface_to[STARPU_MPI_MS_RAM] = NULL,
 #endif
 #ifdef STARPU_USE_FPGA
-	.copy_interface_to[STARPU_FPGA_RAM] = _starpu_fpga_copy_interface_from_cpu_to_fpga,
+	//.copy_interface_to[STARPU_FPGA_RAM] = _starpu_fpga_copy_interface_from_cpu_to_fpga,
 #endif
 
 	.copy_data_to[STARPU_UNUSED] = NULL,
@@ -573,7 +573,7 @@ struct _starpu_node_ops _starpu_driver_cpu_node_ops =
 	.copy_data_to[STARPU_MPI_MS_RAM] = NULL,
 #endif
 #ifdef STARPU_USE_FPGA
-	.copy_data_to[STARPU_FPGA_RAM] = _starpu_fpga_copy_data_from_cpu_to_fpga,
+	//.copy_data_to[STARPU_FPGA_RAM] = _starpu_fpga_copy_data_from_cpu_to_fpga,
 #endif
 
 	.copy2d_data_to[STARPU_UNUSED] = NULL,

src/profiling/bound.c

@@ -234,7 +234,9 @@ static void initialize_duration(struct bound_task *task)
 	task->duration[STARPU_CPU_WORKER] = initialize_arch_duration(1,&conf->topology.nhwcpus);
 	task->duration[STARPU_CUDA_WORKER] = initialize_arch_duration(conf->topology.nhwcudagpus,NULL);
 	task->duration[STARPU_OPENCL_WORKER] = initialize_arch_duration(conf->topology.nhwopenclgpus,NULL);
+	task->duration[STARPU_FPGA_WORKER] = initialize_arch_duration(conf->topology.nhwfpgafpgas,NULL);
 	task->duration[STARPU_MIC_WORKER] = initialize_arch_duration(conf->topology.nhwmicdevices,conf->topology.nmiccores);
+	task->duration[STARPU_MPI_MS_WORKER] = initialize_arch_duration(conf->topology.nhwmpidevices,conf->topology.nmpicores);
 }
 
 static struct starpu_perfmodel_device device =

tests/datawizard/manual_reduction.c

@@ -206,8 +206,10 @@ int main(int argc, char **argv)
 	struct starpu_conf conf;
 
 	starpu_conf_init(&conf);
-	conf.nmic = 0;
-	conf.nmpi_ms = 0;
+	starpu_conf_noworker(&conf);
+	conf.ncpus = -1;
+	conf.ncuda = -1;
+	conf.nopencl = -1;
 
 	variable = INIT_VALUE;
 

tests/datawizard/partition_dep.c

@@ -98,6 +98,7 @@ int main(int argc, char **argv)
         return ret;
 
 enodev:
+	starpu_data_unpartition(handle, STARPU_MAIN_RAM);
 	starpu_data_unregister(handle);
 	fprintf(stderr, "WARNING: No one can execute this task\n");
 	/* yes, we do not perform the computation but we did detect that no one