Skip to content

Commit ff2a943

Browse files
committed
Fix cross-platform unit test failures
Keep diffusers model detection available when pipeline imports fail under the minimum Transformers dependency set. Give cold distributed and native extension tests platform-appropriate time budgets. Signed-off-by: Johannes Rausch <jrausch@nvidia.com>
1 parent d16d62e commit ff2a943

3 files changed

Lines changed: 14 additions & 4 deletions

File tree

modelopt/torch/export/diffusers_utils.py

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,22 @@
3232
ModelMixin: type[Any] | None
3333
try: # diffusers is optional for LTX-2 export paths
3434
from diffusers import DiffusionPipeline as _DiffusionPipeline
35-
from diffusers import ModelMixin as _ModelMixin
3635

3736
DiffusionPipeline = _DiffusionPipeline
38-
ModelMixin = _ModelMixin
39-
_HAS_DIFFUSERS = True
4037
except Exception: # pragma: no cover
4138
DiffusionPipeline = None
39+
40+
try:
41+
try:
42+
from diffusers import ModelMixin as _ModelMixin
43+
except ImportError: # older diffusers releases do not export ModelMixin at package level
44+
from diffusers.models.modeling_utils import ModelMixin as _ModelMixin
45+
46+
ModelMixin = _ModelMixin
47+
except Exception: # pragma: no cover
4248
ModelMixin = None
43-
_HAS_DIFFUSERS = False
49+
50+
_HAS_DIFFUSERS = DiffusionPipeline is not None or ModelMixin is not None
4451

4552
TI2VidTwoStagesPipeline: type[Any] | None
4653
try: # optional for LTX-2 export paths

tests/unit/onnx/quantization/test_qdq_utils.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -705,6 +705,7 @@ def create_test_model_with_int4_dq_matmul():
705705
class TestColumnMajorTransformation:
706706
"""Test suite for column-major storage transformation functions."""
707707

708+
@pytest.mark.timeout(180)
708709
def test_column_major_transformation_graph_structure(self):
709710
"""Test that column-major transformation produces correct graph structure.
710711

tests/unit/torch/quantization/test_dist.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
# See the License for the specific language governing permissions and
1414
# limitations under the License.
1515

16+
import pytest
1617
import torch
1718
import torch.distributed as dist
1819
from _test_utils.torch.distributed.utils import spawn_multiprocess_job
@@ -43,5 +44,6 @@ def forward_loop(model):
4344
dist.destroy_process_group()
4445

4546

47+
@pytest.mark.timeout(120)
4648
def test_data_parallel(skip_on_windows):
4749
spawn_multiprocess_job(2, _test_data_parallel_helper, backend="gloo")

0 commit comments

Comments
 (0)