Skip to content

Fix two typos in the install guide #206

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 27, 2020
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions content/en/installing-python-and-numpy-guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ On all of Windows, macOS and Linux:
#### Windows or macOS

- Install [Miniconda](https://docs.conda.io/en/latest/miniconda.html)
- Keep the `base` conda environment minimal, and use one or more
- Keep the `base` conda environment minimal, and use one or more
[conda environments](https://docs.conda.io/projects/conda/en/latest/user-guide/tasks/manage-environments.html#)
to install the package you need for the task or project you're working on.
- Unless you're fine with only the packages in the `defaults` channel, make `conda-forge`
Expand All @@ -54,15 +54,15 @@ able to use the latest versions of libraries:

If you use a GPU:
- Install [Miniconda](https://docs.conda.io/en/latest/miniconda.html)
- Keep the `base` conda environment minimal, and use one or more
- Keep the `base` conda environment minimal, and use one or more
[conda environments](https://docs.conda.io/projects/conda/en/latest/user-guide/tasks/manage-environments.html#)
to install the package you need for the task or project you're working on.
- Use the `defaults` conda channel (`conda-forge` doesn't have good support for
GPU packages yet)

Otherwise:
- Install [Miniforge](https://github.com/conda-forge/miniforge)
- Keep the `base` conda environment minimal, and use one or more
- Keep the `base` conda environment minimal, and use one or more
[conda environments](https://docs.conda.io/projects/conda/en/latest/user-guide/tasks/manage-environments.html#)
to install the package you need for the task or project you're working on.

Expand Down Expand Up @@ -173,7 +173,7 @@ now have two copies of OpenBLAS on disk.
In the Conda defaults channel, NumPy is built against Intel MKL. MKL is a
separate package that will be installed in the user's environment when she
installs NumPy. That MKL package is a lot larger than OpenBLAS, several hundred
MB. MKL is typically a little faster and more robust than OpenBLAS.
MB. MKL is typically a little faster and more robust than OpenBLAS.

In the conda-forge channel, NumPy is built against a dummy "BLAS" package. When
the user install NumPy from conda-forge, that BLAS package then gets installed
Expand All @@ -189,8 +189,8 @@ consider:
- Both MKL and OpenBLAS will use multi-threading for function calls like
`np.dot`, with the number of threads being determined by both a build-time
option and an environment variable. Often all CPU cores will be used. This is
sometimes unexpected for users; NumPy itself doesn't auto-parallize any
sometimes unexpected for users; NumPy itself doesn't auto-parallelize any
function calls. It can also be harmful for performance, for example when
using another level of parallellization manually or with, e.g. Dask or
using another level of parallelization manually or with, e.g. Dask or
scikit-learn functionality.