Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix/assign #103

Merged
merged 8 commits into from
Nov 14, 2013
Merged

Fix/assign #103

merged 8 commits into from
Nov 14, 2013

Conversation

heikoburau
Copy link
Member

fix issue #41

Heikman added 3 commits November 13, 2013 14:52
remove HDINLINEs for pure host functions
3b3ff21 
- add PMACC_NO_NVCC_HDWARNING to CartBuffer::assign
simplify SphericMapper.hpp
62c04f0 
- outsource ForeachKernel
add cuSTL runtime foreach
0525d76 
runtime means that the cuda block size is given at runtime
@ghost ghost assigned psychocoderHPC Nov 13, 2013
ax3l
ax3l reviewed Nov 13, 2013
View reviewed changes
src/libPMacc/include/cuSTL/algorithm/kernel/detail/ForeachKernel.hpp
#define SHIFTACCESS_CURSOR(Z, N, _) forward(c ## N [cellIndex])

#define KERNEL_FOREACH(Z, N, _) \
template<typename Mapper, BOOST_PP_ENUM_PARAMS(N, typename C), typename Functor> \
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pls add comments style guide

@ax3l
Copy link
Member

ax3l commented Nov 13, 2013

👍

psychocoderHPC
psychocoderHPC reviewed Nov 14, 2013
View reviewed changes
src/libPMacc/include/cuSTL/algorithm/kernel/detail/SphericMapper.hpp
@@ -95,16 +102,10 @@ class SphericMapper<2, BlockDim>
};

template<typename BlockDim>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it real BlockDim (e.g 1,2,3) or is it the size of the block? Than I think you should write BlockSize.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's BlockSize

@ax3l
Copy link
Member

ax3l commented Nov 14, 2013

Ah, very pretty now. Thx!

@psychocoderHPC
Copy link
Member

👍

psychocoderHPC added a commit that referenced this pull request Nov 14, 2013
@psychocoderHPC
Merge pull request #103 from Heikman/fix/assign
1100fda 
Fix/assign
@psychocoderHPC psychocoderHPC merged commit 1100fda into ComputationalRadiationPhysics:dev Nov 14, 2013
@ax3l ax3l mentioned this pull request Nov 28, 2013
Closed
ax3l added a commit to ax3l/picongpu that referenced this pull request Dec 6, 2013
@ax3l
Update and Split Code
82b6ed2 
- update to libSplash 1.0 calls
- move functors into separate file
- remove cuSTL assign work-around for device buffers
  (that was fixed with ComputationalRadiationPhysics#103)
- update with new frame/particle syntax
ax3l added a commit to ax3l/picongpu that referenced this pull request Apr 8, 2014
@ax3l
Update and Split Code
10d163f 
- update to libSplash 1.0 calls
- move functors into separate file
- remove cuSTL assign work-around for device buffers
  (that was fixed with ComputationalRadiationPhysics#103)
- update with new frame/particle syntax
ax3l added a commit to ax3l/picongpu that referenced this pull request Apr 8, 2014
@ax3l
Update and Split Code
71b7e48 
- update to libSplash 1.0 calls
- move functors into separate file
- remove cuSTL assign work-around for device buffers
  (that was fixed with ComputationalRadiationPhysics#103)
- update with new frame/particle syntax
ax3l added a commit to ax3l/picongpu that referenced this pull request Apr 8, 2014
@ax3l
Update and Split Code
054271c 
- update to libSplash 1.0 calls
- move functors into separate file
- remove cuSTL assign work-around for device buffers
  (that was fixed with ComputationalRadiationPhysics#103)
- update with new frame/particle syntax
ax3l added a commit to ax3l/picongpu that referenced this pull request Apr 9, 2014
@ax3l
Update and Split Code
63b1a22 
- update to libSplash 1.0 calls
- move functors into separate file
- remove cuSTL assign work-around for device buffers
  (that was fixed with ComputationalRadiationPhysics#103)
- update with new frame/particle syntax
ax3l added a commit to ax3l/picongpu that referenced this pull request Apr 9, 2014
@ax3l
Update and Split Code
5c101a4 
- update to libSplash 1.0 calls
- move functors into separate file
- remove cuSTL assign work-around for device buffers
  (that was fixed with ComputationalRadiationPhysics#103)
- update with new frame/particle syntax
ax3l added a commit to ax3l/picongpu that referenced this pull request Apr 11, 2014
@ax3l
Update and Split Code
78b642f 
- update to libSplash 1.0 calls
- move functors into separate file
- remove cuSTL assign work-around for device buffers
  (that was fixed with ComputationalRadiationPhysics#103)
- update with new frame/particle syntax
ax3l added a commit to ax3l/picongpu that referenced this pull request Apr 12, 2014
@ax3l
Update and Split Code
8a4cf39 
- update to libSplash 1.0 calls
- move functors into separate file
- remove cuSTL assign work-around for device buffers
  (that was fixed with ComputationalRadiationPhysics#103)
- update with new frame/particle syntax
ax3l added a commit to ax3l/picongpu that referenced this pull request Apr 12, 2014
@ax3l
Update and Split Code
8ae844d 
- update to libSplash 1.0 calls
- move functors into separate file
- remove cuSTL assign work-around for device buffers
  (that was fixed with ComputationalRadiationPhysics#103)
- update with new frame/particle syntax
ax3l added a commit to ax3l/picongpu that referenced this pull request Apr 14, 2014
@ax3l
Update and Split Code
3dae11c 
- update to libSplash 1.0 calls
- move functors into separate file
- remove cuSTL assign work-around for device buffers
  (that was fixed with ComputationalRadiationPhysics#103)
- update with new frame/particle syntax
ax3l added a commit to ax3l/picongpu that referenced this pull request Apr 14, 2014
@ax3l
Update and Split Code
bcfb41e 
- update to libSplash 1.0 calls
- move functors into separate file
- remove cuSTL assign work-around for device buffers
  (that was fixed with ComputationalRadiationPhysics#103)
- update with new frame/particle syntax
ax3l added a commit to ax3l/picongpu that referenced this pull request Apr 15, 2014
@ax3l
Update and Split Code
483def5 
- update to libSplash 1.0 calls
- move functors into separate file
- remove cuSTL assign work-around for device buffers
  (that was fixed with ComputationalRadiationPhysics#103)
- update with new frame/particle syntax
ax3l added a commit to ax3l/picongpu that referenced this pull request Apr 15, 2014
@ax3l
Update and Split Code
479bdfc 
- update to libSplash 1.0 calls
- move functors into separate file
- remove cuSTL assign work-around for device buffers
  (that was fixed with ComputationalRadiationPhysics#103)
- update with new frame/particle syntax
ax3l added a commit to ax3l/picongpu that referenced this pull request Apr 15, 2014
@ax3l
Update and Split Code
71ac89a 
- update to libSplash 1.0 calls
- move functors into separate file
- remove cuSTL assign work-around for device buffers
  (that was fixed with ComputationalRadiationPhysics#103)
- update with new frame/particle syntax
sbastrakov pushed a commit to sbastrakov/picongpu that referenced this pull request Sep 19, 2019
@sbastrakov
Squashed 'thirdParty/cupla/' changes from a96b293..7c330a5
d878817 
7c330a5 Merge pull request ComputationalRadiationPhysics#112 from psychocoderHPC/topic-standaloneHeader
d84f2fd configuration header
6a97c1c Merge pull request ComputationalRadiationPhysics#113 from fwyzard/dev_cuplaGetErrorName
d210a37 Add cuplaGetErrorName with the same functionality as cuplaGetErrorString
d050bf3 Merge pull request ComputationalRadiationPhysics#111 from tdd11235813/doc-subtree
19cf469 Describes how to pull subtree as generic git author.
4ecc143 Merge pull request ComputationalRadiationPhysics#103 from tdd11235813/dev
16c806e Merge pull request ComputationalRadiationPhysics#104 from tdd11235813/dev-targets
fd37e7b Alpaka as git subtree instead of git submodule.
69b79bd Merge commit '16b4551075f93cdd71309433b02936a152dfee9f' as 'alpaka'
16b4551 Squashed 'alpaka/' content from commit 0a2b6161
fa5cc52 Removes alpaka git module.
67485d5 Some stylistic changes.
4f2b9c0 CUPLA_ADD_EXECUTABLE links cupla target. Target provides c++11.

git-subtree-dir: thirdParty/cupla
git-subtree-split: 7c330a5a9285b79fdc0929acff5cb685f51f041a
psychocoderHPC pushed a commit to psychocoderHPC/picongpu that referenced this pull request Oct 28, 2019
@psychocoderHPC
Squashed 'thirdParty/cupla/' changes from a96b293dc..4578ae151
9c93042 
4578ae151 Merge pull request ComputationalRadiationPhysics#128 from psychocoderHPC/topic-updateAlpakaToCurrent0.4.0dev
0c090e536 Merge commit 'dd8afa5cec90a1398b8da3f9cd7d30aa59664cb5' into topic-updateAlpakaToCurrent0.4.0dev
dd8afa5ce Squashed 'alpaka/' changes from 0a2b6161..d5e59590
767768a88 rename alpaka queue names
8c227fbb6 Merge pull request ComputationalRadiationPhysics#130 from psychocoderHPC/fix-configHeaderTest
a6c3da536 fix `config header` test
a439c9d6b Merge pull request ComputationalRadiationPhysics#129 from psychocoderHPC/topic-updateTravisCMakeTo3.15.4
2e0daaf1b update tavis CMake to 3.15.4
04698e9c6 Merge pull request ComputationalRadiationPhysics#123 from SimeonEhrig/ci_enable_backends
25e64b623 time command add to ci test
c559bf432 Merge pull request ComputationalRadiationPhysics#107 from SimeonEhrig/init-gitlab-ci
488a2e95f Merge pull request ComputationalRadiationPhysics#117 from tdd11235813/pr-fixes-atomics
c2916be68 Adds atomicAnd, atomicXor, atomicOr.
7c330a5a9 Merge pull request ComputationalRadiationPhysics#112 from psychocoderHPC/topic-standaloneHeader
d84f2fdea configuration header
6a97c1cf1 Merge pull request ComputationalRadiationPhysics#113 from fwyzard/dev_cuplaGetErrorName
d210a37a0 Add cuplaGetErrorName with the same functionality as cuplaGetErrorString
d050bf3cd Merge pull request ComputationalRadiationPhysics#111 from tdd11235813/doc-subtree
19cf46913 Describes how to pull subtree as generic git author.
4ecc143f4 Merge pull request ComputationalRadiationPhysics#103 from tdd11235813/dev
16c806e68 Merge pull request ComputationalRadiationPhysics#104 from tdd11235813/dev-targets
43fd52319 Add gitlab-ci.yml for GitLab CI tests
fd37e7b7d Alpaka as git subtree instead of git submodule.
16b455107 Squashed 'alpaka/' content from commit 0a2b6161
69b79bd95 Merge commit '16b4551075f93cdd71309433b02936a152dfee9f' as 'alpaka'
fa5cc5260 Removes alpaka git module.
67485d510 Some stylistic changes.
4f2b9c019 CUPLA_ADD_EXECUTABLE links cupla target. Target provides c++11.

git-subtree-dir: thirdParty/cupla
git-subtree-split: 4578ae151ee6ac5c7810f76ff0c3a4506158807d
psychocoderHPC pushed a commit to psychocoderHPC/picongpu that referenced this pull request Jan 8, 2020
@psychocoderHPC
Squashed 'thirdParty/cupla/' changes from a96b293dc..0594a68a0
d648896 
0594a68a0 Merge pull request ComputationalRadiationPhysics#140 from psychocoderHPC/topic-cuplaTargetBehavior
0991f2c6e compile cupla interfaces into static cupla library
914a87133 Merge pull request ComputationalRadiationPhysics#136 from psychocoderHPC/topic-refactorKernelExecution
0027076c7 Merge pull request ComputationalRadiationPhysics#137 from psychocoderHPC/topic-supportForAlpakaOMP4Backend
d2b118662 Merge pull request ComputationalRadiationPhysics#139 from psychocoderHPC/fix-configHeader
16c084970 support for alpaka OMP4 backend
e990d63c5 fix config header
e2048f565 refactor cupla kernel execution
d5f969a93 Merge pull request ComputationalRadiationPhysics#132 from sbastrakov/doc-clarifyIncludeOrder
cca400a60 Clarify documentation of inclusion order
4578ae151 Merge pull request ComputationalRadiationPhysics#128 from psychocoderHPC/topic-updateAlpakaToCurrent0.4.0dev
0c090e536 Merge commit 'dd8afa5cec90a1398b8da3f9cd7d30aa59664cb5' into topic-updateAlpakaToCurrent0.4.0dev
dd8afa5ce Squashed 'alpaka/' changes from 0a2b6161..d5e59590
767768a88 rename alpaka queue names
8c227fbb6 Merge pull request ComputationalRadiationPhysics#130 from psychocoderHPC/fix-configHeaderTest
a6c3da536 fix `config header` test
a439c9d6b Merge pull request ComputationalRadiationPhysics#129 from psychocoderHPC/topic-updateTravisCMakeTo3.15.4
2e0daaf1b update tavis CMake to 3.15.4
04698e9c6 Merge pull request ComputationalRadiationPhysics#123 from SimeonEhrig/ci_enable_backends
25e64b623 time command add to ci test
c559bf432 Merge pull request ComputationalRadiationPhysics#107 from SimeonEhrig/init-gitlab-ci
488a2e95f Merge pull request ComputationalRadiationPhysics#117 from tdd11235813/pr-fixes-atomics
c2916be68 Adds atomicAnd, atomicXor, atomicOr.
7c330a5a9 Merge pull request ComputationalRadiationPhysics#112 from psychocoderHPC/topic-standaloneHeader
d84f2fdea configuration header
6a97c1cf1 Merge pull request ComputationalRadiationPhysics#113 from fwyzard/dev_cuplaGetErrorName
d210a37a0 Add cuplaGetErrorName with the same functionality as cuplaGetErrorString
d050bf3cd Merge pull request ComputationalRadiationPhysics#111 from tdd11235813/doc-subtree
19cf46913 Describes how to pull subtree as generic git author.
4ecc143f4 Merge pull request ComputationalRadiationPhysics#103 from tdd11235813/dev
16c806e68 Merge pull request ComputationalRadiationPhysics#104 from tdd11235813/dev-targets
43fd52319 Add gitlab-ci.yml for GitLab CI tests
fd37e7b7d Alpaka as git subtree instead of git submodule.
16b455107 Squashed 'alpaka/' content from commit 0a2b6161
69b79bd95 Merge commit '16b4551075f93cdd71309433b02936a152dfee9f' as 'alpaka'
fa5cc5260 Removes alpaka git module.
67485d510 Some stylistic changes.
4f2b9c019 CUPLA_ADD_EXECUTABLE links cupla target. Target provides c++11.

git-subtree-dir: thirdParty/cupla
git-subtree-split: 0594a68a0d9bdbfc949391f83473d4734575a7f5
psychocoderHPC pushed a commit to psychocoderHPC/picongpu that referenced this pull request Mar 10, 2020
@psychocoderHPC
Squashed 'thirdParty/cupla/' changes from a96b293dc..36f6ca909
512a9a2 
36f6ca909 refactor cupla kernel execution
d5f969a93 Merge pull request ComputationalRadiationPhysics#132 from sbastrakov/doc-clarifyIncludeOrder
cca400a60 Clarify documentation of inclusion order
4578ae151 Merge pull request ComputationalRadiationPhysics#128 from psychocoderHPC/topic-updateAlpakaToCurrent0.4.0dev
0c090e536 Merge commit 'dd8afa5cec90a1398b8da3f9cd7d30aa59664cb5' into topic-updateAlpakaToCurrent0.4.0dev
dd8afa5ce Squashed 'alpaka/' changes from 0a2b6161..d5e59590
767768a88 rename alpaka queue names
8c227fbb6 Merge pull request ComputationalRadiationPhysics#130 from psychocoderHPC/fix-configHeaderTest
a6c3da536 fix `config header` test
a439c9d6b Merge pull request ComputationalRadiationPhysics#129 from psychocoderHPC/topic-updateTravisCMakeTo3.15.4
2e0daaf1b update tavis CMake to 3.15.4
04698e9c6 Merge pull request ComputationalRadiationPhysics#123 from SimeonEhrig/ci_enable_backends
25e64b623 time command add to ci test
c559bf432 Merge pull request ComputationalRadiationPhysics#107 from SimeonEhrig/init-gitlab-ci
488a2e95f Merge pull request ComputationalRadiationPhysics#117 from tdd11235813/pr-fixes-atomics
c2916be68 Adds atomicAnd, atomicXor, atomicOr.
7c330a5a9 Merge pull request ComputationalRadiationPhysics#112 from psychocoderHPC/topic-standaloneHeader
d84f2fdea configuration header
6a97c1cf1 Merge pull request ComputationalRadiationPhysics#113 from fwyzard/dev_cuplaGetErrorName
d210a37a0 Add cuplaGetErrorName with the same functionality as cuplaGetErrorString
d050bf3cd Merge pull request ComputationalRadiationPhysics#111 from tdd11235813/doc-subtree
19cf46913 Describes how to pull subtree as generic git author.
4ecc143f4 Merge pull request ComputationalRadiationPhysics#103 from tdd11235813/dev
16c806e68 Merge pull request ComputationalRadiationPhysics#104 from tdd11235813/dev-targets
43fd52319 Add gitlab-ci.yml for GitLab CI tests
fd37e7b7d Alpaka as git subtree instead of git submodule.
16b455107 Squashed 'alpaka/' content from commit 0a2b6161
69b79bd95 Merge commit '16b4551075f93cdd71309433b02936a152dfee9f' as 'alpaka'
fa5cc5260 Removes alpaka git module.
67485d510 Some stylistic changes.
4f2b9c019 CUPLA_ADD_EXECUTABLE links cupla target. Target provides c++11.

git-subtree-dir: thirdParty/cupla
git-subtree-split: 36f6ca90972028fbf45e0aa5ed4fd7c9ea50f03a
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@psychocoderHPC psychocoderHPC

Labels
bug a bug in the project's code component: PMacc in PMacc
Projects
None yet
Milestone
0.2.0: Open Beta
Development

Successfully merging this pull request may close these issues.
3 participants
@heikoburau @ax3l @psychocoderHPC