Commit d564b7e6 authored by Philip ABBET's avatar Philip ABBET
Browse files

Temporarily disable the splitting of jobs

parent cb243beb
......@@ -239,9 +239,9 @@ class Experiment(Shareable):
#_____ Fields __________
author = models.ForeignKey(User, related_name='experiments',
on_delete=models.CASCADE)
toolchain = models.ForeignKey(Toolchain,
related_name='experiments', on_delete=models.CASCADE)
on_delete=models.CASCADE)
toolchain = models.ForeignKey(Toolchain, related_name='experiments',
on_delete=models.CASCADE)
name = models.CharField(max_length=200)
short_description = models.CharField(max_length=100, default='', blank=True, help_text=Messages['short_description'])
status = models.CharField(max_length=1, choices=STATUS, default=PENDING)
......@@ -577,7 +577,7 @@ class Experiment(Shareable):
b.analyzer=algorithm.analysis()
b.environment=env
b.queue=queue
b.required_slots=job_description['nb_slots']
# TEMPORARILY DISABLED: b.required_slots=job_description['nb_slots']
b.channel=job_description['channel']
b.save()
......@@ -911,21 +911,21 @@ class Block(models.Model):
)
experiment = models.ForeignKey(Experiment, related_name='blocks',
on_delete=models.CASCADE)
on_delete=models.CASCADE)
name = models.CharField(max_length=200)
command = models.TextField(null=True, blank=True)
status = models.CharField(max_length=1, choices=STATUS, default=NOT_CACHED)
analyzer = models.BooleanField(default=False)
algorithm = models.ForeignKey(Algorithm, related_name='blocks',
on_delete=models.CASCADE)
on_delete=models.CASCADE)
creation_date = models.DateTimeField(null=True, blank=True,
auto_now_add=True)
auto_now_add=True)
start_date = models.DateTimeField(null=True, blank=True)
end_date = models.DateTimeField(null=True, blank=True)
environment = models.ForeignKey(Environment, related_name='blocks',
null=True, on_delete=models.SET_NULL)
null=True, on_delete=models.SET_NULL)
queue = models.ForeignKey(Queue, related_name='blocks', null=True,
on_delete=models.SET_NULL)
on_delete=models.SET_NULL)
required_slots = models.PositiveIntegerField(default=1)
channel = models.CharField(max_length=200, default='', blank=True,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment