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

Modified Configuration File #535

Merged
merged 6 commits into from
Jun 20, 2024
Merged

Modified Configuration File #535

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b859e10
Added a check for correct configuration before the actual configurati…
BrandonJLazard Jun 18, 2024
fd5ada8
removed stdc++ flags again?
BrandonJLazard Jun 19, 2024
8c63dd5
fixed syntax error
BrandonJLazard Jun 19, 2024
9f30ce8
changed conditionals
BrandonJLazard Jun 20, 2024
33d01c2
Edited the github conda test to include the fftw and blas flags
BrandonJLazard Jun 20, 2024
ac8aaa2
Updated error code message for incorrect configuration
BrandonJLazard Jun 20, 2024
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
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,6 @@ jobs:
- name: Build Rayleigh
run: |
cd "$GITHUB_WORKSPACE"
./configure --openblas --FC=mpifort --FFLAGS_DBG='-O0 -g -fbounds-check -ffpe-trap=invalid,zero,overflow -fbacktrace -ffixed-line-length-132 -Wall'
./configure --openblas --with-blas=$CONDA_PREFIX --with-fftw=$CONDA_PREFIX --FC=mpifort --FFLAGS_DBG='-O0 -g -fbounds-check -ffpe-trap=invalid,zero,overflow -fbacktrace -ffixed-line-length-132 -Wall'
make -j
make install
19 changes: 19 additions & 0 deletions configure
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -474,6 +474,25 @@ do

esac
done

if [ "$USE_MKL" == "TRUE" ]
then
echo ""
elif [[ ! -z $FFTWROOT && ! -z $BLASROOT && ! -z $LPROOT ]];
then
echo ""
elif [[ ! -z $FFTWROOT && ! -z $BLASROOT && "$USEOPENBLAS" == "TRUE" ]]
then
echo ""
else
echo "Configuration Error: One of the three combinations must be satisfied"
echo " 1)The location of MKL is specified."
echo " 2)The location of fftw, blas, and lapack is specified."
echo " 3)The location of fftw, blas, and openblas is specified."
exit 1
fi


echo ""
echo " -----------------------------------------------------------------------------"
VERSION_FILE="VERSION"
Expand Down
Loading