mirror of
https://github.com/slsdetectorgroup/slsDetectorPackage.git
synced 2025-06-11 04:17:15 +02:00
Dhanya Thattil
c10bc5e530
Some checks failed
Native CMake Build / Configure and build using cmake (push) Failing after 3s
* Python module is now built using scikit-build-core: Dev/scikitbuild #1164 * slsdet is available on PyPI from this release onwards * Fixed broken import in typecaster.h #1181 * Dev/automate version number #1193 * Dev/automate version part2 #1209 * 9111: added expat to host section to fix conda #1216 * fix for gotthard.py to import slsdet properly * added slsFramesynchronizer to conda copy_lib.sh * version of release * update version of client * removed cmake <=3.28 that was added in 9.1.11 (main_library in meta.yaml in conda-recipes) * added slsFrameSynchronizer binary to conda * added numpy dependency to toml * added documentation for pip in installation Detailed Commits: * skeleton pyproject.toml * moved compiled extension into slsdet * WIP * WI{ * separated the recipes * restored comments, cleanup * cleaned meta yaml * added back some python versions * conda build of main library * fixed typo * removed conda build pin * added zlib * added workflow for python lib * patching libzmq and cleaned up cmake * removed compiler version * switched patch tool * reverted to scikit-build in pyproject.toml * added sls_detector bin * added sync, renamed action * update cmake<=3.28 in conda build requirements * Fixed broken import in typecaster.h (#1181) - Fixed the broken import _slsdet --> slsdet._slsdet caused by a previous upgrade - added tests that exercises the conversion from python to C++ and from C++ to python - Python unit tests now run in CI (!) * removed 3.28 restriction on cmake in meta.yaml * from #1216 to 9.1.1.rc that got lost in merge from develoepr, added expat to host section to fix conda build * back with the cmake restriction * fixing gotthard1 import * version number automated for python build * mistakenly set version back to 0.0.0 * updated github workflow scripts to support automatic version numbering with environment variable * managed to load VERSION file in yaml file - simplifies things * saving changes in git workflow failed * got typo in github workflow * updatet regex pattern to support postfix * normalized version to PEP 440 specification in update_version.py * bug did not support version 0.0.0 * added regex pattern matching to version in toml file * version now supports . before postfix * updates api version based on version file & converted shell script files to python * updated all makefiles * adresses review comments * updated release version and the api lib version * raise an exception if the pull socket python script had errors at startup (for eg if pyzmq was not installed) * cmake<=3.28 not required anymore * updated documentation for pip installation as well * 920/add numpy (#1226) * added numpy dependency * aded build specifications for python version and platform * release notes --------- Co-authored-by: froejdh_e <erik.frojdh@psi.ch> Co-authored-by: Fröjd Lars Erik <froejdh_e@pcmoench03.psi.ch> Co-authored-by: Erik Fröjdh <erik.frojdh@gmail.com> Co-authored-by: mazzol_a <mazzol_a@pc17378.psi.ch> Co-authored-by: AliceMazzoleni99 <alice.mazzoleni@psi.ch>
93 lines
2.0 KiB
CMake
Executable File
93 lines
2.0 KiB
CMake
Executable File
# SPDX-License-Identifier: LGPL-3.0-or-other
|
|
# Copyright (C) 2021 Contributors to the SLS Detector Package
|
|
|
|
pybind11_add_module(_slsdet
|
|
src/main.cpp
|
|
src/enums.cpp
|
|
src/detector.cpp
|
|
src/network.cpp
|
|
src/pattern.cpp
|
|
src/scan.cpp
|
|
src/current.cpp
|
|
src/duration.cpp
|
|
src/DurationWrapper.cpp
|
|
src/pedestal.cpp
|
|
)
|
|
|
|
target_link_libraries(_slsdet PUBLIC
|
|
slsDetectorStatic
|
|
)
|
|
|
|
|
|
set_target_properties(_slsdet PROPERTIES
|
|
LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin/slsdet
|
|
)
|
|
|
|
#Copy Python code
|
|
set( PYTHON_FILES
|
|
slsdet/__init__.py
|
|
slsdet/adcs.py
|
|
slsdet/dacs.py
|
|
slsdet/powers.py
|
|
slsdet/decorators.py
|
|
slsdet/detector_property.py
|
|
slsdet/detector.py
|
|
slsdet/defines.py
|
|
slsdet/eiger.py
|
|
slsdet/enums.py
|
|
slsdet/errors.py
|
|
slsdet/gaincaps.py
|
|
slsdet/gotthard.py
|
|
slsdet/pattern.py
|
|
slsdet/gotthard2.py
|
|
slsdet/moench.py
|
|
slsdet/proxy.py
|
|
slsdet/ctb.py
|
|
slsdet/jungfrau.py
|
|
slsdet/mythen3.py
|
|
slsdet/registers.py
|
|
slsdet/temperature.py
|
|
slsdet/lookup.py
|
|
slsdet/utils.py
|
|
)
|
|
|
|
foreach(FILE ${PYTHON_FILES})
|
|
configure_file( ${FILE}
|
|
${CMAKE_BINARY_DIR}/bin/${FILE} )
|
|
|
|
endforeach(FILE ${PYTHON_FILES})
|
|
|
|
configure_file( scripts/basic.py
|
|
${CMAKE_BINARY_DIR}/basic.py
|
|
)
|
|
configure_file( scripts/test_virtual.py
|
|
${CMAKE_BINARY_DIR}/test_virtual.py
|
|
)
|
|
|
|
configure_file(scripts/frameSynchronizerPullSocket.py
|
|
${CMAKE_BINARY_DIR}/bin/frameSynchronizerPullSocket.py COPYONLY)
|
|
|
|
|
|
configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/../VERSION
|
|
${CMAKE_BINARY_DIR}/bin/slsdet/VERSION
|
|
)
|
|
|
|
if(SLS_INSTALL_PYTHONEXT)
|
|
install(TARGETS _slsdet
|
|
EXPORT "${TARGETS_EXPORT_NAME}"
|
|
LIBRARY DESTINATION slsdet
|
|
COMPONENT python
|
|
)
|
|
install(
|
|
FILES ${PYTHON_FILES}
|
|
DESTINATION slsdet
|
|
COMPONENT python
|
|
)
|
|
install(
|
|
FILES ../VERSION
|
|
DESTINATION slsdet
|
|
COMPONENT python
|
|
)
|
|
|
|
endif()
|