Skip to content

Commit

Permalink
move horovod installation to multi-gpu
Browse files Browse the repository at this point in the history
  • Loading branch information
edknv committed Mar 7, 2023
1 parent 8c2e0e6 commit 5c7fd5a
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 12 deletions.
5 changes: 0 additions & 5 deletions .github/workflows/cpu-horovod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,6 @@ jobs:
- name: Install tox-conda
run: |
python -m pip install tox-conda
- name: Prepare distributing-embeddings installation
uses: actions/checkout@v3
with:
repository: NVIDIA-Merlin/distributed-embeddings
path: /tmp/distributed-embeddings
- name: Run tests
run: |
ref_type=${{ github.ref_type }}
Expand Down
5 changes: 3 additions & 2 deletions examples/usecases/multi-gpu/install_distributed_embeddings.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@

set -e

INSTALL_DIR=$1

WORK_DIR=$(pwd)
ROOT_DIR="/tmp"

cd $ROOT_DIR
cd $INSTALL_DIR

if [ ! -d "distributed-embeddings" ]; then
git clone https://github.com/NVIDIA-Merlin/distributed-embeddings.git
Expand Down
10 changes: 5 additions & 5 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,8 @@ commands =
; Runs in: Github Actions
; Runs GPU-based tests.
allowlist_externals =
sh
bash
horovodrun
examples/usecases/multi-gpu/install_distributed_embeddings.sh
deps =
-rrequirements/test.txt
passenv =
Expand All @@ -43,8 +42,11 @@ commands =
python -m pip install --upgrade git+https://github.com/NVIDIA-Merlin/core.git@{posargs:main}
python -m pip install --upgrade git+https://github.com/NVIDIA-Merlin/dataloader.git@{posargs:main}
python -m pip install --upgrade git+https://github.com/NVIDIA-Merlin/nvtabular.git@{posargs:main}
# Reinstall Horovod using `pip install --no-cache-dir` to build with the new version.
python -m pip install horovod --no-cache-dir
horovodrun --check-build
# Install distributed embeddings and check build
sh examples/usecases/multi-gpu/install_distributed_embeddings.sh
bash examples/usecases/multi-gpu/install_distributed_embeddings.sh {envtmpdir}
# Run multi-gpu tests marked with `horovod` marker
horovodrun -np 2 sh examples/usecases/multi-gpu/hvd_wrapper.sh pytest -m horovod -rxs tests/unit

Expand All @@ -60,8 +62,6 @@ commands =
# Install horovod and check build
{envdir}/env/bin/python -m pip install horovod --no-cache-dir
{envdir}/env/bin/horovodrun --check-build
# Install distributed embeddings and check build
sh examples/usecases/multi-gpu/install_distributed_embeddings.sh
# Install Merlin packages
{envdir}/env/bin/python -m pip install --upgrade git+https://github.com/NVIDIA-Merlin/core.git
{envdir}/env/bin/python -m pip install --upgrade git+https://github.com/NVIDIA-Merlin/dataloader.git
Expand Down

0 comments on commit 5c7fd5a

Please sign in to comment.