diff --git a/.conda.tensorflow/meta.yaml b/.conda.tensorflow/meta.yaml index bd487e0..98f000d 100644 --- a/.conda.tensorflow/meta.yaml +++ b/.conda.tensorflow/meta.yaml @@ -2,7 +2,7 @@ package: name: tensorflow - version: 2.10.1 + version: 2.7.0 about: home: https://tensorflow.org @@ -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: ../ @@ -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: diff --git a/.github/workflows/build_tensorflow.yml b/.github/workflows/build_tensorflow.yml index c997b65..53a382b 100644 --- a/.github/workflows/build_tensorflow.yml +++ b/.github/workflows/build_tensorflow.yml @@ -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 @@ -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) @@ -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' @@ -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 diff --git a/requirements.tensorflow.txt b/requirements.tensorflow.txt index d0a393c..355cf5d 100644 --- a/requirements.tensorflow.txt +++ b/requirements.tensorflow.txt @@ -1 +1,2 @@ -tensorflow==2.10.1 \ No newline at end of file +# tensorflow==2.10.1 # https://github.com/talmolab/sleap/issues/1721 +tensorflow==2.7.0 # 2.7.0 worked in the past \ No newline at end of file