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

Release 2.2.0crp #102

Merged
merged 29 commits into from
Sep 25, 2015
Merged

Release 2.2.0crp #102

merged 29 commits into from
Sep 25, 2015

Conversation

slizzered
Copy link
Contributor

No description provided.

ax3l and others added 29 commits February 17, 2015 18:01
 - use: std::vector<HeapInfo> mallocMC::getHeapLocations()
 - uses a vector, since future allocators might have more than 1 heap
   (and those are not necessarily located one after another)
 - currently, HeapInfo contains size and a pointer p
 - the pointer is the device address (as it would be returned my
   cudaMalloc for example)
 - the CUDA toolkit allocator will currently return NULL. Ideas very
   welcome. Problem: we have no pointer address for its internal heap
   (might be multiple heaps, who knows). Also, we don't know how objects
   are organized on the heap, so copying to host might be of limited
   value anyway.
- add typedef for `vector<HeapInfo>` in `mallocMC_hostclass`
- add missing includes `<vector>`
added host function to return heap pointer
fix non-matching class/struct declaration
Currently the `getAvailableSlotsHost` function of a `CreationPolicy` is required irrespective of its availability.
In the [source](https://github.com/ComputationalRadiationPhysics/mallocMC/blob/84c8c20309633c98f69be83153eb897ce2d83110/src/include/mallocMC/mallocMC_hostclass.hpp#L144-155) the `CreationPolicy::providesAvailableSlots::value` flag is checked in a runtime `if` so the function is required for all CreationPolicies even for `OldMalloc`.
This has been changed to a compile time construct.
differenciate -> differentiate
__THROW is defined in Glibc so it is not available on all platforms.
The safest way to fix this is to define it empty for platforms where it is not available.
Maybe it is also safe to remove it completely.
fix unconditional usage of getAvailableSlotsHost
Define __THROW for systems without Glibc
Require CMake 2.8.12.2+ for the whole project to
ensure the full build chain until a project that
is using the FindmallocMC.cmake module will pass.

Dependency increase in
  ComputationalRadiationPhysics/cmake-modules#8
Close #92: Update CMake Version to 2.8.12.2+
GCC:
 - Wshadow
 - Werror (used in compile suite)

ICC:
 - Wshadow
 - Since the warning (and the cast necessary to suppress it) are solved
   in newer versions of nvcc/gcc, one bright day in the future might
   permit us to remove that dreadful cast again.
Added TODO to boost_static_assert cast warning
 - replaced by `uint32_t` from `<boost/cstdint.hpp>`
ax3l added a commit that referenced this pull request Sep 25, 2015
@ax3l ax3l merged commit 80bf2b0 into master Sep 25, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants