Skip to content

GitLab

Unverified Commit c79bbd01 authored by msbaines's avatar msbaines Committed by GitHub
Browse files

[chore] update to torch v1.8.0 (#508)

parent c9fdf506
Show whitespace changes
Inline Side-by-side
Showing with 75 additions and 121 deletions
.circleci/config.yml
View file @ c79bbd01
......@@ -15,23 +15,24 @@ version: 2.1
cpu_py37: &cpu_py37
docker:
- image: circleci/python:3.7
resource_class: medium
resource_class: large
cpu_py38: &cpu_py38
docker:
- image: circleci/python:3.8
resource_class: medium
resource_class: large
cpu_py39: &cpu_py39
docker:
- image: circleci/python:3.9
resource_class: medium
resource_class: large
# Here are list of GPU images:
# https://circleci.com/docs/2.0/configuration-reference/#available-linux-gpu-images
gpu: &gpu
environment:
CUDA_VERSION: "10.1"
CUDA_HOME: /usr/local/cuda-10.1
machine:
image: ubuntu-1604-cuda-10.1:201909-23
resource_class: gpu.large
......@@ -39,6 +40,7 @@ gpu: &gpu
gpu_cu111: &gpu_cu111
environment:
CUDA_VERSION: "11.1"
CUDA_HOME: /usr/local/cuda-11.1
machine:
image: ubuntu-1604-cuda-11.1:202012-01
resource_class: gpu.large
......@@ -59,30 +61,13 @@ setup_venv: &setup_venv
which pip
pip install --upgrade pip
install_dep_151: &install_dep_151
- run:
name: Install Dependencies with torch 1.5.1
command: |
# make sure that apt-get retries if needed
sudo sh -c "echo 'APT::Acquire::Retries "3";' > /etc/apt/apt.conf.d/80-retries"
sudo apt-get install -y libopenmpi-dev
# check if we have restored venv cache (/home/circleci/venv) correctly, if so, just skip
if [ -f /home/circleci/venv/check_version.py ]; then python /home/circleci/venv/check_version.py torch eq 1.5 && exit 0; fi
# start installing
pip install --progress-bar off torch==1.5.1+cu101 torchvision==0.6.1+cu101 -f https://download.pytorch.org/whl/torch_stable.html
pip install --progress-bar off -r requirements-test.txt
pip install --progress-bar off -r requirements-benchmarks.txt
python -c 'import torch; print("Torch version:", torch.__version__)'
python -c 'import torch; assert torch.__version__.split(".")[:2] == ["1", "5"], "wrong torch version"'
python -m torch.utils.collect_env
wget -O /home/circleci/venv/check_version.py https://raw.githubusercontent.com/min-xu-ai/check_verion/main/check_version.py
install_dep_160: &install_dep_160
- run:
name: Install Dependencies with torch 1.6.0
command: |
# make sure that apt-get retries if needed
sudo sh -c "echo 'APT::Acquire::Retries "3";' > /etc/apt/apt.conf.d/80-retries"
sudo apt-get update -y
sudo apt-get install -y libopenmpi-dev
# check if we have restored venv cache (/home/circleci/venv) correctly, if so, just skip
if [ -f /home/circleci/venv/check_version.py ]; then python /home/circleci/venv/check_version.py torch eq 1.6 && exit 0; fi
......@@ -102,27 +87,7 @@ install_dep_171: &install_dep_171
command: |
# make sure that apt-get retries if needed
sudo sh -c "echo 'APT::Acquire::Retries "3";' > /etc/apt/apt.conf.d/80-retries"
sudo apt-get install -y libopenmpi-dev
# check if we have restored venv cache (/home/circleci/venv) correctly, if so, just skip
if [ -f /home/circleci/venv/check_version.py ]; then python /home/circleci/venv/check_version.py torch eq 1.7 && exit 0; fi
# start installing
pip install --progress-bar off torch==1.7.1+cu101 torchvision==0.8.2+cu101 -f https://download.pytorch.org/whl/torch_stable.html
pip install --progress-bar off -r requirements-test.txt
pip install --progress-bar off -r requirements-benchmarks.txt
pip install --progress-bar off git+https://github.com/msbaines/torch_pg.git@c85c96f#egg=torch-pg
python -c 'import torch; print("Torch version:", torch.__version__)'
python -c 'import torch; assert torch.__version__.split(".")[:2] == ["1", "7"], "wrong torch version"'
python -m torch.utils.collect_env
wget -O /home/circleci/venv/check_version.py https://raw.githubusercontent.com/min-xu-ai/check_verion/main/check_version.py
install_dep_171_cu110: &install_dep_171_cu110
- run:
name: Install Dependencies with torch 1.7.1+cu110
command: |
# make sure that apt-get retries if needed
sudo sh -c "echo 'APT::Acquire::Retries "3";' > /etc/apt/apt.conf.d/80-retries"
sudo add-apt-repository universe
sudo apt-get update
sudo apt-get update -y
sudo apt-get install -y libopenmpi-dev
# check if we have restored venv cache (/home/circleci/venv) correctly, if so, just skip
if [ -f /home/circleci/venv/check_version.py ]; then python /home/circleci/venv/check_version.py torch eq 1.7 && exit 0; fi
......@@ -138,32 +103,24 @@ install_dep_171_cu110: &install_dep_171_cu110
install_dep_180: &install_dep_180
- run:
name: Install Dependencies with torch 1.8.0 nightly
name: Install Dependencies with torch 1.8.0
command: |
# make sure that apt-get retries if needed
sudo sh -c "echo 'APT::Acquire::Retries "3";' > /etc/apt/apt.conf.d/80-retries"
sudo apt-get update -y
sudo apt-get install -y libopenmpi-dev
# check if we have restored cache correctly, if so, just skip
# check if we have restored venv cache (/home/circleci/venv) correctly, if so, just skip
if [ -f /home/circleci/venv/check_version.py ]; then python /home/circleci/venv/check_version.py torch eq 1.8 && exit 0; fi
# start installing
pip install --progress-bar off torch==1.8.0+cu101 torchvision==0.9.0+cu101 -f https://download.pytorch.org/whl/torch_stable.html
pip install --progress-bar off -r requirements-test.txt
# Since we are using nightly builds, we bypass the benchmarks req file
# and install ourselves for testing.
#pip install --progress-bar off -r requirements-benchmarks.txt
# torchvision nightly wants torch 1.9.
pip install --pre --progress-bar off torchtext==0.6.0 \
torchvision==0.9.0.dev20210222+cu112 \
-f https://download.pytorch.org/whl/nightly/cu112/torch_nightly.html
# we only use it a bit in benchmarking, so it might be safe to use 1.8.
pip install --pre --progress-bar off torch==1.8.0.dev20210210+cu112 \
-f https://download.pytorch.org/whl/nightly/cu112/torch_nightly.html
pip install --progress-bar off git+https://github.com/min-xu-ai/torch_pg.git@c723ab4#egg=torch-pg
pip install --progress-bar off -r requirements-benchmarks.txt
python -c 'import torch; print("Torch version:", torch.__version__)'
python -c 'import torch; assert torch.__version__.split(".")[:2] == ["1", "8"], "wrong torch version"'
python -m torch.utils.collect_env
wget -O /home/circleci/venv/check_version.py https://raw.githubusercontent.com/min-xu-ai/check_verion/main/check_version.py
install_repo_cpu: &install_repo_cpu
install_repo: &install_repo
- run:
name: Install Repository
command: |
......@@ -171,21 +128,6 @@ install_repo_cpu: &install_repo_cpu
# Test import.
python -c 'import sys; sys.path = sys.path[1:]; import fairscale'
install_repo_gpu: &install_repo_gpu
- run:
name: Install Repository
command: |
export CUDA_HOME=/usr/local/cuda-10.1
pip install -e .
install_repo_gpu_cu111: &install_repo_gpu_cu111
- run:
name: Install Repository
command: |
export CUDA_HOME=/usr/local/cuda-11.1
pip install -e .
run_isort: &run_isort
- run:
name: Run Linter (isort)
......@@ -305,10 +247,9 @@ commands:
steps:
- run:
name: Run Unit Tests
# we use pytest -x so that it stops on first failure to save GPU time, which is expensive.
command: |
if [ ! -f <<parameters.test_list_file>> ]; then exit 1; fi
pytest -x --junitxml=test-results/junit.xml --verbose --timeout 60 `cat <<parameters.test_list_file>>`
pytest --junitxml=test-results/junit.xml --verbose --timeout 60 `cat <<parameters.test_list_file>>`
# -------------------------------------------------------------------------------------
# Jobs to run
......@@ -328,16 +269,16 @@ jobs:
# Cache the venv directory that contains dependencies
- restore_cache:
keys:
- cache-key-cpu-py37-171-{{ checksum "setup.py"}}-{{ checksum "requirements-test.txt"}}
- cache-key-cpu-py37-180-1-{{ checksum "setup.py"}}-{{ checksum "requirements-test.txt"}}
- <<: *install_dep_171
- save_cache:
paths:
- ~/venv
key: cache-key-cpu-py37-171-{{ checksum "setup.py"}}-{{ checksum "requirements-test.txt"}}
key: cache-key-cpu-py37-180-1-{{ checksum "setup.py"}}-{{ checksum "requirements-test.txt"}}
- <<: *install_repo_cpu
- <<: *install_repo
- <<: *run_isort
- <<: *run_black
......@@ -363,15 +304,15 @@ jobs:
# Cache the venv directory that contains dependencies
- restore_cache:
keys:
- cache-key-cpu-py38-171-{{ checksum "setup.py"}}-{{ checksum "requirements-test.txt"}}
- cache-key-cpu-py38-180-1-{{ checksum "setup.py"}}-{{ checksum "requirements-test.txt"}}
- <<: *install_dep_171
- save_cache:
paths:
- ~/venv
key: cache-key-cpu-py38-171-{{ checksum "setup.py"}}-{{ checksum "requirements-test.txt"}}
key: cache-key-cpu-py38-180-1-{{ checksum "setup.py"}}-{{ checksum "requirements-test.txt"}}
- <<: *install_repo_cpu
- <<: *install_repo
- <<: *run_isort
- <<: *run_black
......@@ -397,7 +338,7 @@ jobs:
# Cache the venv directory that contains dependencies
- restore_cache:
keys:
- cache-key-cpu-py39-180-3-{{ checksum "setup.py"}}-{{ checksum "requirements-test.txt"}}
- cache-key-cpu-py39-180-4-{{ checksum "setup.py"}}-{{ checksum "requirements-test.txt"}}
# py3.9 doesn't work well with torch < 1.8. See this PR:
# https://github.com/pytorch/pytorch/pull/50998
......@@ -408,23 +349,23 @@ jobs:
- save_cache:
paths:
- ~/venv
key: cache-key-cpu-py39-180-3-{{ checksum "setup.py"}}-{{ checksum "requirements-test.txt"}}
key: cache-key-cpu-py39-180-4-{{ checksum "setup.py"}}-{{ checksum "requirements-test.txt"}}
- <<: *install_repo_cpu
- <<: *install_repo
- <<: *run_isort
- <<: *run_black
- <<: *run_mypy
- <<: *run_flake8
- <<: *run_unittests
- <<: *run_mpi_unittests
# TODO(msb) - <<: *run_mpi_unittests
- <<: *run_doc_build
- store_test_results:
path: test-results
gpu_tests_151:
gpu_tests_160:
parameters:
test_list_file:
type: string
......@@ -446,16 +387,16 @@ jobs:
# Cache the venv directory that contains dependencies
- restore_cache:
keys:
- cache-key-gpu-151-{{ checksum "setup.py"}}-{{ checksum "requirements-test.txt"}}
- cache-key-gpu-160-101-{{ checksum "setup.py"}}-{{ checksum "requirements-test.txt"}}
- <<: *install_dep_151
- <<: *install_dep_160
- save_cache:
paths:
- ~/venv
key: cache-key-gpu-151-{{ checksum "setup.py"}}-{{ checksum "requirements-test.txt"}}
key: cache-key-gpu-160-101-{{ checksum "setup.py"}}-{{ checksum "requirements-test.txt"}}
- <<: *install_repo_gpu
- <<: *install_repo
- run_unittests_from_list:
test_list_file: <<parameters.test_list_file>>
......@@ -463,13 +404,13 @@ jobs:
- store_test_results:
path: test-results
gpu_tests_160:
gpu_tests_171:
parameters:
test_list_file:
type: string
default: "/dev/non_exist"
<<: *gpu
<<: *gpu_cu111
working_directory: ~/fairscale
......@@ -478,23 +419,24 @@ jobs:
- run: nvidia-smi
- run: pyenv global 3.7.0
# Run this to make sure we use python3 from the system.
- run: pyenv global 3.8.6
- <<: *setup_venv
# Cache the venv directory that contains dependencies
- restore_cache:
keys:
- cache-key-gpu-160-{{ checksum "setup.py"}}-{{ checksum "requirements-test.txt"}}
- cache-key-gpu-171-110-{{ checksum "setup.py"}}-{{ checksum "requirements-test.txt"}}
- <<: *install_dep_160
- <<: *install_dep_171
- save_cache:
paths:
- ~/venv
key: cache-key-gpu-160-{{ checksum "setup.py"}}-{{ checksum "requirements-test.txt"}}
key: cache-key-gpu-171-110-{{ checksum "setup.py"}}-{{ checksum "requirements-test.txt"}}
- <<: *install_repo_gpu
- <<: *install_repo
- run_unittests_from_list:
test_list_file: <<parameters.test_list_file>>
......@@ -502,13 +444,13 @@ jobs:
- store_test_results:
path: test-results
gpu_tests_171:
gpu_tests_180:
parameters:
test_list_file:
type: string
default: "/dev/non_exist"
<<: *gpu_cu111
<<: *gpu
working_directory: ~/fairscale
......@@ -518,23 +460,23 @@ jobs:
- run: nvidia-smi
# Run this to make sure we use python3 from the system.
- run: pyenv global 3.8.6
- run: pyenv global 3.7.0
- <<: *setup_venv
# Cache the venv directory that contains dependencies
- restore_cache:
keys:
- cache-key-gpu-cu111-171-{{ checksum "setup.py"}}-{{ checksum "requirements-test.txt"}}
- cache-key-gpu-180-101-{{ checksum "setup.py"}}-{{ checksum "requirements-test.txt"}}
- <<: *install_dep_171_cu110
- <<: *install_dep_180
- save_cache:
paths:
- ~/venv
key: cache-key-gpu-cu111-171-{{ checksum "setup.py"}}-{{ checksum "requirements-test.txt"}}
key: cache-key-gpu-180-101-{{ checksum "setup.py"}}-{{ checksum "requirements-test.txt"}}
- <<: *install_repo_gpu_cu111
- <<: *install_repo
- run_unittests_from_list:
test_list_file: <<parameters.test_list_file>>
......@@ -563,21 +505,21 @@ jobs:
# Cache the venv directory that contains dependencies
- restore_cache:
keys:
- cache-key-benchmarks-{{ checksum "setup.py"}}-{{ checksum "requirements-test.txt"}}
- cache-key-benchmarks-180-101-{{ checksum "setup.py"}}-{{ checksum "requirements-test.txt"}}
# Cache the MNIST directory that contains benchmark data
- restore_cache:
keys:
- cache-key-benchmark-MNIST-{{ checksum "benchmarks/datasets/mnist.py"}}
- <<: *install_dep_171
- <<: *install_dep_180
- save_cache:
paths:
- ~/venv
key: cache-key-benchmarks-{{ checksum "setup.py"}}-{{ checksum "requirements-test.txt"}}
key: cache-key-benchmarks-180-101-{{ checksum "setup.py"}}-{{ checksum "requirements-test.txt"}}
- <<: *install_repo_gpu
- <<: *install_repo
- <<: *run_pipe_benchmark
......@@ -594,8 +536,6 @@ jobs:
- /tmp/MNIST
key: cache-key-benchmark-MNIST-{{ checksum "benchmarks/datasets/mnist.py"}}
benchmarks_2:
<<: *gpu
......@@ -617,7 +557,7 @@ jobs:
# Cache the venv directory that contains dependencies
- restore_cache:
keys:
- cache-key-benchmarks-{{ checksum "setup.py"}}-{{ checksum "requirements-test.txt"}}
- cache-key-benchmarks-180-101-{{ checksum "setup.py"}}-{{ checksum "requirements-test.txt"}}
# Cache the MNIST directory that contains benchmark data
......@@ -625,14 +565,14 @@ jobs:
keys:
- cache-key-benchmark-MNIST-{{ checksum "benchmarks/datasets/mnist.py"}}
- <<: *install_dep_171
- <<: *install_dep_180
- save_cache:
paths:
- ~/venv
key: cache-key-benchmarks-{{ checksum "setup.py"}}-{{ checksum "requirements-test.txt"}}
key: cache-key-benchmarks-180-101-{{ checksum "setup.py"}}-{{ checksum "requirements-test.txt"}}
- <<: *install_repo_gpu
- <<: *install_repo
- <<: *run_oss_benchmark
......@@ -649,23 +589,23 @@ workflows:
- cpu_tests_py37
- cpu_tests_py38
- cpu_tests_py39
- gpu_tests_151:
test_list_file: tests/ci_test_list_1.txt
- gpu_tests_160:
test_list_file: tests/ci_test_list_1.txt
- gpu_tests_171:
test_list_file: tests/ci_test_list_1.txt
- gpu_tests_151:
test_list_file: tests/ci_test_list_2.txt
- gpu_tests_180:
test_list_file: tests/ci_test_list_1.txt
- gpu_tests_160:
test_list_file: tests/ci_test_list_2.txt
- gpu_tests_171:
test_list_file: tests/ci_test_list_2.txt
- gpu_tests_151:
test_list_file: tests/ci_test_list_3.txt
- gpu_tests_180:
test_list_file: tests/ci_test_list_2.txt
- gpu_tests_160:
test_list_file: tests/ci_test_list_3.txt
- gpu_tests_171:
test_list_file: tests/ci_test_list_3.txt
- gpu_tests_180:
test_list_file: tests/ci_test_list_3.txt
- benchmarks_1
- benchmarks_2
README.md
View file @ c79bbd01
......@@ -164,7 +164,7 @@ At a high level, we want ML researchers to:
# Testing
We use circleci to test on PyTorch versions 1.5.1, 1.6.0 and 1.7.1 and CUDA version 10.1. Please create an [issue](https://github.com/facebookresearch/fairscale/issues) if you are having trouble with installation.
We use circleci to test on PyTorch versions 1.6.0, 1.7.1, and 1.8.0. Please create an [issue](https://github.com/facebookresearch/fairscale/issues) if you are having trouble with installation.
## Contributors
......
fairscale/utils/testing.py
View file @ c79bbd01
......@@ -146,12 +146,17 @@ def dist_init(rank: int, world_size: int, filename: str, filename_rpc: str = "")
torch.distributed.init_process_group(backend=backend, rank=rank, world_size=world_size, init_method=url)
tp_options = {"init_method": url_rpc}
# Workaround for bug in torch v1.8.0. Should be fixed in v1.8.1
if torch_version() == (1, 8, 0):
tp_options["_transports"] = ["uv"] # type: ignore
rpc.init_rpc(
f"Test{rank}",
rank=rank,
world_size=world_size,
backend=rpc.BackendType.TENSORPIPE,
rpc_backend_options=rpc.TensorPipeRpcBackendOptions(init_method=url_rpc),
rpc_backend_options=rpc.TensorPipeRpcBackendOptions(**tp_options),
)
else:
......
requirements.txt
View file @ c79bbd01
# FairScale should only depends on torch, not things higher level than torch.
torch >= 1.5.1
torch >= 1.6.0
setup.cfg
View file @ c79bbd01
......@@ -52,6 +52,9 @@ disallow_untyped_decorators = true
disallow_incomplete_defs = true
warn_unused_ignores = true
[mypy-benchmarks.*]
ignore_errors = True
# Ignore missing imports from untyped third-party libraries.
[mypy-torch.*,torchvision.*,setuptools.*,pytest.*]
ignore_missing_imports = true
tests/nn/pipe_process/test_rpc.py
View file @ c79bbd01
......@@ -241,6 +241,8 @@ def rpc_multiple_tensors():
@torch_spawn([2])
@pytest.mark.skipif("OMPI_COMM_WORLD_RANK" in os.environ, reason="no mpi")
@pytest.mark.skipif(not torch.cuda.is_available(), reason="cuda required")
# TODO(msb) Fix this
@pytest.mark.skipif(torch.__version__.split("+")[0].split(".") == ["1", "8", "0"], reason="disabled for torch 1.8.0")
def construct_only_rank_zero():
model = [nn.Linear(10, 10), nn.ReLU()]
if torch.distributed.get_rank() == 0:
......
tests/optim/test_oss.py
View file @ c79bbd01
......@@ -451,6 +451,8 @@ def run_test_collect_shards(rank, world_size, reference_rank, tempfile_name):
dist.destroy_process_group()
# TODO(blefaudeux) Fix for torch v1.8.0
@pytest.mark.skipif(torch.__version__.split("+")[0].split(".") == ["1", "8", "0"], reason="disabled for torch 1.8.0")
def test_collect_shards():
world_size = 3
temp_file_name = tempfile.mkstemp()[1]
......@@ -515,6 +517,8 @@ def run_test_reproducibility(rank, world_size, reference_rank, tempfile_name):
dist.destroy_process_group()
# TODO(blefaudeux) Fix for torch v1.8.0
@pytest.mark.skipif(torch.__version__.split("+")[0].split(".") == ["1", "8", "0"], reason="disabled for torch 1.8.0")
def test_reproducibility():
world_size = 2
temp_file_name = tempfile.mkstemp()[1]
......
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