From 4e895d86aea9e9917735744190bd4c271d3f25e4 Mon Sep 17 00:00:00 2001 From: NickNickGo <66033489+NickNickGo@users.noreply.github.com> Date: Tue, 20 Oct 2020 16:01:25 -0700 Subject: [PATCH 01/22] Set up CI with Azure Pipelines [skip ci] --- azure-pipelines.yml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 azure-pipelines.yml diff --git a/azure-pipelines.yml b/azure-pipelines.yml new file mode 100644 index 0000000..aa91291 --- /dev/null +++ b/azure-pipelines.yml @@ -0,0 +1,19 @@ +# Starter pipeline +# Start with a minimal pipeline that you can customize to build and deploy your code. +# Add steps that build, run tests, deploy, and more: +# https://aka.ms/yaml + +trigger: +- master + +pool: + vmImage: 'ubuntu-latest' + +steps: +- script: echo Hello, world! + displayName: 'Run a one-line script' + +- script: | + echo Add other tasks to build, test, and deploy your project. + echo See https://aka.ms/yaml + displayName: 'Run a multi-line script' From 675589ade5dba1daff898f7171e03dab993e426c Mon Sep 17 00:00:00 2001 From: NickNickGo <66033489+NickNickGo@users.noreply.github.com> Date: Tue, 20 Oct 2020 16:16:18 -0700 Subject: [PATCH 02/22] Update azure-pipelines.yml initial pipeline --- azure-pipelines.yml | 88 +++++++++++++++++++++++++++++++++++++-------- 1 file changed, 74 insertions(+), 14 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index aa91291..4270bb9 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,19 +1,79 @@ -# Starter pipeline -# Start with a minimal pipeline that you can customize to build and deploy your code. -# Add steps that build, run tests, deploy, and more: -# https://aka.ms/yaml +# Python package +# Create and test a Python package on multiple Python versions. +# Add steps that analyze code, save the dist with the build record, publish to a PyPI-compatible index, and more: +# https://docs.microsoft.com/azure/devops/pipelines/languages/python trigger: -- master + branches: + include: + - master -pool: - vmImage: 'ubuntu-latest' +jobs: + - job: DeepSpeed_Tests + timeoutInMinutes: 360 + pool: + vmImage: 'ubuntu-18.04' + #container: pytorch/pytorch:latest + container: + image: adsbrainwestus2.azurecr.io/fastseq:dev-py3 + endpoint: acr-westus2 + + #container: adsbrainwestus2.azurecr.io/fastseq:dev-py3 + + # strategy: + # matrix: + # PyTorch12-CUDA100: + # python.version: '3.6' + # cuda.version: '10.0' + # pytorch.version: '0.9.0' -steps: -- script: echo Hello, world! - displayName: 'Run a one-line script' + steps: + # Unfortunately nvidia's nvcc_linux-64= seems to install 10.1 regardless? + # Most of this complexity is a workaround to get the compiler toolchain to match the + # cudatoolkit runtime + - script: | + #conda create --force --yes -n $(conda_env) python=$(python.version) cudatoolkit=$(cuda.version) + #conda init bash + #conda activate $(conda_env) + #conda install -q --yes conda + #conda install -q --yes pip + #conda install -q --yes gxx_linux-64 + #if [[ $(cuda.version) != "10.2" ]]; then conda install --yes -c conda-forge cudatoolkit-dev=$(cuda.version) ; fi + #echo "PATH=$PATH, LD_LIBRARY_PATH=$LD_LIBRARY_PATH" + python --version + which nvcc + nvcc --version + which fastseq + python test.py + displayName: 'Setup environment python=$(python.version) pytorch=$(pytorch.version) cuda=$(cuda.version)' -- script: | - echo Add other tasks to build, test, and deploy your project. - echo See https://aka.ms/yaml - displayName: 'Run a multi-line script' + # - script: | + # source activate $(conda_env) + # pip install --progress-bar=off torch==$(pytorch.version) + # #-f https://download.pytorch.org/whl/torch_stable.html + # a=$(python --version) + # echo $a + # pip install fastseq + # #python -I basic_install_test.py + # displayName: 'Install Fastseq' + # - script: | + # sudo docker run --gpus all --network=host --privileged -w '/root' --shm-size=1g --ulimit memlock=-1 --ulimit stack=67108864 adsbrainwestus2.azurecr.io/fastseq:dev-py3 /bin/bash + # python --version + # which nvcc + # nvcc --version + # which fastseq + # ls + # displayName: 'docker' + + # - script: | + # source activate $(conda_env) + # which python + # python --version + # which nvcc + # nvcc --version + # which fastseq + # python -c "import torch; print('torch:', torch.__version__, torch)" + # python -c "import torch; print('CUDA available:', torch.cuda.is_available())" + # #python -c "import deepspeed; print('fastseq:', fastseq.__version__)" + # displayName: 'Show environment' + From 9e90413db719e5cc508225db074247f3aa9a87db Mon Sep 17 00:00:00 2001 From: NickNickGo <66033489+NickNickGo@users.noreply.github.com> Date: Tue, 20 Oct 2020 16:18:46 -0700 Subject: [PATCH 03/22] Update azure-pipelines.yml --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 4270bb9..513d5a0 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -6,7 +6,7 @@ trigger: branches: include: - - master + - main jobs: - job: DeepSpeed_Tests From 28fc09910ab32a95d852c3f73d649f5c30a8bcbc Mon Sep 17 00:00:00 2001 From: NickNickGo <66033489+NickNickGo@users.noreply.github.com> Date: Tue, 20 Oct 2020 16:35:04 -0700 Subject: [PATCH 04/22] Update azure-pipelines.yml --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 513d5a0..cfda3b6 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -44,7 +44,7 @@ jobs: which nvcc nvcc --version which fastseq - python test.py + bash tests/run_fairseq_tests.sh displayName: 'Setup environment python=$(python.version) pytorch=$(pytorch.version) cuda=$(cuda.version)' # - script: | From 1f34332e491ad44c03d9e1c02a76da8db6d08f4a Mon Sep 17 00:00:00 2001 From: NickNickGo <66033489+NickNickGo@users.noreply.github.com> Date: Tue, 20 Oct 2020 17:55:35 -0700 Subject: [PATCH 05/22] Update azure-pipelines.yml --- azure-pipelines.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index cfda3b6..ba54c59 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -11,8 +11,9 @@ trigger: jobs: - job: DeepSpeed_Tests timeoutInMinutes: 360 - pool: - vmImage: 'ubuntu-18.04' + #pool: + # vmImage: 'ubuntu-18.04' + pool: gpu4 #container: pytorch/pytorch:latest container: image: adsbrainwestus2.azurecr.io/fastseq:dev-py3 From e1f154b0ca33728a6f264e42d28ed624ff499267 Mon Sep 17 00:00:00 2001 From: NickNickGo <66033489+NickNickGo@users.noreply.github.com> Date: Tue, 20 Oct 2020 18:07:45 -0700 Subject: [PATCH 06/22] Update azure-pipelines.yml --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index ba54c59..e16fe6d 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -13,7 +13,7 @@ jobs: timeoutInMinutes: 360 #pool: # vmImage: 'ubuntu-18.04' - pool: gpu4 + pool:'gpu4' #container: pytorch/pytorch:latest container: image: adsbrainwestus2.azurecr.io/fastseq:dev-py3 From 62f6a294a82a3122e2b0d8ee820c3259269150cf Mon Sep 17 00:00:00 2001 From: NickNickGo <66033489+NickNickGo@users.noreply.github.com> Date: Tue, 20 Oct 2020 18:27:58 -0700 Subject: [PATCH 07/22] Update azure-pipelines.yml --- azure-pipelines.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index e16fe6d..458d973 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -13,6 +13,7 @@ jobs: timeoutInMinutes: 360 #pool: # vmImage: 'ubuntu-18.04' + #haha pool:'gpu4' #container: pytorch/pytorch:latest container: From 33f90502d312076792995d44358bb850efc137dd Mon Sep 17 00:00:00 2001 From: NickNickGo <66033489+NickNickGo@users.noreply.github.com> Date: Tue, 20 Oct 2020 18:32:37 -0700 Subject: [PATCH 08/22] Update azure-pipelines.yml --- azure-pipelines.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 458d973..e16fe6d 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -13,7 +13,6 @@ jobs: timeoutInMinutes: 360 #pool: # vmImage: 'ubuntu-18.04' - #haha pool:'gpu4' #container: pytorch/pytorch:latest container: From c2a5a9eabd87d452fa4552184fb63b13c1944ac6 Mon Sep 17 00:00:00 2001 From: NickNickGo <66033489+NickNickGo@users.noreply.github.com> Date: Tue, 20 Oct 2020 18:43:34 -0700 Subject: [PATCH 09/22] Update azure-pipelines.yml --- azure-pipelines.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index e16fe6d..458d973 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -13,6 +13,7 @@ jobs: timeoutInMinutes: 360 #pool: # vmImage: 'ubuntu-18.04' + #haha pool:'gpu4' #container: pytorch/pytorch:latest container: From 650fe2bd4a07ac917da1bb153abc768a30cb3ca0 Mon Sep 17 00:00:00 2001 From: NickNickGo <66033489+NickNickGo@users.noreply.github.com> Date: Tue, 20 Oct 2020 18:50:56 -0700 Subject: [PATCH 10/22] Update azure-pipelines.yml --- azure-pipelines.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 458d973..627f3d1 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -14,7 +14,13 @@ jobs: #pool: # vmImage: 'ubuntu-18.04' #haha - pool:'gpu4' + pool: + name: default + demands: + - agent.name -equals gpu4 + + + #pool:'gpu4' #container: pytorch/pytorch:latest container: image: adsbrainwestus2.azurecr.io/fastseq:dev-py3 From ff8fd8c60c3bccbacb564faa2f34e5d7850aef3f Mon Sep 17 00:00:00 2001 From: NickNickGo <66033489+NickNickGo@users.noreply.github.com> Date: Tue, 20 Oct 2020 19:01:23 -0700 Subject: [PATCH 11/22] Update azure-pipelines.yml --- azure-pipelines.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 627f3d1..9e6cc2d 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -13,7 +13,6 @@ jobs: timeoutInMinutes: 360 #pool: # vmImage: 'ubuntu-18.04' - #haha pool: name: default demands: From c91ba67aea7bdfdb88ce439a6f34869568155e67 Mon Sep 17 00:00:00 2001 From: NickNickGo <66033489+NickNickGo@users.noreply.github.com> Date: Tue, 20 Oct 2020 19:08:22 -0700 Subject: [PATCH 12/22] Update azure-pipelines.yml --- azure-pipelines.yml | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 9e6cc2d..6dcbe0a 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -19,11 +19,9 @@ jobs: - agent.name -equals gpu4 - #pool:'gpu4' - #container: pytorch/pytorch:latest - container: - image: adsbrainwestus2.azurecr.io/fastseq:dev-py3 - endpoint: acr-westus2 + #container: + # image: adsbrainwestus2.azurecr.io/fastseq:dev-py3 + # endpoint: acr-westus2 #container: adsbrainwestus2.azurecr.io/fastseq:dev-py3 @@ -48,10 +46,10 @@ jobs: #if [[ $(cuda.version) != "10.2" ]]; then conda install --yes -c conda-forge cudatoolkit-dev=$(cuda.version) ; fi #echo "PATH=$PATH, LD_LIBRARY_PATH=$LD_LIBRARY_PATH" python --version - which nvcc - nvcc --version - which fastseq - bash tests/run_fairseq_tests.sh + #which nvcc + #nvcc --version + #which fastseq + #bash tests/run_fairseq_tests.sh displayName: 'Setup environment python=$(python.version) pytorch=$(pytorch.version) cuda=$(cuda.version)' # - script: | From 4b79eb18fd46d4fd957c7f0ccafcb32cc8d8c5fa Mon Sep 17 00:00:00 2001 From: NickNickGo <66033489+NickNickGo@users.noreply.github.com> Date: Tue, 20 Oct 2020 19:11:28 -0700 Subject: [PATCH 13/22] Update azure-pipelines.yml --- azure-pipelines.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 6dcbe0a..d2ac6c6 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -50,6 +50,8 @@ jobs: #nvcc --version #which fastseq #bash tests/run_fairseq_tests.sh + sudo docker run --gpus all --network=host --privileged -w '/root' --shm-size=1g --ulimit memlock=-1 --ulimit stack=67108864 adsbrainwestus2.azurecr.io/fastseq:dev + python --version displayName: 'Setup environment python=$(python.version) pytorch=$(pytorch.version) cuda=$(cuda.version)' # - script: | From ec43d27b880373c8c89d5986f0d680482307692e Mon Sep 17 00:00:00 2001 From: NickNickGo <66033489+NickNickGo@users.noreply.github.com> Date: Tue, 20 Oct 2020 19:15:32 -0700 Subject: [PATCH 14/22] Update azure-pipelines.yml --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index d2ac6c6..2b9be13 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -50,7 +50,7 @@ jobs: #nvcc --version #which fastseq #bash tests/run_fairseq_tests.sh - sudo docker run --gpus all --network=host --privileged -w '/root' --shm-size=1g --ulimit memlock=-1 --ulimit stack=67108864 adsbrainwestus2.azurecr.io/fastseq:dev + sudo docker run --gpus all --network=host --privileged -w '/root' --shm-size=1g --ulimit memlock=-1 --ulimit stack=67108864 adsbrainwestus2.azurecr.io/fastseq:dev-py3 /bin/bash python --version displayName: 'Setup environment python=$(python.version) pytorch=$(pytorch.version) cuda=$(cuda.version)' From 7bd64a81dabbd2be1bada8a06f0cdfc32ec85abd Mon Sep 17 00:00:00 2001 From: NickNickGo <66033489+NickNickGo@users.noreply.github.com> Date: Tue, 20 Oct 2020 19:18:57 -0700 Subject: [PATCH 15/22] Update azure-pipelines.yml --- azure-pipelines.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 2b9be13..79bb3e5 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -51,6 +51,7 @@ jobs: #which fastseq #bash tests/run_fairseq_tests.sh sudo docker run --gpus all --network=host --privileged -w '/root' --shm-size=1g --ulimit memlock=-1 --ulimit stack=67108864 adsbrainwestus2.azurecr.io/fastseq:dev-py3 /bin/bash + bash tests/run_fairseq_tests.sh python --version displayName: 'Setup environment python=$(python.version) pytorch=$(pytorch.version) cuda=$(cuda.version)' From 6d98718367b3965f0eba315c75132695b9765013 Mon Sep 17 00:00:00 2001 From: NickNickGo <66033489+NickNickGo@users.noreply.github.com> Date: Tue, 20 Oct 2020 20:30:23 -0700 Subject: [PATCH 16/22] Update azure-pipelines.yml --- azure-pipelines.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 79bb3e5..b9a9c19 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -51,6 +51,8 @@ jobs: #which fastseq #bash tests/run_fairseq_tests.sh sudo docker run --gpus all --network=host --privileged -w '/root' --shm-size=1g --ulimit memlock=-1 --ulimit stack=67108864 adsbrainwestus2.azurecr.io/fastseq:dev-py3 /bin/bash + ls + pip install --editable . bash tests/run_fairseq_tests.sh python --version displayName: 'Setup environment python=$(python.version) pytorch=$(pytorch.version) cuda=$(cuda.version)' From 57fb6d9559b02f43536cc50291364ea84ab024e5 Mon Sep 17 00:00:00 2001 From: NickNickGo <66033489+NickNickGo@users.noreply.github.com> Date: Tue, 20 Oct 2020 20:40:04 -0700 Subject: [PATCH 17/22] Update beam_search_optimizer_v1.py --- fastseq/optimizer/fairseq/beam_search_optimizer_v1.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fastseq/optimizer/fairseq/beam_search_optimizer_v1.py b/fastseq/optimizer/fairseq/beam_search_optimizer_v1.py index 83adba4..ec4d7b0 100644 --- a/fastseq/optimizer/fairseq/beam_search_optimizer_v1.py +++ b/fastseq/optimizer/fairseq/beam_search_optimizer_v1.py @@ -53,7 +53,7 @@ class MultiheadAttentionV2(MultiheadAttention): """ def __init__(self, - embed_dim, + embed_dim____, num_heads, kdim=None, vdim=None, From ed3497d29ef3cf9585511a31f9c29b167d81baa5 Mon Sep 17 00:00:00 2001 From: NickNickGo <66033489+NickNickGo@users.noreply.github.com> Date: Tue, 20 Oct 2020 20:46:49 -0700 Subject: [PATCH 18/22] Update beam_search_optimizer_v1.py --- fastseq/optimizer/fairseq/beam_search_optimizer_v1.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fastseq/optimizer/fairseq/beam_search_optimizer_v1.py b/fastseq/optimizer/fairseq/beam_search_optimizer_v1.py index ec4d7b0..83adba4 100644 --- a/fastseq/optimizer/fairseq/beam_search_optimizer_v1.py +++ b/fastseq/optimizer/fairseq/beam_search_optimizer_v1.py @@ -53,7 +53,7 @@ class MultiheadAttentionV2(MultiheadAttention): """ def __init__(self, - embed_dim____, + embed_dim, num_heads, kdim=None, vdim=None, From 83943babd71075073051ccfacc24aaa9bf7c8d7b Mon Sep 17 00:00:00 2001 From: NickNickGo <66033489+NickNickGo@users.noreply.github.com> Date: Tue, 20 Oct 2020 20:55:30 -0700 Subject: [PATCH 19/22] Update azure-pipelines.yml --- azure-pipelines.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index b9a9c19..2ea54ae 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -4,10 +4,9 @@ # https://docs.microsoft.com/azure/devops/pipelines/languages/python trigger: - branches: - include: - - main - + paths: + exclude: + - docs jobs: - job: DeepSpeed_Tests timeoutInMinutes: 360 From 489662fa55061eebe0d375e6ae69e0aa162b6e4c Mon Sep 17 00:00:00 2001 From: NickNickGo <66033489+NickNickGo@users.noreply.github.com> Date: Tue, 20 Oct 2020 21:26:15 -0700 Subject: [PATCH 20/22] Update azure-pipelines.yml --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 2ea54ae..c62e911 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -8,7 +8,7 @@ trigger: exclude: - docs jobs: - - job: DeepSpeed_Tests + - job: Fastseq_Tests timeoutInMinutes: 360 #pool: # vmImage: 'ubuntu-18.04' From 76164ef5c996180fa1aedc4da24c15c9d616f656 Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Thu, 22 Oct 2020 18:57:11 +0000 Subject: [PATCH 21/22] random change --- fastseq/optimizer/fairseq/beam_search_optimizer_v1.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fastseq/optimizer/fairseq/beam_search_optimizer_v1.py b/fastseq/optimizer/fairseq/beam_search_optimizer_v1.py index 83adba4..36ce041 100644 --- a/fastseq/optimizer/fairseq/beam_search_optimizer_v1.py +++ b/fastseq/optimizer/fairseq/beam_search_optimizer_v1.py @@ -53,7 +53,7 @@ class MultiheadAttentionV2(MultiheadAttention): """ def __init__(self, - embed_dim, + embed_dim__, num_heads, kdim=None, vdim=None, From 541519421c04e0204cc217aa2b4a29a26fccbc9a Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Thu, 22 Oct 2020 19:16:28 +0000 Subject: [PATCH 22/22] random change --- fastseq/optimizer/fairseq/beam_search_optimizer_v1.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fastseq/optimizer/fairseq/beam_search_optimizer_v1.py b/fastseq/optimizer/fairseq/beam_search_optimizer_v1.py index 36ce041..83adba4 100644 --- a/fastseq/optimizer/fairseq/beam_search_optimizer_v1.py +++ b/fastseq/optimizer/fairseq/beam_search_optimizer_v1.py @@ -53,7 +53,7 @@ class MultiheadAttentionV2(MultiheadAttention): """ def __init__(self, - embed_dim__, + embed_dim, num_heads, kdim=None, vdim=None,