Skip to content

Commit

Permalink
drop poetry and conda
Browse files Browse the repository at this point in the history
  • Loading branch information
nim65s committed Jun 18, 2024
1 parent 24d5c4f commit 3f49bc2
Show file tree
Hide file tree
Showing 10 changed files with 214 additions and 5,109 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/conda-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:
if: steps.cache.outputs.cache-hit != 'true'

- name: Install happypose
run: pip install -e .
run: pip install -r requirements/cpu.lock

- name: Download pre-trained models required for tests
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pip-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
run: pip install -U pip

- name: Install happypose
run: pip install ".[cpu,multiview,pypi]" --extra-index-url https://download.pytorch.org/whl/cpu
run: pip install -r requirements/cpu.lock

- name: Download pre-trained models required for tests
run: |
Expand Down
58 changes: 0 additions & 58 deletions .github/workflows/poetry-test.yml

This file was deleted.

14 changes: 3 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

[![Conda](https://github.com/agimus-project/happypose/actions/workflows/conda-test.yml/badge.svg)](https://github.com/agimus-project/happypose/actions/workflows/conda-test.yml)
[![Pip](https://github.com/agimus-project/happypose/actions/workflows/pip-test.yml/badge.svg)](https://github.com/agimus-project/happypose/actions/workflows/pip-test.yml)
[![Poetry](https://github.com/agimus-project/happypose/actions/workflows/poetry-test.yml/badge.svg)](https://github.com/agimus-project/happypose/actions/workflows/poetry-test.yml)
[![Book](https://github.com/agimus-project/happypose/actions/workflows/book.yml/badge.svg)](https://github.com/agimus-project/happypose/actions/workflows/book.yml)

[![pre-commit.ci status](https://results.pre-commit.ci/badge/github/agimus-project/happypose/main.svg)](https://results.pre-commit.ci/latest/github/agimus-project/happypose/main)
Expand All @@ -16,7 +15,7 @@ Toolbox and trackers for object pose-estimation. Based on the work [CosyPose](ht

## Installation

To install happypose, you can use pip or poetry.
To install happypose, you can use pip.

We strongly suggest to install it in either a
[venv](https://docs.python.org/fr/3/library/venv.html) or a
Expand All @@ -29,7 +28,7 @@ git clone --branch dev --recurse-submodules https://github.com/agimus-project/ha
cd happypose
conda env create -f environment.yml
conda activate happypose
pip install .
pip install -r requirements/YOUR_DEVICE.lock # you *must* choose between cpu / cu121
```

### Example with venv
Expand All @@ -39,16 +38,9 @@ git clone --branch dev --recurse-submodules https://github.com/agimus-project/ha
cd happypose
python -m venv .venv
source .venv/bin/activate
pip install .[pypi,cpu] --extra-index-url https://download.pytorch.org/whl/cpu
pip install -r requirements/YOUR_DEVICE.lock # you *must* choose between cpu / cu121
```

### Install extras:

- `cpu`: required to get pytorch CPU from PyPI (don't use this for GPU or with conda)
- `gpu`: required to get pytorch GPU from PyPI (don't use this for CPU or with conda)
- `multiview`: installs cosypose c++ extension
- `pypi`: install pinocchio & opencv from PyPI (don't use this with conda)

## Create data directory

```
Expand Down
22 changes: 1 addition & 21 deletions environment.yml
Original file line number Diff line number Diff line change
@@ -1,21 +1 @@
name: happypose_torch2
channels:
- conda-forge
- pytorch
- nvidia
- anaconda
- defaults
dependencies:
- pytorch-cuda==12.1
- python=3.9
- pip
- pytorch==2.1
- torchvision==0.16
- mkl==2024.0.0
- geckodriver
- firefox
- opencv
- pinocchio
- torchtnt
- pip:
- torchnet
name: happypose
Loading

0 comments on commit 3f49bc2

Please sign in to comment.