diff --git a/scripts/configure_cmake_msys2.sh b/scripts/configure_cmake_msys2.sh index 95649e7..4bbc051 100644 --- a/scripts/configure_cmake_msys2.sh +++ b/scripts/configure_cmake_msys2.sh @@ -1,10 +1,11 @@ #!/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" for fn in ${files_to_cpy}; do - cp /c/msys64/mingw64/bin/${fn} src/lasp + cp /c/msys64/${arch}/bin/${fn} src/lasp done diff --git a/scripts/install_msys2_builddeps.sh b/scripts/install_msys2_builddeps.sh index fb19aba..3bea6b7 100644 --- a/scripts/install_msys2_builddeps.sh +++ b/scripts/install_msys2_builddeps.sh @@ -5,8 +5,8 @@ if [ -z $CI ]; then PACMAN_OPTIONS="--needed --noconfirm" fi -arch=mingw-w64-x86_64 - +# arch=mingw-w64-x86_64 +arch=mingw-w64-ucrt-x86_64 pacman -S ${PACMAN_OPTIONS} make diff --git a/src/lasp/pybind11/lasp_streammgr.cpp b/src/lasp/pybind11/lasp_streammgr.cpp index 54addcc..6c62fe5 100644 --- a/src/lasp/pybind11/lasp_streammgr.cpp +++ b/src/lasp/pybind11/lasp_streammgr.cpp @@ -23,7 +23,7 @@ void init_streammgr(py::module &m) { smgr.def("stopStream", &StreamMgr::stopStream); smgr.def_static("getInstance", []() { return std::unique_ptr(&StreamMgr::getInstance()); - }); + }, py::return_value_policy::reference_internal); smgr.def("stopAllStreams", &StreamMgr::stopAllStreams); smgr.def("setSiggen", &StreamMgr::setSiggen); diff --git a/third_party/uldaq b/third_party/uldaq index 6e5940e..1d84041 160000 --- a/third_party/uldaq +++ b/third_party/uldaq @@ -1 +1 @@ -Subproject commit 6e5940eae0d44df49ff64fc7dedd49f86db56cd0 +Subproject commit 1d8404159c0fb6d2665461b80acca5bbef5c610a