Merge branch 'release'
0e9609fd66f8
Actions

Authored by Christoph Schaefer <cerschae@greina13.cm.cluster> on Dec 4 2018, 10:53.

Description

Merge branch 'release'

Committed

Christoph Schaefer <cerschae@greina13.cm.cluster>

Dec 4 2018, 10:53

Pushed

schaefer

Dec 4 2018, 10:53

Parents

Branches

Unknown

Tags

Unknown

Christoph Schaefer <cerschae@greina13.cm.cluster> committed R1448:0e9609fd66f8: Merge branch 'release' (authored by Christoph Schaefer <cerschae@greina13.cm.cluster>).Dec 4 2018, 10:53

Commit	Author	Details	Committed
109714f0cef6	Christoph Schaefer	a few add config files for tests	Nov 26 2018
8f4190f12e02	Christoph Schaefer	added some comments	Nov 21 2018
721e37da0731	Christoph Schaefer	refactored out image prediction into function and seperate folder	Nov 21 2018
9f660c272a4f	Christoph Schaefer	handled merge problems, with potfile and potential contention, not enough…	Nov 21 2018
8729f1657fc2	Christoph Schaefer	handling new merge	Nov 19 2018
3775f8e554fb	Christoph Schaefer	trying to handle mpi	Nov 19 2018
ebe667d850ef	Christoph Schaefer	handling emrge conflicts	Nov 16 2018
eafc03818a89	Christoph Schaefer	preparing image keyword	Nov 16 2018
e0681ed12f3d	Christoph Schaefer	added some comments, started on image keyword	Nov 12 2018
f166e1b95f4f	Christoph Schaefer	removed large files	Oct 29 2018

				Path
	A			Benchmarks/ChiBenchmark/chi_CPU.cpp
	M			Benchmarks/ConfigFiles/TestResultParameter.par
	A			Benchmarks/ConfigFiles/theoimages_for_TestResultParameter.txt
	A			Benchmarks/ConfigFiles/theoretical_images_time_1source.txt
	M			Benchmarks/GradientBenchmark/Makefile
	M			Benchmarks/Scripts/BenchA2744
	M			src/Makefile.GPU.intel
	M			src/Makefile.intel
	M			src/allocation.cpp
	M			src/allocation.hpp
	M			src/allocation_GPU.cu
	M			src/allocation_GPU.cuh
	M			src/chi_CPU.hpp
	M			src/chi_CPU_barycenter.cpp
	M			src/chi_barycenter_GPU.cu
	M			src/chi_comm.cpp
	M			src/delense_CPU.hpp
	M			src/delense_GPU.cuh
	M			src/grid_gradient_GPU.cu
	A			src/image_prediction_GPU.cu
	A			src/image_prediction_GPU.cuh
	M			src/module_readParameters.cpp
	M			src/module_readParameters.hpp
	A			src/write_output.cpp
	P			src/write_output.hpp Copied from src/gradient2.hpp
	M			utils/exec/main.cpp
	M			utils/maps/main.cpp