From cd6977d9b370555b6b053b6206e1724a32a27cab Mon Sep 17 00:00:00 2001 From: Thomas Viehmann Date: Tue, 26 Nov 2024 16:31:50 +0100 Subject: [PATCH] versioning scheme for nightlies with dev (#1474) --- thunder/tests/test_dynamo.py | 2 +- thunder/tests/test_grad.py | 4 ++-- thunder/tests/test_networks.py | 8 ++++---- thunder/tests/test_recipes.py | 2 +- thunder/tests/test_transforms.py | 6 +++--- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/thunder/tests/test_dynamo.py b/thunder/tests/test_dynamo.py index 233b126d94..65e6603f54 100644 --- a/thunder/tests/test_dynamo.py +++ b/thunder/tests/test_dynamo.py @@ -452,7 +452,7 @@ def func(x): reason="Skip until the Torch bug is fixed - https://github.com/pytorch/pytorch/pull/139275", ), pytest.mark.skipif( - version_between(torch.__version__, min_ver="2.6.0a0", max_ver="2.6.0a99"), + version_between(torch.__version__, min_ver="2.6.0dev0", max_ver="2.6.0a99"), reason="https://github.com/Lightning-AI/lightning-thunder/issues/1471", ), ), diff --git a/thunder/tests/test_grad.py b/thunder/tests/test_grad.py index 2f389a480f..fbd479cb33 100644 --- a/thunder/tests/test_grad.py +++ b/thunder/tests/test_grad.py @@ -1472,7 +1472,7 @@ def test_populate_grads_mlp(executor, device, dtype): @instantiate(dtypes=(thunder.float32,)) def test_populate_grads_csa(executor, device, dtype): - if version_between(torch.__version__, min_ver="2.6.0a0", max_ver="2.6.0"): + if version_between(torch.__version__, min_ver="2.6.0dev0", max_ver="2.6.0"): pytest.skip("https://github.com/Lightning-AI/lightning-thunder/issues/1254") from thunder.benchmarks import NanoGPTCSABenchmark, NanoGPTConfig @@ -1502,7 +1502,7 @@ def test_populate_grads_csa(executor, device, dtype): @instantiate(dtypes=(thunder.float32,)) def test_populate_grads_block(executor, device, dtype): - if version_between(torch.__version__, min_ver="2.6.0a0", max_ver="2.6.0"): + if version_between(torch.__version__, min_ver="2.6.0dev0", max_ver="2.6.0"): pytest.skip("https://github.com/Lightning-AI/lightning-thunder/issues/1254") from thunder.benchmarks import NanoGPTBlockBenchmark, NanoGPTConfig diff --git a/thunder/tests/test_networks.py b/thunder/tests/test_networks.py index 287314c18c..223d898ec4 100644 --- a/thunder/tests/test_networks.py +++ b/thunder/tests/test_networks.py @@ -225,7 +225,7 @@ def test_nanogpt_mlp(executor, device, dtype): executors=all_test_executors_and_dynamo, decorators=( pytest.mark.skipif( - version_between(torch.__version__, min_ver="2.6.0a0", max_ver="2.6.0a99"), + version_between(torch.__version__, min_ver="2.6.0dev0", max_ver="2.6.0a99"), reason="https://github.com/Lightning-AI/lightning-thunder/issues/1471", ), ), @@ -285,7 +285,7 @@ def dummy(*args): @pytest.mark.skipif( - version_between(torch.__version__, min_ver="2.6.0a0", max_ver="2.6.0a99"), + version_between(torch.__version__, min_ver="2.6.0dev0", max_ver="2.6.0a99"), reason="https://github.com/bitsandbytes-foundation/bitsandbytes/pull/1413", ) @requiresCUDA @@ -369,7 +369,7 @@ def test_quantization(): @pytest.mark.skipif( - version_between(torch.__version__, min_ver="2.6.0a0", max_ver="2.6.0a99"), + version_between(torch.__version__, min_ver="2.6.0dev0", max_ver="2.6.0a99"), reason="https://github.com/Lightning-AI/lightning-thunder/issues/1471", ) @thunder.tests.framework.requiresCUDA @@ -424,7 +424,7 @@ def test_thunderfx_mistral_nemo_small(): @pytest.mark.skipif( - version_between(torch.__version__, min_ver="2.6.0a0", max_ver="2.6.0a99"), + version_between(torch.__version__, min_ver="2.6.0dev0", max_ver="2.6.0a99"), reason="https://github.com/Lightning-AI/lightning-thunder/issues/1471", ) @thunder.tests.framework.requiresCUDA diff --git a/thunder/tests/test_recipes.py b/thunder/tests/test_recipes.py index eec3df8cb0..e5c62138da 100644 --- a/thunder/tests/test_recipes.py +++ b/thunder/tests/test_recipes.py @@ -25,7 +25,7 @@ def test_recipe_basic_bert(): @pytest.mark.skipif( - version_between(torch.__version__, min_ver="2.6.0a0", max_ver="2.6.0a99"), + version_between(torch.__version__, min_ver="2.6.0dev0", max_ver="2.6.0a99"), reason="https://github.com/Lightning-AI/lightning-thunder/issues/1471", ) def test_recipe_basic_bert_dynamo(): diff --git a/thunder/tests/test_transforms.py b/thunder/tests/test_transforms.py index 7bdfcef32f..f6b56bc90d 100644 --- a/thunder/tests/test_transforms.py +++ b/thunder/tests/test_transforms.py @@ -113,7 +113,7 @@ def test_materialization(): @pytest.mark.skipif( - version_between(torch.__version__, min_ver="2.6.0a0", max_ver="2.6.0a99"), + version_between(torch.__version__, min_ver="2.6.0dev0", max_ver="2.6.0a99"), reason="https://github.com/bitsandbytes-foundation/bitsandbytes/pull/1413", ) @pytest.mark.skipif(not package_available("bitsandbytes"), reason="`bitsandbytes` is not available") @@ -190,7 +190,7 @@ def test_quantization_on_meta(): @pytest.mark.skipif( - version_between(torch.__version__, min_ver="2.6.0a0", max_ver="2.6.0a99"), + version_between(torch.__version__, min_ver="2.6.0dev0", max_ver="2.6.0a99"), reason="https://github.com/bitsandbytes-foundation/bitsandbytes/pull/1413", ) @pytest.mark.skipif( @@ -301,7 +301,7 @@ def f(x): @pytest.mark.skipif( - version_between(torch.__version__, min_ver="2.6.0a0", max_ver="2.6.0a99"), + version_between(torch.__version__, min_ver="2.6.0dev0", max_ver="2.6.0a99"), reason="https://github.com/bitsandbytes-foundation/bitsandbytes/pull/1413", ) @pytest.mark.skipif(not package_available("bitsandbytes"), reason="`bitsandbytes` is not available")