Skip to content

Commit

Permalink
Merge pull request #2 from talmolab/elizabeth/Change-Tensorflow-version
Browse files Browse the repository at this point in the history
Rolling back to 2.7.0
  • Loading branch information
eberrigan authored Apr 7, 2024
2 parents bea4f16 + eaab62c commit 68aa2f5
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 20 deletions.
20 changes: 18 additions & 2 deletions .conda.tensorflow/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

package:
name: tensorflow
version: 2.10.1
version: 2.7.0

about:
home: https://tensorflow.org
Expand All @@ -12,7 +12,7 @@ about:
For GPU support, install cudatoolkit 11.3.1 and cudnn 8.2.1 which are available as conda packages on the default channel.'

build:
number: 1
number: 4

source:
path: ../
Expand All @@ -24,10 +24,26 @@ requirements:

host:
- python=3.7
- numpy
- h5py
- protobuf # 3.20.3 is what pip pulls in
- certifi # 2024.2.28 is what pip pulls in
- importlib-metadata # 6.7.0 is what pip pulls in
- six # 1.16.0 is what pip pulls in
- typing-extensions # 4.7.1 is what pip pulls in
- zipp # 3.15.0 is what pip pulls in
- pip

run:
- python=3.7
- numpy
- h5py
- protobuf
- certifi
- importlib-metadata
- six
- typing-extensions
- zipp
- pip

test:
Expand Down
19 changes: 2 additions & 17 deletions .github/workflows/build_tensorflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ jobs:
strategy:
fail-fast: false
matrix:
# os: ["ubuntu-20.04", "windows-2019", "macos-10.15"]
os: ["ubuntu-22.04", "windows-2022"]
steps:
# Setup
Expand Down Expand Up @@ -56,11 +55,6 @@ jobs:
shell: bash -l {0}
run: |
conda build .conda.tensorflow --output-folder build.tensorflow -c conda-forge
# - name: Build conda package (Mac)
# if: matrix.os == 'macos-10.15'
# shell: bash -l {0}
# run: |
# conda build .conda.tensorflow --output-folder build.tensorflow
# Upload conda package
- name: Upload to Anaconda (Windows)
Expand All @@ -70,7 +64,7 @@ jobs:
shell: powershell
run: |
anaconda login --username sleap --password "$env:ANACONDA_LOGIN"
anaconda -v upload "build.tensorflow\win-64\*.tar.bz2"
anaconda -v upload "build.tensorflow\win-64\*.tar.bz2" --label dev
anaconda logout
- name: Upload to Anaconda (Ubuntu)
if: matrix.os == 'ubuntu-22.04'
Expand All @@ -79,14 +73,5 @@ jobs:
shell: bash -l {0}
run: |
anaconda login --username sleap --password "$ANACONDA_LOGIN"
anaconda -v upload build.tensorflow/linux-64/*.tar.bz2
anaconda -v upload build.tensorflow/linux-64/*.tar.bz2 --label dev
anaconda logout
# - name: Upload to Anaconda (Mac)
# if: matrix.os == 'macos-10.15'
# env:
# ANACONDA_LOGIN: ${{ secrets.ANACONDA_LOGIN }}
# shell: bash -l {0}
# run: |
# anaconda login --username sleap --password "$ANACONDA_LOGIN"
# anaconda -v upload build.tensorflow/osx-64/*.tar.bz2
# anaconda logout
3 changes: 2 additions & 1 deletion requirements.tensorflow.txt
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
tensorflow==2.10.1
# tensorflow==2.10.1 # https://github.com/talmolab/sleap/issues/1721
tensorflow==2.7.0 # 2.7.0 worked in the past

0 comments on commit 68aa2f5

Please sign in to comment.