From 869db909dd54d151c93f68f2bd0178da36db5ed9 Mon Sep 17 00:00:00 2001 From: jeremie du boisberranger Date: Fri, 22 Apr 2022 17:32:45 +0200 Subject: [PATCH 1/7] don't set selected tests if no selected tests --- build_tools/azure/get_selected_tests.py | 7 +++++-- build_tools/azure/test_script.sh | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/build_tools/azure/get_selected_tests.py b/build_tools/azure/get_selected_tests.py index 09b8a6eef5b28..faa90cf4b05e2 100644 --- a/build_tools/azure/get_selected_tests.py +++ b/build_tools/azure/get_selected_tests.py @@ -26,6 +26,9 @@ def get_selected_tests(): if __name__ == "__main__": # set the environment variable to be propagated to other steps selected_tests = get_selected_tests() - print(f"##vso[task.setvariable variable=SELECTED_TESTS]'{selected_tests}'") - print(f"selected tests: {selected_tests}") # helps debugging + if selected_tests: + print(f"##vso[task.setvariable variable=SELECTED_TESTS]'{selected_tests}'") + print(f"selected tests: {selected_tests}") # helps debugging + + print("no selected tests") diff --git a/build_tools/azure/test_script.sh b/build_tools/azure/test_script.sh index 46f6dc7d43943..3c6ee6337e72a 100755 --- a/build_tools/azure/test_script.sh +++ b/build_tools/azure/test_script.sh @@ -70,7 +70,7 @@ if [[ "$SHOW_SHORT_SUMMARY" == "true" ]]; then TEST_CMD="$TEST_CMD -ra" fi -if [[ "$SELECTED_TESTS" != "" ]]; then +if [[ -z "$SELECTED_TESTS" ]]; then TEST_CMD="$TEST_CMD -k $SELECTED_TESTS" # Override to make selected tests run on all random seeds From 94f117d37174b47a5a97fdce81543cac588fc055 Mon Sep 17 00:00:00 2001 From: jeremie du boisberranger Date: Fri, 22 Apr 2022 17:40:11 +0200 Subject: [PATCH 2/7] cln --- build_tools/azure/get_selected_tests.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build_tools/azure/get_selected_tests.py b/build_tools/azure/get_selected_tests.py index faa90cf4b05e2..f453748f843c4 100644 --- a/build_tools/azure/get_selected_tests.py +++ b/build_tools/azure/get_selected_tests.py @@ -30,5 +30,5 @@ def get_selected_tests(): if selected_tests: print(f"##vso[task.setvariable variable=SELECTED_TESTS]'{selected_tests}'") print(f"selected tests: {selected_tests}") # helps debugging - - print("no selected tests") + else: + print("no selected tests") From 3ba0491b3757db52a6772c0103bc417bc3f791d5 Mon Sep 17 00:00:00 2001 From: jeremie du boisberranger Date: Fri, 22 Apr 2022 17:46:35 +0200 Subject: [PATCH 3/7] debug --- build_tools/azure/test_script.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/build_tools/azure/test_script.sh b/build_tools/azure/test_script.sh index 3c6ee6337e72a..54843fbb5e45a 100755 --- a/build_tools/azure/test_script.sh +++ b/build_tools/azure/test_script.sh @@ -1,6 +1,6 @@ #!/bin/bash -set -e +set -xe # defines the show_installed_libraries function source build_tools/shared.sh @@ -77,6 +77,5 @@ if [[ -z "$SELECTED_TESTS" ]]; then export SKLEARN_TESTS_GLOBAL_RANDOM_SEED="all" fi -set -x eval "$TEST_CMD --pyargs sklearn" set +x From 429de0f6da3477991c34ae2778a4bdbf8f33ae5e Mon Sep 17 00:00:00 2001 From: jeremie du boisberranger Date: Fri, 22 Apr 2022 17:50:25 +0200 Subject: [PATCH 4/7] cln --- build_tools/azure/test_script.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/build_tools/azure/test_script.sh b/build_tools/azure/test_script.sh index 54843fbb5e45a..c083114df60a4 100755 --- a/build_tools/azure/test_script.sh +++ b/build_tools/azure/test_script.sh @@ -1,6 +1,6 @@ #!/bin/bash -set -xe +set -e # defines the show_installed_libraries function source build_tools/shared.sh @@ -70,12 +70,13 @@ if [[ "$SHOW_SHORT_SUMMARY" == "true" ]]; then TEST_CMD="$TEST_CMD -ra" fi -if [[ -z "$SELECTED_TESTS" ]]; then +if [[ -n "$SELECTED_TESTS" ]]; then TEST_CMD="$TEST_CMD -k $SELECTED_TESTS" # Override to make selected tests run on all random seeds export SKLEARN_TESTS_GLOBAL_RANDOM_SEED="all" fi +set -x eval "$TEST_CMD --pyargs sklearn" set +x From 1eb238a2a3e78804b638732af9f5a44a458b07cb Mon Sep 17 00:00:00 2001 From: jeremie du boisberranger Date: Fri, 22 Apr 2022 17:56:39 +0200 Subject: [PATCH 5/7] check that all random seeds still works [all random seeds] test_kmeans_elkan_results From deb5fd333e7f6755fb87d4f62b9e7983c80ddc56 Mon Sep 17 00:00:00 2001 From: jeremie du boisberranger Date: Fri, 22 Apr 2022 18:02:18 +0200 Subject: [PATCH 6/7] check that all random seeds still works [all random seeds] test_kmeans_elkan_results test_kmeans_convergence From ce5fdd414bd022e92ed1be73fc710b44202484a3 Mon Sep 17 00:00:00 2001 From: jeremie du boisberranger Date: Fri, 22 Apr 2022 18:19:50 +0200 Subject: [PATCH 7/7] trigger ci default behavior