Skip to content
Snippets Groups Projects
Commit 680664cb authored by 数学の武士's avatar 数学の武士
Browse files

hotfix

parent 47f1edf5
No related branches found
No related tags found
No related merge requests found
...@@ -2,6 +2,8 @@ ...@@ -2,6 +2,8 @@
#include "TemplateParameters.h" #include "TemplateParameters.h"
#include <cstddef> #include <cstddef>
namespace memproc
{
template <MemType memtype> template <MemType memtype>
bool realloc(void *&array, size_t &allocated_size, const size_t new_size); bool realloc(void *&array, size_t &allocated_size, const size_t new_size);
...@@ -10,3 +12,4 @@ bool dealloc(void *&array, size_t &allocated_size); ...@@ -10,3 +12,4 @@ bool dealloc(void *&array, size_t &allocated_size);
template <MemType dst_memtype, MemType src_memtype> template <MemType dst_memtype, MemType src_memtype>
bool memcopy(void *dst, const void* src, const size_t copy_elem_size); bool memcopy(void *dst, const void* src, const size_t copy_elem_size);
}
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
#include <cstring> #include <cstring>
template<> template<>
bool dealloc<MemType::CPU>(void *&array, size_t &allocated_size) bool memproc::dealloc<MemType::CPU>(void *&array, size_t &allocated_size)
{ {
if(allocated_size > 0) if(allocated_size > 0)
{ {
...@@ -15,7 +15,7 @@ bool dealloc<MemType::CPU>(void *&array, size_t &allocated_size) ...@@ -15,7 +15,7 @@ bool dealloc<MemType::CPU>(void *&array, size_t &allocated_size)
} }
template <> template <>
bool realloc<MemType::CPU>(void *&array, size_t &allocated_size, const size_t new_size) bool memproc::realloc<MemType::CPU>(void *&array, size_t &allocated_size, const size_t new_size)
{ {
if(new_size > allocated_size) if(new_size > allocated_size)
{ {
...@@ -29,7 +29,7 @@ bool realloc<MemType::CPU>(void *&array, size_t &allocated_size, const size_t ne ...@@ -29,7 +29,7 @@ bool realloc<MemType::CPU>(void *&array, size_t &allocated_size, const size_t ne
} }
template <> template <>
bool memcopy<MemType::CPU, MemType::CPU>(void *dst, const void* src, const size_t copy_elem_size) bool memproc::memcopy<MemType::CPU, MemType::CPU>(void *dst, const void* src, const size_t copy_elem_size)
{ {
memcpy(dst, src, copy_elem_size); memcpy(dst, src, copy_elem_size);
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
#include <cuda_runtime_api.h> #include <cuda_runtime_api.h>
template<> template<>
bool dealloc<MemType::GPU>(void *&array, size_t &allocated_size) bool memproc::dealloc<MemType::GPU>(void *&array, size_t &allocated_size)
{ {
if(allocated_size > 0) if(allocated_size > 0)
{ {
...@@ -15,7 +15,7 @@ bool dealloc<MemType::GPU>(void *&array, size_t &allocated_size) ...@@ -15,7 +15,7 @@ bool dealloc<MemType::GPU>(void *&array, size_t &allocated_size)
} }
template <> template <>
bool realloc<MemType::GPU>(void *&array, size_t &allocated_size, const size_t new_size) bool memproc::realloc<MemType::GPU>(void *&array, size_t &allocated_size, const size_t new_size)
{ {
if(new_size > allocated_size) if(new_size > allocated_size)
{ {
...@@ -29,7 +29,7 @@ bool realloc<MemType::GPU>(void *&array, size_t &allocated_size, const size_t ne ...@@ -29,7 +29,7 @@ bool realloc<MemType::GPU>(void *&array, size_t &allocated_size, const size_t ne
} }
template <> template <>
bool memcopy<MemType::GPU, MemType::CPU>(void *dst, const void* src, const size_t copy_elem_size) bool memproc::memcopy<MemType::GPU, MemType::CPU>(void *dst, const void* src, const size_t copy_elem_size)
{ {
cudaMemcpy ( dst, src, copy_elem_size, cudaMemcpyHostToDevice); cudaMemcpy ( dst, src, copy_elem_size, cudaMemcpyHostToDevice);
...@@ -37,14 +37,14 @@ bool memcopy<MemType::GPU, MemType::CPU>(void *dst, const void* src, const size_ ...@@ -37,14 +37,14 @@ bool memcopy<MemType::GPU, MemType::CPU>(void *dst, const void* src, const size_
} }
template <> template <>
bool memcopy<MemType::CPU, MemType::GPU>(void *dst, const void* src, const size_t copy_elem_size) bool memproc::memcopy<MemType::CPU, MemType::GPU>(void *dst, const void* src, const size_t copy_elem_size)
{ {
cudaMemcpy ( dst, src, copy_elem_size, cudaMemcpyDeviceToHost); cudaMemcpy ( dst, src, copy_elem_size, cudaMemcpyDeviceToHost);
return true; return true;
} }
template <> template <>
bool memcopy<MemType::GPU, MemType::GPU>(void *dst, const void* src, const size_t copy_elem_size) bool memproc::memcopy<MemType::GPU, MemType::GPU>(void *dst, const void* src, const size_t copy_elem_size)
{ {
cudaMemcpy ( dst, src, copy_elem_size, cudaMemcpyDeviceToDevice); cudaMemcpy ( dst, src, copy_elem_size, cudaMemcpyDeviceToDevice);
return true; return true;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment