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

Simplify state conversions - combination #270

Merged
merged 65 commits into from
Dec 22, 2023
Merged

Simplify state conversions - combination #270

merged 65 commits into from
Dec 22, 2023

Conversation

alexhernandezgarcia
Copy link
Owner

@alexhernandezgarcia alexhernandezgarcia commented Dec 22, 2023 •
edited
Loading

This PR combines #247 and #269 to finally merge everything into main.

nikita-0209 and others added 30 commits April 11, 2023 11:58
@nikita-0209
checkout files from test_merge_cont_mf
737cda8
@nikita-0209
remove comments
afdb762
@nikita-0209
Update to a slightly faster version of get_parents()
e7cd7a5
@alexhernandezgarcia
Merge branch 'main_seq' into sequence-envs
b57c695
@alexhernandezgarcia
Move sequence config files into new dir seqs/
7567fe3
@alexhernandezgarcia
Move sequence proxy config files into new dir seqs/
2ba9ae4
@alexhernandezgarcia
Move sequence env *.py files into new dir seqs/
e607efc
@alexhernandezgarcia
wip: refactor of parent sequence class
690fde0
@alexhernandezgarcia
Replace original README with info about the new private repository.
beed5df
@alexhernandezgarcia
Merge remote-tracking branch 'public/main' into main-public
40c7f33
@alexhernandezgarcia
WIP: few changes to sequence base
9a4829d
@alexhernandezgarcia
Merge remote-tracking branch 'public/sequence-envs' into main
02ab997
@alexhernandezgarcia
Finished __init__ for now.
b4919d6
@alexhernandezgarcia
Docstring of get_action_space.
8ce60ab
@alexhernandezgarcia
Merge pull request #2 from alexhernandezgarcia/main-public
d280222 
Update dev main with public main
@alexhernandezgarcia
Merge branch 'main' of github.com:alexhernandezgarcia/gflownet-dev in…
1c17674 
…to main
@alexhernandezgarcia
Remove env.oracle and leave proxy only
8b0b621
@alexhernandezgarcia
Grid: states2proxy, states2policy; temporary state because old code i…
0088ee4 
…s still there.
@alexhernandezgarcia
docstring
c83d8b3
@alexhernandezgarcia
Tetris: states2proxy, states2policy; temporary state because old code…
04bb59f 
… is still there.
@alexhernandezgarcia
Refactoring of tfloat, tlogn, tint and tbool
41962f9
@alexhernandezgarcia
Typo in typing and correct docstrings
e446262
@alexhernandezgarcia
Cube: states2policy; temporary state because old code is still there.
be67b5c
@alexhernandezgarcia
Fix typos
89ebdaf
@alexhernandezgarcia
Continuous Tori: states2proxy, states2policy; temporary state because…
43bf2ea 
… old code is still there.
@alexhernandezgarcia
Alanine Dipeptide: states2proxy; temporary state because old code is …
7593578 
…still there.
@alexhernandezgarcia
Missing imports
72a31ea
@alexhernandezgarcia
Discrete Torus: states2proxy, states2policy; temporary state because …
f7a8d2b 
…old code is still there.
@alexhernandezgarcia
Tree: remove mention to oracle
7201991
@alexhernandezgarcia
Composition: states2proxy; temporary state because old code is still …
127a017 
…there.
alexhernandezgarcia and others added 28 commits October 31, 2023 10:46
@alexhernandezgarcia
All tests: remove statebatch2proxy, statetorch2proxy, statebatch2poli…
9107d63 
…cy, statetorch2policy, state2policy and state2proxy
@alexhernandezgarcia
gflownet, buffer and batch: remove statebatch2proxy, statetorch2proxy…
ed03294 
…, statebatch2policy, statetorch2policy, state2policy and state2proxy
@alexhernandezgarcia
Fix how policy_input_dim is computed
c9eac79
@alexhernandezgarcia
Tetris: policy output to float
828141c
@alexhernandezgarcia
Fix typo
94c0c32
@alexhernandezgarcia
squeeze output of state2policy and state2proxy and revert to previous…
ad2c7f6 
… way of getting policy_input_dim
@alexhernandezgarcia
Add missing import
17407b5
@alexhernandezgarcia
Update composition and crystal tests
1f817b1
@alexhernandezgarcia
Discrete torus: Remove state2policy and output of policy to float
ea16fc2
@alexhernandezgarcia
Update env.reward() in base
55b8ed3
@alexhernandezgarcia
Test batch: statebatch2policy -> states2policy
1e71a6d
@alexhernandezgarcia
Envs: remove state2proxy
a50cd7d
@alexhernandezgarcia
Remove reward_torchbatch because it is unused
3880e48
@alexhernandezgarcia
Add TODO
03308a9
@alexhernandezgarcia
statetorch2 -> states2
5e3c765
@alexhernandezgarcia
Fix
388816c
@alexhernandezgarcia
Delete files not relevant to branch
14e30c1
@alexhernandezgarcia
Delete files not relevant to branch
ce38e3f
@alexhernandezgarcia
Delete files not relevant to branch
88d3fa6
@alexhernandezgarcia
Delete files not relevant to branch
f0e3feb
@alexhernandezgarcia
Fix tensor comparison
cc634cf
@alexhernandezgarcia
Add typing in returns of state2policy and state2proxy of base env.
11d5fc4
@alexhernandezgarcia
Resolve conflicts with main
fe105d1
@alexhernandezgarcia
Simplify state conversions in CCrystal.
261b8fb
@alexhernandezgarcia
Simplify state conversions in Composition and missing bit in CCrystal.
b07e258
@alexhernandezgarcia
Repair states2proxy in Composition
c5763ea
@alexhernandezgarcia
Merge pull request #269 from alexhernandezgarcia/conversions-simplify…
768d059 
…-crystals

Simplify state conversions (Crystal environments)
@alexhernandezgarcia
Revert "Replace original README with info about the new private repos…
3ecea37 
…itory."

This reverts commit beed5df.
@alexhernandezgarcia alexhernandezgarcia merged commit bf65b57 into main Dec 22, 2023
1 check passed
@josephdviviano josephdviviano deleted the conversions-simplify branch February 7, 2024 15:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@alexhernandezgarcia @nikita-0209