Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
memory-faucet
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
数学の武士
memory-faucet
Commits
d545d668
Commit
d545d668
authored
4 months ago
by
数学の武士
Browse files
Options
Downloads
Patches
Plain Diff
.
parent
34b020b3
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
CMakeLists.txt
+2
-2
2 additions, 2 deletions
CMakeLists.txt
Lib/memory-holder.cpp
+20
-6
20 additions, 6 deletions
Lib/memory-holder.cpp
Lib/memory-holder.h
+2
-0
2 additions, 0 deletions
Lib/memory-holder.h
with
24 additions
and
8 deletions
CMakeLists.txt
+
2
−
2
View file @
d545d668
...
@@ -27,5 +27,5 @@ set(SOURCES
...
@@ -27,5 +27,5 @@ set(SOURCES
)
)
add_executable
(
test
${
SOURCES
}
)
add_executable
(
test
${
SOURCES
}
)
target_include_directories
(
test PUBLIC
${
memory_processing_SOURCE_DIR
}
/include ./Lib/
)
target_include_directories
(
test PUBLIC ./Lib/
)
target_link_libraries
(
test memproc memory-holder
)
target_link_libraries
(
test memory-holder
)
\ No newline at end of file
\ No newline at end of file
This diff is collapsed.
Click to expand it.
Lib/memory-holder.cpp
+
20
−
6
View file @
d545d668
...
@@ -52,7 +52,9 @@ bool size_comparator(const buffer<mem>& obj, const size_t required_size)
...
@@ -52,7 +52,9 @@ bool size_comparator(const buffer<mem>& obj, const size_t required_size)
}
}
template
bool
size_comparator
(
const
buffer
<
MemType
::
CPU
>&
obj
,
const
size_t
required_size
);
template
bool
size_comparator
(
const
buffer
<
MemType
::
CPU
>&
obj
,
const
size_t
required_size
);
#ifdef INCLUDE_CUDA
template
bool
size_comparator
(
const
buffer
<
MemType
::
GPU
>&
obj
,
const
size_t
required_size
);
template
bool
size_comparator
(
const
buffer
<
MemType
::
GPU
>&
obj
,
const
size_t
required_size
);
#endif
template
<
MemType
mem
>
template
<
MemType
mem
>
void
*
buffer
<
mem
>::
get_ptr
()
const
void
*
buffer
<
mem
>::
get_ptr
()
const
...
@@ -78,6 +80,7 @@ buffer<mem>& buffer<mem>::operator=(buffer<mem>& other)
...
@@ -78,6 +80,7 @@ buffer<mem>& buffer<mem>::operator=(buffer<mem>& other)
if
(
this
==
&
other
)
if
(
this
==
&
other
)
return
*
this
;
return
*
this
;
// memproc::realloc<mem>((void*&)ptr, allocated_size, other.get_size());
std
::
swap
(
ptr
,
other
.
ptr
);
std
::
swap
(
ptr
,
other
.
ptr
);
std
::
swap
(
allocated_size
,
other
.
allocated_size
);
// exchange resources between *this and other
std
::
swap
(
allocated_size
,
other
.
allocated_size
);
// exchange resources between *this and other
std
::
swap
(
scalar_size
,
other
.
scalar_size
);
std
::
swap
(
scalar_size
,
other
.
scalar_size
);
...
@@ -99,17 +102,23 @@ void buffer<mem>::set_id(const int idx)
...
@@ -99,17 +102,23 @@ void buffer<mem>::set_id(const int idx)
}
}
template
class
buffer
<
MemType
::
CPU
>;
template
class
buffer
<
MemType
::
CPU
>;
#ifdef INCLUDE_CUDA
template
class
buffer
<
MemType
::
GPU
>;
template
class
buffer
<
MemType
::
GPU
>;
#endif
memory_pipline
::
memory_pipline
()
memory_pipline
::
memory_pipline
()
{
{
#ifdef INCLUDE_CUDA
gpu_buff
=
std
::
vector
<
buffer
<
MemType
::
GPU
>
>
();
gpu_buff
=
std
::
vector
<
buffer
<
MemType
::
GPU
>
>
();
#endif
cpu_buff
=
std
::
vector
<
buffer
<
MemType
::
CPU
>
>
();
cpu_buff
=
std
::
vector
<
buffer
<
MemType
::
CPU
>
>
();
}
}
memory_pipline
::~
memory_pipline
()
memory_pipline
::~
memory_pipline
()
{
{
#ifdef INCLUDE_CUDA
gpu_buff
.
clear
();
gpu_buff
.
clear
();
#endif
cpu_buff
.
clear
();
cpu_buff
.
clear
();
}
}
...
@@ -119,14 +128,13 @@ std::vector<buffer<mem> >& memory_pipline::get_memtyped_vector()
...
@@ -119,14 +128,13 @@ std::vector<buffer<mem> >& memory_pipline::get_memtyped_vector()
return
cpu_buff
;
return
cpu_buff
;
}
}
#ifdef INCLUDE_CUDA
template
<
>
template
<
>
std
::
vector
<
buffer
<
MemType
::
GPU
>
>&
memory_pipline
::
get_memtyped_vector
()
std
::
vector
<
buffer
<
MemType
::
GPU
>
>&
memory_pipline
::
get_memtyped_vector
()
{
{
return
gpu_buff
;
return
gpu_buff
;
}
}
#endif
// template std::vector<buffer<MemType::CPU> >& memory_pipline::get_memtyped_vector();
// template std::vector<buffer<MemType::GPU> >& memory_pipline::get_memtyped_vector();
template
<
MemType
mem
>
template
<
MemType
mem
>
int
memory_pipline
::
get_buffer
(
const
size_t
required_size
,
void
*
ptr
)
int
memory_pipline
::
get_buffer
(
const
size_t
required_size
,
void
*
ptr
)
...
@@ -149,7 +157,9 @@ int memory_pipline::get_buffer(const size_t required_size, void * ptr)
...
@@ -149,7 +157,9 @@ int memory_pipline::get_buffer(const size_t required_size, void * ptr)
}
}
template
int
memory_pipline
::
get_buffer
<
MemType
::
CPU
>(
const
size_t
required_size
,
void
*
ptr
);
template
int
memory_pipline
::
get_buffer
<
MemType
::
CPU
>(
const
size_t
required_size
,
void
*
ptr
);
#ifdef INCLUDE_CUDA
template
int
memory_pipline
::
get_buffer
<
MemType
::
GPU
>(
const
size_t
required_size
,
void
*
ptr
);
template
int
memory_pipline
::
get_buffer
<
MemType
::
GPU
>(
const
size_t
required_size
,
void
*
ptr
);
#endif
template
<
MemType
mem
>
template
<
MemType
mem
>
void
memory_pipline
::
set_available
(
const
int
id
)
void
memory_pipline
::
set_available
(
const
int
id
)
...
@@ -158,7 +168,9 @@ void memory_pipline::set_available(const int id)
...
@@ -158,7 +168,9 @@ void memory_pipline::set_available(const int id)
}
}
template
void
memory_pipline
::
set_available
<
MemType
::
CPU
>(
const
int
id
);
template
void
memory_pipline
::
set_available
<
MemType
::
CPU
>(
const
int
id
);
#ifdef INCLUDE_CUDA
template
void
memory_pipline
::
set_available
<
MemType
::
GPU
>(
const
int
id
);
template
void
memory_pipline
::
set_available
<
MemType
::
GPU
>(
const
int
id
);
#endif
memory_faucet
::
memory_faucet
(){}
memory_faucet
::
memory_faucet
(){}
...
@@ -184,8 +196,8 @@ memBuf<mem>::memBuf(const size_t required_size)
...
@@ -184,8 +196,8 @@ memBuf<mem>::memBuf(const size_t required_size)
template
<
MemType
mem
>
template
<
MemType
mem
>
memBuf
<
mem
>::~
memBuf
()
memBuf
<
mem
>::~
memBuf
()
{
{
memory_pipline
*
mem_pipe
=
memory_faucet
::
get_faucet
();
//
memory_pipline* mem_pipe = memory_faucet::get_faucet();
mem_pipe
->
set_available
<
mem
>
(
id
);
//
mem_pipe->set_available<mem>(id);
}
}
template
<
MemType
mem
>
template
<
MemType
mem
>
...
@@ -201,4 +213,6 @@ int memBuf<mem>::get_size()
...
@@ -201,4 +213,6 @@ int memBuf<mem>::get_size()
}
}
template
class
memBuf
<
MemType
::
CPU
>;
template
class
memBuf
<
MemType
::
CPU
>;
template
class
memBuf
<
MemType
::
GPU
>;
#ifdef INCLUDE_CUDA
\ No newline at end of file
template
class
memBuf
<
MemType
::
GPU
>;
#endif
This diff is collapsed.
Click to expand it.
Lib/memory-holder.h
+
2
−
0
View file @
d545d668
...
@@ -38,7 +38,9 @@ public:
...
@@ -38,7 +38,9 @@ public:
class
memory_pipline
class
memory_pipline
{
{
private:
private:
#ifdef INCLUDE_CUDA
std
::
vector
<
buffer
<
MemType
::
GPU
>
>
gpu_buff
;
std
::
vector
<
buffer
<
MemType
::
GPU
>
>
gpu_buff
;
#endif
std
::
vector
<
buffer
<
MemType
::
CPU
>
>
cpu_buff
;
std
::
vector
<
buffer
<
MemType
::
CPU
>
>
cpu_buff
;
public:
public:
memory_pipline
();
memory_pipline
();
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment