Fix onedir pyinstall

Use relative paths for install

pyinstaller web/shark_sd.spec creates an exe
This commit is contained in:
Anush Elangovan
2022-12-02 00:50:25 -08:00
parent 8c3eabdcee
commit 8c158f2452
2 changed files with 19 additions and 8 deletions

View File

@@ -7,17 +7,24 @@ import gradio as gr
from PIL import Image
import json
import os
import sys
from random import randint
from numpy import iinfo
import numpy as np
def resource_path(relative_path):
""" Get absolute path to resource, works for dev and for PyInstaller """
base_path = getattr(sys, '_MEIPASS', os.path.dirname(os.path.abspath(__file__)))
return os.path.join(base_path, relative_path)
prompt_examples = []
prompt_loc = "./prompts.json"
prompt_loc = resource_path("prompts.json")
if os.path.exists(prompt_loc):
with open("./prompts.json", encoding="utf-8") as fopen:
with open(prompt_loc, encoding="utf-8") as fopen:
prompt_examples = json.load(fopen)
nodlogo_loc = resource_path("logos/nod-logo.png")
sdlogo_loc = resource_path("logos/sd-demo-logo.png")
demo_css = """
.gradio-container {background-color: black}
@@ -43,8 +50,8 @@ footer {display: none !important;}
with gr.Blocks(css=demo_css) as shark_web:
with gr.Row(elem_id="ui_title"):
nod_logo = Image.open("./logos/nod-logo.png")
logo2 = Image.open("./logos/sd-demo-logo.png")
nod_logo = Image.open(nodlogo_loc)
logo2 = Image.open(sdlogo_loc)
with gr.Row():
with gr.Column(scale=1, elem_id="demo_title_outer"):
gr.Image(

View File

@@ -19,10 +19,14 @@ datas += copy_metadata('torchvision')
datas += copy_metadata('torch-mlir')
datas += copy_metadata('diffusers')
datas += copy_metadata('transformers')
datas += copy_metadata('gradio')
datas += collect_data_files('gradio')
datas += collect_data_files('iree')
#datas += copy_metadata('iree')
datas += collect_data_files('shark')
datas += [
( 'prompts.json', '.' ),
( 'logos/*', 'logos' )
]
block_cipher = None
@@ -32,7 +36,7 @@ a = Analysis(
pathex=['.'],
binaries=[],
datas=datas,
hiddenimports=['shark', 'shark.*', 'shark.shark_inference', 'shark_inference', 'iree.tools.core'],
hiddenimports=['shark', 'shark.*', 'shark.shark_inference', 'shark_inference', 'iree.tools.core', 'gradio'],
hookspath=[],
hooksconfig={},
runtime_hooks=[],
@@ -49,7 +53,7 @@ exe = EXE(
a.scripts,
[],
exclude_binaries=True,
name='index',
name='shark_sd',
debug=False,
bootloader_ignore_signals=False,
strip=False,
@@ -69,5 +73,5 @@ coll = COLLECT(
strip=False,
upx=True,
upx_exclude=[],
name='index',
name='shark_sd',
)