detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-28 09:10:01 +02:00
Code Issues Actions Packages Releases Activity

WI{

Browse Source
This commit is contained in:
Fröjd Lars Erik 2025-03-19 16:37:37 +01:00
parent d9a50ad9f4
commit 2f390971e6
5 changed files with 199 additions and 182 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
CMakeLists.txt
View File

@ -13,6 +13,8 @@ set(PROJECT_VERSION ${PROJECT_VERSION_STRING})
add_compile_definitions(SLS_DET_VERSION="${PROJECT_VERSION}") add_compile_definitions(SLS_DET_VERSION="${PROJECT_VERSION}")
set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG") set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG")
set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
cmake_policy(SET CMP0074 NEW) cmake_policy(SET CMP0074 NEW)
@ -58,6 +60,11 @@ set(ENABLE_CPACK OFF CACHE BOOL "")
set(ENABLE_CLANG OFF CACHE BOOL "") set(ENABLE_CLANG OFF CACHE BOOL "")
set(ENABLE_CURVE OFF CACHE BOOL "") set(ENABLE_CURVE OFF CACHE BOOL "")
set(ENABLE_DRAFTS OFF CACHE BOOL "") set(ENABLE_DRAFTS OFF CACHE BOOL "")
set(ENABLE_PRECOMPILED OFF CACHE BOOL "")
set(WITH_DOC OFF CACHE BOOL "")
set(WITH_DOCS OFF CACHE BOOL "")
# Using GetProperties and Populate to be able to exclude zmq # Using GetProperties and Populate to be able to exclude zmq
# from install (not possible with FetchContent_MakeAvailable(libzmq)) # from install (not possible with FetchContent_MakeAvailable(libzmq))
@ -195,7 +202,7 @@ endif()
# to control options for the libraries # to control options for the libraries
if(NOT TARGET slsProjectOptions) if(NOT TARGET slsProjectOptions)
add_library(slsProjectOptions INTERFACE) add_library(slsProjectOptions INTERFACE)
target_compile_features(slsProjectOptions INTERFACE cxx_std_11) # target_compile_features(slsProjectOptions INTERFACE cxx_std_11)
endif() endif()
if (NOT TARGET slsProjectWarnings) if (NOT TARGET slsProjectWarnings)

5
conda-recipe/build.sh
View File

@ -8,12 +8,12 @@ if [ ! -d "install" ]; then
mkdir install mkdir install
fi fi
cd build cd build
cmake .. \ cmake .. -G Ninja \
-DCMAKE_PREFIX_PATH=$CONDA_PREFIX \ -DCMAKE_PREFIX_PATH=$CONDA_PREFIX \
-DCMAKE_INSTALL_PREFIX=install \ -DCMAKE_INSTALL_PREFIX=install \
-DSLS_USE_TEXTCLIENT=ON \ -DSLS_USE_TEXTCLIENT=ON \
-DSLS_USE_RECEIVER=ON \ -DSLS_USE_RECEIVER=ON \
-DSLS_USE_GUI=ON \ -DSLS_USE_GUI=OFF \
-DSLS_USE_MOENCH=ON\ -DSLS_USE_MOENCH=ON\
-DSLS_USE_TESTS=ON \ -DSLS_USE_TESTS=ON \
-DSLS_USE_PYTHON=OFF \ -DSLS_USE_PYTHON=OFF \
@ -25,4 +25,5 @@ echo "Building using: ${NCORES} cores"
cmake --build . -- -j${NCORES} cmake --build . -- -j${NCORES}
cmake --build . --target install cmake --build . --target install
export SLSDETNAME=automated_tests
CTEST_OUTPUT_ON_FAILURE=1 ctest -j 1 CTEST_OUTPUT_ON_FAILURE=1 ctest -j 1

8
conda-recipe/conda_build_config.yaml
View File

@ -6,3 +6,11 @@ python:
# - 3.12 # - 3.12
- 3.13 - 3.13
c_compiler_version: # [unix]
- 11 # [linux]
cxx_compiler_version:
- 11 # [linux]
c_stdlib_version: # [linux]
- 2.17 # [linux]

123
conda-recipe/meta.yaml
View File

