Browse Source

Update for 0.3

Matthias Vogelgesang 11 years ago
parent
commit
955bfb7608

+ 1 - 9
src/ufo-filter-3d-edf-writer.c

@@ -1,20 +1,12 @@
-#include <gmodule.h>
-
 #ifdef __APPLE__
 #include <OpenCL/cl.h>
 #else
 #include <CL/cl.h>
 #endif
-
-
-#include <ufo/ufo-filter.h>
-#include <ufo/ufo-buffer.h>
-#include <ufo/ufo-resource-manager.h>
+#include <stdio.h>
 
 #include "ufo-filter-3d-edf-writer.h"
 
-#include <stdio.h>
-
 
 /**
  * SECTION:ufo-filter-3d-edf-writer

+ 1 - 1
src/ufo-filter-3d-edf-writer.h

@@ -2,7 +2,7 @@
 #define __UFO_FILTER_3D_EDF_WRITER_H__ 
 
 #include <glib.h>
-#include <ufo/ufo-filter-sink.h>
+#include <ufo/ufo.h>
 
 #define UFO_TYPE_FILTER_3D_EDF_WRITER             (ufo_filter_3d_edf_writer_get_type())
 #define UFO_FILTER_3D_EDF_WRITER(obj)             (G_TYPE_CHECK_INSTANCE_CAST((obj), UFO_TYPE_FILTER_3D_EDF_WRITER, UfoFilter3DEdfWriter))

+ 0 - 2
src/ufo-lamino-bp-task.c

@@ -14,7 +14,6 @@
 #include <CL/cl.h>
 #endif
 #include <math.h>
-#include <ufo-gpu-task-iface.h>
 #include "ufo-lamino-bp-task.h"
 #include "lamino-filter-def.h"
 
@@ -116,7 +115,6 @@ ufo_lamino_bp_task_get_structure (UfoTask *task,
     *n_inputs = 1;
     *input_params = g_new0 (UfoInputParam, 1);
     (*input_params)[0].n_dims = 2;
-    (*input_params)[0].n_expected = -1;
 }
 
 static gboolean

+ 1 - 1
src/ufo-lamino-bp-task.h

@@ -1,7 +1,7 @@
 #ifndef __UFO_LAMINO_BP_TASK_H
 #define __UFO_LAMINO_BP_TASK_H
 
-#include <ufo-task-node.h>
+#include <ufo/ufo.h>
 
 G_BEGIN_DECLS
 

+ 0 - 3
src/ufo-lamino-conv-task.c

@@ -15,7 +15,6 @@
 #else
 #include <CL/cl.h>
 #endif
-#include <ufo-gpu-task-iface.h>
 #include "ufo-lamino-conv-task.h"
 
 struct _UfoLaminoConvTaskPrivate {
@@ -108,9 +107,7 @@ ufo_lamino_conv_task_get_structure (UfoTask *task,
     *n_inputs = 2;
     *in_params = g_new0 (UfoInputParam, 2);
     (*in_params)[0].n_dims = 2;
-    (*in_params)[0].n_expected = -1;
     (*in_params)[1].n_dims = 2;
-    (*in_params)[1].n_expected = 1;
 }
 
 static UfoNode *

+ 1 - 1
src/ufo-lamino-conv-task.h

@@ -1,7 +1,7 @@
 #ifndef __UFO_LAMINO_CONV_TASK_H
 #define __UFO_LAMINO_CONV_TASK_H
 
-#include <ufo-task-node.h>
+#include <ufo/ufo.h>
 
 G_BEGIN_DECLS
 

+ 0 - 1
src/ufo-lamino-ramp-task.c

@@ -20,7 +20,6 @@
 #include <CL/cl.h>
 #endif
 
-#include <ufo-gpu-task-iface.h>
 #include "ufo-lamino-ramp-task.h"
 
 struct _UfoLaminoRampTaskPrivate {

+ 1 - 1
src/ufo-lamino-ramp-task.h

@@ -1,7 +1,7 @@
 #ifndef __UFO_LAMINO_RAMP_TASK_H
 #define __UFO_LAMINO_RAMP_TASK_H
 
-#include <ufo-task-node.h>
+#include <ufo/ufo.h>
 
 G_BEGIN_DECLS
 

+ 0 - 2
src/ufo-padding-2d-task.c

@@ -15,7 +15,6 @@
 #else
 #include <CL/cl.h>
 #endif
-#include <ufo-gpu-task-iface.h>
 #include "ufo-padding-2d-task.h"
 
 typedef enum {
@@ -212,7 +211,6 @@ ufo_padding_2d_task_get_structure (UfoTask *task,
     *n_inputs = 1;
     *in_params = g_new0 (UfoInputParam, 1);
     (*in_params)[0].n_dims = 2;
-    (*in_params)[0].n_expected = -1;
 }
 
 static UfoNode *

+ 1 - 1
src/ufo-padding-2d-task.h

@@ -1,7 +1,7 @@
 #ifndef __UFO_PADDING_2D_TASK_H
 #define __UFO_PADDING_2D_TASK_H
 
-#include <ufo-task-node.h>
+#include <ufo/ufo.h>
 
 G_BEGIN_DECLS
 

+ 0 - 2
src/ufo-scale-task.c

@@ -15,7 +15,6 @@
 #else
 #include <CL/cl.h>
 #endif
-#include <ufo-gpu-task-iface.h>
 #include "ufo-scale-task.h"
 
 struct _UfoScaleTaskPrivate {
@@ -90,7 +89,6 @@ ufo_scale_task_get_structure (UfoTask *task,
     *n_inputs = 1;
     *in_params = g_new0 (UfoInputParam, 1);
     (*in_params)[0].n_dims = 2;
-    (*in_params)[0].n_expected = -1;
 }
 
 static void

+ 1 - 1
src/ufo-scale-task.h

@@ -1,7 +1,7 @@
 #ifndef __UFO_SCALE_TASK_H
 #define __UFO_SCALE_TASK_H
 
-#include <ufo-task-node.h>
+#include <ufo/ufo.h>
 
 G_BEGIN_DECLS