From 373dc113b39b0c0cf515e90e20a33dfa0b3f0c00 Mon Sep 17 00:00:00 2001 From: GarethCabournDavies Date: Thu, 19 Dec 2024 04:29:20 -0800 Subject: [PATCH 1/8] Test printing z before it undergoes max() --- bin/plotting/pycbc_plot_singles_vs_params | 1 + 1 file changed, 1 insertion(+) diff --git a/bin/plotting/pycbc_plot_singles_vs_params b/bin/plotting/pycbc_plot_singles_vs_params index 3654c2ab6a5..33475af08ba 100644 --- a/bin/plotting/pycbc_plot_singles_vs_params +++ b/bin/plotting/pycbc_plot_singles_vs_params @@ -175,6 +175,7 @@ elif opts.z_var in ranking.sngls_ranking_function_dict: max_z = z.max() if opts.max_z is None else opts.max_z if max_z / min_z > 10: cb_style['ticks'] = LogLocator(subs=range(10)) + print(z) hb = ax.hexbin(x, y, C=z, reduce_C_function=np.max, **hexbin_style) fig.colorbar(hb, **cb_style) else: From cfb98d1d650ded810f53582dcfa1aec1b843017a Mon Sep 17 00:00:00 2001 From: GarethCabournDavies Date: Thu, 19 Dec 2024 05:51:50 -0800 Subject: [PATCH 2/8] Add output for relevant files needed to recreate job --- .github/workflows/search-workflow.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/search-workflow.yml b/.github/workflows/search-workflow.yml index 32367c2b86b..9c0661eb969 100644 --- a/.github/workflows/search-workflow.yml +++ b/.github/workflows/search-workflow.yml @@ -59,6 +59,12 @@ jobs: with: name: logs path: output/submitdir/work + - name: store output files + if: always() + uses: actions/upload-artifact@v4 + with: + name: output_files + path: output/bank/*BANK2HDF-* output/segments/* output/full_data/*HDF_TRIGGER_MERGE* - name: store result page uses: actions/upload-artifact@v4 with: From 7ed83cb50759c721c7289b3dbd1a5e2310547127 Mon Sep 17 00:00:00 2001 From: GarethCabournDavies Date: Thu, 19 Dec 2024 06:42:44 -0800 Subject: [PATCH 3/8] just upload everything for this test --- .github/workflows/search-workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/search-workflow.yml b/.github/workflows/search-workflow.yml index 9c0661eb969..ca5997ac832 100644 --- a/.github/workflows/search-workflow.yml +++ b/.github/workflows/search-workflow.yml @@ -64,7 +64,7 @@ jobs: uses: actions/upload-artifact@v4 with: name: output_files - path: output/bank/*BANK2HDF-* output/segments/* output/full_data/*HDF_TRIGGER_MERGE* + path: output - name: store result page uses: actions/upload-artifact@v4 with: From 503488e18578f009af24be252a76fdc3f26a1a21 Mon Sep 17 00:00:00 2001 From: GarethCabournDavies Date: Fri, 20 Dec 2024 02:03:09 -0800 Subject: [PATCH 4/8] Fix --- bin/plotting/pycbc_plot_singles_vs_params | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/plotting/pycbc_plot_singles_vs_params b/bin/plotting/pycbc_plot_singles_vs_params index 33475af08ba..98def36df48 100644 --- a/bin/plotting/pycbc_plot_singles_vs_params +++ b/bin/plotting/pycbc_plot_singles_vs_params @@ -30,6 +30,7 @@ from matplotlib.colors import LogNorm from matplotlib.ticker import LogLocator import h5py import sys +from packaging.version import Version import pycbc import pycbc.pnutils @@ -148,7 +149,7 @@ hexbin_style = { # In earlier versions mpl will try to take the max over bins with 0 triggers # and fail, unless we tell it to leave these blank by setting mincnt -if matplotlib.__version__ < '3.8.1': +if Version(matplotlib.__version__) < Version('3.8.1'): hexbin_style['mincnt'] = 0 if opts.log_x: @@ -175,7 +176,6 @@ elif opts.z_var in ranking.sngls_ranking_function_dict: max_z = z.max() if opts.max_z is None else opts.max_z if max_z / min_z > 10: cb_style['ticks'] = LogLocator(subs=range(10)) - print(z) hb = ax.hexbin(x, y, C=z, reduce_C_function=np.max, **hexbin_style) fig.colorbar(hb, **cb_style) else: From f37aa710cfe649de6b4a21be084d280a67f36df7 Mon Sep 17 00:00:00 2001 From: GarethCabournDavies Date: Fri, 20 Dec 2024 02:21:46 -0800 Subject: [PATCH 5/8] SEOBNRV4 ROM version has updated --- .github/workflows/basic-tests.yml | 2 +- .github/workflows/search-workflow.yml | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/.github/workflows/basic-tests.yml b/.github/workflows/basic-tests.yml index 45cd7248d07..69857f71e50 100644 --- a/.github/workflows/basic-tests.yml +++ b/.github/workflows/basic-tests.yml @@ -32,7 +32,7 @@ jobs: cd lalsuite-extra git lfs pull -I "data/lalsimulation/SEOBNRv2ROM_*.dat" git lfs pull -I "data/lalsimulation/*ChirpTime*.dat" - git lfs pull -I "data/lalsimulation/SEOBNRv4ROM_v2.0.hdf5" + git lfs pull -I "data/lalsimulation/SEOBNRv4ROM_v*.hdf5" mv data/lalsimulation/* ../ cd ../ - name: run pycbc test suite diff --git a/.github/workflows/search-workflow.yml b/.github/workflows/search-workflow.yml index ca5997ac832..32367c2b86b 100644 --- a/.github/workflows/search-workflow.yml +++ b/.github/workflows/search-workflow.yml @@ -59,12 +59,6 @@ jobs: with: name: logs path: output/submitdir/work - - name: store output files - if: always() - uses: actions/upload-artifact@v4 - with: - name: output_files - path: output - name: store result page uses: actions/upload-artifact@v4 with: From 2446d842a51c3e8e2b89b4e6397e48177d5e0b63 Mon Sep 17 00:00:00 2001 From: GarethCabournDavies Date: Fri, 20 Dec 2024 02:56:46 -0800 Subject: [PATCH 6/8] Test blocking latest lalsuite version --- .github/workflows/basic-tests.yml | 2 +- requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/basic-tests.yml b/.github/workflows/basic-tests.yml index 69857f71e50..45cd7248d07 100644 --- a/.github/workflows/basic-tests.yml +++ b/.github/workflows/basic-tests.yml @@ -32,7 +32,7 @@ jobs: cd lalsuite-extra git lfs pull -I "data/lalsimulation/SEOBNRv2ROM_*.dat" git lfs pull -I "data/lalsimulation/*ChirpTime*.dat" - git lfs pull -I "data/lalsimulation/SEOBNRv4ROM_v*.hdf5" + git lfs pull -I "data/lalsimulation/SEOBNRv4ROM_v2.0.hdf5" mv data/lalsimulation/* ../ cd ../ - name: run pycbc test suite diff --git a/requirements.txt b/requirements.txt index 709649b789b..038cbe7d624 100644 --- a/requirements.txt +++ b/requirements.txt @@ -10,7 +10,7 @@ jinja2 mpld3>=0.3 beautifulsoup4>=4.6.0 cython -lalsuite!=7.2 +lalsuite!=7.2,!=7.25 lscsoft-glue>=1.59.3 ligo-segments tqdm From d5314844dfa0737879817f8657217fc1a9cfc609 Mon Sep 17 00:00:00 2001 From: GarethCabournDavies Date: Fri, 20 Dec 2024 03:27:20 -0800 Subject: [PATCH 7/8] less than, not block --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 038cbe7d624..c87c0a8411f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -10,7 +10,7 @@ jinja2 mpld3>=0.3 beautifulsoup4>=4.6.0 cython -lalsuite!=7.2,!=7.25 +lalsuite!=7.2,<7.25 lscsoft-glue>=1.59.3 ligo-segments tqdm From 7032e92685a0cfc497f6c0577843155d31dea6aa Mon Sep 17 00:00:00 2001 From: GarethCabournDavies Date: Fri, 20 Dec 2024 03:58:34 -0800 Subject: [PATCH 8/8] Adding comment for why this is pinned --- requirements.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/requirements.txt b/requirements.txt index c87c0a8411f..4f401ab237f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -10,6 +10,8 @@ jinja2 mpld3>=0.3 beautifulsoup4>=4.6.0 cython +# lalsuite 7.25 requires a data file which is not public +#- pinning temporarily until it is lalsuite!=7.2,<7.25 lscsoft-glue>=1.59.3 ligo-segments