Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
OpenDAS
Lmdeploy
Commits
d29b70ae
Unverified
Commit
d29b70ae
authored
Dec 18, 2023
by
Chen Xin
Committed by
GitHub
Dec 18, 2023
Browse files
Return the iterator after erasing it from a map (#864)
parent
60d03021
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
src/turbomind/models/llama/SequenceManager.cc
src/turbomind/models/llama/SequenceManager.cc
+2
-2
src/turbomind/models/llama/SequenceManager.h
src/turbomind/models/llama/SequenceManager.h
+1
-1
No files found.
src/turbomind/models/llama/SequenceManager.cc
View file @
d29b70ae
...
@@ -61,7 +61,7 @@ bool SequenceManager::Contains(uint64_t id)
...
@@ -61,7 +61,7 @@ bool SequenceManager::Contains(uint64_t id)
return
sequences_
.
find
(
id
)
!=
sequences_
.
end
();
return
sequences_
.
find
(
id
)
!=
sequences_
.
end
();
}
}
void
SequenceManager
::
Erase
(
std
::
map
<
uint64_t
,
Sequence
>::
iterator
it
)
void
SequenceManager
::
Erase
(
std
::
map
<
uint64_t
,
Sequence
>::
iterator
&
it
)
{
{
auto
&
seq
=
it
->
second
;
auto
&
seq
=
it
->
second
;
if
(
seq
.
status
==
Sequence
::
kCached
)
{
if
(
seq
.
status
==
Sequence
::
kCached
)
{
...
@@ -72,7 +72,7 @@ void SequenceManager::Erase(std::map<uint64_t, Sequence>::iterator it)
...
@@ -72,7 +72,7 @@ void SequenceManager::Erase(std::map<uint64_t, Sequence>::iterator it)
UpdateAndSetUnlock
(
seq
);
UpdateAndSetUnlock
(
seq
);
}
}
freed_
.
insert
(
freed_
.
end
(),
seq
.
blocks
.
begin
(),
seq
.
blocks
.
end
());
freed_
.
insert
(
freed_
.
end
(),
seq
.
blocks
.
begin
(),
seq
.
blocks
.
end
());
sequences_
.
erase
(
it
);
it
=
sequences_
.
erase
(
it
);
}
}
bool
SequenceManager
::
Erase
(
uint64_t
id
)
bool
SequenceManager
::
Erase
(
uint64_t
id
)
...
...
src/turbomind/models/llama/SequenceManager.h
View file @
d29b70ae
...
@@ -107,7 +107,7 @@ public:
...
@@ -107,7 +107,7 @@ public:
}
}
private:
private:
void
Erase
(
std
::
map
<
uint64_t
,
Sequence
>::
iterator
it
);
void
Erase
(
std
::
map
<
uint64_t
,
Sequence
>::
iterator
&
it
);
void
CommitUnlockAndFree
();
void
CommitUnlockAndFree
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment