Skip to content

Commit

Permalink
fix lint and change onnxruntime version
Browse files Browse the repository at this point in the history
  • Loading branch information
Ghassen-Chaabouni committed Jun 14, 2024
1 parent c89c91f commit 131eea4
Show file tree
Hide file tree
Showing 5 changed files with 36 additions and 16 deletions.
2 changes: 1 addition & 1 deletion envs/environment-gpu.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ dependencies:
- python=3.8
- pip=21.3
- pip:
- onnxruntime-gpu==1.9.0
- onnxruntime-gpu==1.18.0
- -r ../requirements.txt
25 changes: 18 additions & 7 deletions requirements-dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,12 @@ colorama==0.4.6
# ipython
# pytest
# tqdm
coloredlogs==15.0.1
# via onnxruntime-gpu
coverage==6.4.2
# via pytest-cov
# via
# coverage
# pytest-cov
customtkinter==5.2.0
# via dot (setup.cfg)
cycler==0.11.0
Expand All @@ -60,7 +64,7 @@ dlib==19.19.0
# via dot (setup.cfg)
executing==0.8.3
# via stack-data
face-alignment==1.3.3
face-alignment==1.4.1
# via dot (setup.cfg)
filelock==3.7.1
# via
Expand All @@ -71,9 +75,11 @@ flake8==3.9.2
flatbuffers==2.0
# via
# mediapipe
# onnxruntime
# onnxruntime-gpu
fonttools==4.43.0
# via matplotlib
humanfriendly==10.0
# via coloredlogs
identify==2.5.1
# via pre-commit
idna==2.10
Expand Down Expand Up @@ -130,15 +136,15 @@ numpy==1.22.0
# matplotlib
# mediapipe
# numba
# onnxruntime
# onnxruntime-gpu
# opencv-contrib-python
# opencv-python
# pywavelets
# scikit-image
# scipy
# tifffile
# torchvision
onnxruntime==1.9.0
onnxruntime-gpu==1.18.0
# via dot (setup.cfg)
opencv-contrib-python==4.5.5.62
# via
Expand All @@ -152,6 +158,7 @@ packaging==21.3
# via
# kornia
# matplotlib
# onnxruntime-gpu
# pytest
# scikit-image
parso==0.8.3
Expand Down Expand Up @@ -183,7 +190,7 @@ protobuf==3.20.2
# via
# dot (setup.cfg)
# mediapipe
# onnxruntime
# onnxruntime-gpu
pure-eval==0.2.2
# via stack-data
py==1.11.0
Expand All @@ -204,6 +211,8 @@ pyparsing==3.0.9
# via
# matplotlib
# packaging
pyreadline3==3.4.1
# via humanfriendly
pytest==7.1.2
# via
# dot (setup.cfg)
Expand Down Expand Up @@ -243,7 +252,9 @@ sounddevice==0.4.6
stack-data==0.3.0
# via ipython
sympy==1.12
# via torch
# via
# onnxruntime-gpu
# torch
tifffile==2022.5.4
# via scikit-image
toml==0.10.2
Expand Down
21 changes: 15 additions & 6 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ colorama==0.4.6
# click
# pytest
# tqdm
coloredlogs==15.0.1
# via onnxruntime-gpu
customtkinter==5.2.0
# via dot (setup.cfg)
cycler==0.11.0
Expand All @@ -31,16 +33,18 @@ dlib==19.19.0
# via dot (setup.cfg)
exceptiongroup==1.1.2
# via pytest
face-alignment==1.3.3
face-alignment==1.4.1
# via dot (setup.cfg)
filelock==3.12.2
# via torch
flatbuffers==2.0
# via
# mediapipe
# onnxruntime
# onnxruntime-gpu
fonttools==4.43.0
# via matplotlib
humanfriendly==10.0
# via coloredlogs
idna==2.10
# via requests
imageio==2.19.3
Expand Down Expand Up @@ -77,15 +81,15 @@ numpy==1.22.0
# matplotlib
# mediapipe
# numba
# onnxruntime
# onnxruntime-gpu
# opencv-contrib-python
# opencv-python
# pywavelets
# scikit-image
# scipy
# tifffile
# torchvision
onnxruntime==1.9.0
onnxruntime-gpu==1.18.0
# via dot (setup.cfg)
opencv-contrib-python==4.5.5.62
# via
Expand All @@ -99,6 +103,7 @@ packaging==21.3
# via
# kornia
# matplotlib
# onnxruntime-gpu
# pytest
# scikit-image
pillow==10.0.1
Expand All @@ -114,13 +119,15 @@ protobuf==3.20.2
# via
# dot (setup.cfg)
# mediapipe
# onnxruntime
# onnxruntime-gpu
pycparser==2.21
# via cffi
pyparsing==3.0.9
# via
# matplotlib
# packaging
pyreadline3==3.4.1
# via humanfriendly
pytest==7.4.0
# via dot (setup.cfg)
python-dateutil==2.8.2
Expand All @@ -147,7 +154,9 @@ six==1.16.0
sounddevice==0.4.6
# via mediapipe
sympy==1.12
# via torch
# via
# onnxruntime-gpu
# torch
tifffile==2022.5.4
# via scikit-image
tomli==2.0.1
Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ install_requires =
kornia
mediapipe
numpy
onnxruntime
onnxruntime-gpu==1.18.0
opencv-contrib-python
opencv_python
Pillow
Expand Down
2 changes: 1 addition & 1 deletion src/dot/fomm/face_alignment.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import numpy as np
import torch
from face_alignment.folder_data import FolderData
from face_alignment.utils import * # noqa
from face_alignment.utils import crop, draw_gaussian, flip, get_image, get_preds_fromhm
from packaging import version
from tqdm import tqdm

Expand Down

0 comments on commit 131eea4

Please sign in to comment.