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.

Sign up for GitHub

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

Jump to bottom

Fix failing builds #2613

Closed
wants to merge 4 commits into from
Closed

Fix failing builds #2613

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cc5bd17
Working on test changes
nvoxland Sep 22, 2023
06ebe3f
Re-enabled enterprise tensorflow testing
nvoxland Oct 10, 2023
acad976
Re-enabled enterprise pytorch testing
nvoxland Oct 11, 2023
181d12b
Re-enabled pytorch tests that used to hit concurrency problems
nvoxland Oct 11, 2023
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
1 change: 0 additions & 1 deletion .github/workflows/test-push.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ concurrency:
jobs:
setup:
runs-on: ubuntu-latest
if: github.event_name == 'push' || (! github.event.pull_request.draft)
outputs:
matrix: ${{ steps.setup.outputs.matrix }}
steps:
Expand Down
2 changes: 2 additions & 0 deletions conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@
tqdm.monitor_interval = 0


collect_ignore = ["cpp", "deeplake/cpp"]

def pytest_configure(config):
config.addinivalue_line(
"markers",
Expand Down
13 changes: 5 additions & 8 deletions deeplake/enterprise/test_pytorch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,14 +102,13 @@ def test_offset_ds_iteration(local_auth_ds):
[
pytest.param(
"hub_cloud_ds",
marks=[pytest.mark.slow, pytest.mark.skip("Causing lockups")],
marks=[pytest.mark.slow],
),
"local_auth_ds",
],
indirect=True,
)
@pytest.mark.flaky
@pytest.mark.skip("causing lockups")
def test_pytorch_small(ds):
with ds:
ds.create_tensor("image", max_chunk_size=PYTORCH_TESTS_MAX_CHUNK_SIZE)
Expand Down Expand Up @@ -171,7 +170,6 @@ def test_pytorch_small(ds):
@pytest.mark.flaky(retry_count=3)
@pytest.mark.slow
@pytest.mark.timeout(10)
@pytest.mark.skip("causing lockups")
def test_pytorch_transform(local_auth_ds):
with local_auth_ds as ds:
ds.create_tensor("image", max_chunk_size=PYTORCH_TESTS_MAX_CHUNK_SIZE)
Expand Down Expand Up @@ -322,7 +320,6 @@ def test_custom_tensor_order(local_auth_ds):
@requires_torch
@requires_libdeeplake
@pytest.mark.flaky
@pytest.mark.skip("causing lockups")
@pytest.mark.timeout(10)
def test_readonly_with_two_workers(local_auth_ds):
with local_auth_ds as ds:
Expand Down Expand Up @@ -581,7 +578,7 @@ def test_rename(local_auth_ds):
"num_workers",
[
0,
pytest.param(2, marks=pytest.mark.skip(reason="causing lockups")),
2,
],
)
@pytest.mark.slow
Expand All @@ -608,7 +605,7 @@ def test_indexes(local_auth_ds, num_workers):
"num_workers",
[
0,
pytest.param(2, marks=pytest.mark.skip("causing lockups")),
2,
],
)
@pytest.mark.flaky
Expand Down Expand Up @@ -636,7 +633,7 @@ def test_indexes_transform(local_auth_ds, num_workers):
@requires_torch
@requires_libdeeplake
@pytest.mark.parametrize(
"num_workers", [0, pytest.param(2, marks=pytest.mark.skip("causing lockups"))]
"num_workers", [0, 2]
)
@pytest.mark.slow
@pytest.mark.flaky
Expand Down Expand Up @@ -672,7 +669,7 @@ def test_indexes_transform_dict(local_auth_ds, num_workers):
@requires_torch
@requires_libdeeplake
@pytest.mark.parametrize(
"num_workers", [0, pytest.param(2, marks=pytest.mark.skip("causing lockups"))]
"num_workers", [0, 2]
)
@pytest.mark.slow
@pytest.mark.flaky
Expand Down
9 changes: 3 additions & 6 deletions deeplake/enterprise/test_tensorflow.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ def index_transform(sample):
@requires_libdeeplake
@pytest.mark.slow
@pytest.mark.flaky
@pytest.mark.skip("causing lockups")
def test_tensorflow_small(local_auth_ds):
with local_auth_ds as ds:
ds.create_tensor("image", max_chunk_size=TF_TESTS_MAX_CHUNK_SIZE)
Expand Down Expand Up @@ -119,7 +118,6 @@ def test_tensorflow_small(local_auth_ds):
@requires_libdeeplake
@pytest.mark.slow
@pytest.mark.flaky
@pytest.mark.skip("causing lockups")
def test_tensorflow_transform(local_auth_ds):
with local_auth_ds as ds:
ds.create_tensor("image", max_chunk_size=TF_TESTS_MAX_CHUNK_SIZE)
Expand Down Expand Up @@ -277,7 +275,6 @@ def test_custom_tensor_order(local_auth_ds):
@requires_libdeeplake
@pytest.mark.slow
@pytest.mark.flaky
@pytest.mark.skip("causing lockups")
def test_readonly_with_two_workers(local_auth_ds):
local_auth_ds.create_tensor("images", max_chunk_size=TF_TESTS_MAX_CHUNK_SIZE)
local_auth_ds.create_tensor("labels", max_chunk_size=TF_TESTS_MAX_CHUNK_SIZE)
Expand Down Expand Up @@ -544,7 +541,7 @@ def test_rename(local_auth_ds):
"num_workers",
[
0,
pytest.param(2, marks=pytest.mark.skip("causing lockups")),
2,
],
)
@pytest.mark.slow
Expand Down Expand Up @@ -574,7 +571,7 @@ def test_indexes(local_auth_ds, num_workers):
"num_workers",
[
0,
pytest.param(2, marks=pytest.mark.skip("causing lockups")),
2,
],
)
@pytest.mark.slow
Expand Down Expand Up @@ -646,7 +643,7 @@ def test_indexes_transform_dict(local_auth_ds, num_workers):
@requires_tensorflow
@requires_libdeeplake
@pytest.mark.parametrize(
"num_workers", [0, pytest.param(2, marks=pytest.mark.skip("causing lockups"))]
"num_workers", [0, 2]
)
@pytest.mark.slow
@pytest.mark.flaky
Expand Down
5 changes: 1 addition & 4 deletions deeplake/integrations/tests/test_pytorch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@ def pytorch_small_shuffle_helper(start, end, dataloader):

