Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Development
ThirdParty-common
Commits
6485db81
Commit
6485db81
authored
Dec 17, 2017
by
Mark OLESEN
Browse files
COMP: use 'cc' instead of 'mpicc' on Cray (issue
#28
)
- the cray 'cc' handles mpi paths, there is no mpicc
parent
5fcd29aa
Changes
3
Hide whitespace changes
Inline
Side-by-side
SOURCES.txt
View file @
6485db81
Quick
summary of third-party versions for recent OpenFOAM versions.
Short
summary of third-party
software
versions for recent OpenFOAM versions.
OpenFOAM-1712
---------------
...
...
@@ -8,6 +8,7 @@ boost_1_64_0
fftw-3.3.7 *minor*
openmpi-1.10.4
scotch_6.0.3
kahip-2.00d *new*
OpenFOAM-1706
...
...
@@ -50,11 +51,19 @@ scotch_6.0.3
OpenFOAM-v2.4+
---------------
CGAL-4.6
CGAL-4.6
*update*
ParaView-4.1.0
cmake-2.8.12.1
openmpi-1.8.5
scotch_6.0.3
openmpi-1.8.5 *update*
scotch_6.0.3 *update*
---------------
OpenFOAM-v2.3
---------------
CGAL-4.3
ParaView-4.1.0
openmpi-1.6.5
scotch_6.0.0
---------------
etc/tools/ParaViewFunctions
View file @
6485db81
...
...
@@ -16,7 +16,7 @@
# ParaView make/install helper functions
#
# Note
# Obtainin
in
g paths via 'python-config' is possible, but may not always
# Obtaining paths via 'python-config' is possible, but may not always
# resolve properly:
#
# python-config --includes
...
...
etc/tools/ThirdPartyFunctions
View file @
6485db81
...
...
@@ -13,7 +13,7 @@
# etc/tools/ThirdPartyFunctions
#
# Description
#
Functions for managing the t
hird
-p
arty packages
#
Various functions used in building T
hird
P
arty packages
#
# Define the standard buildBASE and installBASE for the platform
# Define WM_NCOMPPROCS always.
...
...
@@ -46,16 +46,21 @@ useGccFlag()
done
}
# Return mpiicc (for INTELMPI) or mpicc etc.
# Return <mpicc> by default or <mpiicc> if possible for INTELMPI.
# Cray doesn't have <mpicc>, but its <cc> manages mpi paths directly.
# NOTE: could further refine based on $CC or $WM_CC, but not yet needed
whichMpicc
()
{
local
mpicc
local
mpicc
=
$(
command
-v
mpicc
)
case
"
$WM_MPLIB
"
in
(
INTELMPI
)
mpicc
=
$(
command
-v
mpiicc
)
# Try using intel 'mpiicc'
mpicc
=
$(
command
-v
mpiicc
)
# Intel <mpiicc> available?
;;
(
CRAY-MPI
*
)
:
${
mpicc
:
=cc
}
# Cray <cc> if there is no <mpicc>
;;
esac
echo
"
${
mpicc
:-
mpicc
}
"
# mpiicc | mpicc
echo
"
${
mpicc
:-
mpicc
}
"
}
#------------------------------------------------------------------------------
...
...
@@ -105,7 +110,6 @@ else
WM_NCOMPPROCS
=
1
fi
export
WM_NCOMPPROCS
# echo "Building on $WM_NCOMPPROCS cores"
#
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment