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

Identify each branch and make a plan for them #62

Closed
16 tasks done
ngraymon opened this issue Jun 6, 2022 · 18 comments
Closed
16 tasks done

Identify each branch and make a plan for them #62

ngraymon opened this issue Jun 6, 2022 · 18 comments

Comments

@ngraymon
Copy link
Owner

ngraymon commented Jun 6, 2022

  • Activate Branches

  • Stale Branches

    • maude_examples (deleted)
    • remove_debug_code (master up to date, should probably be deleted)
    • older_latex_branch
    • remove_old_functions_fix
    • remove_old_functions
    • remove_prints
    • aug25_ansatz
    • testing_pipeline
    • updating_code_generator
    • updating-zhz-latex-generator
  • google about best practice for dealing with stale branches

@ngraymon
Copy link
Owner Author

ngraymon commented Jun 6, 2022

github_prep was already merged at 5f0c3cbc8befd03cf92b189beb8db1eabf385f56 but github doesn't recognize?

@ngraymon
Copy link
Owner Author

ngraymon commented Jun 6, 2022

implement_pytest was already merged at 79d27c253a3013d5da65ca01e4b65d2c9924f5fa, again GitHub does not recognize?

@ngraymon
Copy link
Owner Author

ngraymon commented Jun 6, 2022

updating-zhz-latex-generator was already merged at c483c91364a029291e9dbcf55c5b508dc936855f (and then later into master) Github doesn't recognize

@lhprice
Copy link
Collaborator

lhprice commented Jun 8, 2022

temp_file_naming, looks like this was used to store the naming scheme:

# DEBUG - temporary override
    maximum_h_rank, maximum_cc_rank, maximum_T_rank, eT_taylor_max_order, omega_max_order = truncations
    path = "./eT_zhz_eqs"
    path += f"_H({maximum_h_rank})"
    path += f"_P({omega_max_order})"
    path += f"_T({maximum_T_rank})"
    path += f"_exp({eT_taylor_max_order})"
    path += f"_Z({maximum_cc_rank})"
    path += ".py"

@lhprice
Copy link
Collaborator

lhprice commented Jun 8, 2022

finish_code_eTzhz, was last split into temp_file_naming branch, contains modifications to the naming of python functions:

ex commit: Improve docstrings for add_*_terms() style functions

when compared with master contains mostly docstring changes to produced python code but also contains some new flags so might need to be carefully cherrypicked before it is merged

@lhprice
Copy link
Collaborator

lhprice commented Jun 8, 2022

LHS_generation: 52 additions and 28 deletions when compared to master

seems to contain some useful modifications to latex but also looks like it clashes in some spots with the LHS gen stuff we have more recently worked on

@lhprice
Copy link
Collaborator

lhprice commented Jun 8, 2022

implement_pytest, already merged can probably just delete

@lhprice
Copy link
Collaborator

lhprice commented Jun 8, 2022

older_latex_branch
seems to be backup of old generator code
contains:

  • older_latex_generator.py
  • generated_latex.txt

@lhprice
Copy link
Collaborator

lhprice commented Jun 8, 2022

remove_old_functions_fix was merged into remove_old_functions

@lhprice
Copy link
Collaborator

lhprice commented Jun 8, 2022

remove_old_functions only dif from master is generate_residual_equations.py which is depreciated

@lhprice
Copy link
Collaborator

lhprice commented Jun 8, 2022

remove_prints was also merged since only dif from master is generate_residual_equations.py which is depreciated

@lhprice
Copy link
Collaborator

lhprice commented Jun 8, 2022

aug25_ansatz branch contains changes to latex_eT_zhz.py that contains some possibly useful naming changes

@lhprice
Copy link
Collaborator

lhprice commented Jun 8, 2022

testing_pipeline was merged, no changes vs master

@lhprice
Copy link
Collaborator

lhprice commented Jun 8, 2022

updating_code_generator was merged into updating-zhz-latex-generator which was merged into implement_pytest which made its way into master at some point around 9bdab69

@ngraymon
Copy link
Owner Author

ngraymon commented Jun 8, 2022

Google best practice for old stale branches, merge/not merge?, but still want to record commits?
Maybe just cherry pick the useful ones into a new branch off the current master branch?

@ngraymon
Copy link
Owner Author

ngraymon commented Jun 8, 2022

@ngraymon
Copy link
Owner Author

ngraymon commented Jun 8, 2022

We can now remove older_latex_branch since I've made a gist of the only files that matter for it:
https://gist.github.com/ngraymon/efd7b55a0e57c32b6d6c5e2a13c76d10

@ngraymon
Copy link
Owner Author

ngraymon commented Jun 8, 2022

Leaving old_master for a week or two incase something weird happens.
storage_generated_einsum_code will stay for now

@lhprice lhprice closed this as completed Jun 15, 2022
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

No branches or pull requests

2 participants