deskit 1.2.7__tar.gz → 1.2.8__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {deskit-1.2.7/src/deskit.egg-info → deskit-1.2.8}/PKG-INFO +1 -1
- {deskit-1.2.7 → deskit-1.2.8}/pyproject.toml +1 -1
- {deskit-1.2.7 → deskit-1.2.8}/src/deskit/base/predictbase.py +13 -11
- {deskit-1.2.7 → deskit-1.2.8/src/deskit.egg-info}/PKG-INFO +1 -1
- {deskit-1.2.7 → deskit-1.2.8}/LICENSE +0 -0
- {deskit-1.2.7 → deskit-1.2.8}/README.md +0 -0
- {deskit-1.2.7 → deskit-1.2.8}/setup.cfg +0 -0
- {deskit-1.2.7 → deskit-1.2.8}/src/deskit/__init__.py +0 -0
- {deskit-1.2.7 → deskit-1.2.8}/src/deskit/_config.py +0 -0
- {deskit-1.2.7 → deskit-1.2.8}/src/deskit/base/__init__.py +0 -0
- {deskit-1.2.7 → deskit-1.2.8}/src/deskit/base/base.py +0 -0
- {deskit-1.2.7 → deskit-1.2.8}/src/deskit/base/knnbase.py +0 -0
- {deskit-1.2.7 → deskit-1.2.8}/src/deskit/des/__init__.py +0 -0
- {deskit-1.2.7 → deskit-1.2.8}/src/deskit/des/dewsi.py +0 -0
- {deskit-1.2.7 → deskit-1.2.8}/src/deskit/des/dewsiv.py +0 -0
- {deskit-1.2.7 → deskit-1.2.8}/src/deskit/des/dewst.py +0 -0
- {deskit-1.2.7 → deskit-1.2.8}/src/deskit/des/dewsu.py +0 -0
- {deskit-1.2.7 → deskit-1.2.8}/src/deskit/des/dewsv.py +0 -0
- {deskit-1.2.7 → deskit-1.2.8}/src/deskit/des/knorae.py +0 -0
- {deskit-1.2.7 → deskit-1.2.8}/src/deskit/des/knoraiu.py +0 -0
- {deskit-1.2.7 → deskit-1.2.8}/src/deskit/des/knorau.py +0 -0
- {deskit-1.2.7 → deskit-1.2.8}/src/deskit/des/lwsei.py +0 -0
- {deskit-1.2.7 → deskit-1.2.8}/src/deskit/des/lwseu.py +0 -0
- {deskit-1.2.7 → deskit-1.2.8}/src/deskit/des/ola.py +0 -0
- {deskit-1.2.7 → deskit-1.2.8}/src/deskit/metrics.py +0 -0
- {deskit-1.2.7 → deskit-1.2.8}/src/deskit/neighbors.py +0 -0
- {deskit-1.2.7 → deskit-1.2.8}/src/deskit/router.py +0 -0
- {deskit-1.2.7 → deskit-1.2.8}/src/deskit/utils.py +0 -0
- {deskit-1.2.7 → deskit-1.2.8}/src/deskit.egg-info/SOURCES.txt +0 -0
- {deskit-1.2.7 → deskit-1.2.8}/src/deskit.egg-info/dependency_links.txt +0 -0
- {deskit-1.2.7 → deskit-1.2.8}/src/deskit.egg-info/requires.txt +0 -0
- {deskit-1.2.7 → deskit-1.2.8}/src/deskit.egg-info/top_level.txt +0 -0
|
@@ -95,23 +95,25 @@ class PredictBase:
|
|
|
95
95
|
Batch → shape ``(n_samples,)`` or ``(n_samples, n_classes)``.
|
|
96
96
|
"""
|
|
97
97
|
x, batch_size = _prepare(X_test)
|
|
98
|
-
weights = self._weights_batch(x, temperature=temperature, **kwargs)
|
|
98
|
+
weights = self._weights_batch(x, temperature=temperature, **kwargs)
|
|
99
99
|
|
|
100
100
|
preds_list = [np.asarray(test_preds[m], dtype=float) for m in self.models]
|
|
101
101
|
first = preds_list[0]
|
|
102
102
|
|
|
103
103
|
if self.task == 'classification':
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
104
|
+
if first.ndim == 1:
|
|
105
|
+
# Hard labels: convert to one-hot internally
|
|
106
|
+
n_classes = len(self.classes_)
|
|
107
|
+
preds_2d = np.stack(preds_list, axis=1) # (batch, n_models)
|
|
108
|
+
preds_3d = np.eye(n_classes)[preds_2d.astype(int)] # (batch, n_models, n_classes)
|
|
109
|
+
else:
|
|
110
|
+
preds_3d = np.stack(preds_list, axis=1) # (batch, n_models, n_classes)
|
|
111
|
+
result = np.einsum("bm,bmc->bc", weights, preds_3d) # (batch, n_classes)
|
|
112
|
+
if first.ndim == 1:
|
|
113
|
+
result = np.argmax(result, axis=1) # (batch,)
|
|
111
114
|
else:
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
result = (weights * preds_2d).sum(axis=1) # (batch,)
|
|
115
|
+
preds_2d = np.stack(preds_list, axis=1)
|
|
116
|
+
result = (weights * preds_2d).sum(axis=1)
|
|
115
117
|
|
|
116
118
|
return result[0] if batch_size == 1 else result
|
|
117
119
|
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|