From 4de33f09d3995015c752d53b3b37a24ae05af362 Mon Sep 17 00:00:00 2001 From: Alexander Harvey Nitz Date: Sat, 27 Apr 2024 13:57:18 -0400 Subject: [PATCH 01/26] try this --- .github/workflows/basic-tests.yml | 8 ++++---- .github/workflows/mac-test.yml | 28 ---------------------------- tox.ini | 12 ------------ 3 files changed, 4 insertions(+), 44 deletions(-) delete mode 100644 .github/workflows/mac-test.yml diff --git a/.github/workflows/basic-tests.yml b/.github/workflows/basic-tests.yml index 54d5ee2c9b8..1ef4f5f0c37 100644 --- a/.github/workflows/basic-tests.yml +++ b/.github/workflows/basic-tests.yml @@ -12,10 +12,11 @@ jobs: strategy: max-parallel: 60 matrix: - os: [ubuntu-20.04] - python-version: ['3.9', '3.10', '3.11', '3.12'] + os: [ubuntu-latest, macos-latest] + python-version: [3.9, '3.10', '3.11', '3.12'] test-type: [unittest, search, docs] steps: + - uses: conda-incubator/setup-miniconda@v3 - uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v5 @@ -23,8 +24,7 @@ jobs: python-version: ${{ matrix.python-version }} - 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 + conda install fftw mpi git-lfs graphviz pip install "tox<4.0.0" pip setuptools --upgrade - name: installing auxiliary data files run: | diff --git a/.github/workflows/mac-test.yml b/.github/workflows/mac-test.yml deleted file mode 100644 index 2a26882d7ae..00000000000 --- a/.github/workflows/mac-test.yml +++ /dev/null @@ -1,28 +0,0 @@ -name: macos basic tests - -on: [push, pull_request] - -concurrency: - group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} - cancel-in-progress: true - -jobs: - build: - runs-on: ${{ matrix.os }} - strategy: - max-parallel: 4 - matrix: - os: [macos-latest] - python-version: ['3.10', '3.11', '3.12'] - steps: - - uses: actions/checkout@v1 - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v5 - with: - python-version: ${{ matrix.python-version }} - - run: | - brew install fftw openssl gsl - pip install --upgrade pip setuptools "tox<4.0.0" - - name: run basic pycbc test suite - run: | - tox -e py-unittest diff --git a/tox.ini b/tox.ini index d3d96b2039b..164e950dcfb 100644 --- a/tox.ini +++ b/tox.ini @@ -17,8 +17,6 @@ allowlist_externals = bash passenv=LAL_DATA_PATH conda_deps=openssl conda_channels=conda-forge -platform = lin: linux - mac: darwin # This test should run on almost anybody's environment [testenv:py-unittest] @@ -30,11 +28,6 @@ deps = git+https://github.com/gwastro/BBHX-waveform-model.git; sys_platform == 'linux' conda_deps= mysqlclient - lin: gcc_linux-64>=12.2.0 - lin: gxx_linux-64>=12.2.0 - ; mac doesn't work, need fix - ; mac: clang_osx-64 - ; mac: clangxx_osx-64 gsl lapack==3.6.1 conda_channels=conda-forge @@ -75,11 +68,6 @@ deps = git+https://github.com/gwastro/BBHX-waveform-model.git; sys_platform == 'linux' conda_deps= mysqlclient - lin: gcc_linux-64>=12.2.0 - lin: gxx_linux-64>=12.2.0 - ; mac doesn't work, need fix - ; mac: clang_osx-64 - ; mac: clangxx_osx-64 binutils_linux-64>=2.39 gsl lapack==3.6.1 From 9ca0da0b7e7d778028a77fad97252d5f3fa945ba Mon Sep 17 00:00:00 2001 From: Alexander Harvey Nitz Date: Sat, 27 Apr 2024 14:11:57 -0400 Subject: [PATCH 02/26] update --- .github/workflows/basic-tests.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/basic-tests.yml b/.github/workflows/basic-tests.yml index 1ef4f5f0c37..6803541fa1a 100644 --- a/.github/workflows/basic-tests.yml +++ b/.github/workflows/basic-tests.yml @@ -26,6 +26,10 @@ jobs: run: | conda install fftw mpi git-lfs graphviz pip install "tox<4.0.0" pip setuptools --upgrade + - name: installing macosx packages + if: matrix.os == 'macos-latest' + run: | + conda install lapack==3.9.0 - name: installing auxiliary data files run: | GIT_LFS_SKIP_SMUDGE=1 git clone https://git.ligo.org/lscsoft/lalsuite-extra From 2d121080e1a6cf5e00bbe51a6da272601a1423ef Mon Sep 17 00:00:00 2001 From: Alexander Harvey Nitz Date: Sat, 27 Apr 2024 14:16:01 -0400 Subject: [PATCH 03/26] test --- .github/workflows/basic-tests.yml | 4 ++++ tox.ini | 3 --- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/basic-tests.yml b/.github/workflows/basic-tests.yml index 6803541fa1a..a71ebba3fe2 100644 --- a/.github/workflows/basic-tests.yml +++ b/.github/workflows/basic-tests.yml @@ -30,6 +30,10 @@ jobs: if: matrix.os == 'macos-latest' run: | conda install lapack==3.9.0 + - name: installing macosx packages + if: matrix.os == 'ubuntu-latest' + run: | + conda install lapack==3.6.1 - name: installing auxiliary data files run: | GIT_LFS_SKIP_SMUDGE=1 git clone https://git.ligo.org/lscsoft/lalsuite-extra diff --git a/tox.ini b/tox.ini index 164e950dcfb..8c77784e547 100644 --- a/tox.ini +++ b/tox.ini @@ -29,7 +29,6 @@ deps = conda_deps= mysqlclient gsl - lapack==3.6.1 conda_channels=conda-forge setenv = ; Tell the linker to look for shared libs inside the temporary Conda env. @@ -68,9 +67,7 @@ deps = git+https://github.com/gwastro/BBHX-waveform-model.git; sys_platform == 'linux' conda_deps= mysqlclient - binutils_linux-64>=2.39 gsl - lapack==3.6.1 openmpi conda_channels=conda-forge setenv = From a4508aba963219a6738095d4dd9755f531be0fea Mon Sep 17 00:00:00 2001 From: Alexander Harvey Nitz Date: Sat, 27 Apr 2024 14:18:30 -0400 Subject: [PATCH 04/26] test --- .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 a71ebba3fe2..ab7184fa395 100644 --- a/.github/workflows/basic-tests.yml +++ b/.github/workflows/basic-tests.yml @@ -29,11 +29,11 @@ jobs: - name: installing macosx packages if: matrix.os == 'macos-latest' run: | - conda install lapack==3.9.0 + conda install -c conda-forge lapack==3.9.0 - name: installing macosx packages if: matrix.os == 'ubuntu-latest' run: | - conda install lapack==3.6.1 + conda install -c conda-forge lapack==3.6.1 - name: installing auxiliary data files run: | GIT_LFS_SKIP_SMUDGE=1 git clone https://git.ligo.org/lscsoft/lalsuite-extra From bd6f91a8b418cf9f33ad2490c98afddfe2227865 Mon Sep 17 00:00:00 2001 From: Alexander Harvey Nitz Date: Sat, 27 Apr 2024 14:32:59 -0400 Subject: [PATCH 05/26] test --- .github/workflows/basic-tests.yml | 4 ++-- tox.ini | 11 ----------- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/.github/workflows/basic-tests.yml b/.github/workflows/basic-tests.yml index ab7184fa395..341eb8619b5 100644 --- a/.github/workflows/basic-tests.yml +++ b/.github/workflows/basic-tests.yml @@ -24,13 +24,13 @@ jobs: python-version: ${{ matrix.python-version }} - name: installing system packages run: | - conda install fftw mpi git-lfs graphviz + conda install -c conda-forge fftw mpi git-lfs graphviz mysqlclient gsl openssl==1.1 openmpi pip install "tox<4.0.0" pip setuptools --upgrade - name: installing macosx packages if: matrix.os == 'macos-latest' run: | conda install -c conda-forge lapack==3.9.0 - - name: installing macosx packages + - name: installing ubuntu packages if: matrix.os == 'ubuntu-latest' run: | conda install -c conda-forge lapack==3.6.1 diff --git a/tox.ini b/tox.ini index 8c77784e547..7b40ba038d0 100644 --- a/tox.ini +++ b/tox.ini @@ -15,8 +15,6 @@ deps = [testenv] allowlist_externals = bash passenv=LAL_DATA_PATH -conda_deps=openssl -conda_channels=conda-forge # This test should run on almost anybody's environment [testenv:py-unittest] @@ -26,10 +24,6 @@ deps = ; Needed for `BBHx` package to work with PyCBC git+https://github.com/titodalcanton/BBHx.git@py39-and-cleanup; sys_platform == 'linux' git+https://github.com/gwastro/BBHX-waveform-model.git; sys_platform == 'linux' -conda_deps= - mysqlclient - gsl -conda_channels=conda-forge setenv = ; Tell the linker to look for shared libs inside the temporary Conda env. ; Needed to build BBHx's wheel, whick links to LAPACK. @@ -65,11 +59,6 @@ deps = ; Needed for `BBHx` package to work with PyCBC git+https://github.com/titodalcanton/BBHx.git@py39-and-cleanup; sys_platform == 'linux' git+https://github.com/gwastro/BBHX-waveform-model.git; sys_platform == 'linux' -conda_deps= - mysqlclient - gsl - openmpi -conda_channels=conda-forge setenv = PYCBC_TEST_TYPE=docs ; Tell the linker to look for shared libs inside the temporary Conda env. From bae9428e772f4026de0f8716ce88661c489a21c4 Mon Sep 17 00:00:00 2001 From: Alexander Harvey Nitz Date: Sat, 27 Apr 2024 14:44:20 -0400 Subject: [PATCH 06/26] test --- .github/workflows/basic-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/basic-tests.yml b/.github/workflows/basic-tests.yml index 341eb8619b5..ca415a03596 100644 --- a/.github/workflows/basic-tests.yml +++ b/.github/workflows/basic-tests.yml @@ -24,7 +24,7 @@ jobs: python-version: ${{ matrix.python-version }} - name: installing system packages run: | - conda install -c conda-forge fftw mpi git-lfs graphviz mysqlclient gsl openssl==1.1 openmpi + conda install -c conda-forge fftw mpi git-lfs graphviz mysqlclient gsl openssl openmpi pip install "tox<4.0.0" pip setuptools --upgrade - name: installing macosx packages if: matrix.os == 'macos-latest' From 4ea61e737a1fbad74213156eab1375636a5345f6 Mon Sep 17 00:00:00 2001 From: Alexander Harvey Nitz Date: Sat, 27 Apr 2024 14:50:41 -0400 Subject: [PATCH 07/26] test --- .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 ca415a03596..6476b727212 100644 --- a/.github/workflows/basic-tests.yml +++ b/.github/workflows/basic-tests.yml @@ -29,11 +29,11 @@ jobs: - name: installing macosx packages if: matrix.os == 'macos-latest' run: | - conda install -c conda-forge lapack==3.9.0 + conda install -c conda-forge 'lapack==3.9.0' - name: installing ubuntu packages if: matrix.os == 'ubuntu-latest' run: | - conda install -c conda-forge lapack==3.6.1 + conda install -c conda-forge 'lapack==3.6.1' - name: installing auxiliary data files run: | GIT_LFS_SKIP_SMUDGE=1 git clone https://git.ligo.org/lscsoft/lalsuite-extra From e1ebba3810552f10914331a9848c2baab90c84df Mon Sep 17 00:00:00 2001 From: Alexander Harvey Nitz Date: Sat, 27 Apr 2024 15:06:56 -0400 Subject: [PATCH 08/26] test --- .github/workflows/basic-tests.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/basic-tests.yml b/.github/workflows/basic-tests.yml index 6476b727212..68a3da2584d 100644 --- a/.github/workflows/basic-tests.yml +++ b/.github/workflows/basic-tests.yml @@ -24,16 +24,16 @@ jobs: python-version: ${{ matrix.python-version }} - name: installing system packages run: | - conda install -c conda-forge fftw mpi git-lfs graphviz mysqlclient gsl openssl openmpi + conda install fftw mpi git-lfs graphviz mysqlclient gsl openssl openmpi pip install "tox<4.0.0" pip setuptools --upgrade - name: installing macosx packages if: matrix.os == 'macos-latest' run: | - conda install -c conda-forge 'lapack==3.9.0' + conda install -c conda-forge lapack==3.9.0 - name: installing ubuntu packages if: matrix.os == 'ubuntu-latest' run: | - conda install -c conda-forge 'lapack==3.6.1' + conda install -c conda-forge lapack==3.6.1 - name: installing auxiliary data files run: | GIT_LFS_SKIP_SMUDGE=1 git clone https://git.ligo.org/lscsoft/lalsuite-extra From 99c210cdeeffeeb9db8c869b0c88b8d2fb80c82a Mon Sep 17 00:00:00 2001 From: Tito Dal Canton Date: Mon, 4 Nov 2024 20:45:59 +0100 Subject: [PATCH 09/26] Rever useless change --- .github/workflows/basic-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/basic-tests.yml b/.github/workflows/basic-tests.yml index 68a3da2584d..1657cade13b 100644 --- a/.github/workflows/basic-tests.yml +++ b/.github/workflows/basic-tests.yml @@ -13,7 +13,7 @@ jobs: max-parallel: 60 matrix: os: [ubuntu-latest, macos-latest] - python-version: [3.9, '3.10', '3.11', '3.12'] + python-version: ['3.9', '3.10', '3.11', '3.12'] test-type: [unittest, search, docs] steps: - uses: conda-incubator/setup-miniconda@v3 From b6cf72f071ae24ba6eefa6d6a0bc1a4cac6ad090 Mon Sep 17 00:00:00 2001 From: Tito Dal Canton Date: Mon, 4 Nov 2024 20:54:50 +0100 Subject: [PATCH 10/26] Try removing mysqlclient --- .github/workflows/basic-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/basic-tests.yml b/.github/workflows/basic-tests.yml index 1657cade13b..650ef7f3dd4 100644 --- a/.github/workflows/basic-tests.yml +++ b/.github/workflows/basic-tests.yml @@ -24,7 +24,7 @@ jobs: python-version: ${{ matrix.python-version }} - name: installing system packages run: | - conda install fftw mpi git-lfs graphviz mysqlclient gsl openssl openmpi + conda install fftw mpi git-lfs graphviz gsl openssl openmpi pip install "tox<4.0.0" pip setuptools --upgrade - name: installing macosx packages if: matrix.os == 'macos-latest' From d928731ba765a30cd99c2ad412b4ed9e771a6e87 Mon Sep 17 00:00:00 2001 From: Tito Dal Canton Date: Thu, 14 Nov 2024 11:38:14 +0100 Subject: [PATCH 11/26] Set up Python directly via miniconda --- .github/workflows/basic-tests.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/basic-tests.yml b/.github/workflows/basic-tests.yml index 650ef7f3dd4..1db8efbdc14 100644 --- a/.github/workflows/basic-tests.yml +++ b/.github/workflows/basic-tests.yml @@ -17,11 +17,10 @@ jobs: test-type: [unittest, search, docs] steps: - uses: conda-incubator/setup-miniconda@v3 - - uses: actions/checkout@v4 - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v5 with: + auto-update-conda: true python-version: ${{ matrix.python-version }} + - uses: actions/checkout@v4 - name: installing system packages run: | conda install fftw mpi git-lfs graphviz gsl openssl openmpi From 0ebf686e21f2985c21d472b5470c7e13b0793453 Mon Sep 17 00:00:00 2001 From: Tito Dal Canton Date: Thu, 14 Nov 2024 11:52:02 +0100 Subject: [PATCH 12/26] Try installing tox via conda --- .github/workflows/basic-tests.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/basic-tests.yml b/.github/workflows/basic-tests.yml index 1db8efbdc14..d55305c05a9 100644 --- a/.github/workflows/basic-tests.yml +++ b/.github/workflows/basic-tests.yml @@ -23,8 +23,7 @@ jobs: - uses: actions/checkout@v4 - name: installing system packages run: | - conda install fftw mpi git-lfs graphviz gsl openssl openmpi - pip install "tox<4.0.0" pip setuptools --upgrade + conda install fftw mpi git-lfs graphviz gsl openssl openmpi "tox<4.0.0" pip setuptools - name: installing macosx packages if: matrix.os == 'macos-latest' run: | From 02540d66831c92569c31021ccf7d30e60eff25d5 Mon Sep 17 00:00:00 2001 From: Tito Dal Canton Date: Thu, 14 Nov 2024 11:54:15 +0100 Subject: [PATCH 13/26] =?UTF-8?q?Try=20with=20conda-forge=E2=80=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/basic-tests.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/basic-tests.yml b/.github/workflows/basic-tests.yml index d55305c05a9..26640e767bf 100644 --- a/.github/workflows/basic-tests.yml +++ b/.github/workflows/basic-tests.yml @@ -23,7 +23,8 @@ jobs: - uses: actions/checkout@v4 - name: installing system packages run: | - conda install fftw mpi git-lfs graphviz gsl openssl openmpi "tox<4.0.0" pip setuptools + conda install fftw mpi git-lfs graphviz gsl openssl openmpi pip setuptools + conda install -c conda-forge "tox<4.0.0" - name: installing macosx packages if: matrix.os == 'macos-latest' run: | From 0eb790f0bbd2abd2b6553d7c32eeea208371195f Mon Sep 17 00:00:00 2001 From: Tito Dal Canton Date: Thu, 14 Nov 2024 12:01:07 +0100 Subject: [PATCH 14/26] Try activating an env explicitly --- .github/workflows/basic-tests.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/basic-tests.yml b/.github/workflows/basic-tests.yml index 26640e767bf..3903278c630 100644 --- a/.github/workflows/basic-tests.yml +++ b/.github/workflows/basic-tests.yml @@ -20,6 +20,7 @@ jobs: with: auto-update-conda: true python-version: ${{ matrix.python-version }} + activate-environment: tests - uses: actions/checkout@v4 - name: installing system packages run: | From 3f448f5b8bcd7820e8ec2366195b0d1af06f2ac0 Mon Sep 17 00:00:00 2001 From: Tito Dal Canton Date: Thu, 14 Nov 2024 12:05:03 +0100 Subject: [PATCH 15/26] Tox via conda does not work, revert --- .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 3903278c630..5f6d4da7cc9 100644 --- a/.github/workflows/basic-tests.yml +++ b/.github/workflows/basic-tests.yml @@ -24,8 +24,8 @@ jobs: - uses: actions/checkout@v4 - name: installing system packages run: | - conda install fftw mpi git-lfs graphviz gsl openssl openmpi pip setuptools - conda install -c conda-forge "tox<4.0.0" + conda install fftw mpi git-lfs graphviz gsl openssl openmpi + pip install "tox<4.0.0" pip setuptools --upgrade - name: installing macosx packages if: matrix.os == 'macos-latest' run: | From 7a8068c1e57c866eaac2710a7daa3634e0c5b281 Mon Sep 17 00:00:00 2001 From: Tito Dal Canton Date: Fri, 15 Nov 2024 11:54:06 +0100 Subject: [PATCH 16/26] Minor change to remove a warning --- .github/workflows/basic-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/basic-tests.yml b/.github/workflows/basic-tests.yml index 5f6d4da7cc9..0d34261cb0e 100644 --- a/.github/workflows/basic-tests.yml +++ b/.github/workflows/basic-tests.yml @@ -36,7 +36,7 @@ jobs: conda install -c conda-forge lapack==3.6.1 - 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/lscsoft/lalsuite-extra.git cd lalsuite-extra git lfs pull -I "data/lalsimulation/SEOBNRv2ROM_*.dat" git lfs pull -I "data/lalsimulation/*ChirpTime*.dat" From 8562cce27882437c945ac9c3998f037db6bbb41e Mon Sep 17 00:00:00 2001 From: Tito Dal Canton Date: Fri, 15 Nov 2024 13:27:55 +0100 Subject: [PATCH 17/26] DEBUG --- .github/workflows/basic-tests.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/basic-tests.yml b/.github/workflows/basic-tests.yml index 0d34261cb0e..54b653006d3 100644 --- a/.github/workflows/basic-tests.yml +++ b/.github/workflows/basic-tests.yml @@ -43,6 +43,14 @@ jobs: git lfs pull -I "data/lalsimulation/SEOBNRv4ROM_v2.0.hdf5" mv data/lalsimulation/* ../ cd ../ + - name: DEBUG DEBUG DEBUG checking various env stuff + run: | + python --version + which python + which tox + echo $CONDA_PREFIX + ls $CONDA_PREFIX/lib/liblapack* + echo $LD_LIBRARY_PATH - name: run pycbc test suite run: | export LAL_DATA_PATH=$PWD From e5bbb9a259fe396dfadd9cb9c7f516bb591670e7 Mon Sep 17 00:00:00 2001 From: Tito Dal Canton Date: Fri, 15 Nov 2024 13:49:08 +0100 Subject: [PATCH 18/26] DEBUG --- .github/workflows/basic-tests.yml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/.github/workflows/basic-tests.yml b/.github/workflows/basic-tests.yml index 54b653006d3..00581dead09 100644 --- a/.github/workflows/basic-tests.yml +++ b/.github/workflows/basic-tests.yml @@ -15,6 +15,10 @@ jobs: os: [ubuntu-latest, macos-latest] python-version: ['3.9', '3.10', '3.11', '3.12'] test-type: [unittest, search, docs] + defaults: + run: + # important when we use Conda envs + shell: bash -el {0} steps: - uses: conda-incubator/setup-miniconda@v3 with: @@ -45,11 +49,17 @@ jobs: cd ../ - name: DEBUG DEBUG DEBUG checking various env stuff run: | + echo "Which Python version do we have?" python --version + echo "Where is Python?" which python + echo "Where is tox?" which tox + echo "What is $CONDA_PREFIX?" echo $CONDA_PREFIX - ls $CONDA_PREFIX/lib/liblapack* + echo "Is LAPACK where it should?" + ls $CONDA_PREFIX/lib/ | grep liblapack + echo "What is LD_LIBRARY_PATH?" echo $LD_LIBRARY_PATH - name: run pycbc test suite run: | From 7936d7a7a6ed36f6a8f774a9a5d76410b5010e28 Mon Sep 17 00:00:00 2001 From: Tito Dal Canton Date: Fri, 15 Nov 2024 13:56:48 +0100 Subject: [PATCH 19/26] DEBUG --- .github/workflows/basic-tests.yml | 4 ++-- tox.ini | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/basic-tests.yml b/.github/workflows/basic-tests.yml index 00581dead09..d033ca5313c 100644 --- a/.github/workflows/basic-tests.yml +++ b/.github/workflows/basic-tests.yml @@ -55,10 +55,10 @@ jobs: which python echo "Where is tox?" which tox - echo "What is $CONDA_PREFIX?" + echo "What is CONDA_PREFIX?" echo $CONDA_PREFIX echo "Is LAPACK where it should?" - ls $CONDA_PREFIX/lib/ | grep liblapack + find $CONDA_PREFIX/lib/ -type f -name liblapack\* echo "What is LD_LIBRARY_PATH?" echo $LD_LIBRARY_PATH - name: run pycbc test suite diff --git a/tox.ini b/tox.ini index 7b40ba038d0..5a82e07fbc2 100644 --- a/tox.ini +++ b/tox.ini @@ -28,7 +28,7 @@ setenv = ; Tell the linker to look for shared libs inside the temporary Conda env. ; Needed to build BBHx's wheel, whick links to LAPACK. LIBRARY_PATH={envdir}/lib:{env:LIBRARY_PATH:} -commands = pytest +commands = echo LIBRARY_PATH is $LIBRARY_PATH ; pytest # The following are long running or may require # some extra system-level dependencies or static files. From 30a79174c2c41596e1d096b6ebef96d0311562f1 Mon Sep 17 00:00:00 2001 From: Tito Dal Canton Date: Fri, 15 Nov 2024 14:10:45 +0100 Subject: [PATCH 20/26] DEBUG --- .github/workflows/basic-tests.yml | 3 +-- tox.ini | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/basic-tests.yml b/.github/workflows/basic-tests.yml index d033ca5313c..cbd5587cdcb 100644 --- a/.github/workflows/basic-tests.yml +++ b/.github/workflows/basic-tests.yml @@ -28,8 +28,7 @@ jobs: - uses: actions/checkout@v4 - name: installing system packages run: | - conda install fftw mpi git-lfs graphviz gsl openssl openmpi - pip install "tox<4.0.0" pip setuptools --upgrade + conda install fftw mpi git-lfs graphviz gsl openssl openmpi "tox<4.0.0" - name: installing macosx packages if: matrix.os == 'macos-latest' run: | diff --git a/tox.ini b/tox.ini index 5a82e07fbc2..7b40ba038d0 100644 --- a/tox.ini +++ b/tox.ini @@ -28,7 +28,7 @@ setenv = ; Tell the linker to look for shared libs inside the temporary Conda env. ; Needed to build BBHx's wheel, whick links to LAPACK. LIBRARY_PATH={envdir}/lib:{env:LIBRARY_PATH:} -commands = echo LIBRARY_PATH is $LIBRARY_PATH ; pytest +commands = pytest # The following are long running or may require # some extra system-level dependencies or static files. From 1e7bfec333137dd1977ec1d38d6236c935bd9e61 Mon Sep 17 00:00:00 2001 From: Tito Dal Canton Date: Fri, 15 Nov 2024 14:15:28 +0100 Subject: [PATCH 21/26] DEBUG --- .github/workflows/basic-tests.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/basic-tests.yml b/.github/workflows/basic-tests.yml index cbd5587cdcb..994f3edd90e 100644 --- a/.github/workflows/basic-tests.yml +++ b/.github/workflows/basic-tests.yml @@ -28,7 +28,8 @@ jobs: - uses: actions/checkout@v4 - name: installing system packages run: | - conda install fftw mpi git-lfs graphviz gsl openssl openmpi "tox<4.0.0" + conda install fftw mpi git-lfs graphviz gsl openssl openmpi + conda install -c conda-forge "tox<4.0.0" - name: installing macosx packages if: matrix.os == 'macos-latest' run: | @@ -57,22 +58,25 @@ jobs: echo "What is CONDA_PREFIX?" echo $CONDA_PREFIX echo "Is LAPACK where it should?" - find $CONDA_PREFIX/lib/ -type f -name liblapack\* + find $CONDA_PREFIX -name \*lapack\* echo "What is LD_LIBRARY_PATH?" echo $LD_LIBRARY_PATH - name: run pycbc test suite run: | export LAL_DATA_PATH=$PWD + export LIBRARY_PATH=$CONDA_PREFIX/lib:$LIBRARY_PATH tox -e py-${{matrix.test-type}} - name: check help messages work if: matrix.test-type == 'unittest' run: | export LAL_DATA_PATH=$PWD + export LIBRARY_PATH=$CONDA_PREFIX/lib:$LIBRARY_PATH tox -e py-help - name: run inference tests if: matrix.test-type == 'search' run: | export LAL_DATA_PATH=$PWD + export LIBRARY_PATH=$CONDA_PREFIX/lib:$LIBRARY_PATH tox -e py-inference - name: store documentation page if: matrix.test-type == 'docs' && matrix.python-version == '3.12' From 4fdd104b5e3d9502e172dfe54d174158ff6c2232 Mon Sep 17 00:00:00 2001 From: Tito Dal Canton Date: Fri, 15 Nov 2024 14:34:56 +0100 Subject: [PATCH 22/26] DEBUG --- .github/workflows/basic-tests.yml | 9 ++++++--- tox.ini | 7 ------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/.github/workflows/basic-tests.yml b/.github/workflows/basic-tests.yml index 994f3edd90e..61b3219515c 100644 --- a/.github/workflows/basic-tests.yml +++ b/.github/workflows/basic-tests.yml @@ -57,26 +57,29 @@ jobs: which tox echo "What is CONDA_PREFIX?" echo $CONDA_PREFIX - echo "Is LAPACK where it should?" + echo "Is LAPACK available?" find $CONDA_PREFIX -name \*lapack\* - echo "What is LD_LIBRARY_PATH?" - echo $LD_LIBRARY_PATH + echo "Is gsl_cblas.h available?" + find $CONDA_PREFIX -name gsl_cblas.h - name: run pycbc test suite run: | export LAL_DATA_PATH=$PWD export LIBRARY_PATH=$CONDA_PREFIX/lib:$LIBRARY_PATH + export C_INCLUDE_PATH=$CONDA_PREFIX/lib:$C_INCLUDE_PATH tox -e py-${{matrix.test-type}} - name: check help messages work if: matrix.test-type == 'unittest' run: | export LAL_DATA_PATH=$PWD export LIBRARY_PATH=$CONDA_PREFIX/lib:$LIBRARY_PATH + export C_INCLUDE_PATH=$CONDA_PREFIX/lib:$C_INCLUDE_PATH tox -e py-help - name: run inference tests if: matrix.test-type == 'search' run: | export LAL_DATA_PATH=$PWD export LIBRARY_PATH=$CONDA_PREFIX/lib:$LIBRARY_PATH + export C_INCLUDE_PATH=$CONDA_PREFIX/lib:$C_INCLUDE_PATH tox -e py-inference - name: store documentation page if: matrix.test-type == 'docs' && matrix.python-version == '3.12' diff --git a/tox.ini b/tox.ini index 7b40ba038d0..d0c41fcd12d 100644 --- a/tox.ini +++ b/tox.ini @@ -24,10 +24,6 @@ deps = ; Needed for `BBHx` package to work with PyCBC git+https://github.com/titodalcanton/BBHx.git@py39-and-cleanup; sys_platform == 'linux' git+https://github.com/gwastro/BBHX-waveform-model.git; sys_platform == 'linux' -setenv = - ; Tell the linker to look for shared libs inside the temporary Conda env. - ; Needed to build BBHx's wheel, whick links to LAPACK. - LIBRARY_PATH={envdir}/lib:{env:LIBRARY_PATH:} commands = pytest # The following are long running or may require @@ -61,7 +57,4 @@ deps = git+https://github.com/gwastro/BBHX-waveform-model.git; sys_platform == 'linux' setenv = PYCBC_TEST_TYPE=docs - ; Tell the linker to look for shared libs inside the temporary Conda env. - ; Needed to build BBHx's wheel, whick links to LAPACK. - LIBRARY_PATH={envdir}/lib:{env:LIBRARY_PATH:} commands = bash tools/pycbc_test_suite.sh From 7faf27c98409291413c933397365059c69885583 Mon Sep 17 00:00:00 2001 From: Tito Dal Canton Date: Fri, 15 Nov 2024 14:41:31 +0100 Subject: [PATCH 23/26] DEBUG --- .github/workflows/basic-tests.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/basic-tests.yml b/.github/workflows/basic-tests.yml index 61b3219515c..9463e40218b 100644 --- a/.github/workflows/basic-tests.yml +++ b/.github/workflows/basic-tests.yml @@ -65,21 +65,21 @@ jobs: run: | export LAL_DATA_PATH=$PWD export LIBRARY_PATH=$CONDA_PREFIX/lib:$LIBRARY_PATH - export C_INCLUDE_PATH=$CONDA_PREFIX/lib:$C_INCLUDE_PATH + export C_INCLUDE_PATH=$CONDA_PREFIX/include:$C_INCLUDE_PATH tox -e py-${{matrix.test-type}} - name: check help messages work if: matrix.test-type == 'unittest' run: | export LAL_DATA_PATH=$PWD export LIBRARY_PATH=$CONDA_PREFIX/lib:$LIBRARY_PATH - export C_INCLUDE_PATH=$CONDA_PREFIX/lib:$C_INCLUDE_PATH + export C_INCLUDE_PATH=$CONDA_PREFIX/include:$C_INCLUDE_PATH tox -e py-help - name: run inference tests if: matrix.test-type == 'search' run: | export LAL_DATA_PATH=$PWD export LIBRARY_PATH=$CONDA_PREFIX/lib:$LIBRARY_PATH - export C_INCLUDE_PATH=$CONDA_PREFIX/lib:$C_INCLUDE_PATH + export C_INCLUDE_PATH=$CONDA_PREFIX/include:$C_INCLUDE_PATH tox -e py-inference - name: store documentation page if: matrix.test-type == 'docs' && matrix.python-version == '3.12' From e2219ec5d2d7543efc1bef302c9c2261134bf219 Mon Sep 17 00:00:00 2001 From: Tito Dal Canton Date: Fri, 15 Nov 2024 14:51:56 +0100 Subject: [PATCH 24/26] DEBUG --- .github/workflows/basic-tests.yml | 24 +++++------------------- 1 file changed, 5 insertions(+), 19 deletions(-) diff --git a/.github/workflows/basic-tests.yml b/.github/workflows/basic-tests.yml index 9463e40218b..1d85a7fad92 100644 --- a/.github/workflows/basic-tests.yml +++ b/.github/workflows/basic-tests.yml @@ -28,8 +28,8 @@ jobs: - uses: actions/checkout@v4 - name: installing system packages run: | - conda install fftw mpi git-lfs graphviz gsl openssl openmpi - conda install -c conda-forge "tox<4.0.0" + conda install fftw git-lfs graphviz gsl openssl + conda install -c conda-forge "tox<4.0.0" openmpi - name: installing macosx packages if: matrix.os == 'macos-latest' run: | @@ -47,39 +47,25 @@ jobs: git lfs pull -I "data/lalsimulation/SEOBNRv4ROM_v2.0.hdf5" mv data/lalsimulation/* ../ cd ../ - - name: DEBUG DEBUG DEBUG checking various env stuff - run: | - echo "Which Python version do we have?" - python --version - echo "Where is Python?" - which python - echo "Where is tox?" - which tox - echo "What is CONDA_PREFIX?" - echo $CONDA_PREFIX - echo "Is LAPACK available?" - find $CONDA_PREFIX -name \*lapack\* - echo "Is gsl_cblas.h available?" - find $CONDA_PREFIX -name gsl_cblas.h - name: run pycbc test suite run: | export LAL_DATA_PATH=$PWD export LIBRARY_PATH=$CONDA_PREFIX/lib:$LIBRARY_PATH - export C_INCLUDE_PATH=$CONDA_PREFIX/include:$C_INCLUDE_PATH + export CPATH=$CONDA_PREFIX/include:$CPATH tox -e py-${{matrix.test-type}} - name: check help messages work if: matrix.test-type == 'unittest' run: | export LAL_DATA_PATH=$PWD export LIBRARY_PATH=$CONDA_PREFIX/lib:$LIBRARY_PATH - export C_INCLUDE_PATH=$CONDA_PREFIX/include:$C_INCLUDE_PATH + export CPATH=$CONDA_PREFIX/include:$CPATH tox -e py-help - name: run inference tests if: matrix.test-type == 'search' run: | export LAL_DATA_PATH=$PWD export LIBRARY_PATH=$CONDA_PREFIX/lib:$LIBRARY_PATH - export C_INCLUDE_PATH=$CONDA_PREFIX/include:$C_INCLUDE_PATH + export CPATH=$CONDA_PREFIX/include:$CPATH tox -e py-inference - name: store documentation page if: matrix.test-type == 'docs' && matrix.python-version == '3.12' From 29c2f8feb2d2de1b6e7b5db5de8e73c27fa77c38 Mon Sep 17 00:00:00 2001 From: Tito Dal Canton Date: Fri, 15 Nov 2024 15:01:31 +0100 Subject: [PATCH 25/26] DEBUG --- .github/workflows/basic-tests.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/basic-tests.yml b/.github/workflows/basic-tests.yml index 1d85a7fad92..6955e0dbeda 100644 --- a/.github/workflows/basic-tests.yml +++ b/.github/workflows/basic-tests.yml @@ -29,7 +29,7 @@ jobs: - name: installing system packages run: | conda install fftw git-lfs graphviz gsl openssl - conda install -c conda-forge "tox<4.0.0" openmpi + conda install -c conda-forge "tox<4.0.0" mpi openmpi - name: installing macosx packages if: matrix.os == 'macos-latest' run: | @@ -52,6 +52,7 @@ jobs: export LAL_DATA_PATH=$PWD export LIBRARY_PATH=$CONDA_PREFIX/lib:$LIBRARY_PATH export CPATH=$CONDA_PREFIX/include:$CPATH + export PKG_CONFIG_PATH=$CONDA_PREFIX/lib/pkgconfig:$PKG_CONFIG_PATH tox -e py-${{matrix.test-type}} - name: check help messages work if: matrix.test-type == 'unittest' @@ -59,6 +60,7 @@ jobs: export LAL_DATA_PATH=$PWD export LIBRARY_PATH=$CONDA_PREFIX/lib:$LIBRARY_PATH export CPATH=$CONDA_PREFIX/include:$CPATH + export PKG_CONFIG_PATH=$CONDA_PREFIX/lib/pkgconfig:$PKG_CONFIG_PATH tox -e py-help - name: run inference tests if: matrix.test-type == 'search' @@ -66,6 +68,7 @@ jobs: export LAL_DATA_PATH=$PWD export LIBRARY_PATH=$CONDA_PREFIX/lib:$LIBRARY_PATH export CPATH=$CONDA_PREFIX/include:$CPATH + export PKG_CONFIG_PATH=$CONDA_PREFIX/lib/pkgconfig:$PKG_CONFIG_PATH tox -e py-inference - name: store documentation page if: matrix.test-type == 'docs' && matrix.python-version == '3.12' From 74c8aa639c85a94560e466dc82e0e60bc9a46646 Mon Sep 17 00:00:00 2001 From: Tito Dal Canton Date: Fri, 15 Nov 2024 15:07:09 +0100 Subject: [PATCH 26/26] DEBUG --- .github/workflows/basic-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/basic-tests.yml b/.github/workflows/basic-tests.yml index 6955e0dbeda..941fd11fca4 100644 --- a/.github/workflows/basic-tests.yml +++ b/.github/workflows/basic-tests.yml @@ -29,7 +29,7 @@ jobs: - name: installing system packages run: | conda install fftw git-lfs graphviz gsl openssl - conda install -c conda-forge "tox<4.0.0" mpi openmpi + conda install -c conda-forge "tox<4.0.0" mpi openmpi mpi4py - name: installing macosx packages if: matrix.os == 'macos-latest' run: |