Skip to content

Commit 422faba

Browse files
authored
Merge branch 'master' into gpu_memory_data
2 parents 8b1bd5a + a1855aa commit 422faba

File tree

3 files changed

+8
-5
lines changed

3 files changed

+8
-5
lines changed

README.rst

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ Possible values
106106
``NVIDIA_VISIBLE_DEVICES`` and ``NVIDIA_DRIVER_CAPABILITIES`` will
107107
default to ``all``.
108108
109-
``disable_require`
109+
``disable_require``
110110
^^^^^^^^^^^^^^^^^^^^^^^^^^
111111

112112
Single switch to disable all the constraints of the form
@@ -116,8 +116,12 @@ Copyright and License
116116

117117
This project is released under the `UIUC/NCSA
118118
License <https://github.com/acm-uiuc/nvdocker/blob/masterLICENSE>`__.
119+
120+
119121
``docker-py`` is licensed under the `Apache License
120122
2.0 <https://github.com/docker/docker-py/blob/master/LICENSE>`__.
123+
124+
121125
nvidia-docker and nvidia-container-runtime are licensed under the `BSD
122126
3-clause
123127
license <https://github.com/NVIDIA/nvidia-container-runtime/blob/master/LICENSE>`__.

nvdocker/nvdocker.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,5 +197,4 @@ def least_used_gpu():
197197
if lowest_key is None or memory < lowest_used_memory:
198198
lowest_key = id
199199
lowest_used_memory = memory
200-
return lowest_key
201-
200+
return lowest_key

setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
setup(
1414
name='nvdocker',
15-
version='0.0.2a3',
15+
version='0.0.2a4',
1616
description='nvdocker is library built on top of the docker-py python sdk to build and run docker containers using nvidia-docker. Targets nvidia-docker2',
1717
long_description=long_description,
1818
url='https://github.com/acm-uiuc/nvdocker',
@@ -35,4 +35,4 @@
3535
keywords='docker nvidia-docker development containers frameworks',
3636
packages=find_packages(exclude=['contrib', 'docs', 'tests']),
3737
install_requires=['docker'],
38-
)
38+
)

0 commit comments

Comments
 (0)