Skip to content

Commit

Permalink
Build using tensorflow 2.6.3 (talmolab#660)
Browse files Browse the repository at this point in the history
  • Loading branch information
talmo authored Feb 24, 2022
1 parent 56d5172 commit 24f0b39
Show file tree
Hide file tree
Showing 6 changed files with 26 additions and 19 deletions.
8 changes: 5 additions & 3 deletions .conda/bld.bat
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,18 @@ set PIP_NO_INDEX=False
set PIP_NO_DEPENDENCIES=False
set PIP_IGNORE_INSTALLED=False

@REM pip install numpy>=1.19.5,<=1.21.5
pip install numpy==1.19.5
pip install six==1.15.0
pip install imageio==2.15.0
pip install attrs==21.2.0
pip install cattrs==1.1.1
pip install jsonpickle==1.2
pip install networkx
@REM pip install tensorflow>=2.6.3,<=2.7.1
@REM pip install h5py>=3.1.0,<=3.6.0
pip install python-rapidjson
pip install opencv-python-headless>=4.2.0.34,<=4.5.5.62
pip install opencv-python @ git+https://github.com/talmolab/wrap_opencv-python-headless.git@ede49f6a23a73033216339f29515e59d594ba921
@REM pip install opencv-python-headless>=4.2.0.34,<=4.5.5.62
@REM pip install opencv-python @ git+https://github.com/talmolab/wrap_opencv-python-headless.git@ede49f6a23a73033216339f29515e59d594ba921
@REM pip install pandas
pip install psutil
@REM pip install PySide2>=5.13.2,<=5.14.1
Expand Down
8 changes: 5 additions & 3 deletions .conda/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,18 @@ export PIP_NO_INDEX=False
export PIP_NO_DEPENDENCIES=False
export PIP_IGNORE_INSTALLED=False

# pip install numpy>=1.19.5,<=1.21.5
pip install numpy==1.19.5
pip install six==1.15.0
pip install imageio==2.15.0
pip install attrs==21.2.0
pip install cattrs==1.1.1
pip install jsonpickle==1.2
pip install networkx
# pip install tensorflow>=2.6.3,<=2.7.1
# pip install h5py>=3.1.0,<=3.6.0
pip install python-rapidjson
pip install opencv-python-headless==4.5.5.62
pip install git+https://github.com/talmolab/wrap_opencv-python-headless.git@ede49f6a23a73033216339f29515e59d594ba921
# pip install opencv-python-headless==4.5.5.62
# pip install git+https://github.com/talmolab/wrap_opencv-python-headless.git@ede49f6a23a73033216339f29515e59d594ba921
# pip install pandas
pip install psutil
# pip install PySide2>=5.13.2,<=5.14.1
Expand Down
16 changes: 9 additions & 7 deletions .conda/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ about:
summary: {{ data.get('description') }}

build:
number: 1
number: 4

source:
path: ../
Expand All @@ -25,11 +25,12 @@ requirements:
host:
- python=3.7
# - sleap::pyside2=5.14.1
- conda-forge::numpy=1.21.5
- sleap::tensorflow=2.7.0
- conda-forge::numpy=1.19.5
- sleap::tensorflow=2.6.3
- conda-forge::pyside2=5.13.2
- conda-forge::h5py=3.6.0
- conda-forge::h5py=3.1.0
- conda-forge::scipy=1.7.3
- conda-forge::six=1.15.0
- pillow=8.4.0
- shapely=1.7.1
- conda-forge::pandas
Expand All @@ -38,11 +39,12 @@ requirements:

run:
- python=3.7
- conda-forge::numpy>=1.19.5,<=1.21.5
- sleap::tensorflow>=2.6.3,<=2.7.1
- conda-forge::numpy~=1.19.5
- sleap::tensorflow=2.6.3
- conda-forge::pyside2>=5.13.2,<=5.14.1
- conda-forge::h5py>=3.1.0,<=3.6.0
- conda-forge::h5py~=3.1.0
- conda-forge::scipy>=1.4.1,<=1.7.3
- conda-forge::six~=1.15.0
- pillow=8.4.0
- shapely=1.7.1
- conda-forge::pandas
Expand Down
10 changes: 5 additions & 5 deletions environment_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ name: sleap

dependencies:
- python=3.7
- conda-forge::numpy>=1.19.5,<=1.21.5
- sleap::tensorflow>=2.6.3,<=2.7.1
- conda-forge::pyside2>=5.13.2,<=5.14.1
- conda-forge::h5py>=3.1.0,<=3.6.0
- conda-forge::scipy>=1.4.1,<=1.7.3
- conda-forge::numpy=1.19.5
- sleap::tensorflow=2.6.3
- conda-forge::pyside2=5.13.2
- conda-forge::h5py=3.1.0
- conda-forge::scipy=1.7.3
- pillow=8.4.0
- shapely=1.7.1
- conda-forge::pandas
Expand Down
1 change: 1 addition & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ psutil
PySide2>=5.13.2,<=5.14.1
pyzmq
pyyaml
imageio<=2.15.0
imgaug==0.4.0
scipy>=1.4.1,<=1.7.3
scikit-image
Expand Down
2 changes: 1 addition & 1 deletion sleap/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"""


__version__ = "1.2.0a5"
__version__ = "1.2.0a6"


def versions():
Expand Down

0 comments on commit 24f0b39

Please sign in to comment.