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

Former-commit-id: 618cf4731c029001ef7ce75c0f8edc02021122bd

Merged Changes

CommitAuthorDetailsCommitted
fbab3cb1a16ffourestey
Merge branch 'master' of ssh://c4science.ch/diffusion/1448/lenstool-hpc 
Oct 12 2018
1f8feb03d3ebfourestey
removing binary exe 
Oct 12 2018
13d991222067fourestey
update 
Oct 12 2018
2985dd02c8ecfourestey
update 
Oct 12 2018
68c474a4b60dfourestey
update 
Oct 12 2018
334194a69020fourestey
update 
Oct 12 2018
b5f21fc84cd8fourestey
update 
Oct 12 2018
6d12d30d3b6dfourestey
lenstool always on 
Oct 12 2018
6b6f71f37f86fourestey
removing the debug info for good 
Oct 12 2018
50e123af39bcfourestey
update 
Oct 12 2018
47089df79055fourestey
update 
Oct 12 2018
1c7745124c6ffourestey
adding a avx512 guard 
Oct 12 2018
657e571d1440fourestey
fixeing up comments 
Oct 12 2018
d42cd80e9716fourestey
removing bug that cudafrees a host pointer 
Oct 12 2018
bddcb9f01ebbfourestey
removing the *print* functions 
Oct 12 2018
29519f3df8c6fourestey
removing the *print* functions 
Oct 12 2018
520da1474de1fourestey
removing CXXFLAGS altogether 
Oct 12 2018
4138cacdfc76fourestey
adding the guard for avx512f 
Oct 12 2018
4fe4f6222807fourestey
bug removed 
Oct 12 2018
ae29d9b999fdfourestey
putting the curly braces where they should be 
Oct 12 2018
fd912591dfdffourestey
inserting the right margins 
Oct 12 2018
8689cd87453bfourestey
phasing out the *print* version of the gradient 
Oct 12 2018
3889e3ff8d37fourestey
much better version, the compiler is passed through the env file 
Oct 12 2018