Merge pull request #53 from easy-model-fusion/module-fix

Fixed modules for demo

__init__.py

@@ -1 +1,4 @@
-from .generated_models import *
+from sdk.options import *
+from sdk.models import *
+from sdk.generated_models import *
+from sdk.demo import *

demo/demo_text_conv.py

@@ -1,6 +1,6 @@
 import torch
-from models import ModelsManagement, ModelsTextConversation
-from options import Devices, OptionsTextConversation
+from sdk.models import ModelsManagement, ModelsTextConversation
+from sdk.options import Devices, OptionsTextConversation
 
 
 class DemoTextConv:

demo/demo_txt_to_img.py

@@ -1,5 +1,5 @@
-from models import ModelTextToImage, ModelsManagement
-from options import Devices, OptionsTextToImage
+from sdk.models import ModelTextToImage, ModelsManagement
+from sdk.options import Devices, OptionsTextToImage
 
 
 class DemoTxtToImg:

models/__init__.py

@@ -1,4 +1,4 @@
-from .model_text_to_image import ModelTextToImage
-from .models_management import ModelsManagement
-from .model_text_conversation import ModelsTextConversation
-from .model import Model
+from sdk.models.model import Model
+from sdk.models.models_management import ModelsManagement
+from sdk.models.model_text_to_image import ModelTextToImage
+from sdk.models.model_text_conversation import ModelsTextConversation

models/model.py

@@ -1,5 +1,5 @@
 from abc import abstractmethod
-from options import Options
+from sdk.options import Options
 from typing import Optional
 
 

models/model_text_conversation.py

@@ -2,8 +2,9 @@
 from typing import Optional
 from transformers import (AutoModel, AutoTokenizer,
                           ConversationalPipeline, Conversation)
-from .model import Model
-from options import Devices, OptionsTextConversation
+
+from sdk.models import Model
+from sdk.options import Devices, OptionsTextConversation
 
 
 class ModelsTextConversation(Model):

models/model_text_to_image.py

@@ -1,8 +1,8 @@
 import torch
 from diffusers import DiffusionPipeline, StableDiffusionXLPipeline
-from options import OptionsTextToImage, Devices
+from sdk.options import OptionsTextToImage, Devices
 from typing import Optional
-from .model import Model
+from sdk.models import Model
 
 
 class ModelTextToImage(Model):

models/models_management.py

@@ -1,6 +1,6 @@
 from typing import Optional, Dict
-from .model import Model
-from options import Options
+from sdk.models import Model
+from sdk.options import Options
 
 
 class ModelsManagement:

options/__init__.py

@@ -1,3 +1,3 @@
-from .options_text_to_image import OptionsTextToImage
-from .options_text_conversation import OptionsTextConversation
-from .options import Options, Devices
+from sdk.options.options import Options, Devices
+from sdk.options.options_text_to_image import OptionsTextToImage
+from sdk.options.options_text_conversation import OptionsTextConversation

options/options_text_conversation.py

@@ -1,5 +1,5 @@
 import torch
-from .options import Options, Devices
+from sdk.options import Options, Devices
 from typing import Optional, Union, Dict, Any
 from transformers import (PreTrainedModel, TFPreTrainedModel,
                           PreTrainedTokenizer,

options/options_text_to_image.py

@@ -1,6 +1,6 @@
 from typing import Optional, Union, List, Dict, Tuple, Any, Callable
 from diffusers.image_processor import PipelineImageInput
-from .options import Options, Devices
+from sdk.options import Options, Devices
 import torch