Skip to content
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

MILLEPEDE: Allow pede to compile on macos (m2) #5588

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

MILLEPEDE: Allow pede to compile on macos (m2) #5588

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 10 additions & 4 deletions millepede-ii.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,11 @@
source: https://gitlab.desy.de/claus.kleinwort/millepede-ii.git
requires:
- zlib
- openmp
- "openmp:(?!osx.*)"
- OpenBLAS
- "GCC-Toolchain:(?!osx)"
- "gfortran-system:(osx.*)"

build_requires:
- alibuild-recipe-tools
---
Expand All @@ -16,13 +18,17 @@

case $ARCHITECTURE in
osx*)
[[ ! $ZLIB_ROOT ]] && ZLIB_ROOT=`brew --prefix zlib` ;;
[[ ! $ZLIB_ROOT ]] && ZLIB_ROOT=$(brew --prefix zlib)

Check notice on line 21 in millepede-ii.sh

View workflow job for this annotation

GitHub Actions / alidistlint 

Prefer explicit -n to check non-empty string (or use =/-ne to check boolean/integer). [SC2244]
[[ ! $GFORTRAN ]] && GFORTRAN=gfortran

Check notice on line 22 in millepede-ii.sh

View workflow job for this annotation

GitHub Actions / alidistlint 

Prefer explicit -n to check non-empty string (or use =/-ne to check boolean/integer). [SC2244]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is supposed to set this variable?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

probably nothing from the outside, I just kept the same code as for other variables.

;;
esac

make pede\
${ZLIB_ROOT:+ ZLIB_INCLUDES_DIR=${ZLIB_ROOT}/include ZLIB_LIBS_DIR=${ZLIB_ROOT}/lib}\
${OPENBLAS_ROOT:+ SUPPORT_LAPACK64=yes LAPACK64=OPENBLAS LAPACK64_LIBS_DIR=${OPENBLAS_ROOT}/lib LAPACK64_LIB=openblas}

${OPENBLAS_ROOT:+ SUPPORT_LAPACK64=yes LAPACK64=OPENBLAS LAPACK64_LIBS_DIR=${OPENBLAS_ROOT}/lib LAPACK64_LIB=openblas}\
${GFORTRAN:+ GCC=${GFORTRAN}}


rsync -a --delete pede ${INSTALLROOT}/bin/

#ModuleFile
Expand Down
2 changes: 1 addition & 1 deletion openblas.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ version: "%(tag_basename)s"
tag: "v0.3.27"
source: https://github.com/xianyi/OpenBLAS.git
requires:
- openmp
- "openmp:(?!osx.*)"
- "GCC-Toolchain:(?!osx)"
build_requires:
- CMake
Expand Down
Loading