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

[xgb] Set default missing value to NaN #1571

Merged
merged 1 commit into from
Apr 14, 2022
Merged

[xgb] Set default missing value to NaN #1571

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 13 additions & 2 deletions engines/ml/xgboost/src/main/java/ai/djl/ml/xgboost/XgbNDManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ public class XgbNDManager extends BaseNDManager {

private static final XgbNDManager SYSTEM_MANAGER = new SystemManager();

private float missingValue = Float.NaN;

private XgbNDManager(NDManager parent, Device device) {
super(parent, device);
}
Expand All @@ -40,6 +42,15 @@ static XgbNDManager getSystemManager() {
return SYSTEM_MANAGER;
}

/**
* Sets the default missing value.
*
* @param missingValue the default missing value
*/
public void setMissingValue(float missingValue) {
this.missingValue = missingValue;
}

/** {@inheritDoc} */
@Override
public ByteBuffer allocateDirect(int capacity) {
Expand Down Expand Up @@ -95,7 +106,7 @@ public NDArray create(Buffer data, Shape shape, DataType dataType) {

if (data.isDirect() && data instanceof ByteBuffer) {
// TODO: allow user to set missing value
long handle = JniUtils.createDMatrix(data, shape, 0.0f);
long handle = JniUtils.createDMatrix(data, shape, missingValue);
return new XgbNDArray(this, alternativeManager, handle, shape, SparseFormat.DENSE);
}

Expand All @@ -109,7 +120,7 @@ public NDArray create(Buffer data, Shape shape, DataType dataType) {
ByteBuffer buf = allocateDirect(size);
buf.asFloatBuffer().put((FloatBuffer) data);
buf.rewind();
long handle = JniUtils.createDMatrix(buf, shape, 0.0f);
long handle = JniUtils.createDMatrix(buf, shape, missingValue);
return new XgbNDArray(this, alternativeManager, handle, shape, SparseFormat.DENSE);
}

Expand Down
1 change: 1 addition & 0 deletions engines/ml/xgboost/src/test/java/ai/djl/ml/xgboost/XgbModelTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ public void testNDArray() {

try (XgbNDManager manager =
(XgbNDManager) XgbNDManager.getSystemManager().newSubManager()) {
manager.setMissingValue(Float.NaN);
NDArray zeros = manager.zeros(new Shape(1, 2));
Assert.expectThrows(UnsupportedOperationException.class, zeros::toFloatArray);

Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ paddlepaddle_version=2.0.2
sentencepiece_version=0.1.95
tokenizers_version=0.11.0
fasttext_version=0.9.2
xgboost_version=1.4.1
xgboost_version=1.5.2

commons_cli_version=1.5.0
commons_compress_version=1.21
Expand Down