hashdist: Use 'gcc' and 'mpich' packages.

memmett · memmett · commit 4a53e80bd205 · 2014-12-03T10:20:22.000-08:00
Signed-off-by: Matthew Emmett &lt;memmett@gmail.com&gt;
diff --git a/examples/advection_diffusion/Makefile b/examples/advection_diffusion/Makefile
@@ -1,6 +1,6 @@
 PFASST   := $(abspath ../..)
-CXX      := mpic++
 STACK    ?= $(PFASST)/stack
+CXX      := $(STACK)/bin/mpic++
 CXXFLAGS ?= -std=c++11 -I$(PFASST)/include -I$(STACK)/include -I$(STACK)/include/eigen3
 
 LDFLAGS  ?= -L$(STACK)/lib -Wl,-rpath=$(STACK)/lib -lboost_program_options -lfftw3
diff --git a/tests/Makefile.tests b/tests/Makefile.tests
@@ -1,8 +1,8 @@
 #
 # settings
 #
-CXX      := mpic++
 STACK    ?= $(PFASST)/stack
+CXX      := $(STACK)/bin/mpic++
 CXXFLAGS ?= -std=c++11 -I$(PFASST)/include -I$(STACK)/include -I$(STACK)/include/eigen3
 
 TESTLIBS  += -pthread -lboost_program_options -L$(STACK)/lib -Wl,-rpath=$(STACK)/lib -lgmock
diff --git a/tools/hashdist/pfasst-stack.debian.yaml b/tools/hashdist/pfasst-stack.debian.yaml
@@ -8,8 +8,9 @@ parameters:
   debug: false
 
 packages:
+  gcc:
   mpi:
-    use: host-mpi
+    use: mpich
   fftw:
   eigen:
   gtest:

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`#`
`2`	`2`	`# settings`
`3`	`3`	`#`
`4`		`-CXX := mpic++`
`5`	`4`	`STACK ?= $(PFASST)/stack`
	`5`	`+CXX := $(STACK)/bin/mpic++`
`6`	`6`	`CXXFLAGS ?= -std=c++11 -I$(PFASST)/include -I$(STACK)/include -I$(STACK)/include/eigen3`
`7`	`7`
`8`	`8`	`TESTLIBS += -pthread -lboost_program_options -L$(STACK)/lib -Wl,-rpath=$(STACK)/lib -lgmock`