From ea8d14f7c4dfd942eaa1aa70b23f1f531cdb4f32 Mon Sep 17 00:00:00 2001 From: openGaussDev Date: Wed, 9 Mar 2022 19:52:11 +0800 Subject: [PATCH] fix CodeCheck Offering: openGaussDev More detail: fix CodeCheck Match-id-9a6021ff7bac5219a9894bcef8582a05f9eeb4d4 --- src/gausskernel/dbmind/db4ai/executor/gd/pca.cpp | 3 ++- src/gausskernel/dbmind/db4ai/executor/kmeans/kmeans.cpp | 3 ++- src/gausskernel/dbmind/db4ai/executor/xgboost/xgboost.cpp | 3 ++- src/test/regress/input/db4ai_xgboost_train_predict.source | 1 + src/test/regress/output/db4ai_xgboost_train_predict.source | 2 ++ 5 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/gausskernel/dbmind/db4ai/executor/gd/pca.cpp b/src/gausskernel/dbmind/db4ai/executor/gd/pca.cpp index 818dc1f04..7abbe9171 100644 --- a/src/gausskernel/dbmind/db4ai/executor/gd/pca.cpp +++ b/src/gausskernel/dbmind/db4ai/executor/gd/pca.cpp @@ -257,7 +257,8 @@ static Datum pca_predict(const Matrix *features, const Matrix *weights, static HyperparameterDefinition pca_hyperparameter_definitions[] = { HYPERPARAMETER_INT4("number_components", 1, 1, true, INT32_MAX, true, HyperparametersGD, number_dimensions, HP_NO_AUTOML()), - HYPERPARAMETER_INT4("batch_size", 1000, 1, true, MAX_BATCH_SIZE, true, HyperparametersGD, batch_size, HP_NO_AUTOML()), + HYPERPARAMETER_INT4("batch_size", 1000, 1, true, MAX_BATCH_SIZE, true, HyperparametersGD, batch_size, + HP_NO_AUTOML()), HYPERPARAMETER_INT4("max_iterations", 100, 1, true, ITER_MAX, true, HyperparametersGD, max_iterations, HP_NO_AUTOML()), HYPERPARAMETER_INT4("max_seconds", 0, 0, true, INT32_MAX, true, HyperparametersGD, max_seconds, HP_NO_AUTOML()), diff --git a/src/gausskernel/dbmind/db4ai/executor/kmeans/kmeans.cpp b/src/gausskernel/dbmind/db4ai/executor/kmeans/kmeans.cpp index 79988a099..0b8933966 100644 --- a/src/gausskernel/dbmind/db4ai/executor/kmeans/kmeans.cpp +++ b/src/gausskernel/dbmind/db4ai/executor/kmeans/kmeans.cpp @@ -1044,7 +1044,8 @@ HyperparameterDefinition kmeans_hyperparameter_definitions[] = { HYPERPARAMETER_INT4("max_iterations", 10, 1, true, ITER_MAX, true, HyperparametersKMeans, num_iterations, HP_NO_AUTOML()), HYPERPARAMETER_INT4("num_features", 0, 1, true, INT32_MAX, true, HyperparametersKMeans, n_features, HP_NO_AUTOML()), - HYPERPARAMETER_INT4("batch_size", 1000, 1, true, MAX_BATCH_SIZE, true, HyperparametersKMeans, batch_size, HP_NO_AUTOML()), + HYPERPARAMETER_INT4("batch_size", 1000, 1, true, MAX_BATCH_SIZE, true, HyperparametersKMeans, batch_size, + HP_NO_AUTOML()), HYPERPARAMETER_INT4("seed", 0, 0, true, INT32_MAX, true, HyperparametersKMeans, external_seed, HP_AUTOML_INT(1, INT32_MAX, 1, ProbabilityDistribution::UNIFORM_RANGE)), HYPERPARAMETER_FLOAT8("tolerance", 0.00001, 0.0, false, 1.0, true, HyperparametersKMeans, tolerance, diff --git a/src/gausskernel/dbmind/db4ai/executor/xgboost/xgboost.cpp b/src/gausskernel/dbmind/db4ai/executor/xgboost/xgboost.cpp index e5b649e65..76b88897f 100644 --- a/src/gausskernel/dbmind/db4ai/executor/xgboost/xgboost.cpp +++ b/src/gausskernel/dbmind/db4ai/executor/xgboost/xgboost.cpp @@ -226,7 +226,8 @@ const char *xgboost_tree_method_str[] = {"auto", "exact", "approx", "hist", "gpu const char *xgboost_eval_metric_str[] = {"rmse", "rmsle", "map", "mae", "auc", "aucpr" }; static HyperparameterDefinition xgboost_hyperparameter_definitions[] = { HYPERPARAMETER_INT4("n_iter", 10, 1, true, ITER_MAX, true, HyperparamsXGBoost, n_iterations, HP_NO_AUTOML()), - HYPERPARAMETER_INT4("batch_size", 10000, 1, true, MAX_BATCH_SIZE, true, HyperparamsXGBoost, batch_size, HP_NO_AUTOML()), + HYPERPARAMETER_INT4("batch_size", 10000, 1, true, MAX_BATCH_SIZE, true, HyperparamsXGBoost, batch_size, + HP_NO_AUTOML()), HYPERPARAMETER_INT4("max_depth", 5, 0, true, INT32_MAX, true, HyperparamsXGBoost, max_depth, HP_NO_AUTOML()), HYPERPARAMETER_INT4("min_child_weight", 1, 0, true, INT32_MAX, true, HyperparamsXGBoost, min_child_weight, HP_NO_AUTOML()), diff --git a/src/test/regress/input/db4ai_xgboost_train_predict.source b/src/test/regress/input/db4ai_xgboost_train_predict.source index cb3d7075e..74eeac421 100644 --- a/src/test/regress/input/db4ai_xgboost_train_predict.source +++ b/src/test/regress/input/db4ai_xgboost_train_predict.source @@ -22,6 +22,7 @@ CREATE MODEL m USING xgboost_binary_logistic FEATURES rainfall, temp9am TARGET r CREATE MODEL m USING xgboost_binary_logistic FEATURES rainfall, temp9am TARGET raintoday FROM db4ai_rain WITH eta=-0.1; CREATE MODEL m USING xgboost_binary_logistic FEATURES rainfall, temp9am TARGET raintoday FROM db4ai_rain WITH seed=-1; CREATE MODEL m USING xgboost_binary_logistic FEATURES rainfall, temp9am TARGET raintoday FROM db4ai_rain WITH nthread=-1; +CREATE MODEL m USING xgboost_binary_logistic FEATURES rainfall, temp9am TARGET raintoday FROM db4ai_rain WITH nthread=101; CREATE MODEL m USING xgboost_binary_logistic FEATURES rainfall, temp9am TARGET raintoday FROM db4ai_rain WITH booster=10; CREATE MODEL m USING xgboost_binary_logistic FEATURES rainfall, temp9am TARGET raintoday FROM db4ai_rain WITH tree_method=10; CREATE MODEL m USING xgboost_binary_logistic FEATURES rainfall, temp9am TARGET raintoday FROM db4ai_rain WITH verbosity=10; diff --git a/src/test/regress/output/db4ai_xgboost_train_predict.source b/src/test/regress/output/db4ai_xgboost_train_predict.source index 4d8e6c52c..8c245b27a 100644 --- a/src/test/regress/output/db4ai_xgboost_train_predict.source +++ b/src/test/regress/output/db4ai_xgboost_train_predict.source @@ -25,6 +25,8 @@ CREATE MODEL m USING xgboost_binary_logistic FEATURES rainfall, temp9am TARGET r ERROR: Hyperparameter seed must be in the range [0,2147483647] CREATE MODEL m USING xgboost_binary_logistic FEATURES rainfall, temp9am TARGET raintoday FROM db4ai_rain WITH nthread=-1; ERROR: Hyperparameter nthread must be in the range [0,100] +CREATE MODEL m USING xgboost_binary_logistic FEATURES rainfall, temp9am TARGET raintoday FROM db4ai_rain WITH nthread=101; +ERROR: Hyperparameter nthread must be in the range [0,100] CREATE MODEL m USING xgboost_binary_logistic FEATURES rainfall, temp9am TARGET raintoday FROM db4ai_rain WITH booster=10; ERROR: Hyperparameter booster must be a string CREATE MODEL m USING xgboost_binary_logistic FEATURES rainfall, temp9am TARGET raintoday FROM db4ai_rain WITH tree_method=10;