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

Merge branch 'master' of github.com:nlesc-dirac/sagecal

This commit is contained in:
Hanno Spreeuw 2018-01-31 14:19:28 +01:00
parent ec9c174211 33496b49d9
commit 538abbe6c1
7 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/MS/Makefile
View File

@ -11,10 +11,10 @@ CASA_LIBS=-lcasa_casa -lcasa_tables -lcasa_measures -lcasa_ms -lcfitsio
#LAPACK=-llapack -lblas #LAPACK=-llapack -lblas
LAPACK=-lopenblas -lgfortran -lpthread LAPACK=-lopenblas -lgfortran -lpthread
# LAPACK_DIR=/cm/shared/apps/openblas/0.2.8/lib # LAPACK_DIR=/cm/shared/apps/openblas/0.2.8/lib
LAPACK_DIR=/cm/shared/apps/openblas/0.2.15/lib LAPACK_DIR=/cm/shared/package/openblas/0.2.17mt/lib
#LAPACK_DIR=/usr/lib/atlas/sse/ #LAPACK_DIR=/usr/lib/atlas/sse/
LDFLAGS=-Wl,--rpath,/usr/local/OpenBLAS/lib/,${CASA_LIBDIR} LDFLAGS=-Wl,--rpath,/cm/shared/package/openblas/0.2.17mt/lib/,${CASA_LIBDIR}
#LDFLAGS=-Wl,-t,--rpath,/software/users/lofareor/SW/lib64 #LDFLAGS=-Wl,-t,--rpath,/software/users/lofareor/SW/lib64
# -Wl,--hash-style=both # -Wl,--hash-style=both

4
src/MS/Makefile.gpu
View File

@ -6,7 +6,7 @@ CASA_INCDIR=-I/cm/shared/package/casacore/v2.3.0-gcc-4.9.3/include -I/cm/shared/
CASA_LIBS=-lcasa_casa -lcasa_tables -lcasa_measures -lcasa_ms -lcfitsio CASA_LIBS=-lcasa_casa -lcasa_tables -lcasa_measures -lcasa_ms -lcfitsio
# LAPACK=-llapack -lblas # LAPACK=-llapack -lblas
LAPACK=-lopenblas -lgfortran -lpthread LAPACK=-lopenblas -lgfortran -lpthread
LAPACK_DIR=/cm/shared/apps/openblas/0.2.8/lib LAPACK_DIR=/cm/shared/package/openblas/0.2.17mt/lib
#LAPACK_DIR=/usr/lib/atlas/sse/ #LAPACK_DIR=/usr/lib/atlas/sse/
CUDAINC=-I/cm/shared/apps/cuda80/toolkit/8.0.44/include/ CUDAINC=-I/cm/shared/apps/cuda80/toolkit/8.0.44/include/
@ -18,7 +18,7 @@ NVML_INC=/usr/include/nvidia/gdk/
NVML_LIB=-lnvidia-ml -L/usr/lib64/nvidia/ NVML_LIB=-lnvidia-ml -L/usr/lib64/nvidia/
LDFLAGS=-Wl,--rpath,/usr/local/OpenBLAS/lib/,${CASA_LIBDIR} LDFLAGS=-Wl,--rpath,/cm/shared/package/openblas/0.2.17mt/lib,${CASA_LIBDIR}
#LDFLAGS=-Wl,-t,--rpath,/software/users/lofareor/SW/lib64 #LDFLAGS=-Wl,-t,--rpath,/software/users/lofareor/SW/lib64
# -Wl,--hash-style=both # -Wl,--hash-style=both

2
src/lib/Dirac/Makefile
View File

@ -7,7 +7,7 @@ CFLAGS= -Wall -g -pg
CLIBS= -lm -lpthread CLIBS= -lm -lpthread
#LAPACK=-L/usr/lib/atlas/sse -llapack -lblas #LAPACK=-L/usr/lib/atlas/sse -llapack -lblas
#LAPACK=-L/usr/local/GotoBLAS2/lib -lgoto2 -lpthread -lgfortran #LAPACK=-L/usr/local/GotoBLAS2/lib -lgoto2 -lpthread -lgfortran
LAPACK=-L/usr/local/OpenBLAS/lib/ -lopenblas -lgfortran -lpthread LAPACK=-L/cm/shared/package/openblas/0.2.17mt/lib -lopenblas -lgfortran -lpthread
INCLUDES= -I. INCLUDES= -I.

2
src/lib/Dirac/Makefile.gpu
View File

@ -3,7 +3,7 @@ CXX=g++
NVCC=nvcc NVCC=nvcc
CFLAGS= -Wall -O3 -g -DHAVE_CUDA -DHYBRID_CODE -pg CFLAGS= -Wall -O3 -g -DHAVE_CUDA -DHYBRID_CODE -pg
CLIBS= -lm -lpthread CLIBS= -lm -lpthread
LAPACK=-L/usr/local/OpenBLAS/lib/ -lopenblas -lgfortran -lpthread LAPACK=-L/cm/shared/package/openblas/0.2.17mt/lib -lopenblas -lgfortran -lpthread
# LAPACK=-lblas -lgfortran -lpthread # LAPACK=-lblas -lgfortran -lpthread
CUDAINC=/usr/local/cuda/include CUDAINC=/usr/local/cuda/include

2
src/lib/Radio/Makefile
View File

@ -7,7 +7,7 @@ CFLAGS= -Wall -g -pg
CLIBS= -lm -lpthread CLIBS= -lm -lpthread
#LAPACK=-L/usr/lib/atlas/sse -llapack -lblas #LAPACK=-L/usr/lib/atlas/sse -llapack -lblas
#LAPACK=-L/usr/local/GotoBLAS2/lib -lgoto2 -lpthread -lgfortran #LAPACK=-L/usr/local/GotoBLAS2/lib -lgoto2 -lpthread -lgfortran
LAPACK=-L/usr/local/OpenBLAS/lib/ -lopenblas -lgfortran -lpthread LAPACK=-L/cm/shared/package/openblas/0.2.17mt/lib -lopenblas -lgfortran -lpthread
INCLUDES= -I. -I../Dirac/ INCLUDES= -I. -I../Dirac/

2
src/lib/Radio/Makefile.gpu
View File

@ -3,7 +3,7 @@ CXX=g++
NVCC=nvcc NVCC=nvcc
CFLAGS= -Wall -O3 -g -DHAVE_CUDA -DHYBRID_CODE -pg CFLAGS= -Wall -O3 -g -DHAVE_CUDA -DHYBRID_CODE -pg
CLIBS= -lm -lpthread CLIBS= -lm -lpthread
LAPACK=-L/usr/local/OpenBLAS/lib/ -lopenblas -lgfortran -lpthread LAPACK=-L/cm/shared/package/openblas/0.2.17mt/lib -lopenblas -lgfortran -lpthread
# LAPACK=-lblas -lgfortran -lpthread # LAPACK=-lblas -lgfortran -lpthread
CUDAINC=/usr/local/cuda/include CUDAINC=/usr/local/cuda/include

8
test/Generate_sources.py
View File

@ -67,9 +67,9 @@ with warnings.catch_warnings():
'pos_angle', 'freq0') 'pos_angle', 'freq0')
formats = ['U6', 'i4', 'i4', 'f8', 'i4', 'i4', 'f8', 'f8', 'i4', 'i4', 'i4', 'f8', 'f8', formats = ['U6', 'i4', 'i4', 'f8', 'i4', 'i4', 'f8', 'f8', 'i4', 'i4', 'i4', 'f8', 'f8',
'i4', 'i4', 'i4', 'i4', 'f8', 'f8'] 'f8', 'f8', 'f8', 'f8', 'f8', 'f8']
formats_reformatted = '%s %d %d %f %d %d %f %f %d %d %d %f %f %d %d %d %d %f %f' formats_reformatted = '%s %d %d %f %d %d %f %f %d %d %d %f %f %f %f %f %f %f %f'
sources_parameters = np.recarray((number_of_sources,), formats=formats, sources_parameters = np.recarray((number_of_sources,), formats=formats,
names=names) names=names)
@ -122,7 +122,7 @@ with warnings.catch_warnings():
# sources_parameters.tofile("extended_source_list_using_tofile.txt", sep='\n') # sources_parameters.tofile("extended_source_list_using_tofile.txt", sep='\n')
with open("extended_source_list_centered_on_3C196.txt", 'wb') as f: with open("extended_source_list.txt", 'wb') as f:
f.write(b"## From Generate_sources.py by Hanno Spreeuw.\n") f.write(b"## From Generate_sources.py by Hanno Spreeuw.\n")
f.write(b"## Generates point sources at random positions with random brighnesses within some range.\n") f.write(b"## Generates point sources at random positions with random brighnesses within some range.\n")
f.write(b"## this is an LSM text (hms/dms) file\n") f.write(b"## this is an LSM text (hms/dms) file\n")
@ -136,5 +136,5 @@ with open("extended_source_list_centered_on_3C196.txt", 'wb') as f:
# Now write the cluster file # Now write the cluster file
# First add '1' and '1' to indicate the cluster id and chunk size. # First add '1' and '1' to indicate the cluster id and chunk size.
cluster_array = np.concatenate((np.array(['1', '1']), sources_parameters.name)) cluster_array = np.concatenate((np.array(['1', '1']), sources_parameters.name))
with open("extended_source_list_centered_on_3C196.txt.cluster", 'wb') as f: with open("extended_source_list.txt.cluster", 'wb') as f:
np.savetxt(f, (cluster_array).reshape(1, cluster_array.shape[0]), fmt='%s', delimiter=' ') np.savetxt(f, (cluster_array).reshape(1, cluster_array.shape[0]), fmt='%s', delimiter=' ')