Diffusion tamaas 94553e902cb7

Merge branch 'gpu'
94553e902cb7
Actions

Authored by frerot on Nov 15 2017, 17:22.

Description

Merge branch 'gpu'

Details

Committed

frerot

Nov 15 2017, 17:22

Pushed

frerot

Nov 15 2017, 17:22

Parents

rTAMAASd01e5c973ef6: clearer moments code
rTAMAAS67ca4e44cdeb: updated readme

Branches

Unknown

Tags

Unknown

References

tag: thrust-gpu

Event Timeline

frerot committed rTAMAAS94553e902cb7: Merge branch 'gpu' (authored by frerot).Nov 15 2017, 17:22

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.

Commit	Author	Details	Committed
d01e5c973ef6	frerot	clearer moments code	Nov 15 2017
e5efef4d3c7c	frerot	added computation of moments (TODO implement correct test)	Nov 15 2017
c80cfa59257f	frerot	minor cleanups	Nov 15 2017
67e961750934	frerot	correct handling of gradient conditions in PKR	Nov 14 2017
f52d1730a909	frerot	updated c++ example	Nov 10 2017
1003d4e2f177	frerot	cleanup useless tests	Nov 10 2017
166723b40ead	frerot	updated readme	Nov 10 2017
84f3f89f4f46	frerot	clang-format	Nov 9 2017
bbd990f626b4	frerot	cleanup + compatibility with clang	Nov 9 2017
6fd8e54c11a4	frerot	changed iterator tag to allow thrust algos on device	Nov 9 2017
9f1e91288a10	frerot	saner code (const-correctness + defaults)	Nov 9 2017
a1637da8edd6	frerot	removed warning	Nov 9 2017
b6fe91b593c4	frerot	clarifying side effects in functionals	Nov 9 2017
81dd5f04e1bc	frerot	added cudaDeviceSynchronize in fft interface	Nov 7 2017
4c505a4941b5	frerot	removed -f options in debug flags for cuda	Nov 7 2017
3a9bbee27fb6	frerot	Merge branch 'thrust' of castor.epfl.ch:tamaas into thrust	Nov 7 2017
7405d7fd0275	frerot	added synchronize for fft test	Nov 7 2017
164d866440c2	frerot	added target names {tamaas, wrapper, tests} for scons	Nov 6 2017
e67ad1441169	frerot	using instead of typdefs in iterators	Nov 5 2017
3927fa639a53	frerot	passed clang-format on whole repository	Nov 5 2017
d069f5437129	frerot	more readable array	Nov 3 2017
e634f0066037	frerot	protecting allocator include	Nov 3 2017
30d402099764	frerot	adding fftw_malloc for SIMD aligned data allocation	Nov 3 2017
7043e94a544a	frerot	device for ApplyConstructor + cudaSync	Nov 3 2017
88e8bc9847bf	frerot	consistent apply_functor copies	Nov 3 2017
4df748b7012f	frerot	fixing rvalue functor bug by making copy	Nov 3 2017
c6b27f90032a	frerot	Merge branch 'gpu' into thrust	Nov 2 2017
dd65fd640204	frerot	added test for model and influence coeffs	Nov 2 2017
f676e684c984	frerot	added c++ tests for fft interface	Nov 2 2017
a0869ea06429	frerot	rewrote loops with thrust	Nov 1 2017
53b9b1ac6cc4	frerot	adding synchronize in test	Nov 1 2017
93055b409b13	frerot	test for loop interface with thrust	Nov 1 2017
209b1173d70d	frerot	small test of thrust capacities	Nov 1 2017
b3c9bf19b545	frerot	passing for_each loops tests	Nov 1 2017
8ef9e8b95c5b	frerot	make everything compile with -G	Oct 31 2017
b366bc3c68d8	frerot	simplified for testing	Oct 31 2017
2e578b066372	frerot	removing unused code	Oct 31 2017
2be5a950ade8	frerot	getting the cuda loops to compile (return of the lambda)	Oct 31 2017
0d1eb492274b	frerot	getting the cuda loops to compile	Oct 31 2017
c952c8e72bb7	frerot	trying to adapt code to cuda	Oct 30 2017
d75a65d09d21	frerot	removed Loop singleton	Oct 30 2017
01bc15346e7f	frerot	added some documentation to classes	Oct 28 2017
b59fa1b6aab3	frerot	added enumeration helper in Loop	Oct 28 2017
f31c9478eeb0	frerot	implemented matrices for strided loops	Oct 27 2017
f76320c57280	frerot	added strided loops	Oct 27 2017
0ca44f94ddd0	frerot	added Statistics class	Oct 26 2017
a79f64962579	frerot	added @file tag for documentation	Oct 26 2017
a757e2311dc9	frerot	rewrote polonsky with lambda-loops	Oct 26 2017
68d26a7bbdf2	frerot	changed vectorial operators	Oct 25 2017
095106192bbb	frerot	c++14 pulls + passing tests	Oct 25 2017

Changes (140)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

		Path
A		.clang-format
M		SConstruct
M		examples/SConstruct
M		examples/rough_surface.cc
P		examples/site_scons/site_init.py Copied from site_scons/site_init.py
M		python/SConscript
M		python/surface.i
M		python/surface_statistics.i
M		python/tamaas.i
P		site_scons/site_init.py Copied to examples/site_scons/site_init.py
A		site_scons/site_tools/nvcc.py
M		site_scons/site_tools/swig.py
M		src/SConscript
M		src/bem/bem_fft_base.cpp
M		src/bem/bem_fft_base.hh
M		src/bem/bem_functional.cpp
M		src/bem/bem_functional.hh
M		src/bem/bem_gigi.cpp
M		src/bem/bem_gigi.hh
M		src/bem/bem_gigipol.cpp
M		src/bem/bem_gigipol.hh
M		src/bem/bem_grid.cpp
M		src/bem/bem_grid.hh
M		src/bem/bem_grid_condat.cpp
M		src/bem/bem_grid_condat.hh
M		src/bem/bem_grid_kato.cpp
M		src/bem/bem_grid_kato.hh
M		src/bem/bem_grid_polonski.cpp
M		src/bem/bem_grid_polonski.hh
M		src/bem/bem_grid_teboulle.cpp
P		src/bem/bem_grid_teboulle.hh Copied to src/core/statistics.hh
M		src/bem/bem_interface.hh
M		src/bem/bem_kato.cpp
M		src/bem/bem_kato.hh
M		src/bem/bem_meta_functional.cpp
M		src/bem/bem_meta_functional.hh
M		src/bem/bem_penalty.cpp
M		src/bem/bem_penalty.hh
M		src/bem/bem_polonski.cpp
M		src/bem/bem_polonski.hh
M		src/bem/bem_uzawa.cpp
M		src/bem/bem_uzawa.hh
M		src/bem/complimentary_term_functional.cpp
M		src/bem/complimentary_term_functional.hh
M		src/bem/elastic_energy_functional.cpp
M		src/bem/elastic_energy_functional.hh
M		src/bem/exponential_adhesion_functional.cpp
M		src/bem/exponential_adhesion_functional.hh
M		src/bem/maugis_adhesion_functional.cpp
M		src/bem/maugis_adhesion_functional.hh
M		src/bem/squared_exponential_adhesion_functional.cpp
M		src/bem/squared_exponential_adhesion_functional.hh
M		src/core/array.hh
M		src/core/fft_plan_manager.cpp
M		src/core/fft_plan_manager.hh
M		src/core/fftransform.cpp
M		src/core/fftransform.hh
M		src/core/fftransform_fftw.cpp
P		src/core/fftransform_fftw.hh Copied to src/gpu/fftransform_cufft.hh
P		src/core/fftw_allocator.hh Copied from src/core/tamaas.cpp
M		src/core/grid.cpp
M		src/core/grid.hh
M		src/core/grid_base.hh
P		src/core/grid_hermitian.cpp Copied to multiple locations: src/core/loop.cpp tests/test_model.cpp
M		src/core/grid_hermitian.hh
M		src/core/grid_tmpl.hh
M		src/core/grid_view.hh
M		src/core/iterator.hh
P		src/core/loop.cpp Copied from src/core/grid_hermitian.cpp
A		src/core/loop.hh
A	(dir)	src/core/loops/
A		src/core/loops/apply.hh
A		src/core/loops/loop_utils.hh
A		src/core/static_types.hh
A		src/core/statistics.cpp
P		src/core/statistics.hh Copied from src/bem/bem_grid_teboulle.hh
M		src/core/surface.cpp
M		src/core/surface.hh
M		src/core/surface_complex.hh
M		src/core/surface_statistics.hh
D		src/core/surface_timer.cpp
D		src/core/surface_timer.hh
P		src/core/tamaas.cpp Copied to src/core/fftw_allocator.hh
M		src/core/tamaas.hh
M		src/core/types.cpp
M		src/core/types.hh
A	(dir)	src/gpu/
A		src/gpu/fftransform_cufft.cpp
P		src/gpu/fftransform_cufft.hh Copied from src/core/fftransform_fftw.hh
P		src/gpu/unified_allocator.hh Copied from src/surface/filter.hh
M		src/model/be_engine.hh
M		src/model/elastic_functional.cpp
M		src/model/elastic_functional.hh
M		src/model/functional.hh
M		src/model/meta_functional.cpp
M		src/model/meta_functional.hh
M		src/model/model.cpp
M		src/model/model.hh
M		src/model/model_factory.cpp
M		src/model/model_factory.hh
M		src/model/model_template.cpp
M		src/model/model_template.hh
M		src/model/model_type.cpp
M		src/model/model_type.hh
M		src/model/westergaard.cpp
M		src/model/westergaard.hh
M		src/percolation/flood_fill.cpp
M		src/percolation/flood_fill.hh
M		src/python/grid_python.hh
M		src/python/surface_python.hh
M		src/solvers/contact_solver.cpp
M		src/solvers/contact_solver.hh
M		src/solvers/polonsky_keer_rey.cpp
M		src/solvers/polonsky_keer_rey.hh
P		src/surface/filter.hh Copied to src/gpu/unified_allocator.hh
M		src/surface/isopowerlaw.cpp
M		src/surface/isopowerlaw.hh
M		src/surface/surface_generator.cpp
M		src/surface/surface_generator.hh
M		src/surface/surface_generator_filter.cpp
M		src/surface/surface_generator_filter.hh
M		src/surface/surface_generator_filter_fft.cpp
M		src/surface/surface_generator_filter_fft.hh
M		tests/SConscript
A		tests/test.hh
M		tests/test_autocorrelation.py
A		tests/test_fft.cpp
M		tests/test_fftransform.py
M		tests/test_flood_fill.py
M		tests/test_grid.cpp
M		tests/test_hertz_adhesion.py
M		tests/test_hertz_disp.py
M		tests/test_hertz_kato.py
M		tests/test_hertz_pressure.py
A		tests/test_loop.cpp
P		tests/test_model.cpp Copied from src/core/grid_hermitian.cpp
M		tests/test_patch_westergaard.py
M		tests/test_saturated_pressure.py
M		tests/test_westergaard.py
M		version.py