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

Jump to bottom

Tweak dev env for Darwin #616

Merged
merged 3 commits into from
May 7, 2019
Merged

Tweak dev env for Darwin #616

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d84db18
Tweak dev env for Darwin
KineticTheory May 4, 2019
8d42936
Merge remote-tracking branch 'upstream/develop' into darwin_env
KineticTheory May 6, 2019
0d6173e
Move to openmpi/3.1.3 to fix broken regression.
KineticTheory May 6, 2019
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
9 changes: 5 additions & 4 deletions environment/bashrc/.bashrc_darwin_fe
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ if test -n "$MODULESHOME"; then
x86_64)
cflavor="gcc-7.3.0"
mflavor="$cflavor-openmpi-3.1.2"
noflavor="emacs git cmake gcc/7.3.0 ack"
noflavor="emacs git cmake/3.14.0-$cflavor gcc/7.3.0 ack"
compflavor="gsl/2.5-$cflavor netlib-lapack/3.8.0-$cflavor numdiff/5.9.0-$cflavor random123/1.09-$cflavor metis/5.1.0-$cflavor eospac/6.3.1-$cflavor openmpi/3.1.2-gcc_7.3.0"
mpiflavor="parmetis/4.0.3-$mflavor superlu-dist/5.2.2-$mflavor-netlib trilinos/12.12.1-$mflavor-netlib"
ec_mf="ndi"
Expand Down Expand Up @@ -82,10 +82,11 @@ superlu-dist/5.2.2-$mflavor trilinos/12.12.1-$mflavor"
# ;;
power9*)
cflavor="gcc-7.3.0"
mflavor="$cflavor-openmpi-3.1.2"
mflavor="$cflavor-openmpi-3.1.3"
lflavor="lapack-3.8.0"
noflavor="git cmake gcc/7.3.0"
compflavor="random123 numdiff gsl/2.5-$cflavor netlib-lapack/3.8.0-$cflavor metis/5.1.0-$cflavor openmpi/p9/3.1.2-gcc_7.3.0"
mpiflavor="parmetis/4.0.3-$mflavor superlu-dist/5.2.2-${mflavor}-netlib trilinos/12.12.1-${mflavor}-netlib"
compflavor="random123 numdiff gsl/2.5-$cflavor netlib-lapack/3.8.0-$cflavor metis/5.1.0-$cflavor openmpi/p9/3.1.3-gcc_7.3.0"
mpiflavor="parmetis/4.0.3-$mflavor superlu-dist/5.2.2-${mflavor}-$lflavor trilinos/12.14.1-${mflavor}-$lflavor"
# These aren't built for power architectures?
# ec_mf="ndi eospac/6.3.0"
;;
Expand Down
4 changes: 2 additions & 2 deletions regression/darwin-regress.msub
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,9 +168,9 @@ superlu-dist/5.2.2-$mflavor trilinos/12.12.1-$mflavor"
;;
power9*)
cflavor="gcc-7.3.0"
mflavor="$cflavor-openmpi-3.1.2"
mflavor="$cflavor-openmpi-3.1.3"
noflavor="git cmake gcc/7.3.0"
compflavor="random123 numdiff gsl/2.5-$cflavor netlib-lapack/3.8.0-$cflavor metis/5.1.0-$cflavor openmpi/p9/3.1.2-gcc_7.3.0"
compflavor="random123 numdiff gsl/2.5-$cflavor netlib-lapack/3.8.0-$cflavor metis/5.1.0-$cflavor openmpi/p9/3.1.3-gcc_7.3.0"
mpiflavor="parmetis/4.0.3-$mflavor superlu-dist/5.2.2-${mflavor}-netlib trilinos/12.12.1-${mflavor}-netlib cuda/9.2"
# These aren't built for power architectures?
# ec_mf="ndi eospac/6.3.0"
Expand Down