Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 2 additions & 0 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ jobs:
run: |-
python -m pip install pip uv -U
python -m uv pip install -r pyproject.toml --extra tests
python -m uv pip install -r requirements/runtime.txt
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Erotemic is this the place (and only place) I needed to add this?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You also need it in the test_purepy_wheels section after python -m uv pip install --prerelease=allow "aiq-magnet[$INSTALL_EXTRAS]==$MOD_VERSION" -f wheelhouse. There are tow paths for testing the source dist and the wheel dist.

- name: Build sdist
shell: bash
run: |-
Expand Down Expand Up @@ -205,6 +206,7 @@ jobs:
echo "UV_RESOLUTION=$UV_RESOLUTION"
echo "MOD_VERSION=$MOD_VERSION"
python -m uv pip install --prerelease=allow "aiq-magnet[$INSTALL_EXTRAS]==$MOD_VERSION" -f wheelhouse
python -m uv pip install -r requirements/runtime.txt
echo "Install finished."
- name: Test wheel ${{ matrix.install-extras }}
shell: bash
Expand Down
12 changes: 0 additions & 12 deletions magnet/backends/helm/magnet_run_helm.py

This file was deleted.

8 changes: 5 additions & 3 deletions magnet/helm_outputs.py
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,6 @@ class HelmOutputs(ub.NiceRepr):
│ └─╼ ...
├─╼ scenario_instances
└─╼ runs: .size=4.00 KB,.files=1,json.size=2.64 MB,json.files=88,tex.size=13.11 KB,tex.files=42
├─╼ latest -> my-suite: size=4.00 KB
└─╼ my-suite: json.size=2.64 MB,json.files=88,tex.size=13.11 KB,tex.files=42
├─╼ runs_to_run_suites.json: size=0.36 KB
...
Expand Down Expand Up @@ -262,6 +261,7 @@ def suites(self, pattern='*') -> list[HelmSuite]:
def _suite_dirs(self, pattern='*'):
# not robust to extra directories being written. is there a way to
# determine that these directories are actually suites?
# TODO: no longer need to handle latest.
return [p for p in sorted((self.root_dir / 'runs').glob(pattern)) if p.is_dir() and p.name != 'latest']

def list_suites(self):
Expand Down Expand Up @@ -471,7 +471,7 @@ def _coerce_from_patterned_paths(cls, input):
>>> cases = [
>>> {'num_expect': 1, 'input': root_dir / 'runs' / 'my-suite'},
>>> {'num_expect': 1, 'input': root_dir / 'runs' / '*suite*'},
>>> {'num_expect': 2, 'input': root_dir / 'runs' / '*'},
>>> {'num_expect': 1, 'input': root_dir / 'runs' / '*'}, # was 2 for helm 0.5.11, but symlinks were removed
>>> ]
>>> for case in cases:
>>> input = case['input']
Expand Down Expand Up @@ -502,6 +502,8 @@ def _coerce_from_patterned_paths(cls, input):
# We could just check for is_dir and name != latest like
# outputs does instead of using _is_likely_a_suite_path
# unsure what the right answer is.
# NOTE: latest was removed in
# https://github.com/stanford-crfm/helm/pull/3984
path = ub.Path(path)
if HelmSuite._is_likely_a_suite_path(path):
suite_paths.append(path)
Expand Down Expand Up @@ -646,7 +648,7 @@ def _coerce_from_patterned_paths(cls, input):
>>> {'num_expect': 2, 'input': root_dir / 'runs' / 'my-suite/*subject=philosophy*'},
>>> {'num_expect': 2, 'input': root_dir / 'runs' / 'my-suite/*subject=anatomy*'},
>>> {'num_expect': 4, 'input': root_dir / 'runs' / 'my-suite/*:*'},
>>> {'num_expect': 8, 'input': root_dir / 'runs' / '*/*:*'},
>>> {'num_expect': 4, 'input': root_dir / 'runs' / '*/*:*'},
>>> ]
>>> for case in cases:
>>> input = case['input']
Expand Down
3 changes: 3 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,9 @@ docs = [
magnet = "magnet.__main__:main"
magnet-helm-run = "magnet.backends.helm.magnet_run_helm:main"

[project.entry-points.helm]
run_specs = "magnet.backends.helm.run_specs"

[tool.pytest.ini_options]
addopts = "--xdoctest --xdoctest-style=google --ignore-glob=docs"
norecursedirs = ".git build __pycache__ dev docs dockerfiles"
Expand Down
1 change: 1 addition & 0 deletions requirements/runtime.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
crfm-helm @ git+https://github.com/AIQ-Kitware/helm@kitware-main
Loading