@pytest.mark.flaky
@requires_torch
@pytest.mark.skip("causing lockup")
def test_pytorch_small(local_ds):
with local_ds as ds:
ds.create_tensor("image", max_chunk_size=PYTORCH_TESTS_MAX_CHUNK_SIZE)
Expand Down Expand Up @@ -441,7 +440,6 @@ def test_pytorch_local_cache(local_ds):

@requires_torch
@pytest.mark.flaky
@pytest.mark.skip("causing lockup")
def test_groups(local_ds, compressed_image_paths):
img1 = deeplake.read(compressed_image_paths["jpeg"][0])
img2 = deeplake.read(compressed_image_paths["png"][0])
Expand Down Expand Up @@ -498,7 +496,6 @@ def test_string_tensors(local_ds):
@pytest.mark.slow
@requires_torch
@pytest.mark.flaky
@pytest.mark.skip("causing lockup")
def test_pytorch_large(local_ds):
arr_list_1 = [np.random.randn(1500, 1500, i) for i in range(5)]
arr_list_2 = [np.random.randn(400, 1500, 4, i) for i in range(5)]
Expand Down Expand Up @@ -603,7 +600,7 @@ def test_pytorch_collate(local_ds, shuffle, buffer_size):
@pytest.mark.slow
@requires_torch
@pytest.mark.parametrize(
"shuffle", [True, pytest.param(False, marks=pytest.mark.skip("causing lockups"))]
"shuffle", [True, False]
)
@pytest.mark.flaky
def test_pytorch_transform_collate(local_ds, shuffle):
Expand Down
Loading