Homec4science

Merge branch 'master' into develop

Authored by fourestey on Oct 19 2018, 13:02.

Description

Merge branch 'master' into develop

Conflicts:
Benchmarks/ChiBenchmark/Makefile.GPU.intel
Benchmarks/ChiBenchmark/chi_CPU.cpp
Benchmarks/ConfigFiles/90Pot.par
Benchmarks/GridGradient2Benchmark/GridGradient_CPU
src/Makefile.GPU.intel
src/grid_gradient_GPU.cu

Merged Changes

CommitAuthorDetailsCommitted
9a601adc7d99fourestey
Merge branch 'master' of ssh://c4science.ch/diffusion/1448/lenstool-hpc 
Oct 12 2018
dcd31868b01dfourestey
removing binary exe 
Oct 12 2018
60d1204bf135fourestey
update 
Oct 12 2018
27e4f6c3f079fourestey
update 
Oct 12 2018
880d87d04d32fourestey
update 
Oct 12 2018
038ae8775e97fourestey
update 
Oct 12 2018
58778757675bfourestey
update 
Oct 12 2018
4d289b9914a6fourestey
lenstool always on 
Oct 12 2018
a06da643017bfourestey
removing the debug info for good 
Oct 12 2018
16997baaae55fourestey
update 
Oct 12 2018
b47d4b106facfourestey
update 
Oct 12 2018
85cf76efa835fourestey
adding a avx512 guard 
Oct 12 2018
0ecc9cb173b0fourestey
fixeing up comments 
Oct 12 2018
36070136a733fourestey
removing bug that cudafrees a host pointer 
Oct 12 2018
980c7878425efourestey
removing the *print* functions 
Oct 12 2018
983cddc7356afourestey
removing the *print* functions 
Oct 12 2018
9ab14c24d568fourestey
removing CXXFLAGS altogether 
Oct 12 2018
5fd25d39d933fourestey
adding the guard for avx512f 
Oct 12 2018
849ed359a661fourestey
bug removed 
Oct 12 2018
9c33b310a466fourestey
putting the curly braces where they should be 
Oct 12 2018
eaa89488bb11fourestey
inserting the right margins 
Oct 12 2018
d9941ed9a0c0fourestey
phasing out the *print* version of the gradient 
Oct 12 2018
af043b6d31adfourestey
much better version, the compiler is passed through the env file 
Oct 12 2018