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.

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

Fix NDims during writeDomain #84

Merged

Conversation

ax3l
Copy link
Member

@ax3l ax3l commented Oct 9, 2013

Fixes the bug for writing fields introduced with Pull #80

fieldTmp (1 component but in a 3D domain living) should have screwed up the other fields a little due to that mismatch...

@ghost ghost assigned f-schmitt Oct 9, 2013
@ax3l
Copy link
Member Author

ax3l commented Oct 9, 2013

Info: still failing, we should consider a possible splash2txt since 422ab7c bug, too

@ax3l
Copy link
Member Author

ax3l commented Oct 9, 2013

Actually it looks like I mismatched x and z somewhere image

@ax3l
Copy link
Member Author

ax3l commented Oct 9, 2013

Ok, the last bug resides in splash2txt:436

excontainer.container = dc.readDomain( options.step, iter->c_str( ), offset, domain_size, NULL );
reads one element too less per dimension for the slice.

Examples with a total Domain of 128x512x256 writing excontainer.container.getSize( ):

$ splash2txt -s 300 --offset 64 --slice xy -d fields_Density_e -o dens_e_300_new.txt h5
127
511
64

$ splash2txt -s 300 --offset 64 --slice yz -d fields_Density_e -o dens_e_300_new.txt h5                                                            
64
511
255

@ax3l
Copy link
Member Author

ax3l commented Oct 9, 2013

I think the problem resides in size[i] = std::max(...) in DataContainer::add :

...
const Dimensions &entryOffset = entry->getOffset();
const Dimensions entryEnd = entry->getEnd();

for (uint32_t i = 0; i < 3; ++i)
{
    offset[i] = std::min(entryOffset[i], offset[i]);
    size[i] = std::max(entryEnd[i] - offset[i], size[i]);
}
...

But Domain::getEnd() returns the last element (e.g. size = 256 -> it returns 255).

That's a little uncommon but fine, but we should change DataContainer::add in that case to:

...
    size[i] = std::max(entryEnd[i] + 1 - offset[i], size[i]);
...

Edit:
Btw: DataContainer::getEnd shows to the first element behind the regular elements in this Container:

Dimensions getEnd() const
{
    return offset + size;
}

That's more STL like but different to the Domain.hpp::getEnd behaviour - what do we like to agree on?

@ax3l
Copy link
Member Author

ax3l commented Oct 9, 2013

libSplash fix: see proposed pull request ComputationalRadiationPhysics/libSplash#39
PIConGPU: ready to merge 👯

@ghost ghost assigned psychocoderHPC Oct 9, 2013
psychocoderHPC added a commit that referenced this pull request Oct 10, 2013
Fix NDims during writeDomain
@psychocoderHPC psychocoderHPC merged commit 1de9061 into ComputationalRadiationPhysics:dev Oct 10, 2013
@ax3l ax3l deleted the fix/writeDomain branch October 10, 2013 10:41
ax3l pushed a commit to ax3l/picongpu that referenced this pull request Feb 17, 2015
…lRadiationPhysics/dev

