Merge branch 'fpga' of ssh://juelich-max/home/jusers/thibault1/jumax/starpu into fpga

src/drivers/max/driver_fpga.c

@@ -167,6 +167,7 @@ static void init_device_context(unsigned devid)
 
 	/* 0 would be seen as NULL, i.e. allocation failed... */
 	// FIXME: Maxeler FPGAs want 192-byte alignment
+	// TODO: use int 	max_get_burst_size (max_file_t *maxfile, const char *name)
 	current_address[devid] = (fpga_mem) (8192*192);
 	global_mem[devid] = 128ULL*1024*1024*1024;
 

tests/errorcheck/starpu_init_noworker.c

@@ -36,6 +36,7 @@ int main(int argc, char **argv)
 	conf.ncpus = 0;
 	conf.ncuda = 0;
 	conf.nopencl = 0;
+        conf.nfpga = 0;
 	conf.nmic = 0;
         conf.nmpi_ms = 0;
 

tests/fpga/MyTasksMuxManager.maxj

@@ -8,7 +8,6 @@ import com.maxeler.maxcompiler.v2.managers.custom.blocks.Mux;
 import com.maxeler.maxcompiler.v2.managers.custom.blocks.Demux;
 import com.maxeler.maxcompiler.v2.managers.custom.stdlib.LMemCommandGroup;
 import com.maxeler.maxcompiler.v2.managers.custom.stdlib.LMemInterface;
-import com.maxeler.maxcompiler.v2.managers.engine_interfaces.InterfaceParam;
 import com.maxeler.platform.max5.manager.MAX5CManager;
 
 public class MyTasksMuxManager extends MAX5CManager