diff --git a/.github/workflows/build_test_release.yaml b/.github/workflows/build_test_release.yaml index daf3a7fc..153a2fff 100644 --- a/.github/workflows/build_test_release.yaml +++ b/.github/workflows/build_test_release.yaml @@ -40,24 +40,15 @@ jobs: echo "::endgroup::" echo "::group::Setup virtual environment" - if [[ ${{ inputs.python3-minor-version }} -gt 7 ]]; - then - conda install -y python=${python_version} mkl mkl-include conda-build pyyaml numpy ipython - conda install -y -c conda-forge libpython-static=${python_version} - conda install -y pytorch torchvision torchaudio cpuonly -c pytorch - conda clean -ya; - else - conda deactivate - pip install virtualenv - git clone https://github.com/pyenv/pyenv.git ~/.pyenv - export CFLAGS="-fPIC -g" - ~/.pyenv/bin/pyenv install --force ${python_version} - virtualenv -p ~/.pyenv/versions/$(~/.pyenv/bin/pyenv latest ${python_version})/bin/python3 ~/venvs/multipy - source ~/venvs/multipy/bin/activate - pip install \ - torch torchvision torchaudio \ - --extra-index-url https://download.pytorch.org/whl/cpu; - fi + echo "conda install -y python=${python_version}" + conda install -y python=${python_version} + echo "conda install -y -c conda-forge libpython-static=${python_version}" + conda install -y -c conda-forge libpython-static=${python_version} + echo "conda install -y mkl-include pyyaml numpy ipython" + conda install -y mkl mkl-include pyyaml numpy ipython + echo "conda install -y pytorch torchvision torchaudio cpuonly -c pytorch" + conda install -y pytorch torchvision torchaudio cpuonly -c pytorch + conda clean -ya; echo "::endgroup::" echo "::group::Install" @@ -94,13 +85,10 @@ jobs: ./multipy/runtime/build/deploy_benchmark 2 none jit multipy/runtime/example/generated/resnet echo "::endgroup::" - if [[ ${{ inputs.python3-minor-version }} -gt 7 ]]; - then - echo "::group::Compat test" - pip install -r compat-requirements.txt - multipy/runtime/build/interactive_embedded_interpreter --pyscript multipy/runtime/test_compat.py - echo "::endgroup::"; - fi + echo "::group::Compat test" + pip install -r compat-requirements.txt + multipy/runtime/build/interactive_embedded_interpreter --pyscript multipy/runtime/test_compat.py + echo "::endgroup::"; echo "::group::Test GPU" # Separating GPU tests due to issues with py37 and py38: https://github.com/pytorch/multipy/issues/239 diff --git a/.github/workflows/install_test.yaml b/.github/workflows/install_test.yaml index de28329f..c5f9f115 100644 --- a/.github/workflows/install_test.yaml +++ b/.github/workflows/install_test.yaml @@ -14,7 +14,7 @@ jobs: installtest: strategy: matrix: - python3-minor-version: [7,8,9,10] + python3-minor-version: [8,9,10] platform: [ubuntu-18.04] fail-fast: false runs-on: ${{ matrix.platform }} diff --git a/.github/workflows/runtime_nightly.yaml b/.github/workflows/runtime_nightly.yaml index 2427ff81..0a0a8433 100644 --- a/.github/workflows/runtime_nightly.yaml +++ b/.github/workflows/runtime_nightly.yaml @@ -9,7 +9,7 @@ jobs: build-test-release: strategy: matrix: - python3-minor-version: [7,8,9,10] + python3-minor-version: [8,9,10] platform: [linux.4xlarge.nvidia.gpu] fail-fast: false uses: ./.github/workflows/build_test_release.yaml diff --git a/.github/workflows/runtime_tests.yaml b/.github/workflows/runtime_tests.yaml index a8bbac54..d994f29d 100644 --- a/.github/workflows/runtime_tests.yaml +++ b/.github/workflows/runtime_tests.yaml @@ -11,7 +11,7 @@ jobs: unittest: strategy: matrix: - python3-minor-version: [7,8,9,10] + python3-minor-version: [8,9,10] platform: [linux.4xlarge.nvidia.gpu] fail-fast: false uses: ./.github/workflows/build_test_release.yaml diff --git a/.github/workflows/test_docker_build.yml b/.github/workflows/test_docker_build.yml index ea48f450..8931b908 100644 --- a/.github/workflows/test_docker_build.yml +++ b/.github/workflows/test_docker_build.yml @@ -9,7 +9,7 @@ jobs: unittest: strategy: matrix: - python3-minor-version: [7,8,9,10] + python3-minor-version: [8,9,10] platform: [linux.4xlarge.nvidia.gpu] fail-fast: false runs-on: ${{ matrix.platform }} diff --git a/multipy/runtime/test_compat.py b/multipy/runtime/test_compat.py index bbf234c7..b094483d 100644 --- a/multipy/runtime/test_compat.py +++ b/multipy/runtime/test_compat.py @@ -17,8 +17,8 @@ def test_torchvision(self): def test_torchaudio(self): import torchaudio # noqa: F401 - def test_pytorch3d(self): - import pytorch3d # noqa: F401 + # def test_pytorch3d(self): + # import pytorch3d # noqa: F401 def test_hf_tokenizers(self): import tokenizers # noqa: F401