Hendrik/xgboost
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update with comments on PR #450, fixed styles and updated CHANGES and CONTRIBUTORS

Browse Source
This commit is contained in:
phunterlau 2015-08-20 10:10:34 -07:00
parent 70e230815b
commit db444c4a08
4 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.md
View File

@ -44,3 +44,4 @@ on going at master
* Java api is ready for use * Java api is ready for use
* Added more test cases and continuous integration to make each build more robust * Added more test cases and continuous integration to make each build more robust
* Improvements in sklearn compatible module * Improvements in sklearn compatible module
* Added pip installation functionality for python module

2
CONTRIBUTORS.md
View File

@ -46,3 +46,5 @@ List of Contributors
* [Yen-Ying Lee](https://github.com/white1033) * [Yen-Ying Lee](https://github.com/white1033)
* [Masaaki Horikoshi](https://github.com/sinhrks) * [Masaaki Horikoshi](https://github.com/sinhrks)
- Masaaki is the initial creator of xgboost python plotting module. - Masaaki is the initial creator of xgboost python plotting module.
* [Hongliang Liu](https://github.com/phunterlau)
- Hongliang is the maintainer of xgboost python PyPI package for pip installation.

20
python-package/setup.py
View File

@ -2,12 +2,12 @@
"""Setup xgboost package.""" """Setup xgboost package."""
from __future__ import absolute_import from __future__ import absolute_import
import sys import sys
from setuptools import setup,find_packages from setuptools import setup, find_packages
import subprocess import subprocess
sys.path.insert(0, '.') sys.path.insert(0, '.')
#build on the fly #build on the fly
build_sh = subprocess.Popen(['sh','xgboost/build-python.sh']) build_sh = subprocess.Popen(['sh', 'xgboost/build-python.sh'])
build_sh.wait() build_sh.wait()
output = build_sh.communicate() output = build_sh.communicate()
print output print output
@ -29,14 +29,16 @@ setup(name='xgboost',
'numpy', 'numpy',
'scipy', 'scipy',
], ],
maintainer = 'Hongliang Liu', maintainer='Hongliang Liu',
maintainer_email = 'phunter.lau@gmail.com', maintainer_email='phunter.lau@gmail.com',
zip_safe=False, zip_safe=False,
packages = find_packages(), packages=find_packages(),
#package_dir = {'':'xgboost'}, #don't need this and don't use this, give everything to MANIFEST.in #don't need this and don't use this, give everything to MANIFEST.in
#package_dir = {'':'xgboost'},
#package_data = {'': ['*.txt','*.md','*.sh'], #package_data = {'': ['*.txt','*.md','*.sh'],
# } # }
include_package_data=True, #this will use MANIFEST.in during install where we specify additional files, this is the golden line #this will use MANIFEST.in during install where we specify additional files,
data_files=[('xgboost',LIB_PATH), #this is the golden line
], include_package_data=True,
data_files=[('xgboost', LIB_PATH)],
url='https://github.com/dmlc/xgboost') url='https://github.com/dmlc/xgboost')

3
python-package/xgboost/core.py
View File

@ -40,7 +40,8 @@ def find_lib_path():
""" """
curr_path = os.path.dirname(os.path.abspath(os.path.expanduser(__file__))) curr_path = os.path.dirname(os.path.abspath(os.path.expanduser(__file__)))
#make pythonpack hack: copy this directory one level upper for setup.py #make pythonpack hack: copy this directory one level upper for setup.py
dll_path = [curr_path, os.path.join(curr_path, '../../wrapper/'),os.path.join(curr_path, './wrapper/')] dll_path = [curr_path, os.path.join(curr_path, '../../wrapper/')
, os.path.join(curr_path, './wrapper/')]
if os.name == 'nt': if os.name == 'nt':
if platform.architecture()[0] == '64bit': if platform.architecture()[0] == '64bit':
dll_path.append(os.path.join(curr_path, '../../windows/x64/Release/')) dll_path.append(os.path.join(curr_path, '../../windows/x64/Release/'))