From 16b9e0c0bb8e979cecc1ca12045bf01128c1bfdd Mon Sep 17 00:00:00 2001 From: Karl Wette Date: Tue, 2 Aug 2022 10:07:07 +1000 Subject: [PATCH 1/5] conda/install-bin.sh: test binaries --- conda/install-bin.sh | 5 +++++ lal/conda/meta.yaml.in.in | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/conda/install-bin.sh b/conda/install-bin.sh index 147ad8e4d2..875950de7a 100644 --- a/conda/install-bin.sh +++ b/conda/install-bin.sh @@ -6,6 +6,11 @@ set -ex _pybuilddir="_build${PY_VER}" cd ${_pybuilddir} +# test binaries +if [[ "${build_platform}" == "${target_platform}" ]]; then + make -j ${CPU_COUNT} V=1 VERBOSE=1 check -C bin +fi + # install binaries make -j ${CPU_COUNT} V=1 VERBOSE=1 install -C bin diff --git a/lal/conda/meta.yaml.in.in b/lal/conda/meta.yaml.in.in index 6041036adc..7e13354deb 100644 --- a/lal/conda/meta.yaml.in.in +++ b/lal/conda/meta.yaml.in.in @@ -177,6 +177,7 @@ outputs: error_overlinking: true ignore_run_exports: - openssl + - numpy - python string: {{ fft_impl }}_py{{ py }}h{{ PKG_HASH }}_{{ PKG_BUILDNUM }} requirements: @@ -190,6 +191,8 @@ outputs: - numpy # [build_platform != target_platform] host: - {{ pin_subpackage('liblal', exact=True) }} + - ligo-segments # [build_platform == target_platform] + - numpy # [build_platform == target_platform] - python # extras to help the solver - mkl {{ mkl }} # [fft_impl == "mkl"] @@ -197,6 +200,8 @@ outputs: run: - fftw # [fft_impl == "fftw"] - {{ pin_subpackage('liblal', exact=True) }} + - ligo-segments + - {{ pin_compatible('numpy') }} - python - {{ pin_subpackage('python-lal', exact=True) }} about: -- GitLab From f38ccdb79f152384f1786bc4d333f7324c9c8712 Mon Sep 17 00:00:00 2001 From: Karl Wette Date: Tue, 2 Aug 2022 10:07:28 +1000 Subject: [PATCH 2/5] lalpulsar/conda/install-bin.sh: use conda/install-bin.sh --- lalpulsar/conda/install-bin.sh | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) mode change 100644 => 120000 lalpulsar/conda/install-bin.sh diff --git a/lalpulsar/conda/install-bin.sh b/lalpulsar/conda/install-bin.sh deleted file mode 100644 index 875950de7a..0000000000 --- a/lalpulsar/conda/install-bin.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash - -set -ex - -# install from python build directory -_pybuilddir="_build${PY_VER}" -cd ${_pybuilddir} - -# test binaries -if [[ "${build_platform}" == "${target_platform}" ]]; then - make -j ${CPU_COUNT} V=1 VERBOSE=1 check -C bin -fi - -# install binaries -make -j ${CPU_COUNT} V=1 VERBOSE=1 install -C bin - -# install system configuration files -make -j ${CPU_COUNT} V=1 VERBOSE=1 install-sysconfDATA diff --git a/lalpulsar/conda/install-bin.sh b/lalpulsar/conda/install-bin.sh new file mode 120000 index 0000000000..8809a31bbc --- /dev/null +++ b/lalpulsar/conda/install-bin.sh @@ -0,0 +1 @@ +../../conda/install-bin.sh \ No newline at end of file -- GitLab From b93d80c9fb433564e2d0458752940641a4930ef7 Mon Sep 17 00:00:00 2001 From: Karl Wette Date: Tue, 2 Aug 2022 10:07:49 +1000 Subject: [PATCH 3/5] lalinference/conda/install-bin.sh: test binaries --- lalinference/conda/install-bin.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lalinference/conda/install-bin.sh b/lalinference/conda/install-bin.sh index a33d98ca75..a5cc14256c 100644 --- a/lalinference/conda/install-bin.sh +++ b/lalinference/conda/install-bin.sh @@ -49,6 +49,11 @@ ${SRC_DIR}/configure \ ${CONFIGURE_ARGS} \ ; +# test binaries +if [[ "${build_platform}" == "${target_platform}" ]]; then + make -j ${CPU_COUNT} V=1 VERBOSE=1 check -C bin +fi + # install binaries make -j ${CPU_COUNT} V=1 VERBOSE=1 install -C bin -- GitLab From 90158aeb2655838c98da09ebed3e0384e55a75c9 Mon Sep 17 00:00:00 2001 From: Karl Wette Date: Tue, 2 Aug 2022 10:08:20 +1000 Subject: [PATCH 4/5] lalinference/conda/meta.yaml.in.in: missing script_env for install-bin.sh --- lalinference/conda/meta.yaml.in.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lalinference/conda/meta.yaml.in.in b/lalinference/conda/meta.yaml.in.in index 9f3de902b6..7b7ceb3187 100644 --- a/lalinference/conda/meta.yaml.in.in +++ b/lalinference/conda/meta.yaml.in.in @@ -229,6 +229,10 @@ outputs: ignore_run_exports: - openssl - python + script_env: + - CI_COMMIT_TAG + - CI_PIPELINE_SOURCE + - GITLAB_CI # Prioritise nompi via build number number: {{ (build + 100) if (mpi or "nompi") == "nompi" else build }} string: {{ "nompi" if (mpi or "nompi") == "nompi" else ("mpi_" + mpi) }}_py{{ py }}h{{ PKG_HASH }}_{{ PKG_BUILDNUM }} -- GitLab From 1b46f7250c951e406a1448a2cf2c610d0f6625a6 Mon Sep 17 00:00:00 2001 From: Karl Wette Date: Fri, 5 Aug 2022 02:18:02 +1000 Subject: [PATCH 5/5] lal*/conda/install-python.sh: test SWIG wrappings --- lal/conda/install-python.sh | 5 +++++ lal/conda/meta.yaml.in.in | 1 + lalburst/conda/install-python.sh | 5 +++++ lalframe/conda/install-python.sh | 5 +++++ lalframe/conda/meta.yaml.in.in | 1 + lalinference/conda/install-python.sh | 5 +++++ lalinference/conda/meta.yaml.in.in | 6 ++++++ lalinspiral/conda/install-python.sh | 5 +++++ lalinspiral/conda/meta.yaml.in.in | 5 +++++ lalmetaio/conda/install-python.sh | 5 +++++ lalmetaio/conda/meta.yaml.in.in | 1 + lalpulsar/conda/install-python.sh | 5 +++++ lalpulsar/conda/meta.yaml.in.in | 6 ++++++ lalsimulation/conda/install-python.sh | 5 +++++ lalsimulation/conda/meta.yaml.in.in | 1 + 15 files changed, 61 insertions(+) diff --git a/lal/conda/install-python.sh b/lal/conda/install-python.sh index 07c5b6eadd..dd205e884c 100644 --- a/lal/conda/install-python.sh +++ b/lal/conda/install-python.sh @@ -54,6 +54,11 @@ ${SRC_DIR}/configure \ make -j ${CPU_COUNT} V=1 VERBOSE=1 -C swig make -j ${CPU_COUNT} V=1 VERBOSE=1 -C python +# test +if [[ "${build_platform}" == "${target_platform}" ]]; then + make -j ${CPU_COUNT} V=1 VERBOSE=1 check -C swig +fi + # install make -j ${CPU_COUNT} V=1 VERBOSE=1 -C swig install-exec # swig bindings make -j ${CPU_COUNT} V=1 VERBOSE=1 -C python install # pure-python extras diff --git a/lal/conda/meta.yaml.in.in b/lal/conda/meta.yaml.in.in index 7e13354deb..05d9637e62 100644 --- a/lal/conda/meta.yaml.in.in +++ b/lal/conda/meta.yaml.in.in @@ -133,6 +133,7 @@ outputs: # provided to assist the solver, but not actually used - mkl-devel {{ mkl }} # [fft_impl == "mkl"] - openssl + - six run: - {{ pin_subpackage('liblal', exact=True) }} - ligo-segments diff --git a/lalburst/conda/install-python.sh b/lalburst/conda/install-python.sh index b1b2825e71..07960c418e 100644 --- a/lalburst/conda/install-python.sh +++ b/lalburst/conda/install-python.sh @@ -52,6 +52,11 @@ sed -i.tmp '/^dependency_libs/d' lib/lib${PKG_NAME##*-}.la make -j ${CPU_COUNT} V=1 VERBOSE=1 -C swig LIBS="" make -j ${CPU_COUNT} V=1 VERBOSE=1 -C python LIBS="" +# test +if [[ "${build_platform}" == "${target_platform}" ]]; then + make -j ${CPU_COUNT} V=1 VERBOSE=1 check -C swig +fi + # install make -j ${CPU_COUNT} V=1 VERBOSE=1 -C swig install-exec # swig bindings make -j ${CPU_COUNT} V=1 VERBOSE=1 -C python install # pure-python extras diff --git a/lalframe/conda/install-python.sh b/lalframe/conda/install-python.sh index b58b3db941..daf791b9dc 100644 --- a/lalframe/conda/install-python.sh +++ b/lalframe/conda/install-python.sh @@ -49,6 +49,11 @@ sed -i.tmp '/^dependency_libs/d' lib/lib${PKG_NAME##*-}.la make -j ${CPU_COUNT} V=1 VERBOSE=1 -C swig LIBS="" make -j ${CPU_COUNT} V=1 VERBOSE=1 -C python LIBS="" +# test +if [[ "${build_platform}" == "${target_platform}" ]]; then + make -j ${CPU_COUNT} V=1 VERBOSE=1 check -C swig +fi + # install make -j ${CPU_COUNT} V=1 VERBOSE=1 -C swig install-exec # swig bindings make -j ${CPU_COUNT} V=1 VERBOSE=1 -C python install # pure-python extras diff --git a/lalframe/conda/meta.yaml.in.in b/lalframe/conda/meta.yaml.in.in index dc699b0e5e..02a25b318a 100644 --- a/lalframe/conda/meta.yaml.in.in +++ b/lalframe/conda/meta.yaml.in.in @@ -129,6 +129,7 @@ outputs: - {{ pin_subpackage('liblalframe', exact=True) }} - numpy - python + - python-lal >={{ lal_version }} # extras to assist the solver, but not actually used - openssl run: diff --git a/lalinference/conda/install-python.sh b/lalinference/conda/install-python.sh index b1b2825e71..07960c418e 100755 --- a/lalinference/conda/install-python.sh +++ b/lalinference/conda/install-python.sh @@ -52,6 +52,11 @@ sed -i.tmp '/^dependency_libs/d' lib/lib${PKG_NAME##*-}.la make -j ${CPU_COUNT} V=1 VERBOSE=1 -C swig LIBS="" make -j ${CPU_COUNT} V=1 VERBOSE=1 -C python LIBS="" +# test +if [[ "${build_platform}" == "${target_platform}" ]]; then + make -j ${CPU_COUNT} V=1 VERBOSE=1 check -C swig +fi + # install make -j ${CPU_COUNT} V=1 VERBOSE=1 -C swig install-exec # swig bindings make -j ${CPU_COUNT} V=1 VERBOSE=1 -C python install # pure-python extras diff --git a/lalinference/conda/meta.yaml.in.in b/lalinference/conda/meta.yaml.in.in index 7b7ceb3187..4da9698a53 100644 --- a/lalinference/conda/meta.yaml.in.in +++ b/lalinference/conda/meta.yaml.in.in @@ -169,6 +169,12 @@ outputs: host: - {{ pin_subpackage('liblalinference', exact=True) }} - python + - python-lal >={{ lal_version }} + - python-lalmetaio >={{ lalmetaio_version }} + - python-lalsimulation >={{ lalsimulation_version }} + - python-lalburst >={{ lalburst_version }} + - python-lalinspiral >={{ lalinspiral_version }} + - python-ligo-lw >={{ python_ligo_lw_version }} - numpy # extras to assist the solver, but not actually used - openssl diff --git a/lalinspiral/conda/install-python.sh b/lalinspiral/conda/install-python.sh index b1b2825e71..07960c418e 100644 --- a/lalinspiral/conda/install-python.sh +++ b/lalinspiral/conda/install-python.sh @@ -52,6 +52,11 @@ sed -i.tmp '/^dependency_libs/d' lib/lib${PKG_NAME##*-}.la make -j ${CPU_COUNT} V=1 VERBOSE=1 -C swig LIBS="" make -j ${CPU_COUNT} V=1 VERBOSE=1 -C python LIBS="" +# test +if [[ "${build_platform}" == "${target_platform}" ]]; then + make -j ${CPU_COUNT} V=1 VERBOSE=1 check -C swig +fi + # install make -j ${CPU_COUNT} V=1 VERBOSE=1 -C swig install-exec # swig bindings make -j ${CPU_COUNT} V=1 VERBOSE=1 -C python install # pure-python extras diff --git a/lalinspiral/conda/meta.yaml.in.in b/lalinspiral/conda/meta.yaml.in.in index c89c00391d..8a7a5e8701 100644 --- a/lalinspiral/conda/meta.yaml.in.in +++ b/lalinspiral/conda/meta.yaml.in.in @@ -142,6 +142,11 @@ outputs: - {{ pin_subpackage('liblalinspiral', exact=True) }} - numpy - python + - python-lal >={{ lal_version }} + - python-lalburst >={{ lalburst_version }} + - python-lalframe >={{ lalframe_version }} + - python-lalmetaio >={{ lalmetaio_version }} + - python-lalsimulation >={{ lalsimulation_version }} # extras to assist the solver, but not actually used - openssl run: diff --git a/lalmetaio/conda/install-python.sh b/lalmetaio/conda/install-python.sh index b58b3db941..daf791b9dc 100644 --- a/lalmetaio/conda/install-python.sh +++ b/lalmetaio/conda/install-python.sh @@ -49,6 +49,11 @@ sed -i.tmp '/^dependency_libs/d' lib/lib${PKG_NAME##*-}.la make -j ${CPU_COUNT} V=1 VERBOSE=1 -C swig LIBS="" make -j ${CPU_COUNT} V=1 VERBOSE=1 -C python LIBS="" +# test +if [[ "${build_platform}" == "${target_platform}" ]]; then + make -j ${CPU_COUNT} V=1 VERBOSE=1 check -C swig +fi + # install make -j ${CPU_COUNT} V=1 VERBOSE=1 -C swig install-exec # swig bindings make -j ${CPU_COUNT} V=1 VERBOSE=1 -C python install # pure-python extras diff --git a/lalmetaio/conda/meta.yaml.in.in b/lalmetaio/conda/meta.yaml.in.in index bc24ac8e37..7904bf634b 100644 --- a/lalmetaio/conda/meta.yaml.in.in +++ b/lalmetaio/conda/meta.yaml.in.in @@ -121,6 +121,7 @@ outputs: - {{ pin_subpackage('liblalmetaio', exact=True) }} - numpy - python + - python-lal >={{ lal_version }} # extras to assist the solver, but not actually used - openssl run: diff --git a/lalpulsar/conda/install-python.sh b/lalpulsar/conda/install-python.sh index 1ca98af67b..08ea4da293 100644 --- a/lalpulsar/conda/install-python.sh +++ b/lalpulsar/conda/install-python.sh @@ -53,6 +53,11 @@ sed -i.tmp '/^dependency_libs/d' lib/lib${PKG_NAME##*-}.la make -j ${CPU_COUNT} V=1 VERBOSE=1 -C swig LIBS="" make -j ${CPU_COUNT} V=1 VERBOSE=1 -C python LIBS="" +# test +if [[ "${build_platform}" == "${target_platform}" ]]; then + make -j ${CPU_COUNT} V=1 VERBOSE=1 check -C swig +fi + # install make -j ${CPU_COUNT} V=1 VERBOSE=1 -C swig install-exec # swig bindings make -j ${CPU_COUNT} V=1 VERBOSE=1 -C python install # pure-python extras diff --git a/lalpulsar/conda/meta.yaml.in.in b/lalpulsar/conda/meta.yaml.in.in index 7e1ed77282..c99a165e96 100644 --- a/lalpulsar/conda/meta.yaml.in.in +++ b/lalpulsar/conda/meta.yaml.in.in @@ -153,6 +153,7 @@ outputs: error_overdepending: true error_overlinking: true ignore_run_exports: + - cfitsio - numpy - openssl - python @@ -175,7 +176,12 @@ outputs: - {{ pin_subpackage('liblalpulsar', exact=True) }} - numpy - python + - python-lal >={{ lal_version }} + - python-lalframe >={{ lalframe_version }} + - python-lalsimulation >={{ lalsimulation_version }} + - python-lalinference >={{ lalinference_version }} # extras to assist the solver, but not actually used + - cfitsio - openssl run: - astropy diff --git a/lalsimulation/conda/install-python.sh b/lalsimulation/conda/install-python.sh index b1b2825e71..07960c418e 100644 --- a/lalsimulation/conda/install-python.sh +++ b/lalsimulation/conda/install-python.sh @@ -52,6 +52,11 @@ sed -i.tmp '/^dependency_libs/d' lib/lib${PKG_NAME##*-}.la make -j ${CPU_COUNT} V=1 VERBOSE=1 -C swig LIBS="" make -j ${CPU_COUNT} V=1 VERBOSE=1 -C python LIBS="" +# test +if [[ "${build_platform}" == "${target_platform}" ]]; then + make -j ${CPU_COUNT} V=1 VERBOSE=1 check -C swig +fi + # install make -j ${CPU_COUNT} V=1 VERBOSE=1 -C swig install-exec # swig bindings make -j ${CPU_COUNT} V=1 VERBOSE=1 -C python install # pure-python extras diff --git a/lalsimulation/conda/meta.yaml.in.in b/lalsimulation/conda/meta.yaml.in.in index 46adb372a2..a8ecae7ed6 100644 --- a/lalsimulation/conda/meta.yaml.in.in +++ b/lalsimulation/conda/meta.yaml.in.in @@ -155,6 +155,7 @@ outputs: - {{ pin_subpackage('liblalsimulation', exact=True) }} - numpy - python + - python-lal >={{ lal_version }} # extras to assist the solver, but not actually used - openssl run: -- GitLab