Skip to content

Commit

Permalink
cleaning up comfyui package more
Browse files Browse the repository at this point in the history
  • Loading branch information
doctorpangloss committed Aug 22, 2023
1 parent 99c791c commit e78ab13
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 9 deletions.
15 changes: 8 additions & 7 deletions spellsource-art-generation/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ plugins {
}


import org.apache.tools.ant.taskdefs.condition.Os
import org.openapitools.generator.gradle.plugin.tasks.GenerateTask

// Top-level declarations
Expand Down Expand Up @@ -33,24 +32,26 @@ tasks.register('venv') {
}
}

["comfyui", "spellsource_art_generation"].each { packageName ->
[["comfyui", "comfy"], ["spellsource_art_generation", "spellsource_art_generation"]].each { tuple ->
def dirName = tuple[0]
def packageName = tuple[1]
tasks.register("${packageName}_installEditable") {
dependsOn 'venv'
inputs.files "$packageName/requirements.txt", "$packageName/setup.py"
outputs.dir "${sitePackagesDir}/${packageName}-0.0.1.dist-info"
inputs.files "$dirName/requirements.txt", "$dirName/setup.py"
outputs.cacheIf { true }
outputs.file "${sitePackagesDir}/__editable__.${packageName}-0.0.1.pth"

doLast {
exec {
workingDir(project.layout.projectDirectory)
commandLine "${scriptsDir}/pip", 'install', "-e", "./$packageName"
workingDir(project.layout.projectDirectory.dir(dirName))
commandLine "${scriptsDir}/pip", 'install', "-e", "."
}
}
}
}

tasks.register('install') {
dependsOn "comfyui_installEditable", "spellsource_art_generation_installEditable"
dependsOn "comfy_installEditable", "spellsource_art_generation_installEditable"
}

tasks.register("downloadModels") {
Expand Down
2 changes: 1 addition & 1 deletion spellsource-art-generation/comfyui
Submodule comfyui updated 95 files
+8 −8 comfy/api/__init__.py
+2 −0 comfy/api/configuration.py
+22 −0 comfy/api/exceptions.py
+2 −2 comfy/cldm/cldm.py
+2 −2 comfy/clip_vision.py
+1 −1 comfy/cmd/cuda_malloc.py
+8 −8 comfy/cmd/execution.py
+2 −2 comfy/cmd/latent_preview.py
+8 −8 comfy/cmd/main.py
+13 −13 comfy/cmd/server.py
+0 −0 comfy/comfy_extras/__init__.py
+0 −0 comfy/comfy_extras/chainner_models/__init__.py
+0 −0 comfy/comfy_extras/chainner_models/architecture/HAT.py
+0 −0 comfy/comfy_extras/chainner_models/architecture/LICENSE-ESRGAN
+0 −0 comfy/comfy_extras/chainner_models/architecture/LICENSE-HAT
+0 −0 comfy/comfy_extras/chainner_models/architecture/LICENSE-RealESRGAN
+0 −0 comfy/comfy_extras/chainner_models/architecture/LICENSE-SPSR
+0 −0 comfy/comfy_extras/chainner_models/architecture/LICENSE-SwiftSRGAN
+0 −0 comfy/comfy_extras/chainner_models/architecture/LICENSE-Swin2SR
+0 −0 comfy/comfy_extras/chainner_models/architecture/LICENSE-SwinIR
+0 −0 comfy/comfy_extras/chainner_models/architecture/LICENSE-lama
+0 −0 comfy/comfy_extras/chainner_models/architecture/LICENSE-mat
+0 −0 comfy/comfy_extras/chainner_models/architecture/LaMa.py
+0 −0 comfy/comfy_extras/chainner_models/architecture/MAT.py
+0 −0 comfy/comfy_extras/chainner_models/architecture/OmniSR/ChannelAttention.py
+0 −0 comfy/comfy_extras/chainner_models/architecture/OmniSR/LICENSE
+0 −0 comfy/comfy_extras/chainner_models/architecture/OmniSR/OSA.py
+0 −0 comfy/comfy_extras/chainner_models/architecture/OmniSR/OSAG.py
+0 −0 comfy/comfy_extras/chainner_models/architecture/OmniSR/OmniSR.py
+0 −0 comfy/comfy_extras/chainner_models/architecture/OmniSR/esa.py
+0 −0 comfy/comfy_extras/chainner_models/architecture/OmniSR/layernorm.py
+0 −0 comfy/comfy_extras/chainner_models/architecture/OmniSR/pixelshuffle.py
+0 −0 comfy/comfy_extras/chainner_models/architecture/RRDB.py
+0 −0 comfy/comfy_extras/chainner_models/architecture/SPSR.py
+0 −0 comfy/comfy_extras/chainner_models/architecture/SRVGG.py
+0 −0 comfy/comfy_extras/chainner_models/architecture/SwiftSRGAN.py
+0 −0 comfy/comfy_extras/chainner_models/architecture/Swin2SR.py
+0 −0 comfy/comfy_extras/chainner_models/architecture/SwinIR.py
+0 −0 comfy/comfy_extras/chainner_models/architecture/__init__.py
+0 −0 comfy/comfy_extras/chainner_models/architecture/block.py
+0 −0 comfy/comfy_extras/chainner_models/architecture/face/LICENSE-GFPGAN
+0 −0 comfy/comfy_extras/chainner_models/architecture/face/LICENSE-RestoreFormer
+0 −0 comfy/comfy_extras/chainner_models/architecture/face/LICENSE-codeformer
+0 −0 comfy/comfy_extras/chainner_models/architecture/face/arcface_arch.py
+0 −0 comfy/comfy_extras/chainner_models/architecture/face/codeformer.py
+0 −0 comfy/comfy_extras/chainner_models/architecture/face/fused_act.py
+0 −0 comfy/comfy_extras/chainner_models/architecture/face/gfpgan_bilinear_arch.py
+0 −0 comfy/comfy_extras/chainner_models/architecture/face/gfpganv1_arch.py
+0 −0 comfy/comfy_extras/chainner_models/architecture/face/gfpganv1_clean_arch.py
+0 −0 comfy/comfy_extras/chainner_models/architecture/face/restoreformer_arch.py
+0 −0 comfy/comfy_extras/chainner_models/architecture/face/stylegan2_arch.py
+0 −0 comfy/comfy_extras/chainner_models/architecture/face/stylegan2_bilinear_arch.py
+0 −0 comfy/comfy_extras/chainner_models/architecture/face/stylegan2_clean_arch.py
+0 −0 comfy/comfy_extras/chainner_models/architecture/face/upfirdn2d.py
+0 −0 comfy/comfy_extras/chainner_models/architecture/mat/utils.py
+0 −0 comfy/comfy_extras/chainner_models/architecture/timm/LICENSE
+0 −0 comfy/comfy_extras/chainner_models/architecture/timm/drop.py
+0 −0 comfy/comfy_extras/chainner_models/architecture/timm/helpers.py
+0 −0 comfy/comfy_extras/chainner_models/architecture/timm/weight_init.py
+0 −0 comfy/comfy_extras/chainner_models/model_loading.py
+0 −0 comfy/comfy_extras/chainner_models/types.py
+0 −0 comfy/comfy_extras/nodes/__init__.py
+0 −0 comfy/comfy_extras/nodes/nodes_canny.py
+1 −1 comfy/comfy_extras/nodes/nodes_clip_sdxl.py
+3 −3 comfy/comfy_extras/nodes/nodes_hypernetwork.py
+1 −1 comfy/comfy_extras/nodes/nodes_mask.py
+9 −10 comfy/comfy_extras/nodes/nodes_model_merging.py
+3 −3 comfy/comfy_extras/nodes/nodes_post_processing.py
+0 −0 comfy/comfy_extras/nodes/nodes_rebatch.py
+0 −0 comfy/comfy_extras/nodes/nodes_tomesd.py
+8 −8 comfy/comfy_extras/nodes/nodes_upscale_model.py
+1 −1 comfy/diffusers_load.py
+4 −4 comfy/ldm/models/autoencoder.py
+1 −1 comfy/ldm/models/diffusion/ddim.py
+2 −2 comfy/ldm/models/diffusion/plms.py
+12 −13 comfy/ldm/modules/attention.py
+29 −29 comfy/ldm/modules/diffusionmodules/model.py
+9 −7 comfy/ldm/modules/diffusionmodules/openaimodel.py
+1 −1 comfy/ldm/modules/diffusionmodules/upscaling.py
+4 −4 comfy/ldm/modules/diffusionmodules/util.py
+1 −1 comfy/ldm/modules/sub_quadratic_attention.py
+4 −4 comfy/model_base.py
+1 −1 comfy/model_management.py
+40 −42 comfy/nodes/base_nodes.py
+3 −3 comfy/nodes/package.py
+5 −5 comfy/sample.py
+2 −2 comfy/samplers.py
+55 −58 comfy/sd.py
+2 −2 comfy/sd1_clip.py
+1 −1 comfy/sd2_clip.py
+1 −1 comfy/sdxl_clip.py
+4 −0 comfy/t2i_adapter/adapter.py
+2 −2 comfy/utils.py
+7 −0 notebooks/comfyui_colab.ipynb
+2 −2 setup.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
comfyui
comfy
diffusers>=0.16.1
bitsandbytes>=0.40.1
rembg

0 comments on commit e78ab13

Please sign in to comment.