Skip to content

Packing updates #26

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zdemat merged 5 commits into from
Sep 7, 2025
Merged

Packing updates #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
087d52f
Update build.yml: libgsl-*.dll
zdemat Aug 31, 2025
ade9de9
Update build.yml: mkl_rt*.dll
zdemat Aug 31, 2025
a82d066
Update build.yml: linux distribution
zdemat Sep 3, 2025
eae6ae2
Update build.yml: adding mkl_intel_thread.dll
zdemat Sep 6, 2025
5b799f5
Update index.md: minor update (win)
zdemat Sep 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,14 +68,16 @@ 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
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
copy %P%\Library\bin\mkl_intel_thread.2.dll dist\mstruct
- name: Archive distribution
uses: actions/upload-artifact@v4
with:
Expand All @@ -84,7 +86,7 @@ jobs:

build-and-test-linux:

runs-on: ubuntu-latest
runs-on: ubuntu-22.04

steps:
- name: Checkout repository
Expand Down Expand Up @@ -125,6 +127,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:
Expand Down
2 changes: 1 addition & 1 deletion doc/source/index.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down