Skip to content
Snippets Groups Projects
Commit 783aaddb authored by Wuttke, Joachim's avatar Wuttke, Joachim
Browse files

[i706] CMake + option HAVE_EXOTIC to test-cover examples that require exotic Py modules ()

Merging branch 'i706'  into 'main'.

See merge request !1880
parents f166ac3e 970f4d41
No related branches found
No related tags found
1 merge request!1880CMake + option HAVE_EXOTIC to test-cover examples that require exotic Py modules
Pipeline #109421 passed
......@@ -22,7 +22,7 @@ native_Debian_clang:
- env
- mkdir build
- cd build
- time cmake .. -GNinja -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DBA_PY_PACKAGE=ON -DCMAKE_PREFIX_PATH="$PYPLAT;$QTCMAKE" -DZERO_TOLERANCE=ON -DDEVELOPER_CHECKS=ON
- time cmake .. -GNinja -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DBA_PY_PACKAGE=ON -DCMAKE_PREFIX_PATH="$PYPLAT;$QTCMAKE" -DZERO_TOLERANCE=ON -DDEVELOPER_CHECKS=ON -DHAVE_EXOTIC=ON
- time ninja
- time xvfb-run -a ctest -j16 --output-on-failure
- time ninja package_source
......@@ -66,7 +66,7 @@ mac_x64:
- env
- mkdir build
- cd build
- cmake .. -DCMAKE_PREFIX_PATH="$OPTDIR;$PYPLAT;$QTDIR/lib/cmake" -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DBA_APPLE_BUNDLE=ON -DCMAKE_OSX_DEPLOYMENT_TARGET=11 -DCMAKE_INSTALL_PREFIX=/tmp/ba -DBA_PY_PACKAGE=ON
- cmake .. -DCMAKE_PREFIX_PATH="$OPTDIR;$PYPLAT;$QTDIR/lib/cmake" -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DBA_APPLE_BUNDLE=ON -DCMAKE_OSX_DEPLOYMENT_TARGET=11 -DCMAKE_INSTALL_PREFIX=/tmp/ba -DBA_PY_PACKAGE=ON -DHAVE_EXOTIC=ON
- make -j$NPROC
- ctest -j3 --output-on-failure
- zsh var/mk_pypack_macos.zsh
......@@ -131,7 +131,7 @@ windows:
- pwd
# configure, make, test, pack
- cmake --version
- cmake -G "Ninja" -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$OPT_DIR;$PY_PLATFORM_DIR;$QTCMake_DIR" -DCMAKE_INCLUDE_PATH="$BOOST_INCLUDE_DIR" -DCMAKE_LIBRARY_PATH="$BOOST_LIB_DIR" -DBA_PY_PACKAGE=ON -DCMAKE_C_COMPILER="cl.exe" -DCMAKE_CXX_COMPILER="cl.exe" -B. ..
- cmake -G "Ninja" -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$OPT_DIR;$PY_PLATFORM_DIR;$QTCMake_DIR" -DCMAKE_INCLUDE_PATH="$BOOST_INCLUDE_DIR" -DCMAKE_LIBRARY_PATH="$BOOST_LIB_DIR" -DBA_PY_PACKAGE=ON -DCMAKE_C_COMPILER="cl.exe" -DCMAKE_CXX_COMPILER="cl.exe" -DHAVE_EXOTIC=ON -B. ..
- pwd
- if($CI_PIPELINE_SOURCE -eq "schedule") { cmake --build . --target clean; echo "redundant target purge done" }
- cmake --build . -j20 --config Release
......
......@@ -36,6 +36,7 @@ option(BORNAGAIN_PYTHON "Build with Python support" ON)
option(BA_GUI "Build a graphical user interface" ON)
option(BA_TIFF_SUPPORT "Tiff files read/write support" ON)
option(BA_TESTS "Build tests" ON)
option(HAVE_EXOTIC "Build tests also for examples that require exotic Python modules" OFF)
# options that are off by default (switch on for additional functionality)
option(CONFIGURE_BINDINGS "Generate python bindings during build (requires swig)" OFF)
......@@ -126,7 +127,7 @@ if(BA_TESTS)
# => 'make check' is an alias for 'ctest'
add_custom_target(fullcheck COMMAND ${CMAKE_CTEST_COMMAND})
# => 'make check' is an alias for 'ctest'
endif()
endif()
### Operating system
......
......@@ -96,7 +96,9 @@ endfunction()
# Test collection
####################################################################################################
run_plotless(bayesian/likelihood_sampling)
if (HAVE_EXOTIC)
run_plotless(bayesian/likelihood_sampling)
endif()
test_example(ff/Bipyramid4 2e-10)
test_example(ff/Box 2e-10)
......
......@@ -24,7 +24,10 @@ message(STATUS "Searching required Python packages...")
set(py_packages "numpy;matplotlib")
if (BA_TESTS)
# Python packages needed for tests
list(APPEND py_packages "scipy;lmfit;emcee;tqdm;corner")
list(APPEND py_packages "scipy;lmfit")
if (HAVE_EXOTIC)
list(APPEND py_packages "emcee;tqdm;corner")
endif()
endif()
if (BA_PY_PACKAGE)
# Python pip is required for making the wheel
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment