Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove deprecated Treelite CI API from FIL #5348

Merged
merged 2 commits into from
Apr 11, 2023
Merged

Remove deprecated Treelite CI API from FIL #5348

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2a9b35d
Remove deprecated Treelite CI API from FIL
hcho3 Apr 10, 2023
65c62a9
Merge branch 'branch-23.04' into update_tl_c_api
hcho3 Apr 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 13 additions & 9 deletions python/cuml/fil/fil.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,16 +50,19 @@ cimport cuml.common.cuda

cdef extern from "treelite/c_api.h":
ctypedef void* ModelHandle
cdef int TreeliteLoadXGBoostModel(const char* filename,
ModelHandle* out) except +
cdef int TreeliteLoadXGBoostJSON(const char* filename,
ModelHandle* out) except +
cdef int TreeliteLoadXGBoostModelEx(const char* filename,
const char* config_json,
ModelHandle* out) except +
cdef int TreeliteLoadXGBoostJSONEx(const char* filename,
const char* config_json,
ModelHandle* out) except +
cdef int TreeliteFreeModel(ModelHandle handle) except +
cdef int TreeliteQueryNumTree(ModelHandle handle, size_t* out) except +
cdef int TreeliteQueryNumFeature(ModelHandle handle, size_t* out) except +
cdef int TreeliteQueryNumClass(ModelHandle handle, size_t* out) except +
cdef int TreeliteLoadLightGBMModel(const char* filename,
ModelHandle* out) except +
cdef int TreeliteLoadLightGBMModelEx(const char* filename,
const char* config_json,
ModelHandle* out) except +
cdef int TreeliteSerializeModel(const char* filename,
ModelHandle handle) except +
cdef int TreeliteDeserializeModel(const char* filename,
Expand Down Expand Up @@ -137,22 +140,23 @@ cdef class TreeliteModel():
Type of model: 'xgboost', 'xgboost_json', or 'lightgbm'
"""
filename_bytes = filename.encode("UTF-8")
config_bytes = "{}".encode("UTF-8")
cdef ModelHandle handle
if model_type == "xgboost":
res = TreeliteLoadXGBoostModel(filename_bytes, &handle)
res = TreeliteLoadXGBoostModelEx(filename_bytes, config_bytes, &handle)
if res < 0:
err = TreeliteGetLastError()
raise RuntimeError("Failed to load %s (%s)" % (filename, err))
elif model_type == "xgboost_json":
res = TreeliteLoadXGBoostJSON(filename_bytes, &handle)
res = TreeliteLoadXGBoostJSONEx(filename_bytes, config_bytes, &handle)
if res < 0:
err = TreeliteGetLastError()
raise RuntimeError("Failed to load %s (%s)" % (filename, err))
elif model_type == "lightgbm":
logger.warn("Treelite currently does not support float64 model"
" parameters. Accuracy may degrade slightly relative"
" to native LightGBM invocation.")
res = TreeliteLoadLightGBMModel(filename_bytes, &handle)
res = TreeliteLoadLightGBMModelEx(filename_bytes, config_bytes, &handle)
if res < 0:
err = TreeliteGetLastError()
raise RuntimeError("Failed to load %s (%s)" % (filename, err))
Expand Down