You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ignite.apache.org by GitBox <gi...@apache.org> on 2020/11/24 08:56:58 UTC
[GitHub] [ignite] mrk-andreev opened a new pull request #8489: IGNITE-13714 Add catboost inference integration
mrk-andreev opened a new pull request #8489:
URL: https://github.com/apache/ignite/pull/8489
* Add [catboost](https://catboost.ai/) (Apache-2.0 License) inference integration
Issue: https://issues.apache.org/jira/browse/IGNITE-13714
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [ignite] saurzcode commented on a change in pull request #8489: IGNITE-13714 [ML]: Add catboost inference integration
Posted by GitBox <gi...@apache.org>.
saurzcode commented on a change in pull request #8489:
URL: https://github.com/apache/ignite/pull/8489#discussion_r660475654
##########
File path: modules/ml/catboost-model-parser/src/main/java/org/apache/ignite/ml/catboost/CatboostClassificationModel.java
##########
@@ -0,0 +1,73 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.ml.catboost;
+
+import ai.catboost.CatBoostError;
+import ai.catboost.CatBoostModel;
+import org.apache.ignite.ml.inference.Model;
+import org.apache.ignite.ml.math.primitives.vector.NamedVector;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * CatboostClassificationModel imported and wrapped to be compatible with Apache Ignite infrastructure.
+ */
+public class CatboostClassificationModel implements Model<NamedVector, Double> {
+ /** Logger. */
+ private static final Logger logger = LoggerFactory.getLogger(CatboostClassificationModel.class);
+
+ /** Catboost model. */
+ private final CatBoostModel model;
+
+ /**
+ * Constructs a new instance of Catboost model wrapper.
+ *
+ * @param model Catboost Model
+ */
+ public CatboostClassificationModel(CatBoostModel model) {
+ this.model = model;
+ }
+
+ /** {@inheritDoc} */
+ @Override public Double predict(NamedVector input) {
+ float[] floatInput = new float[input.size()];
+ int index = 0;
+ for (String key: model.getFeatureNames()) {
+ floatInput[index] = (float) input.get(key);
+ index++;
+ }
+
+ try {
+ double predict = model.predict(floatInput, model.getFeatureNames())
Review comment:
Sure ! I can make a pull request to handle those, I have some idea on it, let me know if you find otherwise any other way to handle in existing i can use that.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@ignite.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [ignite] mrk-andreev commented on a change in pull request #8489: IGNITE-13714 [ML]: Add catboost inference integration
Posted by GitBox <gi...@apache.org>.
mrk-andreev commented on a change in pull request #8489:
URL: https://github.com/apache/ignite/pull/8489#discussion_r535920435
##########
File path: modules/ml/catboost-model-parser/src/main/java/org/apache/ignite/ml/catboost/CatboostClassificationModel.java
##########
@@ -0,0 +1,77 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.ml.catboost;
+
+import ai.catboost.CatBoostError;
+import ai.catboost.CatBoostModel;
+import org.apache.ignite.ml.inference.Model;
+import org.apache.ignite.ml.math.primitives.vector.NamedVector;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * CatboostClassificationModel imported and wrapped to be compatible with Apache Ignite infrastructure.
Review comment:
Original javadoc is not so useful:
> CatBoost model, supports basic model application.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [ignite] saurzcode commented on a change in pull request #8489: IGNITE-13714 [ML]: Add catboost inference integration
Posted by GitBox <gi...@apache.org>.
saurzcode commented on a change in pull request #8489:
URL: https://github.com/apache/ignite/pull/8489#discussion_r660475654
##########
File path: modules/ml/catboost-model-parser/src/main/java/org/apache/ignite/ml/catboost/CatboostClassificationModel.java
##########
@@ -0,0 +1,73 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.ml.catboost;
+
+import ai.catboost.CatBoostError;
+import ai.catboost.CatBoostModel;
+import org.apache.ignite.ml.inference.Model;
+import org.apache.ignite.ml.math.primitives.vector.NamedVector;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * CatboostClassificationModel imported and wrapped to be compatible with Apache Ignite infrastructure.
+ */
+public class CatboostClassificationModel implements Model<NamedVector, Double> {
+ /** Logger. */
+ private static final Logger logger = LoggerFactory.getLogger(CatboostClassificationModel.class);
+
+ /** Catboost model. */
+ private final CatBoostModel model;
+
+ /**
+ * Constructs a new instance of Catboost model wrapper.
+ *
+ * @param model Catboost Model
+ */
+ public CatboostClassificationModel(CatBoostModel model) {
+ this.model = model;
+ }
+
+ /** {@inheritDoc} */
+ @Override public Double predict(NamedVector input) {
+ float[] floatInput = new float[input.size()];
+ int index = 0;
+ for (String key: model.getFeatureNames()) {
+ floatInput[index] = (float) input.get(key);
+ index++;
+ }
+
+ try {
+ double predict = model.predict(floatInput, model.getFeatureNames())
Review comment:
Sure ! I can make a pull request to handle those, I have some idea on it, let me know if you find otherwise any other way to handle in existing i can use that.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@ignite.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [ignite] mrk-andreev commented on a change in pull request #8489: IGNITE-13714 [ML]: Add catboost inference integration
Posted by GitBox <gi...@apache.org>.
mrk-andreev commented on a change in pull request #8489:
URL: https://github.com/apache/ignite/pull/8489#discussion_r660472816
##########
File path: modules/ml/catboost-model-parser/src/main/java/org/apache/ignite/ml/catboost/CatboostClassificationModel.java
##########
@@ -0,0 +1,73 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.ml.catboost;
+
+import ai.catboost.CatBoostError;
+import ai.catboost.CatBoostModel;
+import org.apache.ignite.ml.inference.Model;
+import org.apache.ignite.ml.math.primitives.vector.NamedVector;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * CatboostClassificationModel imported and wrapped to be compatible with Apache Ignite infrastructure.
+ */
+public class CatboostClassificationModel implements Model<NamedVector, Double> {
+ /** Logger. */
+ private static final Logger logger = LoggerFactory.getLogger(CatboostClassificationModel.class);
+
+ /** Catboost model. */
+ private final CatBoostModel model;
+
+ /**
+ * Constructs a new instance of Catboost model wrapper.
+ *
+ * @param model Catboost Model
+ */
+ public CatboostClassificationModel(CatBoostModel model) {
+ this.model = model;
+ }
+
+ /** {@inheritDoc} */
+ @Override public Double predict(NamedVector input) {
+ float[] floatInput = new float[input.size()];
+ int index = 0;
+ for (String key: model.getFeatureNames()) {
+ floatInput[index] = (float) input.get(key);
+ index++;
+ }
+
+ try {
+ double predict = model.predict(floatInput, model.getFeatureNames())
Review comment:
Hi, @saurzcode . I need more time for investigation.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@ignite.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [ignite] saurzcode commented on a change in pull request #8489: IGNITE-13714 [ML]: Add catboost inference integration
Posted by GitBox <gi...@apache.org>.
saurzcode commented on a change in pull request #8489:
URL: https://github.com/apache/ignite/pull/8489#discussion_r659650183
##########
File path: modules/ml/catboost-model-parser/src/main/java/org/apache/ignite/ml/catboost/CatboostClassificationModelParser.java
##########
@@ -0,0 +1,44 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.ml.catboost;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import ai.catboost.CatBoostError;
+import ai.catboost.CatBoostModel;
+import org.apache.ignite.ml.inference.parser.ModelParser;
+import org.apache.ignite.ml.math.primitives.vector.NamedVector;
+
+/**
+ * Catboost Classification model parser.
+ */
+public class CatboostClassificationModelParser implements
+ ModelParser<NamedVector, Double, CatboostClassificationModel> {
Review comment:
Hi, second parameter in predict for catboost model, isn't that supposed to be categorical features? Could you please help me understand how are categorical features passed here?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@ignite.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [ignite] zaleslaw commented on pull request #8489: IGNITE-13714 [ML]: Add catboost inference integration
Posted by GitBox <gi...@apache.org>.
zaleslaw commented on pull request #8489:
URL: https://github.com/apache/ignite/pull/8489#issuecomment-739914134
It's ready to merge, I suppose, please merge master into branch to check on conflicts and run on TC (ML Visa and common)
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [ignite] saurzcode commented on a change in pull request #8489: IGNITE-13714 [ML]: Add catboost inference integration
Posted by GitBox <gi...@apache.org>.
saurzcode commented on a change in pull request #8489:
URL: https://github.com/apache/ignite/pull/8489#discussion_r659650833
##########
File path: modules/ml/catboost-model-parser/src/main/java/org/apache/ignite/ml/catboost/CatboostClassificationModel.java
##########
@@ -0,0 +1,73 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.ml.catboost;
+
+import ai.catboost.CatBoostError;
+import ai.catboost.CatBoostModel;
+import org.apache.ignite.ml.inference.Model;
+import org.apache.ignite.ml.math.primitives.vector.NamedVector;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * CatboostClassificationModel imported and wrapped to be compatible with Apache Ignite infrastructure.
+ */
+public class CatboostClassificationModel implements Model<NamedVector, Double> {
+ /** Logger. */
+ private static final Logger logger = LoggerFactory.getLogger(CatboostClassificationModel.class);
+
+ /** Catboost model. */
+ private final CatBoostModel model;
+
+ /**
+ * Constructs a new instance of Catboost model wrapper.
+ *
+ * @param model Catboost Model
+ */
+ public CatboostClassificationModel(CatBoostModel model) {
+ this.model = model;
+ }
+
+ /** {@inheritDoc} */
+ @Override public Double predict(NamedVector input) {
+ float[] floatInput = new float[input.size()];
+ int index = 0;
+ for (String key: model.getFeatureNames()) {
+ floatInput[index] = (float) input.get(key);
+ index++;
+ }
+
+ try {
+ double predict = model.predict(floatInput, model.getFeatureNames())
Review comment:
Hi @mrk-andreev , second parameter in predict for catboost model, isn't that supposed to be categorical features? Could you please help me understand how are categorical features passed here?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@ignite.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [ignite] mrk-andreev commented on a change in pull request #8489: IGNITE-13714 [ML]: Add catboost inference integration
Posted by GitBox <gi...@apache.org>.
mrk-andreev commented on a change in pull request #8489:
URL: https://github.com/apache/ignite/pull/8489#discussion_r535933385
##########
File path: modules/ml/catboost-model-parser/src/main/java/org/apache/ignite/ml/catboost/CatboostRegressionModel.java
##########
@@ -0,0 +1,71 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.ml.catboost;
+
+import ai.catboost.CatBoostError;
+import ai.catboost.CatBoostModel;
+import org.apache.ignite.ml.inference.Model;
+import org.apache.ignite.ml.math.primitives.vector.NamedVector;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * CatboostRegressionModel imported and wrapped to be compatible with Apache Ignite infrastructure.
+ */
+public class CatboostRegressionModel implements Model<NamedVector, Double> {
+ /** Logger. */
+ private static final Logger logger = LoggerFactory.getLogger(CatboostRegressionModel.class);
+
+ /** Catboost model. */
+ private final CatBoostModel model;
+
+ /**
+ * Constructs a new instance of Catboost model wrapper.
+ *
+ * @param model Catboost Model
+ */
+ public CatboostRegressionModel(CatBoostModel model) {
+ this.model = model;
+ }
+
+ /** {@inheritDoc} */
+ @Override public Double predict(NamedVector input) {
+ float[] floatInput = new float[input.size()];
+ int index = 0;
+ for (String key: model.getFeatureNames()) {
+ floatInput[index] = (float) input.get(key);
+ index++;
+ }
+
+ try {
+ return model.predict(floatInput, model.getFeatureNames()).get(0, 0);
+ } catch (CatBoostError e) {
+ throw new RuntimeException(e.getMessage());
+ }
+ }
+
+ /** {@inheritDoc} */
+ @Override public void close() {
+ try {
+ model.close();
+ } catch (CatBoostError e) {
+ logger.error(e.getMessage());
+ }
+ }
+
Review comment:
Fixed
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [ignite] mrk-andreev commented on a change in pull request #8489: IGNITE-13714 [ML]: Add catboost inference integration
Posted by GitBox <gi...@apache.org>.
mrk-andreev commented on a change in pull request #8489:
URL: https://github.com/apache/ignite/pull/8489#discussion_r535933955
##########
File path: modules/ml/catboost-model-parser/src/main/java/org/apache/ignite/ml/catboost/CatboostClassificationModelParser.java
##########
@@ -0,0 +1,44 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.ml.catboost;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import ai.catboost.CatBoostError;
+import ai.catboost.CatBoostModel;
+import org.apache.ignite.ml.inference.parser.ModelParser;
+import org.apache.ignite.ml.math.primitives.vector.NamedVector;
+
+/**
+ * Catboost Classification model parser.
+ */
+public class CatboostClassificationModelParser implements
+ ModelParser<NamedVector, Double, CatboostClassificationModel> {
+ /** */
+ private static final long serialVersionUID = -8425510352746936163L;
+
+ /** {@inheritDoc} */
+ @Override public CatboostClassificationModel parse(byte[] mdl) {
+ try (InputStream inputStream = new ByteArrayInputStream(mdl)) {
+ return new CatboostClassificationModel(CatBoostModel.loadModel(inputStream));
+ } catch (IOException | CatBoostError e) {
+ throw new RuntimeException("Failed to parse model", e);
Review comment:
Add original exception message to RuntimeException message
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [ignite] mrk-andreev commented on a change in pull request #8489: IGNITE-13714 [ML]: Add catboost inference integration
Posted by GitBox <gi...@apache.org>.
mrk-andreev commented on a change in pull request #8489:
URL: https://github.com/apache/ignite/pull/8489#discussion_r535933612
##########
File path: modules/ml/catboost-model-parser/src/main/java/org/apache/ignite/ml/catboost/CatboostClassificationModel.java
##########
@@ -0,0 +1,77 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.ml.catboost;
+
+import ai.catboost.CatBoostError;
+import ai.catboost.CatBoostModel;
+import org.apache.ignite.ml.inference.Model;
+import org.apache.ignite.ml.math.primitives.vector.NamedVector;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * CatboostClassificationModel imported and wrapped to be compatible with Apache Ignite infrastructure.
+ */
+public class CatboostClassificationModel implements Model<NamedVector, Double> {
+ /** Logger. */
+ private static final Logger logger = LoggerFactory.getLogger(CatboostClassificationModel.class);
+
+ /** Catboost model. */
+ private final CatBoostModel model;
+
+ /**
+ * Constructs a new instance of Catboost model wrapper.
+ *
+ * @param model Catboost Model
+ */
+ public CatboostClassificationModel(CatBoostModel model) {
+ this.model = model;
+ }
+
+ /** {@inheritDoc} */
+ @Override public Double predict(NamedVector input) {
+ float[] floatInput = new float[input.size()];
+ int index = 0;
+ for (String key: model.getFeatureNames()) {
+ floatInput[index] = (float) input.get(key);
+ index++;
+ }
+
+ try {
+ double predict = model.predict(
Review comment:
Fixed in all committed files
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [ignite] mrk-andreev commented on a change in pull request #8489: IGNITE-13714 [ML]: Add catboost inference integration
Posted by GitBox <gi...@apache.org>.
mrk-andreev commented on a change in pull request #8489:
URL: https://github.com/apache/ignite/pull/8489#discussion_r535935442
##########
File path: modules/ml/catboost-model-parser/src/main/java/org/apache/ignite/ml/catboost/CatboostClassificationModelParser.java
##########
@@ -0,0 +1,44 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.ml.catboost;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import ai.catboost.CatBoostError;
+import ai.catboost.CatBoostModel;
+import org.apache.ignite.ml.inference.parser.ModelParser;
+import org.apache.ignite.ml.math.primitives.vector.NamedVector;
+
+/**
+ * Catboost Classification model parser.
+ */
+public class CatboostClassificationModelParser implements
+ ModelParser<NamedVector, Double, CatboostClassificationModel> {
Review comment:
Catboost require right order of features. So I can fetch order `model.getFeatureNames()` and fill input vector `floatInput` using expected order.
```java
float[] floatInput = new float[input.size()];
int index = 0;
for (String key: model.getFeatureNames()) {
floatInput[index] = (float) input.get(key);
index++;
}
return model.predict(floatInput, model.getFeatureNames()).get(0, 0);
```
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [ignite] zaleslaw merged pull request #8489: IGNITE-13714 [ML]: Add catboost inference integration
Posted by GitBox <gi...@apache.org>.
zaleslaw merged pull request #8489:
URL: https://github.com/apache/ignite/pull/8489
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [ignite] zaleslaw commented on a change in pull request #8489: IGNITE-13714 [ML]: Add catboost inference integration
Posted by GitBox <gi...@apache.org>.
zaleslaw commented on a change in pull request #8489:
URL: https://github.com/apache/ignite/pull/8489#discussion_r533192239
##########
File path: modules/ml/catboost-model-parser/src/main/java/org/apache/ignite/ml/catboost/CatboostClassificationModel.java
##########
@@ -0,0 +1,77 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.ml.catboost;
+
+import ai.catboost.CatBoostError;
+import ai.catboost.CatBoostModel;
+import org.apache.ignite.ml.inference.Model;
+import org.apache.ignite.ml.math.primitives.vector.NamedVector;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * CatboostClassificationModel imported and wrapped to be compatible with Apache Ignite infrastructure.
Review comment:
Add more comments about CatBoost model, maybe copy some javadaoc from CatBoost
##########
File path: modules/ml/catboost-model-parser/src/main/java/org/apache/ignite/ml/catboost/CatboostRegressionModel.java
##########
@@ -0,0 +1,71 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.ml.catboost;
+
+import ai.catboost.CatBoostError;
+import ai.catboost.CatBoostModel;
+import org.apache.ignite.ml.inference.Model;
+import org.apache.ignite.ml.math.primitives.vector.NamedVector;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * CatboostRegressionModel imported and wrapped to be compatible with Apache Ignite infrastructure.
+ */
+public class CatboostRegressionModel implements Model<NamedVector, Double> {
+ /** Logger. */
+ private static final Logger logger = LoggerFactory.getLogger(CatboostRegressionModel.class);
+
+ /** Catboost model. */
+ private final CatBoostModel model;
+
+ /**
+ * Constructs a new instance of Catboost model wrapper.
+ *
+ * @param model Catboost Model
+ */
+ public CatboostRegressionModel(CatBoostModel model) {
+ this.model = model;
+ }
+
+ /** {@inheritDoc} */
+ @Override public Double predict(NamedVector input) {
+ float[] floatInput = new float[input.size()];
+ int index = 0;
+ for (String key: model.getFeatureNames()) {
+ floatInput[index] = (float) input.get(key);
+ index++;
+ }
+
+ try {
+ return model.predict(floatInput, model.getFeatureNames()).get(0, 0);
+ } catch (CatBoostError e) {
+ throw new RuntimeException(e.getMessage());
+ }
+ }
+
+ /** {@inheritDoc} */
+ @Override public void close() {
+ try {
+ model.close();
+ } catch (CatBoostError e) {
+ logger.error(e.getMessage());
+ }
+ }
+
Review comment:
Remove blank line
##########
File path: modules/ml/catboost-model-parser/src/main/java/org/apache/ignite/ml/catboost/CatboostClassificationModel.java
##########
@@ -0,0 +1,77 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.ml.catboost;
+
+import ai.catboost.CatBoostError;
+import ai.catboost.CatBoostModel;
+import org.apache.ignite.ml.inference.Model;
+import org.apache.ignite.ml.math.primitives.vector.NamedVector;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * CatboostClassificationModel imported and wrapped to be compatible with Apache Ignite infrastructure.
+ */
+public class CatboostClassificationModel implements Model<NamedVector, Double> {
+ /** Logger. */
+ private static final Logger logger = LoggerFactory.getLogger(CatboostClassificationModel.class);
+
+ /** Catboost model. */
+ private final CatBoostModel model;
+
+ /**
+ * Constructs a new instance of Catboost model wrapper.
+ *
+ * @param model Catboost Model
+ */
+ public CatboostClassificationModel(CatBoostModel model) {
+ this.model = model;
+ }
+
+ /** {@inheritDoc} */
+ @Override public Double predict(NamedVector input) {
+ float[] floatInput = new float[input.size()];
+ int index = 0;
+ for (String key: model.getFeatureNames()) {
+ floatInput[index] = (float) input.get(key);
+ index++;
+ }
+
+ try {
+ double predict = model.predict(
Review comment:
Looks like the use different code formatting
Could you please check https://cwiki.apache.org/confluence/display/IGNITE/Coding+Guidelines especially
**Whitespaces and empty lines** chapter
Source code line should not be longer then 120 characters (to be visible on most conventional monitors). 4 space characters should be used for tabulation and indentation
##########
File path: modules/ml/catboost-model-parser/src/main/java/org/apache/ignite/ml/catboost/CatboostClassificationModelParser.java
##########
@@ -0,0 +1,44 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.ml.catboost;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import ai.catboost.CatBoostError;
+import ai.catboost.CatBoostModel;
+import org.apache.ignite.ml.inference.parser.ModelParser;
+import org.apache.ignite.ml.math.primitives.vector.NamedVector;
+
+/**
+ * Catboost Classification model parser.
+ */
+public class CatboostClassificationModelParser implements
+ ModelParser<NamedVector, Double, CatboostClassificationModel> {
Review comment:
Could you please explain, why did you use NamedVector with CatBoost models
##########
File path: modules/ml/catboost-model-parser/src/main/java/org/apache/ignite/ml/catboost/CatboostClassificationModelParser.java
##########
@@ -0,0 +1,44 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.ml.catboost;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import ai.catboost.CatBoostError;
+import ai.catboost.CatBoostModel;
+import org.apache.ignite.ml.inference.parser.ModelParser;
+import org.apache.ignite.ml.math.primitives.vector.NamedVector;
+
+/**
+ * Catboost Classification model parser.
+ */
+public class CatboostClassificationModelParser implements
+ ModelParser<NamedVector, Double, CatboostClassificationModel> {
+ /** */
+ private static final long serialVersionUID = -8425510352746936163L;
+
+ /** {@inheritDoc} */
+ @Override public CatboostClassificationModel parse(byte[] mdl) {
+ try (InputStream inputStream = new ByteArrayInputStream(mdl)) {
+ return new CatboostClassificationModel(CatBoostModel.loadModel(inputStream));
+ } catch (IOException | CatBoostError e) {
+ throw new RuntimeException("Failed to parse model", e);
Review comment:
Rewrite the RuntimeException message to more clear (maybe with tips, what's going on)
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [ignite] saurzcode commented on a change in pull request #8489: IGNITE-13714 [ML]: Add catboost inference integration
Posted by GitBox <gi...@apache.org>.
saurzcode commented on a change in pull request #8489:
URL: https://github.com/apache/ignite/pull/8489#discussion_r659650833
##########
File path: modules/ml/catboost-model-parser/src/main/java/org/apache/ignite/ml/catboost/CatboostClassificationModel.java
##########
@@ -0,0 +1,73 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.ml.catboost;
+
+import ai.catboost.CatBoostError;
+import ai.catboost.CatBoostModel;
+import org.apache.ignite.ml.inference.Model;
+import org.apache.ignite.ml.math.primitives.vector.NamedVector;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * CatboostClassificationModel imported and wrapped to be compatible with Apache Ignite infrastructure.
+ */
+public class CatboostClassificationModel implements Model<NamedVector, Double> {
+ /** Logger. */
+ private static final Logger logger = LoggerFactory.getLogger(CatboostClassificationModel.class);
+
+ /** Catboost model. */
+ private final CatBoostModel model;
+
+ /**
+ * Constructs a new instance of Catboost model wrapper.
+ *
+ * @param model Catboost Model
+ */
+ public CatboostClassificationModel(CatBoostModel model) {
+ this.model = model;
+ }
+
+ /** {@inheritDoc} */
+ @Override public Double predict(NamedVector input) {
+ float[] floatInput = new float[input.size()];
+ int index = 0;
+ for (String key: model.getFeatureNames()) {
+ floatInput[index] = (float) input.get(key);
+ index++;
+ }
+
+ try {
+ double predict = model.predict(floatInput, model.getFeatureNames())
Review comment:
Hi @mrk-andreev , second parameter in predict for catboost model should be an array of categorical features? Could you please help with, how can we run for a model containing categorical features?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@ignite.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [ignite] mrk-andreev commented on a change in pull request #8489: IGNITE-13714 [ML]: Add catboost inference integration
Posted by GitBox <gi...@apache.org>.
mrk-andreev commented on a change in pull request #8489:
URL: https://github.com/apache/ignite/pull/8489#discussion_r660472816
##########
File path: modules/ml/catboost-model-parser/src/main/java/org/apache/ignite/ml/catboost/CatboostClassificationModel.java
##########
@@ -0,0 +1,73 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.ml.catboost;
+
+import ai.catboost.CatBoostError;
+import ai.catboost.CatBoostModel;
+import org.apache.ignite.ml.inference.Model;
+import org.apache.ignite.ml.math.primitives.vector.NamedVector;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * CatboostClassificationModel imported and wrapped to be compatible with Apache Ignite infrastructure.
+ */
+public class CatboostClassificationModel implements Model<NamedVector, Double> {
+ /** Logger. */
+ private static final Logger logger = LoggerFactory.getLogger(CatboostClassificationModel.class);
+
+ /** Catboost model. */
+ private final CatBoostModel model;
+
+ /**
+ * Constructs a new instance of Catboost model wrapper.
+ *
+ * @param model Catboost Model
+ */
+ public CatboostClassificationModel(CatBoostModel model) {
+ this.model = model;
+ }
+
+ /** {@inheritDoc} */
+ @Override public Double predict(NamedVector input) {
+ float[] floatInput = new float[input.size()];
+ int index = 0;
+ for (String key: model.getFeatureNames()) {
+ floatInput[index] = (float) input.get(key);
+ index++;
+ }
+
+ try {
+ double predict = model.predict(floatInput, model.getFeatureNames())
Review comment:
Hi, @saurzcode . I need more time for investigation.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@ignite.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org