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
13 changes: 10 additions & 3 deletions skl2onnx/operator_converters/ada_boost.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# SPDX-License-Identifier: Apache-2.0

import packaging.version as pv
import numpy as np
from onnx.helper import make_tensor
from sklearn import __version__
Expand Down Expand Up @@ -32,6 +31,8 @@


def _scikit_learn_before_any(any_version: str) -> bool:
import packaging.version as pv

if ".dev" in __version__:
return pv.Version(__version__.split(".dev")[0]) < pv.Version(any_version)
if ".post" in __version__:
Expand All @@ -40,11 +41,17 @@ def _scikit_learn_before_any(any_version: str) -> bool:


def _scikit_learn_before_022() -> bool:
return _scikit_learn_before_any("0.22")
return __version__[0] == "0"


def _scikit_learn_before_131():
return _scikit_learn_before_any("1.3.1")
try:
return _scikit_learn_before_any("1.3.1")
except ImportError:
# introduced in 1.3.0
import sklearn.cluster

return not hasattr(sklearn.cluster, "HDBSCAN")


def _samme_proba(
Expand Down
11 changes: 9 additions & 2 deletions skl2onnx/operator_converters/cross_decomposition.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,16 @@

def _skl150() -> bool:
import sklearn
import packaging.version as pv

return pv.Version(sklearn.__version__) >= pv.Version("1.5.0")
try:
import packaging.version as pv

return pv.Version(sklearn.__version__) >= pv.Version("1.5.0")
except ImportError:
# function introduced in 1.5.0
import sklearn.metrics

return hasattr(sklearn.metrics, "d2_log_loss_score")


def convert_pls_regression(
Expand Down
Loading