From f7d3f1e5caf675f1a0d1a172d382a0624b8d0165 Mon Sep 17 00:00:00 2001 From: Volpeon Date: Tue, 20 Dec 2022 13:31:11 +0100 Subject: Dependency cleanup/upgrades --- data/csv.py | 5 ++--- environment.yaml | 34 ++++++++++------------------------ 2 files changed, 12 insertions(+), 27 deletions(-) diff --git a/data/csv.py b/data/csv.py index 6525e45..d400757 100644 --- a/data/csv.py +++ b/data/csv.py @@ -3,7 +3,6 @@ import torch import json import numpy as np from pathlib import Path -import pytorch_lightning as pl from PIL import Image from torch.utils.data import Dataset, DataLoader, random_split from torchvision import transforms @@ -42,7 +41,7 @@ class CSVDataItem(NamedTuple): nprompt: str -class CSVDataModule(pl.LightningDataModule): +class CSVDataModule(): def __init__( self, batch_size: int, @@ -141,7 +140,7 @@ class CSVDataModule(pl.LightningDataModule): items = [ item for item in items - if "mode" in item and self.mode in item["mode"] + if "mode" in item and self.mode in item["mode"].split(", ") ] items = self.prepare_items(template, expansions, items) items = self.filter_items(items) diff --git a/environment.yaml b/environment.yaml index 57e090c..e598f72 100644 --- a/environment.yaml +++ b/environment.yaml @@ -5,34 +5,20 @@ channels: - defaults dependencies: - cudatoolkit=11.3 - - numpy=1.22.3 - - pip=20.3 - - python=3.9.13 - - pytorch=1.12.1 - - torchvision=0.13.1 - - pandas=1.4.3 - - xformers=0.0.15.dev344 + - numpy=1.23.4 + - pip=22.3.1 + - python=3.9.15 + - pytorch=1.13.1 + - torchvision=0.14.1 - pip: - -e . - - -e git+https://github.com/CompVis/taming-transformers.git@master#egg=taming-transformers - - -e git+https://github.com/openai/CLIP.git@main#egg=clip - - -e git+https://github.com/devilismyfriend/latent-diffusion#egg=latent-diffusion - -e git+https://github.com/huggingface/diffusers#egg=diffusers - - accelerate==0.12.0 - - albumentations==1.1.0 + - -e git+https://github.com/cloneofsimo/lora#egg=lora-diffusion + - accelerate==0.15.0 - bitsandbytes==0.35.4 - - einops==0.4.1 - - imageio==2.22.0 - - k-diffusion==0.0.12 - - kornia==0.6 - - pudb==2019.2 - - omegaconf==2.2.3 - - opencv-python-headless==4.6.0.66 - python-slugify>=6.1.2 - - pytorch-lightning==1.7.7 - - setuptools==59.5.0 + - setuptools==65.6.3 - test-tube>=0.7.5 - - torch-fidelity==0.3.0 - - torchmetrics==0.9.3 - transformers==4.25.1 - - triton==2.0.0.dev20221105 + - triton==2.0.0.dev20221202 + - xformers==0.0.16rc391 -- cgit v1.2.3-54-g00ecf