slightly refactor setup scripts (#174)

Author: StrikerRUS

lightning/impl/randomkit/setup.py

@@ -1,28 +1,31 @@
 import sys
-import numpy
 
-def configuration(parent_package='', top_path=None):
-    from numpy.distutils.misc_util import Configuration
+from numpy import get_include
+from numpy.distutils.core import setup
+from numpy.distutils.misc_util import Configuration
+
 
-    config = Configuration('randomkit', parent_package, top_path)
+def configuration(parent_package='', top_path=None):
+    rnd_kit = 'randomkit'
+    rnd_fast = 'random_fast'
+    config = Configuration(rnd_kit, parent_package, top_path)
     libs = []
     if sys.platform == 'win32':
         libs.append('Advapi32')
 
     config.add_extension(
-        'random_fast',
-        sources=['random_fast.pyx', 'randomkit.c'],
+        rnd_fast,
+        sources=[f'{rnd_fast}.pyx', f'{rnd_kit}.c'],
         language='c++',
         libraries=libs,
-        include_dirs=[numpy.get_include()]
+        include_dirs=[get_include()]
     )
 
     config.add_subpackage('tests')
-    config.add_data_files('random_fast.pxd')
-    config.add_data_files('randomkit.h')
+    config.add_data_files(f'{rnd_fast}.pxd')
+    config.add_data_files(f'{rnd_kit}.h')
 
     return config
 
 if __name__ == '__main__':
-    from numpy.distutils.core import setup
     setup(**configuration(top_path='').todict())

lightning/impl/setup.py

@@ -1,80 +1,45 @@
 import os.path
 
-import numpy
+from numpy import get_include
+from numpy.distutils.core import setup
+from numpy.distutils.misc_util import Configuration
 
 
 def configuration(parent_package='', top_path=None):
-    from numpy.distutils.misc_util import Configuration
-
     config = Configuration('impl', parent_package, top_path)
 
     randomdir = os.path.join(top_path, "lightning", "impl", "randomkit")
-
-    config.add_extension('adagrad_fast',
-                         sources=['adagrad_fast.pyx'],
-                         language='c++',
-                         include_dirs=[numpy.get_include(), randomdir])
-
-    config.add_extension('dataset_fast',
-                         sources=['dataset_fast.pyx'],
-                         language='c++',
-                         include_dirs=[numpy.get_include(), randomdir])
-
-    config.add_extension('dual_cd_fast',
-                         sources=['dual_cd_fast.pyx'],
-                         language='c++',
-                         include_dirs=[numpy.get_include(), randomdir])
-
-    config.add_extension('loss_fast',
-                         sources=['loss_fast.pyx'],
-                         language='c++',
-                         include_dirs=[numpy.get_include(), randomdir])
-
-    config.add_extension('prank_fast',
-                         sources=['prank_fast.pyx'],
-                         language='c++',
-                         include_dirs=[numpy.get_include(), randomdir])
-
-    config.add_extension('primal_cd_fast',
-                         sources=['primal_cd_fast.pyx'],
-                         language='c++',
-                         include_dirs=[numpy.get_include(), randomdir])
-
-    config.add_extension('prox_fast',
-                         sources=['prox_fast.pyx'],
-                         language='c++',
-                         include_dirs=[numpy.get_include(), randomdir])
-
-    config.add_extension('sag_fast',
-                         sources=['sag_fast.pyx'],
-                         language='c++',
-                         include_dirs=[numpy.get_include(), randomdir])
-
-    config.add_extension('sdca_fast',
-                         sources=['sdca_fast.pyx'],
-                         language='c++',
-                         include_dirs=[numpy.get_include(), randomdir])
-
-    config.add_extension('sgd_fast',
-                         sources=['sgd_fast.pyx'],
-                         language='c++',
-                         include_dirs=[numpy.get_include(), randomdir])
-
-    config.add_extension('svrg_fast',
-                         sources=['svrg_fast.pyx'],
-                         language='c++',
-                         include_dirs=[numpy.get_include(), randomdir])
+    currdir = os.path.dirname(os.path.abspath(__file__))
+
+    files = [
+        'adagrad_fast',
+        'dataset_fast',
+        'dual_cd_fast',
+        'loss_fast',
+        'prank_fast',
+        'primal_cd_fast',
+        'prox_fast',
+        'sag_fast',
+        'sdca_fast',
+        'sgd_fast',
+        'svrg_fast',
+    ]
+    for f in files:
+        config.add_extension(f,
+                             sources=[f'{f}.pyx'],
+                             language='c++',
+                             include_dirs=[get_include(), randomdir])
+
+        # add .pxd files to be re-used by third party software
+        pxd_file = os.path.join(currdir, f'{f}.pxd')
+        if os.path.exists(pxd_file):
+            config.add_data_files(f'{f}.pxd')
 
     config.add_subpackage('datasets')
     config.add_subpackage('randomkit')
     config.add_subpackage('tests')
 
-    # add .pxd files to be re-used by third party software
-    config.add_data_files('sag_fast.pxd', 'dataset_fast.pxd',
-                          'sgd_fast.pxd', 'prox_fast.pxd')
-
     return config
 
 if __name__ == '__main__':
-    from numpy.distutils.core import setup
     setup(**configuration(top_path='').todict())

lightning/setup.py

@@ -1,9 +1,10 @@
+from numpy.distutils.core import setup
+from numpy.distutils.misc_util import Configuration
+
 from lightning._build_utils import maybe_cythonize_extensions
 
 
 def configuration(parent_package='', top_path=None):
-    from numpy.distutils.misc_util import Configuration
-
     config = Configuration('lightning', parent_package, top_path)
 
     config.add_subpackage('impl')
@@ -13,5 +14,4 @@ def configuration(parent_package='', top_path=None):
     return config
 
 if __name__ == '__main__':
-    from numpy.distutils.core import setup
     setup(**configuration(top_path='').todict())