adding macos-14 to CI

IQVIA-ML · Apr 22, 2024 · 726c965 · 726c965
2 parents 96ff0b3 + 3c3d508
commit 726c965
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 11 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -12,8 +12,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        version: ['1.6', '1.7', '1.8', '1.9']
-        os:  [windows-latest, ubuntu-latest, macOS-latest]
+        version: ['1.6', '1.7', '1.8', '1.9', '1.10']
+        os:  [windows-latest, ubuntu-latest, macOS-latest, macos-14]
         arch:
           - x64
     env:
@@ -54,7 +54,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        version: ['1.6', '1.7', '1.8', '1.9']
+        version: ['1.6', '1.7', '1.8', '1.9', '1.10']
     steps:
       - uses: actions/checkout@v2
       - uses: julia-actions/setup-julia@v1

diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
@@ -8,7 +8,7 @@ Thank you to our Amazing :star: Contributors:
     <td align="center"><a href="https://github.com/yalwan-iqvia"><img src="https://avatars2.githubusercontent.com/u/59194485?s=460&u=808c813a76690b2291a64e9a5234ca5a25f7c578&v=4" width="100px;" alt=""/><br /><sub><b>yalwan-iqvia</b></sub></a><br /></td>
     <td align="center"><a href="https://github.com/wakakusa"><img src="https://avatars3.githubusercontent.com/u/11461331?s=460&u=1ac8ebf94116a9b97a92725110a80372f32c46f7&v=4" width="100px;" alt=""/><br /><sub><b>wakakusa</b></sub></a><br /></td>
     <td align="center"><a href="https://github.com/tlienart"><img src="https://avatars0.githubusercontent.com/u/10897531?s=460&u=a103c60e034fa18e0ccb321f3ca3c3ebeded2f9f&v=4" width="100px;" alt=""/><br /><sub><b>tlienart</b></sub></a><br /></td>
-    <td align="center"><a href="https://github.com/kd-iqvia"><img src="https://avatars0.githubusercontent.com/u/59925069?s=460&u=c64a9704e27c013b257dfe5238c471dd0b163140&v=4" width="100px;" alt=""/><br /><sub><b>kd-iqvia</b></sub></a><br /></td>
+    <td align="center"><a href="https://github.com/kainkad"><img src="https://avatars.githubusercontent.com/u/59925069?v=4" width="100px;" alt=""/><br /><sub><b>kainkad</b></sub></a><br /></td>
     <td align="center"><a href="https://github.com/sbeura"><img src="https://avatars0.githubusercontent.com/u/60133213?s=460&v=4" width="100px;" alt=""/><br /><sub><b>sbeura</b></sub></a><br /></td>
     <td align="center"><a href="https://github.com/cbecker"><img src="https://avatars3.githubusercontent.com/u/26833?s=460&u=b1db6023439bc76b15d1a202e77b05c6c6bbe7aa&v=4" width="100px;" alt=""/><br /><sub><b>cbecker</b></sub></a><br /></td>
   </tr>

diff --git a/Project.toml b/Project.toml
@@ -1,6 +1,6 @@
 name = "LightGBM"
 uuid = "7acf609c-83a4-11e9-1ffb-b912bcd3b04a"
-version = "0.6.1"
+version = "0.6.2"
 
 [deps]
 Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"

diff --git a/README.md b/README.md
@@ -149,5 +149,4 @@ Note: `Libdl.DL_LOAD_PATH` will be first searched and used, then the system libr
 
 ## Contributors ✨
 
-The list of our Contributors can be found [here](CONTRIBUTORS.md).
-Please don't hesitate to add yourself when you contribute.
+Please don't hesitate to add yourself when you contribute to CONTRIBUTORS.md.
diff --git a/docs/src/index.md b/docs/src/index.md
@@ -149,5 +149,4 @@ Note: `Libdl.DL_LOAD_PATH` will be first searched and used, then the system libr
 
 ## Contributors ✨
 
-The list of our Contributors can be found [here](CONTRIBUTORS.md).
-Please don't hesitate to add yourself when you contribute.
+Please don't hesitate to add yourself when you contribute to CONTRIBUTORS.md.
diff --git a/src/MLJInterface.jl b/src/MLJInterface.jl
@@ -74,6 +74,7 @@ MLJModelInterface.@mlj_model mutable struct LGBMRegressor <: MLJModelInterface.D
     is_unbalance::Bool = false
     boost_from_average::Bool = true
     use_missing::Bool = true
