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

G Retriever Experiments and Improvements (full) #9666

Draft
wants to merge 934 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
934 commits
Select commit Hold shift + click to select a range
3a336fc
cleaning
puririshi98 Jul 25, 2024
0597ec0
Merge branch 'add-g-retriever' into web-qsp-integ
puririshi98 Jul 25, 2024
e62bd16
Merge branch 'web-qsp-integ' into gnn-llm-model-integration
puririshi98 Jul 25, 2024
78643c9
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jul 25, 2024
952c539
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jul 25, 2024
d407cbd
last minor fix
puririshi98 Jul 25, 2024
9112b58
Merge branch 'add-g-retriever' into web-qsp-integ
puririshi98 Jul 25, 2024
c4c565c
Merge branch 'web-qsp-integ' into gnn-llm-model-integration
puririshi98 Jul 25, 2024
dd651be
hopefuly final minor fix from my rework
puririshi98 Jul 25, 2024
910bc26
Merge branch 'add-g-retriever' into web-qsp-integ
puririshi98 Jul 25, 2024
a964f4c
Merge branch 'web-qsp-integ' into gnn-llm-model-integration
puririshi98 Jul 25, 2024
6d54d5a
fix docs, model selection
akihironitta Jul 26, 2024
a952948
Merge branch 'add-g-retriever' into web-qsp-integ
puririshi98 Jul 29, 2024
3789f44
Merge branch 'web-qsp-integ' into gnn-llm-model-integration
puririshi98 Jul 29, 2024
31d8f2b
Update g_retriever.py
puririshi98 Jul 29, 2024
dc44a7d
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jul 29, 2024
63340d8
Update g_retriever.py
puririshi98 Jul 29, 2024
21224b1
Update torch_geometric/nn/models/g_retriever.py
puririshi98 Jul 29, 2024
9bb6b07
Merge branch 'master' into add-g-retriever
puririshi98 Jul 29, 2024
8524d93
Merge branch 'add-g-retriever' into web-qsp-integ
puririshi98 Jul 29, 2024
e67a094
Merge branch 'web-qsp-integ' into gnn-llm-model-integration
puririshi98 Jul 29, 2024
98523d1
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jul 29, 2024
3f58f90
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jul 29, 2024
4afb5cd
noqa for bare except
puririshi98 Jul 29, 2024
41c5883
Merge branch 'add-g-retriever' into web-qsp-integ
puririshi98 Jul 29, 2024
ce37ca5
Merge branch 'web-qsp-integ' into gnn-llm-model-integration
puririshi98 Jul 29, 2024
7238400
removing unneeded noqa
puririshi98 Jul 29, 2024
c4d32eb
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jul 29, 2024
fe22334
Merge branch 'add-g-retriever' into web-qsp-integ
puririshi98 Jul 29, 2024
0d1d35c
Merge branch 'web-qsp-integ' into gnn-llm-model-integration
puririshi98 Jul 29, 2024
99dd3e2
Merge branch 'master' into add-g-retriever
puririshi98 Jul 30, 2024
85f149b
Merge branch 'add-g-retriever' into web-qsp-integ
puririshi98 Jul 30, 2024
631325f
Merge branch 'web-qsp-integ' into gnn-llm-model-integration
puririshi98 Jul 30, 2024
09de7d0
fix for recent changes intro-ing a typo
puririshi98 Aug 1, 2024
625b93e
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Aug 1, 2024
89efa75
Update test_g_retriever.py
puririshi98 Aug 16, 2024
6860770
removing unneeded requirement (only needed for larger multigpu llms)
puririshi98 Aug 16, 2024
54f653a
undoing
puririshi98 Aug 16, 2024
d794dc2
undoing
puririshi98 Aug 16, 2024
55ad768
Merge branch 'master' into add-g-retriever
puririshi98 Aug 16, 2024
068bded
Update conftest.py
puririshi98 Aug 16, 2024
834a808
Update conftest.py
puririshi98 Aug 16, 2024
fb532c0
Update test_web_qsp_dataset.py
puririshi98 Aug 16, 2024
92d80cf
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Aug 16, 2024
7a585b5
Update test_web_qsp_dataset.py
puririshi98 Aug 16, 2024
dde79cf
Update conftest.py
puririshi98 Aug 16, 2024
e849fba
Update test_web_qsp_dataset.py
puririshi98 Aug 16, 2024
8158255
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Aug 16, 2024
91a3988
Merge branch 'add-g-retriever' into web-qsp-integ
puririshi98 Aug 16, 2024
7bdb2d8
Merge branch 'web-qsp-integ' into gnn-llm-model-integration
puririshi98 Aug 16, 2024
55420c4
Merge branch 'master' into add-g-retriever
puririshi98 Aug 19, 2024
cc1225d
Merge branch 'add-g-retriever' into web-qsp-integ
puririshi98 Aug 19, 2024
782b0f9
Merge branch 'web-qsp-integ' into gnn-llm-model-integration
puririshi98 Aug 19, 2024
6d36d09
Merge branch 'master' into add-g-retriever
puririshi98 Aug 27, 2024
683a946
Merge branch 'add-g-retriever' into web-qsp-integ
puririshi98 Aug 27, 2024
c44997a
Merge branch 'web-qsp-integ' into gnn-llm-model-integration
puririshi98 Aug 27, 2024
095123a
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Aug 27, 2024
f460f28
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Aug 27, 2024
93f268e
adding typing to helper functions
puririshi98 Aug 27, 2024
98e3fc6
Merge branch 'add-g-retriever' into web-qsp-integ
puririshi98 Aug 27, 2024
a31d8d9
Merge branch 'web-qsp-integ' into gnn-llm-model-integration
puririshi98 Aug 27, 2024
96d719f
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Aug 27, 2024
258e486
Merge branch 'add-g-retriever' into web-qsp-integ
puririshi98 Aug 27, 2024
b3e233f
Merge branch 'web-qsp-integ' into gnn-llm-model-integration
puririshi98 Aug 27, 2024
c2ccb2e
fix for typing CI checker
puririshi98 Aug 27, 2024
ede8336
Merge branch 'add-g-retriever' into web-qsp-integ
puririshi98 Aug 27, 2024
361c5af
Merge branch 'web-qsp-integ' into gnn-llm-model-integration
puririshi98 Aug 27, 2024
89a1fc3
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Aug 27, 2024
d7fdc0c
Merge branch 'add-g-retriever' into web-qsp-integ
puririshi98 Aug 27, 2024
6800e43
Merge branch 'web-qsp-integ' into gnn-llm-model-integration
puririshi98 Aug 27, 2024
c9170e2
precommit fix
puririshi98 Aug 27, 2024
b266b7f
Merge branch 'add-g-retriever' into web-qsp-integ
puririshi98 Aug 27, 2024
73ee3a8
Merge branch 'web-qsp-integ' into gnn-llm-model-integration
puririshi98 Aug 27, 2024
a1f5deb
doc string for hallucination eval
puririshi98 Aug 27, 2024
4ba58b9
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Aug 27, 2024
67435fb
Update g_retriever.py
puririshi98 Aug 27, 2024
a65a15e
dataloading whole graph
May 25, 2024
f109bf9
dataloading and retrieval debugging
May 29, 2024
b912652
finished dataloader
May 30, 2024
ce5370b
finished dataloader 2
May 30, 2024
dc3f9f4
add to data transform
May 30, 2024
4488d70
init commit of dataset
May 31, 2024
eb9b761
debug pcst part 1
May 31, 2024
85da0e7
push what i have for now
May 31, 2024
168a37a
fixes after rebase
Jun 1, 2024
2cf727f
more fixes and mocking
Jun 1, 2024
9ab9b22
more mocking
Jun 1, 2024
6a1ee0f
main mocking working
Jun 3, 2024
03f6f4e
pr fixes
Jun 3, 2024
0b4ee3d
migrate large graph indexer
Jun 3, 2024
81a1b8a
fix save overrider
Jun 3, 2024
dd2ec56
formatting 1
Jun 3, 2024
917fe54
formatting 2
Jun 3, 2024
ae8d057
start unittests
Jun 4, 2024
7fdae85
tests done for largegraphindexer
Jun 4, 2024
5f67a84
tests done for largegraphindexer 2
Jun 4, 2024
b0ab66f
tests done for largegraphindexer 3
Jun 4, 2024
bfd1a2f
tests done for largegraphindexer 4
Jun 4, 2024
bcee67a
migrate updated qsp dataset
Jun 4, 2024
2117605
formatting
Jun 4, 2024
866866c
add dataset
Jun 4, 2024
70f0380
add option for new dataloader
Jun 4, 2024
db94397
fix formatting
Jun 4, 2024
a03028a
instantiate ds in train func
Jun 4, 2024
0ec7aac
Restore mapping attrs
zaristei Jun 4, 2024
c1e5cc8
Test edited to cover restoration of data info
zaristei Jun 4, 2024
5a09881
begin trying profiling
Jun 5, 2024
9d1093c
speedup retrieval to avoid timeouts
Jun 6, 2024
27acc5b
init commit for retrieval
Jun 11, 2024
ff24ce9
profiling nb
Jun 11, 2024
8180fa6
pre commit
Jun 11, 2024
2e51703
debug part 1
Jun 12, 2024
0ac3258
pre commit
Jun 12, 2024
e6b2cd0
debugging done, begin qol cleanup and writing tests
Jun 13, 2024
a782e02
fstore and gstore configurable from loader
Jun 14, 2024
0e58080
move rag loader
Jun 14, 2024
8fd61f4
pre commit
Jun 14, 2024
7f001c8
pre transform working
Jun 17, 2024
53ab64a
fix saving bug for pcst hack
Jun 18, 2024
c1fae6f
fix bug in profiler and make blank file to be filled with unittests
Jun 18, 2024
a051259
overhaul test profiling
Jun 18, 2024
3c60f03
begin nvtx profiler
Jun 26, 2024
5c3876d
nvtx profiler optional name
Jun 28, 2024
a2b606c
nvtx profiler optional name 2
Jun 28, 2024
0a588f6
precommit
Jun 28, 2024
f0d7aa3
nvtx shell script
Jun 28, 2024
8a4d0cf
nvtx scripts added for kg loading and backend retrieval
Jun 28, 2024
01696e4
nvtx_webqsp_script
Jun 28, 2024
42cc16e
cudaprofilerapi hook
Jun 28, 2024
d390cce
make tracking the kernels optional
Jun 29, 2024
3c2a20d
nvtx test scripts
Jul 2, 2024
e91a951
bugfixes
Jul 3, 2024
7ddee4d
code to parallelize checking step in g_retriever
Jul 8, 2024
18eabf4
refactor training and demo loop to allow for multiple model benchmarks
Jul 11, 2024
e120760
benchmark script for current experiment
Jul 11, 2024
71788de
gretriever more embedding size
Jul 16, 2024
bf220d1
override switch
Jul 24, 2024
c347994
override switch 2
Jul 24, 2024
3611aa5
rag generation script
Jul 27, 2024
953262f
wikidata dataset
Aug 8, 2024
97d15e2
documentation part 1
Aug 9, 2024
d58568e
multihop
Aug 15, 2024
77cd9a7
Prune out everything that doesn't have to do with LargeGraphIndexer
zaristei Aug 15, 2024
8c340af
fix imports
zaristei Aug 16, 2024
8947a9d
lint
Aug 16, 2024
8b5a462
mypy purgatory 1
Aug 16, 2024
d4c20c4
mypy purgatory 2
Aug 17, 2024
d0c6dfa
mypy purgatory 3
Aug 17, 2024
b835caa
Changelog 0
Aug 17, 2024
79d70c3
mypy purgatory 4
Aug 17, 2024
a15b141
docstrings
Aug 21, 2024
cc3543d
unittest for updated qsp
Aug 21, 2024
ea3c0be
address pr feedback
Aug 27, 2024
eac09a8
Add back in all Remote backend deltas
zaristei Aug 15, 2024
79784cb
changelog 0
Aug 17, 2024
4b0e658
RAG Backend documentation 0
Aug 21, 2024
4faad32
rag generate running on whole dataset now
Aug 21, 2024
567b43e
docstrings
Aug 21, 2024
0bdcc6d
drop performance ref
Aug 23, 2024
36426bd
Add back in nvtx profiler code
zaristei Aug 15, 2024
0927f48
forgot a file
zaristei Aug 15, 2024
109420b
forgot a few more test scripts
zaristei Aug 15, 2024
d7ea7ef
rename to not get detected by pytest
Aug 17, 2024
e63af63
changelog 0
Aug 17, 2024
05269ca
docstrings
Aug 21, 2024
11293ff
nvtx performance additons
Aug 24, 2024
530405c
Changes to allow for multiprocessing in hallucination detection
zaristei Aug 15, 2024
35b8dd0
restore changes that were for benchmarking and experiments
zaristei Aug 15, 2024
46a7d7a
changelog 0
Aug 17, 2024
85bfeaa
docstrings
Aug 21, 2024
23872a3
passs in arbitrary dataset path
Aug 24, 2024
a22cb82
automate gretriever benchmarking for other subgraphs
Aug 24, 2024
117ec9e
begin incorporating approx knn so that dataset can be fully generated
Aug 26, 2024
e23889c
experimental batch query support for rag loader
Aug 26, 2024
68a2070
rag generate specify num samples
Aug 26, 2024
3d5c2cb
switch to approx knn for rag generate multihop example
Aug 26, 2024
9c972e7
argparse for rag generate
Aug 27, 2024
518a9e3
move all benchmark code into own directory
Aug 27, 2024
59564a5
beginning of refactor into doc
Aug 28, 2024
05b95c1
reorder files
Aug 28, 2024
770a7d1
begin merger of uwebqsp and webqsp
Aug 28, 2024
e660a9b
rename
Aug 28, 2024
759f0f8
merger 2
Aug 28, 2024
e5668bd
verbose
Aug 28, 2024
dc54508
out file
Aug 28, 2024
0359b09
rm separate file for benchmarking multitoken gnns and readd changes t…
Aug 29, 2024
e045ed4
rm from benchmark section
Aug 29, 2024
60bd11f
fix formatting
Aug 29, 2024
e748cfc
check dependencies for webqsp
Aug 29, 2024
664cf7a
multihop scripts
Aug 29, 2024
7472539
adjust multihop
Aug 29, 2024
9f2e618
adjust multihop 2
Aug 29, 2024
000931c
more tests for web qsp
Aug 29, 2024
db8e004
fix unittests
Aug 29, 2024
99c8db5
rag docs part 2
Aug 29, 2024
ca54720
add images
Aug 29, 2024
2a49022
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Aug 29, 2024
5a97400
precommit
Aug 29, 2024
fb57e26
ipython3 to python
Aug 29, 2024
30fe562
remove batch query for now
Aug 29, 2024
27843dc
precommit 2
Aug 29, 2024
204ac8f
clean up code in docs 1
Aug 29, 2024
3c05386
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Aug 29, 2024
20fc46d
remove tqdm bars
Aug 29, 2024
1a33f5a
nvtx unit tests
Aug 29, 2024
9aa4244
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Aug 29, 2024
5915b3d
make linter happy
Aug 29, 2024
137d7a2
renamed some files to prevent misnomers
Aug 29, 2024
fafbb9b
typo
Aug 29, 2024
e14acc0
typo 2
Aug 29, 2024
62ce0b2
typo 3
Aug 29, 2024
a90b5d9
fix retrieval test
Aug 29, 2024
018bdcf
fix multihop
Aug 29, 2024
1ff34c8
remove ipynbs due to them being superseded by the rsts
Aug 29, 2024
a597870
readme in llm_plus_gnn
Aug 29, 2024
e5e5453
fix multihop 2
Aug 29, 2024
a959118
linting
Aug 29, 2024
0ef2bbc
close parenthesis
Aug 29, 2024
6fab6a5
fix multihop 3
Aug 29, 2024
d9ef859
fix typo in example
Aug 29, 2024
352c4ab
multihop to multihop rag
Aug 30, 2024
97ab60a
linting
Aug 30, 2024
ab53471
typo
Aug 30, 2024
99e715d
fix bug where force flag wasnt being acknoledged for LLM results
Aug 30, 2024
3eea912
restore patch from rishis commits
Aug 30, 2024
6560566
add verbosity flag for webqsp
Aug 30, 2024
9852a76
fix force reload for webqsp and set to default
Aug 30, 2024
f41e8d6
update llama2 url
Aug 31, 2024
e1f8f62
Merge branch 'pyg-team:master' into zaristei/g_retriever_experiments
zaristei Sep 1, 2024
60ef416
restore webqsp as default
zacool64 Sep 2, 2024
d06a285
fix skip untuned arg issues
zacool64 Sep 2, 2024
f88be6b
reform file structure and add more documentation
zaristei Sep 4, 2024
e50f776
Merge branch 'master' into zaristei/g_retriever_experiments
zaristei Sep 26, 2024
7f5d8f1
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Sep 27, 2024
cd0de7a
fix bad inport
zaristei Sep 26, 2024
a496480
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Sep 27, 2024
884ffe5
bug fix 1
zacool64 Sep 30, 2024
52944f7
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Sep 30, 2024
d096fa7
rename example dir
zaristei Sep 30, 2024
b89ec88
pre-commit
zacool64 Sep 30, 2024
2b0ccb4
pre-commit
zacool64 Sep 30, 2024
db8085d
mypy
zacool64 Sep 30, 2024
1779ce7
fix import change
zacool64 Sep 30, 2024
7aead2a
mypy 2
zacool64 Sep 30, 2024
d13d2ea
mypy 3
zacool64 Sep 30, 2024
04ca150
mypy 4
zacool64 Sep 30, 2024
8089b95
fix nvtx examples
zacool64 Sep 30, 2024
7bc91d9
Merge branch 'zaristei/modded_master' into zaristei/g_retriever_exper…
zaristei Oct 4, 2024
453d61c
Rename to path on master branch
zaristei Oct 4, 2024
29cd5bd
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Oct 4, 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
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).

### Added

- Added various GRetriever Architecture Benchmarking examples ([#9597](https://github.com/pyg-team/pytorch_geometric/pull/9597))
- Added `profiler.nvtxit` with some examples ([#9597](https://github.com/pyg-team/pytorch_geometric/pull/9597))
- Added `loader.RagQueryLoader` with Remote Backend Example ([#9597](https://github.com/pyg-team/pytorch_geometric/pull/9597))
- Added `data.LargeGraphIndexer` ([#9597](https://github.com/pyg-team/pytorch_geometric/pull/9597))

### Changed

### Deprecated
Expand Down
1 change: 1 addition & 0 deletions docs/source/_figures/flowchart.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions docs/source/_figures/multihop_example.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions docs/source/_figures/remote_backend.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading