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.

Sign up for GitHub

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

Jump to bottom

Normalized discounted cumulative gain #31

Merged
merged 85 commits into from
Nov 22, 2022
Merged

Normalized discounted cumulative gain #31

merged 85 commits into from
Nov 22, 2022

Conversation

aldopareja
Copy link
Contributor

this adds normalized discounted cumulative gain

Your Name and others added 30 commits July 14, 2022 19:39
added wasserstein distance, it's respective tests and modified the re…
e86bcd6 
…quirements
modified setup.py to avoid clashes
6171568
Revert "modified setup.py to avoid clashes"
05181a4 
This reverts commit 6171568.
@aldopareja
added the distance to documentation
23335cc
@aldopareja
iterim commit, fixing
b2e1b8b
@aldopareja
fixed test_common distances
5650faa
@aldopareja
problems in merge
30e5591
@aldopareja
fixed merge from main
1488423
@aldopareja
made the batched version a parameter of the forward method and modifi…
67cd46b 
…ed the test accordingly
@aldopareja
merging batched mahalanobis
700db6c
@aldopareja
removed unused code
2630877
@aldopareja
Merge branch 'batched_mahalanobis_distance-2' into wasserstein-distan…
977b108 
…ce-ranking-2
@aldopareja
made the wasserstein distance into a new class inheriting from distan…
2289025 
…ce, only supporting mahalanobis distance parameters at the moment. Also modified tests and documentation accordingly
@aldopareja
iterim commit, need to bring some changes from another branch
4cb3eeb
@aldopareja
wrote the auditor code, will work on test and documentation now
5077064
@aldopareja
iterim commit, need to modify the batched pairwise mahalanobis distance
15295ed
@aldopareja
added better documentation to wasserstein distance
e08c5b7
@aldopareja
Merge branch 'wasserstein-distance-ranking-2' into ranking-auditor
077ec5e
@aldopareja
fixed the input_distance and output distance size differences
961be1f
@aldopareja
finished code for sestir auditor and its test, also used black on them
0f3c775
@aldopareja
removed all changes from this branch since I ended up not using it
ffa9c8b
@aldopareja
removed batched mahalanobis
9d27b9c
@aldopareja
Merge branch 'wasserstein-distance-ranking-2' into ranking-auditor
05c2440
@aldopareja
removing batched mahalanobis
8416928
@aldopareja
removing batched mahalanobis
1aae6a9
@aldopareja
removing batched mahalanobis
b9b0cb3
@aldopareja
modified the test, it was too stringent
4c68865
@aldopareja
fixed merge coflict
458fc33
@aldopareja
removed stochasticity from the test
2ffc393
@aldopareja
removed stochasticity from the test
5b7d5bf
aldopareja and others added 18 commits August 4, 2022 22:07
@aldopareja
Merge branch 'wasserstein-distance-ranking-2' into ranking-auditor
1426ce7
@aldopareja
fixed requirements
d808a70
@aldopareja
plackett-luce requires torch 1.12 so we will have to go with it
cd93fb6
@aldopareja
plackett-luce requires torch 1.12 so we will have to go with it
1a3b272
@aldopareja
using POT instead of geomloss now
e64d4c1
@aldopareja
Merge branch 'wasserstein-distance-ranking-2' into ranking-auditor
8b388fe
@aldopareja
fixed conflict
750e7d5
@aldopareja
fixed conflict
769ae7c
@aldopareja
plackett-luce requires torch 1.12 so we will have to go with it
e3d2829
@aldopareja
we need latest functorch to work with pytorch 1.12
dea3cf4
@aldopareja
conflicts with the previous pr for wasserstein distance
033da62
@MayankAgarwal
resolve merge conflicts from main
32de8dc
@MayankAgarwal
update senstir auditor to accept distance_x instead of distance_q
eb06443
@MayankAgarwal
black formatting
3b7f73a
@MayankAgarwal
update requirements and documentation
aa6adc1
@MayankAgarwal
Merge branch 'main' into normalized-discounted-cumulative-gain
4774bc0
@MayankAgarwal
Merge branch 'ranking-auditor' into normalized-discounted-cumulative-…
a465d5a 
…gain
@aldopareja
changed requirements so that placket-luce pass tests
f8783e2
@aldopareja
Copy link
Contributor Author

I just checked this, and modified requirements.txt so that it includes torch 1.13, which supports vmap out of the box (no need for functorch anymore). Should be good for merging.

@MayankAgarwal MayankAgarwal mentioned this pull request Nov 7, 2022
Closed
@MayankAgarwal MayankAgarwal merged commit 9897b49 into main Nov 22, 2022
@MayankAgarwal MayankAgarwal deleted the normalized-discounted-cumulative-gain branch November 22, 2022 15:12
@MayankAgarwal MayankAgarwal mentioned this pull request Nov 22, 2022
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@MayankAgarwal MayankAgarwal MayankAgarwal approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@aldopareja @MayankAgarwal