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/12/01 09:16:03 UTC
[GitHub] [ignite] zaleslaw commented on a change in pull request #8489: IGNITE-13714 [ML]: Add catboost inference integration
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