From d495fef3f7c7af9388946e61f44ffa70583e4529 Mon Sep 17 00:00:00 2001 From: Garrett Wright Date: Tue, 21 Nov 2023 14:59:32 -0500 Subject: [PATCH 1/4] Fix mistake in class name param log --- tests/test_class_src.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_class_src.py b/tests/test_class_src.py index a1cc9cbc6b..ede7cb397e 100644 --- a/tests/test_class_src.py +++ b/tests/test_class_src.py @@ -137,7 +137,7 @@ def class_sim_fixture(dtype, img_size): @pytest.fixture( - params=CLS_SRCS, ids=lambda param: f"ClassSource={param.__class__}", scope="module" + params=CLS_SRCS, ids=lambda param: f"ClassSource={param.__class__.__name__}", scope="module" ) def test_src_cls(request): return request.param From 30408145e0ecd5a421b54feb6e6bb47972ffb220 Mon Sep 17 00:00:00 2001 From: Garrett Wright Date: Wed, 22 Nov 2023 14:12:42 -0500 Subject: [PATCH 2/4] reduce bispect settings for smaller image size (32~>16) --- tests/test_class_src.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/tests/test_class_src.py b/tests/test_class_src.py index ede7cb397e..0c169621cd 100644 --- a/tests/test_class_src.py +++ b/tests/test_class_src.py @@ -137,7 +137,9 @@ def class_sim_fixture(dtype, img_size): @pytest.fixture( - params=CLS_SRCS, ids=lambda param: f"ClassSource={param.__class__.__name__}", scope="module" + params=CLS_SRCS, + ids=lambda param: f"ClassSource={param.__class__.__name__}", + scope="module", ) def test_src_cls(request): return request.param @@ -147,8 +149,8 @@ def test_src_cls(request): def classifier(class_sim_fixture): return RIRClass2D( class_sim_fixture, - fspca_components=123, - bispectrum_components=101, # Compressed Features after last PCA stage. + fspca_components=63, + bispectrum_components=51, # Compressed Features after last PCA stage. n_nbor=10, sample_n=50000, large_pca_implementation="legacy", @@ -223,8 +225,8 @@ def cls_fixture(class_sim_fixture): # Create the classifier c2d = RIRClass2D( class_sim_fixture, - fspca_components=123, - bispectrum_components=101, # Compressed Features after last PCA stage. + fspca_components=63, + bispectrum_components=51, # Compressed Features after last PCA stage. n_nbor=10, sample_n=50000, nn_implementation="sklearn", From 75ad4e75e5e674fd28a111e02d9da93540eb00b4 Mon Sep 17 00:00:00 2001 From: Garrett Wright Date: Wed, 22 Nov 2023 14:13:46 -0500 Subject: [PATCH 3/4] force workflow run --- .github/workflows/long_workflow.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/long_workflow.yml b/.github/workflows/long_workflow.yml index 4346b93222..51a5f36f2b 100644 --- a/.github/workflows/long_workflow.yml +++ b/.github/workflows/long_workflow.yml @@ -2,9 +2,6 @@ name: ASPIRE Python Long Running Test Suite on: push: - branches: - - 'main' - - 'develop' jobs: expensive_tests: From dc20139c768f22298889661229f34f81ca10fde2 Mon Sep 17 00:00:00 2001 From: Garrett Wright Date: Mon, 27 Nov 2023 08:09:20 -0500 Subject: [PATCH 4/4] Revert "force workflow run" This reverts commit ed0119bf79b6f233dbbb6cd803ea4251f6e1688f. --- .github/workflows/long_workflow.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/long_workflow.yml b/.github/workflows/long_workflow.yml index 51a5f36f2b..4346b93222 100644 --- a/.github/workflows/long_workflow.yml +++ b/.github/workflows/long_workflow.yml @@ -2,6 +2,9 @@ name: ASPIRE Python Long Running Test Suite on: push: + branches: + - 'main' + - 'develop' jobs: expensive_tests: