Added conda-forge channel to environment.yaml to make it so nodejs and yarn can be installed with it as part of the environment for the UI. (#1655)

This commit is contained in:
Alejandro Gil 2022-11-09 23:52:00 -08:00 committed by GitHub
commit 94abf30e99
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 1 deletions

View File

@ -27,6 +27,7 @@ general:
gpu: 0
outdir: outputs
default_model: "Stable Diffusion v1.5"
base_model: "Stable Diffusion v1.5"
default_model_config: "configs/stable-diffusion/v1-inference.yaml"
default_model_path: "models/ldm/stable-diffusion-v1/Stable Diffusion v1.5.ckpt"
use_sd_concepts_library: True

View File

@ -15,6 +15,7 @@ name: ldm
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
channels:
- conda-forge
- pytorch
- defaults
- nvidia

View File

@ -1502,7 +1502,7 @@ def load_sd_model(model_name: str):
"""Loads Stable Diffusion model by name"""
ckpt_path = st.session_state.defaults.general.default_model_path
if model_name != st.session_state.defaults.general.default_model:
if model_name != st.session_state.defaults.general.base_model:
ckpt_path = os.path.join("models", "custom", f"{model_name}.ckpt")
if st.session_state.defaults.general.optimized: