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

Update ndarray 0.14 #110

Merged
merged 9 commits into from
Apr 19, 2021
Merged

Update ndarray 0.14 #110

merged 9 commits into from
Apr 19, 2021

Conversation

relf
Copy link
Member

@relf relf commented Mar 23, 2021

This PR update linfa to ndarray 0.14 version with the following crates updates as well

  • approx = 0.4
  • argmin = 0.4
  • ndarray-csv = 0.5
  • ndarray-linalg = 0.13
  • ndarray-npy = 0.7
  • ndarray-rand = 0.13
  • ndarray-stats = 0.4
  • num-traits = 0.2
  • rand = 0.8
  • rand-isaac = 0.3
  • sprs = git master rev=761d4f0

The PR is still WIP as there is an issue with sprs 0.10 (see #109 )

EDIT:

  • sprs 0.9.4

@codecov-io
Copy link

Codecov Report

Merging #110 (3e21ad7) into master (6065062) will decrease coverage by 0.20%.
The diff coverage is 55.07%.

❗ Current head 3e21ad7 differs from pull request most recent head 60f83a0. Consider uploading reports for the commit 60f83a0 to get more accurate results
Impacted file tree graph

@@            Coverage Diff             @@
##           master     #110      +/-   ##
==========================================
- Coverage   55.93%   55.73%   -0.21%     
==========================================
  Files          67       67              
  Lines        5626     5616      -10     
==========================================
- Hits         3147     3130      -17     
- Misses       2479     2486       +7     
Impacted Files Coverage Δ
algorithms/linfa-hierarchical/src/lib.rs 50.00% <ø> (-2.18%) ⬇️
algorithms/linfa-linear/src/glm/link.rs 56.43% <0.00%> (-0.57%) ⬇️
algorithms/linfa-logistic/src/lib.rs 73.85% <ø> (+0.26%) ⬆️
...ms/linfa-reduction/src/diffusion_map/algorithms.rs 0.00% <ø> (ø)
algorithms/linfa-svm/src/classification.rs 84.84% <ø> (-0.34%) ⬇️
...rithms/linfa-trees/src/decision_trees/algorithm.rs 51.05% <ø> (+0.52%) ⬆️
src/dataset/impl_targets.rs 6.66% <0.00%> (+1.66%) ⬆️
algorithms/linfa-linear/src/glm/distribution.rs 72.18% <20.00%> (-2.24%) ⬇️
...linfa-clustering/src/gaussian_mixture/algorithm.rs 55.14% <45.45%> (-0.90%) ⬇️
algorithms/linfa-pls/src/pls_generic.rs 68.40% <57.14%> (-0.52%) ⬇️
... and 38 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 6065062...60f83a0. Read the comment docs.

Copy link
Member

@bytesnake bytesnake left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the cleanup and dependency update. This won't work with the latest sprs release because of sparsemat/sprs#278 correct? The 0.14 -> 0.15 jump seems to be quite big (I just skimmed the release notes, there are probably some breakages for the parallel stuff in kmeans) and should be in a separate crate

algorithms/linfa-kernel/Cargo.toml Outdated Show resolved Hide resolved
algorithms/linfa-linear/Cargo.toml Outdated Show resolved Hide resolved
algorithms/linfa-reduction/src/pca.rs Show resolved Hide resolved
@relf
Copy link
Member Author

relf commented Apr 7, 2021

This won't work with the latest sprs release because of sparsemat/sprs#278 correct?

Exactly. I open the sprs issue after I get a compilation error with linfa-kernel.

* approx = 0.4
* argmin = 0.4
* ndarray-csv = 0.5
* ndarray-linalg = 0.13
* ndarray-npy = 0.7
* ndarray-rand = 0.13
* ndarray-stats = 0.4
* num-traits = 0.2
* rand = 0.8
* rand-isaac = 0.3
* sprs = git master rev=761d4f0
@relf
Copy link
Member Author

relf commented Apr 16, 2021

Hmmm... I do not understand what is going on. I am not familiar with the various CI checks. 👀 It seems that build fails with rustc 1.42 which would be our current lowest rustc supported version, @bytesnake correct?

@mulimoen
Copy link

mulimoen commented Apr 16, 2021

Running cargo tree --workspace -i ndarray shows you are pulling in ndarray:0.15.1 through

ndarray v0.15.1
└── ndarray-rand v0.14.0
    └── argmin v0.4.2
        ├── linfa-linear v0.3.1 (/home/magnus/Documents/projects/linfa/algorithms/linfa-linear)
        └── linfa-logistic v0.3.1 (/home/magnus/Documents/projects/linfa/algorithms/linfa-logistic)

@relf
Copy link
Member Author

relf commented Apr 16, 2021

@mulimoen thanks for the heads up. Indeed in the meantime, argmin bumped from 0.4.1 to 0.4.2 pulling new ndarray_rand version and then new ndarray 0.15! At the same time argmin 0.4.2 fixes the issue argmin-rs/argmin#104 which broke the linfa CI system! I am doomed! 😅

@mulimoen
Copy link

@relf Ouch, that is quite unfortunate, you were almost there with the sprs bump

@codecov-commenter
Copy link

codecov-commenter commented Apr 17, 2021

Codecov Report

❗ No coverage uploaded for pull request base (master@2079957). Click here to learn what that means.
The diff coverage is 56.00%.

Impacted file tree graph

@@            Coverage Diff            @@
##             master     #110   +/-   ##
=========================================
  Coverage          ?   58.24%           
=========================================
  Files             ?       75           
  Lines             ?     6697           
  Branches          ?        0           
=========================================
  Hits              ?     3901           
  Misses            ?     2796           
  Partials          ?        0           
Impacted Files Coverage Δ
algorithms/linfa-hierarchical/src/lib.rs 50.00% <ø> (ø)
algorithms/linfa-linear/src/glm/link.rs 56.43% <0.00%> (ø)
algorithms/linfa-logistic/src/lib.rs 73.59% <ø> (ø)
...ms/linfa-reduction/src/diffusion_map/algorithms.rs 0.00% <ø> (ø)
algorithms/linfa-svm/src/classification.rs 84.84% <ø> (ø)
...rithms/linfa-trees/src/decision_trees/algorithm.rs 51.05% <ø> (ø)
src/dataset/impl_targets.rs 8.33% <0.00%> (ø)
algorithms/linfa-linear/src/glm/distribution.rs 72.18% <20.00%> (ø)
algorithms/linfa-preprocessing/src/whitening.rs 75.96% <33.33%> (ø)
...linfa-clustering/src/gaussian_mixture/algorithm.rs 56.20% <45.45%> (ø)
... and 11 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 2079957...7736d20. Read the comment docs.

@relf relf changed the title [WIP] Update ndarray 0.14 Update ndarray 0.14 Apr 19, 2021
Copy link
Member

@bytesnake bytesnake left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

okay let's bump and I will try to clean up a bit in a follow up 👍

@bytesnake bytesnake merged commit 8276bdc into rust-ml:master Apr 19, 2021
@relf relf deleted the update-ndarray-0.14 branch April 19, 2021 13:18
@bytesnake bytesnake mentioned this pull request Apr 20, 2021
This was referenced Apr 22, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants