Skip to content

Commit 739199c

Browse files
Merge pull request #32 from tomas-gajarsky/feature/portability
Feature/portability
2 parents 45e562a + ea2861a commit 739199c

File tree

11 files changed

+388
-457
lines changed

11 files changed

+388
-457
lines changed

.github/workflows/python-package.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
strategy:
1414
fail-fast: false
1515
matrix:
16-
python-version: ["3.9", "3.10"]
16+
python-version: ["3.8", "3.9", "3.10"]
1717

1818
steps:
1919
- uses: actions/checkout@v3

CHANGELOG.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,16 @@
11
# Change Log
22

3+
4+
## 0.2.0
5+
6+
Released on January 28, 2023.
7+
8+
### Added
9+
* Python 3.8 support
10+
* platform to Docker compose file for Apple Silicon M chips
11+
* Docker compose service for locking dependencies
12+
13+
314
## 0.1.5
415

516
Released on January 22, 2023.

README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,8 @@ Docker Compose provides an easy way of building a working facetorch environment
4747

4848
Check *data/output* for resulting images with bounding boxes and facial 3D landmarks.
4949

50+
(Apple Mac M1) Use Rosetta 2 emulator in Docker Desktop to run the CPU version.
51+
5052
### Configure
5153

5254
The project is configured by files located in *conf* with the main file: *conf/config.yaml*. One can easily add or remove modules from the configuration.
@@ -249,11 +251,13 @@ the requirements of the new model.
249251
CPU:
250252
* Add packages with corresponding versions to ```environment.yml``` file
251253
* Lock the environment: ```conda lock -p linux-64 -f environment.yml --lockfile conda-lock.yml```
254+
* (Alternative Docker) Lock the environment: ```docker compose -f docker-compose.dev.yml run facetorch-lock```
252255
* Install the locked environment: ```conda-lock install --name env conda-lock.yml```
253256

254257
GPU:
255258
* Add packages with corresponding versions to ```gpu.environment.yml``` file
256259
* Lock the environment: ```conda lock -p linux-64 -f gpu.environment.yml --lockfile gpu.conda-lock.yml```
260+
* (Alternative Docker) Lock the environment: ```docker compose -f docker-compose.dev.yml run facetorch-lock-gpu```
257261
* Install the locked environment: ```conda-lock install --name env gpu.conda-lock.yml```
258262

259263
### Run tests + coverage

0 commit comments

Comments
 (0)