Skip to content

Commit 7541734

Browse files
authored
Merge pull request #36 from IntelligentSensingAndRehabilitation/devcontainer_dev
MMCV Update and Devcontainer Development
2 parents 942bbf5 + 2f8246a commit 7541734

File tree

17 files changed

+893
-171
lines changed

17 files changed

+893
-171
lines changed

.devcontainer/devcontainer.json

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,28 @@
22
"name": "PosePipe Dev Container",
33
"dockerComposeFile": ["docker-compose.yaml"],
44
"service": "posepipe",
5-
"workspaceFolder": "/workspace",
5+
// "features": {
6+
// "ghcr.io/devcontainers/features/common-utils:2":{
7+
// "installZsh": "true",
8+
// "username": "vscode",
9+
// "userUid": "1000",
10+
// "userGid": "1000",
11+
// "upgradePackages": "true"
12+
// }
13+
// },
14+
"workspaceFolder": "/PosePipe",
615
"forwardPorts": [3306],
716
"postCreateCommand": "pip install ipykernel",
817
"customizations": {
9-
1018
"settings": {
11-
"python.pythonPath": "/usr/local/bin/python"
12-
},
13-
"vscode": {
14-
"extensions": [
15-
"ms-python.python",
16-
"ms-toolsai.jupyter"
17-
]
18-
}
19-
19+
"python.pythonPath": "/usr/local/bin/python"
20+
},
21+
"vscode": {
22+
"extensions": [
23+
"ms-python.python",
24+
"ms-toolsai.jupyter"
25+
]
26+
}
2027
}
28+
// "remoteUser": "vscode"
2129
}

.devcontainer/docker-compose.yaml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,19 @@ services:
66
context: ..
77
dockerfile: ./docker/Dockerfile
88
image: posepipe_dev
9-
runtime: nvidia
9+
deploy:
10+
resources:
11+
reservations:
12+
devices:
13+
- driver: nvidia
14+
count: 6
15+
capabilities: [gpu]
1016
env_file:
1117
- ../.env
1218
volumes:
13-
- ..:/workspace
19+
- ..:/PosePipe
1420
- '/datajoint_external:/datajoint_external'
21+
- ~/test_videos:/videos
1522

1623
# This service starts the datajoint database image
1724
db:

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
/datajoint_docker/data
2+
.devcontainer/data/
23

34
# Byte-compiled / optimized / DLL files
45
__pycache__/

CHANGELOG.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# Changelog - Pose Pipeline
2+
All notable changes to this project will be documented in this file.
3+
4+
The format is based on [Keep a Changelog](http://keepachangelog.com/)
5+
and this project adheres to [Calendar Versioning](https://calver.org/).
6+
7+
## [2024.01.14] - 2024-01-14
8+
- Initial Release
9+
10+
### Added
11+
- PosePipeline is now 'pip installable', with external dependencies automatically downloaded.
12+
- Transition to uv as package manager [[#33]](https://github.com/IntelligentSensingAndRehabilitation/PosePipeline/pull/33)
13+
- Breaking change with update to MMCV. [[#36]](https://github.com/IntelligentSensingAndRehabilitation/PosePipeline/pull/36)
14+

INSTALL.md

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,8 @@ dj.config['stores'] = {
2727
}
2828
```
2929

30-
4. Set the environment variables found in `pose_pipeline.env` based on the local installation. Follow the specific
31-
installations instructions for each one and also store the necessary network weights in the 3rdparty directory.
30+
4. To use `OpenMMLab` packages, the following additional step is required. Note: this assume `uv` is being used as the package manager.
3231

33-
MMPose files:
3432
```
35-
3rdparty/mmpose/checkpoints/hrnet_w48_coco_wholebody_384x288_dark-f5726563_20200918.pth
36-
3rdparty/mmpose/checkpoints/hrnet_w48_coco_384x288_dark-e881a4b6_20210203.pth
37-
3rdparty/mmpose/checkpoints/higher_hrnet48_coco_512x512-60fedcbc_20200712.pth
38-
3rdparty/mmpose/checkpoints/res50_coco_640x640-2046f9cb_20200822.pth
33+
uv run bash scripts/mmlab_install.sh
3934
```

0 commit comments

Comments
 (0)