From 865c24bc4cc8e5ccf9093752f85f7f10a41b50d5 Mon Sep 17 00:00:00 2001 From: Ian Harry Date: Fri, 14 Feb 2025 05:26:27 -0800 Subject: [PATCH 1/5] Unpin lalsuite version --- requirements.txt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/requirements.txt b/requirements.txt index ca156372818..be41a00feae 100644 --- a/requirements.txt +++ b/requirements.txt @@ -10,9 +10,7 @@ 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 +lalsuite!=7.2 lscsoft-glue>=1.59.3 igwn-segments tqdm From e364be59e08b6ab2d53361e8f316cc8d6eb8e32d Mon Sep 17 00:00:00 2001 From: Ian Harry Date: Fri, 14 Feb 2025 05:57:12 -0800 Subject: [PATCH 2/5] Do need to download new ROM files --- .github/workflows/basic-tests.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/basic-tests.yml b/.github/workflows/basic-tests.yml index 45cd7248d07..7392365ad4d 100644 --- a/.github/workflows/basic-tests.yml +++ b/.github/workflows/basic-tests.yml @@ -29,12 +29,17 @@ jobs: - name: installing auxiliary data files run: | GIT_LFS_SKIP_SMUDGE=1 git clone https://git.ligo.org/lscsoft/lalsuite-extra + GIT_LFS_SKIP_SMUDGE=1 git clone https://git.ligo.org/waveforms/software/lalsuite-waveform-data 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" mv data/lalsimulation/* ../ cd ../ + cd lalsuite-waveform-data + git lfs pull -I "waveform_data/SEOBNRv4ROM_v3.0.hdf5" + mv waveform_data/SEOBNRv4ROM_v3.0.hdf5 ../ + cd .. - name: run pycbc test suite run: | export LAL_DATA_PATH=$PWD From c1c2f58de648db96295aa99f32bba45c6531a968 Mon Sep 17 00:00:00 2001 From: Ian Harry Date: Fri, 14 Feb 2025 07:07:16 -0800 Subject: [PATCH 3/5] Try this ... I hate git lfs, it sucks --- .github/workflows/basic-tests.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/basic-tests.yml b/.github/workflows/basic-tests.yml index 7392365ad4d..5fe6cc4c70a 100644 --- a/.github/workflows/basic-tests.yml +++ b/.github/workflows/basic-tests.yml @@ -29,17 +29,13 @@ jobs: - name: installing auxiliary data files run: | GIT_LFS_SKIP_SMUDGE=1 git clone https://git.ligo.org/lscsoft/lalsuite-extra - GIT_LFS_SKIP_SMUDGE=1 git clone https://git.ligo.org/waveforms/software/lalsuite-waveform-data 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" mv data/lalsimulation/* ../ cd ../ - cd lalsuite-waveform-data - git lfs pull -I "waveform_data/SEOBNRv4ROM_v3.0.hdf5" - mv waveform_data/SEOBNRv4ROM_v3.0.hdf5 ../ - cd .. + curl https://git.ligo.org/waveforms/software/lalsuite-waveform-data/-/raw/main/waveform_data/SEOBNRv4ROM_v3.0.hdf5 > SEOBNRv4ROM_v3.0.hdf5 - name: run pycbc test suite run: | export LAL_DATA_PATH=$PWD From a0022df218491de5a2211648f7f016c85914ad81 Mon Sep 17 00:00:00 2001 From: Ian Harry Date: Fri, 14 Feb 2025 08:22:41 -0800 Subject: [PATCH 4/5] Try this --- .github/workflows/basic-tests.yml | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/.github/workflows/basic-tests.yml b/.github/workflows/basic-tests.yml index 5fe6cc4c70a..74a057ab01f 100644 --- a/.github/workflows/basic-tests.yml +++ b/.github/workflows/basic-tests.yml @@ -24,18 +24,12 @@ jobs: - name: installing system packages run: | sudo apt-get -o Acquire::Retries=3 update - sudo apt-get -o Acquire::Retries=3 install *fftw3* mpi intel-mkl* git-lfs graphviz + sudo apt-get -o Acquire::Retries=3 install *fftw3* mpi intel-mkl* graphviz pip install tox pip setuptools --upgrade - name: installing auxiliary data files run: | - GIT_LFS_SKIP_SMUDGE=1 git clone https://git.ligo.org/lscsoft/lalsuite-extra - 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" - mv data/lalsimulation/* ../ - cd ../ - curl https://git.ligo.org/waveforms/software/lalsuite-waveform-data/-/raw/main/waveform_data/SEOBNRv4ROM_v3.0.hdf5 > SEOBNRv4ROM_v3.0.hdf5 + curl --show-error --silent --remote-name https://git.ligo.org/lscsoft/lalsuite-extra/-/raw/master/data/lalsimulation/SEOBNRv4ROM_v2.0.hdf5 > SEOBNRv4ROM_v2.0.hdf5 + curl --show-error --silent --remote-name https://git.ligo.org/waveforms/software/lalsuite-waveform-data/-/raw/main/waveform_data/SEOBNRv4ROM_v3.0.hdf5 > SEOBNRv4ROM_v3.0.hdf5 - name: run pycbc test suite run: | export LAL_DATA_PATH=$PWD From 2399ef8de36b1f63e5ad2c6db992ef26d8606e65 Mon Sep 17 00:00:00 2001 From: Ian Harry Date: Fri, 14 Feb 2025 17:00:25 +0000 Subject: [PATCH 5/5] What Tito says --- .github/workflows/basic-tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/basic-tests.yml b/.github/workflows/basic-tests.yml index 74a057ab01f..3273dc85c74 100644 --- a/.github/workflows/basic-tests.yml +++ b/.github/workflows/basic-tests.yml @@ -28,8 +28,8 @@ jobs: pip install tox pip setuptools --upgrade - name: installing auxiliary data files run: | - curl --show-error --silent --remote-name https://git.ligo.org/lscsoft/lalsuite-extra/-/raw/master/data/lalsimulation/SEOBNRv4ROM_v2.0.hdf5 > SEOBNRv4ROM_v2.0.hdf5 - curl --show-error --silent --remote-name https://git.ligo.org/waveforms/software/lalsuite-waveform-data/-/raw/main/waveform_data/SEOBNRv4ROM_v3.0.hdf5 > SEOBNRv4ROM_v3.0.hdf5 + curl --show-error --silent --remote-name https://git.ligo.org/lscsoft/lalsuite-extra/-/raw/master/data/lalsimulation/SEOBNRv4ROM_v2.0.hdf5 + curl --show-error --silent --remote-name https://git.ligo.org/waveforms/software/lalsuite-waveform-data/-/raw/main/waveform_data/SEOBNRv4ROM_v3.0.hdf5 - name: run pycbc test suite run: | export LAL_DATA_PATH=$PWD