Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
seminar-breakout
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Shashank Suhas
seminar-breakout
Commits
a761a839
Commit
a761a839
authored
Feb 08, 2017
by
Yuxin Wu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
some more improvements in data reading
parent
da5e9e66
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
29 additions
and
9 deletions
+29
-9
tensorpack/dataflow/format.py
tensorpack/dataflow/format.py
+1
-1
tensorpack/dataflow/image.py
tensorpack/dataflow/image.py
+4
-4
tensorpack/dataflow/prefetch.py
tensorpack/dataflow/prefetch.py
+24
-3
tensorpack/train/input_data.py
tensorpack/train/input_data.py
+0
-1
No files found.
tensorpack/dataflow/format.py
View file @
a761a839
...
@@ -111,7 +111,7 @@ class LMDBData(RNGDataFlow):
...
@@ -111,7 +111,7 @@ class LMDBData(RNGDataFlow):
def
open_lmdb
(
self
):
def
open_lmdb
(
self
):
self
.
_lmdb
=
lmdb
.
open
(
self
.
_lmdb_path
,
self
.
_lmdb
=
lmdb
.
open
(
self
.
_lmdb_path
,
subdir
=
os
.
path
.
isdir
(
self
.
_lmdb_path
),
subdir
=
os
.
path
.
isdir
(
self
.
_lmdb_path
),
readonly
=
True
,
lock
=
False
,
readahead
=
Fals
e
,
readonly
=
True
,
lock
=
False
,
readahead
=
Tru
e
,
map_size
=
1099511627776
*
2
,
max_readers
=
100
)
map_size
=
1099511627776
*
2
,
max_readers
=
100
)
self
.
_txn
=
self
.
_lmdb
.
begin
()
self
.
_txn
=
self
.
_lmdb
.
begin
()
self
.
_size
=
self
.
_txn
.
stat
()[
'entries'
]
self
.
_size
=
self
.
_txn
.
stat
()[
'entries'
]
...
...
tensorpack/dataflow/image.py
View file @
a761a839
...
@@ -70,8 +70,8 @@ class AugmentImageComponent(MapDataComponent):
...
@@ -70,8 +70,8 @@ class AugmentImageComponent(MapDataComponent):
raise
raise
except
Exception
:
except
Exception
:
self
.
_nr_error
+=
1
self
.
_nr_error
+=
1
if
self
.
_nr_error
%
1000
==
0
:
if
self
.
_nr_error
%
1000
==
0
or
self
.
_nr_error
<
10
:
logger
.
war
n
(
"Got {} augmentation errors."
.
format
(
self
.
_nr_error
))
logger
.
exceptio
n
(
"Got {} augmentation errors."
.
format
(
self
.
_nr_error
))
return
None
return
None
return
ret
return
ret
...
@@ -111,8 +111,8 @@ class AugmentImageComponents(MapData):
...
@@ -111,8 +111,8 @@ class AugmentImageComponents(MapData):
raise
raise
except
Exception
:
except
Exception
:
self
.
_nr_error
+=
1
self
.
_nr_error
+=
1
if
self
.
_nr_error
%
1000
==
0
:
if
self
.
_nr_error
%
1000
==
0
or
self
.
_nr_error
<
10
:
logger
.
war
n
(
"Got {} augmentation errors."
.
format
(
self
.
_nr_error
))
logger
.
exceptio
n
(
"Got {} augmentation errors."
.
format
(
self
.
_nr_error
))
return
None
return
None
super
(
AugmentImageComponents
,
self
)
.
__init__
(
ds
,
func
)
super
(
AugmentImageComponents
,
self
)
.
__init__
(
ds
,
func
)
...
...
tensorpack/dataflow/prefetch.py
View file @
a761a839
...
@@ -19,7 +19,8 @@ from ..utils.serialize import loads, dumps
...
@@ -19,7 +19,8 @@ from ..utils.serialize import loads, dumps
from
..utils
import
logger
from
..utils
import
logger
from
..utils.gpu
import
change_gpu
from
..utils.gpu
import
change_gpu
__all__
=
[
'PrefetchData'
,
'PrefetchDataZMQ'
,
'PrefetchOnGPUs'
]
__all__
=
[
'PrefetchData'
,
'PrefetchDataZMQ'
,
'PrefetchOnGPUs'
,
'ThreadedMapData'
,
'StartNewProcess'
]
class
PrefetchProcess
(
mp
.
Process
):
class
PrefetchProcess
(
mp
.
Process
):
...
@@ -68,8 +69,7 @@ class PrefetchData(ProxyDataFlow):
...
@@ -68,8 +69,7 @@ class PrefetchData(ProxyDataFlow):
self
.
procs
=
[
PrefetchProcess
(
self
.
ds
,
self
.
queue
)
self
.
procs
=
[
PrefetchProcess
(
self
.
ds
,
self
.
queue
)
for
_
in
range
(
self
.
nr_proc
)]
for
_
in
range
(
self
.
nr_proc
)]
ensure_proc_terminate
(
self
.
procs
)
ensure_proc_terminate
(
self
.
procs
)
for
x
in
self
.
procs
:
start_proc_mask_signal
(
self
.
procs
)
x
.
start
()
def
get_data
(
self
):
def
get_data
(
self
):
for
k
in
itertools
.
count
():
for
k
in
itertools
.
count
():
...
@@ -105,6 +105,9 @@ class PrefetchDataZMQ(ProxyDataFlow):
...
@@ -105,6 +105,9 @@ class PrefetchDataZMQ(ProxyDataFlow):
"""
"""
Prefetch data from a DataFlow using multiple processes, with ZMQ for
Prefetch data from a DataFlow using multiple processes, with ZMQ for
communication.
communication.
Note that this dataflow is not fork-safe. You cannot nest this dataflow
into another PrefetchDataZMQ or PrefetchData.
"""
"""
def
__init__
(
self
,
ds
,
nr_proc
=
1
,
pipedir
=
None
,
hwm
=
50
):
def
__init__
(
self
,
ds
,
nr_proc
=
1
,
pipedir
=
None
,
hwm
=
50
):
"""
"""
...
@@ -262,3 +265,21 @@ class ThreadedMapData(ProxyDataFlow):
...
@@ -262,3 +265,21 @@ class ThreadedMapData(ProxyDataFlow):
for
_
in
range
(
sz
):
for
_
in
range
(
sz
):
self
.
_in_queue
.
put
(
next
(
self
.
_itr
))
self
.
_in_queue
.
put
(
next
(
self
.
_itr
))
yield
self
.
_out_queue
.
get
()
yield
self
.
_out_queue
.
get
()
def
StartNewProcess
(
ds
,
queue_size
):
"""
Run ds in a new process, and use multiprocessing.queue to send data back.
Args:
ds (DataFlow): a DataFlow.
queue_size (int): the size of queue.
Returns:
a fork-safe DataFlow, therefore is safe to use under another PrefetchData or
PrefetchDataZMQ.
Note:
There could be a zmq version of this in the future.
"""
return
PrefetchData
(
ds
,
queue_size
,
1
)
tensorpack/train/input_data.py
View file @
a761a839
...
@@ -147,7 +147,6 @@ class QueueInput(FeedfreeInput):
...
@@ -147,7 +147,6 @@ class QueueInput(FeedfreeInput):
def
_get_input_tensors
(
self
):
def
_get_input_tensors
(
self
):
ret
=
self
.
queue
.
dequeue
(
name
=
'input_deque'
)
ret
=
self
.
queue
.
dequeue
(
name
=
'input_deque'
)
print
(
ret
)
if
isinstance
(
ret
,
tf
.
Tensor
):
# only one input
if
isinstance
(
ret
,
tf
.
Tensor
):
# only one input
ret
=
[
ret
]
ret
=
[
ret
]
assert
len
(
ret
)
==
len
(
self
.
input_placehdrs
)
assert
len
(
ret
)
==
len
(
self
.
input_placehdrs
)
...
...
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