Skip to content
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

OS-specific installation #235

Merged
merged 7 commits into from
Mar 11, 2024
Merged
Show file tree
Hide file tree
Changes from 4 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
2 changes: 1 addition & 1 deletion .github/workflows/docs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
- uses: conda-incubator/setup-miniconda@v2
with:
activate-environment: gt4sd
environment-file: conda.yml
environment-file: conda_cpu_linux.yml
auto-activate-base: false
use-only-tar-bz2: true
- name: Build docs
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
- uses: conda-incubator/setup-miniconda@v2
with:
activate-environment: gt4sd
environment-file: conda.yml
environment-file: conda_cpu_linux.yml
auto-activate-base: false
use-only-tar-bz2: true
- name: Install gt4sd from source
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ If you would like to contribute to the package, we recommend the following devel
5. Create and activate a dedicated conda environment:

```sh
conda env create -f conda.yml
conda env create -f conda_cpu_mac.yml
jannisborn marked this conversation as resolved.
Show resolved Hide resolved
conda activate gt4sd
```

Expand Down
10 changes: 4 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,12 @@ The recommended way to install the `gt4sd` is to create a dedicated conda enviro
```sh
git clone https://github.com/GT4SD/gt4sd-core.git
cd gt4sd-core/
conda env create -f conda.yml
conda env create -f conda_cpu_mac.yml # for linux use conda_cpu_linux.yml
conda activate gt4sd
pip install gt4sd
```

**NOTE 1:** By default `gt4sd` is installed with CPU requirements. For GPU usage replace `conda env create -f conda.yml` with:
**NOTE 1:** By default `gt4sd` is installed with CPU requirements. For GPU usage replace with:
jannisborn marked this conversation as resolved.
Show resolved Hide resolved
```sh
conda env create -f conda_gpu.yml
```
Expand All @@ -59,12 +59,10 @@ A few VCS dependencies require Git LFS (make sure it's available on your system)

### Development setup & installation

If you would like to contribute to the package, we recommend the following development setup:
If you would like to contribute to the package, we recommend to install gt4sd in
editable mode inside your `conda` environment:

```sh
conda env create -f conda.yml
conda activate gt4sd
# install gt4sd in editable mode
pip install --no-deps -e .
```

Expand Down
File renamed without changes.
18 changes: 18 additions & 0 deletions conda_cpu_mac.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
name: gt4sd
channels:
- https://conda.anaconda.org/pytorch
- https://conda.anaconda.org/nvidia
- https://conda.anaconda.org/pyg
- https://conda.anaconda.org/conda-forge
dependencies:
- python>=3.7,<3.9
- pip>=19.1,<20.3
- pytorch>=1.0,<=1.12.1
- cpuonly
- pytorch-scatter<=2.0.9
- pip:
- -r requirements.txt
- -r cpu_requirements.txt
- -r vcs_requirements.txt
# development
- -r dev_requirements.txt
4 changes: 2 additions & 2 deletions docs/source/gt4sd_inference_usage_md.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ This notebook show the basic usage of the GT4SD algorithms.

### A note on the setup

In the following we assume that the toolkit has been setup using the provided `conda.yml` as follows:
In the following we assume that the toolkit has been setup using your preferred `conda` `yml` file as follows:
jannisborn marked this conversation as resolved.
Show resolved Hide resolved

```{code-block} sh
# create and activate environment
conda env create -f conda.yml
conda env create -f conda_cpu_mac.yml # or conda_cpu_linux.yml or conda_gpu.yml
conda activate gt4sd
# install the toolkit
pip install .
Expand Down
Loading