Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
28 changes: 4 additions & 24 deletions Project.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "MLJ"
uuid = "add582a8-e3ab-11e8-2d5e-e98b27df1bc7"
authors = ["Anthony D. Blaom <[email protected]>"]
version = "0.21.0"
version = "0.22.0"

[deps]
CategoricalArrays = "324d7699-5711-5eae-9e2f-1d82baa6b597"
Expand Down Expand Up @@ -30,7 +30,7 @@ StatsBase = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91"
Tables = "bd369af6-aec1-5ad0-b16a-f7cc5008161c"

[compat]
CategoricalArrays = "0.8,0.9, 0.10"
CategoricalArrays = "1"
ComputationalResources = "0.3"
Distributions = "0.21,0.22,0.23, 0.24, 0.25"
FeatureSelection = "0.2"
Expand All @@ -49,48 +49,28 @@ ProgressMeter = "1.1"
Random = "<0.0.1, 1"
Reexport = "1.2"
ScientificTypes = "3"
StatisticalMeasures = "0.2"
StatisticalMeasures = "0.3"
Statistics = "<0.0.1, 1"
StatsBase = "0.32,0.33, 0.34"
Tables = "0.2,1.0"
julia = "1.6"

[extras]
BetaML = "024491cd-cc6b-443e-8034-08ea7eb7db2b"
CatBoost = "e2e10f9a-a85d-4fa9-b6b2-639a32100a12"
EvoLinear = "ab853011-1780-437f-b4b5-5de6f4777246"
EvoTrees = "f6006082-12f8-11e9-0c9c-0d5d367ab1e5"
Imbalance = "c709b415-507b-45b7-9a3d-1767c89fde68"
InteractiveUtils = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
LaplaceRedux = "c52c1a26-f7c5-402b-80be-ba1e638ad478"
LightGBM = "7acf609c-83a4-11e9-1ffb-b912bcd3b04a"
MLJClusteringInterface = "d354fa79-ed1c-40d4-88ef-b8c7bd1568af"
MLJDecisionTreeInterface = "c6f25543-311c-4c74-83dc-3ea6d1015661"
MLJFlux = "094fc8d1-fd35-5302-93ea-dabda2abf845"
MLJGLMInterface = "caf8df21-4939-456d-ac9c-5fefbfb04c0c"
MLJLIBSVMInterface = "61c7150f-6c77-4bb1-949c-13197eac2a52"
MLJLinearModels = "6ee0df7b-362f-4a72-a706-9e79364fb692"
MLJMultivariateStatsInterface = "1b6a4a23-ba22-4f51-9698-8599985d3728"
MLJNaiveBayesInterface = "33e4bacb-b9e2-458e-9a13-5d9a90b235fa"
MLJScikitLearnInterface = "5ae90465-5518-4432-b9d2-8a1def2f0cab"
MLJTSVDInterface = "7fa162e1-0e29-41ca-a6fa-c000ca4e7e7e"
MLJTestIntegration = "697918b4-fdc1-4f9e-8ff9-929724cee270"
MLJTestInterface = "72560011-54dd-4dc2-94f3-c5de45b75ecd"
MLJText = "5e27fcf9-6bac-46ba-8580-b5712f3d6387"
MLJXGBoostInterface = "54119dfa-1dab-4055-a167-80440f4f7a91"
Markdown = "d6f4376e-aef5-505a-96c1-9c027394607a"
Maxnet = "81f79f80-22f2-4e41-ab86-00c11cf0f26f"
NearestNeighborModels = "636a865e-7cf4-491e-846c-de09b730eb36"
OneRule = "90484964-6d6a-4979-af09-8657dbed84ff"
OutlierDetectionNeighbors = "51249a0a-cb36-4849-8e04-30c7f8d311bb"
OutlierDetectionPython = "2449c660-d36c-460e-a68b-92ab3c865b3e"
ParallelKMeans = "42b8e9d4-006b-409a-8472-7f34b3fb58af"
PartitionedLS = "19f41c5e-8610-11e9-2f2a-0d67e7c5027f"
SIRUS = "cdeec39e-fb35-4959-aadb-a1dd5dede958"
SelfOrganizingMaps = "ba4b7379-301a-4be0-bee6-171e4e152787"
StableRNGs = "860ef19b-820b-49d6-a774-d7a799459cd3"
Suppressor = "fd094767-a336-5f1f-9728-57cf17d0bbfb"
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

[targets]
test = ["BetaML", "CatBoost", "EvoLinear", "EvoTrees", "Imbalance", "InteractiveUtils", "LightGBM", "LaplaceRedux", "Maxnet", "MLJClusteringInterface", "MLJDecisionTreeInterface", "MLJFlux", "MLJGLMInterface", "MLJLIBSVMInterface", "MLJLinearModels", "MLJMultivariateStatsInterface", "MLJNaiveBayesInterface", "MLJScikitLearnInterface", "MLJTSVDInterface", "MLJTestInterface", "MLJTestIntegration", "MLJText", "MLJXGBoostInterface", "Markdown", "NearestNeighborModels", "OneRule", "OutlierDetectionNeighbors", "OutlierDetectionPython", "ParallelKMeans", "PartitionedLS", "SelfOrganizingMaps", "SIRUS", "StableRNGs", "Suppressor", "Test"]
test = ["EvoTrees", "InteractiveUtils", "MLJClusteringInterface", "MLJDecisionTreeInterface", "MLJFlux", "MLJGLMInterface", "MLJLinearModels", "MLJMultivariateStatsInterface", "MLJTestInterface", "MLJTestIntegration", "Markdown", "NearestNeighborModels", "StableRNGs", "Suppressor", "Test"]
51 changes: 7 additions & 44 deletions test/integration.jl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using MLJTestIntegration, MLJModels, MLJ, Test, Markdown
using MLJTestIntegration, MLJModels, MLJ, Test, Markdown
import MLJTestIntegration as MTI
import Pkg.TOML as TOML
using Suppressor
Expand Down Expand Up @@ -29,46 +29,7 @@ FILTER_GIVEN_ISSUE = Dict(
"https://github.com/JuliaAI/MLJ.jl/issues/1085" =>
model ->
(model.name == "AdaBoostStumpClassifier" &&
model.package_name == "DecisionTree") ||
(model.name == "COFDetector" &&
model.package_name == "OutlierDetectionNeighbors") ||
(model.name == "TSVDTransformer" &&
model.package_name == "TSVD"),
"https://github.com/sylvaticus/BetaML.jl/issues/65" =>
model -> model.name in ["KMeans", "KMedoids"] &&
model.package_name == "BetaML",
"https://github.com/JuliaAI/MLJ.jl/issues/1074" =>
model -> model.name == "AutoEncoderMLJ",
"https://github.com/rikhuijzer/SIRUS.jl/issues/78" =>
model -> model.package_name == "SIRUS",
"MLJScikitLearnInterface - multiple issues, WIP" =>
model -> model.package_name == "MLJScikitLearnInterface" &&
model.name in [
"MultiTaskElasticNetCVRegressor",
"MultiTaskElasticNetRegressor",
"MultiTaskLassoCVRegressor",
"MultiTaskLassoRegressor",
],
"https://github.com/sylvaticus/BetaML.jl/issues/75" =>
model -> model.package_name == "BetaML" &&
model.name == "NeuralNetworkClassifier",
"https://github.com/sylvaticus/BetaML.jl/issues/80" =>
model -> model.package_name == "BetaML" &&
model.name in ["PegasosClassifier", "PerceptronClassifier"],
"https://github.com/sylvaticus/BetaML.jl/issues/81" =>
model -> model.package_name == "BetaML" &&
model.name in ["RandomForestClassifier", "RandomForestRegressor"],
"https://github.com/JuliaAI/MLJTransforms.jl/issues/42" =>
model -> model.package_name == "MLJTransforms" &&
model.name in [
"CardinalityReducer",
"ContrastEncoder",
"FrequencyEncoder",
"MissingnessEncoder",
"OrdinalEncoder",
],
# "https://github.com/JuliaAI/Imbalance.jl/issues/103" =>
# model -> model.package_name == "Imbalance",
model.package_name == "DecisionTree")
)


Expand Down Expand Up @@ -262,9 +223,11 @@ for (model_set, level) in [
end
end

isempty(missing_pkgs) || @warn "Integration tests for the following packages in the "*
"model registry were omitted, as they do not have an entry in the [extras] "*
"section of the MLJ Project.toml file: "*join(missing_pkgs, ", ")
isempty(missing_pkgs) || @info "\nIntegration tests are only carried out for some core "*
"packages. To be included in tests, a package must have an entry in the "*
"[extras] "*
"section of the MLJ Project.toml file. The following packages with MLJ-registered "*
"model are not in that list:\n"*join(missing_pkgs, "\n")
okay = isempty(problems)
okay || @error "Integration tests failed for these models: \n $problems"

Expand Down