Skip to content

[C-API] Avoid C++ includes from arrow.h when including c_api.h #6973

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

Merged
jameslamb merged 7 commits into from
Dec 29, 2025
Merged

[C-API] Avoid C++ includes from arrow.h when including c_api.h #6973

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
cf0fd3d
Bug-fix of include c_api.h in C code
desertstsung Jul 22, 2025
8da6da0
Merge branch 'master' into master
desertstsung Jul 28, 2025
5bfd9f0
Merge branch 'master' into master
jameslamb Jul 29, 2025
d16a91b
Merge branch 'master' into master
desertstsung Sep 4, 2025
d29189e
Merge branch 'master' into master
StrikerRUS Oct 9, 2025
59cd465
Merge branch 'master' into master
StrikerRUS Oct 10, 2025
74b1081
Merge branch 'master' into master
jameslamb Dec 23, 2025
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
4 changes: 4 additions & 0 deletions include/LightGBM/arrow.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
#ifndef LIGHTGBM_INCLUDE_LIGHTGBM_ARROW_H_
#define LIGHTGBM_INCLUDE_LIGHTGBM_ARROW_H_

#ifdef __cplusplus
#include <algorithm>
#include <cstdint>
#include <functional>
Expand All @@ -17,6 +18,7 @@
#include <utility>
#include <vector>
#include <stdexcept>
#endif

/* -------------------------------------- C DATA INTERFACE ------------------------------------- */
// The C data interface is taken from
Expand Down Expand Up @@ -72,6 +74,7 @@ struct ArrowArray {
/* CHUNKED ARRAY */
/* --------------------------------------------------------------------------------------------- */

#ifdef __cplusplus
namespace LightGBM {

/**
Expand Down Expand Up @@ -295,5 +298,6 @@ class ArrowTable {
} // namespace LightGBM

#include "arrow.tpp"
#endif /* __cplusplus */

#endif // LIGHTGBM_INCLUDE_LIGHTGBM_ARROW_H_
12 changes: 6 additions & 6 deletions include/LightGBM/c_api.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -449,8 +449,8 @@ LIGHTGBM_C_EXPORT int LGBM_DatasetCreateFromMats(int32_t nmat,
* \return 0 when succeed, -1 when failure happens
*/
LIGHTGBM_C_EXPORT int LGBM_DatasetCreateFromArrow(int64_t n_chunks,
const ArrowArray* chunks,
const ArrowSchema* schema,
const struct ArrowArray* chunks,
const struct ArrowSchema* schema,
const char* parameters,
const DatasetHandle reference,
DatasetHandle *out);
Expand Down Expand Up @@ -571,8 +571,8 @@ LIGHTGBM_C_EXPORT int LGBM_DatasetSetField(DatasetHandle handle,
LIGHTGBM_C_EXPORT int LGBM_DatasetSetFieldFromArrow(DatasetHandle handle,
const char* field_name,
int64_t n_chunks,
const ArrowArray* chunks,
const ArrowSchema* schema);
const struct ArrowArray* chunks,
const struct ArrowSchema* schema);

/*!
* \brief Get info vector from dataset.
Expand Down Expand Up @@ -1450,8 +1450,8 @@ LIGHTGBM_C_EXPORT int LGBM_BoosterPredictForMats(BoosterHandle handle,
*/
LIGHTGBM_C_EXPORT int LGBM_BoosterPredictForArrow(BoosterHandle handle,
int64_t n_chunks,
const ArrowArray* chunks,
const ArrowSchema* schema,
const struct ArrowArray* chunks,
const struct ArrowSchema* schema,
int predict_type,
int start_iteration,
int num_iteration,
Expand Down
12 changes: 6 additions & 6 deletions src/c_api.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1643,8 +1643,8 @@ int LGBM_DatasetCreateFromCSC(const void* col_ptr,
}

int LGBM_DatasetCreateFromArrow(int64_t n_chunks,
const ArrowArray* chunks,
const ArrowSchema* schema,
const struct ArrowArray* chunks,
const struct ArrowSchema* schema,
const char* parameters,
const DatasetHandle reference,
DatasetHandle *out) {
Expand Down Expand Up @@ -1858,8 +1858,8 @@ int LGBM_DatasetSetField(DatasetHandle handle,
int LGBM_DatasetSetFieldFromArrow(DatasetHandle handle,
const char* field_name,
int64_t n_chunks,
const ArrowArray* chunks,
const ArrowSchema* schema) {
const struct ArrowArray* chunks,
const struct ArrowSchema* schema) {
API_BEGIN();
auto dataset = reinterpret_cast<Dataset*>(handle);
ArrowChunkedArray ca(n_chunks, chunks, schema);
Expand Down Expand Up @@ -2617,8 +2617,8 @@ int LGBM_BoosterPredictForMats(BoosterHandle handle,

int LGBM_BoosterPredictForArrow(BoosterHandle handle,
int64_t n_chunks,
const ArrowArray* chunks,
const ArrowSchema* schema,
const struct ArrowArray* chunks,
const struct ArrowSchema* schema,
int predict_type,
int start_iteration,
int num_iteration,
Expand Down
Loading