Commit 30b8e5d9 authored by Christopher Subich's avatar Christopher Subich
Browse files

Modifications to orca system spec; added MPICXX flag

The MPICXX flag is necessary because the blitz configure script
does not properly deal with the sharcnet 'compile' scripting
command; since it does not actually contain 'icc' in the *NAME*
of the command, the configure seems to default to a
blitz/gnu/bzconfig.h scheme -- which is then not found during
bona fide compilation.  This is probably an underlying bug in
the blitz build system.
parent 1125845d
......@@ -132,14 +132,14 @@ else
pushd AMD
(make > /dev/null) || (echo "Could not make AMD"; exit 1)
cp Include/* ../include/
cp Lib/* ../lib
cp Lib/*.a ../lib
popd
pushd UMFPACK
echo "Building UMFPACK"
(make library > /dev/null) || (echo "Could not make UMFPACK"; exit 1);
cp Include/* ../include
cp Lib/* ../lib
cp Lib/*.a ../lib
popd
cp UFconfig/UFconfig.h ./include/
......
......@@ -14,6 +14,12 @@ OPTIM?=true
# longer for compilation
SLOW_OPTIM?=false
# If MPICXX isn't separately defined, then set it to be the same
# as CXX
ifeq ($(strip $(MPICXX)),)
MPICXX:=$(CXX)
endif
# Assemble the CFLAGS
CFLAGS:=$(SYSTEM_CFLAGS)
LDFLAGS:=$(SYSTEM_LDFLAGS)
......@@ -49,13 +55,13 @@ objfiles: $(shell ls *.cpp | sed -e 's/cpp/o/g')
NSIntegrator.o: NSIntegrator.cpp NSIntegrator_impl.cc
tests/test%.o: tests/tests%.cpp
$(CXX) $(CFLAGS) -o $@ -c $<
$(MPICXX) $(CFLAGS) -o $@ -c $<
tests/test%_x: tests/test%.o TArray.o Parformer.o T_util.o ESolver.o Timestep.o NSIntegrator.o BaseCase.o Science.o Splits.o Par_util.o Split_reader.o gmres.o gmres_1d_solver.o gmres_2d_solver.o grad.o multigrid.o
$(LD) $(LDFLAGS) -o $@ $^ $(LDLIBS)
cases/%.o: cases/%.cpp NSIntegrator_impl.cc NSIntegrator.hpp
$(CXX) $(CFLAGS) -o $@ -c $<
$(MPICXX) $(CFLAGS) -o $@ -c $<
nonhydro_x: nonhydro_sw.o TArray.o T_util.o Parformer.o Splits.o Par_util.o Split_reader.o
......@@ -71,5 +77,5 @@ cases/%_x: cases/%.o TArray.o T_util.o Parformer.o ESolver.o Timestep.o NSIntegr
$(LD) $(LDFLAGS) -o $@ $^ $(LDLIBS)
%.o : %.cpp *.hpp
$(CXX) $(CFLAGS) -o $@ -c $<
$(MPICXX) $(CFLAGS) -o $@ -c $<
......@@ -32,6 +32,7 @@ cat > ../src/system.mk << EOF
CC:=$CC
CXX:=$CXX
LD:=$LD
MPICXX:=$MPICXX
# Compiler flags
SYSTEM_CFLAGS:=$SYSTEM_CFLAGS
......
......@@ -2,12 +2,13 @@
# System-specific settings for the orca.sharcnet.ca cluster
CC=mpicc
CXX=mpic++
CC=icc
CXX=icc
LD=mpic++
# System-specific compiler flags
SYSTEM_CFLAGS="-Wall -wd981 -wd444 -wd1572 -wd383 -wd869"
SYSTEM_CFLAGS=
SYSTEM_LDFLAGS=
# Compiler flags for debugging
......@@ -25,14 +26,15 @@ EXTRA_OPTIM_LDFLAGS=
# Library names/locations/flags for MPI-compilation. This will
# probably not be necessary on systems with a working mpicc
# alias
MPICXX=mpic++
MPI_CFLAGS=
MPI_LIB=-lmpi
MPI_LIB=
MPI_LIBDIR=
MPI_INCDIR=
# Library names/locations for LAPACK
LAPACK_LIB="-llapack"
LAPACK_LIBDIR=
LAPACK_LIBDIR=-L`dirname $(find /opt/sharcnet/intel/11* -name 'libmkl_core.a' | head -1)`
LAPACK_INCDIR=
# Library locations for blitz; leave blank to use system-installed
......@@ -41,8 +43,8 @@ BLITZ_LIBDIR=
BLITZ_INCDIR=
# Library locations for fftw
FFTW_LIBDIR=
FFTW_INCDIR=
FFTW_LIBDIR=-L`dirname $(find /opt/sharcnet/fftw* -name 'libfftw3.a' | grep intel | head -1)`
FFTW_INCDIR=-I`dirname $(find /opt/sharcnet/fftw* -name "fftw3.h" | grep intel | head -1)`
# Library locations for UMFPACK
UMF_INCDIR=
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment