[fix] Pull upstream and fix the incompatible codes

Preparation before merging to the refactor_development.

Author: nabenabe0928

autoPyTorch/datasets/base_dataset.py

@@ -1,5 +1,5 @@
 from abc import ABCMeta
-from typing import Any, Dict, List, Optional, Sequence, Tuple, Union, cast
+from typing import Any, Dict, List, Optional, Sequence, Tuple, Union, cast, Callable
 
 import numpy as np
 
@@ -22,6 +22,7 @@
 from autoPyTorch.utils.common import FitRequirement, hash_array_or_matrix
 
 BaseDatasetType = Union[Tuple[np.ndarray, np.ndarray], Dataset]
+SplitFunc = Callable[[Union[int, float], np.ndarray, Any], List[Tuple[np.ndarray, np.ndarray]]]
 
 
 def check_valid_data(data: Any) -> None:

autoPyTorch/datasets/resampling_strategy.py

@@ -16,6 +16,9 @@
 from typing_extensions import Protocol
 
 
+SplitFunc = Callable[[Union[int, float], np.ndarray, Any], List[Tuple[np.ndarray, np.ndarray]]]
+
+
 # Use callback protocol as workaround, since callable with function fields count 'self' as argument
 class CrossValFunc(Protocol):
     """TODO: This class is not required anymore, because CrossValTypes class does not require get_validators()"""
@@ -150,6 +153,11 @@ def get_validators(*choices: CrossValFunc):
         """TODO: to be compatible, it is here now, but will be deprecated soon."""
         return {choice.name: choice.value for choice in choices}
 
+    def is_stratified(self) -> bool:
+        stratified = [self.stratified_k_fold_cross_validation,
+                      self.stratified_shuffle_split_cross_validation]
+        return getattr(self, self.name) in stratified
+
 
 class HoldoutValTypes(Enum):
     """The type of hold out validation (refer to CrossValTypes' doc-string)"""