Commit 5029ff2f authored by Jens Korinth's avatar Jens Korinth

Remove resource check for memory

* memory usage estimates are based on numbers reported by the
  Lichtenberg cluster, but are too conservative for normal users
* removed check for memory entirely
parent ed0497b2
......@@ -21,7 +21,6 @@ trait ResourceConsumer {
/** Returns true, if this consumer uses more resources than other. */
def usesMoreThan(other: ResourceConsumer): Boolean = if (! Slurm.enabled) {
cpus > other.cpus ||
memory > other.memory ||
(licences.keys map { k => licences(k) > other.licences.getOrElse(k, Integer.MAX_VALUE) } fold false) (_ || _)
} else {
(licences.keys map { k => licences(k) > other.licences.getOrElse(k, Integer.MAX_VALUE) } fold false) (_ || _)
......
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