Skip to content

Commit

Permalink
Merge pull request #535 from BrandonJLazard/add_configurechecks
Browse files Browse the repository at this point in the history
Modified Configuration File
  • Loading branch information
gassmoeller authored Jun 20, 2024
2 parents 85954b3 + ac8aaa2 commit 4787813
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 1 deletion.
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
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
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

0 comments on commit 4787813

Please sign in to comment.