resolved merge
c8a4b458969b
Actions

Authored by Christoph Schaefer <cerschae@greina17.cm.cluster> on Feb 23 2017, 16:13.

Description

resolved merge

Committed

Christoph Schaefer <cerschae@greina17.cm.cluster>

Feb 23 2017, 16:13

Pushed

schaefer

Feb 23 2017, 16:13

Parents

Branches

Unknown

Tags

Unknown

Christoph Schaefer <cerschae@greina17.cm.cluster> committed R1448:c8a4b458969b: resolved merge (authored by Christoph Schaefer <cerschae@greina17.cm.cluster>).Feb 23 2017, 16:13

	Commit			Author	Details	Committed
	9df9e1a1fc10			schaefer	played auround with chi	Feb 23 2017

				Path
	M			Benchmarks/ChiBenchmark/Makefile
	A			Benchmarks/ChiBenchmark/chi_GPU.cu
	A			Benchmarks/ChiBenchmark/chi_GPU.cuh
	M			Benchmarks/ChiBenchmark/cudafunctions.cuh
	P			Benchmarks/ChiBenchmark/gradient_GPU.cu Copied from Benchmarks/GridGradientBenchmark/gradient_GPU.cu
	P			Benchmarks/ChiBenchmark/gradient_GPU.cuh Copied from Benchmarks/GridGradientBenchmark/gradient_GPU.cuh
	P			Benchmarks/ChiBenchmark/grid_gradient_GPU.cu Copied from Benchmarks/GridGradientBenchmark/grid_gradient_GPU.cu
	P			Benchmarks/ChiBenchmark/grid_gradient_GPU.cuh Copied from Benchmarks/GridGradientBenchmark/grid_gradient_GPU.cuh
	M			Benchmarks/ChiBenchmark/main.cpp
	M			src/chi_CPU.cpp
	M			src/chi_CPU.hpp