summaryrefslogtreecommitdiff
path: root/ufo/ufo-fixed-scheduler.c
diff options
context:
space:
mode:
authorMatthias Vogelgesang <matthias.vogelgesang@kit.edu>2014-10-17 10:17:39 +0200
committerMatthias Vogelgesang <matthias.vogelgesang@kit.edu>2014-10-23 13:46:19 +0200
commitda96af094a06c91c296c0ada35e94f12ee566e7d (patch)
treebe5b77b344052dcb8ecc39a299b31d3ef43afc0a /ufo/ufo-fixed-scheduler.c
parent5fb7cb07f1a1759d3d68854e395fe6456d266f11 (diff)
Decouple config from scheduler
Diffstat (limited to 'ufo/ufo-fixed-scheduler.c')
-rw-r--r--ufo/ufo-fixed-scheduler.c31
1 files changed, 3 insertions, 28 deletions
diff --git a/ufo/ufo-fixed-scheduler.c b/ufo/ufo-fixed-scheduler.c
index 050b887..5250024 100644
--- a/ufo/ufo-fixed-scheduler.c
+++ b/ufo/ufo-fixed-scheduler.c
@@ -43,8 +43,7 @@
#include "compat.h"
-G_DEFINE_TYPE_WITH_CODE (UfoFixedScheduler, ufo_fixed_scheduler, UFO_TYPE_BASE_SCHEDULER,
- G_IMPLEMENT_INTERFACE (UFO_TYPE_CONFIGURABLE, NULL))
+G_DEFINE_TYPE (UfoFixedScheduler, ufo_fixed_scheduler, UFO_TYPE_BASE_SCHEDULER)
#define UFO_FIXED_SCHEDULER_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), UFO_TYPE_FIXED_SCHEDULER, UfoFixedSchedulerPrivate))
@@ -102,30 +101,6 @@ ufo_fixed_scheduler_new (UfoConfig *config)
return UFO_BASE_SCHEDULER (g_object_new (UFO_TYPE_FIXED_SCHEDULER, "config", config, NULL));
}
-/**
- * ufo_fixed_scheduler_get_arch:
- * @sched: A #UfoFixedScheduler object
- *
- * Get a #UfoArchGraph object to get GPU nodes for manual assignment to tasks.
- * If it does not exist, it is created on the fly.
- *
- * Returns: (transfer none): An #UfoArchGraph object to retrieve GPU nodes.
- */
-UfoArchGraph *
-ufo_fixed_scheduler_get_arch (UfoFixedScheduler *sched)
-{
-
- g_return_val_if_fail (UFO_IS_FIXED_SCHEDULER (sched), NULL);
-
- if (sched->priv->arch == NULL) {
- UfoResources *resources;
- resources = ufo_base_scheduler_get_resources (UFO_BASE_SCHEDULER (sched));
- sched->priv->arch = UFO_ARCH_GRAPH (ufo_arch_graph_new (resources, NULL));
- }
-
- return sched->priv->arch;
-}
-
static gboolean
pop_input_data (UfoTwoWayQueue **in_queues, gboolean *finished, UfoBuffer **inputs, guint n_inputs)
{
@@ -528,8 +503,8 @@ ufo_fixed_scheduler_run (UfoBaseScheduler *scheduler,
g_return_if_fail (UFO_IS_FIXED_SCHEDULER (scheduler));
- resources = ufo_base_scheduler_get_resources (scheduler);
- arch = ufo_fixed_scheduler_get_arch (UFO_FIXED_SCHEDULER (scheduler));
+ arch = ufo_base_scheduler_get_arch (scheduler);
+ resources = ufo_arch_graph_get_resources (arch);
pdata = setup_tasks (UFO_GRAPH (task_graph), arch, resources, &tmp_error);
if (tmp_error != NULL) {