Skip to content

Commit

Permalink
Merge branch 'master' of github.com:ludwig-ai/ludwig into release-0.8
Browse files Browse the repository at this point in the history
  • Loading branch information
justinxzhao committed Oct 9, 2023
2 parents b607629 + 4b3ccad commit 09eff3b
Show file tree
Hide file tree
Showing 36 changed files with 1,341 additions and 433 deletions.
51 changes: 24 additions & 27 deletions .github/workflows/pytest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ jobs:
- name: Setup Linux
if: runner.os == 'linux'
run: |
sudo apt-get update && sudo apt-get install -y cmake libsndfile1 wget
sudo apt-get update && sudo apt-get install -y cmake libsndfile1 wget libsox-dev
- name: Setup macOS
if: runner.os == 'macOS'
Expand Down Expand Up @@ -126,10 +126,7 @@ jobs:
if [ "$PYTORCH" == "nightly" ]; then
extra_index_url=https://download.pytorch.org/whl/nightly/cpu
torchaudio_wheel="https://download.pytorch.org/whl/nightly/cpu/torchaudio-2.1.0.dev20230727%2Bcpu-cp310-cp310-linux_x86_64.whl"
pip install --pre torch torchtext torchvision torchaudio --index-url $extra_index_url
wget $torchaudio_wheel
pip install --no-deps $torchaudio_wheel
else
extra_index_url=https://download.pytorch.org/whl/cpu
Expand Down Expand Up @@ -166,31 +163,31 @@ jobs:
run: |
RUN_PRIVATE=$IS_NOT_FORK LUDWIG_TEST_SUITE_TIMEOUT_S=5400 pytest -v --timeout 300 --durations 100 -m "$MARKERS and not slow and not combinatorial and not horovod or benchmark and not llm" --junitxml pytest.xml tests/regression_tests
# Skip Horovod installation for torch nightly.
# Skip Horovod and replace with DDP.
# https://github.com/ludwig-ai/ludwig/issues/3468
- name: Install Horovod if necessary
if: matrix.test-markers == 'distributed' && matrix.pytorch-version != 'nightly'
env:
HOROVOD_WITH_PYTORCH: 1
HOROVOD_WITHOUT_MPI: 1
HOROVOD_WITHOUT_TENSORFLOW: 1
HOROVOD_WITHOUT_MXNET: 1
run: |
pip install -r requirements_extra.txt
HOROVOD_BUILT=$(python -c "import horovod.torch; horovod.torch.nccl_built(); print('SUCCESS')" || true)
if [[ $HOROVOD_BUILT != "SUCCESS" ]]; then
pip uninstall -y horovod
pip install --no-cache-dir git+https://github.com/horovod/horovod.git@master
fi
horovodrun --check-build
shell: bash

# Skip Horovod tests for torch nightly.
# - name: Install Horovod if necessary
# if: matrix.test-markers == 'distributed' && matrix.pytorch-version != 'nightly'
# env:
# HOROVOD_WITH_PYTORCH: 1
# HOROVOD_WITHOUT_MPI: 1
# HOROVOD_WITHOUT_TENSORFLOW: 1
# HOROVOD_WITHOUT_MXNET: 1
# run: |
# pip install -r requirements_extra.txt
# HOROVOD_BUILT=$(python -c "import horovod.torch; horovod.torch.nccl_built(); print('SUCCESS')" || true)
# if [[ $HOROVOD_BUILT != "SUCCESS" ]]; then
# pip uninstall -y horovod
# pip install --no-cache-dir git+https://github.com/horovod/horovod.git@master
# fi
# horovodrun --check-build
# shell: bash

# Skip Horovod tests and replace with DDP.
# https://github.com/ludwig-ai/ludwig/issues/3468
- name: Horovod Tests
if: matrix.test-markers == 'distributed' && matrix.pytorch-version != 'nightly'
run: |
RUN_PRIVATE=$IS_NOT_FORK LUDWIG_TEST_SUITE_TIMEOUT_S=5400 pytest -v --timeout 300 --durations 100 -m "$MARKERS and horovod and not slow and not combinatorial and not llm" --junitxml pytest.xml tests/
# - name: Horovod Tests
# if: matrix.test-markers == 'distributed' && matrix.pytorch-version != 'nightly'
# run: |
# RUN_PRIVATE=$IS_NOT_FORK LUDWIG_TEST_SUITE_TIMEOUT_S=5400 pytest -v --timeout 300 --durations 100 -m "$MARKERS and horovod and not slow and not combinatorial and not llm" --junitxml pytest.xml tests/

- name: Upload Unit Test Results
if: ${{ always() && !env.ACT }}
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ __pycache__/
# Distribution / packaging
.Python
env/
env*
build/
develop-eggs/
dist/
Expand Down
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -318,6 +318,10 @@ more accessible and feature rich framework for everyone to use!
<img src="https://contrib.rocks/image?repo=ludwig-ai/ludwig" />
</a><br/>

## Star History

[![Star History Chart](https://api.star-history.com/svg?repos=ludwig-ai/ludwig&type=Date)](https://star-history.com/#ludwig-ai/ludwig&Date)

# 👋 Getting Involved

- [Slack](https://join.slack.com/t/ludwig-ai/shared_invite/zt-mrxo87w6-DlX5~73T2B4v_g6jj0pJcQ)
Expand Down
4 changes: 2 additions & 2 deletions docker/ludwig-gpu/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
# model serving
#

FROM pytorch/pytorch:2.0.0-cuda11.7-cudnn8-devel
FROM pytorch/pytorch:2.0.1-cuda11.7-cudnn8-devel

# https://forums.developer.nvidia.com/t/notice-cuda-linux-repository-key-rotation/212771
RUN sh -c 'echo "APT { Get { AllowUnauthenticated \"1\"; }; };" > /etc/apt/apt.conf.d/99allow_unauth' && \
Expand All @@ -21,7 +21,7 @@ RUN sh -c 'echo "APT { Get { AllowUnauthenticated \"1\"; }; };" > /etc/apt/apt.c
rm -f /etc/apt/sources.list.d/cuda.list /etc/apt/apt.conf.d/99allow_unauth cuda-keyring_1.0-1_all.deb && \
apt-key adv --keyserver keyserver.ubuntu.com --recv-keys A4B469963BF863CC F60F4B3D7FA2AF80

RUN apt-get -y update && apt-get -y install \
RUN apt-get -y update && DEBIAN_FRONTEND="noninteractive" apt-get -y install \
git \
libsndfile1 \
cmake \
Expand Down
Loading

0 comments on commit 09eff3b

Please sign in to comment.