diff --git a/Dockerfile b/Dockerfile index 444436c88..1e4cc1901 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,10 +4,14 @@ FROM nvidia/cuda:11.0.3-base-ubuntu20.04 # Run update RUN apt update +RUN apt-get install -y software-properties-common +RUN add-apt-repository ppa:deadsnakes/ppa +RUN apt-get update && apt-get install ffmpeg libsm6 libxext6 -y #Install Python -RUN apt-get install -y python3 python3-pip +RUN apt-get install -y python3.9 +RUN apt-get install -y python3-pip # Set the working directory inside the container @@ -18,12 +22,12 @@ WORKDIR /app COPY ./ /app # Install Python dependencies -RUN pip3 install torch torchvision torchaudio --extra-index-url https://download.pytorch.org/whl/cu118 xformers -RUN pip3 install -r requirements.txt -RUN pip3 install runpod -RUN pip3 install websocket-client -RUN pip3 install webcolors -RUN pip3 install scikit-learn +RUN python3.9 -m pip install numpy==1.21.6 +RUN python3.9 -m pip install -r requirements.txt +RUN python3.9 -m pip install scikit-learn==0.24.2 +ENV DEBIAN_FRONTEND=noninteractive +RUN apt update && apt install -y build-essential && rm -rf /var/lib/apt/lists/* +RUN python3.9 -m pip install scikit-image #Give permission to script RUN chmod +x ./entrypoint.sh @@ -33,4 +37,3 @@ ENV NVIDIA_VISIBLE_DEVICES all # Run the Python program when the container starts ENTRYPOINT ["./entrypoint.sh"] -# [ "python3", "-u", "comfy_runpod.py" ] diff --git a/color_output.txt b/color_output.txt index cf4a4ec6e..4ef718e56 100644 --- a/color_output.txt +++ b/color_output.txt @@ -1,5 +1,5 @@ -MC1: #16b3d8 - darkturquoise, MC2: #d1a443 - peru, MC3: #c0e5ed - powderblue, MC4: #5f870f - olivedrab -AN1: #1652d8 - royalblue, AN2: #16d89c - mediumspringgreen -T1: #d816b3 - mediumvioletred, T2: #b3d816 - yellowgreen -C1: #d83b16 - orangered, C2: #4370d1 - royalblue -MO1: #9ecdd8 - lightsteelblue, MO2: #d1c4a6 - tan, MO3: #e0ebed - lavender, MO4: #7b8763 - gray +MC1: #5d6c2c - darkolivegreen, MC2: #c0b1ab - darkgray, MC3: #73299d - darkslateblue, MC4: #323416 - darkslategray +AN1: #3d6c2c - darkolivegreen, AN2: #6c5b2c - darkolivegreen +T1: #2c5d6c - darkslategray, T2: #6c2c5d - purple +C1: #3b2c6c - darkslateblue, C2: #abbac0 - silver +MO1: #686c59 - dimgray, MO2: #c0bbba - silver, MO3: #907a9d - lightslategray, MO4: #33342b - darkslategray diff --git a/comfy_runpod.py b/comfy_runpod.py index e402b0205..28961a18e 100644 --- a/comfy_runpod.py +++ b/comfy_runpod.py @@ -96,7 +96,7 @@ def run_prompt(job): new_working_directory = "./lama-with-refiner" os.chdir(new_working_directory) - cmd = "python3 bin/predict.py model.path=$(pwd)/big-lama indir=$(pwd)/LaMa_test_images outdir=$(pwd)/output" + cmd = "python3.9 bin/predict.py model.path=$(pwd)/big-lama indir=$(pwd)/input outdir=$(pwd)/output" os.system(cmd) new_working_directory = "../" diff --git a/entrypoint.sh b/entrypoint.sh index 6b844c86e..da458fbcc 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -1,10 +1,10 @@ #!/bin/bash # Run the first Python script -python3 main.py & +python3.9 main.py & # Wait for 20 seconds sleep 20 # Run the second Python script -python3 comfy_runpod.py +python3.9 comfy_runpod.py diff --git a/requirement_our.txt b/requirement_our.txt deleted file mode 100644 index 730353bf6..000000000 --- a/requirement_our.txt +++ /dev/null @@ -1,4 +0,0 @@ -webcolors==1.13 -runpod -websocket-client -scikit-learn diff --git a/requirements.txt b/requirements.txt index 8ee7b83d1..3b8c1bea1 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,11 +1,156 @@ -torch -torchsde -einops -transformers>=4.25.1 -safetensors>=0.3.0 -aiohttp +absl-py==1.4.0 accelerate -pyyaml -Pillow -scipy -tqdm +aiohttp==3.8.5 +aiosignal==1.3.1 +albumentations==0.5.2 +annotated-types==0.5.0 +antlr4-python3-runtime==4.8 +anyio==3.7.1 +astunparse==1.6.3 +async-timeout==4.0.2 +attrs==23.1.0 +backoff==2.2.1 +boltons==23.0.0 +boto3==1.28.21 +botocore==1.31.21 +braceexpand==0.1.7 +cachetools==5.3.1 +certifi==2023.7.22 +charset-normalizer==3.2.0 +click==8.1.6 +cmake==3.27.1 +contourpy==1.1.0 +cycler==0.11.0 +dnspython==2.4.1 +easydict==1.9 +einops==0.6.1 +email-validator==2.0.0.post2 +exceptiongroup==1.1.2 +fastapi +filelock==3.12.2 +flatbuffers==23.5.26 +fonttools==4.42.0 +frozenlist==1.4.0 +fsspec==2023.6.0 +future==0.18.3 +gast==0.4.0 +google-auth==2.22.0 +google-auth-oauthlib==1.0.0 +google-pasta==0.2.0 +grpcio==1.56.2 +h11==0.14.0 +h5py==3.9.0 +httpcore==0.17.3 +httptools==0.6.0 +httpx==0.24.1 +huggingface-hub +hydra-core==1.1.0 +idna==3.4 +imageio==2.31.1 +imgaug==0.4.0 +importlib-metadata==6.8.0 +importlib-resources==6.0.1 +itsdangerous==2.1.2 +Jinja2==3.1.2 +jmespath==1.0.1 +joblib==1.3.1 +keras==2.13.1 +kiwisolver==1.4.4 +kornia==0.5.0 +libclang==16.0.6 +lit==16.0.6 +Markdown==3.4.4 +MarkupSafe==2.1.3 +matplotlib==3.7.2 +mpmath==1.3.0 +multidict==6.0.4 +networkx==3.1 +numpy==1.23.1 +nvidia-cublas-cu11==11.10.3.66 +nvidia-cuda-cupti-cu11==11.7.101 +nvidia-cuda-nvrtc-cu11==11.7.99 +nvidia-cuda-runtime-cu11==11.7.99 +nvidia-cudnn-cu11==8.5.0.96 +nvidia-cufft-cu11==10.9.0.58 +nvidia-curand-cu11==10.2.10.91 +nvidia-cusolver-cu11==11.4.0.1 +nvidia-cusparse-cu11==11.7.4.91 +nvidia-nccl-cu11==2.14.3 +nvidia-nvtx-cu11==11.7.91 +oauthlib==3.2.2 +omegaconf==2.1.2 +opencv-python==4.8.0.74 +opencv-python-headless==4.8.0.74 +opt-einsum==3.3.0 +orjson==3.9.4 +packaging==23.1 +pandas==2.0.3 +Pillow==10.0.0 +protobuf==4.23.4 +psutil==5.9.5 +py-cpuinfo==9.0.0 +pyasn1==0.5.0 +pyasn1-modules==0.3.0 +pydantic +pydantic-extra-types==2.0.0 +pydantic-settings==2.0.2 +pydantic_core +pyparsing==3.0.9 +python-dateutil==2.8.2 +python-dotenv==1.0.0 +python-multipart==0.0.6 +pytorch-lightning +pytz==2023.3 +PyWavelets==1.4.1 +PyYAML==6.0.1 +regex==2023.6.3 +requests==2.31.0 +requests-oauthlib==1.3.1 +rsa==4.9 +runpod==0.9.12 +s3transfer==0.6.1 +safetensors==0.3.2 +#scikit-image==0.17.2 +#scikit-learn==0.24.2 +scipy==1.11.1 +shapely==2.0.1 +six==1.16.0 +sniffio==1.3.0 +starlette +sympy==1.12 +tabulate==0.9.0 +tensorboard==2.13.0 +tensorboard-data-server==0.7.1 +#tensorflow +tensorflow-estimator==2.13.0 +tensorflow-io-gcs-filesystem==0.33.0 +termcolor==2.3.0 +threadpoolctl==3.2.0 +tifffile==2023.7.18 +tokenizers==0.13.3 +torch==2.0.1 +torchaudio==0.8.0 +torchmetrics==0.2.0 +torchsde +torchvision +tqdm==4.65.1 +tqdm-loggable==0.1.4 +trampoline==0.1.2 +transformers==4.31.0 +triton==2.0.0 +typing_extensions +tzdata==2023.3 +ujson==5.8.0 +urllib3==1.26.16 +uvicorn +uvloop==0.17.0 +watchfiles==0.19.0 +webcolors==1.13 +webdataset==0.2.48 +websocket-client==1.6.1 +websockets==11.0.3 +Werkzeug==2.3.6 +wldhx.yadisk-direct==0.0.6 +wrapt==1.15.0 +yarl==1.9.2 +zipp==3.16.2