From 4872a2c4def6b773482766beb0a1729a0724c809 Mon Sep 17 00:00:00 2001 From: Jeremy Reizenstein Date: Tue, 4 Aug 2020 15:22:03 -0700 Subject: [PATCH] wheels with cuda Summary: The main pytorch wheels on PyPI support CUDA 10.2. Here we make pytorch3d's wheels do the same, instead of being cpu only. This should ultimately make life easier in colab. Also a little script to count builds, which can be useful for nightly jobs. Reviewed By: gkioxari Differential Revision: D22924321 fbshipit-source-id: d6cea9bfbab49bcb0080f65608066c553ea8bb4d --- .circleci/build_count.py | 29 +++++++++++++++++++++++++++++ .circleci/config.in.yml | 2 +- .circleci/config.yml | 14 +++++++------- .circleci/regenerate.py | 2 +- 4 files changed, 38 insertions(+), 9 deletions(-) create mode 100644 .circleci/build_count.py diff --git a/.circleci/build_count.py b/.circleci/build_count.py new file mode 100644 index 00000000..2a59b741 --- /dev/null +++ b/.circleci/build_count.py @@ -0,0 +1,29 @@ +#!/usr/bin/env python3 +# Copyright (c) Facebook, Inc. and its affiliates. All rights reserved. + +""" +Print the number of nightly builds +""" + +from collections import Counter + +import yaml + + +conf = yaml.safe_load(open("config.yml")) +jobs = conf["workflows"]["build_and_test"]["jobs"] + + +def jobtype(job): + if isinstance(job, str): + return job + if len(job) == 1: + [name] = job.keys() + return name + return "MULTIPLE PARTS" + + +for i, j in Counter(map(jobtype, jobs)).items(): + print(i, j) +print() +print(len(jobs)) diff --git a/.circleci/config.in.yml b/.circleci/config.in.yml index ee8b39c2..832e1982 100644 --- a/.circleci/config.in.yml +++ b/.circleci/config.in.yml @@ -55,7 +55,7 @@ binary_common: &binary_common wheel_docker_image: description: "Wheel only: what docker image to use" type: string - default: "pytorch/manylinux-cuda101" + default: "pytorch/manylinux-cuda102" environment: PYTHON_VERSION: << parameters.python_version >> BUILD_VERSION: << parameters.build_version >> diff --git a/.circleci/config.yml b/.circleci/config.yml index 1571765d..6de7419d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -55,7 +55,7 @@ binary_common: &binary_common wheel_docker_image: description: "Wheel only: what docker image to use" type: string - default: "pytorch/manylinux-cuda101" + default: "pytorch/manylinux-cuda102" environment: PYTHON_VERSION: << parameters.python_version >> BUILD_VERSION: << parameters.build_version >> @@ -386,18 +386,18 @@ workflows: python_version: '3.8' pytorch_version: 1.6.0 - binary_linux_wheel: - cu_version: cpu - name: linux_wheel_py36_cpu_pyt160 + cu_version: cu102 + name: linux_wheel_py36_cu102_pyt160 python_version: '3.6' pytorch_version: 1.6.0 - binary_linux_wheel: - cu_version: cpu - name: linux_wheel_py37_cpu_pyt160 + cu_version: cu102 + name: linux_wheel_py37_cu102_pyt160 python_version: '3.7' pytorch_version: 1.6.0 - binary_linux_wheel: - cu_version: cpu - name: linux_wheel_py38_cpu_pyt160 + cu_version: cu102 + name: linux_wheel_py38_cu102_pyt160 python_version: '3.8' pytorch_version: 1.6.0 - binary_linux_conda_cuda: diff --git a/.circleci/regenerate.py b/.circleci/regenerate.py index 7946f7dd..e1a8c78d 100755 --- a/.circleci/regenerate.py +++ b/.circleci/regenerate.py @@ -38,7 +38,7 @@ def workflows(prefix="", filter_branch=None, upload=False, indentation=6): ) for btype in ["wheel"]: for python_version in ["3.6", "3.7", "3.8"]: - for cu_version in ["cpu"]: + for cu_version in ["cu102"]: w += workflow_pair( btype=btype, python_version=python_version,