Commit 0bfa01f5 authored by Gerald Salin's avatar Gerald Salin
Browse files

#51

parent cfe987de
......@@ -63,6 +63,7 @@ class Component(object):
# in case of SGE, parse the cpu and memory parameter
self.__cpu=None
self.__memory=None
self.__memory_per_cpu=None
type, options, limit_submission = self.config_reader.get_batch()
if type.lower() == "sge" :
try:
......@@ -85,6 +86,9 @@ class Component(object):
try:
self.__memory = re.match( r'.*--mem=(\d+\S+)\s?.*', self.batch_options).group(1)
except: pass
try:
self.__memory_per_cpu = re.match( r'.*--mem-per-cpu=(\d+\S+)\s?.*', self.batch_options).group(1)
except: pass
def get_prefix(self):
return self.__prefix
......@@ -99,7 +103,10 @@ class Component(object):
def get_memory(self):
return self.__memory
def get_memory_per_cpu(self):
return self.__memory_per_cpu
def is_dynamic(self):
return len(self.get_dynamic_outputs()) != 0
......
......@@ -28,7 +28,7 @@ class STARIndex (Component):
self.memory = '4G'
if self.get_memory() != None :
self.memory=self.get_memory()
self.memory=self.get_memory_per_cpu()
self.cpu = "8"
if self.get_cpu() != None :
self.n_threads=self.get_cpu()
......
Supports Markdown
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