Release 2.1.0crp: malloc Interface, Performance, Bugs
slizzered pushed a commit to slizzered/picongpu that referenced this pull request Sep 28, 2015
80bf2b0 Merge pull request ComputationalRadiationPhysics#102 from ComputationalRadiationPhysics/dev
ef29c73 Merge pull request ComputationalRadiationPhysics#101 from slizzered/prepare-version_2_2_crp
248539c changelog entry for 2.2.0crp
f57b59b version bump to 2.2.0crp
3b91c67 Merge pull request ComputationalRadiationPhysics#100 from slizzered/issue98-rename_uint_typedef
aeab138 the backslash is now aligned
af6b7ca changed type to match __ballot signature
17389a5 removed typedef uint32_richtig_huebsch
b5737f7 Merge pull request ComputationalRadiationPhysics#97 from slizzered/issue65-add_comment
1d0b136 Added TODO to boost_static_assert cast warning
da904d0 Merge pull request ComputationalRadiationPhysics#95 from ax3l/topic-wshadow
ca39cbc Fix Wshadow Warnings
0e7e517 Add Wshadow
65e010d Merge pull request ComputationalRadiationPhysics#93 from ax3l/doc-updateCMakeVersion
b4d0657 Add a CMake 2.8.12.2 PPA for Precise
3eb9205 Close ComputationalRadiationPhysics#92: Update CMake Version to 2.8.12.2+
bb96ed9 Merge pull request ComputationalRadiationPhysics#91 from BenjaminW3/patch-3
2fafcbd Merge pull request ComputationalRadiationPhysics#89 from BenjaminW3/patch-1
f09c782 Define __THROW for systems without Glibc
133eb65 Merge pull request ComputationalRadiationPhysics#90 from BenjaminW3/patch-2
01b2dd7 fix a spelling mistake
229c891 fix unconditional usage of getAvailableSlotsHost
1b1819a Merge pull request ComputationalRadiationPhysics#87 from BenjaminW3/fix-struct-class
5f4adf5 fix non-matching class/struct declaration
799d7d7 Merge pull request ComputationalRadiationPhysics#84 from ComputationalRadiationPhysics/dev
1314bf2 Merge pull request ComputationalRadiationPhysics#76 from ComputationalRadiationPhysics/dev
ddeae86 Merge pull request ComputationalRadiationPhysics#56 from ComputationalRadiationPhysics/dev

git-subtree-dir: thirdParty/mallocMC
git-subtree-split: 80bf2b0d0ec33bf350c5de4cc5dc11231f9ee7cd
ax3l pushed a commit to ax3l/picongpu that referenced this pull request Jun 11, 2018
4b779a34c Merge pull request ComputationalRadiationPhysics#147 from ComputationalRadiationPhysics/dev
1ca54d657 Merge pull request ComputationalRadiationPhysics#146 from ax3l/doc-changelog023
07a316488 Version: Bump 0.2.3crp
6f2f6140d Add 0.2.3crp Changelog
1749d1cae Merge pull request ComputationalRadiationPhysics#145 from ax3l/fix-activeMask
68bf353de Fix V100 Active Lanes in Warp
80bf2b0d0 Merge pull request ComputationalRadiationPhysics#102 from ComputationalRadiationPhysics/dev
799d7d7 Merge pull request ComputationalRadiationPhysics#84 from ComputationalRadiationPhysics/dev
1314bf2 Merge pull request ComputationalRadiationPhysics#76 from ComputationalRadiationPhysics/dev
ddeae86 Merge pull request ComputationalRadiationPhysics#56 from ComputationalRadiationPhysics/dev

git-subtree-dir: thirdParty/mallocMC
git-subtree-split: 4b779a34cd8ba073b24f69435d71022f3988d42e
psychocoderHPC pushed a commit to psychocoderHPC/picongpu that referenced this pull request May 9, 2019
a96b293 Merge pull request ComputationalRadiationPhysics#106 from fwyzard/cupla_accelerator_namespace
1af2b2b Merge pull request ComputationalRadiationPhysics#110 from tdd11235813/cmake-macro
663521c Changes function to macro 'CUPLA_ADD_EXECUTABLE'.
a440a7c Fix namespace definition if two accelerators are selected
64f02bb Move all accelerator-specific code to an inline namespece
bbef699 Merge pull request ComputationalRadiationPhysics#105 from fwyzard/tbb_IsThreadSeqAcc
b463a25 Mark the TBB backend as "thread sequential"
b45d4e9 Merge pull request ComputationalRadiationPhysics#102 from psychocoderHPC/topic-updateToLatestAlapkaDev
7e8b832 createTaskExec -> createTaskKernel
84b6dc1 update to latest alapka develop branch
037f7b2 Merge pull request ComputationalRadiationPhysics#100 from DerWaldschrat/dev
7add5ed fix -Wreorder in cuplaPitchedPtr (#4)
9fa745b Merge pull request ComputationalRadiationPhysics#99 from ax3l/topic-cmake312rootHints
041d454 Merge pull request ComputationalRadiationPhysics#98 from DerWaldschrat/dev-fix
ecc5839 CMake: Honor _ROOT Env Hints
24d159a Added conditional check for backends.
5822555 Add cudaEventBlockingSync to event creation
906cd41 Merge pull request ComputationalRadiationPhysics#97 from psychocoderHPC/topic-HIPBackend
bc67259 alpaka backend: HIP
87fe58d Merge pull request ComputationalRadiationPhysics#96 from psychocoderHPC/fix-kernelSharedMemCalc
68877b5 fix dynamic shared mem definition
9452a70 Merge pull request ComputationalRadiationPhysics#95 from psychocoderHPC/topic-updateDocs
8b26918 update docs
e822bfa Merge pull request ComputationalRadiationPhysics#89 from psychocoderHPC/topic-switchToAlpakaDevelop0.4.X
50cedbc alpaka renamings + cmake version incerase
5ecd227 update to alapka dev upcoming version 0.4.X
66a9240 Merge pull request ComputationalRadiationPhysics#94 from psychocoderHPC/topic-ciUpdateToCUDA8
3ba6104 CI: update CUDA from 7.5 to 8.0
5af56ce Merge pull request ComputationalRadiationPhysics#93 from psychocoderHPC/topic-updateCIToClang4
68a6555 Travis: CUDA Compiler Ignore
279bfd0 Travis: Xenial
9d583b7 CI: switch from clan 3.5 to 4.0
11eb874 Merge pull request ComputationalRadiationPhysics#92 from ax3l/topic-ciCMake3110
da617da Travis: CMake 3.11.0
da63524 Merge pull request ComputationalRadiationPhysics#91 from ComputationalRadiationPhysics/dev
66a2da7 Merge pull request ComputationalRadiationPhysics#88 from psychocoderHPC/topic-versionIncreaseTo0.1.1
e029584 version increase to 0.1.1
ffdb268 Merge pull request ComputationalRadiationPhysics#90 from psychocoderHPC/fix-tbbSelection
06030af fix TBB backend activation
aa8a921 Merge pull request ComputationalRadiationPhysics#84 from psychocoderHPC/topic-cuplaGetErrorString
55c99b7 add implementation for `cuplaGetErrorString`
c765052 Merge pull request ComputationalRadiationPhysics#86 from psychocoderHPC/topic-cuplaPeekAtLastError
49612bb Merge pull request ComputationalRadiationPhysics#87 from psychocoderHPC/topic-helpUpdatecuplaGetLastError
c763de4 Merge pull request ComputationalRadiationPhysics#85 from psychocoderHPC/topic-cuplaStreamQuerySupport
5d19923 update documentation of `cuplaGetLastError`
3806b8f implement `cuplaPeekAtLastError()`
2e79816 add `cuplaStreamQuery()`
7c73dc8 Merge pull request ComputationalRadiationPhysics#83 from psychocoderHPC/fix-cuplaGetLastError
b02299a fix `cuplaGetLastError`
1b7d7ea Merge pull request ComputationalRadiationPhysics#81 from tdd11235813/master
b0adfd9 Updates alpaka to 0.3.5.

git-subtree-dir: thirdParty/cupla
git-subtree-split: a96b293dcb14662a57901b55dfedaa1cd615adc9
psychocoderHPC pushed a commit to psychocoderHPC/picongpu that referenced this pull request May 17, 2019
a96b293 Merge pull request ComputationalRadiationPhysics#106 from fwyzard/cupla_accelerator_namespace
1af2b2b Merge pull request ComputationalRadiationPhysics#110 from tdd11235813/cmake-macro
663521c Changes function to macro 'CUPLA_ADD_EXECUTABLE'.
a440a7c Fix namespace definition if two accelerators are selected
64f02bb Move all accelerator-specific code to an inline namespece
bbef699 Merge pull request ComputationalRadiationPhysics#105 from fwyzard/tbb_IsThreadSeqAcc
b463a25 Mark the TBB backend as "thread sequential"
b45d4e9 Merge pull request ComputationalRadiationPhysics#102 from psychocoderHPC/topic-updateToLatestAlapkaDev
7e8b832 createTaskExec -> createTaskKernel
84b6dc1 update to latest alapka develop branch
037f7b2 Merge pull request ComputationalRadiationPhysics#100 from DerWaldschrat/dev
7add5ed fix -Wreorder in cuplaPitchedPtr (#4)
9fa745b Merge pull request ComputationalRadiationPhysics#99 from ax3l/topic-cmake312rootHints
041d454 Merge pull request ComputationalRadiationPhysics#98 from DerWaldschrat/dev-fix
ecc5839 CMake: Honor _ROOT Env Hints
24d159a Added conditional check for backends.
5822555 Add cudaEventBlockingSync to event creation
906cd41 Merge pull request ComputationalRadiationPhysics#97 from psychocoderHPC/topic-HIPBackend
bc67259 alpaka backend: HIP
87fe58d Merge pull request ComputationalRadiationPhysics#96 from psychocoderHPC/fix-kernelSharedMemCalc
68877b5 fix dynamic shared mem definition
9452a70 Merge pull request ComputationalRadiationPhysics#95 from psychocoderHPC/topic-updateDocs
8b26918 update docs
e822bfa Merge pull request ComputationalRadiationPhysics#89 from psychocoderHPC/topic-switchToAlpakaDevelop0.4.X
50cedbc alpaka renamings + cmake version incerase
5ecd227 update to alapka dev upcoming version 0.4.X
66a9240 Merge pull request ComputationalRadiationPhysics#94 from psychocoderHPC/topic-ciUpdateToCUDA8
3ba6104 CI: update CUDA from 7.5 to 8.0
5af56ce Merge pull request ComputationalRadiationPhysics#93 from psychocoderHPC/topic-updateCIToClang4
68a6555 Travis: CUDA Compiler Ignore
279bfd0 Travis: Xenial
9d583b7 CI: switch from clan 3.5 to 4.0
11eb874 Merge pull request ComputationalRadiationPhysics#92 from ax3l/topic-ciCMake3110
da617da Travis: CMake 3.11.0
da63524 Merge pull request ComputationalRadiationPhysics#91 from ComputationalRadiationPhysics/dev
66a2da7 Merge pull request ComputationalRadiationPhysics#88 from psychocoderHPC/topic-versionIncreaseTo0.1.1
e029584 version increase to 0.1.1
ffdb268 Merge pull request ComputationalRadiationPhysics#90 from psychocoderHPC/fix-tbbSelection
06030af fix TBB backend activation
aa8a921 Merge pull request ComputationalRadiationPhysics#84 from psychocoderHPC/topic-cuplaGetErrorString
55c99b7 add implementation for `cuplaGetErrorString`
c765052 Merge pull request ComputationalRadiationPhysics#86 from psychocoderHPC/topic-cuplaPeekAtLastError
49612bb Merge pull request ComputationalRadiationPhysics#87 from psychocoderHPC/topic-helpUpdatecuplaGetLastError
c763de4 Merge pull request ComputationalRadiationPhysics#85 from psychocoderHPC/topic-cuplaStreamQuerySupport
5d19923 update documentation of `cuplaGetLastError`
3806b8f implement `cuplaPeekAtLastError()`
2e79816 add `cuplaStreamQuery()`
7c73dc8 Merge pull request ComputationalRadiationPhysics#83 from psychocoderHPC/fix-cuplaGetLastError
b02299a fix `cuplaGetLastError`
1b7d7ea Merge pull request ComputationalRadiationPhysics#81 from tdd11235813/master
b0adfd9 Updates alpaka to 0.3.5.

git-subtree-dir: thirdParty/cupla
git-subtree-split: a96b293dcb14662a57901b55dfedaa1cd615adc9
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug a bug in the project's code component: plugin in PIConGPU plugin
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants