From 087d52f0163a6f924a394727b94ba8330eeca7ea Mon Sep 17 00:00:00 2001 From: Zdenek <32390711+zdemat@users.noreply.github.com> Date: Sun, 31 Aug 2025 23:02:44 +0200 Subject: [PATCH 1/5] Update build.yml: libgsl-*.dll --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7142b24..fe98a18 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -68,7 +68,7 @@ jobs: copy %P%\Library\bin\mstruct.exe dist\mstruct copy %P%\Library\bin\mstruct_xml.exe dist\mstruct copy %P%\Library\bin\fftw3.dll dist\mstruct - copy %P%\Library\bin\gsl-25.dll dist\mstruct + copy %P%\Library\bin\gsl-*.dll dist\mstruct copy %P%\Library\bin\libcblas.dll dist\mstruct copy %P%\Library\bin\zlib.dll dist\mstruct copy %P%\Library\bin\boost_python311.dll dist\mstruct From ade9de9b1859163643604c03e669ed5fe53af83e Mon Sep 17 00:00:00 2001 From: Zdenek <32390711+zdemat@users.noreply.github.com> Date: Sun, 31 Aug 2025 23:24:33 +0200 Subject: [PATCH 2/5] Update build.yml: mkl_rt*.dll --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fe98a18..ca10347 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -73,6 +73,7 @@ jobs: copy %P%\Library\bin\zlib.dll dist\mstruct copy %P%\Library\bin\boost_python311.dll dist\mstruct copy %P%\Library\bin\boost_numpy311.dll dist\mstruct + copy %P%\Library\bin\mkl_rt*.dll dist\mstruct copy %P%\Library\bin\boost_program_options.dll dist\mstruct copy %P%\Library\bin\boost_date_time.dll dist\mstruct copy %P%\Library\bin\libMStruct.dll dist\mstruct\libMStruct.pyd From a82d0665bf49d5578bb29f150e22543c5633a5a2 Mon Sep 17 00:00:00 2001 From: Zdenek <32390711+zdemat@users.noreply.github.com> Date: Wed, 3 Sep 2025 16:58:32 +0200 Subject: [PATCH 3/5] Update build.yml: linux distribution --- .github/workflows/build.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ca10347..2da03ac 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -85,7 +85,7 @@ jobs: build-and-test-linux: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - name: Checkout repository @@ -126,6 +126,13 @@ jobs: cp $P/bin/mstruct_xml dist/mstruct cp $P/lib/libMStruct.so dist/mstruct cp $P/lib/libObjCryst.so dist/mstruct + cp $P/lib/libfftw3.so.3 dist/mstruct + cp $P/lib/libgsl.so.28 dist/mstruct + cp $P/lib/libcblas.so.3 dist/mstruct + cp $P/lib/libmkl_rt.so.2 dist/mstruct + cp $P/lib/libboost_python311.so.1.78.0 dist/mstruct + cp $P/lib/libboost_numpy311.so.1.78.0 dist/mstruct + cp $P/lib/libboost_program_options.so.1.78.0 dist/mstruct - name: Archive distribution uses: actions/upload-artifact@v4 with: From eae6ae2a716641c7940a71078bd37961c1709741 Mon Sep 17 00:00:00 2001 From: Zdenek <32390711+zdemat@users.noreply.github.com> Date: Sat, 6 Sep 2025 11:41:51 +0200 Subject: [PATCH 4/5] Update build.yml: adding mkl_intel_thread.dll --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2da03ac..4df5ee3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -77,6 +77,7 @@ jobs: copy %P%\Library\bin\boost_program_options.dll dist\mstruct copy %P%\Library\bin\boost_date_time.dll dist\mstruct copy %P%\Library\bin\libMStruct.dll dist\mstruct\libMStruct.pyd + copy %P%\Library\bin\mkl_intel_thread.2.dll dist\mstruct - name: Archive distribution uses: actions/upload-artifact@v4 with: From 5b799f56b33d0293b6a737752ee57bfa2dfd0f9f Mon Sep 17 00:00:00 2001 From: Zdenek <32390711+zdemat@users.noreply.github.com> Date: Sun, 7 Sep 2025 19:03:30 +0200 Subject: [PATCH 5/5] Update index.md: minor update (win) --- doc/source/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/source/index.md b/doc/source/index.md index 070208b..6a60246 100644 --- a/doc/source/index.md +++ b/doc/source/index.md @@ -117,7 +117,7 @@ For Windows **Python3 (x64) is strongly adviced!** # add 'conda-forge' channel conda config --add channels conda-forge # install required packages -conda install python=3.11 boost=1.78 lapack fftw gsl scons bzip2 git blas=*=*mkl +conda install python=3.11 boost=1.78 lapack fftw gsl scons bzip2 git blas=*=*mkl gcc gxx # git clone or download ZIP # git clone https://github.com/xray-group/mstruct.git