Skip to content

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 8732bf6

Browse filesBrowse files
authored
Merge pull request #3718 from mauriliogenovese/FIX-gputil-error-on-window
reimplementation of gpu_count
2 parents 13228e8 + c189912 commit 8732bf6
Copy full SHA for 8732bf6

File tree

4 files changed

+47
-12
lines changed
Filter options

4 files changed

+47
-12
lines changed

‎nipype/info.py

Copy file name to clipboardExpand all lines: nipype/info.py
-1
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,6 @@ def get_nipype_gitversion():
149149
"acres",
150150
"etelemetry>=0.3.1",
151151
"looseversion!=1.2",
152-
"gputil>=1.4.0",
153152
"puremagic",
154153
]
155154

‎nipype/pipeline/plugins/multiproc.py

Copy file name to clipboardExpand all lines: nipype/pipeline/plugins/multiproc.py
+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
from ...utils.profiler import get_system_total_memory_gb
2222
from ..engine import MapNode
2323
from .base import DistributedPluginBase
24-
from .tools import gpu_count
24+
from ...utils.gpu_count import gpu_count
2525

2626
try:
2727
from textwrap import indent

‎nipype/pipeline/plugins/tools.py

Copy file name to clipboardExpand all lines: nipype/pipeline/plugins/tools.py
-10
Original file line numberDiff line numberDiff line change
@@ -175,13 +175,3 @@ def create_pyscript(node, updatehash=False, store_exception=True):
175175
with open(pyscript, "w") as fp:
176176
fp.writelines(cmdstr)
177177
return pyscript
178-
179-
180-
def gpu_count():
181-
n_gpus = 1
182-
try:
183-
import GPUtil
184-
except ImportError:
185-
return 1
186-
else:
187-
return len(GPUtil.getGPUs())

‎nipype/utils/gpu_count.py

Copy file name to clipboard
+46
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
# -*- DISCLAIMER: this file contains code derived from gputil (https://github.com/anderskm/gputil)
2+
# and therefore is distributed under to the following license:
3+
#
4+
# MIT License
5+
#
6+
# Copyright (c) 2017 anderskm
7+
#
8+
# Permission is hereby granted, free of charge, to any person obtaining a copy
9+
# of this software and associated documentation files (the "Software"), to deal
10+
# in the Software without restriction, including without limitation the rights
11+
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
12+
# copies of the Software, and to permit persons to whom the Software is
13+
# furnished to do so, subject to the following conditions:
14+
#
15+
# The above copyright notice and this permission notice shall be included in all
16+
# copies or substantial portions of the Software.
17+
#
18+
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
19+
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
20+
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
21+
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
22+
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
23+
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
24+
# SOFTWARE.
25+
26+
import platform
27+
import shutil
28+
import subprocess
29+
import os
30+
31+
32+
def gpu_count():
33+
nvidia_smi = shutil.which('nvidia-smi')
34+
if nvidia_smi is None and platform.system() == "Windows":
35+
nvidia_smi = f'{os.environ["systemdrive"]}\\Program Files\\NVIDIA Corporation\\NVSMI\\nvidia-smi.exe'
36+
if nvidia_smi is None:
37+
return 0
38+
try:
39+
p = subprocess.run(
40+
[nvidia_smi, "--query-gpu=name", "--format=csv,noheader,nounits"],
41+
stdout=subprocess.PIPE,
42+
text=True,
43+
)
44+
except (OSError, UnicodeDecodeError):
45+
return 0
46+
return len(p.stdout.splitlines())

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.