From b9469c3f2d3c43679d842f7d0ed92545d36175d6 Mon Sep 17 00:00:00 2001 From: eberrigan Date: Mon, 25 Mar 2024 08:35:50 -0700 Subject: [PATCH 01/13] Try 2.9.3 --- .conda.tensorflow/meta.yaml | 2 +- requirements.tensorflow.txt | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.conda.tensorflow/meta.yaml b/.conda.tensorflow/meta.yaml index bd487e0..8013226 100644 --- a/.conda.tensorflow/meta.yaml +++ b/.conda.tensorflow/meta.yaml @@ -2,7 +2,7 @@ package: name: tensorflow - version: 2.10.1 + version: 2.9.3 about: home: https://tensorflow.org diff --git a/requirements.tensorflow.txt b/requirements.tensorflow.txt index d0a393c..0525bbb 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.9.3 \ No newline at end of file From 67dec1614a1ee5bce9c2bd3808f29307b2a9e7e6 Mon Sep 17 00:00:00 2001 From: eberrigan Date: Mon, 25 Mar 2024 08:36:08 -0700 Subject: [PATCH 02/13] Add dev tag to build --- .github/workflows/build_tensorflow.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_tensorflow.yml b/.github/workflows/build_tensorflow.yml index c997b65..4dfb83b 100644 --- a/.github/workflows/build_tensorflow.yml +++ b/.github/workflows/build_tensorflow.yml @@ -70,7 +70,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,7 +79,7 @@ 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' From bc7e4ff9e409e14fa2a280d1040542888673339f Mon Sep 17 00:00:00 2001 From: eberrigan Date: Mon, 25 Mar 2024 08:38:07 -0700 Subject: [PATCH 03/13] Build when pushing to current branch --- .github/workflows/build_tensorflow.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build_tensorflow.yml b/.github/workflows/build_tensorflow.yml index 4dfb83b..aea9997 100644 --- a/.github/workflows/build_tensorflow.yml +++ b/.github/workflows/build_tensorflow.yml @@ -4,6 +4,7 @@ on: push: branches: - main + - elizabeth/Change-Tensorflow-version paths: - '.github/workflows/build_tensorflow.yml' - '.conda.tensorflow/**' From bbf2173faa7b98ab8b6fbd59b94a994e75754561 Mon Sep 17 00:00:00 2001 From: eberrigan Date: Mon, 25 Mar 2024 16:25:55 -0700 Subject: [PATCH 04/13] Try 2.8.4 --- .conda.tensorflow/meta.yaml | 2 +- requirements.tensorflow.txt | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.conda.tensorflow/meta.yaml b/.conda.tensorflow/meta.yaml index 8013226..fe9ba8e 100644 --- a/.conda.tensorflow/meta.yaml +++ b/.conda.tensorflow/meta.yaml @@ -2,7 +2,7 @@ package: name: tensorflow - version: 2.9.3 + version: 2.8.4 about: home: https://tensorflow.org diff --git a/requirements.tensorflow.txt b/requirements.tensorflow.txt index 0525bbb..68c4f19 100644 --- a/requirements.tensorflow.txt +++ b/requirements.tensorflow.txt @@ -1,2 +1,3 @@ # tensorflow==2.10.1 # https://github.com/talmolab/sleap/issues/1721 -tensorflow==2.9.3 \ No newline at end of file +# tensorflow==2.9.3 +tensorflow==2.8.4 \ No newline at end of file From 566bea7cb78c9bd92997f145dbc54eaebc79b9f4 Mon Sep 17 00:00:00 2001 From: Elizabeth Berrigan Date: Wed, 27 Mar 2024 08:41:15 -0700 Subject: [PATCH 05/13] Remove comment --- requirements.tensorflow.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/requirements.tensorflow.txt b/requirements.tensorflow.txt index 68c4f19..73d1ab2 100644 --- a/requirements.tensorflow.txt +++ b/requirements.tensorflow.txt @@ -1,3 +1,2 @@ # tensorflow==2.10.1 # https://github.com/talmolab/sleap/issues/1721 -# tensorflow==2.9.3 tensorflow==2.8.4 \ No newline at end of file From d0a5fe07c87bd3279e8226ecc9f7645c2a2f8349 Mon Sep 17 00:00:00 2001 From: Elizabeth Berrigan Date: Wed, 27 Mar 2024 09:42:38 -0700 Subject: [PATCH 06/13] Anaconda server down, pushing again --- requirements.tensorflow.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.tensorflow.txt b/requirements.tensorflow.txt index 73d1ab2..a6bdb07 100644 --- a/requirements.tensorflow.txt +++ b/requirements.tensorflow.txt @@ -1,2 +1,2 @@ # tensorflow==2.10.1 # https://github.com/talmolab/sleap/issues/1721 -tensorflow==2.8.4 \ No newline at end of file +tensorflow==2.8.4 # server overloaded, need to push again \ No newline at end of file From a84425e6af115c5e37a649d0c46ddf3ce5bfa99c Mon Sep 17 00:00:00 2001 From: Elizabeth Berrigan Date: Wed, 27 Mar 2024 12:17:06 -0700 Subject: [PATCH 07/13] Pushing again --- requirements.tensorflow.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.tensorflow.txt b/requirements.tensorflow.txt index a6bdb07..87dbdef 100644 --- a/requirements.tensorflow.txt +++ b/requirements.tensorflow.txt @@ -1,2 +1,2 @@ # tensorflow==2.10.1 # https://github.com/talmolab/sleap/issues/1721 -tensorflow==2.8.4 # server overloaded, need to push again \ No newline at end of file +tensorflow==2.8.4 # I don't see windows version on anaconda, pushing again \ No newline at end of file From 55822d0f810ebc8ad63448dbbd6a0074b4f64801 Mon Sep 17 00:00:00 2001 From: Elizabeth Berrigan Date: Fri, 29 Mar 2024 08:24:21 -0700 Subject: [PATCH 08/13] Trying TensorFlow version 2.7.4 --- .conda.tensorflow/meta.yaml | 2 +- requirements.tensorflow.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.conda.tensorflow/meta.yaml b/.conda.tensorflow/meta.yaml index fe9ba8e..8945faa 100644 --- a/.conda.tensorflow/meta.yaml +++ b/.conda.tensorflow/meta.yaml @@ -2,7 +2,7 @@ package: name: tensorflow - version: 2.8.4 + version: 2.7.4 about: home: https://tensorflow.org diff --git a/requirements.tensorflow.txt b/requirements.tensorflow.txt index 87dbdef..151f067 100644 --- a/requirements.tensorflow.txt +++ b/requirements.tensorflow.txt @@ -1,2 +1,2 @@ # tensorflow==2.10.1 # https://github.com/talmolab/sleap/issues/1721 -tensorflow==2.8.4 # I don't see windows version on anaconda, pushing again \ No newline at end of file +tensorflow==2.7.4 # 2.7.0 worked in the past \ No newline at end of file From 3ff8c4876e402e46ef1b871c3b6b62d948d15c5b Mon Sep 17 00:00:00 2001 From: Elizabeth Berrigan Date: Sun, 31 Mar 2024 14:09:02 -0700 Subject: [PATCH 09/13] Add numpy and h5py as conda dependencies --- .conda.tensorflow/meta.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.conda.tensorflow/meta.yaml b/.conda.tensorflow/meta.yaml index 8945faa..b5a352e 100644 --- a/.conda.tensorflow/meta.yaml +++ b/.conda.tensorflow/meta.yaml @@ -24,10 +24,14 @@ requirements: host: - python=3.7 + - numpy + - h5py - pip run: - python=3.7 + - numpy + - h5py - pip test: From d4683d6411230f1a6dcbcdb6ae6025dc6cbd82b5 Mon Sep 17 00:00:00 2001 From: Elizabeth Berrigan Date: Sun, 31 Mar 2024 14:10:20 -0700 Subject: [PATCH 10/13] try tensorflow version 2.7.0, which worked in the past --- .conda.tensorflow/meta.yaml | 4 ++-- requirements.tensorflow.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.conda.tensorflow/meta.yaml b/.conda.tensorflow/meta.yaml index b5a352e..868596c 100644 --- a/.conda.tensorflow/meta.yaml +++ b/.conda.tensorflow/meta.yaml @@ -2,7 +2,7 @@ package: name: tensorflow - version: 2.7.4 + 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: 2 source: path: ../ diff --git a/requirements.tensorflow.txt b/requirements.tensorflow.txt index 151f067..355cf5d 100644 --- a/requirements.tensorflow.txt +++ b/requirements.tensorflow.txt @@ -1,2 +1,2 @@ # tensorflow==2.10.1 # https://github.com/talmolab/sleap/issues/1721 -tensorflow==2.7.4 # 2.7.0 worked in the past \ No newline at end of file +tensorflow==2.7.0 # 2.7.0 worked in the past \ No newline at end of file From 28defbb1e3af1cf812c41d8cc562354f5a2d2c5c Mon Sep 17 00:00:00 2001 From: Elizabeth Berrigan Date: Sun, 7 Apr 2024 15:03:35 -0700 Subject: [PATCH 11/13] change build number --- .conda.tensorflow/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.conda.tensorflow/meta.yaml b/.conda.tensorflow/meta.yaml index 868596c..5f75a09 100644 --- a/.conda.tensorflow/meta.yaml +++ b/.conda.tensorflow/meta.yaml @@ -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: 2 + number: 4 source: path: ../ From 6f6d129dba68304c85f902cdddd97f31ab8566b6 Mon Sep 17 00:00:00 2001 From: Elizabeth Berrigan Date: Sun, 7 Apr 2024 15:04:16 -0700 Subject: [PATCH 12/13] clean-up workflow --- .github/workflows/build_tensorflow.yml | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/.github/workflows/build_tensorflow.yml b/.github/workflows/build_tensorflow.yml index aea9997..53a382b 100644 --- a/.github/workflows/build_tensorflow.yml +++ b/.github/workflows/build_tensorflow.yml @@ -4,7 +4,6 @@ on: push: branches: - main - - elizabeth/Change-Tensorflow-version paths: - '.github/workflows/build_tensorflow.yml' - '.conda.tensorflow/**' @@ -18,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 @@ -57,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) @@ -82,12 +75,3 @@ jobs: anaconda login --username sleap --password "$ANACONDA_LOGIN" 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 From eaab62c3df2c37520bfab73d7870a214396ad21a Mon Sep 17 00:00:00 2001 From: Elizabeth Berrigan Date: Sun, 7 Apr 2024 15:28:57 -0700 Subject: [PATCH 13/13] add conda dependencies that give `ClobberWarning` --- .conda.tensorflow/meta.yaml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.conda.tensorflow/meta.yaml b/.conda.tensorflow/meta.yaml index 5f75a09..98f000d 100644 --- a/.conda.tensorflow/meta.yaml +++ b/.conda.tensorflow/meta.yaml @@ -26,12 +26,24 @@ requirements: - 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: