p61743098
/
sagecal
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

-pg not appropriate, NVML_INC is redundant and link to the latest cuda, i.e. cuda 9.1

This commit is contained in:
Hanno Spreeuw 2018-05-02 21:10:01 +02:00
parent 45730106a1
commit d0a2e251a8
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/MS/Makefile
View File

@ -1,7 +1,7 @@
OUTPUT=
CXX=g++
CXXFLAGS=-O3 -Wall -g -pg -std=c++11 #-fnostack-protector
CXXFLAGS=-O3 -Wall -g -std=c++11 #-fnostack-protector
# CASA_LIBDIR=-L/cm/shared/package/casacore/v2.1.0-gcc-4.9.3/lib -L/cm/shared/package/cfitsio/3380-gcc-4.9.3/lib -L/cm/shared/package/lapack/3.6.0-gcc-4.9.3/lib64
CASA_LIBDIR=-L/cm/shared/package/casacore/v2.4.1-gcc-6.3.0/lib -L/cm/shared/package/cfitsio/3380-gcc-4.9.3/lib -L/cm/shared/package/lapack/3.6.0-gcc-4.9.3/lib64
# CASA_INCDIR=-I/cm/shared/package/casacore/v2.1.0-g++-4.9.3/include -I/cm/shared/package/casacore/v2.1.0-g++-4.9.3/include/casacore

9
src/MS/Makefile.gpu
View File

@ -1,6 +1,6 @@
OUTPUT=
CXX=g++
CXXFLAGS=-O3 -Wall -g -DHAVE_CUDA -pg -std=c++11
CXXFLAGS=-O3 -Wall -g -DHAVE_CUDA -std=c++11
CASA_LIBDIR=-L/cm/shared/package/casacore/v2.4.1-gcc-6.3.0/lib -L/cm/shared/package/cfitsio/3380-gcc-4.9.3/lib -L/cm/shared/package/lapack/3.6.0-gcc-4.9.3/lib64
CASA_INCDIR=-I/cm/shared/package/casacore/v2.4.1-gcc-6.3.0/include -I/cm/shared/package/casacore/v2.4.1-gcc-6.3.0/include/casacore
CASA_LIBS=-lcasa_casa -lcasa_tables -lcasa_measures -lcasa_ms -lcfitsio
@ -10,11 +10,10 @@ LAPACK_DIR=/cm/shared/package/openblas/0.2.17mt/lib
#LAPACK_DIR=/usr/lib/atlas/sse/
CUDALIB=-lcuda -lcudart -lcublas -lcusolver -lcudadevrt
# CULALIB=-lcublas -lcusolver -lcudadevrt
# NVML
NVML_INC=/usr/include/nvidia/gdk/
NVML_LIB=-lnvidia-ml -L/cm/shared/package/cuda80/toolkit/8.0.61/lib64/stubs
NVML_LIB=-lnvidia-ml -L/cm/shared/package/cuda91/toolkit/9.1.85/lib64/stubs
LDFLAGS=-Wl,--rpath,/cm/shared/package/openblas/0.2.17mt/lib,${CASA_LIBDIR}
@ -23,7 +22,7 @@ LDFLAGS=-Wl,--rpath,/cm/shared/package/openblas/0.2.17mt/lib,${CASA_LIBDIR}
# with multithread FFTW
MY_LIBS=-lm -lradio -ldirac
INCLUDES=-I. -I../lib/Dirac/ -I../lib/Radio/ $(CASA_INCDIR) -I/usr/include -I$(NVML_INC)
INCLUDES=-I. -I../lib/Dirac/ -I../lib/Radio/ $(CASA_INCDIR) -I/usr/include
LIBPATH=-L$(LAPACK_DIR) -L$(CASA_LIBDIR) -L../lib/Dirac/ -L../lib/Radio/
#### glib