Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ci(test): split each pytest job into 6 separated jobs #3716

Merged
merged 8 commits into from
Apr 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 46 additions & 9 deletions .github/workflows/test_python.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,10 @@ jobs:
name: Test Python
runs-on: ubuntu-22.04
strategy:
fail-fast: false
matrix:
include:
- python: 3.8
tf:
torch:
- python: "3.11"
tf:
torch:
group: [1, 2, 3, 4, 5, 6]
python: ["3.8", "3.11"]

steps:
- uses: actions/checkout@v4
Expand All @@ -45,15 +41,56 @@ jobs:
HOROVOD_WITHOUT_PYTORCH: 1
HOROVOD_WITHOUT_GLOO: 1
- run: dp --version
- run: pytest --cov=deepmd source/tests --durations=0
- name: Get durations from cache
uses: actions/cache@v4
with:
path: test_durations
# the key must never match, even when restarting workflows, as that
# will cause durations to get out of sync between groups, the
# combined durations will be loaded if available
key: test-durations-split-${{ github.run_id }}-${{ github.run_number}}-${{ matrix.python }}-${{ matrix.group }}
restore-keys: |
test-durations-combined-${{ matrix.python }}-${{ github.sha }}
test-durations-combined-${{ matrix.python }}
- run: pytest --cov=deepmd source/tests --durations=0 --splits 6 --group ${{ matrix.group }} --store-durations --durations-path=.test_durations_${{ matrix.group }} --splitting-algorithm least_duration
env:
NUM_WORKERS: 0
- name: Upload partial durations
uses: actions/upload-artifact@v4
with:
name: split-${{ matrix.python }}-${{ matrix.group }}
path: .test_durations_${{ matrix.group }}
- uses: codecov/codecov-action@v4
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
update_durations:
name: Combine and update integration test durations
runs-on: ubuntu-22.04
strategy:
fail-fast: false
matrix:
python: ["3.8", "3.11"]
needs: testpython
steps:
- name: Get durations from cache
uses: actions/cache@v4
with:
path: .test_durations
# key won't match during the first run for the given commit, but
# restore-key will if there's a previous stored durations file,
# so cache will both be loaded and stored
key: test-durations-combined-${{ matrix.python }}-${{ github.sha }}
restore-keys: test-durations-combined-${{ matrix.python }}
- name: Download artifacts
uses: actions/download-artifact@v4
with:
pattern: split-${{ matrix.python }}-*
merge-multiple: true
- name: Combine test durations
run: jq '. + input' .test_durations_* > .test_durations
pass:
name: Pass testing Python
needs: [testpython]
needs: [testpython, update_durations]
runs-on: ubuntu-latest
if: always()
steps:
Expand Down
1 change: 1 addition & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ test = [
"pytest",
"pytest-cov",
"pytest-sugar",
"pytest-split",
"dpgui",
"mendeleev",
]
Expand Down
13 changes: 7 additions & 6 deletions source/tests/tf/test_nvnmd_entrypoints.py
Original file line number Diff line number Diff line change
Expand Up @@ -391,8 +391,6 @@ def test_mapt_cnn_v0(self):
2.24079704,
]
np.testing.assert_almost_equal(pred, ref_dout, 8)
# close
nvnmd_cfg.enable = False

@pytest.mark.run(order=1)
def test_model_qnn_v0(self):
Expand Down Expand Up @@ -510,6 +508,8 @@ def test_model_qnn_v0(self):
pred = valuedic["o_energy"]
ref_dout = -62.60181403
np.testing.assert_almost_equal(pred, ref_dout, 8)

def tearDown(self):
# close
nvnmd_cfg.enable = False

Expand Down Expand Up @@ -700,8 +700,6 @@ def test_mapt_cnn_v1(self):
3.24079514,
]
np.testing.assert_almost_equal(pred, ref_dout, 8)
# close
nvnmd_cfg.enable = False

@pytest.mark.run(order=1)
def test_model_qnn_v1(self):
Expand Down Expand Up @@ -846,11 +844,12 @@ def test_model_qnn_v1(self):
pred = d2[key]
ref_dout = d1[key]
np.testing.assert_almost_equal(pred, ref_dout, 8)
# close
nvnmd_cfg.enable = False

@pytest.mark.run(order=2)
def test_wrap_qnn_v1(self):
# without calling test_mapt_cnn_v1, this test will fail when running individually
self.test_mapt_cnn_v1()

tf.reset_default_graph()
jdata = {}
jdata["nvnmd_config"] = str(tests_path / "nvnmd" / "ref" / "config_v1_cnn.npy")
Expand All @@ -865,6 +864,8 @@ def test_wrap_qnn_v1(self):
pred = [data[i] for i in idx]
red_dout = [249, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 254, 95, 24, 176]
np.testing.assert_equal(pred, red_dout)

def tearDown(self):
# close
nvnmd_cfg.enable = False

Expand Down