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

fix include package #15659

Merged
merged 8 commits into from Nov 12, 2022
Merged

fix include package #15659

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4333d1a
fix include package
Borda Nov 12, 2022
2dca63b
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Nov 12, 2022
a5969a5
clean
Borda Nov 12, 2022
719b93d
Merge branch 'pkg/img' of https://github.com/PyTorchLightning/pytorch…
Borda Nov 12, 2022
29c9219
Merge branch 'master' into pkg/img
Borda Nov 12, 2022
d4edd09
Merge branch 'master' into pkg/img
Borda Nov 12, 2022
236699b
Merge branch 'master' into pkg/img
Borda Nov 12, 2022
c98ba01
Self suggested changes
carmocca Nov 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
17 changes: 5 additions & 12 deletions .actions/assistant.py
View file
Open in desktop
@@ -1,4 +1,3 @@
import logging
import os
import re
import shutil
Expand All @@ -9,7 +8,6 @@

import pkg_resources

_PATH_ROOT = dirname(dirname(__file__))
REQUIREMENT_FILES = {
"pytorch": (
"requirements/pytorch/base.txt",
Expand Down Expand Up @@ -68,12 +66,8 @@ def _replace_imports(lines: List[str], mapping: List[Tuple[str, str]]) -> List[s
def copy_replace_imports(
source_dir: str, source_imports: List[str], target_imports: List[str], target_dir: Optional[str] = None
) -> None:
"""Copy package content with import adjustments.

>>> _ = copy_replace_imports(os.path.join(
Copy link
Member Author

Choose a reason for hiding this comment

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

well, after simplification in #15365
it shall be included here: https://github.com/Lightning-AI/lightning/blob/f9d906c3405807da2167d6d2282e5b9cdbb1671e/.github/workflows/ci-pkg-install.yml#L46

... _PATH_ROOT, "src"), ["lightning_app"], ["lightning.app"], os.path.join(_PATH_ROOT, "src", "lightning"))
"""
logging.info(f"Replacing imports: {locals()}")
"""Copy package content with import adjustments."""
print(f"Replacing imports: {locals()}")
assert len(source_imports) == len(target_imports), (
"source and target imports must have the same length, "
f"source: {len(source_imports)}, target: {len(target_imports)}"
Expand All @@ -98,7 +92,7 @@ def copy_replace_imports(
lines = fo.readlines()
except UnicodeDecodeError:
# a binary file, skip
logging.warning(f"Skipped replacing imports for {fp}")
print(f"Skipped replacing imports for {fp}")
continue
lines = _replace_imports(lines, list(zip(source_imports, target_imports)))
os.makedirs(os.path.dirname(fp_new), exist_ok=True)
Expand Down Expand Up @@ -145,7 +139,7 @@ def _prune_packages(req_file: str, packages: Sequence[str]) -> None:
req = list(pkg_resources.parse_requirements(ln_))[0]
if req.name not in packages:
final.append(line)
logging.info(final)
print(final)
path.write_text("\n".join(final))

@staticmethod
Expand All @@ -163,7 +157,7 @@ def replace_oldest_ver(requirement_fnames: Sequence[str] = REQUIREMENT_FILES_ALL
def copy_replace_imports(
source_dir: str, source_import: str, target_import: str, target_dir: Optional[str] = None
) -> None:
"""Recursively replace imports in given folder."""
"""Copy package content with import adjustments."""
source_imports = source_import.strip().split(",")
target_imports = target_import.strip().split(",")
copy_replace_imports(source_dir, source_imports, target_imports, target_dir=target_dir)
Expand All @@ -172,5 +166,4 @@ def copy_replace_imports(
if __name__ == "__main__":
import jsonargparse

logging.basicConfig(level=logging.INFO)
jsonargparse.CLI(AssistantCLI, as_positional=False)