Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
H
helix
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Andreas Korpi-Lagg
helix
Commits
bf11b280
Commit
bf11b280
authored
4 years ago
by
Andreas Korpi-Lagg
Browse files
Options
Downloads
Patches
Plain Diff
added OMPI_FC=ifort to configure.ac: This selects the correct compiler for the Open MPI
parent
b3ad1d84
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
configure.ac
+12
-4
12 additions, 4 deletions
configure.ac
with
12 additions
and
4 deletions
configure.ac
+
12
−
4
View file @
bf11b280
...
@@ -43,7 +43,8 @@ AC_PREFIX_DEFAULT(`pwd`)
...
@@ -43,7 +43,8 @@ AC_PREFIX_DEFAULT(`pwd`)
.githooks/git-create-revisioninfo-hook.sh
.githooks/git-create-revisioninfo-hook.sh
# Check MPI first. This might overwrite FC setting
# Check MPI first. This might overwrite FC
OMPI_FC=$FC
MPIFC=""
MPIFC=""
MPICC=""
MPICC=""
PP="-D"
PP="-D"
...
@@ -97,6 +98,7 @@ if test "x$with_mpi" != "x" ; then
...
@@ -97,6 +98,7 @@ if test "x$with_mpi" != "x" ; then
AC_PROG_FC($FC)
AC_PROG_FC($FC)
fi
fi
fi
fi
AC_MSG_NOTICE([Using fortran Compiler: $FC])
#check for debug option
#check for debug option
AC_ARG_ENABLE(debug,
AC_ARG_ENABLE(debug,
...
@@ -134,9 +136,9 @@ case $FC in
...
@@ -134,9 +136,9 @@ case $FC in
FCFLAGS=" "
FCFLAGS=" "
AR="ar"
AR="ar"
if $debug ;then
if $debug ;then
OPTFLAGS="-O3 -O4 -O5 -ffast-math -fallow-argument-mismatch"
OPTFLAGS="-O3 -O4 -O5 -ffast-math -fallow-argument-mismatch
"
else
else
OPTFLAGS="-O2 -g3 -fallow-argument-mismatch"
OPTFLAGS="-O2 -g3 -fallow-argument-mismatch
"
fi
fi
EXEADD=".gfortran"$EXEADD
EXEADD=".gfortran"$EXEADD
DISLINSUB="gf"
DISLINSUB="gf"
...
@@ -149,6 +151,10 @@ esac
...
@@ -149,6 +151,10 @@ esac
AC_MSG_RESULT([$OPTFLAGS])
AC_MSG_RESULT([$OPTFLAGS])
AC_MSG_NOTICE([Preprocessor flag: $PPCMD])
AC_MSG_NOTICE([Preprocessor flag: $PPCMD])
AC_MSG_NOTICE([Using fortran Compiler: $FC])
AC_MSG_NOTICE([Using OPTFLAGS: $OPTFLAGS])
# check whether 64 or 32 bit
# check whether 64 or 32 bit
AS_IF([test "$ac_cv_sizeof_long" -eq 8],
AS_IF([test "$ac_cv_sizeof_long" -eq 8],
[PPFLAGS=$PPFLAGS" "$PP"bit64" ; IDLPAR=" -m64"])
[PPFLAGS=$PPFLAGS" "$PP"bit64" ; IDLPAR=" -m64"])
...
@@ -168,7 +174,7 @@ if test "x$with_mpi" == "x" ; then
...
@@ -168,7 +174,7 @@ if test "x$with_mpi" == "x" ; then
AC_MSG_NOTICE([IDL version])
AC_MSG_NOTICE([IDL version])
PPFLAGS=$PPFLAGS" "$PP"IDL"
PPFLAGS=$PPFLAGS" "$PP"IDL"
FCFLAGS=$FCFLAGS$IDLPAR" -shared "
FCFLAGS=$FCFLAGS$IDLPAR" -shared "
if test `uname` != "
Darw
in" ; then
if test `uname` != "in" ; then
FCFLAGS=$FCFLAGS" -fPIC "
FCFLAGS=$FCFLAGS" -fPIC "
fi
fi
HELIBS=$HELIBS" "
HELIBS=$HELIBS" "
...
@@ -244,6 +250,8 @@ if test "$fitsio" != "1" ; then
...
@@ -244,6 +250,8 @@ if test "$fitsio" != "1" ; then
fi
fi
IPATH=$IPATH" -I$with_cfitsio_include_path "
IPATH=$IPATH" -I$with_cfitsio_include_path "
LPATH=$LPATH" -L$with_cfitsio_lib_path "
LPATH=$LPATH" -L$with_cfitsio_lib_path "
AC_MSG_NOTICE([CFITSIO Libraries: $with_cfitsio_lib_path])
AC_MSG_NOTICE([CFITSIO Include: $with_cfitsio_include_path])
fi
fi
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment