Requirements updates -testing

app.py

@@ -7,6 +7,7 @@ from pathlib import Path
 import atexit
 import random
 import spaces
+
 # Import constants
 import utils.constants as constants
 
@@ -160,7 +161,7 @@ def get_model_and_lora(model_textbox):
         default_model = model_textbox
         return default_model, []
 
-@spaces.GPU(duration=128)
+#@spaces.GPU(duration=256)
 def generate_input_image_click(map_option, prompt_textbox_value, negative_prompt_textbox_value, model_textbox_value, use_conditioned_image=False, strength=0.5, image_format="16:9", scale_factor=3):
     # Get the model and LoRA weights
     model, lora_weights = get_model_and_lora(model_textbox_value)

requirements.txt

@@ -1,10 +1,10 @@
 accelerate
 invisible_watermark
 # Updated versions 2.4.0+cu118
-torch==2.4.0 --index-url https://download.pytorch.org/whl/cu118
-torchvision==0.19.0 --index-url https://download.pytorch.org/whl/cu118
-torchaudio==2.4.0 --index-url https://download.pytorch.org/whl/cu118
-xformers==0.0.27.post2 --index-url https://download.pytorch.org/whl/cu118
+torch==2.4.0 --index-url https://download.pytorch.org/whl/cu118/torch-2.4.0%2Bcu118-cp310-cp310-linux_x86_64.whl#sha256=80f75f98282dfcca50a013ce14ee6a4385680e1c15cb0e9b376612442137ead5
+torchvision --index-url https://download.pytorch.org/whl/cu118
+torchaudio --index-url https://download.pytorch.org/whl/cu118
+xformers==0.0.27.post2 --index-url https://download.pytorch.org/whl/cu118/xformers-0.0.27.post2%2Bcu118-cp310-cp310-manylinux2014_x86_64.whl#sha256=b3cdeeb9eae4547805ab8c3c645ac2fa9c6da85b46c039d9befa117e9f6f22fe
 
 # Other dependencies
 Haishoku
@@ -12,14 +12,12 @@ pybind11>=2.12
 huggingface_hub
 # git+https://github.com/huggingface/transformers@v4.48.1#egg=transformers
 transformers==4.48.1
-gradio==5.12.0
 gradio[oauth]
 Pillow
-numpy==1.26.4
+numpy
 requests
-# git+https://github.com/huggingface/diffusers[torch]
-diffusers[torch]==0.32.2
-accelerate
+# git+https://github.com/huggingface/diffusers
+diffusers
 peft
 opencv-python
 open3d
@@ -27,12 +25,13 @@ protobuf
 safetensors
 sentencepiece
 git+https://github.com/asomoza/image_gen_aux.git
-# git+https://github.com/huggingface/optimum.git
-# git+https://github.com/triton-lang/triton.git -not windows supported --disable in environment variable
+#git+https://github.com/huggingface/optimum.git
+#git+https://github.com/triton-lang/triton.git -not windows supported --disable in environment variable
 tiktoken
-pilmoji[requests]==2.0.4
-emoji==2.2.0
+#pilmoji[requests]==2.0.4
+#emoji==2.2.0
 pycairo
 cairocffi
 pangocffi
-pangocairocffi
+pangocairocffi
+tensorflow

src/condition.py

@@ -13,6 +13,7 @@ condition_dict = {
     "deblurring": 7,
     "fill": 9,
 }
+
 class Condition(object):
     def __init__(
         self,

utils/ai_generator.py

@@ -3,6 +3,7 @@
 import os
 import time
 from turtle import width  # Added for implementing delays
+import spaces
 import torch
 import random
 from utils.ai_generator_diffusers_flux import generate_ai_image_local
@@ -14,6 +15,7 @@ from PIL import Image
 from tempfile import NamedTemporaryFile
 import utils.constants as constants
 
+
 def generate_image_from_text(text, model_name="flax-community/dalle-mini", image_width=768, image_height=512):
     # Initialize the InferenceClient
     client = InferenceClient()

utils/ai_generator_diffusers_flux.py

@@ -1,5 +1,6 @@
 # utils/ai_generator_diffusers_flux.py
 import os
+import spaces
 import torch
 from diffusers import FluxPipeline,FluxImg2ImgPipeline,FluxControlPipeline
 import accelerate 
@@ -26,6 +27,7 @@ from utils.color_utils import detect_color_format
 import utils.misc as misc
 from pathlib import Path
 import warnings
+
 warnings.filterwarnings("ignore", message=".*Torch was not compiled with flash attention.*")
 #print(torch.__version__)  # Ensure it's 2.0 or newer
 #print(torch.cuda.is_available())  # Ensure CUDA is available
@@ -35,7 +37,7 @@ PIPELINE_CLASSES = {
     "FluxImg2ImgPipeline": FluxImg2ImgPipeline
 }
 
-
+@spaces.GPU(duration=140)
 def generate_image_from_text(
     text,
     model_name="black-forest-labs/FLUX.1-dev",
@@ -95,6 +97,7 @@ def generate_image_from_text(
     pipe.unload_lora_weights()
     return image
 
+@spaces.GPU(duration=140)
 def generate_image_lowmem(
     text,
     neg_prompt=None,
@@ -112,13 +115,14 @@ def generate_image_lowmem(
     additional_parameters=None
 ):
     # Retrieve the pipeline class from the mapping
+    print(f"device:{device}\nmodel_name:{model_name}\nlora_weights:{lora_weights}\n")
+    print(f"\n {get_torch_info()}\n")
     pipeline_class = PIPELINE_CLASSES.get(pipeline_name)
     if not pipeline_class:
         raise ValueError(f"Unsupported pipeline type '{pipeline_name}'. "
                         f"Available options: {list(PIPELINE_CLASSES.keys())}")
     device = "cuda" if torch.cuda.is_available() else "cpu"
-    print(f"device:{device}\nmodel_name:{model_name}\nlora_weights:{lora_weights}\n")
-    print(f"\n {get_torch_info()}\n")
+    
     # Disable gradient calculations
     with torch.no_grad():
         # Initialize the pipeline inside the context manager
@@ -343,6 +347,7 @@ def generate_ai_image_local (
         return None
 
 # does not work
+#@spaces.GPU(duration=256)
 def merge_LoRA_weights(model="black-forest-labs/FLUX.1-dev",
     lora_weights="Borcherding/FLUX.1-dev-LoRA-FractalLand-v0.1"):
     

utils/constants.py

@@ -5,11 +5,14 @@ os.environ["PYTORCH_CUDA_ALLOC_CONF"] = "max_split_size_mb:256,expandable_segmen
 IS_SHARED_SPACE = "Surn/HexaGrid" in os.environ.get('SPACE_ID', '')
 
 # Set the temporary folder location
-os.environ['TEMP'] = r'e:\\TMP'
-os.environ['TMPDIR'] = r'e:\\TMP'
-os.environ['XDG_CACHE_HOME'] = r'E:\\cache'
+#os.environ['TEMP'] = r'e:\\TMP'
+#os.environ['TMPDIR'] = r'e:\\TMP'
+#os.environ['XDG_CACHE_HOME'] = r'E:\\cache'
 os.environ['USE_FLASH_ATTENTION'] = '1'
-os.environ['XFORMERS_FORCE_DISABLE_TRITON']= '1'
+#os.environ['XFORMERS_FORCE_DISABLE_TRITON']= '1'
+os.environ["CUDA_DEVICE_ORDER"] = "PCI_BUS_ID"
+os.environ["PYTORCH_NVML_BASED_CUDA_CHECK"] = "1"
+os.environ["CUDA_VISIBLE_DEVICES"] = "0,1,2,3"
 
 # constants.py contains all the constants used in the project
 os.environ["HF_TOKEN"] = ""

utils/version_info.py

@@ -2,6 +2,7 @@
 
 import subprocess
 import os
+import spaces
 import torch
 import sys
 import gradio as gr
@@ -45,7 +46,7 @@ def get_diffusers_version():
         return diffusers.__version__
     except Exception:
         return "<none>"
-
+#@spaces.GPU()
 def get_torch_info():
     try:
         return [torch.__version__, f"CUDA Version:{torch.version.cuda}", f"Available:{torch.cuda.is_available()}", f"flash attention enabled: {torch.backends.cuda.flash_sdp_enabled()}", f"Capabilities: {torch.cuda.get_device_capability(0)}", f"Device Name: {torch.cuda.get_device_name(0)}"]
@@ -78,4 +79,6 @@ def versions_html():
         gradio: {gr.__version__}
         &#x2000;•&#x2000;
         {toggle_dark_link}
+        <br>
+        Full GPU Info:{get_torch_info()}
         """