lenstool-hpc
fbab3cb1a16f
Actions

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

Former-commit-id: 9a601adc7d9909a5b8c92993bb62b12cecf0a433

Details

Committed

fourestey

Oct 12 2018, 13:49

Pushed

schaefer

Jul 8 2019, 16:11

Parents

R1448:2a0b944366d0: adding compilation flags file
R1448:1f8feb03d3eb: removing binary exe

Branches

Unknown

Tags

Unknown

Event Timeline

fourestey committed R1448:fbab3cb1a16f: Merge branch 'master' of ssh://c4science.ch/diffusion/1448/lenstool-hpc (authored by fourestey).Oct 12 2018, 13:49

Merged Changes

Commit	Author	Details	Committed
2a0b944366d0	fourestey	adding compilation flags file	Oct 4 2018
9e729f28d5e9	fourestey	general update	Oct 4 2018
bf35c9e3ac93	fourestey	bug fix for multiple GPUs	Oct 4 2018
5ecfeeadf73e	fourestey	updated compilation options (-Ofast in particular)	Oct 4 2018
3b52c0ea7736	fourestey	better readability	Oct 4 2018
9fc34a3c211d	fourestey	preparation for a rehaul	Oct 4 2018
ecf8039d8daa	fourestey	updating the compilation options	Oct 4 2018
fb54cfe83a8f	fourestey	Changing the executable name	Oct 4 2018

Changes (9)

				Path
	M			Benchmarks/ChiBenchmark/Makefile
	M			Benchmarks/ChiBenchmark/Makefile.GPU.intel
	M			Benchmarks/ChiBenchmark/chi_CPU.cpp
	A			Benchmarks/ChiBenchmark/cppflags.inc
	M			Benchmarks/ChiBenchmark/main.cpp
	M			env_gilles.sh
	M			src/Makefile.intel
	M			src/gradient_GPU.cu
	M			src/grid_gradient2_GPU.cu