From bee39be41623f2a578694ec42617d437928a17a8 Mon Sep 17 00:00:00 2001 From: Francisco Massa Date: Thu, 8 Oct 2020 12:21:08 +0200 Subject: [PATCH 1/8] Testing import on latest libs --- .circleci/config.yml | 494 ++-------------------------------------- .circleci/config.yml.in | 20 +- 2 files changed, 28 insertions(+), 486 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a5e33528dfc..eadc062e2c5 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -131,6 +131,19 @@ jobs: sudo apt-get install -y clang-format ./travis-scripts/run-clang-format/run-clang-format.py -r torchvision/csrc + + + check_import_linux: + docker: + - image: circleci/python:3.7 + steps: + - checkout + - run: + command: | + pip install --user --progress-bar off --pre torch torchvision -f https://download.pytorch.org/whl/nightly/cpu/torch_nightly.html + python test/test_import.py + + binary_linux_wheel: <<: *binary_common docker: @@ -667,492 +680,13 @@ workflows: build: jobs: - circleci_consistency - - binary_linux_wheel: - cu_version: cpu - name: binary_linux_wheel_py3.6_cpu - python_version: '3.6' - wheel_docker_image: pytorch/manylinux-cuda102 - - binary_linux_wheel: - cu_version: cu92 - name: binary_linux_wheel_py3.6_cu92 - python_version: '3.6' - wheel_docker_image: pytorch/manylinux-cuda92 - - binary_linux_wheel: - cu_version: cu101 - name: binary_linux_wheel_py3.6_cu101 - python_version: '3.6' - wheel_docker_image: pytorch/manylinux-cuda101 - - binary_linux_wheel: - cu_version: cu102 - name: binary_linux_wheel_py3.6_cu102 - python_version: '3.6' - wheel_docker_image: pytorch/manylinux-cuda102 - - binary_linux_wheel: - cu_version: cu110 - name: binary_linux_wheel_py3.6_cu110 - python_version: '3.6' - wheel_docker_image: pytorch/manylinux-cuda110 - - binary_linux_wheel: - cu_version: cpu - name: binary_linux_wheel_py3.7_cpu - python_version: '3.7' - wheel_docker_image: pytorch/manylinux-cuda102 - - binary_linux_wheel: - cu_version: cu92 - name: binary_linux_wheel_py3.7_cu92 - python_version: '3.7' - wheel_docker_image: pytorch/manylinux-cuda92 - - binary_linux_wheel: - cu_version: cu101 - name: binary_linux_wheel_py3.7_cu101 - python_version: '3.7' - wheel_docker_image: pytorch/manylinux-cuda101 - - binary_linux_wheel: - cu_version: cu102 - name: binary_linux_wheel_py3.7_cu102 - python_version: '3.7' - wheel_docker_image: pytorch/manylinux-cuda102 - - binary_linux_wheel: - cu_version: cu110 - name: binary_linux_wheel_py3.7_cu110 - python_version: '3.7' - wheel_docker_image: pytorch/manylinux-cuda110 - - binary_linux_wheel: - cu_version: cpu - name: binary_linux_wheel_py3.8_cpu - python_version: '3.8' - wheel_docker_image: pytorch/manylinux-cuda102 - - binary_linux_wheel: - cu_version: cu92 - name: binary_linux_wheel_py3.8_cu92 - python_version: '3.8' - wheel_docker_image: pytorch/manylinux-cuda92 - - binary_linux_wheel: - cu_version: cu101 - name: binary_linux_wheel_py3.8_cu101 - python_version: '3.8' - wheel_docker_image: pytorch/manylinux-cuda101 - - binary_linux_wheel: - cu_version: cu102 - name: binary_linux_wheel_py3.8_cu102 - python_version: '3.8' - wheel_docker_image: pytorch/manylinux-cuda102 - - binary_linux_wheel: - cu_version: cu110 - name: binary_linux_wheel_py3.8_cu110 - python_version: '3.8' - wheel_docker_image: pytorch/manylinux-cuda110 - - binary_macos_wheel: - cu_version: cpu - name: binary_macos_wheel_py3.6_cpu - python_version: '3.6' - wheel_docker_image: pytorch/manylinux-cuda102 - - binary_macos_wheel: - cu_version: cpu - name: binary_macos_wheel_py3.7_cpu - python_version: '3.7' - wheel_docker_image: pytorch/manylinux-cuda102 - - binary_macos_wheel: - cu_version: cpu - name: binary_macos_wheel_py3.8_cpu - python_version: '3.8' - wheel_docker_image: pytorch/manylinux-cuda102 - - binary_win_wheel: - cu_version: cpu - filters: - branches: - only: master - tags: - only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ - name: binary_win_wheel_py3.6_cpu - python_version: '3.6' - - binary_win_wheel: - cu_version: cu101 - filters: - branches: - only: master - tags: - only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ - name: binary_win_wheel_py3.6_cu101 - python_version: '3.6' - - binary_win_wheel: - cu_version: cu102 - filters: - branches: - only: master - tags: - only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ - name: binary_win_wheel_py3.6_cu102 - python_version: '3.6' - - binary_win_wheel: - cu_version: cu110 - filters: - branches: - only: master - tags: - only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ - name: binary_win_wheel_py3.6_cu110 - python_version: '3.6' - - binary_win_wheel: - cu_version: cpu - filters: - branches: - only: master - tags: - only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ - name: binary_win_wheel_py3.7_cpu - python_version: '3.7' - - binary_win_wheel: - cu_version: cu101 - filters: - branches: - only: master - tags: - only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ - name: binary_win_wheel_py3.7_cu101 - python_version: '3.7' - - binary_win_wheel: - cu_version: cu102 - filters: - branches: - only: master - tags: - only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ - name: binary_win_wheel_py3.7_cu102 - python_version: '3.7' - - binary_win_wheel: - cu_version: cu110 - filters: - branches: - only: master - tags: - only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ - name: binary_win_wheel_py3.7_cu110 - python_version: '3.7' - - binary_win_wheel: - cu_version: cpu - name: binary_win_wheel_py3.8_cpu - python_version: '3.8' - - binary_win_wheel: - cu_version: cu101 - filters: - branches: - only: master - tags: - only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ - name: binary_win_wheel_py3.8_cu101 - python_version: '3.8' - - binary_win_wheel: - cu_version: cu102 - filters: - branches: - only: master - tags: - only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ - name: binary_win_wheel_py3.8_cu102 - python_version: '3.8' - - binary_win_wheel: - cu_version: cu110 - name: binary_win_wheel_py3.8_cu110 - python_version: '3.8' - - binary_linux_conda: - cu_version: cpu - name: binary_linux_conda_py3.6_cpu - python_version: '3.6' - wheel_docker_image: pytorch/manylinux-cuda102 - - binary_linux_conda: - cu_version: cu92 - name: binary_linux_conda_py3.6_cu92 - python_version: '3.6' - wheel_docker_image: pytorch/manylinux-cuda92 - - binary_linux_conda: - cu_version: cu101 - name: binary_linux_conda_py3.6_cu101 - python_version: '3.6' - wheel_docker_image: pytorch/manylinux-cuda101 - - binary_linux_conda: - cu_version: cu102 - name: binary_linux_conda_py3.6_cu102 - python_version: '3.6' - wheel_docker_image: pytorch/manylinux-cuda102 - - binary_linux_conda: - cu_version: cu110 - name: binary_linux_conda_py3.6_cu110 - python_version: '3.6' - wheel_docker_image: pytorch/manylinux-cuda110 - - binary_linux_conda: - cu_version: cpu - name: binary_linux_conda_py3.7_cpu - python_version: '3.7' - wheel_docker_image: pytorch/manylinux-cuda102 - - binary_linux_conda: - cu_version: cu92 - name: binary_linux_conda_py3.7_cu92 - python_version: '3.7' - wheel_docker_image: pytorch/manylinux-cuda92 - - binary_linux_conda: - cu_version: cu101 - name: binary_linux_conda_py3.7_cu101 - python_version: '3.7' - wheel_docker_image: pytorch/manylinux-cuda101 - - binary_linux_conda: - cu_version: cu102 - name: binary_linux_conda_py3.7_cu102 - python_version: '3.7' - wheel_docker_image: pytorch/manylinux-cuda102 - - binary_linux_conda: - cu_version: cu110 - name: binary_linux_conda_py3.7_cu110 - python_version: '3.7' - wheel_docker_image: pytorch/manylinux-cuda110 - - binary_linux_conda: - cu_version: cpu - name: binary_linux_conda_py3.8_cpu - python_version: '3.8' - wheel_docker_image: pytorch/manylinux-cuda102 - - binary_linux_conda: - cu_version: cu92 - name: binary_linux_conda_py3.8_cu92 - python_version: '3.8' - wheel_docker_image: pytorch/manylinux-cuda92 - - binary_linux_conda: - cu_version: cu101 - name: binary_linux_conda_py3.8_cu101 - python_version: '3.8' - wheel_docker_image: pytorch/manylinux-cuda101 - - binary_linux_conda: - cu_version: cu102 - name: binary_linux_conda_py3.8_cu102 - python_version: '3.8' - wheel_docker_image: pytorch/manylinux-cuda102 - - binary_linux_conda: - cu_version: cu110 - name: binary_linux_conda_py3.8_cu110 - python_version: '3.8' - wheel_docker_image: pytorch/manylinux-cuda110 - - binary_macos_conda: - cu_version: cpu - name: binary_macos_conda_py3.6_cpu - python_version: '3.6' - wheel_docker_image: pytorch/manylinux-cuda102 - - binary_macos_conda: - cu_version: cpu - name: binary_macos_conda_py3.7_cpu - python_version: '3.7' - wheel_docker_image: pytorch/manylinux-cuda102 - - binary_macos_conda: - cu_version: cpu - name: binary_macos_conda_py3.8_cpu - python_version: '3.8' - wheel_docker_image: pytorch/manylinux-cuda102 - - binary_win_conda: - cu_version: cpu - filters: - branches: - only: master - tags: - only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ - name: binary_win_conda_py3.6_cpu - python_version: '3.6' - - binary_win_conda: - cu_version: cu101 - filters: - branches: - only: master - tags: - only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ - name: binary_win_conda_py3.6_cu101 - python_version: '3.6' - - binary_win_conda: - cu_version: cu102 - filters: - branches: - only: master - tags: - only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ - name: binary_win_conda_py3.6_cu102 - python_version: '3.6' - - binary_win_conda: - cu_version: cu110 - filters: - branches: - only: master - tags: - only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ - name: binary_win_conda_py3.6_cu110 - python_version: '3.6' - - binary_win_conda: - cu_version: cpu - filters: - branches: - only: master - tags: - only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ - name: binary_win_conda_py3.7_cpu - python_version: '3.7' - - binary_win_conda: - cu_version: cu101 - filters: - branches: - only: master - tags: - only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ - name: binary_win_conda_py3.7_cu101 - python_version: '3.7' - - binary_win_conda: - cu_version: cu102 - filters: - branches: - only: master - tags: - only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ - name: binary_win_conda_py3.7_cu102 - python_version: '3.7' - - binary_win_conda: - cu_version: cu110 - filters: - branches: - only: master - tags: - only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ - name: binary_win_conda_py3.7_cu110 - python_version: '3.7' - - binary_win_conda: - cu_version: cpu - name: binary_win_conda_py3.8_cpu - python_version: '3.8' - - binary_win_conda: - cu_version: cu101 - filters: - branches: - only: master - tags: - only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ - name: binary_win_conda_py3.8_cu101 - python_version: '3.8' - - binary_win_conda: - cu_version: cu102 - filters: - branches: - only: master - tags: - only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ - name: binary_win_conda_py3.8_cu102 - python_version: '3.8' - - binary_win_conda: - cu_version: cu110 - name: binary_win_conda_py3.8_cu110 - python_version: '3.8' - python_lint - python_type_check - clang_format unittest: jobs: - - unittest_linux_cpu: - cu_version: cpu - name: unittest_linux_cpu_py3.6 - python_version: '3.6' - - unittest_linux_cpu: - cu_version: cpu - name: unittest_linux_cpu_py3.7 - python_version: '3.7' - - unittest_linux_cpu: - cu_version: cpu - name: unittest_linux_cpu_py3.8 - python_version: '3.8' - - unittest_linux_gpu: - cu_version: cu101 - filters: - branches: - only: - - master - - nightly - name: unittest_linux_gpu_py3.6 - python_version: '3.6' - - unittest_linux_gpu: - cu_version: cu101 - filters: - branches: - only: - - master - - nightly - name: unittest_linux_gpu_py3.7 - python_version: '3.7' - - unittest_linux_gpu: - cu_version: cu101 - name: unittest_linux_gpu_py3.8 - python_version: '3.8' - - unittest_windows_cpu: - cu_version: cpu - name: unittest_windows_cpu_py3.6 - python_version: '3.6' - - unittest_windows_cpu: - cu_version: cpu - name: unittest_windows_cpu_py3.7 - python_version: '3.7' - - unittest_windows_cpu: - cu_version: cpu - name: unittest_windows_cpu_py3.8 - python_version: '3.8' - - unittest_windows_gpu: - cu_version: cu101 - filters: - branches: - only: - - master - - nightly - name: unittest_windows_gpu_py3.6 - python_version: '3.6' - - unittest_windows_gpu: - cu_version: cu101 - filters: - branches: - only: - - master - - nightly - name: unittest_windows_gpu_py3.7 - python_version: '3.7' - - unittest_windows_gpu: - cu_version: cu101 - name: unittest_windows_gpu_py3.8 - python_version: '3.8' - - unittest_macos_cpu: - cu_version: cpu - name: unittest_macos_cpu_py3.6 - python_version: '3.6' - - unittest_macos_cpu: - cu_version: cpu - name: unittest_macos_cpu_py3.7 - python_version: '3.7' - - unittest_macos_cpu: - cu_version: cpu - name: unittest_macos_cpu_py3.8 - python_version: '3.8' - - cmake: - jobs: - - cmake_linux_cpu: - cu_version: cpu - name: cmake_linux_cpu - python_version: '3.8' - - cmake_linux_gpu: - cu_version: cu101 - name: cmake_linux_gpu - python_version: '3.8' - wheel_docker_image: pytorch/manylinux-cuda101 - - cmake_windows_cpu: - cu_version: cpu - name: cmake_windows_cpu - python_version: '3.8' - - cmake_windows_gpu: - cu_version: cu101 - name: cmake_windows_gpu - python_version: '3.8' - - cmake_macos_cpu: - cu_version: cpu - name: cmake_macos_cpu - python_version: '3.8' + - check_import_linux nightly: jobs: diff --git a/.circleci/config.yml.in b/.circleci/config.yml.in index fc0539bc682..f60230fe152 100644 --- a/.circleci/config.yml.in +++ b/.circleci/config.yml.in @@ -131,6 +131,19 @@ jobs: sudo apt-get install -y clang-format ./travis-scripts/run-clang-format/run-clang-format.py -r torchvision/csrc + + + check_import_linux: + docker: + - image: circleci/python:3.7 + steps: + - checkout + - run: + command: | + pip install --user --progress-bar off --pre torch torchvision -f https://download.pytorch.org/whl/nightly/cpu/torch_nightly.html + python test/test_import.py + + binary_linux_wheel: <<: *binary_common docker: @@ -668,18 +681,13 @@ workflows: {%- if True %} jobs: - circleci_consistency - {{ build_workflows(windows_latest_only=True) }} - python_lint - python_type_check - clang_format unittest: jobs: - {{ unittest_workflows() }} - - cmake: - jobs: - {{ cmake_workflows() }} + - check_import_linux nightly: {%- endif %} From 3180f9b9edd951e80b52cf943a837c5e3a8a735a Mon Sep 17 00:00:00 2001 From: Francisco Massa Date: Thu, 8 Oct 2020 12:24:46 +0200 Subject: [PATCH 2/8] Forgot file --- test/test_import.py | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 test/test_import.py diff --git a/test/test_import.py b/test/test_import.py new file mode 100644 index 00000000000..e9b717e282a --- /dev/null +++ b/test/test_import.py @@ -0,0 +1,18 @@ +import torch, torchvision +import unittest + + +class ImportTester(unittest.TestCase): + def test__C(self): + self.assertTrue(torchvision._HAS_OPS) + + def test_image(self): + torch.ops.load_library(torchvision.io.image.ext_specs.origin) + + def test_video(self): + import torchvision.io._video_opt as vopt + torch.ops.load_library(vopt.ext_specs.origin) + + +if __name__ == '__main__': + unittest.main() From f109d56c4cfb1f0afb468139c2b51ac02a2c687a Mon Sep 17 00:00:00 2001 From: Francisco Massa Date: Thu, 8 Oct 2020 12:30:51 +0200 Subject: [PATCH 3/8] Trying to add osx --- .circleci/config.yml | 16 +++++++++++++++- .circleci/config.yml.in | 16 +++++++++++++++- 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index eadc062e2c5..5b1f6121bf0 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -143,6 +143,19 @@ jobs: pip install --user --progress-bar off --pre torch torchvision -f https://download.pytorch.org/whl/nightly/cpu/torch_nightly.html python test/test_import.py + check_import_osx: + macos + xcode: "9.4.1" + steps: + - checkout + - run: + command: | + curl -o conda.sh https://repo.anaconda.com/miniconda/Miniconda3-latest-MacOSX-x86_64.sh + sh conda.sh -b + source $HOME/miniconda3/bin/activate + conda install pip + pip install --user --progress-bar off --pre torch torchvision -f https://download.pytorch.org/whl/nightly/cpu/torch_nightly.html + python test/test_import.py binary_linux_wheel: <<: *binary_common @@ -224,7 +237,7 @@ jobs: binary_macos_wheel: <<: *binary_common - macos: + macos xcode: "9.4.1" steps: - checkout_merge @@ -687,6 +700,7 @@ workflows: unittest: jobs: - check_import_linux + - check_import_osx nightly: jobs: diff --git a/.circleci/config.yml.in b/.circleci/config.yml.in index f60230fe152..bdbbde2c44d 100644 --- a/.circleci/config.yml.in +++ b/.circleci/config.yml.in @@ -143,6 +143,19 @@ jobs: pip install --user --progress-bar off --pre torch torchvision -f https://download.pytorch.org/whl/nightly/cpu/torch_nightly.html python test/test_import.py + check_import_osx: + macos + xcode: "9.4.1" + steps: + - checkout + - run: + command: | + curl -o conda.sh https://repo.anaconda.com/miniconda/Miniconda3-latest-MacOSX-x86_64.sh + sh conda.sh -b + source $HOME/miniconda3/bin/activate + conda install pip + pip install --user --progress-bar off --pre torch torchvision -f https://download.pytorch.org/whl/nightly/cpu/torch_nightly.html + python test/test_import.py binary_linux_wheel: <<: *binary_common @@ -224,7 +237,7 @@ jobs: binary_macos_wheel: <<: *binary_common - macos: + macos xcode: "9.4.1" steps: - checkout_merge @@ -688,6 +701,7 @@ workflows: unittest: jobs: - check_import_linux + - check_import_osx nightly: {%- endif %} From 1bc2b112b485e72365e692c995e57bc4c20e7584 Mon Sep 17 00:00:00 2001 From: Francisco Massa Date: Thu, 8 Oct 2020 12:32:50 +0200 Subject: [PATCH 4/8] Bugfix --- .circleci/config.yml | 4 ++-- .circleci/config.yml.in | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5b1f6121bf0..c8fd2229b93 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -144,7 +144,7 @@ jobs: python test/test_import.py check_import_osx: - macos + macos: xcode: "9.4.1" steps: - checkout @@ -237,7 +237,7 @@ jobs: binary_macos_wheel: <<: *binary_common - macos + macos: xcode: "9.4.1" steps: - checkout_merge diff --git a/.circleci/config.yml.in b/.circleci/config.yml.in index bdbbde2c44d..a4f1ef5debd 100644 --- a/.circleci/config.yml.in +++ b/.circleci/config.yml.in @@ -144,7 +144,7 @@ jobs: python test/test_import.py check_import_osx: - macos + macos: xcode: "9.4.1" steps: - checkout @@ -237,7 +237,7 @@ jobs: binary_macos_wheel: <<: *binary_common - macos + macos: xcode: "9.4.1" steps: - checkout_merge From 936c5581baa14808080d954b68df6be8abac3ece Mon Sep 17 00:00:00 2001 From: Francisco Massa Date: Thu, 8 Oct 2020 13:42:36 +0200 Subject: [PATCH 5/8] No need for pip --- .circleci/config.yml | 1 - .circleci/config.yml.in | 1 - 2 files changed, 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c8fd2229b93..7600ec61115 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -153,7 +153,6 @@ jobs: curl -o conda.sh https://repo.anaconda.com/miniconda/Miniconda3-latest-MacOSX-x86_64.sh sh conda.sh -b source $HOME/miniconda3/bin/activate - conda install pip pip install --user --progress-bar off --pre torch torchvision -f https://download.pytorch.org/whl/nightly/cpu/torch_nightly.html python test/test_import.py diff --git a/.circleci/config.yml.in b/.circleci/config.yml.in index a4f1ef5debd..5df1cf9bab4 100644 --- a/.circleci/config.yml.in +++ b/.circleci/config.yml.in @@ -153,7 +153,6 @@ jobs: curl -o conda.sh https://repo.anaconda.com/miniconda/Miniconda3-latest-MacOSX-x86_64.sh sh conda.sh -b source $HOME/miniconda3/bin/activate - conda install pip pip install --user --progress-bar off --pre torch torchvision -f https://download.pytorch.org/whl/nightly/cpu/torch_nightly.html python test/test_import.py From ee14cc5d781c0324addb6499227cc1f10e157ea0 Mon Sep 17 00:00:00 2001 From: Francisco Massa Date: Thu, 8 Oct 2020 13:54:17 +0200 Subject: [PATCH 6/8] Try windows --- .circleci/config.yml | 17 +++++++++++++++++ .circleci/config.yml.in | 17 +++++++++++++++++ 2 files changed, 34 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 7600ec61115..e943269f30b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -156,6 +156,22 @@ jobs: pip install --user --progress-bar off --pre torch torchvision -f https://download.pytorch.org/whl/nightly/cpu/torch_nightly.html python test/test_import.py + + check_import_win: + executor: windows-cpu + steps: + - checkout_merge + - run: + name: Build conda packages + command: | + set -ex + eval "$('/C/tools/miniconda3/Scripts/conda.exe' 'shell.bash' 'hook')" + conda activate base + #conda install -yq conda-build "conda-package-handling!=1.5.0" + conda install pip + pip install --user --progress-bar off --pre torch torchvision -f https://download.pytorch.org/whl/nightly/cpu/torch_nightly.html + python test/test_import.py + binary_linux_wheel: <<: *binary_common docker: @@ -700,6 +716,7 @@ workflows: jobs: - check_import_linux - check_import_osx + - check_import_win nightly: jobs: diff --git a/.circleci/config.yml.in b/.circleci/config.yml.in index 5df1cf9bab4..0a9278052dc 100644 --- a/.circleci/config.yml.in +++ b/.circleci/config.yml.in @@ -156,6 +156,22 @@ jobs: pip install --user --progress-bar off --pre torch torchvision -f https://download.pytorch.org/whl/nightly/cpu/torch_nightly.html python test/test_import.py + + check_import_win: + executor: windows-cpu + steps: + - checkout_merge + - run: + name: Build conda packages + command: | + set -ex + eval "$('/C/tools/miniconda3/Scripts/conda.exe' 'shell.bash' 'hook')" + conda activate base + #conda install -yq conda-build "conda-package-handling!=1.5.0" + conda install pip + pip install --user --progress-bar off --pre torch torchvision -f https://download.pytorch.org/whl/nightly/cpu/torch_nightly.html + python test/test_import.py + binary_linux_wheel: <<: *binary_common docker: @@ -701,6 +717,7 @@ workflows: jobs: - check_import_linux - check_import_osx + - check_import_win nightly: {%- endif %} From f8759d5caa65400a9581d5c012f8d8d2e48e0daa Mon Sep 17 00:00:00 2001 From: Francisco Massa Date: Thu, 8 Oct 2020 14:05:49 +0200 Subject: [PATCH 7/8] Add conda as well --- .circleci/config.yml | 60 ++++++++++++++++++++++++++++++++++++----- .circleci/config.yml.in | 60 ++++++++++++++++++++++++++++++++++++----- 2 files changed, 108 insertions(+), 12 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e943269f30b..8e461e38b0d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -133,7 +133,7 @@ jobs: - check_import_linux: + check_import_linux_pip: docker: - image: circleci/python:3.7 steps: @@ -143,7 +143,7 @@ jobs: pip install --user --progress-bar off --pre torch torchvision -f https://download.pytorch.org/whl/nightly/cpu/torch_nightly.html python test/test_import.py - check_import_osx: + check_import_osx_pip: macos: xcode: "9.4.1" steps: @@ -157,7 +157,7 @@ jobs: python test/test_import.py - check_import_win: + check_import_win_pip: executor: windows-cpu steps: - checkout_merge @@ -172,6 +172,51 @@ jobs: pip install --user --progress-bar off --pre torch torchvision -f https://download.pytorch.org/whl/nightly/cpu/torch_nightly.html python test/test_import.py + + + check_import_linux_conda: + docker: + - image: circleci/python:3.7 + steps: + - checkout + - run: + command: | + curl -o conda.sh https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh + sh conda.sh -b + source $HOME/miniconda3/bin/activate + conda install -c pytorch-nightly pytorch torchvision + python test/test_import.py + + check_import_osx_conda: + macos: + xcode: "9.4.1" + steps: + - checkout + - run: + command: | + curl -o conda.sh https://repo.anaconda.com/miniconda/Miniconda3-latest-MacOSX-x86_64.sh + sh conda.sh -b + source $HOME/miniconda3/bin/activate + conda install -c pytorch-nightly pytorch torchvision + python test/test_import.py + + + check_import_win_conda: + executor: windows-cpu + steps: + - checkout_merge + - run: + name: Build conda packages + command: | + set -ex + eval "$('/C/tools/miniconda3/Scripts/conda.exe' 'shell.bash' 'hook')" + conda activate base + #conda install -yq conda-build "conda-package-handling!=1.5.0" + conda install pip + pip install --user --progress-bar off --pre torch torchvision -f https://download.pytorch.org/whl/nightly/cpu/torch_nightly.html + python test/test_import.py + + binary_linux_wheel: <<: *binary_common docker: @@ -714,9 +759,12 @@ workflows: unittest: jobs: - - check_import_linux - - check_import_osx - - check_import_win + - check_import_linux_pip + - check_import_osx_pip + - check_import_win_pip + - check_import_linux_conda + - check_import_osx_conda + - check_import_win_conda nightly: jobs: diff --git a/.circleci/config.yml.in b/.circleci/config.yml.in index 0a9278052dc..a8b68a9ce0d 100644 --- a/.circleci/config.yml.in +++ b/.circleci/config.yml.in @@ -133,7 +133,7 @@ jobs: - check_import_linux: + check_import_linux_pip: docker: - image: circleci/python:3.7 steps: @@ -143,7 +143,7 @@ jobs: pip install --user --progress-bar off --pre torch torchvision -f https://download.pytorch.org/whl/nightly/cpu/torch_nightly.html python test/test_import.py - check_import_osx: + check_import_osx_pip: macos: xcode: "9.4.1" steps: @@ -157,7 +157,7 @@ jobs: python test/test_import.py - check_import_win: + check_import_win_pip: executor: windows-cpu steps: - checkout_merge @@ -172,6 +172,51 @@ jobs: pip install --user --progress-bar off --pre torch torchvision -f https://download.pytorch.org/whl/nightly/cpu/torch_nightly.html python test/test_import.py + + + check_import_linux_conda: + docker: + - image: circleci/python:3.7 + steps: + - checkout + - run: + command: | + curl -o conda.sh https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh + sh conda.sh -b + source $HOME/miniconda3/bin/activate + conda install -c pytorch-nightly pytorch torchvision + python test/test_import.py + + check_import_osx_conda: + macos: + xcode: "9.4.1" + steps: + - checkout + - run: + command: | + curl -o conda.sh https://repo.anaconda.com/miniconda/Miniconda3-latest-MacOSX-x86_64.sh + sh conda.sh -b + source $HOME/miniconda3/bin/activate + conda install -c pytorch-nightly pytorch torchvision + python test/test_import.py + + + check_import_win_conda: + executor: windows-cpu + steps: + - checkout_merge + - run: + name: Build conda packages + command: | + set -ex + eval "$('/C/tools/miniconda3/Scripts/conda.exe' 'shell.bash' 'hook')" + conda activate base + #conda install -yq conda-build "conda-package-handling!=1.5.0" + conda install pip + pip install --user --progress-bar off --pre torch torchvision -f https://download.pytorch.org/whl/nightly/cpu/torch_nightly.html + python test/test_import.py + + binary_linux_wheel: <<: *binary_common docker: @@ -715,9 +760,12 @@ workflows: unittest: jobs: - - check_import_linux - - check_import_osx - - check_import_win + - check_import_linux_pip + - check_import_osx_pip + - check_import_win_pip + - check_import_linux_conda + - check_import_osx_conda + - check_import_win_conda nightly: {%- endif %} From 43903fabe1f0cc2c74516846b532882717c1fd58 Mon Sep 17 00:00:00 2001 From: Francisco Massa Date: Thu, 8 Oct 2020 14:21:47 +0200 Subject: [PATCH 8/8] Bugfix --- .circleci/config.yml | 7 +++---- .circleci/config.yml.in | 7 +++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 8e461e38b0d..d82757b043b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -184,7 +184,7 @@ jobs: curl -o conda.sh https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh sh conda.sh -b source $HOME/miniconda3/bin/activate - conda install -c pytorch-nightly pytorch torchvision + conda install -y -c pytorch-nightly pytorch torchvision python test/test_import.py check_import_osx_conda: @@ -197,7 +197,7 @@ jobs: curl -o conda.sh https://repo.anaconda.com/miniconda/Miniconda3-latest-MacOSX-x86_64.sh sh conda.sh -b source $HOME/miniconda3/bin/activate - conda install -c pytorch-nightly pytorch torchvision + conda install -y -c pytorch-nightly pytorch torchvision python test/test_import.py @@ -212,8 +212,7 @@ jobs: eval "$('/C/tools/miniconda3/Scripts/conda.exe' 'shell.bash' 'hook')" conda activate base #conda install -yq conda-build "conda-package-handling!=1.5.0" - conda install pip - pip install --user --progress-bar off --pre torch torchvision -f https://download.pytorch.org/whl/nightly/cpu/torch_nightly.html + conda install -y -c pytorch-nightly pytorch torchvision python test/test_import.py diff --git a/.circleci/config.yml.in b/.circleci/config.yml.in index a8b68a9ce0d..116d681a33a 100644 --- a/.circleci/config.yml.in +++ b/.circleci/config.yml.in @@ -184,7 +184,7 @@ jobs: curl -o conda.sh https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh sh conda.sh -b source $HOME/miniconda3/bin/activate - conda install -c pytorch-nightly pytorch torchvision + conda install -y -c pytorch-nightly pytorch torchvision python test/test_import.py check_import_osx_conda: @@ -197,7 +197,7 @@ jobs: curl -o conda.sh https://repo.anaconda.com/miniconda/Miniconda3-latest-MacOSX-x86_64.sh sh conda.sh -b source $HOME/miniconda3/bin/activate - conda install -c pytorch-nightly pytorch torchvision + conda install -y -c pytorch-nightly pytorch torchvision python test/test_import.py @@ -212,8 +212,7 @@ jobs: eval "$('/C/tools/miniconda3/Scripts/conda.exe' 'shell.bash' 'hook')" conda activate base #conda install -yq conda-build "conda-package-handling!=1.5.0" - conda install pip - pip install --user --progress-bar off --pre torch torchvision -f https://download.pytorch.org/whl/nightly/cpu/torch_nightly.html + conda install -y -c pytorch-nightly pytorch torchvision python test/test_import.py