← Back to branch summary

~ubuntu-branches/ubuntu/quantal/starpu-contrib/quantal

« back to all changes in this revision

Viewing changes to src/core/jobs.c

  • Committer: Package Import Robot
  • Author(s): Samuel Thibault
  • Date: 2012-04-12 15:04:15 UTC
  • mfrom: (1.1.2)
  • Revision ID: package-import@ubuntu.com-20120412150415-gzp107thb5wknugm
Tags: 1.0.1-1
http://bugs.debian.org/667381
http://bugs.debian.org/670422
* New upstream release.
* Explicitly use gcc-4.6 to fix plugin build (Closes: Bug#667381).
* Use gcc-4.5 for starpu, as nvcc does not actually support all 4.6
  features, notably not __float128.
* patches/relax-gcc-plugin: Relax gcc-4.6 dependency for plugins to upstream
  release version (Closes: #670422)
* watch: Fix URL.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/core/jobs.c
415
415
                return NULL;
416
416
 
417
417
        struct starpu_task *task = j->task;
418
 
        if (task && task->cl
419
 
            && task->cl->model
420
 
            && task->cl->model->symbol)
 
418
        if (task && task->cl) {
 
419
            if (task->cl->model && task->cl->model->symbol)
421
420
                return task->cl->model->symbol;
422
 
        else
 
421
            else
 
422
                return task->cl->name;
 
423
        } else
423
424
        {
424
425
#ifdef STARPU_USE_FXT
425
426
                return j->model_name;