handled merge problems, with potfile and potential contention, not enough…
9f660c272a4f
Actions

Authored by Christoph Schaefer <cerschae@greina13.cm.cluster> on Nov 21 2018, 16:40.

Description

handled merge problems, with potfile and potential contention, not enough allocation

Committed

Christoph Schaefer <cerschae@greina13.cm.cluster>

Nov 21 2018, 16:40

Pushed

schaefer

Nov 21 2018, 16:40

Parents

R1448:8729f1657fc2: handling new merge

Branches

Unknown

Tags

Unknown

Christoph Schaefer <cerschae@greina13.cm.cluster> committed R1448:9f660c272a4f: handled merge problems, with potfile and potential contention, not enough… (authored by Christoph Schaefer <cerschae@greina13.cm.cluster>).Nov 21 2018, 16:40

				Path
	M			Benchmarks/ConfigFiles/TestResultParameter.par
	M			Benchmarks/Scripts/BenchA2744
	M			src/allocation.cpp
	M			src/allocation_GPU.cu
	M			src/chi_CPU_barycenter.cpp
	M			src/chi_barycenter_GPU.cu
	M			src/chi_comm.cpp
	M			src/module_readParameters.cpp
	M			src/write_output.cpp
	M			src/write_output.hpp
	M			utils/exec/main.cpp
	M			utils/maps/main.cpp