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

force handle as void_p, seems fix mac problem

Browse Source
This commit is contained in:
tqchen 2014-05-17 11:03:21 -07:00
parent e267f4c5f9
commit c23d8c8b88
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
python/Makefile
View File

@ -1,6 +1,6 @@
export CC = gcc export CC = clang
export CXX = g++ export CXX = clang++
export CFLAGS = -Wall -O3 -msse2 -Wno-unknown-pragmas -fopenmp export CFLAGS = -Wall -O3 -msse2 -Wno-unknown-pragmas # -fopenmp
# specify tensor path # specify tensor path
SLIB = libxgboostpy.so SLIB = libxgboostpy.so

9
python/xgboost.py
View File

@ -36,7 +36,8 @@ def ctypes2numpy( cptr, length ):
class DMatrix: class DMatrix:
# constructor # constructor
def __init__(self, data=None, label=None, missing=0.0, weight = None): def __init__(self, data=None, label=None, missing=0.0, weight = None):
self.handle = xglib.XGDMatrixCreate() # force into void_p, mac need to pass things in as void_p
self.handle = ctypes.c_void_p( xglib.XGDMatrixCreate() )
if data == None: if data == None:
return return
if isinstance(data,str): if isinstance(data,str):
@ -118,8 +119,8 @@ class Booster:
""" constructor, param: """ """ constructor, param: """
for d in cache: for d in cache:
assert isinstance(d,DMatrix) assert isinstance(d,DMatrix)
dmats = ( ctypes.c_void_p * len(cache) )(*[ ctypes.c_void_p(d.handle) for d in cache]) dmats = ( ctypes.c_void_p * len(cache) )(*[ d.handle for d in cache])
self.handle = xglib.XGBoosterCreate( dmats, len(cache) ) self.handle = ctypes.c_void_p( xglib.XGBoosterCreate( dmats, len(cache) ) )
self.set_param( params ) self.set_param( params )
def __del__(self): def __del__(self):
xglib.XGBoosterFree(self.handle) xglib.XGBoosterFree(self.handle)
@ -154,7 +155,7 @@ class Booster:
for d in evals: for d in evals:
assert isinstance(d[0], DMatrix) assert isinstance(d[0], DMatrix)
assert isinstance(d[1], str) assert isinstance(d[1], str)
dmats = ( ctypes.c_void_p * len(evals) )(*[ ctypes.c_void_p(d[0].handle) for d in evals]) dmats = ( ctypes.c_void_p * len(evals) )(*[ d[0].handle for d in evals])
evnames = ( ctypes.c_char_p * len(evals) )(*[ ctypes.c_char_p(d[1]) for d in evals]) evnames = ( ctypes.c_char_p * len(evals) )(*[ ctypes.c_char_p(d[1]) for d in evals])
xglib.XGBoosterEvalOneIter( self.handle, it, dmats, evnames, len(evals) ) xglib.XGBoosterEvalOneIter( self.handle, it, dmats, evnames, len(evals) )
def eval(self, mat, name = 'eval', it = 0 ): def eval(self, mat, name = 'eval', it = 0 ):