+    linear_tree::Bool = false
     feature_pre_filter::Bool = true
 
     alpha::Float64 = 0.9::(_ > 0.0 )
@@ -159,6 +160,7 @@ MLJModelInterface.@mlj_model mutable struct LGBMClassifier <: MLJModelInterface.
     boost_from_average::Bool = true
     scale_pos_weight = 1.0
     use_missing::Bool = true
+    linear_tree::Bool = false
     feature_pre_filter::Bool = true
 
     # Metrics

diff --git a/src/estimators.jl b/src/estimators.jl
@@ -40,6 +40,7 @@ mutable struct LGBMRegression <: LGBMEstimator
     categorical_feature::Vector{Int}
     use_missing::Bool
     feature_pre_filter::Bool
+    linear_tree::Bool
 
     is_unbalance::Bool
     boost_from_average::Bool
@@ -112,6 +113,7 @@ end
         save_binary = false,
         categorical_feature = Int[],
         use_missing = true,
+        linear_tree = false,
         feature_pre_filter = true,
         is_unbalance = false,
         boost_from_average = true,
@@ -180,6 +182,7 @@ function LGBMRegression(;
     save_binary = false,
     categorical_feature = Int[],
     use_missing = true,
+    linear_tree = false,
     feature_pre_filter = true,
     is_unbalance = false,
     boost_from_average = true,
@@ -220,7 +223,7 @@ function LGBMRegression(;
         min_gain_to_split, feature_fraction, feature_fraction_bynode, feature_fraction_seed,
         bagging_fraction, bagging_freq, bagging_seed, early_stopping_round, extra_trees,
         extra_seed, max_bin, bin_construct_sample_cnt, data_random_seed, init_score,
-        is_sparse, save_binary, categorical_feature, use_missing, feature_pre_filter,
+        is_sparse, save_binary, categorical_feature, use_missing, linear_tree, feature_pre_filter,
         is_unbalance, boost_from_average, alpha, drop_rate, max_drop, skip_drop,
         xgboost_dart_mode,uniform_drop, drop_seed, top_rate, other_rate, min_data_per_group, max_cat_threshold,
         cat_l2, cat_smooth, metric, metric_freq, is_training_metric, ndcg_at, num_machines, local_listen_port, time_out,
@@ -271,6 +274,7 @@ mutable struct LGBMClassification <: LGBMEstimator
     save_binary::Bool
     categorical_feature::Vector{Int}
     use_missing::Bool
+    linear_tree::Bool
     feature_pre_filter::Bool
 
     is_unbalance::Bool
@@ -348,6 +352,7 @@ end
         save_binary = false,
         categorical_feature = Int[],
         use_missing = true,
+        linear_tree = false,
         is_unbalance = false,
         boost_from_average = true,
         scale_pos_weight = 1.0,
@@ -419,6 +424,7 @@ function LGBMClassification(;
     save_binary = false,
     categorical_feature = Int[],
     use_missing = true,
+    linear_tree = false,
     feature_pre_filter = true,
     is_unbalance = false,
     boost_from_average = true,
@@ -462,7 +468,7 @@ function LGBMClassification(;
         bagging_fraction, pos_bagging_fraction, neg_bagging_fraction,bagging_freq,
         bagging_seed, early_stopping_round, extra_trees, extra_seed, max_bin, bin_construct_sample_cnt,
         data_random_seed, init_score, is_sparse, save_binary,
-        categorical_feature, use_missing, feature_pre_filter, is_unbalance, boost_from_average, scale_pos_weight, sigmoid,
+        categorical_feature, use_missing, linear_tree, feature_pre_filter, is_unbalance, boost_from_average, scale_pos_weight, sigmoid,
         drop_rate, max_drop, skip_drop, xgboost_dart_mode,
         uniform_drop, drop_seed, top_rate, other_rate, min_data_per_group, max_cat_threshold, cat_l2, cat_smooth,
         metric, metric_freq, is_training_metric, ndcg_at, num_machines, local_listen_port, time_out,

diff --git a/test/Project.toml b/test/Project.toml
@@ -9,5 +9,9 @@ SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 
 [compat]
+# MLJBase >1.0 requires adding StatisticalMeasures and its LearnAPI dependency
+# is not compatible with julia 1.3 - 1.5
+# This restriction can be removed if LightGBM drops support for julia 1.3 - 1.5
+MLJBase = "< 1.0"
 julia = "1.0"
 MLJBase = "0.21"