Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
4 changes: 1 addition & 3 deletions conda-environments/DEEPLABCUT_M1.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,4 @@ dependencies:
- ffmpeg
- apple::tensorflow-deps
- pip:
- tensorflow-macos
- tensorflow-metal
- -e ../[gui]
- -e ../[gui,apple_mchips]
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ scikit-image>=0.17
scikit-learn>=1.0
scipy>=1.4,<1.11.0
statsmodels>=0.11
tensorflow>=2.0
tensorflow>=2.0,<2.13.0
tables==3.7.0
tensorpack==0.11
tf_slim==1.1.0
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
"openvino": ["openvino-dev==2022.1.0"],
"docs": ["numpydoc"],
"tf": ["tensorflow>=2.0,<=2.10"], # Last supported TF version on Windows Native is 2.10
"apple_mchips": ["tensorflow-macos","tensorflow-metal"],
"apple_mchips": ["tensorflow-macos<2.13.0","tensorflow-metal"],
"modelzoo": ["huggingface_hub"],
},
scripts=["deeplabcut/pose_estimation_tensorflow/models/pretrained/download.sh"],
Expand Down
2 changes: 1 addition & 1 deletion tests/test_trackingutils.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ def test_ellipse_similarity(ellipse):
def test_ellipse_fitter():
fitter = trackingutils.EllipseFitter()
assert fitter.fit(np.random.rand(2, 2)) is None
xy = np.asarray([[-2, 0], [2, 0], [0, 1], [0, -1]], dtype=np.float)
xy = np.asarray([[-2, 0], [2, 0], [0, 1], [0, -1]], dtype=float)
assert fitter.fit(xy) is not None
fitter.sd = 0
el = fitter.fit(xy)
Expand Down