Skip to content

Commit

Permalink
Try conda tf 2.1 install, bump to v0.2.1a4
Browse files Browse the repository at this point in the history
  • Loading branch information
ntabris committed Mar 28, 2020
1 parent 0f65f73 commit 68789bc
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 8 deletions.
3 changes: 2 additions & 1 deletion .conda/bld.bat
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ rem # this out myself, ughhh.
set PIP_NO_INDEX=False
set PIP_NO_DEPENDENCIES=False
set PIP_IGNORE_INSTALLED=False
pip install tensorflow==2.1 opencv-python-headless==3.4.1.15 PySide2>=5.12.0 imgaug==0.3.0 cattrs==1.0.0rc0 qimage2ndarray==1.8 imgstore jsmin seaborn
pip install cattrs==1.0.0rc0 opencv-python-headless==3.4.1.15 PySide2>=5.12 imgaug==0.3.0 qimage2ndarray==1.8 imgstore jsmin seaborn
REM pip install tensorflow==2.1

rem # Use and update environment.yml call to install pip dependencies. This is slick.
rem # While environment.yml contains the non pip dependencies, the only thing left
Expand Down
3 changes: 2 additions & 1 deletion .conda/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ export PIP_NO_INDEX=False
export PIP_NO_DEPENDENCIES=False
export PIP_IGNORE_INSTALLED=False

pip install tensorflow==2.1 opencv-python-headless==3.4.1.15 PySide2>=5.12.0 imgaug==0.3.0 cattrs==1.0.0rc0 qimage2ndarray==1.8 imgstore jsmin seaborn
pip install cattrs==1.0.0rc0 opencv-python-headless==3.4.1.15 PySide2>=5.12 imgaug==0.3.0 qimage2ndarray==1.8 imgstore jsmin seaborn
#pip install tensorflow==2.1

pip install setuptools-scm

Expand Down
2 changes: 0 additions & 2 deletions .conda/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ requirements:
- attrs
- jsonpickle=1.2
- networkx
- tensorflow-gpu=2.0
- scikit-learn
- h5py
- pandas
Expand All @@ -41,7 +40,6 @@ requirements:
- attrs
- jsonpickle=1.2
- networkx
- tensorflow-gpu=2.0
- scikit-learn
- h5py
- pandas
Expand Down
5 changes: 2 additions & 3 deletions environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ dependencies:
- attrs
- jsonpickle=1.2
- networkx
- cudatoolkit=10.1.*
- cudnn
- tensorflow=2.1
- tensorboard=2.1
- scikit-learn
- h5py
- pandas
Expand All @@ -18,7 +18,6 @@ dependencies:
- python-rapidjson
- pip
- pip:
- tensorflow==2.1
- opencv-python-headless==3.4.1.15
- PySide2>=5.12.0
- imgaug==0.3.0
Expand Down
2 changes: 1 addition & 1 deletion sleap/version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "0.2.1a3"
__version__ = "0.2.1a4"

0 comments on commit 68789bc

Please sign in to comment.