Merge branch 'develop' of https://github.com/LeilyR/Knight-Ruiz-Matrix-balancing-algorithm into develop

Author: Leily Rabbani

setup.py

@@ -1,94 +1,38 @@
-#The template of this setup.py is taken from pybind github (https://github.com/pybind/python_example)
-from setuptools import setup, Extension
 from setuptools.command.build_ext import build_ext
+from distutils.core import setup, Extension
 import sys
-import setuptools
 from sysconfig import get_config_var, get_paths
+import logging
 
+__version__ = '0.0.1dev'
 
-__version__ = '0.0.0'
 
-def get_include(): #TODO 
-	info = get_paths()
-	Eigen_path = info['include']+'/../eigen3'
-	return Eigen_path      
+def get_include():  # TODO
+    info = get_paths()
+    Eigen_path = '/'.join(info['include'].split('/')[:-1])
+    Eigen_path += '/eigen3'
+    return Eigen_path
 
-KR_module = [
-    Extension(
-        'KRBalancing',
-        ['src/KRBalancing.cpp'],
-        include_dirs=[
-            # Path to eigen3 headers
-            get_include(),
-        ],
-        language='c++',
-	extra_compile_args=["-fopenmp"],
-        extra_link_args=["-fopenmp"]
-    )
-]
 
+sources_list = ['src/KRBalancing.cpp']
 
-# As of Python 3.6, CCompiler has a `has_flag` method.
-# cf http://bugs.python.org/issue26689
-def has_flag(compiler, flagname):
-    """Return a boolean indicating whether a flag name is supported on
-    the specified compiler.
-    """
-    import tempfile
-    with tempfile.NamedTemporaryFile('w', suffix='.cpp') as f:
-        f.write('int main (int argc, char **argv) { return 0; }')
-        try:
-            compiler.compile([f.name], extra_postargs=[flagname])
-        except setuptools.distutils.errors.CompileError:
-            return False
-    return True
+kr_module = Extension('KRBalancing',
+                      sources=sources_list,
+                      include_dirs=[
+                          # Path to eigen3 headers
+                          get_include()
+                      ],
+                      extra_link_args=["-lgomp", "-lm", "-lrt"],
+                      extra_compile_args=["-fopenmp", "-std=c++11"]
+                      )
 
 
-def cpp_flag(compiler):
-    """Return the -std=c++[11/14] compiler flag.
-    The c++14 is prefered over c++11 (when it is available).
-    """
-    if has_flag(compiler, '-std=c++14'):
-        return '-std=c++14'
-    elif has_flag(compiler, '-std=c++11'):
-        return '-std=c++11'
-    else:
-        raise RuntimeError('Unsupported compiler -- at least C++11 support '
-                           'is needed!')
-
-
-class BuildExt(build_ext):
-    """A custom build extension for adding compiler-specific options."""
-    c_opts = {
-        'msvc': ['/EHsc'],
-        'unix': [],
-    }
-
-    if sys.platform == 'darwin':
-        c_opts['unix'] += ['-stdlib=libc++', '-mmacosx-version-min=10.7']
-
-    def build_extensions(self):
-        ct = self.compiler.compiler_type
-        opts = self.c_opts.get(ct, [])
-        if ct == 'unix':
-            opts.append('-DVERSION_INFO="%s" ' % self.distribution.get_version())
-            opts.append(cpp_flag(self.compiler))
-            if has_flag(self.compiler, '-fvisibility=hidden'):
-                opts.append('-fvisibility=hidden')
-        elif ct == 'msvc':
-            opts.append('/DVERSION_INFO=\\"%s\\"' % self.distribution.get_version())
-        for ext in self.extensions:
-            ext.extra_compile_args = opts
-        build_ext.build_extensions(self)
-
 setup(
     name='KRBalancing',
     version=__version__,
     author='Leily Rabbani',
     author_email='[email protected]',
     description='A c++ extension for python to balance a matrix using KR method',
-    ext_modules=KR_module,
-    install_requires=['pybind11>=2.2'],
-    cmdclass={'build_ext': BuildExt},
-    zip_safe=False,
+    ext_modules=[kr_module],
+    install_requires=['pybind11>=2.2']
 )