Skip to content

GitLab

Unverified Commit d2460a75 authored by Edward Z. Yang's avatar Edward Z. Yang Committed by GitHub
Browse files

Fixes from 0.4.0 (#1217) 



* Actually upload wheels (please port to master)
Signed-off-by: default avatarEdward Z. Yang <ezyang@fb.com>

* Propagate more environment variables.
Signed-off-by: default avatarEdward Z. Yang <ezyang@fb.com>

* Put macos binaries in the right place
Signed-off-by: default avatarEdward Z. Yang <ezyang@fb.com>
parent 2f46070f
Show whitespace changes
Inline Side-by-side
Showing with 44 additions and 7 deletions
.circleci/config.yml
View file @ d2460a75
......@@ -143,6 +143,10 @@ jobs:
# Requires org-member context
binary_wheel_upload:
parameters:
subfolder:
description: "What whl subfolder to upload to, e.g., blank or cu100/ (trailing slash is important)"
type: string
docker:
- image: circleci/python:3.7
steps:
......@@ -158,9 +162,9 @@ jobs:
export AWS_ACCESS_KEY_ID="${PYTORCH_BINARY_AWS_ACCESS_KEY_ID}"
export AWS_SECRET_ACCESS_KEY="${PYTORCH_BINARY_AWS_SECRET_ACCESS_KEY}"
set -x
#for pkg in ~/workspace/*.whl; do
# aws s3 cp "$pkg" "s3://pytorch/whl/nightly/" --acl public-read
#done
for pkg in ~/workspace/*.whl; do
aws s3 cp "$pkg" "s3://pytorch/whl/nightly/<< parameters.subfolder >>" --acl public-read
done
workflows:
build:
......@@ -345,6 +349,7 @@ workflows:
context: org-member
requires:
- nightly_binary_linux_wheel_py2.7_cpu
subfolder: "cpu/"
- binary_linux_wheel:
name: nightly_binary_linux_wheel_py2.7u_cpu
python_version: "2.7"
......@@ -355,6 +360,7 @@ workflows:
context: org-member
requires:
- nightly_binary_linux_wheel_py2.7u_cpu
subfolder: "cpu/"
- binary_linux_wheel:
name: nightly_binary_linux_wheel_py2.7_cu92
python_version: "2.7"
......@@ -365,6 +371,7 @@ workflows:
context: org-member
requires:
- nightly_binary_linux_wheel_py2.7_cu92
subfolder: "cu92/"
- binary_linux_wheel:
name: nightly_binary_linux_wheel_py2.7u_cu92
python_version: "2.7"
......@@ -376,6 +383,7 @@ workflows:
context: org-member
requires:
- nightly_binary_linux_wheel_py2.7u_cu92
subfolder: "cu92/"
- binary_linux_wheel:
name: nightly_binary_linux_wheel_py2.7_cu100
python_version: "2.7"
......@@ -385,6 +393,7 @@ workflows:
context: org-member
requires:
- nightly_binary_linux_wheel_py2.7_cu100
subfolder: "cu100/"
- binary_linux_wheel:
name: nightly_binary_linux_wheel_py2.7u_cu100
python_version: "2.7"
......@@ -395,6 +404,7 @@ workflows:
context: org-member
requires:
- nightly_binary_linux_wheel_py2.7u_cu100
subfolder: "cu100/"
- binary_linux_wheel:
name: nightly_binary_linux_wheel_py3.5_cpu
python_version: "3.5"
......@@ -404,6 +414,7 @@ workflows:
context: org-member
requires:
- nightly_binary_linux_wheel_py3.5_cpu
subfolder: "cpu/"
- binary_linux_wheel:
name: nightly_binary_linux_wheel_py3.5_cu92
python_version: "3.5"
......@@ -414,6 +425,7 @@ workflows:
context: org-member
requires:
- nightly_binary_linux_wheel_py3.5_cu92
subfolder: "cu92/"
- binary_linux_wheel:
name: nightly_binary_linux_wheel_py3.5_cu100
python_version: "3.5"
......@@ -423,6 +435,7 @@ workflows:
context: org-member
requires:
- nightly_binary_linux_wheel_py3.5_cu100
subfolder: "cu100/"
- binary_linux_wheel:
name: nightly_binary_linux_wheel_py3.6_cpu
python_version: "3.6"
......@@ -432,6 +445,7 @@ workflows:
context: org-member
requires:
- nightly_binary_linux_wheel_py3.6_cpu
subfolder: "cpu/"
- binary_linux_wheel:
name: nightly_binary_linux_wheel_py3.6_cu92
python_version: "3.6"
......@@ -442,6 +456,7 @@ workflows:
context: org-member
requires:
- nightly_binary_linux_wheel_py3.6_cu92
subfolder: "cu92/"
- binary_linux_wheel:
name: nightly_binary_linux_wheel_py3.6_cu100
python_version: "3.6"
......@@ -451,6 +466,7 @@ workflows:
context: org-member
requires:
- nightly_binary_linux_wheel_py3.6_cu100
subfolder: "cu100/"
- binary_linux_wheel:
name: nightly_binary_linux_wheel_py3.7_cpu
python_version: "3.7"
......@@ -460,6 +476,7 @@ workflows:
context: org-member
requires:
- nightly_binary_linux_wheel_py3.7_cpu
subfolder: "cpu/"
- binary_linux_wheel:
name: nightly_binary_linux_wheel_py3.7_cu92
python_version: "3.7"
......@@ -470,6 +487,7 @@ workflows:
context: org-member
requires:
- nightly_binary_linux_wheel_py3.7_cu92
subfolder: "cu92/"
- binary_linux_wheel:
name: nightly_binary_linux_wheel_py3.7_cu100
python_version: "3.7"
......@@ -479,6 +497,7 @@ workflows:
context: org-member
requires:
- nightly_binary_linux_wheel_py3.7_cu100
subfolder: "cu100/"
- binary_macos_wheel:
name: nightly_binary_macos_wheel_py2.7_cpu
python_version: "2.7"
......@@ -488,6 +507,7 @@ workflows:
context: org-member
requires:
- nightly_binary_macos_wheel_py2.7_cpu
subfolder: ""
- binary_macos_wheel:
name: nightly_binary_macos_wheel_py2.7u_cpu
python_version: "2.7"
......@@ -498,6 +518,7 @@ workflows:
context: org-member
requires:
- nightly_binary_macos_wheel_py2.7u_cpu
subfolder: ""
- binary_macos_wheel:
name: nightly_binary_macos_wheel_py3.5_cpu
python_version: "3.5"
......@@ -507,6 +528,7 @@ workflows:
context: org-member
requires:
- nightly_binary_macos_wheel_py3.5_cpu
subfolder: ""
- binary_macos_wheel:
name: nightly_binary_macos_wheel_py3.6_cpu
python_version: "3.6"
......@@ -516,6 +538,7 @@ workflows:
context: org-member
requires:
- nightly_binary_macos_wheel_py3.6_cpu
subfolder: ""
- binary_macos_wheel:
name: nightly_binary_macos_wheel_py3.7_cpu
python_version: "3.7"
......@@ -525,6 +548,7 @@ workflows:
context: org-member
requires:
- nightly_binary_macos_wheel_py3.7_cpu
subfolder: ""
- binary_linux_conda:
name: nightly_binary_linux_conda_py2.7_cpu
python_version: "2.7"
......
.circleci/config.yml.in
View file @ d2460a75
......@@ -143,6 +143,10 @@ jobs:
# Requires org-member context
binary_wheel_upload:
parameters:
subfolder:
description: "What whl subfolder to upload to, e.g., blank or cu100/ (trailing slash is important)"
type: string
docker:
- image: circleci/python:3.7
steps:
......@@ -158,9 +162,9 @@ jobs:
export AWS_ACCESS_KEY_ID="${PYTORCH_BINARY_AWS_ACCESS_KEY_ID}"
export AWS_SECRET_ACCESS_KEY="${PYTORCH_BINARY_AWS_SECRET_ACCESS_KEY}"
set -x
#for pkg in ~/workspace/*.whl; do
# aws s3 cp "$pkg" "s3://pytorch/whl/nightly/" --acl public-read
#done
for pkg in ~/workspace/*.whl; do
aws s3 cp "$pkg" "s3://pytorch/whl/nightly/<< parameters.subfolder >>" --acl public-read
done
{%- macro workflow(btype, os, python_version, cu_version, unicode, prefix='', upload=False) %}
- binary_{{os}}_{{btype}}:
......@@ -180,6 +184,13 @@ jobs:
context: org-member
requires:
- {{prefix}}binary_{{os}}_{{btype}}_py{{python_version}}{{ "u" if unicode }}_{{cu_version}}
{%- if btype == 'wheel' %}
{%- if os == 'macos' %}
subfolder: ""
{%- else %}
subfolder: "{{cu_version}}/"
{%- endif %}
{%- endif %}
{%- endif %}
{%- endmacro %}
......
packaging/torchvision/meta.yaml
View file @ d2460a75
......@@ -27,7 +27,9 @@ build:
string: py{{py}}_{{ environ['CU_VERSION'] }}
script: python setup.py install --single-version-externally-managed --record=record.txt # [not win]
script_env:
- CU_VERSION
- CUDA_HOME
- FORCE_CUDA
- NVCC_FLAGS
features:
{{ CONDA_CPUONLY_FEATURE }}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment