ASCEE/lasp
ASCEE/lasp
5
1
Fork 0
Code Issues 5 Pull Requests Actions Releases 14 Activity

Destroythreadpool waits forever. Try with ucrt64
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
Anne de Jong 2023-05-12 08:27:35 -07:00
parent 93619a344c
commit 34729cf9c0
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
scripts/configure_cmake_msys2.sh
View File

@ -1,10 +1,11 @@
#!/bin/bash #!/bin/bash
# #
cmake . -G"Ninja" -DLASP_HAS_ULDAQ=OFF -DPython3_ROOT_DIR=C:\\winpython\\python-3.10.9.amd64 cmake . -G"Ninja" -DLASP_HAS_ULDAQ=OFF -DPython3_ROOT_DIR=C:\Users\User\AppData\Local\Programs\Python\Python310
arch=urcr64
#arch=mingw64
files_to_cpy="libfftw3-3.dll libgcc_s_seh-1.dll libgfortran-5.dll libgomp-1.dll libopenblas.dll libquadmath-0.dll libstdc++-6.dll libwinpthread-1.dll" files_to_cpy="libfftw3-3.dll libgcc_s_seh-1.dll libgfortran-5.dll libgomp-1.dll libopenblas.dll libquadmath-0.dll libstdc++-6.dll libwinpthread-1.dll"
for fn in ${files_to_cpy}; do for fn in ${files_to_cpy}; do
cp /c/msys64/mingw64/bin/${fn} src/lasp cp /c/msys64/${arch}/bin/${fn} src/lasp
done done

4
scripts/install_msys2_builddeps.sh
View File

@ -5,8 +5,8 @@
if [ -z $CI ]; then if [ -z $CI ]; then
PACMAN_OPTIONS="--needed --noconfirm" PACMAN_OPTIONS="--needed --noconfirm"
fi fi
arch=mingw-w64-x86_64 # arch=mingw-w64-x86_64
arch=mingw-w64-ucrt-x86_64
pacman -S ${PACMAN_OPTIONS} make pacman -S ${PACMAN_OPTIONS} make

2
src/lasp/pybind11/lasp_streammgr.cpp
View File

@ -23,7 +23,7 @@ void init_streammgr(py::module &m) {
smgr.def("stopStream", &StreamMgr::stopStream); smgr.def("stopStream", &StreamMgr::stopStream);
smgr.def_static("getInstance", []() { smgr.def_static("getInstance", []() {
return std::unique_ptr<StreamMgr, py::nodelete>(&StreamMgr::getInstance()); return std::unique_ptr<StreamMgr, py::nodelete>(&StreamMgr::getInstance());
}); }, py::return_value_policy::reference_internal);
smgr.def("stopAllStreams", &StreamMgr::stopAllStreams); smgr.def("stopAllStreams", &StreamMgr::stopAllStreams);
smgr.def("setSiggen", &StreamMgr::setSiggen); smgr.def("setSiggen", &StreamMgr::setSiggen);

2
third_party/uldaq vendored

@ -1 +1 @@
Subproject commit 6e5940eae0d44df49ff64fc7dedd49f86db56cd0 Subproject commit 1d8404159c0fb6d2665461b80acca5bbef5c610a