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

Loss ratio senstir #43

Open
wants to merge 110 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
110 commits
Select commit Hold shift + click to select a range
e86bcd6
added wasserstein distance, it's respective tests and modified the re…
Jul 14, 2022
6171568
modified setup.py to avoid clashes
Jul 15, 2022
05181a4
Revert "modified setup.py to avoid clashes"
Jul 15, 2022
23335cc
added the distance to documentation
aldopareja Jul 18, 2022
b2e1b8b
iterim commit, fixing
aldopareja Jul 18, 2022
5650faa
fixed test_common distances
aldopareja Jul 18, 2022
30e5591
problems in merge
aldopareja Jul 18, 2022
1488423
fixed merge from main
aldopareja Jul 18, 2022
67cd46b
made the batched version a parameter of the forward method and modifi…
aldopareja Jul 19, 2022
700db6c
merging batched mahalanobis
aldopareja Jul 19, 2022
2630877
removed unused code
aldopareja Jul 19, 2022
977b108
Merge branch 'batched_mahalanobis_distance-2' into wasserstein-distan…
aldopareja Jul 19, 2022
2289025
made the wasserstein distance into a new class inheriting from distan…
aldopareja Jul 19, 2022
4cb3eeb
iterim commit, need to bring some changes from another branch
aldopareja Jul 19, 2022
5077064
wrote the auditor code, will work on test and documentation now
aldopareja Jul 19, 2022
15295ed
iterim commit, need to modify the batched pairwise mahalanobis distance
aldopareja Jul 19, 2022
e08c5b7
added better documentation to wasserstein distance
aldopareja Jul 19, 2022
077ec5e
Merge branch 'wasserstein-distance-ranking-2' into ranking-auditor
aldopareja Jul 19, 2022
961be1f
fixed the input_distance and output distance size differences
aldopareja Jul 19, 2022
0f3c775
finished code for sestir auditor and its test, also used black on them
aldopareja Jul 19, 2022
ffa9c8b
removed all changes from this branch since I ended up not using it
aldopareja Jul 19, 2022
9d27b9c
removed batched mahalanobis
aldopareja Jul 19, 2022
05c2440
Merge branch 'wasserstein-distance-ranking-2' into ranking-auditor
aldopareja Jul 19, 2022
8416928
removing batched mahalanobis
aldopareja Jul 19, 2022
1aae6a9
removing batched mahalanobis
aldopareja Jul 19, 2022
b9b0cb3
removing batched mahalanobis
aldopareja Jul 19, 2022
4c68865
modified the test, it was too stringent
aldopareja Jul 19, 2022
458fc33
fixed merge coflict
aldopareja Jul 19, 2022
2ffc393
removed stochasticity from the test
aldopareja Jul 19, 2022
5b7d5bf
removed stochasticity from the test
aldopareja Jul 19, 2022
c1990bb
Merge branch 'wasserstein-distance-ranking-2' into ranking-auditor
aldopareja Jul 19, 2022
b76a642
added senstir auditor to the docs
aldopareja Jul 19, 2022
29fc244
added default values for the noise
aldopareja Jul 20, 2022
ac0db70
finished writting the code code for senstir
aldopareja Jul 20, 2022
36ce69a
adding placket_luce to build a normalized discounted gain utility for…
aldopareja Jul 20, 2022
798ff19
added normalized discounted cumulative gain, required for the ranking…
aldopareja Jul 20, 2022
5eec47a
Merge branch 'normalized-discounted-cumulative-gain' into plackett_lu…
aldopareja Jul 20, 2022
f62c771
added tests for the placket-luce distribution
aldopareja Jul 20, 2022
2420e1f
Merge branch 'plackett_luce-2' into senstir-algo
aldopareja Jul 20, 2022
67e26a2
added a monte carlo dimension for NDCG
aldopareja Jul 20, 2022
3a946f8
Merge branch 'normalized-discounted-cumulative-gain' into plackett_lu…
aldopareja Jul 20, 2022
43f88e3
Merge branch 'plackett_luce-2' into senstir-algo
aldopareja Jul 20, 2022
988d681
finished code for senstir, will work on the test now
aldopareja Jul 20, 2022
93bda95
working on the demo and polished some bugs in senstir
aldopareja Jul 20, 2022
a16c5a4
finished senstir code, changed a reshape in the aditor to avoid silen…
aldopareja Jul 25, 2022
6f0d6b7
finished the demo, had to tune some hyperparameters, still need to ma…
aldopareja Jul 28, 2022
f8b2f7e
modifying requirements to check if it builds on travis
aldopareja Aug 2, 2022
ae48891
modifying requirements to check if it builds on travis
aldopareja Aug 2, 2022
a1665f0
modifying requirements to check if it builds on travis
aldopareja Aug 2, 2022
7cf9e75
modifying requirements to check if it builds on travis
aldopareja Aug 2, 2022
bce35b5
printing setuptools version
aldopareja Aug 2, 2022
94ee0fc
printing setuptools version
aldopareja Aug 2, 2022
28872f9
escaping single quote
aldopareja Aug 2, 2022
0934c27
escaping single quote
aldopareja Aug 2, 2022
2edf390
travis doesn't build!
aldopareja Aug 2, 2022
d6cd624
tuning travis
aldopareja Aug 3, 2022
621de4c
using python 3.8.13 to see if that removes the build error
aldopareja Aug 3, 2022
1d6390c
updated to 3.8.2 to make it work
aldopareja Aug 3, 2022
178cdec
polished .travis.yml and requirements, mostly rolling back unrequired…
aldopareja Aug 3, 2022
d5c5ac2
senstirauditor should inherit from auditor
aldopareja Aug 3, 2022
70063b0
rolling back changes in the test
aldopareja Aug 3, 2022
e34da18
Merge branch 'ranking-auditor' into senstir-algo
aldopareja Aug 3, 2022
87d91f9
polished the last comment on the demo
aldopareja Aug 3, 2022
359a62f
removed debugging part
aldopareja Aug 3, 2022
d3a5bfa
black format
aldopareja Aug 3, 2022
4aeebf3
black format
aldopareja Aug 3, 2022
d4aba2e
Merge branch 'ranking-auditor' into senstir-algo
aldopareja Aug 3, 2022
e468b44
fixing travis build
aldopareja Aug 3, 2022
868d391
fixing travis build
aldopareja Aug 3, 2022
6e4e9af
Merge branch 'main' into wasserstein-distance-ranking-2
aldopareja Aug 3, 2022
ebdd00d
Merge branch 'wasserstein-distance-ranking-2' into ranking-auditor
aldopareja Aug 3, 2022
b2f564b
Merge branch 'main' into wasserstein-distance-ranking-2
aldopareja Aug 3, 2022
088b459
fixing travis build
aldopareja Aug 3, 2022
9b6ae67
fixing travis build
aldopareja Aug 3, 2022
6dda0e7
fixed merge conflict, using torch 1.12 now
aldopareja Aug 3, 2022
9d7998d
Merge branch 'wasserstein-distance-ranking-2' into ranking-auditor
aldopareja Aug 3, 2022
a66564e
merged auditor
aldopareja Aug 3, 2022
166010d
made the test for placket-luce more robust
aldopareja Aug 3, 2022
036a8b8
merged and fixed
aldopareja Aug 3, 2022
5acc576
merged and fixed
aldopareja Aug 3, 2022
707d7d9
merged and fixed
aldopareja Aug 3, 2022
47cc20e
added test for senstir
aldopareja Aug 4, 2022
e00e5b6
added test for senstir
aldopareja Aug 4, 2022
5749aec
fixed merge from main and modified to avoid performance issues
aldopareja Aug 5, 2022
916a3ab
deleted some unnecessary code and formatted with black
aldopareja Aug 5, 2022
d79ff5a
deleted some more unnecessary code
aldopareja Aug 5, 2022
65db72f
deleted some more unnecessary code
aldopareja Aug 5, 2022
a438150
fixed requirements
aldopareja Aug 5, 2022
1426ce7
Merge branch 'wasserstein-distance-ranking-2' into ranking-auditor
aldopareja Aug 5, 2022
d808a70
fixed requirements
aldopareja Aug 5, 2022
5e75a1e
fixed merge
aldopareja Aug 5, 2022
65ff16d
built the loss ratio method for the senstir auditor using expected nd…
aldopareja Aug 5, 2022
c6361d9
plackett-luce requires torch 1.12 so we will have to go with it
aldopareja Aug 5, 2022
cd93fb6
plackett-luce requires torch 1.12 so we will have to go with it
aldopareja Aug 5, 2022
1a3b272
plackett-luce requires torch 1.12 so we will have to go with it
aldopareja Aug 5, 2022
29719df
plackett-luce requires torch 1.12 so we will have to go with it
aldopareja Aug 5, 2022
e64d4c1
using POT instead of geomloss now
aldopareja Aug 19, 2022
8b388fe
Merge branch 'wasserstein-distance-ranking-2' into ranking-auditor
aldopareja Aug 19, 2022
750e7d5
fixed conflict
aldopareja Aug 19, 2022
769ae7c
fixed conflict
aldopareja Aug 19, 2022
75c2c79
fixed conflict
aldopareja Aug 19, 2022
fea23bc
fixed conflict
aldopareja Aug 19, 2022
e3d2829
plackett-luce requires torch 1.12 so we will have to go with it
aldopareja Aug 19, 2022
e618595
Merge branch 'plackett_luce-2' into senstir-algo
aldopareja Aug 19, 2022
75347de
Merge branch 'senstir-algo' into loss_ratio_senstir
aldopareja Aug 19, 2022
2140bab
we need latest functorch to work with pytorch 1.12
aldopareja Aug 19, 2022
69a3432
we need latest functorch to work with pytorch 1.12
aldopareja Aug 19, 2022
4749526
updated to torch 1.12.1 since they have fixed the bug
aldopareja Aug 19, 2022
124e857
updated to torch 1.12.1 since they have fixed the bug
aldopareja Aug 19, 2022
76b82d4
updated to torch 1.12.1 since they have fixed the bug
aldopareja Aug 19, 2022
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
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ dist: focal
language: python

python:
- '3.8'
- '3.8.2'
- '3.9'

install:
Expand Down
6 changes: 6 additions & 0 deletions docs/source/reference/auditors.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,10 @@ SenSeI Auditor
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
.. autoclass:: SenSeIAuditor
:members:

SenSTIR Auditor
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
.. autoclass:: SenSTIRAuditor
:members:

```
7 changes: 7 additions & 0 deletions docs/source/reference/distances.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,11 @@ Euclidean Distance
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
.. autoclass:: EuclideanDistance
:members:

Wasserstein Distance
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
.. autoclass:: BatchedWassersteinDistance
:members:
```


Loading