Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: update miniconda version to latest stable #440

Merged
merged 21 commits into from
May 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
9373339
FIX: Put lower threshold for difference
LacombeLouis Apr 18, 2024
494ac0a
Update decimal number for test_calibration.py
LacombeLouis Apr 18, 2024
ab2039e
FIX: linting
LacombeLouis Apr 19, 2024
e084500
ADD: decimal precision and type fix
LacombeLouis Apr 19, 2024
0228014
FIX: remove test due to changes in version 1.4.2 of _sigmoidcalibration
LacombeLouis Apr 19, 2024
8d21b0a
Update python version to 3.10 for macOS in test.yml
LacombeLouis Apr 19, 2024
a1245da
Merge branch '432-issue-with-mapie-dev-environment' of https://github…
LacombeLouis Apr 19, 2024
c81974f
FIX: do not change python version
LacombeLouis Apr 19, 2024
f2db5ee
TRY Code changes without any impact to make a PR
BaptisteCalot Apr 12, 2024
40b41c2
TRY Code changes without any impact to make a PR
BaptisteCalot Apr 12, 2024
6d71abb
TRY Code changes without any impact to make a PR
BaptisteCalot Apr 12, 2024
1e2273e
Update joblib dependency to version 1.3.2
LacombeLouis Apr 15, 2024
510d230
Update joblib dependency to version 1.3.2
LacombeLouis Apr 18, 2024
0b11f68
FIX: possibe fix for issue with joblib and python version
LacombeLouis Apr 19, 2024
cd566dc
FIX: make no changes
LacombeLouis Apr 19, 2024
7b5b30c
FIX: make no changes to original file
LacombeLouis Apr 19, 2024
0727a27
chore: update miniconda version to latest stable
LacombeLouis May 3, 2024
2e18a9f
Merge branch '432-issue-with-mapie-dev-environment' into 439-specifyi…
LacombeLouis May 6, 2024
08ea5a9
chore: Update joblib dependency to version 1.3.2
LacombeLouis May 6, 2024
2744d2f
Merge branch '432-issue-with-mapie-dev-environment' into 439-specifyi…
LacombeLouis May 6, 2024
c666194
ADD history: conda versioning and reduce precision for test in MapieC…
LacombeLouis May 6, 2024
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
1 change: 1 addition & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ jobs:
python-version: ${{ matrix.python-version }}
environment-file: environment.ci.yml
channels: defaults, conda-forge
miniconda-version: "latest"
- name: Install numpy
run: conda install numpy=${{ matrix.numpy-version }}
- name: Check linting
Expand Down
8 changes: 7 additions & 1 deletion HISTORY.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@
History
=======

0.8.3 (2024-**-**)
------------------

* Fix conda versionning.
* Reduce precision for test in `MapieCalibrator`.

0.8.3 (2024-03-01)
------------------

Expand All @@ -13,7 +19,7 @@ History
0.8.2 (2024-01-11)
------------------

* * Resolve issue still present in 0.8.1 by updating pandas.
* Resolve issue still present in 0.8.1 by updating pandas.

0.8.1 (2024-01-11)
------------------
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@
print(
"Coverage / prediction interval width mean for MapieTimeSeriesRegressor: "
"\nEnbPI without any partial_fit:"
f"{coverage_npfit_enbpi :.3f}, {width_npfit_enbpi:.3f}"
f"{coverage_npfit_enbpi:.3f}, {width_npfit_enbpi:.3f}"
)
print(
"Coverage / prediction interval width mean for MapieTimeSeriesRegressor: "
Expand Down
18 changes: 9 additions & 9 deletions mapie/calibration.py
Original file line number Diff line number Diff line change
Expand Up @@ -97,15 +97,15 @@ class MapieCalibrator(BaseEstimator, ClassifierMixin):
>>> mapie = MapieCalibrator().fit(X_toy, y_toy, random_state=20)
>>> y_calib = mapie.predict_proba(X_toy)
>>> print(y_calib)
[[0.84900723 nan nan]
[0.75432411 nan nan]
[0.62285341 nan nan]
[ nan 0.33333333 nan]
[ nan 0.33333333 nan]
[ nan 0.33333333 nan]
[ nan nan 0.33333002]
[ nan nan 0.54326683]
[ nan nan 0.66666124]]
[[0.84...... nan nan]
[0.75...... nan nan]
[0.62...... nan nan]
[ nan 0.33...... nan]
[ nan 0.33...... nan]
[ nan 0.33...... nan]
[ nan nan 0.33......]
[ nan nan 0.54......]
[ nan nan 0.66......]]
"""

fit_attributes = [
Expand Down
8 changes: 6 additions & 2 deletions mapie/tests/test_calibration.py
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,9 @@ def test_correct_results(cv: str) -> None:
pred_ = mapie_cal.predict_proba(X_test)
top_label_ece_ = top_label_ece(y_test, pred_)
np.testing.assert_array_almost_equal(
results[cv]["y_score"], pred_ # type:ignore
np.array(results[cv]["y_score"]),
np.array(pred_),
decimal=2
)
np.testing.assert_allclose( # type:ignore
results[cv]["top_label_ece"],
Expand Down Expand Up @@ -345,7 +347,9 @@ def test_correct_results_binary(cv: str) -> None:
top_label_ece_ = top_label_ece(y_binary, pred_)
ece = expected_calibration_error(y_binary, pred_)
np.testing.assert_array_almost_equal(
results_binary[cv]["y_score"], pred_ # type:ignore
np.array(results_binary[cv]["y_score"]),
np.array(pred_),
decimal=2
)
np.testing.assert_allclose( # type:ignore
results_binary[cv]["top_label_ece"],
Expand Down
Loading