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

Fix test_configure_logging_custom_handlers test for ARM #2112

Merged
Merged
Changes from all commits
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
a690b55
First pass at adding arm64 outputs to conda
dagardner-nv Dec 30, 2024
01a18af
WIP: No vale for arm
dagardner-nv Dec 30, 2024
71986be
pypdfium2 not available on arm
dagardner-nv Dec 30, 2024
4c1d99d
Milvus does not have arm builds
dagardner-nv Dec 30, 2024
0a845f5
WIP
dagardner-nv Dec 30, 2024
4097f37
Specify an alternate version of torch for arm, which doesn't appear t…
dagardner-nv Dec 30, 2024
aa8b2ee
Adding arm support
dagardner-nv Dec 31, 2024
e49c234
Pass PKG_ARCH var to the doca script
dagardner-nv Dec 31, 2024
9081ada
Mark newspaper3k as an amd64 specific dep
dagardner-nv Jan 2, 2025
7b73e9e
Update CI container version
dagardner-nv Jan 2, 2025
6dc6327
Update CR year
dagardner-nv Jan 2, 2025
91a7c3a
Replace hard-coded x86_64
dagardner-nv Jan 2, 2025
1f3ad5b
Disable doca for arm for now
dagardner-nv Jan 2, 2025
cebe3c6
Comment the work-around
dagardner-nv Jan 2, 2025
7d66cfc
Fix type-o
dagardner-nv Jan 2, 2025
694e9e6
Optionall set pytest flags based on the arch
dagardner-nv Jan 2, 2025
285b9eb
Add arch matrix to CI
dagardner-nv Jan 2, 2025
2736f2b
Skip milvus tests if not installed
dagardner-nv Jan 2, 2025
17fc5d2
Fix pylint issues
dagardner-nv Jan 2, 2025
59b1f12
Avoid test errors on ARM
dagardner-nv Jan 2, 2025
69484d5
Add missing import
dagardner-nv Jan 2, 2025
d91c0f6
Skip tests based on having a gpu enabled torch build
dagardner-nv Jan 2, 2025
76fb963
Add missing import
dagardner-nv Jan 2, 2025
d09141a
Arm test fixes
dagardner-nv Jan 3, 2025
069f0a8
Remove top-level import of torch
dagardner-nv Jan 3, 2025
99dd038
pylint ignore
dagardner-nv Jan 3, 2025
6c5f9fa
Fix test skip
dagardner-nv Jan 3, 2025
76ede78
Skip conda tests for arm
dagardner-nv Jan 3, 2025
d07ddd0
Don't use a gpu runner for arm conda builds
dagardner-nv Jan 3, 2025
2f07e17
WIP
dagardner-nv Jan 3, 2025
b4de04f
Don't try to run nvidia-smi if we don't have it
dagardner-nv Jan 3, 2025
496aac7
Add arch matricies to requirements outputs
dagardner-nv Jan 3, 2025
3b7429b
Update paths to requirements files
dagardner-nv Jan 3, 2025
9b5c267
Update CR year
dagardner-nv Jan 3, 2025
d5d33d4
Fix specific for dfp output
dagardner-nv Jan 3, 2025
9becb07
Install newspaper3k and pypdfium2 via pip for arm64
dagardner-nv Jan 3, 2025
6711961
Fix newspaper3k deps
dagardner-nv Jan 3, 2025
4de9b68
Fix paths to requirements files
dagardner-nv Jan 4, 2025
a0b055f
Merge branch 'branch-25.02' of github.com:nv-morpheus/Morpheus into d…
dagardner-nv Jan 4, 2025
a9ceda1
Fix paths to requirements files
dagardner-nv Jan 4, 2025
8d717ec
Adopt updated utilities
dagardner-nv Jan 15, 2025
5b76034
Merge branch 'branch-25.02' of github.com:nv-morpheus/Morpheus into d…
dagardner-nv Jan 15, 2025
d4adfab
WIP
dagardner-nv Jan 15, 2025
d8f5d9e
Updare the reference to our own https://github.com/nv-morpheus/Morphe…
dagardner-nv Jan 15, 2025
12f9570
Merge branch 'branch-25.02' of github.com:nv-morpheus/Morpheus into d…
dagardner-nv Jan 15, 2025
205bb5d
Merge branch 'david-arm-ci' into david-arm-docker
dagardner-nv Jan 15, 2025
5711d3c
WIP: Arm support
dagardner-nv Jan 15, 2025
a130ec3
WIP: Update build script for arm support
dagardner-nv Jan 15, 2025
a6bb8d1
WIP: Multi-arch support for the models container
dagardner-nv Jan 15, 2025
b1c526a
Append the arch to the tag
dagardner-nv Jan 16, 2025
1390525
Support running multi-arch containers
dagardner-nv Jan 16, 2025
ec14b09
Add missing --platform flag
dagardner-nv Jan 16, 2025
6277a9a
Merge branch 'branch-25.02' of github.com:nv-morpheus/Morpheus into d…
dagardner-nv Jan 16, 2025
3ee53a9
Remove skip mark on test_configure_logging_custom_handlers
dagardner-nv Jan 16, 2025
ba6e42f
Update _flush_logging_queue to no longer use the 'qsize' method which…
dagardner-nv Jan 16, 2025
2ef2acb
Merge branch 'branch-25.02' of github.com:nv-morpheus/Morpheus into d…
dagardner-nv Jan 16, 2025
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
8 changes: 4 additions & 4 deletions tests/morpheus/utils/test_logger.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
import logging
import logging.handlers
import os
import platform
import re
import time
from unittest.mock import patch
Expand All @@ -35,9 +34,12 @@


def _flush_logging_queue(logger: logging.Logger):
# Per Python documentation, the `empty` method is not reliable, adding a safety sleep
# https://docs.python.org/3.10/library/multiprocessing.html?highlight=queue#multiprocessing.Queue.empty
time.sleep(0.1)
for handler in logger.handlers:
if isinstance(handler, logging.handlers.QueueHandler):
while (handler.queue.qsize() != 0):
while (not handler.queue.empty()):
time.sleep(0.01)


Expand Down Expand Up @@ -131,8 +133,6 @@ def test_configure_logging_from_file_filenotfound():
configure_logging(log_config_file="does_not_exist.json")


@pytest.mark.skipif(platform.machine() == 'aarch64',
reason="Remove skip once https://github.com/nv-morpheus/Morpheus/issues/2110 is resolved")
def test_configure_logging_custom_handlers():
# Create a string stream for the handler
string_stream_1 = io.StringIO()
Expand Down
Loading