From 12a3dce287e9e4205b2186aa39d57700c063445d Mon Sep 17 00:00:00 2001 From: sjyan Date: Wed, 15 Jan 2020 20:13:18 +0800 Subject: [PATCH] save --- doc/GETTING_STARTED.md | 1 - setup.py | 32 +++++++++++++++++--------------- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/doc/GETTING_STARTED.md b/doc/GETTING_STARTED.md index 13eee1cc6..40ff72c02 100644 --- a/doc/GETTING_STARTED.md +++ b/doc/GETTING_STARTED.md @@ -3,7 +3,6 @@ [Option] **Create** a conda virtual environment and activate it: ``` shell -pip install conda conda create -n open-mmlab python=3.7 -y conda activate open-mmlab ``` diff --git a/setup.py b/setup.py index 9775f0e28..1023d4836 100644 --- a/setup.py +++ b/setup.py @@ -3,9 +3,11 @@ import platform import subprocess import time + +from setuptools import find_packages, setup, Extension, dist +dist.Distribution().fetch_build_eggs(['Cython', 'numpy>=1.11.1']) import numpy as np -from setuptools import find_packages, setup, Extension -# from Cython.Build import cythonize # noqa: E402 +from Cython.Build import cythonize # noqa: E402 sys.path.append('./src') from nms.setup_linux import custom_build_ext, CUDA @@ -96,19 +98,19 @@ def get_requirements(filename='requirements.txt'): return requires -# def make_cython_ext(name, module, sources): -# extra_compile_args = None -# if platform.system() != 'Windows': -# extra_compile_args = { -# 'cxx': ['-Wno-unused-function', '-Wno-write-strings'] -# } -# extension = Extension('{}.{}'.format( -# module, name), [os.path.join(*module.split('.'), p) for p in sources], -# include_dirs=[np.get_include()], -# language='c++', -# extra_compile_args=extra_compile_args) -# extension, = cythonize(extension) -# return extension +def make_cython_ext(name, module, sources): + extra_compile_args = None + if platform.system() != 'Windows': + extra_compile_args = { + 'cxx': ['-Wno-unused-function', '-Wno-write-strings'] + } + extension = Extension('{}.{}'.format( + module, name), [os.path.join(*module.split('.'), p) for p in sources], + include_dirs=[np.get_include()], + language='c++', + extra_compile_args=extra_compile_args) + extension, = cythonize(extension) + return extension if __name__ == '__main__':