Skip to content

Commit

Permalink
Merge branch 'develop' into track-progress
Browse files Browse the repository at this point in the history
  • Loading branch information
roomrys authored Oct 2, 2024
2 parents 2e9b45a + 10aae76 commit ca956ae
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions .conda/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ requirements:
- conda-forge::seaborn
- conda-forge::qudida
- conda-forge::albumentations
- conda-forge::ndx-pose
- conda-forge::ndx-pose <0.2.0
- conda-forge::importlib-metadata ==4.11.4
run:
- conda-forge::python ==3.7.12 # Run into _MAX_WINDOWS_WORKERS not found if <
Expand Down Expand Up @@ -90,7 +90,7 @@ requirements:
- conda-forge::tensorflow-hub <0.14.0 # Causes pynwb conflicts on linux GH-1446
- conda-forge::qudida
- conda-forge::albumentations
- conda-forge::ndx-pose
- conda-forge::ndx-pose <0.2.0
- conda-forge::importlib-metadata ==4.11.4

# This no longer works so we have moved it to the build workflow
Expand Down
4 changes: 2 additions & 2 deletions .conda_mac/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ requirements:
- conda-forge::seaborn
- conda-forge::qudida
- conda-forge::albumentations
- conda-forge::ndx-pose
- conda-forge::ndx-pose <0.2.0

run:
- conda-forge::python >=3.9.0, <3.10.0
Expand Down Expand Up @@ -89,7 +89,7 @@ requirements:
# - conda-forge::tensorflow-hub # pulls in tensorflow cpu from conda-forge
- conda-forge::qudida
- conda-forge::albumentations
- conda-forge::ndx-pose
- conda-forge::ndx-pose <0.2.0

# test:
# imports:
Expand Down
2 changes: 1 addition & 1 deletion environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ dependencies:
- conda-forge::tensorflow-hub # Pinned in meta.yml, but no problems here... yet
- conda-forge::qudida
- conda-forge::albumentations
- conda-forge::ndx-pose
- conda-forge::ndx-pose <0.2.0

# Packages required by tensorflow to find/use GPUs
- conda-forge::cudatoolkit ==11.3.1
Expand Down
2 changes: 1 addition & 1 deletion environment_mac.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,6 @@ dependencies:
# - conda-forge::tensorflow-hub # pulls in tensorflow cpu from conda-forge
- conda-forge::qudida
- conda-forge::albumentations
- conda-forge::ndx-pose
- conda-forge::ndx-pose <0.2.0
- pip:
- "--editable=.[conda_dev]"
2 changes: 1 addition & 1 deletion environment_no_cuda.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ dependencies:
- conda-forge::tensorflow-hub
- conda-forge::qudida
- conda-forge::albumentations
- conda-forge::ndx-pose
- conda-forge::ndx-pose <0.2.0

- pip:
- "--editable=.[conda_dev]"
2 changes: 1 addition & 1 deletion pypi_requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ tensorflow>=2.6.3,<2.9; platform_machine != 'arm64'
# tensorflow ==2.7.4; platform_machine != 'arm64'
tensorflow-hub<=0.14.0
albumentations
ndx-pose
ndx-pose<0.2.0
# These dependencies are untested since we do not offer a wheel for apple silicon atm.
tensorflow-macos==2.9.2; sys_platform == 'darwin' and platform_machine == 'arm64'
tensorflow-metal==0.5.0; sys_platform == 'darwin' and platform_machine == 'arm64'
Expand Down

0 comments on commit ca956ae

Please sign in to comment.