From 0643b34146ee700613376b93dbcfd7e03e3c89d2 Mon Sep 17 00:00:00 2001 From: ssuzuki Date: Thu, 31 Aug 2017 19:50:28 +0900 Subject: [PATCH 1/5] fix setup.py --- setup.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/setup.py b/setup.py index 46a48bb5..daaebbc6 100644 --- a/setup.py +++ b/setup.py @@ -21,6 +21,12 @@ libraries=['nccl']) ] +package_data={ + 'chainermn': [ + 'nccl/chainermn_nccl.h' + ], +} + if '--no-nccl' in sys.argv: sys.argv.remove('--no-nccl') ext_modules = [] @@ -35,6 +41,7 @@ author='Takuya Akiba', author_email='akiba@preferred.jp', packages=find_packages(), + package_data=package_data, ext_modules=ext_modules, cmdclass={'build_ext': build_ext}, install_requires=install_requires From f68877b5f4ada6bcb1bf3a9f21ee0cd6e742e150 Mon Sep 17 00:00:00 2001 From: ssuzuki Date: Thu, 31 Aug 2017 20:31:09 +0900 Subject: [PATCH 2/5] fix an error of flake8 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index daaebbc6..9e80d46c 100644 --- a/setup.py +++ b/setup.py @@ -21,7 +21,7 @@ libraries=['nccl']) ] -package_data={ +package_data = { 'chainermn': [ 'nccl/chainermn_nccl.h' ], From f8fa038070aa29b9078df2dd91baa9bd244a4317 Mon Sep 17 00:00:00 2001 From: ssuzuki Date: Fri, 1 Sep 2017 07:52:09 +0900 Subject: [PATCH 3/5] fix setup.py --- setup.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/setup.py b/setup.py index 9e80d46c..7fef2a62 100644 --- a/setup.py +++ b/setup.py @@ -18,15 +18,10 @@ Extension( name='chainermn.nccl.nccl', sources=['chainermn/nccl/nccl.pyx'], + include=['chainermn/nccl/chainermn_nccl.h'], libraries=['nccl']) ] -package_data = { - 'chainermn': [ - 'nccl/chainermn_nccl.h' - ], -} - if '--no-nccl' in sys.argv: sys.argv.remove('--no-nccl') ext_modules = [] @@ -41,7 +36,6 @@ author='Takuya Akiba', author_email='akiba@preferred.jp', packages=find_packages(), - package_data=package_data, ext_modules=ext_modules, cmdclass={'build_ext': build_ext}, install_requires=install_requires From f4ad3bf994dc2ec5ac7d4b289620af6d4084f6dc Mon Sep 17 00:00:00 2001 From: Shuji Suzuki Date: Fri, 1 Sep 2017 09:04:06 +0900 Subject: [PATCH 4/5] add MANIFEST.in --- MANIFEST.in | 1 + setup.py | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 MANIFEST.in diff --git a/MANIFEST.in b/MANIFEST.in new file mode 100644 index 00000000..b1ec34c3 --- /dev/null +++ b/MANIFEST.in @@ -0,0 +1 @@ +recursive-include chainermn *.pyx *.pxd *.pxi *.h \ No newline at end of file diff --git a/setup.py b/setup.py index 7fef2a62..46a48bb5 100644 --- a/setup.py +++ b/setup.py @@ -18,7 +18,6 @@ Extension( name='chainermn.nccl.nccl', sources=['chainermn/nccl/nccl.pyx'], - include=['chainermn/nccl/chainermn_nccl.h'], libraries=['nccl']) ] From 79b333c772ae6e75a824c1f1ef4dcb1cff373260 Mon Sep 17 00:00:00 2001 From: Shuji Suzuki Date: Fri, 1 Sep 2017 09:05:59 +0900 Subject: [PATCH 5/5] update MANIFEST.in --- MANIFEST.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MANIFEST.in b/MANIFEST.in index b1ec34c3..ac3045ef 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1 +1 @@ -recursive-include chainermn *.pyx *.pxd *.pxi *.h \ No newline at end of file +recursive-include chainermn *.pyx *.pxd *.pxi *.h