Fix some issues with circular and relative imports (#1658)

Lightning-AI · Aug 6, 2024 · 4558463 · 4558463
1 parent 9722fdb
commit 4558463
Show file tree

Hide file tree

Showing 15 changed files with 15 additions and 16 deletions.
diff --git a/litgpt/config.py b/litgpt/config.py
@@ -8,8 +8,6 @@
 import torch
 import yaml
 from typing_extensions import Self
-
-import litgpt.model
 from litgpt.utils import find_multiple
 
 
@@ -144,6 +142,7 @@ def from_checkpoint(cls, path: Path, **kwargs: Any) -> Self:
     @property
     def mlp_class(self) -> Type:
         # `self.mlp_class_name` cannot be the type to keep the config serializable
+        import litgpt.model
         return getattr(litgpt.model, self.mlp_class_name)
 
     @property

diff --git a/litgpt/data/base.py b/litgpt/data/base.py
@@ -8,7 +8,7 @@
 from torch import Tensor
 from torch.utils.data import Dataset
 
-from litgpt import Tokenizer
+from litgpt.tokenizer import Tokenizer
 from litgpt.prompts import PromptStyle
 
 

diff --git a/litgpt/data/deita.py b/litgpt/data/deita.py
@@ -7,7 +7,7 @@
 import torch
 from torch.utils.data import DataLoader
 
-from litgpt import PromptStyle
+from litgpt.prompts import PromptStyle
 from litgpt.data import DataModule, SFTDataset, get_sft_collate_fn
 from litgpt.tokenizer import Tokenizer
 

diff --git a/litgpt/data/dolly.py b/litgpt/data/dolly.py
@@ -8,7 +8,7 @@
 import torch
 from torch.utils.data import random_split
 
-from litgpt import PromptStyle
+from litgpt.prompts import PromptStyle
 from litgpt.data import Alpaca, SFTDataset
 
 _URL: str = "https://huggingface.co/datasets/databricks/databricks-dolly-15k/resolve/main/databricks-dolly-15k.jsonl"

diff --git a/litgpt/data/flan.py b/litgpt/data/flan.py
@@ -8,7 +8,7 @@
 import torch
 from torch.utils.data import DataLoader
 
-from litgpt import PromptStyle
+from litgpt.prompts import PromptStyle
 from litgpt.data import DataModule, SFTDataset, get_sft_collate_fn
 from litgpt.data.alpaca import download_if_missing
 from litgpt.tokenizer import Tokenizer

diff --git a/litgpt/data/json_data.py b/litgpt/data/json_data.py
@@ -8,7 +8,7 @@
 import torch
 from torch.utils.data import DataLoader, random_split
 
-from litgpt import PromptStyle
+from litgpt.prompts import PromptStyle
 from litgpt.data import DataModule, SFTDataset, get_sft_collate_fn
 from litgpt.tokenizer import Tokenizer
 

diff --git a/litgpt/data/lima.py b/litgpt/data/lima.py
@@ -7,7 +7,7 @@
 import torch
 from torch.utils.data import DataLoader, random_split
 
-from litgpt import PromptStyle
+from litgpt.prompts import PromptStyle
 from litgpt.data import DataModule, SFTDataset, get_sft_collate_fn
 from litgpt.tokenizer import Tokenizer
 

diff --git a/litgpt/data/lit_data.py b/litgpt/data/lit_data.py
@@ -6,7 +6,7 @@
 
 from torch.utils.data import DataLoader
 
-from litgpt import Tokenizer
+from litgpt.tokenizer import Tokenizer
 from litgpt.data import DataModule
 
 

diff --git a/litgpt/data/longform.py b/litgpt/data/longform.py
@@ -8,7 +8,7 @@
 import torch
 from torch.utils.data import DataLoader
 
-from litgpt import PromptStyle
+from litgpt.prompts import PromptStyle
 from litgpt.data import DataModule, SFTDataset, get_sft_collate_fn
 from litgpt.data.alpaca import download_if_missing
 from litgpt.tokenizer import Tokenizer

diff --git a/litgpt/data/openwebtext.py b/litgpt/data/openwebtext.py
@@ -7,7 +7,7 @@
 
 from torch.utils.data import DataLoader
 
-from litgpt import Tokenizer
+from litgpt.tokenizer import Tokenizer
 from litgpt.data import DataModule
 
 

diff --git a/litgpt/data/prepare_slimpajama.py b/litgpt/data/prepare_slimpajama.py
@@ -5,7 +5,7 @@
 import time
 from pathlib import Path
 
-from litgpt import Tokenizer
+from litgpt.tokenizer import Tokenizer
 from litgpt.data.prepare_starcoder import DataChunkRecipe
 from litgpt.utils import CLI, extend_checkpoint_dir
 

diff --git a/litgpt/data/prepare_starcoder.py b/litgpt/data/prepare_starcoder.py
@@ -7,7 +7,7 @@
 
 from lightning_utilities.core.imports import RequirementCache
 
-from litgpt import Tokenizer
+from litgpt.tokenizer import Tokenizer
 from litgpt.utils import CLI, extend_checkpoint_dir
 
 _LITDATA_AVAILABLE = RequirementCache("litdata")

diff --git a/litgpt/data/text_files.py b/litgpt/data/text_files.py
@@ -8,7 +8,7 @@
 
 from torch.utils.data import DataLoader
 
-from litgpt import Tokenizer
+from litgpt.tokenizer import Tokenizer
 from litgpt.data import DataModule
 
 

diff --git a/litgpt/data/tinyllama.py b/litgpt/data/tinyllama.py
@@ -5,7 +5,7 @@
 
 from torch.utils.data import DataLoader
 
-from litgpt import Tokenizer
+from litgpt.tokenizer import Tokenizer
 from litgpt.data import DataModule
 
 

diff --git a/litgpt/data/tinystories.py b/litgpt/data/tinystories.py
@@ -10,7 +10,7 @@
 from torch.utils.data import DataLoader
 from tqdm import tqdm
 
-from litgpt import Tokenizer
+from litgpt.tokenizer import Tokenizer
 from litgpt.data import DataModule
 from litgpt.data.alpaca import download_if_missing
 from litgpt.data.text_files import validate_tokenizer