Skip to content

Commit

Permalink
[release] Prepare dummy binary for 2.0 release (#1115)
Browse files Browse the repository at this point in the history
  • Loading branch information
zou3519 authored Mar 8, 2023
1 parent 408bcf1 commit feed934
Show file tree
Hide file tree
Showing 8 changed files with 17 additions and 16 deletions.
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -256,13 +256,13 @@ workflows:
name: unittest_linux_<< matrix.cu_version >>_py<< matrix.python_version >>
matrix:
parameters:
python_version: ["3.7", "3.8", "3.9", "3.10"]
python_version: ["3.8", "3.9", "3.10"]
cu_version: ["cpu"]
- unittest_linux_gpu:
name: unittest_linux_<< matrix.cu_version >>_py<< matrix.python_version >>
matrix:
parameters:
python_version: ["3.7", "3.8", "3.9", "3.10"]
python_version: ["3.8", "3.9", "3.10"]
cu_version: ["cu116"]

- unittest_macos_cpu:
Expand Down
4 changes: 2 additions & 2 deletions .circleci/unittest/linux/scripts/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,11 @@ gcc --version
pip install expecttest

if [ "${CU_VERSION:-}" == cpu ] ; then
conda install -y pytorch torchvision cpuonly -c pytorch-nightly
conda install -y pytorch=2.0 torchvision cpuonly -c pytorch-test
PYTORCH_VERSION="$(python -c "import torch; print(torch.__version__)")" python setup.py develop bdist_wheel -d $WHEELS_FOLDER
pip install functorch -f $WHEELS_FOLDER
else
conda install pytorch torchvision pytorch-cuda=11.6 -c pytorch-nightly -c nvidia
conda install pytorch=2.0 torchvision pytorch-cuda=11.6 -c pytorch-test -c nvidia
PYTORCH_VERSION="$(python -c "import torch; print(torch.__version__)")" python setup.py develop bdist_wheel -d $WHEELS_FOLDER
pip install functorch -f $WHEELS_FOLDER
fi
3 changes: 2 additions & 1 deletion .circleci/unittest/linux/scripts/run_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ echo git_version
git clone https://github.com/pytorch/pytorch.git
pushd pytorch
git checkout $git_version
pushd test
pushd functorch

find test \( -name test\*.py ! -name test_functorch_lagging_op_db.py \) | xargs -I {} -n 1 python {} -v || EXIT_STATUS=$?
find . \( -name test\*.py \) | xargs -I {} -n 1 python {} -v || EXIT_STATUS=$?
exit $EXIT_STATUS
2 changes: 1 addition & 1 deletion .circleci/unittest/windows/scripts/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ else
fi

printf "Installing PyTorch with %s\n" "${cudatoolkit}"
conda install -y -c "pytorch-${UPLOAD_CHANNEL}" -c nvidia "pytorch-${UPLOAD_CHANNEL}"::pytorch[build="*${version}*"] "${cudatoolkit}"
conda install -y pytorch torchvision "${cudatoolkit}" -c pytorch-test

torch_cuda=$(python -c "import torch; print(torch.cuda.is_available())")
echo torch.cuda.is_available is $torch_cuda
Expand Down
4 changes: 2 additions & 2 deletions .circleci/unittest/windows/scripts/run_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@ echo git_version
git clone https://github.com/pytorch/pytorch.git
pushd pytorch
git checkout $git_version
pushd functorch
pushd test

pytest test
pytest functorch
4 changes: 2 additions & 2 deletions .github/workflows/wheels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
types: [opened, synchronize, reopened]
push:
branches:
- main
- release/2.0

jobs:

Expand All @@ -20,7 +20,7 @@ jobs:
uses: actions/checkout@v2
- name: Install PyTorch Nightly
run: |
python3 -mpip install --pre torch>=1.13.0.dev -f https://download.pytorch.org/whl/nightly/cpu/torch_nightly.html
python3 -mpip install --pre torch==2.0 -f https://download.pytorch.org/whl/test/cpu/torch_test.html
- name: Build wheel
run: |
python3 -mpip install wheel
Expand Down
10 changes: 5 additions & 5 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,16 @@
sha = 'Unknown'
package_name = 'functorch'

if os.getenv('BUILD_VERSION'):
version = os.getenv('BUILD_VERSION')
elif sha != 'Unknown':
version += '+' + sha[:7]
# if os.getenv('BUILD_VERSION'):
# version = os.getenv('BUILD_VERSION')
# elif sha != 'Unknown':
# version += '+' + sha[:7]


requirements = [
# This represents a nightly version of PyTorch.
# It can be installed as a binary or from source.
"torch>=1.14.0.dev",
"torch>=2.0,<2.1",
]

extras = {}
Expand Down
2 changes: 1 addition & 1 deletion version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.14.0a0
2.0.0

0 comments on commit feed934

Please sign in to comment.