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

Use Paramspace to automate the file naming scheme based on wildcards #40

Open
wants to merge 89 commits into
base: main
Choose a base branch
from

Commits on Jan 18, 2023

  1. Configuration menu
    Copy the full SHA
    56a403e View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    754329d View commit details
    Browse the repository at this point in the history

Commits on Jan 20, 2023

  1. Config key names need to be valid Python

    Can't have hyphens.
    Better to use hyphens to separate params.
    kelly-sovacool committed Jan 20, 2023
    Configuration menu
    Copy the full SHA
    00346d7 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    8461a3c View commit details
    Browse the repository at this point in the history

Commits on Jan 25, 2023

  1. Configuration menu
    Copy the full SHA
    63dd26c View commit details
    Browse the repository at this point in the history

Commits on Jan 26, 2023

  1. Configuration menu
    Copy the full SHA
    b734d3a View commit details
    Browse the repository at this point in the history
  2. Fix wildcards

    kelly-sovacool committed Jan 26, 2023
    Configuration menu
    Copy the full SHA
    6306e35 View commit details
    Browse the repository at this point in the history

Commits on Jan 28, 2023

  1. Remove old test code

    kelly-sovacool committed Jan 28, 2023
    Configuration menu
    Copy the full SHA
    63249bb View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    279e7dd View commit details
    Browse the repository at this point in the history
  3. Implement 'exclude_param_keys' in config

    to give users control over paramspace wildcards
    kelly-sovacool committed Jan 28, 2023
    Configuration menu
    Copy the full SHA
    8561b1c View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    6110b0f View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    3436877 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    58bdfc4 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    8edca31 View commit details
    Browse the repository at this point in the history
  8. Move paramspace-related functions to separate script

    and write unit tests
    kelly-sovacool committed Jan 28, 2023
    Configuration menu
    Copy the full SHA
    4c245b5 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    57b8f82 View commit details
    Browse the repository at this point in the history
  10. Write get_paramspace_from_config()

    Also fix instances_drop_wildcard() so it returns a unique set
    kelly-sovacool committed Jan 28, 2023
    Configuration menu
    Copy the full SHA
    50800e2 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    afbb45b View commit details
    Browse the repository at this point in the history

Commits on Jan 29, 2023

  1. Configuration menu
    Copy the full SHA
    f3496c7 View commit details
    Browse the repository at this point in the history
  2. Fix indent

    kelly-sovacool committed Jan 29, 2023
    Configuration menu
    Copy the full SHA
    e6b5e2a View commit details
    Browse the repository at this point in the history
  3. Fix typo for find_feature_importance

    Have to use output filepath, not rules.output,
    because the plot is blank when find_feat_imp is False
    kelly-sovacool committed Jan 29, 2023
    Configuration menu
    Copy the full SHA
    2aec70f View commit details
    Browse the repository at this point in the history
  4. Use 'include' instead of 'import' for snakedeploy

    Otherwise, will get a ModuleNotFoundError when deploying
    this module with snakedeploy
    kelly-sovacool committed Jan 29, 2023
    Configuration menu
    Copy the full SHA
    7bb8255 View commit details
    Browse the repository at this point in the history
  5. Merge 7bb8255 into 49b327a

    kelly-sovacool authored Jan 29, 2023
    Configuration menu
    Copy the full SHA
    c93109e View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    f6cd873 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    773e3f6 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    791473a View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    09b75b4 View commit details
    Browse the repository at this point in the history
  10. No need to specify inner_join(by)

    Just use all columns that match
    kelly-sovacool committed Jan 29, 2023
    Configuration menu
    Copy the full SHA
    5fcaf69 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    07f9380 View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    90f7e8f View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    7415cbb View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    7e60ea1 View commit details
    Browse the repository at this point in the history
  15. Merge 7e60ea1 into 49b327a

    kelly-sovacool authored Jan 29, 2023
    Configuration menu
    Copy the full SHA
    1888f47 View commit details
    Browse the repository at this point in the history
  16. Configuration menu
    Copy the full SHA
    6842ef9 View commit details
    Browse the repository at this point in the history
  17. Get method,seed,kfold from wildcards not params

    Because of this error with snakedeploy:
    
    WildcardError in file https://github.com/SchlossLab/mikropml-snakemake-workflow/raw/paramspace/workflow/rules/learn.smk, line 25:
    Wildcards in params cannot be determined from output files. Note that you have to use a function to deactivate automatic wildcard expansion in params strings, e.g., `lambda wildcards: '{test}'`. Also see https://snakemake.readthedocs.io/en/stable/snakefiles/rules.html#non-file-parameters-for-rules:
    'method'
    kelly-sovacool committed Jan 29, 2023
    Configuration menu
    Copy the full SHA
    2c28be0 View commit details
    Browse the repository at this point in the history
  18. Configuration menu
    Copy the full SHA
    89f9c3d View commit details
    Browse the repository at this point in the history
  19. Configuration menu
    Copy the full SHA
    0c8629a View commit details
    Browse the repository at this point in the history
  20. Merge 0c8629a into 49b327a

    kelly-sovacool authored Jan 29, 2023
    Configuration menu
    Copy the full SHA
    24eff57 View commit details
    Browse the repository at this point in the history
  21. Silence snakemake linter warning about abs paths

    These are not absolute paths, but the snakemake linter thinks they are.
    Moving the slash to the end of the regex should fix it.
    
    Lints for snakefile /github/workspace/workflow/scripts/functions.py:
        * Absolute path "/{{0,1}}{wildcard}{paramspace.param_sep}{{{wildcard}}}" in line 36:
          Do not define absolute paths inside of the workflow, since this renders
          your workflow irreproducible on other machines. Use path relative to the
          working directory instead, or make the path configurable via a config
          file.
          Also see:
          https://snakemake.readthedocs.io/en/latest/snakefiles/configuration.html#configuration
        * Absolute path "/{{0,1}}{wildcard}{paramspace.param_sep}[a-zA-Z_0-9]*" in line 54:
          Do not define absolute paths inside of the workflow, since this renders
          your workflow irreproducible on other machines. Use path relative to the
          working directory instead, or make the path configurable via a config
          file.
          Also see:
          https://snakemake.readthedocs.io/en/latest/snakefiles/configuration.html#configuration
    kelly-sovacool committed Jan 29, 2023
    Configuration menu
    Copy the full SHA
    e05e36c View commit details
    Browse the repository at this point in the history
  22. Configuration menu
    Copy the full SHA
    8ef170e View commit details
    Browse the repository at this point in the history
  23. Merge 8ef170e into 49b327a

    kelly-sovacool authored Jan 29, 2023
    Configuration menu
    Copy the full SHA
    020e813 View commit details
    Browse the repository at this point in the history
  24. New rule to write the paramspace to csv

    This may be needed because workflows that use this module with snakedeploy won't have access to the paramspace object
    kelly-sovacool committed Jan 29, 2023
    Configuration menu
    Copy the full SHA
    a1f3f89 View commit details
    Browse the repository at this point in the history
  25. Configuration menu
    Copy the full SHA
    679489e View commit details
    Browse the repository at this point in the history
  26. Merge 679489e into 49b327a

    kelly-sovacool authored Jan 29, 2023
    Configuration menu
    Copy the full SHA
    6d3a656 View commit details
    Browse the repository at this point in the history
  27. Configuration menu
    Copy the full SHA
    fa09085 View commit details
    Browse the repository at this point in the history
  28. Move write_paramspace code to script to satisfy linter

    Nothing was actually wrong with it.
    Snakemake has a bug (snakemake issue #2035).
    kelly-sovacool committed Jan 29, 2023
    Configuration menu
    Copy the full SHA
    3ac6da8 View commit details
    Browse the repository at this point in the history
  29. Configuration menu
    Copy the full SHA
    1e30f77 View commit details
    Browse the repository at this point in the history
  30. Merge 1e30f77 into 49b327a

    kelly-sovacool authored Jan 29, 2023
    Configuration menu
    Copy the full SHA
    0667b61 View commit details
    Browse the repository at this point in the history
  31. Configuration menu
    Copy the full SHA
    79bfce4 View commit details
    Browse the repository at this point in the history
  32. Configuration menu
    Copy the full SHA
    d688ae3 View commit details
    Browse the repository at this point in the history
  33. Merge d688ae3 into 49b327a

    kelly-sovacool authored Jan 29, 2023
    Configuration menu
    Copy the full SHA
    96fb339 View commit details
    Browse the repository at this point in the history

Commits on Jan 30, 2023

  1. Switch from pytest-parallel to pytest-xdist

    Got a warning in pytest-parallel, found out it's no longer maintained.
    kevlened/pytest-parallel#118
    kelly-sovacool committed Jan 30, 2023
    Configuration menu
    Copy the full SHA
    5ffec5b View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    070fbcb View commit details
    Browse the repository at this point in the history
  3. Merge 070fbcb into 49b327a

    kelly-sovacool authored Jan 30, 2023
    Configuration menu
    Copy the full SHA
    d852355 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    2262d62 View commit details
    Browse the repository at this point in the history
  5. Merge 2262d62 into 49b327a

    kelly-sovacool authored Jan 30, 2023
    Configuration menu
    Copy the full SHA
    8b4fb8c View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    a72de4a View commit details
    Browse the repository at this point in the history
  7. Note pandas dependency

    kelly-sovacool committed Jan 30, 2023
    Configuration menu
    Copy the full SHA
    48c7b35 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    2c1c768 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    a7dd11a View commit details
    Browse the repository at this point in the history
  10. Merge a7dd11a into e6ec7d1

    kelly-sovacool authored Jan 30, 2023
    Configuration menu
    Copy the full SHA
    59c79ff View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    7df13d3 View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    37175ac View commit details
    Browse the repository at this point in the history
  13. Merge 37175ac into e6ec7d1

    kelly-sovacool authored Jan 30, 2023
    Configuration menu
    Copy the full SHA
    dd1a42c View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    2333b1e View commit details
    Browse the repository at this point in the history
  15. Configuration menu
    Copy the full SHA
    67c3d4a View commit details
    Browse the repository at this point in the history
  16. Configuration menu
    Copy the full SHA
    f337938 View commit details
    Browse the repository at this point in the history
  17. Merge f337938 into e6ec7d1

    kelly-sovacool authored Jan 30, 2023
    Configuration menu
    Copy the full SHA
    a5c4d4e View commit details
    Browse the repository at this point in the history
  18. Configuration menu
    Copy the full SHA
    78b6c12 View commit details
    Browse the repository at this point in the history

Commits on Jan 31, 2023

  1. Tweak medium config

    kelly-sovacool committed Jan 31, 2023
    Configuration menu
    Copy the full SHA
    8a0d346 View commit details
    Browse the repository at this point in the history

Commits on Feb 1, 2023

  1. Configuration menu
    Copy the full SHA
    2eb5d42 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    f85889c View commit details
    Browse the repository at this point in the history
  3. Merge f85889c into 20323a3

    kelly-sovacool authored Feb 1, 2023
    Configuration menu
    Copy the full SHA
    7cc242c View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    b75bf46 View commit details
    Browse the repository at this point in the history
  5. Fix typo

    kelly-sovacool committed Feb 1, 2023
    Configuration menu
    Copy the full SHA
    911a343 View commit details
    Browse the repository at this point in the history
  6. Merge 911a343 into 20323a3

    kelly-sovacool authored Feb 1, 2023
    Configuration menu
    Copy the full SHA
    5cabc22 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    0b49896 View commit details
    Browse the repository at this point in the history

Commits on Feb 2, 2023

  1. Merge 0b49896 into 20323a3

    kelly-sovacool authored Feb 2, 2023
    Configuration menu
    Copy the full SHA
    f2e28c1 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    b22a22d View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    c218f14 View commit details
    Browse the repository at this point in the history
  4. Merge c218f14 into 20323a3

    kelly-sovacool authored Feb 2, 2023
    Configuration menu
    Copy the full SHA
    0342604 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    e202855 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    4c6b528 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    f6ea6c7 View commit details
    Browse the repository at this point in the history
  8. Update example report

    kelly-sovacool committed Feb 2, 2023
    Configuration menu
    Copy the full SHA
    c1ea2a8 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    3f91d0d View commit details
    Browse the repository at this point in the history
  10. Merge 3f91d0d into 20323a3

    kelly-sovacool authored Feb 2, 2023
    Configuration menu
    Copy the full SHA
    8b76cbc View commit details
    Browse the repository at this point in the history

Commits on Feb 6, 2023

  1. Configuration menu
    Copy the full SHA
    8a3c446 View commit details
    Browse the repository at this point in the history
  2. Merge 8a3c446 into 20323a3

    kelly-sovacool authored Feb 6, 2023
    Configuration menu
    Copy the full SHA
    2ace7d3 View commit details
    Browse the repository at this point in the history