preparing merge2
795c7c7dbe57
Actions

Authored by Christoph Schaefer <cerschae@greina6.cm.cluster> on Nov 16 2017, 13:20.

Description

preparing merge2

Committed

Christoph Schaefer <cerschae@greina6.cm.cluster>

Nov 16 2017, 13:20

Pushed

schaefer

Nov 16 2017, 13:20

Parents

R1448:0a4f8f9d3db2: preparing merge

Branches

Unknown

Tags

Unknown

Christoph Schaefer <cerschae@greina6.cm.cluster> committed R1448:795c7c7dbe57: preparing merge2 (authored by Christoph Schaefer <cerschae@greina6.cm.cluster>).Nov 16 2017, 13:20

				Path
	M			Benchmarks/ChiBenchmark/Makefile.GPU.intel
	M			Benchmarks/ChiBenchmark/chi_CPU.hpp
	M			Benchmarks/ChiBenchmark/main.cpp
	M			Benchmarks/ChiBenchmark/setup.hpp
	M			Benchmarks/GradientBenchmark/main.cpp
	M			Benchmarks/GradientBenchmark/setup.cpp
	M			src/module_readParameters.cpp