Skip to content

Modified configure script to work on Athena. #600

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
feathern merged 2 commits into from
Jul 13, 2026
Merged

Modified configure script to work on Athena. #600

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6937331
Modified configure script to work on Athena. There is a --for-athena …
kyle-augustson Jun 5, 2026
c35a1f9
fix capitalization in configure
tukss Jul 12, 2026
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
48 changes: 42 additions & 6 deletions configure
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ function opt_flags {

if [[ $1 == "GNU" ]]
then
echo '-O3 -ffixed-line-length-132'
echo '-O3 -ffixed-line-length-132 -fallow-argument-mismatch'
fi

if [[ $1 == "AOCC" ]]
Expand All @@ -70,7 +70,7 @@ function dbg_flags {
fi
if [[ $1 == "GNU" ]]
then
echo '-O0 -g -fbounds-check -ffpe-trap=invalid,zero,overflow -fbacktrace -ffixed-line-length-132'
echo '-O0 -g -fbounds-check -ffpe-trap=invalid,zero,overflow -fbacktrace -ffixed-line-length-132 -fallow-argument-mismatch'
fi
if [[ $1 == "AOCC" ]]
then
Expand Down Expand Up @@ -305,6 +305,10 @@ function displayhelp {
echo " the standard Rayleigh source files."
echo ""

echo " --for-athena=<BOOL>"
echo " Set this flag to use Cray's libsci for BLAS and LAPACK, use in"
echo " combination with --with-blas and --with-lapack to point to the"
echo " correct library."
}


Expand All @@ -319,6 +323,7 @@ USE_MKL="FALSE"
CONDAMKL="FALSE"
DEBIANMKL="FALSE"
CUSTOMROOT="none"
FORATHENA="FALSE"


###############################################################################################
Expand Down Expand Up @@ -467,6 +472,9 @@ do
BLANKMACHINE="TRUE";
;;

--for-athena)
FORATHENA="TRUE";
;;
*)
echo "unknown option: $option"
exit 1
Expand Down Expand Up @@ -605,8 +613,10 @@ else

if [ $FVERSION == "CRAY" ]
then
OPT_FLAGS="$OPT_FLAGS -DCRAY_COMPILER"
DBG_FLAGS="$DBG_FLAGS -DCRAY_COMPILER"
#OPT_FLAGS="$OPT_FLAGS -DCRAY_COMPILER"
#DBG_FLAGS="$DBG_FLAGS -DCRAY_COMPILER"
OPT_FLAGS="$OPT_FLAGS"
DBG_FLAGS="$DBG_FLAGS"
fi

@tukss tukss Jul 12, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Do you remember why this was necessary? I've added it back then because we had similar defines for Intel and GNU. I think the only place we it matters is where we have nonstandard routines like SIGNAL.
CRAY_COMPILER is not used anywhere in the source at the moment, so it shouldn't make a difference.

@kyle-augustson kyle-augustson Jul 12, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

That's why I got rid of it, but left the original in the file in case it popped up at some point.


echo ' '
Expand Down Expand Up @@ -912,14 +922,40 @@ else
then
BLASLINK="-L$BLASROOT/lib/libblas.a"
else
BLASLINK="-L$BLASROOT/lib -lblas"
if [ $FORATHENA == "FALSE" ]
then
BLASLINK="-L$BLASROOT/lib -lblas"
else
if [ $FVERSION == "CRAY" ]
then
BLASLINK="-L$BLASROOT/lib -lsci_cray"
fi

if [ $FVERSION == "GNU" ]
then
BLASLINK="-L$BLASROOT/lib -lsci_gnu"
fi
fi
fi
#LAPACK
if [[ $STATICLAPACK == "TRUE" ]]
then
LAPACKLINK="-L$LPROOT/lib/liblapack.a"
else
LAPACKLINK="-L$LPROOT/lib -llapack"
if [ $FORATHENA == "FALSE" ]
then
LAPACKLINK="-L$LPROOT/lib -llapack"
else
if [ $FVERSION == "CRAY" ]
then
BLASLINK="-L$BLASROOT/lib -lsci_cray"
fi

if [ $FVERSION == "GNU" ]
then
BLASLINK="-L$BLASROOT/lib -lsci_gnu"
fi
fi
fi
fi

Expand Down
Loading