@ -15,8 +15,9 @@ build:
requirements: requirements:
build: build:
- {{ compiler('c') }} - {{ compiler('c') }}
- {{compiler('cxx')}} - {{ compiler('cxx') }}
- cmake - cmake
- ninja
- qt 5.* - qt 5.*
- xorg-libx11 - xorg-libx11
- xorg-libice - xorg-libice
@ -34,8 +35,8 @@ requirements:
- expat - expat
host: host:
- libstdcxx-ng # - libstdcxx-ng
- libgcc-ng # - libgcc-ng
- xorg-libx11 - xorg-libx11
- xorg-libice - xorg-libice
- xorg-libxext - xorg-libxext
@ -44,10 +45,12 @@ requirements:
- xorg-libxrender - xorg-libxrender
- xorg-libxfixes - xorg-libxfixes
- expat - expat
- libtiff
- libpng
run: run:
- libstdcxx-ng # - libstdcxx-ng
- libgcc-ng # - libgcc-ng
outputs: outputs:
@ -58,70 +61,68 @@ outputs:
build: build:
- {{ compiler('c') }} - {{ compiler('c') }}
- {{compiler('cxx')}} - {{compiler('cxx')}}
- libstdcxx-ng # - libstdcxx-ng
- libgcc-ng # - libgcc-ng
run: run:
- libstdcxx-ng # - libstdcxx-ng
- libgcc-ng # - libgcc-ng
- name: slsdet # - name: slsdet
script: # script: build_pylib.sh
- unset CMAKE_GENERATOR && {{ PYTHON }} -m pip install . -vv # [not win]
requirements: # requirements:
build: # build:
- python {{python}} # - python
- {{ compiler('c') }} # - {{ compiler('c') }}
- {{compiler('cxx')}} # - {{compiler('cxx')}}
# - {{ pin_subpackage('slsdetlib', exact=True) }} #discuss keeping pinning for simplicity? # - {{ pin_subpackage('slsdetlib', exact=True) }}
- pybind11>=2.13 # - setuptools
# - pybind11=2.13
host: # host:
- cmake # - python
- ninja # - {{ pin_subpackage('slsdetlib', exact=True) }}
- python {{python}} # - setuptools
- pip # - pybind11=2.13
- setuptools
- pybind11>=2.13
- scikit-build-core
run: # run:
- libstdcxx-ng # - libstdcxx-ng
- libgcc-ng # - libgcc-ng
- python {{python}} # - python
# - numpy
# - {{ pin_subpackage('slsdetlib', exact=True) }}
# test:
# imports:
# - slsdet
test: # - name: slsdetgui
imports: # script: copy_gui.sh
- slsdet # requirements:
# build:
# - {{ compiler('c') }}
# - {{compiler('cxx')}}
# - {{ pin_subpackage('slsdetlib', exact=True) }}
# run:
# - {{ pin_subpackage('slsdetlib', exact=True) }}
# - qt 5.*
# - expat
# - name: moenchzmq
# script: copy_moench.sh
# requirements:
# build:
# - {{ compiler('c') }}
# - {{compiler('cxx')}}
# - {{ pin_subpackage('slsdetlib', exact=True) }}
- name: slsdetgui # run:
script: copy_gui.sh # - {{ pin_subpackage('slsdetlib', exact=True) }}
requirements: # - expat
build:
- {{ compiler('c') }}
- {{compiler('cxx')}}
- {{ pin_subpackage('slsdetlib', exact=True) }}
run:
- {{ pin_subpackage('slsdetlib', exact=True) }}
- qt 5.*
- expat
- name: moenchzmq
script: copy_moench.sh
requirements:
build:
- {{ compiler('c') }}
- {{compiler('cxx')}}
- {{ pin_subpackage('slsdetlib', exact=True) }}
run:
- {{ pin_subpackage('slsdetlib', exact=True) }}
- expat

236
slsDetectorSoftware/tests/test-SharedMemory.cpp
View File

@ -17,155 +17,155 @@ struct Data {
constexpr int shm_id = 10; constexpr int shm_id = 10;
TEST_CASE("Create SharedMemory read and write", "[detector]") { // TEST_CASE("Create SharedMemory read and write", "[detector]") {
SharedMemory<Data> shm(shm_id, -1); // SharedMemory<Data> shm(shm_id, -1);
shm.createSharedMemory(); // shm.createSharedMemory();
CHECK(shm.getName() == std::string("/slsDetectorPackage_detector_") + // CHECK(shm.getName() == std::string("/slsDetectorPackage_detector_") +
std::to_string(shm_id)); // std::to_string(shm_id));
shm()->x = 3; // shm()->x = 3;
shm()->y = 5.7; // shm()->y = 5.7;
strcpy_safe(shm()->mess, "Some string"); // strcpy_safe(shm()->mess, "Some string");
CHECK(shm()->x == 3); // CHECK(shm()->x == 3);
CHECK(shm()->y == 5.7); // CHECK(shm()->y == 5.7);
CHECK(std::string(shm()->mess) == "Some string"); // CHECK(std::string(shm()->mess) == "Some string");
shm.unmapSharedMemory(); // shm.unmapSharedMemory();
shm.removeSharedMemory(); // shm.removeSharedMemory();
CHECK(shm.exists() == false); // CHECK(shm.exists() == false);
} // }
TEST_CASE("Open existing SharedMemory and read", "[detector]") { // TEST_CASE("Open existing SharedMemory and read", "[detector]") {
{ // {
SharedMemory<double> shm(shm_id, -1); // SharedMemory<double> shm(shm_id, -1);
shm.createSharedMemory(); // shm.createSharedMemory();
*shm() = 5.3; // *shm() = 5.3;
} // }
SharedMemory<double> shm2(shm_id, -1); // SharedMemory<double> shm2(shm_id, -1);
shm2.openSharedMemory(true); // shm2.openSharedMemory(true);
CHECK(*shm2() == 5.3); // CHECK(*shm2() == 5.3);
shm2.removeSharedMemory(); // shm2.removeSharedMemory();
} // }
TEST_CASE("Creating a second shared memory with the same name throws", // TEST_CASE("Creating a second shared memory with the same name throws",
"[detector]") { // "[detector]") {
SharedMemory<double> shm0(shm_id, -1); // SharedMemory<double> shm0(shm_id, -1);
SharedMemory<double> shm1(shm_id, -1); // SharedMemory<double> shm1(shm_id, -1);
shm0.createSharedMemory(); // shm0.createSharedMemory();
CHECK_THROWS(shm1.createSharedMemory()); // CHECK_THROWS(shm1.createSharedMemory());
shm0.removeSharedMemory(); // shm0.removeSharedMemory();
} // }
TEST_CASE("Open two shared memories to the same place", "[detector]") { // TEST_CASE("Open two shared memories to the same place", "[detector]") {
// Create the first shared memory // // Create the first shared memory
SharedMemory<Data> shm(shm_id, -1); // SharedMemory<Data> shm(shm_id, -1);
shm.createSharedMemory(); // shm.createSharedMemory();
shm()->x = 5; // shm()->x = 5;
CHECK(shm()->x == 5); // CHECK(shm()->x == 5);
// Open the second shared memory with the same name // // Open the second shared memory with the same name
SharedMemory<Data> shm2(shm_id, -1); // SharedMemory<Data> shm2(shm_id, -1);
shm2.openSharedMemory(true); // shm2.openSharedMemory(true);
CHECK(shm2()->x == 5); // CHECK(shm2()->x == 5);
CHECK(shm.getName() == shm2.getName()); // CHECK(shm.getName() == shm2.getName());
// Check that they still point to the same place // // Check that they still point to the same place
shm2()->x = 7; // shm2()->x = 7;
CHECK(shm()->x == 7); // CHECK(shm()->x == 7);
// Remove only needs to be done once since they refer // // Remove only needs to be done once since they refer
// to the same memory // // to the same memory
shm2.removeSharedMemory(); // shm2.removeSharedMemory();
CHECK(shm.exists() == false); // CHECK(shm.exists() == false);
CHECK(shm2.exists() == false); // CHECK(shm2.exists() == false);
} // }
TEST_CASE("Move SharedMemory", "[detector]") { // TEST_CASE("Move SharedMemory", "[detector]") {
SharedMemory<Data> shm(shm_id, -1); // SharedMemory<Data> shm(shm_id, -1);
CHECK(shm.getName() == std::string("/slsDetectorPackage_detector_") + // CHECK(shm.getName() == std::string("/slsDetectorPackage_detector_") +
std::to_string(shm_id)); // std::to_string(shm_id));
shm.createSharedMemory(); // shm.createSharedMemory();
shm()->x = 9; // shm()->x = 9;
SharedMemory<Data> shm2(shm_id + 1, -1); // SharedMemory<Data> shm2(shm_id + 1, -1);
shm2 = std::move(shm); // shm is now a moved from object! // shm2 = std::move(shm); // shm is now a moved from object!
CHECK(shm2()->x == 9); // CHECK(shm2()->x == 9);
REQUIRE_THROWS( // REQUIRE_THROWS(
shm()); // trying to access should throw instead of returning a nullptr // shm()); // trying to access should throw instead of returning a nullptr
CHECK(shm2.getName() == std::string("/slsDetectorPackage_detector_") + // CHECK(shm2.getName() == std::string("/slsDetectorPackage_detector_") +
std::to_string(shm_id)); // std::to_string(shm_id));
shm2.removeSharedMemory(); // shm2.removeSharedMemory();
} // }
TEST_CASE("Create several shared memories", "[detector]") { // TEST_CASE("Create several shared memories", "[detector]") {
constexpr int N = 5; // constexpr int N = 5;
std::vector<SharedMemory<int>> v; // std::vector<SharedMemory<int>> v;
v.reserve(N); // v.reserve(N);
for (int i = 0; i != N; ++i) { // for (int i = 0; i != N; ++i) {
v.emplace_back(shm_id + i, -1); // v.emplace_back(shm_id + i, -1);
CHECK(v[i].exists() == false); // CHECK(v[i].exists() == false);
v[i].createSharedMemory(); // v[i].createSharedMemory();
*v[i]() = i; // *v[i]() = i;
CHECK(*v[i]() == i); // CHECK(*v[i]() == i);
} // }
for (int i = 0; i != N; ++i) { // for (int i = 0; i != N; ++i) {
CHECK(*v[i]() == i); // CHECK(*v[i]() == i);
CHECK(v[i].getName() == std::string("/slsDetectorPackage_detector_") + // CHECK(v[i].getName() == std::string("/slsDetectorPackage_detector_") +
std::to_string(i + shm_id)); // std::to_string(i + shm_id));
} // }
for (int i = 0; i != N; ++i) { // for (int i = 0; i != N; ++i) {
v[i].removeSharedMemory(); // v[i].removeSharedMemory();
CHECK(v[i].exists() == false); // CHECK(v[i].exists() == false);
} // }
} // }
TEST_CASE("Create create a shared memory with a tag") { // TEST_CASE("Create create a shared memory with a tag") {
SharedMemory<int> shm(0, -1, "ctbdacs"); // SharedMemory<int> shm(0, -1, "ctbdacs");
REQUIRE(shm.getName() == "/slsDetectorPackage_detector_0_ctbdacs"); // REQUIRE(shm.getName() == "/slsDetectorPackage_detector_0_ctbdacs");
} // }
TEST_CASE("Create create a shared memory with a tag when SLSDETNAME is set") { // TEST_CASE("Create create a shared memory with a tag when SLSDETNAME is set") {
// if SLSDETNAME is already set we unset it but // // if SLSDETNAME is already set we unset it but
// save the value // // save the value
std::string old_slsdetname; // std::string old_slsdetname;
if (getenv(SHM_ENV_NAME)) // if (getenv(SHM_ENV_NAME))
old_slsdetname = getenv(SHM_ENV_NAME); // old_slsdetname = getenv(SHM_ENV_NAME);
unsetenv(SHM_ENV_NAME); // unsetenv(SHM_ENV_NAME);
setenv(SHM_ENV_NAME, "myprefix", 1); // setenv(SHM_ENV_NAME, "myprefix", 1);
SharedMemory<int> shm(0, -1, "ctbdacs"); // SharedMemory<int> shm(0, -1, "ctbdacs");
REQUIRE(shm.getName() == "/slsDetectorPackage_detector_0_myprefix_ctbdacs"); // REQUIRE(shm.getName() == "/slsDetectorPackage_detector_0_myprefix_ctbdacs");
// Clean up after us // // Clean up after us
if (old_slsdetname.empty()) // if (old_slsdetname.empty())
unsetenv(SHM_ENV_NAME); // unsetenv(SHM_ENV_NAME);
else // else
setenv(SHM_ENV_NAME, old_slsdetname.c_str(), 1); // setenv(SHM_ENV_NAME, old_slsdetname.c_str(), 1);
} // }
TEST_CASE("map int64 to int32 throws") { // TEST_CASE("map int64 to int32 throws") {
SharedMemory<int32_t> shm(shm_id, -1); // SharedMemory<int32_t> shm(shm_id, -1);
shm.createSharedMemory(); // shm.createSharedMemory();
*shm() = 7; // *shm() = 7;
SharedMemory<int64_t> shm2(shm_id, -1); // SharedMemory<int64_t> shm2(shm_id, -1);
REQUIRE_THROWS(shm2.openSharedMemory(true)); // REQUIRE_THROWS(shm2.openSharedMemory(true));
shm.removeSharedMemory(); // shm.removeSharedMemory();
} // }
} // namespace sls } // namespace sls