Skip to content

Commit 5c7fd5a

Browse files
committed
move horovod installation to multi-gpu
1 parent 8c2e0e6 commit 5c7fd5a

File tree

3 files changed

+8
-12
lines changed

3 files changed

+8
-12
lines changed

.github/workflows/cpu-horovod.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,6 @@ jobs:
3737
- name: Install tox-conda
3838
run: |
3939
python -m pip install tox-conda
40-
- name: Prepare distributing-embeddings installation
41-
uses: actions/checkout@v3
42-
with:
43-
repository: NVIDIA-Merlin/distributed-embeddings
44-
path: /tmp/distributed-embeddings
4540
- name: Run tests
4641
run: |
4742
ref_type=${{ github.ref_type }}

examples/usecases/multi-gpu/install_distributed_embeddings.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@
22

33
set -e
44

5+
INSTALL_DIR=$1
6+
57
WORK_DIR=$(pwd)
6-
ROOT_DIR="/tmp"
78

8-
cd $ROOT_DIR
9+
cd $INSTALL_DIR
910

1011
if [ ! -d "distributed-embeddings" ]; then
1112
git clone https://github.com/NVIDIA-Merlin/distributed-embeddings.git

tox.ini

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,8 @@ commands =
2828
; Runs in: Github Actions
2929
; Runs GPU-based tests.
3030
allowlist_externals =
31-
sh
31+
bash
3232
horovodrun
33-
examples/usecases/multi-gpu/install_distributed_embeddings.sh
3433
deps =
3534
-rrequirements/test.txt
3635
passenv =
@@ -43,8 +42,11 @@ commands =
4342
python -m pip install --upgrade git+https://github.com/NVIDIA-Merlin/core.git@{posargs:main}
4443
python -m pip install --upgrade git+https://github.com/NVIDIA-Merlin/dataloader.git@{posargs:main}
4544
python -m pip install --upgrade git+https://github.com/NVIDIA-Merlin/nvtabular.git@{posargs:main}
45+
# Reinstall Horovod using `pip install --no-cache-dir` to build with the new version.
46+
python -m pip install horovod --no-cache-dir
47+
horovodrun --check-build
4648
# Install distributed embeddings and check build
47-
sh examples/usecases/multi-gpu/install_distributed_embeddings.sh
49+
bash examples/usecases/multi-gpu/install_distributed_embeddings.sh {envtmpdir}
4850
# Run multi-gpu tests marked with `horovod` marker
4951
horovodrun -np 2 sh examples/usecases/multi-gpu/hvd_wrapper.sh pytest -m horovod -rxs tests/unit
5052

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

0 commit comments

Comments
 (0)