Commit 2c2c066

committed

code refactory

1 parent 27448bc commit 2c2c066Copy full SHA for 2c2c066

File tree

-6

lines changed

-6

lines changed

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -823,7 +823,8 @@ def update(self, **opts):`
`823`	`823`
`824`	`824`	`def is_gpu_node(self):`
`825`	`825`	`return bool(getattr(self.inputs, 'use_cuda', False)) or bool(`
`826`		`- getattr(self.inputs, 'use_gpu', False))`
	`826`	`+ getattr(self.inputs, 'use_gpu', False)`
	`827`	`+ )`
`827`	`828`
`828`	`829`
`829`	`830`	`class JoinNode(Node):`

Lines changed: 5 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,9 @@ def __init__(self, plugin_args=None):`
`141`	`141`	`if self.n_gpu_procs > self.n_gpus_visible:`
`142`	`142`	`logger.info(`
`143`	`143`	`'Total number of GPUs proc requested (%d) exceeds the available number of GPUs (%d) on the system. Using requested GPU slots at your own risk!',`
`144`		`- self.n_gpu_procs, self.n_gpus_visible)`
	`144`	`+ self.n_gpu_procs,`
	`145`	`+ self.n_gpus_visible,`
	`146`	`+ )`
`145`	`147`
`146`	`148`	`# Instantiate different thread pools for non-daemon processes`
`147`	`149`	`logger.debug(`
`@@ -394,7 +396,7 @@ def _send_procs_to_workers(self, updatehash=False, graph=None):`
`394`	`396`	`free_memory_gb += next_job_gb`
`395`	`397`	`free_processors += next_job_th`
`396`	`398`	`if is_gpu_node:`
`397`		`- free_gpu_slots -= next_job_gpu_th`
	`399`	`+ free_gpu_slots += next_job_gpu_th`
`398`	`400`	`# Display stats next loop`
`399`	`401`	`self._stats = None`
`400`	`402`
`@@ -421,5 +423,4 @@ def _sort_jobs(self, jobids, scheduler="tsort"):`
`421`	`423`	`jobids,`
`422`	`424`	`key=lambda item: (self.procs[item].mem_gb, self.procs[item].n_procs),`
`423`	`425`	`)`
`424`		`- return jobids`
`425`		`-`
	`426`	`+ return jobids`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -179,11 +179,12 @@ def create_pyscript(node, updatehash=False, store_exception=True):`
`179`	`179`	`fp.writelines(cmdstr)`
`180`	`180`	`return pyscript`
`181`	`181`
	`182`	`+`
`182`	`183`	`def gpu_count():`
`183`	`184`	`n_gpus = 1`
`184`	`185`	`try:`
`185`	`186`	`import GPUtil`
`186`	`187`	`except ImportError:`
`187`	`188`	`return 1`
`188`	`189`	`else:`
`189`		`- return len(GPUtil.getGPUs())`
	`190`	`+ return len(GPUtil.getGPUs())`

Comments

(0)