Merge Master ChangeLog #112
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- @f-schmitt-zih thx!
Release/beta rc2
ghost
assigned
psychocoderHPC
pushed a commit
to psychocoderHPC/picongpu
that referenced
this pull request
Feb 6, 2017
977b55f Merge pull request ComputationalRadiationPhysics#141 from ax3l/doc-usagelink 0f79cd5 Link Usage.md 8415cb1 Merge pull request ComputationalRadiationPhysics#140 from psychocoderHPC/topic-makeAllocatorSelfConstistent ee6f58e update examples 8822cb0 remove `finalizeHeap()` from `creationPolicies` ebb37f5 update `Usage.md` 66785ac selfe consistent allocator a036d5c Merge pull request ComputationalRadiationPhysics#135 from psychocoderHPC/fix-missingPoolSizeReset 449bc7b Merge pull request ComputationalRadiationPhysics#136 from psychocoderHPC/topic-destructiveResize b2e0d76 add `destructiveResize` method d0ecb62 fix missing local size change in `finalizeHeap()` 9c58f4d Merge pull request ComputationalRadiationPhysics#133 from psychocoderHPC/fix-ptxSpecialRegisterUsage 4cd47f0 fix missing '%%' to use ptx special register cee846f Merge pull request ComputationalRadiationPhysics#127 from slizzered/documentation-add-thesis b92f67f Merge pull request ComputationalRadiationPhysics#128 from slizzered/travis-fix_Werror 53e86b4 simpler handling of CXX_FLAGS d2c4e08 Merge pull request ComputationalRadiationPhysics#126 from slizzered/fix_115 85143c0 Updated Readme.md 5f84db9 fixed string concatenation eb1ad2d Fix to travis file: -Werror ad72a61 Check heap pointer in Scatter creation policy ffa4f7e Merge pull request ComputationalRadiationPhysics#125 from ComputationalRadiationPhysics/slizzered-patch-1 368478c moar fixes a0bd2eb Update Usage.md 69a6973 Merge pull request ComputationalRadiationPhysics#109 from Flamefire/staticConstexpr 638fa5b Use BOOST_STATIC_CONSTEXPR c0c6450 Merge pull request ComputationalRadiationPhysics#116 from slizzered/issue113-separate_object_host_device 4070f40 some renamig and freeing at end of examples b9fe440 added implicit conversion to device handle 7f742b8 fixed OldMalloc policy to comply with new interface 0de5416 removed unnecessary inheritance 28c52c2 fixed a return type to comply with defined interface 503f0bd changed pointer to handle d281cbe replaced initHeap function with constructor 74ba8aa Replaced the global __device__ object 4fa2d75 Merge pull request ComputationalRadiationPhysics#121 from ax3l/fix-cincludes d99a6f3 Fix: Includes from C headers b52c2b2 Merge pull request ComputationalRadiationPhysics#119 from ax3l/fix-travis eb096f7 Updating to Travis-CI Trusty Beta 93ab74b Merge pull request ComputationalRadiationPhysics#112 from slizzered/issue110-error-handling 90881fd Fixed problems leading to uninitialized pointers 8980ead Merge pull request ComputationalRadiationPhysics#108 from Flamefire/exampleC++11 a92d4e1 Rename some shadowed variables in C++11 mode git-subtree-dir: thirdParty/mallocMC git-subtree-split: 977b55f98fe0e6e4545f6e092660b7b4f1b54493
sbastrakov
pushed a commit
to sbastrakov/picongpu
that referenced
this pull request
Sep 19, 2019
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
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
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
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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Convenience update from the merged release branch to keep the ChangeLog of the
devbranch sync.