diff --git a/conda/install-bin.sh b/conda/install-bin.sh index 147ad8e4d2568f64952a8b5eb8c1268e6dbf9d3e..875950de7a65cae785139d2c45f9b7a3d5baefca 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/install-python.sh b/lal/conda/install-python.sh index 07c5b6eadd7dee2a018b3ff075e89dbd379a1fa8..dd205e884cdaaa13aa1048b61f07e247bf5a781f 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 6041036adc45cce830b8c4d7f870ea20a30627c4..05d9637e628fd9915083453b64e121da1c112288 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 @@ -177,6 +178,7 @@ outputs: error_overlinking: true ignore_run_exports: - openssl + - numpy - python string: {{ fft_impl }}_py{{ py }}h{{ PKG_HASH }}_{{ PKG_BUILDNUM }} requirements: @@ -190,6 +192,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 +201,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: diff --git a/lalburst/conda/install-python.sh b/lalburst/conda/install-python.sh index b1b2825e712eb25b572ec355e6ae8c3025d7d4b9..07960c418ebeafaa681715921324a30713242390 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 b58b3db9411221f34c457d18329c9e8315e41ea7..daf791b9dcab2d26ffa5eacad7057307898ea427 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 dc699b0e5e150b4d36a64839a9d883ac3ecd4f06..02a25b318a15cf4292af2aec85cf379fa35bca19 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-bin.sh b/lalinference/conda/install-bin.sh index a33d98ca751f916086273f6728fb992259a82b9b..a5cc14256c8374503e4b2597cea87d0998e9b435 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 diff --git a/lalinference/conda/install-python.sh b/lalinference/conda/install-python.sh index b1b2825e712eb25b572ec355e6ae8c3025d7d4b9..07960c418ebeafaa681715921324a30713242390 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 9f3de902b686dacbd435dc9cfa8621587f9d4df3..4da9698a532e818a2509785b17f7d0badf9e4178 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 @@ -229,6 +235,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 }} diff --git a/lalinspiral/conda/install-python.sh b/lalinspiral/conda/install-python.sh index b1b2825e712eb25b572ec355e6ae8c3025d7d4b9..07960c418ebeafaa681715921324a30713242390 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 c89c00391d8d847fce7d41246008fd27d213d8e8..8a7a5e8701f7f4a36f2e9ae973d1f2b74ff0238e 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 b58b3db9411221f34c457d18329c9e8315e41ea7..daf791b9dcab2d26ffa5eacad7057307898ea427 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 bc24ac8e3793379d5e00371175a903da61b60784..7904bf634baeaaac6349983188eccf2878e1dcdd 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-bin.sh b/lalpulsar/conda/install-bin.sh deleted file mode 100644 index 875950de7a65cae785139d2c45f9b7a3d5baefca..0000000000000000000000000000000000000000 --- 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 0000000000000000000000000000000000000000..8809a31bbc8e41ef84efc42b49b2332ad35cd4ca --- /dev/null +++ b/lalpulsar/conda/install-bin.sh @@ -0,0 +1 @@ +../../conda/install-bin.sh \ No newline at end of file diff --git a/lalpulsar/conda/install-python.sh b/lalpulsar/conda/install-python.sh index 1ca98af67b649b1bbb108a77d7daf63e877f3319..08ea4da29376006bf7ca056284621a5599c00042 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 7e1ed77282f6c68dbbc1c5d1496254ea3ad5dc4a..c99a165e965b20cd94d5bdcf3745ca605f729d21 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 b1b2825e712eb25b572ec355e6ae8c3025d7d4b9..07960c418ebeafaa681715921324a30713242390 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 46adb372a29337ccf01fb3661b66c3509ea2e18f..a8ecae7ed649ed6f1e241e59930c8ad839a9a757 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: