Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support cuDNN v7 #50

Merged
merged 4 commits into from
Aug 4, 2017
Merged

Support cuDNN v7 #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6803821
Support cuDNN v7
unnonouno Aug 4, 2017
c9901aa
Rename v7
unnonouno Aug 4, 2017
f24e59f
Fix test
unnonouno Aug 4, 2017
0f07427
Update README
unnonouno Aug 4, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,9 @@ Use `activate` subcommand to only activate installed version.

positional arguments:

:`VERSION`: Version of cuDNN you want to install and activate. Select from [v2, v3, v4, v5, v5-cuda8, v51, v51-cuda8, v6, v6-cuda8]
:`VERSION`: Version of cuDNN you want to install and activate. Select from [v2, v3, v4, v5, v5-cuda8, v51, v51-cuda8, v6, v6-cuda8, v7-cuda8, v7-cuda9]

Note that `v7-cuda8` is not available on macOS.

`install-file`
~~~~~~~~~~~~~~
Expand Down
18 changes: 18 additions & 0 deletions cudnnenv/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,18 @@
sha256sum='9b09110af48c9a4d7b6344eb4b3e344daa84987ed6177d5c44319732f3bb7f9c',
)

codes['v7-cuda8'] = cudnn_base.format(
cudnn='cudnn-8.0-linux-x64-v7',
cudnn_ver='v7.0.1',
sha256sum='288d844ab289b56d0c7b6719a34c7c0b57a01c58ffbe4d582c9b539da96ed2a7',
)

codes['v7-cuda9'] = cudnn_base.format(
cudnn='cudnn-9.0-linux-x64-v7',
cudnn_ver='v7.0.1',
sha256sum='32d0caf6250ea8d2c3c80649ea6a032e46741d78bdca40c37b8ac67b00fe3244',
)

LIBDIR = 'lib64'

elif sys.platform == 'darwin':
Expand Down Expand Up @@ -176,6 +188,12 @@
sha256sum='1f2842872ddae3ca61d5f5a89fe5f519f18ca538c28cc04c0c4bb3b5f3317dac'
)

codes['v7-cuda9'] = cudnn_base.format(
cudnn='cudnn-9.0-osx-x64-v7',
cudnn_ver='v7.0.1',
sha256sum='b2c259fc6b47abd820397e37194b49ff538f03c07d0121a66475986e61d11c5d',
)

LIBDIR = 'lib'

else:
Expand Down
79 changes: 35 additions & 44 deletions test/test_command.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,33 @@
import cudnnenv


if 'linux' in sys.platform:
_available_versions = ''' v2
v3
v4
v5
v5-cuda8
v51
v51-cuda8
v6
v6-cuda8
v7-cuda8
v7-cuda9
'''
elif sys.platform == 'darwin':
_available_versions = ''' v2
v3
v4
v5
v5-cuda8
v51
v51-cuda8
v6
v6-cuda8
v7-cuda9
'''


class TestCommand(unittest.TestCase):

empty_tgz_path = os.path.join(
Expand Down Expand Up @@ -94,19 +121,10 @@ def test_install_file_and_uninstall(self):
self.clear_stdout()
self.call_main('versions')
self.assertEqual(self.get_stdout(), '''Available versions:
v2
v3
v4
v5
v5-cuda8
v51
v51-cuda8
v6
v6-cuda8

{}
Installed versions:
* v0
''')
'''.format(_available_versions))

self.set_stdin('y\n')
self.call_main('uninstall', 'v0')
Expand All @@ -116,18 +134,9 @@ def test_install_file_and_uninstall(self):
self.clear_stdout()
self.call_main('versions')
self.assertEqual(self.get_stdout(), '''Available versions:
v2
v3
v4
v5
v5-cuda8
v51
v51-cuda8
v6
v6-cuda8

{}
Installed versions:
''')
'''.format(_available_versions))

def test_install_exists(self):
self.call_main('install-file', self.empty_tgz_path, 'v0')
Expand All @@ -154,36 +163,18 @@ def test_activate_deactivate(self):
self.clear_stdout()
self.call_main('versions')
self.assertEqual(self.get_stdout(), '''Available versions:
v2
v3
v4
v5
v5-cuda8
v51
v51-cuda8
v6
v6-cuda8

{}
Installed versions:
v0
v1
''')
'''.format(_available_versions))

def test_clean_environment(self):
self.call_main('versions')
self.assertEqual(self.get_stdout(), '''Available versions:
v2
v3
v4
v5
v5-cuda8
v51
v51-cuda8
v6
v6-cuda8

{}
Installed versions:
''')
'''.format(_available_versions))

self.clear_stdout()
self.call_main('version')
Expand Down