diff --git a/.circleci/config.yml b/.circleci/config.yml index 2a97b4bbccc..b7c6b6408b5 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1112,15 +1112,6 @@ workflows: only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ name: binary_win_wheel_py3.8_cpu python_version: '3.8' - - binary_win_wheel: - cu_version: cu116 - filters: - branches: - only: main - tags: - only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ - name: binary_win_wheel_py3.8_cu116 - python_version: '3.8' - binary_win_wheel: cu_version: cu117 filters: @@ -1148,15 +1139,6 @@ workflows: only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ name: binary_win_wheel_py3.9_cpu python_version: '3.9' - - binary_win_wheel: - cu_version: cu116 - filters: - branches: - only: main - tags: - only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ - name: binary_win_wheel_py3.9_cu116 - python_version: '3.9' - binary_win_wheel: cu_version: cu117 filters: @@ -1179,15 +1161,6 @@ workflows: cu_version: cpu name: binary_win_wheel_py3.10_cpu python_version: '3.10' - - binary_win_wheel: - cu_version: cu116 - filters: - branches: - only: main - tags: - only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ - name: binary_win_wheel_py3.10_cu116 - python_version: '3.10' - binary_win_wheel: cu_version: cu117 filters: @@ -1210,15 +1183,6 @@ workflows: only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ name: binary_win_conda_py3.8_cpu python_version: '3.8' - - binary_win_conda: - cu_version: cu116 - filters: - branches: - only: main - tags: - only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ - name: binary_win_conda_py3.8_cu116 - python_version: '3.8' - binary_win_conda: cu_version: cu117 filters: @@ -1246,15 +1210,6 @@ workflows: only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ name: binary_win_conda_py3.9_cpu python_version: '3.9' - - binary_win_conda: - cu_version: cu116 - filters: - branches: - only: main - tags: - only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ - name: binary_win_conda_py3.9_cu116 - python_version: '3.9' - binary_win_conda: cu_version: cu117 filters: @@ -1277,15 +1232,6 @@ workflows: cu_version: cpu name: binary_win_conda_py3.10_cpu python_version: '3.10' - - binary_win_conda: - cu_version: cu116 - filters: - branches: - only: main - tags: - only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ - name: binary_win_conda_py3.10_cu116 - python_version: '3.10' - binary_win_conda: cu_version: cu117 filters: @@ -1342,11 +1288,11 @@ workflows: - unittest_onnx - unittest_extended - unittest_linux_gpu: - cu_version: cu116 + cu_version: cu117 name: unittest_linux_gpu_py3.8 python_version: '3.8' - unittest_linux_gpu: - cu_version: cu116 + cu_version: cu117 filters: branches: only: @@ -1355,7 +1301,7 @@ workflows: name: unittest_linux_gpu_py3.9 python_version: '3.9' - unittest_linux_gpu: - cu_version: cu116 + cu_version: cu117 filters: branches: only: @@ -1376,11 +1322,11 @@ workflows: name: unittest_windows_cpu_py3.10 python_version: '3.10' - unittest_windows_gpu: - cu_version: cu116 + cu_version: cu117 name: unittest_windows_gpu_py3.8 python_version: '3.8' - unittest_windows_gpu: - cu_version: cu116 + cu_version: cu117 filters: branches: only: @@ -1389,7 +1335,7 @@ workflows: name: unittest_windows_gpu_py3.9 python_version: '3.9' - unittest_windows_gpu: - cu_version: cu116 + cu_version: cu117 filters: branches: only: @@ -1417,7 +1363,7 @@ workflows: name: cmake_linux_cpu python_version: '3.8' - cmake_linux_gpu: - cu_version: cu116 + cu_version: cu117 name: cmake_linux_gpu python_version: '3.8' wheel_docker_image: pytorch/manylinux-cuda116 @@ -1426,7 +1372,7 @@ workflows: name: cmake_windows_cpu python_version: '3.8' - cmake_windows_gpu: - cu_version: cu116 + cu_version: cu117 name: cmake_windows_gpu python_version: '3.8' - cmake_macos_cpu: @@ -1503,26 +1449,6 @@ workflows: requires: - nightly_binary_win_wheel_py3.8_cpu subfolder: cpu/ - - binary_win_wheel: - cu_version: cu116 - filters: - branches: - only: nightly - tags: - only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ - name: nightly_binary_win_wheel_py3.8_cu116 - python_version: '3.8' - - binary_wheel_upload: - context: org-member - filters: - branches: - only: nightly - tags: - only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ - name: nightly_binary_win_wheel_py3.8_cu116_upload - requires: - - nightly_binary_win_wheel_py3.8_cu116 - subfolder: cu116/ - binary_win_wheel: cu_version: cu117 filters: @@ -1583,26 +1509,6 @@ workflows: requires: - nightly_binary_win_wheel_py3.9_cpu subfolder: cpu/ - - binary_win_wheel: - cu_version: cu116 - filters: - branches: - only: nightly - tags: - only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ - name: nightly_binary_win_wheel_py3.9_cu116 - python_version: '3.9' - - binary_wheel_upload: - context: org-member - filters: - branches: - only: nightly - tags: - only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ - name: nightly_binary_win_wheel_py3.9_cu116_upload - requires: - - nightly_binary_win_wheel_py3.9_cu116 - subfolder: cu116/ - binary_win_wheel: cu_version: cu117 filters: @@ -1663,26 +1569,6 @@ workflows: requires: - nightly_binary_win_wheel_py3.10_cpu subfolder: cpu/ - - binary_win_wheel: - cu_version: cu116 - filters: - branches: - only: nightly - tags: - only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ - name: nightly_binary_win_wheel_py3.10_cu116 - python_version: '3.10' - - binary_wheel_upload: - context: org-member - filters: - branches: - only: nightly - tags: - only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ - name: nightly_binary_win_wheel_py3.10_cu116_upload - requires: - - nightly_binary_win_wheel_py3.10_cu116 - subfolder: cu116/ - binary_win_wheel: cu_version: cu117 filters: @@ -1742,25 +1628,6 @@ workflows: name: nightly_binary_win_conda_py3.8_cpu_upload requires: - nightly_binary_win_conda_py3.8_cpu - - binary_win_conda: - cu_version: cu116 - filters: - branches: - only: nightly - tags: - only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ - name: nightly_binary_win_conda_py3.8_cu116 - python_version: '3.8' - - binary_conda_upload: - context: org-member - filters: - branches: - only: nightly - tags: - only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ - name: nightly_binary_win_conda_py3.8_cu116_upload - requires: - - nightly_binary_win_conda_py3.8_cu116 - binary_win_conda: cu_version: cu117 filters: @@ -1818,25 +1685,6 @@ workflows: name: nightly_binary_win_conda_py3.9_cpu_upload requires: - nightly_binary_win_conda_py3.9_cpu - - binary_win_conda: - cu_version: cu116 - filters: - branches: - only: nightly - tags: - only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ - name: nightly_binary_win_conda_py3.9_cu116 - python_version: '3.9' - - binary_conda_upload: - context: org-member - filters: - branches: - only: nightly - tags: - only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ - name: nightly_binary_win_conda_py3.9_cu116_upload - requires: - - nightly_binary_win_conda_py3.9_cu116 - binary_win_conda: cu_version: cu117 filters: @@ -1894,25 +1742,6 @@ workflows: name: nightly_binary_win_conda_py3.10_cpu_upload requires: - nightly_binary_win_conda_py3.10_cpu - - binary_win_conda: - cu_version: cu116 - filters: - branches: - only: nightly - tags: - only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ - name: nightly_binary_win_conda_py3.10_cu116 - python_version: '3.10' - - binary_conda_upload: - context: org-member - filters: - branches: - only: nightly - tags: - only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ - name: nightly_binary_win_conda_py3.10_cu116_upload - requires: - - nightly_binary_win_conda_py3.10_cu116 - binary_win_conda: cu_version: cu117 filters: diff --git a/.circleci/regenerate.py b/.circleci/regenerate.py index f372516adc0..aa077efb9ab 100755 --- a/.circleci/regenerate.py +++ b/.circleci/regenerate.py @@ -32,8 +32,8 @@ def build_workflows(prefix="", filter_branch=None, upload=False, indentation=6, for os_type in ["linux", "macos", "win"]: python_versions = PYTHON_VERSIONS cu_versions_dict = { - "linux": ["cpu", "cu116", "cu117", "cu118", "rocm5.2", "rocm5.3"], - "win": ["cpu", "cu116", "cu117", "cu118"], + "linux": ["cpu", "cu117", "cu118", "rocm5.2", "rocm5.3"], + "win": ["cpu", "cu117", "cu118"], "macos": ["cpu"], } cu_versions = cu_versions_dict[os_type] @@ -144,7 +144,6 @@ def upload_doc_job(filter_branch): manylinux_images = { - "cu116": "pytorch/manylinux-cuda116", "cu117": "pytorch/manylinux-cuda117", "cu118": "pytorch/manylinux-cuda118", } @@ -271,7 +270,7 @@ def unittest_workflows(indentation=6): if device_type == "gpu": if python_version != "3.8": job["filters"] = gen_filter_branch_tree("main", "nightly") - job["cu_version"] = "cu116" + job["cu_version"] = "cu117" else: job["cu_version"] = "cpu" @@ -289,7 +288,7 @@ def cmake_workflows(indentation=6): for device in device_types: job = {"name": f"cmake_{os_type}_{device}", "python_version": python_version} - job["cu_version"] = "cu116" if device == "gpu" else "cpu" + job["cu_version"] = "cu117" if device == "gpu" else "cpu" if device == "gpu" and os_type == "linux": job["wheel_docker_image"] = "pytorch/manylinux-cuda116" jobs.append({f"cmake_{os_type}_{device}": job})