From a3456c7e4a8ebaa674b07187c5ff9b390283b438 Mon Sep 17 00:00:00 2001 From: Evan Smothers Date: Mon, 16 Oct 2023 14:36:26 -0700 Subject: [PATCH 1/8] [just testing] Move off of nightly releases --- .github/workflows/nightly_build.yaml | 10 ++-------- README.md | 6 +++--- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/.github/workflows/nightly_build.yaml b/.github/workflows/nightly_build.yaml index 97a8b505d..fe215371a 100644 --- a/.github/workflows/nightly_build.yaml +++ b/.github/workflows/nightly_build.yaml @@ -1,12 +1,7 @@ name: Build/Push Nightly Binary on: - schedule: - # * is a special character in YAML so you have to quote this string - # Runs at midnight every day - - cron: '0 0 * * *' - # manual trigger - workflow_dispatch: + pull_request: defaults: run: @@ -44,8 +39,7 @@ jobs: run: python -m pip install --upgrade setuptools wheel twine - name: Install dependencies run: | - python -m pip install --pre torch torchvision torchtext torchaudio --extra-index-url \ - https://download.pytorch.org/whl/nightly/cpu + python -m pip install torch torchvision torchtext torchaudio python -m pip install -r requirements.txt - name: Test installation of dependencies run: | diff --git a/README.md b/README.md index f22b60ce5..39d346f17 100644 --- a/README.md +++ b/README.md @@ -24,11 +24,11 @@ The following assumes conda is installed. ``` # Use the current CUDA version as seen [here](https://pytorch.org/get-started/locally/) - # Select the nightly Pytorch build, Linux as the OS, and conda. Pick the most recent CUDA version. - conda install pytorch torchvision torchtext torchaudio pytorch-cuda=\ -c pytorch-nightly -c nvidia + # Select the stable Pytorch build, Linux as the OS, and conda. Pick the most recent CUDA version. + conda install pytorch torchvision torchtext torchaudio pytorch-cuda=\ -c pytorch -c nvidia # For CPU-only install - conda install pytorch torchvision torchtext torchaudio cpuonly -c pytorch-nightly + conda install pytorch torchvision torchtext torchaudio cpuonly -c pytorch ``` ### Install from binaries From c7235deb45d1d03c3397efb5ecd9df54c09b65ee Mon Sep 17 00:00:00 2001 From: Evan Smothers Date: Mon, 16 Oct 2023 14:52:34 -0700 Subject: [PATCH 2/8] add init file to fix unit tests --- torchmultimodal/models/video_gpt/__init__.py | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 torchmultimodal/models/video_gpt/__init__.py diff --git a/torchmultimodal/models/video_gpt/__init__.py b/torchmultimodal/models/video_gpt/__init__.py new file mode 100644 index 000000000..2e41cd717 --- /dev/null +++ b/torchmultimodal/models/video_gpt/__init__.py @@ -0,0 +1,5 @@ +# Copyright (c) Meta Platforms, Inc. and affiliates. +# All rights reserved. +# +# This source code is licensed under the BSD-style license found in the +# LICENSE file in the root directory of this source tree. From efb0c789f7c5de38cc199bbaa42c912c8fb67392 Mon Sep 17 00:00:00 2001 From: Evan Smothers Date: Mon, 16 Oct 2023 15:05:38 -0700 Subject: [PATCH 3/8] test stable version for GHA unit test config --- .github/workflows/unit_test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/unit_test.yaml b/.github/workflows/unit_test.yaml index b2632390e..256b29c65 100644 --- a/.github/workflows/unit_test.yaml +++ b/.github/workflows/unit_test.yaml @@ -29,7 +29,7 @@ jobs: run: python -m pip install --upgrade pip - name: Install dependencies run: | - conda install pytorch torchvision torchtext torchaudio cpuonly -c pytorch-nightly + conda install pytorch torchvision torchtext torchaudio cpuonly -c pytorch python -m pip install -e ".[dev]" - name: Run unit tests with coverage run: pytest tests --cov=. --cov-report=xml --durations=20 -vv From 0528a89ee6a23161b8125e142cef1f5ca041bb43 Mon Sep 17 00:00:00 2001 From: Evan Smothers Date: Mon, 16 Oct 2023 15:21:40 -0700 Subject: [PATCH 4/8] test adding extra index url back --- .github/workflows/nightly_build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/nightly_build.yaml b/.github/workflows/nightly_build.yaml index fe215371a..5a2ebf19b 100644 --- a/.github/workflows/nightly_build.yaml +++ b/.github/workflows/nightly_build.yaml @@ -39,7 +39,7 @@ jobs: run: python -m pip install --upgrade setuptools wheel twine - name: Install dependencies run: | - python -m pip install torch torchvision torchtext torchaudio + python -m pip install torch torchvision torchtext torchaudio --extra-index-url https://download.pytorch.org/whl/cpu python -m pip install -r requirements.txt - name: Test installation of dependencies run: | From 9f0f7723d9a999cb246123e9215b05456f153ab5 Mon Sep 17 00:00:00 2001 From: Evan Smothers Date: Mon, 16 Oct 2023 15:35:00 -0700 Subject: [PATCH 5/8] torchtext stable only --- .github/workflows/nightly_build.yaml | 5 ++++- .github/workflows/unit_test.yaml | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/nightly_build.yaml b/.github/workflows/nightly_build.yaml index 5a2ebf19b..af43edf9e 100644 --- a/.github/workflows/nightly_build.yaml +++ b/.github/workflows/nightly_build.yaml @@ -39,7 +39,10 @@ jobs: run: python -m pip install --upgrade setuptools wheel twine - name: Install dependencies run: | - python -m pip install torch torchvision torchtext torchaudio --extra-index-url https://download.pytorch.org/whl/cpu + python -m pip install --pre torch torchvision torchaudio --extra-index-url \ + https://download.pytorch.org/whl/nightly/cpu + python -m pip install torchtext --extra-index-url \ + https://download.pytorch.org/whl/cpu python -m pip install -r requirements.txt - name: Test installation of dependencies run: | diff --git a/.github/workflows/unit_test.yaml b/.github/workflows/unit_test.yaml index 256b29c65..066ea3dbd 100644 --- a/.github/workflows/unit_test.yaml +++ b/.github/workflows/unit_test.yaml @@ -29,7 +29,8 @@ jobs: run: python -m pip install --upgrade pip - name: Install dependencies run: | - conda install pytorch torchvision torchtext torchaudio cpuonly -c pytorch + conda install pytorch torchvision torchaudio cpuonly -c pytorch-nightly + conda install torchtext cpuonly -c pytorch python -m pip install -e ".[dev]" - name: Run unit tests with coverage run: pytest tests --cov=. --cov-report=xml --durations=20 -vv From ddd6f3e248577d383abda327bc8ea9b29985d0d0 Mon Sep 17 00:00:00 2001 From: Evan Smothers Date: Mon, 16 Oct 2023 15:39:08 -0700 Subject: [PATCH 6/8] install torchtext first --- .github/workflows/nightly_build.yaml | 4 ++-- .github/workflows/unit_test.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/nightly_build.yaml b/.github/workflows/nightly_build.yaml index af43edf9e..2e8f97def 100644 --- a/.github/workflows/nightly_build.yaml +++ b/.github/workflows/nightly_build.yaml @@ -39,10 +39,10 @@ jobs: run: python -m pip install --upgrade setuptools wheel twine - name: Install dependencies run: | - python -m pip install --pre torch torchvision torchaudio --extra-index-url \ - https://download.pytorch.org/whl/nightly/cpu python -m pip install torchtext --extra-index-url \ https://download.pytorch.org/whl/cpu + python -m pip install --pre torch torchvision torchaudio --extra-index-url \ + https://download.pytorch.org/whl/nightly/cpu python -m pip install -r requirements.txt - name: Test installation of dependencies run: | diff --git a/.github/workflows/unit_test.yaml b/.github/workflows/unit_test.yaml index 066ea3dbd..b6c306f44 100644 --- a/.github/workflows/unit_test.yaml +++ b/.github/workflows/unit_test.yaml @@ -29,8 +29,8 @@ jobs: run: python -m pip install --upgrade pip - name: Install dependencies run: | - conda install pytorch torchvision torchaudio cpuonly -c pytorch-nightly conda install torchtext cpuonly -c pytorch + conda install pytorch torchvision torchaudio cpuonly -c pytorch-nightly python -m pip install -e ".[dev]" - name: Run unit tests with coverage run: pytest tests --cov=. --cov-report=xml --durations=20 -vv From 0e5d7984e21ba33fccdbe513bc31800bb41c1109 Mon Sep 17 00:00:00 2001 From: Evan Smothers Date: Mon, 16 Oct 2023 15:45:35 -0700 Subject: [PATCH 7/8] revert nightly build changes --- .github/workflows/nightly_build.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/nightly_build.yaml b/.github/workflows/nightly_build.yaml index 2e8f97def..3327c983a 100644 --- a/.github/workflows/nightly_build.yaml +++ b/.github/workflows/nightly_build.yaml @@ -39,9 +39,7 @@ jobs: run: python -m pip install --upgrade setuptools wheel twine - name: Install dependencies run: | - python -m pip install torchtext --extra-index-url \ - https://download.pytorch.org/whl/cpu - python -m pip install --pre torch torchvision torchaudio --extra-index-url \ + python -m pip install --pre torch torchvision torchtext torchaudio --extra-index-url \ https://download.pytorch.org/whl/nightly/cpu python -m pip install -r requirements.txt - name: Test installation of dependencies From 2806f116fd5368116679322cac2924a82a350f09 Mon Sep 17 00:00:00 2001 From: Evan Smothers Date: Mon, 16 Oct 2023 15:45:35 -0700 Subject: [PATCH 8/8] revert nightly build changes --- .github/workflows/unit_test.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/unit_test.yaml b/.github/workflows/unit_test.yaml index b6c306f44..b2632390e 100644 --- a/.github/workflows/unit_test.yaml +++ b/.github/workflows/unit_test.yaml @@ -29,8 +29,7 @@ jobs: run: python -m pip install --upgrade pip - name: Install dependencies run: | - conda install torchtext cpuonly -c pytorch - conda install pytorch torchvision torchaudio cpuonly -c pytorch-nightly + conda install pytorch torchvision torchtext torchaudio cpuonly -c pytorch-nightly python -m pip install -e ".[dev]" - name: Run unit tests with coverage run: pytest tests --cov=. --cov-report=xml --durations=20 -vv