Homec4science

Merge branch 'master' of ssh://c4science.ch/diffusion/1448/lenstool-hpc

Authored by fourestey on Oct 12 2018, 13:49.

Description

Merge branch 'master' of ssh://c4science.ch/diffusion/1448/lenstool-hpc

Conflicts:
Benchmarks/ChiBenchmark/Makefile.GPU.intel
Benchmarks/ChiBenchmark/chi_CPU.cpp
src/Makefile.GPU.intel
src/Makefile.intel
src/gradient_GPU.cu
src/grid_gradient_GPU.cu

Details

Committed
fouresteyOct 12 2018, 13:49
Pushed
fouresteyOct 12 2018, 13:50
Parents
R1448:dcd31868b01d: removing binary exe
R1448:56c399be4553: adding compilation flags file
Branches
Unknown
Tags
Unknown

Merged Changes

CommitAuthorDetailsCommitted
56c399be4553fourestey
adding compilation flags file 
Oct 4 2018
bf4d0aaf26f3fourestey
general update 
Oct 4 2018
ca75d4a790d0fourestey
bug fix for multiple GPUs 
Oct 4 2018
708251f74a60fourestey
updated compilation options (-Ofast in particular) 
Oct 4 2018
e31edd9a1d91fourestey
better readability 
Oct 4 2018
f723ffda046dfourestey
preparation for a rehaul 
Oct 4 2018
088baf1f872efourestey
updating the compilation options 
Oct 4 2018
7d33574c9641fourestey
Changing the executable name 
Oct 4 2018