drop fpga_func field

include/starpu_task.h

@@ -228,16 +228,6 @@ typedef starpu_mpi_ms_kernel_t (*starpu_mpi_ms_func_t)(void);
 
 /**
    @deprecated
-   Setting the field starpu_codelet::fpga_func with this macro
-   indicates the codelet will have several implementations. The use of
-   this macro is deprecated. One should always only define the field
-   starpu_codelet::fpga_funcs.
-*/
-
-#define STARPU_MULTIPLE_FPGA_IMPLEMENTATIONS   ((starpu_fpga_func_t) -1)
-
-/**
-   @deprecated
    Setting the field starpu_codelet::opencl_func with this macro
    indicates the codelet will have several implementations. The use of
    this macro is deprecated. One should always only define the field
@@ -329,14 +319,6 @@ struct starpu_codelet
         /**
 	   @deprecated
 	   Optional field which has been made deprecated. One should
-	   use instead the starpu_codelet::fpga_funcs field.
-	*/
-
-	starpu_fpga_func_t fpga_func STARPU_DEPRECATED;
-
-        /**
-	   @deprecated
-	   Optional field which has been made deprecated. One should
 	   use instead the starpu_codelet::opencl_funcs field.
 	*/
 

src/core/task.c

@@ -622,16 +622,6 @@ void _starpu_codelet_check_deprecated_fields(struct starpu_codelet *cl)
 	}
 
        /* FPGA */
-	if (cl->fpga_func && cl->fpga_func != STARPU_MULTIPLE_FPGA_IMPLEMENTATIONS && cl->fpga_funcs[0])
-	{
-		_STARPU_DISP("[warning] [struct starpu_codelet] both fpga_func and fpga_funcs are set. Ignoring fpga_func.\n");
-		cl->fpga_func = STARPU_MULTIPLE_FPGA_IMPLEMENTATIONS;
-	}
-	if (cl->fpga_func && cl->fpga_func != STARPU_MULTIPLE_FPGA_IMPLEMENTATIONS)
-	{
-		cl->fpga_funcs[0] = cl->fpga_func;
-		cl->fpga_func = STARPU_MULTIPLE_FPGA_IMPLEMENTATIONS;
-	}
 	some_impl = 0;
 	for (i = 0; i < STARPU_MAXIMPLEMENTATIONS; i++)
 		if (cl->fpga_funcs[i])
@@ -639,10 +629,6 @@ void _starpu_codelet_check_deprecated_fields(struct starpu_codelet *cl)
 			some_impl = 1;
 			break;
 		}
-	if (some_impl && cl->fpga_func == 0)
-	{
-		cl->fpga_func = STARPU_MULTIPLE_FPGA_IMPLEMENTATIONS;
-	}
 	if (some_impl && is_where_unset)
 	{
 		where |= STARPU_FPGA;

src/drivers/max/driver_fpga.c

@@ -1,6 +1,6 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
- * Copyright (C) 2009-2015  Université de Bordeaux
+ * Copyright (C) 2009-2015, 2019  Université de Bordeaux
  * Copyright (C) 2010  Mehdi Juhoor <mjuhoor@gmail.com>
  * Copyright (C) 2010, 2011, 2012, 2013, 2014, 2019  CNRS
  * Copyright (C) 2011  Télécom-SudParis
@@ -211,7 +211,7 @@ static int execute_job_on_fpga(struct _starpu_job *j, struct starpu_task *worker
 			/* bind to parallel worker */
 			_starpu_bind_thread_on_cpus(_starpu_get_combined_worker_struct(j->combined_workerid));
 
-		STARPU_ASSERT_MSG(func, "when STARPU_FPGA is defined in 'where', fpga_func or fpga_funcs has to be defined");
+		STARPU_ASSERT_MSG(func, "when STARPU_FPGA is defined in 'where', fpga_funcs has to be defined");
 		if (_starpu_get_disable_kernels() <= 0)
 		{
 			_STARPU_TRACE_START_EXECUTING();