maxframe 1.3.1__cp38-cp38-macosx_10_9_universal2.whl → 2.0.0__cp38-cp38-macosx_10_9_universal2.whl

maxframe/learn/contrib/models.py

@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from typing import Type
+
 from ... import opcodes
 from ...core import ENTITY_TYPE, OutputType
 from ...core.operator import ObjectOperator, ObjectOperatorMixin
@@ -21,7 +23,30 @@ from ...serialization.serializables import (
     FunctionField,
     TupleField,
 )
+from ...udf import BuiltinFunction
 from ...utils import find_objects, replace_objects
+from ..core import Model, ModelData
+
+
+class ModelWithEvalData(ModelData):
+    __slots__ = ("_evals_result",)
+
+    _evals_result: dict
+
+    def __init__(self, *args, evals_result=None, **kwargs):
+        super().__init__(*args, **kwargs)
+        self._evals_result = evals_result if evals_result is not None else dict()
+
+    def execute(self, session=None, **kw):
+        # The evals_result should be fetched when BoosterData.execute() is called.
+        result = super().execute(session=session, **kw)
+        if self.op.has_evals_result and self.key == self.op.outputs[0].key:
+            self._evals_result.update(self.op.outputs[1].fetch(session=session))
+        return result
+
+
+class ModelWithEval(Model):
+    pass
 
 
 class ModelDataSource(ObjectOperator, ObjectOperatorMixin):
@@ -29,7 +54,7 @@ class ModelDataSource(ObjectOperator, ObjectOperatorMixin):
 
     data = AnyField("data")
 
-    def __call__(self, model_cls):
+    def __call__(self, model_cls: Type[ModelWithEval]):
         self._output_types = [OutputType.object]
         return self.new_tileable(None, object_class=model_cls)
 
@@ -48,14 +73,18 @@ class ModelApplyChunk(ObjectOperator, ObjectOperatorMixin):
         self._output_types = list(output_types)
         super().__init__(**kwargs)
 
-    def _set_inputs(self, inputs):
-        super()._set_inputs(inputs)
-        old_inputs = find_objects(self.args, ENTITY_TYPE) + find_objects(
-            self.kwargs, ENTITY_TYPE
+    def has_custom_code(self) -> bool:
+        return not isinstance(self.func, BuiltinFunction)
+
+    @classmethod
+    def _set_inputs(cls, op: "ModelApplyChunk", inputs):
+        super()._set_inputs(op, inputs)
+        old_inputs = find_objects(op.args, ENTITY_TYPE) + find_objects(
+            op.kwargs, ENTITY_TYPE
         )
-        mapping = {o: n for o, n in zip(old_inputs, self._inputs[1:])}
-        self.args = replace_objects(self.args, mapping)
-        self.kwargs = replace_objects(self.kwargs, mapping)
+        mapping = {o: n for o, n in zip(old_inputs, op._inputs[1:])}
+        op.args = replace_objects(op.args, mapping)
+        op.kwargs = replace_objects(op.kwargs, mapping)
 
     @property
     def output_limit(self) -> int:
@@ -72,6 +101,6 @@ class ModelApplyChunk(ObjectOperator, ObjectOperatorMixin):
         return self.new_tileables(inputs, kws=output_kws)
 
 
-def to_remote_model(model, model_cls):
+def to_remote_model(model, model_cls: Type[ModelWithEval]) -> ModelWithEval:
     op = ModelDataSource(data=model)
     return op(model_cls)

maxframe/learn/contrib/utils.py

@@ -14,6 +14,8 @@
 
 import sys
 
+from ...serialization.serializables import Serializable
+
 
 def make_import_error_func(package_name):
     def _func(*_, **__):  # pragma: no cover
@@ -51,3 +53,56 @@ def config_mod_getattr(mod_dict, globals_):
             "__warningregistry__": dict(),
         }
     )
+
+
+class TrainingCallback(Serializable):
+    _local_cls = None
+
+    @classmethod
+    def _load_local_to_remote_mapping(cls, globals_dict):
+        if cls._local_to_remote:
+            return
+        for v in globals_dict.values():
+            if isinstance(v, type) and issubclass(v, cls) and v._local_cls is not None:
+                cls._local_to_remote[v._local_cls] = v
+
+    @classmethod
+    def from_local(cls, callback_obj):
+        if isinstance(callback_obj, (list, tuple)):
+            return [cls.from_local(x) for x in callback_obj]
+        if not type(callback_obj) in cls._local_to_remote:
+            return callback_obj
+
+        kw = {}
+        remote_cls = cls._local_to_remote[type(callback_obj)]
+        for attr in remote_cls._FIELDS:
+            try:
+                kw[attr] = getattr(callback_obj, attr)
+            except AttributeError:
+                pass
+        return remote_cls(**kw)
+
+    def has_custom_code(self) -> bool:
+        return False
+
+    @classmethod
+    def remote_to_local(cls, remote_obj):
+        if isinstance(remote_obj, (list, tuple)):
+            return [cls.remote_to_local(x) for x in remote_obj]
+        if not isinstance(remote_obj, TrainingCallback):
+            return remote_obj
+        return remote_obj.to_local()
+
+    def _extract_kw(self) -> dict:
+        kw = {}
+        for attr in type(self)._FIELDS:
+            val = getattr(self, attr, None)
+            if val is not None:
+                kw[attr] = val
+        return kw
+
+    def to_local(self):
+        return type(self)._local_cls(**self._extract_kw())
+
+    def __call__(self, *args, **kwargs):
+        return self.to_local()(*args, **kwargs)

maxframe/learn/contrib/xgboost/callback.py

@@ -0,0 +1,86 @@
+# Copyright 1999-2025 Alibaba Group Holding Ltd.
+#
+# Licensed 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.
+
+from typing import Callable, Optional, Sequence, Union
+
+from ....serialization.serializables import (
+    AnyField,
+    BoolField,
+    Float32Field,
+    Int32Field,
+    StringField,
+)
+from ....udf import BuiltinFunction
+from ..utils import TrainingCallback
+
+try:
+    from xgboost.callback import EarlyStopping as _EarlyStopping
+    from xgboost.callback import LearningRateScheduler as _LearningRateScheduler
+except ImportError:
+    _LearningRateScheduler = _EarlyStopping = None
+
+
+class XGBTrainingCallback(TrainingCallback):
+    _local_to_remote = {}
+
+    @classmethod
+    def from_local(cls, callback_obj):
+        cls._load_local_to_remote_mapping(globals())
+        return super().from_local(callback_obj)
+
+
+class LearningRateScheduler(XGBTrainingCallback):
+    _local_cls = _LearningRateScheduler
+
+    learning_rates = AnyField("learning_rates", default=None)
+
+    def __init__(
+        self, learning_rates: Union[Callable[[int], float], Sequence[float]], **kw
+    ) -> None:
+        super().__init__(learning_rates=learning_rates, **kw)
+
+    def has_custom_code(self) -> bool:
+        return not isinstance(self.learning_rates, (tuple, list, BuiltinFunction))
+
+
+class EarlyStopping(XGBTrainingCallback):
+    _local_cls = _EarlyStopping
+
+    rounds = Int32Field("rounds")
+    metric_name = StringField("metric_name", default=None)
+    data_name = StringField("data_name", default=None)
+    maximize = BoolField("maximize", default=None)
+    save_best = BoolField("save_best", default=None)
+    min_delta = Float32Field("min_delta", default=None)
+
+    def __init__(
+        self,
+        *,
+        rounds: int,
+        metric_name: Optional[str] = None,
+        data_name: Optional[str] = None,
+        maximize: Optional[bool] = None,
+        save_best: Optional[bool] = False,
+        min_delta: float = 0.0,
+        **kw
+    ) -> None:
+        super().__init__(
+            rounds=rounds,
+            metric_name=metric_name,
+            data_name=data_name,
+            maximize=maximize,
+            save_best=save_best,
+            min_delta=min_delta,
+            **kw
+        )

maxframe/learn/contrib/xgboost/classifier.py

@@ -26,9 +26,7 @@ if not xgboost:
 else:
     from xgboost.sklearn import XGBClassifierBase
 
-    from .core import wrap_evaluation_matrices
     from .predict import predict
-    from .train import train
 
     class XGBClassifier(XGBScikitLearnBase, XGBClassifierBase):
         """
@@ -43,6 +41,15 @@ else:
             super().__init__(**kwargs)
             self._set_model(xgb_model)
 
+        def get_xgb_params(self):
+            params = super().get_xgb_params()
+            if self.n_classes_ > 2:
+                params["objective"] = "multi:softprob"
+                params["num_class"] = self.n_classes_
+            else:
+                params["objective"] = "binary:logistic"
+            return params
+
         def fit(
             self,
             X,
@@ -50,43 +57,32 @@ else:
             sample_weight=None,
             base_margin=None,
             eval_set=None,
+            xgb_model=None,
             sample_weight_eval_set=None,
             base_margin_eval_set=None,
             num_class=None,
             **kw,
         ):
             session = kw.pop("session", None)
-            run_kwargs = kw.pop("run_kwargs", None) or dict()
-            dtrain, evals = wrap_evaluation_matrices(
-                None,
+            run_kwargs = kw.pop("run_kwargs", dict())
+
+            if num_class is not None:
+                self.n_classes_ = num_class
+            else:
+                t_labels = mt.unique(y).execute(session=session, **run_kwargs)
+                self.n_classes_ = t_labels.shape[0]
+
+            super().fit(
                 X,
                 y,
-                sample_weight,
-                base_margin,
-                eval_set,
-                sample_weight_eval_set,
-                base_margin_eval_set,
-            )
-            params = self.get_xgb_params()
-            self._n_features_in = X.shape[1]
-            self.n_classes_ = num_class or 1
-            if self.n_classes_ > 2:
-                params["objective"] = "multi:softprob"
-                params["num_class"] = self.n_classes_
-            else:
-                params["objective"] = "binary:logistic"
-            self.evals_result_ = dict()
-            result = train(
-                params,
-                dtrain,
-                num_boost_round=self.get_num_boosting_rounds(),
-                evals=evals,
-                evals_result=self.evals_result_,
-                num_class=num_class,
-                session=session,
-                run_kwargs=run_kwargs,
+                sample_weight=sample_weight,
+                base_margin=base_margin,
+                eval_set=eval_set,
+                xgb_model=xgb_model,
+                sample_weight_eval_set=sample_weight_eval_set,
+                base_margin_eval_set=base_margin_eval_set,
+                **kw,
             )
-            self._Booster = result
             return self
 
         def predict(self, data, **kw):

maxframe/learn/contrib/xgboost/core.py

@@ -19,26 +19,19 @@ from typing import Any, Callable, Dict, List, Optional, Tuple, Union
 
 import numpy as np
 
+from ....errors import TileableNotExecutedError
+
 try:
     import xgboost
 except ImportError:
     xgboost = None
 
 from ....core import OutputType
-from ...core import Model, ModelData
-from ..models import ModelApplyChunk, to_remote_model
+from ..models import ModelApplyChunk, ModelWithEval, ModelWithEvalData, to_remote_model
 from .dmatrix import DMatrix
 
 
-class BoosterData(ModelData):
-    __slots__ = ("_evals_result",)
-
-    _evals_result: Dict
-
-    def __init__(self, *args, evals_result=None, **kwargs):
-        super().__init__(*args, **kwargs)
-        self._evals_result = evals_result if evals_result is not None else dict()
-
+class BoosterData(ModelWithEvalData):
     @staticmethod
     def _get_booster_score(bst, fmap=None, importance_type="weight"):
         if not fmap:
@@ -66,13 +59,6 @@ class BoosterData(ModelData):
                 fmap_data = fmap_file.read()
         return op(self, [{}], fmap=fmap_data, importance_type=importance_type)[0]
 
-    def execute(self, session=None, **kw):
-        # The evals_result should be fetched when BoosterData.execute() is called.
-        result = super().execute(session=session, **kw)
-        if self.op.has_evals_result and self.key == self.op.outputs[0].key:
-            self._evals_result.update(self.op.outputs[1].fetch(session=session))
-        return result
-
     def predict(
         self,
         data,
@@ -103,7 +89,7 @@ class BoosterData(ModelData):
         )
 
 
-class Booster(Model):
+class Booster(ModelWithEval):
     pass
 
 
@@ -137,39 +123,65 @@ else:
             return names
 
         def __repr__(self):
-            local_model = self.fetch()
-            return repr(local_model)
+            try:
+                local_model = self.fetch()
+                return repr(local_model)
+            except TileableNotExecutedError:
+                return f"<{type(self).__name__} unexecuted>"
 
         def fit(
             self,
             X,
             y,
-            sample_weights=None,
+            sample_weight=None,
+            base_margin=None,
             eval_set=None,
+            xgb_model=None,
             sample_weight_eval_set=None,
+            base_margin_eval_set=None,
             **kw,
         ):
-            """
-            Fit the regressor. Note that fit() is an eager-execution
-            API. The call will be blocked until training finished.
+            from .train import train
 
-            Parameters
-            ----------
-            X : array_like
-                Feature matrix
-            y : array_like
-                Labels
-            sample_weight : array_like
-                instance weights
-            eval_set : list, optional
-                A list of (X, y) tuple pairs to use as validation sets, for which
-                metrics will be computed.
-                Validation metrics will help us track the performance of the model.
-            sample_weight_eval_set : list, optional
-                A list of the form [L_1, L_2, ..., L_n], where each L_i is a list
-                of group weights on the i-th validation set.
-            """
-            raise NotImplementedError
+            session = kw.pop("session", None)
+            run_kwargs = kw.pop("run_kwargs", dict())
+
+            self._n_features_in = X.shape[1]
+
+            dtrain, evals = wrap_evaluation_matrices(
+                None,
+                X,
+                y,
+                sample_weight,
+                base_margin,
+                eval_set,
+                sample_weight_eval_set,
+                base_margin_eval_set,
+            )
+            params = self.get_xgb_params()
+            if not params.get("objective"):
+                params["objective"] = "reg:squarederror"
+            self.evals_result_ = dict()
+            train_kw = {}
+            train_kw.update(kw)
+
+            if getattr(self, "n_classes_", None):
+                train_kw["num_class"] = self.n_classes_
+
+            result = train(
+                params,
+                dtrain,
+                num_boost_round=self.get_num_boosting_rounds(),
+                evals=evals,
+                evals_result=self.evals_result_,
+                xgb_model=xgb_model,
+                callbacks=self.callbacks,
+                session=session,
+                run_kwargs=run_kwargs,
+                **train_kw,
+            )
+            self._Booster = result
+            return self
 
         def predict(self, data, **kw):
             """

maxframe/learn/contrib/xgboost/dmatrix.py

@@ -12,14 +12,16 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from typing import List
 
 from .... import opcodes
+from ....core import EntityData
 from ....core.entity.output_types import get_output_types
 from ....core.operator.base import Operator
 from ....core.operator.core import TileableOperatorMixin
 from ....dataframe.core import DATAFRAME_TYPE
-from ....serialization.serializables import Float64Field, KeyField, ListField
-from ....serialization.serializables.field import AnyField, BoolField, Int64Field
+from ....serialization.serializables import BoolField, Float64Field, KeyField, ListField
+from ....serialization.serializables.field import AnyField, Int64Field
 from ....tensor import tensor as astensor
 from ....tensor.core import TENSOR_TYPE
 from ....typing_ import TileableType
@@ -42,24 +44,29 @@ class ToDMatrix(Operator, TileableOperatorMixin):
     qid = AnyField("qid", default=None)
     label_lower_bound = AnyField("label_lower_bound", default=None)
     label_upper_bound = AnyField("label_upper_bound", default=None)
+    # if to collocate the data, label and weight
+    collocate = BoolField("collocate", default=False)
     enable_categorical = BoolField("enable_categorical", default=None)
 
     @property
     def output_limit(self):
+        if self.collocate:
+            return 1 + sum(bool(x) for x in [self.label, self.weight, self.base_margin])
         return 1
 
-    def _set_inputs(self, inputs):
-        super()._set_inputs(inputs)
-        if self.data is not None:
-            self.data = self._inputs[0]
-        has_label = self.label is not None
+    @classmethod
+    def _set_inputs(cls, op: "ToDMatrix", inputs: List[EntityData]):
+        super()._set_inputs(op, inputs)
+        if op.data is not None:
+            op.data = op._inputs[0]
+        has_label = op.label is not None
         if has_label:
-            self.label = self._inputs[1]
-        if self.weight is not None:
+            op.label = op._inputs[1]
+        if op.weight is not None:
             i = 1 if not has_label else 2
-            self.weight = self._inputs[i]
-        if self.base_margin is not None:
-            self.base_margin = self._inputs[-1]
+            op.weight = op._inputs[i]
+        if op.base_margin is not None:
+            op.base_margin = op._inputs[-1]
 
     @staticmethod
     def _get_kw(obj):

maxframe/learn/contrib/xgboost/predict.py

@@ -12,10 +12,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from typing import List
 
 import numpy as np
 
 from .... import opcodes
+from ....core import EntityData
 from ....core.entity.output_types import OutputType
 from ....core.operator.base import Operator
 from ....core.operator.core import TileableOperatorMixin
