commit 7db4c3617ff4e7a0d88320952e320599e75b39db · pyrox.dev/nixpkgs

+2 -2

pkgs/development/libraries/xgboost/default.nix

···

       9
       9
        
       

     

       10
       10
        
       stdenv.mkDerivation rec {

     

       11
       11
        
         name = "xgboost-${version}";

     

       12
       12
       -
         version = "0.7";

     

       12
       12
       +
         version = "0.72";

     

       13
       13
        
       

     

       14
       14
        
         # needs submodules

     

       15
       15
        
         src = fetchgit {

     

       16
       16
        
           url = "https://github.com/dmlc/xgboost";

     

       17
       17
        
           rev = "refs/tags/v${version}";

     

       18
       18
       -
           sha256 = "1wxh020l4q037hc5z7vgxflb70l41a97anl8g6y4wxb74l5zv61l";

     

       18
       18
       +
           sha256 = "1d4kw2jm7d12g8qwi7p9r3429y7sjks9xp9yhvfpx5jh7qakkxj6";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
        
         enableParallelBuilding = true;

+14 -16

pkgs/development/python-modules/xgboost/default.nix

···

       3
       3
        
       , nose

     

       4
       4
        
       , scipy

     

       5
       5
        
       , xgboost

     

       6
       6
       +
       , substituteAll

     

       6
       7
        
       }:

     

       7
       8
        
       

     

       8
       9
        
       buildPythonPackage rec {

     

       9
       10
        
         pname = "xgboost";

     

       10
       11
        
         inherit (xgboost) version src meta;

     

       11
       12
        
       

     

       12
       12
       -
         propagatedBuildInputs = [ scipy ];

     

       13
       13
       -
         checkInputs = [ nose ];

     

       13
       13
       +
         patches = [

     

       14
       14
       +
           (substituteAll {

     

       15
       15
       +
             src = ./lib-path-for-python.patch;

     

       16
       16
       +
             libpath = "${xgboost}/lib";

     

       17
       17
       +
           })

     

       18
       18
       +
         ];

     

       14
       19
        
       

     

       15
       15
       -
         postPatch = let

     

       16
       16
       -
           libname = "libxgboost.${stdenv.hostPlatform.extensions.sharedLibrary}";

     

       17
       17
       -
       

     

       18
       18
       -
         in ''

     

       19
       19
       -
           cd python-package

     

       20
       20
       +
         postPatch = "cd python-package";

     

       20
       21
        
       

     

       21
       21
       -
           sed "s/CURRENT_DIR = os.path.dirname(__file__)/CURRENT_DIR = os.path.abspath(os.path.dirname(__file__))/g" -i setup.py

     

       22
       22
       -
           sed "/^LIB_PATH.*/a LIB_PATH = [os.path.relpath(LIB_PATH[0], CURRENT_DIR)]" -i setup.py

     

       23
       23
       -
           cat <<EOF >xgboost/libpath.py

     

       24
       24
       -
           def find_lib_path():

     

       25
       25
       -
             return ["${xgboost}/lib/${libname}"]

     

       26
       26
       -
           EOF

     

       27
       27
       -
         '';

     

       22
       22
       +
         propagatedBuildInputs = [ scipy ];

     

       23
       23
       +
         buildInputs = [ xgboost ];

     

       24
       24
       +
         checkInputs = [ nose ];

     

       28
       25
        
       

     

       29
       29
       -
         postInstall = ''

     

       30
       30
       -
           rm -rf $out/xgboost

     

       26
       26
       +
         checkPhase = ''

     

       27
       27
       +
           ln -sf ../demo .

     

       28
       28
       +
           nosetests ../tests/python

     

       31
       29
        
         '';

     

       32
       30
        
       }

+59

pkgs/development/python-modules/xgboost/lib-path-for-python.patch

···

       1
       1
       +
       diff --git a/python-package/setup.py b/python-package/setup.py

     

       2
       2
       +
       index e6c3386f..4ed0a8bd 100644

     

       3
       3
       +
       --- a/python-package/setup.py

     

       4
       4
       +
       +++ b/python-package/setup.py

     

       5
       5
       +
       @@ -16,8 +16,6 @@ libpath_py = os.path.join(CURRENT_DIR, 'xgboost/libpath.py')

     

       6
       6
       +
        libpath = {'__file__': libpath_py}

     

       7
       7
       +
        exec(compile(open(libpath_py, "rb").read(), libpath_py, 'exec'), libpath, libpath)

     

       8
       8
       +
        

     

       9
       9
       +
       -LIB_PATH = [os.path.relpath(libfile, CURRENT_DIR) for libfile in libpath['find_lib_path']()]

     

       10
       10
       +
       -print("Install libxgboost from: %s" % LIB_PATH)

     

       11
       11
       +
        # Please use setup_pip.py for generating and deploying pip installation

     

       12
       12
       +
        # detailed instruction in setup_pip.py

     

       13
       13
       +
        setup(name='xgboost',

     

       14
       14
       +
       @@ -35,7 +33,6 @@ setup(name='xgboost',

     

       15
       15
       +
              # this will use MANIFEST.in during install where we specify additional files,

     

       16
       16
       +
              # this is the golden line

     

       17
       17
       +
              include_package_data=True,

     

       18
       18
       +
       -      data_files=[('xgboost', LIB_PATH)],

     

       19
       19
       +
              license='Apache-2.0',

     

       20
       20
       +
              classifiers=['License :: OSI Approved :: Apache Software License'],

     

       21
       21
       +
              url='https://github.com/dmlc/xgboost')

     

       22
       22
       +
       diff --git a/python-package/xgboost/libpath.py b/python-package/xgboost/libpath.py

     

       23
       23
       +
       index d87922c0..859a30fb 100644

     

       24
       24
       +
       --- a/python-package/xgboost/libpath.py

     

       25
       25
       +
       +++ b/python-package/xgboost/libpath.py

     

       26
       26
       +
       @@ -19,32 +19,4 @@ def find_lib_path():

     

       27
       27
       +
            lib_path: list(string)

     

       28
       28
       +
               List of all found library path to xgboost

     

       29
       29
       +
            """

     

       30
       30
       +
       -    curr_path = os.path.dirname(os.path.abspath(os.path.expanduser(__file__)))

     

       31
       31
       +
       -    # make pythonpack hack: copy this directory one level upper for setup.py

     

       32
       32
       +
       -    dll_path = [curr_path, os.path.join(curr_path, '../../lib/'),

     

       33
       33
       +
       -                os.path.join(curr_path, './lib/'),

     

       34
       34
       +
       -                os.path.join(sys.prefix, 'xgboost')]

     

       35
       35
       +
       -    if sys.platform == 'win32':

     

       36
       36
       +
       -        if platform.architecture()[0] == '64bit':

     

       37
       37
       +
       -            dll_path.append(os.path.join(curr_path, '../../windows/x64/Release/'))

     

       38
       38
       +
       -            # hack for pip installation when copy all parent source directory here

     

       39
       39
       +
       -            dll_path.append(os.path.join(curr_path, './windows/x64/Release/'))

     

       40
       40
       +
       -        else:

     

       41
       41
       +
       -            dll_path.append(os.path.join(curr_path, '../../windows/Release/'))

     

       42
       42
       +
       -            # hack for pip installation when copy all parent source directory here

     

       43
       43
       +
       -            dll_path.append(os.path.join(curr_path, './windows/Release/'))

     

       44
       44
       +
       -        dll_path = [os.path.join(p, 'xgboost.dll') for p in dll_path]

     

       45
       45
       +
       -    elif sys.platform.startswith('linux') or sys.platform.startswith('freebsd'):

     

       46
       46
       +
       -        dll_path = [os.path.join(p, 'libxgboost.so') for p in dll_path]

     

       47
       47
       +
       -    elif sys.platform == 'darwin':

     

       48
       48
       +
       -        dll_path = [os.path.join(p, 'libxgboost.dylib') for p in dll_path]

     

       49
       49
       +
       -

     

       50
       50
       +
       -    lib_path = [p for p in dll_path if os.path.exists(p) and os.path.isfile(p)]

     

       51
       51
       +
       -

     

       52
       52
       +
       -    # From github issues, most of installation errors come from machines w/o compilers

     

       53
       53
       +
       -    if not lib_path and not os.environ.get('XGBOOST_BUILD_DOC', False):

     

       54
       54
       +
       -        raise XGBoostLibraryNotFound(

     

       55
       55
       +
       -            'Cannot find XGBoost Library in the candidate path, ' +

     

       56
       56
       +
       -            'did you install compilers and run build.sh in root path?\n'

     

       57
       57
       +
       -            'List of candidates:\n' + ('\n'.join(dll_path)))

     

       58
       58
       +
       -    return lib_path

     

       59
       59
       +
       +    return ["@libpath@/libxgboost.so"]