From 7ad2355b1da53861bb75312edead8f9db0b0f44d Mon Sep 17 00:00:00 2001 From: Lincoln Stein Date: Sat, 12 Nov 2022 15:14:33 +0000 Subject: [PATCH] documentation fixes --- docs/installation/INSTALL_MANUAL.md | 18 +++++++++++------- docs/installation/index.md | 5 +++++ ldm/generate.py | 2 +- 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/docs/installation/INSTALL_MANUAL.md b/docs/installation/INSTALL_MANUAL.md index 8657dff11b..fd53d32131 100644 --- a/docs/installation/INSTALL_MANUAL.md +++ b/docs/installation/INSTALL_MANUAL.md @@ -79,7 +79,7 @@ command-line completion. | :----------------------: | :----------------------------: | | environment-lin-amd.yml | Linux with an AMD (ROCm) GPU | | environment-lin-cuda.yml | Linux with an NVIDIA CUDA GPU | - | environment-mac.yml | Macintosh | + | environment-mac.yml | Macintosh | | environment-win-cuda.yml | Windows with an NVIDA CUDA GPU | @@ -108,10 +108,10 @@ command-line completion. === "Windows" - !!! todo " Since it requires admin privileges to create links, we will use the copy (cp) command to create your `environment.yml`" + !!! todo " Since it requires admin privileges to create links, we will use the copy command to create your `environment.yml`" ```cmd - cp environments-and-requirements\environment-win-cuda.yml environment.yml + copy environments-and-requirements\environment-win-cuda.yml environment.yml ``` Afterwards verify that the file `environment.yml` has been created, either via the @@ -121,6 +121,8 @@ command-line completion. dir ``` + !!! warning "Do not try to run conda on directly on the subdirectory environments file. This won't work. Instead, copy or link it to the top-level directory as shown." + 6. Create the conda environment: ```bash @@ -287,17 +289,19 @@ steps: === "Windows" - !!! info "since admin privileges are required to make links, so we use the copy (`cp`) command instead" + !!! info "on Windows, admin privileges are required to make links, so we use the copy command instead" ```cmd - cp environments-and-requirements\requirements-lin-win-colab-cuda.txt requirements.txt + copy environments-and-requirements\requirements-lin-win-colab-cuda.txt requirements.txt ``` !!! warning - Please do not link or copy `environments-and-requirements/requirements.txt`. + Please do not link or copy `environments-and-requirements/requirements-base.txt`. This is a base requirements file that does not have the platform-specific - libraries. + libraries. Also, be sure to link or copy the platform-specific file to + a top-level file named `requirements.txt` as shown here. Running pip on + a requirements file in a subdirectory will not work as expected. When this is done, confirm that a file named `requirements.txt` has been created in the InvokeAI root directory and that it points to the correct diff --git a/docs/installation/index.md b/docs/installation/index.md index 8058644b5e..2ede7061de 100644 --- a/docs/installation/index.md +++ b/docs/installation/index.md @@ -16,6 +16,11 @@ experience and preferences. work", don't have an interest in tinkering with it, and do not care about upgrading to unreleased experimental features. + *Note that this script has difficulty on some Macintosh machines + that have previously been used for Python development due to + conflicting development tools versions. Mac developers may wish + to try method (2) or one of the manual methods instead. + 2. [Source code installer](INSTALL_SOURCE.md) This is a script that will install InvokeAI and all its essential diff --git a/ldm/generate.py b/ldm/generate.py index 4cabeb6810..ca9fd7691c 100644 --- a/ldm/generate.py +++ b/ldm/generate.py @@ -569,7 +569,7 @@ class Generate: elif args.seed >= 0: seed = args.seed else: - seed = random.randrange(0, np.iinfo(np.uint32).max) + seed = random.randrange(0, np.iinfo(np.uint32).max) if opt.prompt is not None: prompt = opt.prompt