Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update to new TensorFlow conda package #1726

Merged
merged 20 commits into from
Apr 8, 2024
Merged

Update to new TensorFlow conda package #1726

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
4c7e96d
Build conda package locally
eberrigan Mar 25, 2024
76f1dbc
Try 2.8.4
eberrigan Mar 27, 2024
77549b5
Merge develop into branch to fix dependencies
eberrigan Mar 29, 2024
f820228
Change tensorflow version to 2.7.4 in where conda packages are used
eberrigan Mar 29, 2024
165eae0
Make tensorflow requirements in pypi looser
eberrigan Mar 29, 2024
4541ac7
Merge branch 'develop' into elizabeth/change-TensorFlow-version-in-co…
talmo Mar 29, 2024
b2d4ece
Conda package has TensorFlow 2.7.0 and h5py and numpy installed via c…
eberrigan Apr 1, 2024
ef5521e
Change tensorflow version in `environment_no_cuda.yml` to test using CI
eberrigan Apr 1, 2024
8972dd7
Test new sleap/tensorflow package
talmo Apr 7, 2024
2de2de3
Reset build number
talmo Apr 8, 2024
5cbcf1f
Bump version
talmo Apr 8, 2024
9aa66a4
Update mac deps
talmo Apr 8, 2024
5285ad4
Update to Arm64 Mac runners
talmo Apr 8, 2024
059326d
pin `importlib-metadata`
eberrigan Apr 8, 2024
2972027
Merge remote-tracking branch 'origin/elizabeth/change-TensorFlow-vers…
eberrigan Apr 8, 2024
a5de8a6
Pin more stuff on mac
talmo Apr 8, 2024
a7349a5
constrain `opencv` version due to new qt dependencies
eberrigan Apr 8, 2024
ff266e0
Update more mac stuff
talmo Apr 8, 2024
f0f8462
Patches to get to green
talmo Apr 8, 2024
1960cf8
More mac skipping
talmo Apr 8, 2024
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
11 changes: 7 additions & 4 deletions .conda/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ source:
path: ../

build:
number: 1
number: 0

requirements:
host:
Expand All @@ -32,7 +32,8 @@ requirements:
# unnecessary pypi packages are installed via the build script (bld.bat, build.sh)
- conda-forge::attrs ==21.4.0
- conda-forge::cattrs ==1.1.1
- conda-forge::h5py ==3.1 # [not win]
# - conda-forge::h5py ==3.1 # [not win]
- conda-forge::h5py ==3.7.0
- conda-forge::jsmin
- conda-forge::jsonpickle ==1.2
- conda-forge::networkx
Expand Down Expand Up @@ -62,7 +63,8 @@ requirements:
- conda-forge::cudatoolkit ==11.3.1
- conda-forge::cudnn=8.2.1
- nvidia::cuda-nvcc=11.3
- conda-forge::h5py ==3.1 # [not win]
# - conda-forge::h5py ==3.1 # [not win]
- conda-forge::h5py ==3.7.0
- conda-forge::jsmin
- conda-forge::jsonpickle ==1.2
- conda-forge::networkx
Expand All @@ -83,7 +85,8 @@ requirements:
- conda-forge::scikit-learn ==1.0
- conda-forge::scikit-video
- conda-forge::seaborn
- sleap::tensorflow >=2.6.3,<2.11 # No windows GPU support for >2.10, sleap channel has 2.6.3
# - sleap::tensorflow >=2.6.3,<2.11 # No windows GPU support for >2.10, sleap channel has 2.6.3
- sleap/label/dev::tensorflow ==2.7.0
- conda-forge::tensorflow-hub <0.14.0 # Causes pynwb conflicts on linux GH-1446
- conda-forge::qudida
- conda-forge::albumentations
Expand Down
3 changes: 2 additions & 1 deletion environment.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@ dependencies:
- conda-forge::scikit-learn ==1.0
- conda-forge::scikit-video
- conda-forge::seaborn
- sleap::tensorflow >=2.6.3,<2.11 # No windows GPU support for >2.10
# - sleap::tensorflow >=2.6.3,<2.11 # No windows GPU support for >2.10
- sleap/label/dev::tensorflow ==2.7.0
- conda-forge::tensorflow-hub # Pinned in meta.yml, but no problems here... yet
- conda-forge::qudida
- conda-forge::albumentations
Expand Down
3 changes: 2 additions & 1 deletion environment_no_cuda.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@ dependencies:
- conda-forge::scikit-learn ==1.0
- conda-forge::scikit-video
- conda-forge::seaborn
- sleap::tensorflow >=2.6.3,<2.11 # No windows GPU support for >2.10
# - sleap::tensorflow >=2.6.3,<2.11 # No windows GPU support for >2.10
- sleap/label/dev::tensorflow ==2.7.0
- conda-forge::tensorflow-hub
- conda-forge::qudida
- conda-forge::albumentations
Expand Down
1 change: 1 addition & 0 deletions pypi_requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ scikit-learn ==1.0.*
scikit-video
seaborn
tensorflow>=2.6.3,<2.9; platform_machine != 'arm64'
# tensorflow ==2.7.4; platform_machine != 'arm64'
tensorflow-hub<=0.14.0
albumentations
ndx-pose
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ tensorflow-macos==2.9.2; sys_platform == 'darwin' and platform_machine == 'arm64
tensorflow-metal==0.5.0; sys_platform == 'darwin' and platform_machine == 'arm64'

# Conda installing results in https://github.com/h5py/h5py/issues/2037
h5py<3.2; sys_platform == 'win32' # Newer versions result in error above, linking issue in Linux
# h5py<3.2; sys_platform == 'win32' # Newer versions result in error above, linking issue in Linux
pynwb>=2.3.3 # 2.0.0 required by ndx-pose, 2.3.3 fixes importlib-metadata incompatibility
2 changes: 1 addition & 1 deletion sleap/version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"""


__version__ = "1.3.3"
__version__ = "1.4.0"


def versions():
Expand Down
Loading