Diffusion Lenstool-HPC ebe667d850ef

handling emrge conflicts
ebe667d850ef
Actions

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

Description

handling emrge conflicts

Details

Committed

Christoph Schaefer <cerschae@greina13.cm.cluster>

Nov 16 2018, 12:13

Pushed

schaefer

Nov 19 2018, 14:57

Parents

R1448:eafc03818a89: preparing image keyword
R1448:ebdc47dd348d: new env files for piz daint and grand tave at CSCS

Branches

Unknown

Tags

Unknown

Event Timeline

Christoph Schaefer <cerschae@greina13.cm.cluster> committed R1448:ebe667d850ef: handling emrge conflicts (authored by Christoph Schaefer <cerschae@greina13.cm.cluster>).Nov 16 2018, 12:13

Merged Changes

Commit	Author	Details	Committed
ebdc47dd348d	fourestey	new env files for piz daint and grand tave at CSCS	Nov 16 2018
47b3898bb0fb	fourestey	added cmath headers for sin/cos/exp...	Nov 15 2018
351d165bf119	fourestey	new separated CPU and GPU chi computation	Nov 15 2018
158d4f666930	fourestey	new fonctions for chi communications and computation	Nov 15 2018
9c5212a3f1c2	fourestey	update	Nov 15 2018
3b39de1e7577	fourestey	changing the number of blocks to fit 2 GPUs (this wont be nececassry anymore…	Nov 15 2018
c06f5dfe384e	fourestey	putting the timers at the right place	Nov 15 2018
e6d16f877fc5	fourestey	mpi checkers	Nov 15 2018
03b37aeb4f8f	fourestey	adding the GPU and CPU separate chi versions	Nov 15 2018
4def3add5f8c	fourestey	separating CPU and GPU version	Nov 15 2018
9e146f2b09f2	fourestey	adding back the lenstool test	Nov 15 2018
d9782d8e6cdd	fourestey	moving files to src	Nov 15 2018
4a31682c67d2	fourestey	new routine to read input files WITHOUT allocating the arrays at the same time	Nov 15 2018
0c50fe56011c	fourestey	update	Nov 15 2018
7adf9ec67f29	fourestey	chi GPU stuff	Nov 15 2018
d07fd40220ca	fourestey	chi CPU stuff	Nov 15 2018
05e3ee187889	fourestey	timer routines	Nov 13 2018
aa527bee03ca	fourestey	allocation is separated between CPU and GPU	Nov 13 2018
f7a48e1a4818	fourestey	moved to src	Nov 13 2018
b170e0b6503f	fourestey	new default block sizes	Nov 12 2018
7c0e86f3c175	fourestey	adding register count (in comment at least)	Nov 12 2018
984af49f269b	fourestey	displaying PCI bus for no reasons besides showing off	Nov 8 2018
3f76ef8fb02b	fourestey	removing problematic image	Nov 8 2018
70b0ef7a4dfc	fourestey	better debug output for images properties	Nov 8 2018
31dfd9cc7a90	fourestey	better debug output for multi-PE	Nov 8 2018
c37d43b65a0e	fourestey	working version	Nov 8 2018
801497074f37	fourestey	setting image_pos_gpu to zero by hand	Nov 4 2018
30974a4044b2	fourestey	removing the non-barycenter chi computation to speed things up	Nov 2 2018
ea1f61931bb9	fourestey	adding delensing on the GPUs	Nov 2 2018
f62a53253520	fourestey	working version of the delensing on the GPU	Oct 31 2018
d063401aa720	fourestey	working version of the delensing on the GPU	Oct 31 2018
45dc32c6f56f	fourestey	unified memory FTW	Oct 19 2018
a90405bcb99b	fourestey	unified memory FTW	Oct 19 2018
14d56602b249	fourestey	unified memory FTW	Oct 19 2018
82b0a9037294	fourestey	user defined cpu and gpu compilation flags	Oct 19 2018
ae9e0e93daf0	fourestey	unified memory FTW	Oct 19 2018
618cf4731c02	fourestey	Merge branch 'master' into develop	Oct 19 2018
401aabdae2f7	fourestey	overhaul of the whole chi computation concept but separating the delensing and…	Oct 7 2018
0142e6091cd0	fourestey	overhaul of the whole chi computation concept but separating the delensing and…	Oct 7 2018
1589525195ac	fourestey	update	Oct 4 2018

Changes (56)

				Path
	M			Benchmarks/ChiBenchmark/Makefile
	M			Benchmarks/ChiBenchmark/Makefile.GPU.intel
	V			{Benchmarks/ChiBenchmark → src}/chi_CPU.hpp
	V			{Benchmarks/ChiBenchmark → src}/cudafunctions.cu
	V			{Benchmarks/ChiBenchmark → src}/cudafunctions.cuh
	M			Benchmarks/ChiBenchmark/main.cpp
	V			{Benchmarks/ChiBenchmark → src}/mpi_check.h
	V			{Benchmarks/ChiBenchmark → src}/timer.h
	M			Benchmarks/ConfigFiles/219Img.txt
	M			Benchmarks/ConfigFiles/90Pot.par
	P			Benchmarks/GridGradient2Benchmark/GridGradient_CPU Copied from Benchmarks/MappingBenchmark/GridGradient_GPU
	M			Benchmarks/GridGradientBenchmark/main.cpp
	P			env_gilles_daint.sh Copied from env_gilles.sh
	A			env_gilles_greina.sh
	P			env_gilles_tave.sh Copied from env_gilles.sh
	M			src/Makefile
	M			src/Makefile.GPU.intel
	M			src/Makefile.intel
	A			src/allocation.cpp
	A			src/allocation.hpp
	A			src/allocation_GPU.cu
	A			src/allocation_GPU.cuh
	M			src/chi_CPU.cpp
	V			{src ← Benchmarks/ChiBenchmark}/chi_CPU.hpp
	A			src/chi_CPU_barycenter.cpp
	A			src/chi_CPU_barycenter.hpp
	A			src/chi_barycenter_GPU.cu
	A			src/chi_barycenter_GPU.cuh
	A			src/chi_comm.cpp
	A			src/chi_comm.hpp
	A			src/chi_computation.cpp
	A			src/chi_computation.hpp
	A			src/cpuflags.inc
	V			{src ← Benchmarks/ChiBenchmark}/cudafunctions.cu
	V			{src ← Benchmarks/ChiBenchmark}/cudafunctions.cuh
	A			src/delense_CPU.cpp
	A			src/delense_CPU.hpp
	A			src/delense_CPU_utils.hpp
	A			src/delense_GPU.cu
	A			src/delense_GPU.cuh
	A			src/delense_GPU_utils.cuh
	A			src/gpuflags.inc
	A			src/gpusm.inc
	M			src/gradient_GPU.cu
	M			src/grid_gradient_GPU.cu
	M			src/grid_gradient_GPU.cuh
	M			src/module_readParameters.cpp
	M			src/module_readParameters.hpp
	V			{src ← Benchmarks/ChiBenchmark}/mpi_check.h
	A			src/precision.inc
	M			src/structure_hpc.hpp
	V			{src ← Benchmarks/ChiBenchmark}/timer.h
	A			utils/Makefile
	P			utils/Makefile.GPU.intel Copied from Benchmarks/ConfigFiles/hff_slmodels/A2744/ellipticite/burnin.dat
	A			utils/gpu.cu
	A			utils/gpu.sh