@@ -45,21 +47,24 @@ class XGBPredict(Operator, TileableOperatorMixin):
     training = BoolField("training", default=False)
     iteration_range = TupleField("iteration_range", default_factory=lambda x: (0, 0))
     strict_shape = BoolField("strict_shape", default=False)
-    flag = BoolField("flag", default=False)
 
     def __init__(self, output_types=None, gpu=None, **kw):
         super().__init__(_output_types=output_types, gpu=gpu, **kw)
 
-    def _set_inputs(self, inputs):
-        super()._set_inputs(inputs)
-        self.data = self._inputs[0]
-        self.model = self._inputs[1]
+    def has_custom_code(self) -> bool:
+        return True
+
+    @classmethod
+    def _set_inputs(cls, op: "XGBPredict", inputs: List[EntityData]):
+        super()._set_inputs(op, inputs)
+        op.data = op._inputs[0]
+        op.model = op._inputs[1]
 
     def __call__(self):
         num_class = getattr(self.model.op, "num_class", None)
         if num_class is not None:
             num_class = int(num_class)
-        if num_class is not None:
+        if num_class is not None and num_class > 2:
             shape = (self.data.shape[0], num_class)
         else:
             shape = (self.data.shape[0],)
@@ -84,7 +89,7 @@ def predict(
     training=False,
     iteration_range=None,
     strict_shape=False,
-    flag=False,
+    **kwargs,
 ):
     """
     Using MaxFrame XGBoost model to predict data.
@@ -100,7 +105,9 @@ def predict(
     import xgboost
 
     data = check_data(data)
-    if isinstance(model, xgboost.Booster):
+    if not isinstance(model, (Booster, BoosterData, xgboost.Booster)):
+        raise TypeError(f"model has to be a xgboost.Booster, got {type(model)} instead")
+    elif isinstance(model, xgboost.Booster):
         model = to_remote_model(model, model_cls=Booster)
 
     output_types = [OutputType.tensor]
@@ -120,5 +127,5 @@ def predict(
         strict_shape=strict_shape,
         gpu=data.op.gpu,
         output_types=output_types,
-        flag=flag,
+        **kwargs,
     )()

maxframe/learn/contrib/xgboost/regressor.py

@@ -22,9 +22,7 @@ if not xgboost:
 else:
     from xgboost.sklearn import XGBRegressorBase
 
-    from .core import wrap_evaluation_matrices
     from .predict import predict
-    from .train import train
 
     class XGBRegressor(XGBScikitLearnBase, XGBRegressorBase):
         """
@@ -46,39 +44,42 @@ else:
             sample_weight=None,
             base_margin=None,
             eval_set=None,
+            xgb_model=None,
             sample_weight_eval_set=None,
             base_margin_eval_set=None,
             **kw,
         ):
-            session = kw.pop("session", None)
-            run_kwargs = kw.pop("run_kwargs", dict())
+            """
+            Fit the regressor. Note that fit() is an eager-execution
+            API. The call will be blocked until training finished.
 
-            self._n_features_in = X.shape[1]
-
-            dtrain, evals = wrap_evaluation_matrices(
-                None,
+            Parameters
+            ----------
+            X : array_like
+                Feature matrix
+            y : array_like
+                Labels
+            sample_weight : array_like
+                instance weights
+            eval_set : list, optional
+                A list of (X, y) tuple pairs to use as validation sets, for which
+                metrics will be computed.
+                Validation metrics will help us track the performance of the model.
+            sample_weight_eval_set : list, optional
+                A list of the form [L_1, L_2, ..., L_n], where each L_i is a list
+                of group weights on the i-th validation set.
+            """
+            super().fit(
                 X,
                 y,
-                sample_weight,
-                base_margin,
-                eval_set,
-                sample_weight_eval_set,
-                base_margin_eval_set,
-            )
-            params = self.get_xgb_params()
-            if not params.get("objective"):
-                params["objective"] = "reg:squarederror"
-            self.evals_result_ = dict()
-            result = train(
-                params,
-                dtrain,
-                num_boost_round=self.get_num_boosting_rounds(),
-                evals=evals,
-                evals_result=self.evals_result_,
-                session=session,
-                run_kwargs=run_kwargs,
+                sample_weight=sample_weight,
+                base_margin=base_margin,
+                eval_set=eval_set,
+                xgb_model=xgb_model,
+                sample_weight_eval_set=sample_weight_eval_set,
+                base_margin_eval_set=base_margin_eval_set,
+                **kw,
             )
-            self._Booster = result
             return self
 
         def predict(self, data, **kw):