From 9d4a1450c718f59661659994de8ef17f5857a61c Mon Sep 17 00:00:00 2001 From: biswaroop1547 Date: Fri, 28 Jul 2023 12:22:03 +0000 Subject: [PATCH 1/3] fix: #71 by making REFINER_ID env variable --- dfs-diffusers/docker/gpu/Dockerfile | 2 +- dfs-diffusers/download.py | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dfs-diffusers/docker/gpu/Dockerfile b/dfs-diffusers/docker/gpu/Dockerfile index b7bf86a..258a334 100644 --- a/dfs-diffusers/docker/gpu/Dockerfile +++ b/dfs-diffusers/docker/gpu/Dockerfile @@ -11,7 +11,7 @@ RUN pip3 install --no-cache-dir -r requirements.txt COPY download.py . -RUN python3 download.py --model $MODEL_ID --refiner $REFINER_ID +RUN python3 download.py --model $MODEL_ID COPY . . diff --git a/dfs-diffusers/download.py b/dfs-diffusers/download.py index 98df28e..cf85add 100644 --- a/dfs-diffusers/download.py +++ b/dfs-diffusers/download.py @@ -1,4 +1,5 @@ import argparse +import os import torch from diffusers import ( @@ -10,7 +11,7 @@ parser = argparse.ArgumentParser() parser.add_argument("--model", help="Model to download") -parser.add_argument("--refiner", required=False, help="Refiner model to download") +REFINER_ID = os.environ.get("REFINER_ID", "") args = parser.parse_args() print(f"Downloading model {args.model}") @@ -25,8 +26,8 @@ def download_model(): _ = StableDiffusionLatentUpscalePipeline.from_pretrained( args.model, torch_dtype=torch.float16 ) - if args.refiner: - _ = DiffusionPipeline.from_pretrained(args.refiner, torch_dtype=torch.float16) + if REFINER_ID: + _ = DiffusionPipeline.from_pretrained(REFINER_ID, torch_dtype=torch.float16) download_model() From 95bcb36b935b5ef6dff0729cdde38c7fe554166d Mon Sep 17 00:00:00 2001 From: Casper da Costa-Luis Date: Fri, 28 Jul 2023 13:41:19 +0100 Subject: [PATCH 2/3] Revert "fix: #71 by making REFINER_ID env variable" This reverts commit 9d4a1450c718f59661659994de8ef17f5857a61c. --- dfs-diffusers/docker/gpu/Dockerfile | 2 +- dfs-diffusers/download.py | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dfs-diffusers/docker/gpu/Dockerfile b/dfs-diffusers/docker/gpu/Dockerfile index 258a334..b7bf86a 100644 --- a/dfs-diffusers/docker/gpu/Dockerfile +++ b/dfs-diffusers/docker/gpu/Dockerfile @@ -11,7 +11,7 @@ RUN pip3 install --no-cache-dir -r requirements.txt COPY download.py . -RUN python3 download.py --model $MODEL_ID +RUN python3 download.py --model $MODEL_ID --refiner $REFINER_ID COPY . . diff --git a/dfs-diffusers/download.py b/dfs-diffusers/download.py index cf85add..98df28e 100644 --- a/dfs-diffusers/download.py +++ b/dfs-diffusers/download.py @@ -1,5 +1,4 @@ import argparse -import os import torch from diffusers import ( @@ -11,7 +10,7 @@ parser = argparse.ArgumentParser() parser.add_argument("--model", help="Model to download") -REFINER_ID = os.environ.get("REFINER_ID", "") +parser.add_argument("--refiner", required=False, help="Refiner model to download") args = parser.parse_args() print(f"Downloading model {args.model}") @@ -26,8 +25,8 @@ def download_model(): _ = StableDiffusionLatentUpscalePipeline.from_pretrained( args.model, torch_dtype=torch.float16 ) - if REFINER_ID: - _ = DiffusionPipeline.from_pretrained(REFINER_ID, torch_dtype=torch.float16) + if args.refiner: + _ = DiffusionPipeline.from_pretrained(args.refiner, torch_dtype=torch.float16) download_model() From 784d4934adc9c4048f02305896556f031800cc8d Mon Sep 17 00:00:00 2001 From: Casper da Costa-Luis Date: Fri, 28 Jul 2023 13:44:44 +0100 Subject: [PATCH 3/3] fix bug --- dfs-diffusers/docker/gpu/Dockerfile | 2 +- dfs-diffusers/download.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dfs-diffusers/docker/gpu/Dockerfile b/dfs-diffusers/docker/gpu/Dockerfile index b7bf86a..bb8a63f 100644 --- a/dfs-diffusers/docker/gpu/Dockerfile +++ b/dfs-diffusers/docker/gpu/Dockerfile @@ -11,7 +11,7 @@ RUN pip3 install --no-cache-dir -r requirements.txt COPY download.py . -RUN python3 download.py --model $MODEL_ID --refiner $REFINER_ID +RUN python3 download.py --model $MODEL_ID --refiner "$REFINER_ID" COPY . . diff --git a/dfs-diffusers/download.py b/dfs-diffusers/download.py index 98df28e..de68de4 100644 --- a/dfs-diffusers/download.py +++ b/dfs-diffusers/download.py @@ -10,7 +10,7 @@ parser = argparse.ArgumentParser() parser.add_argument("--model", help="Model to download") -parser.add_argument("--refiner", required=False, help="Refiner model to download") +parser.add_argument("--refiner", help="Refiner model to download") args = parser.parse_args() print(f"Downloading model {args.model}")