Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
OrcaSong
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor 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
Machine Learning
OrcaSong
Commits
49347bfe
Commit
49347bfe
authored
4 years ago
by
Stefan Reck
Browse files
Options
Downloads
Patches
Plain Diff
format
parent
43efc433
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!15
Fix shuffle2
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
orcasong/tools/shuffle2.py
+85
-54
85 additions, 54 deletions
orcasong/tools/shuffle2.py
with
85 additions
and
54 deletions
orcasong/tools/shuffle2.py
+
85
−
54
View file @
49347bfe
...
...
@@ -14,12 +14,14 @@ from orcasong.tools.concatenate import copy_attrs
__author__
=
"
Stefan Reck
"
def
h5shuffle2
(
input_file
,
output_file
=
None
,
iterations
=
None
,
datasets
=
(
"
x
"
,
"
y
"
),
max_ram_fraction
=
0.25
,
**
kwargs
):
def
h5shuffle2
(
input_file
,
output_file
=
None
,
iterations
=
None
,
datasets
=
(
"
x
"
,
"
y
"
),
max_ram_fraction
=
0.25
,
**
kwargs
,
):
if
output_file
is
None
:
output_file
=
get_filepath_output
(
input_file
,
shuffle
=
True
)
if
iterations
is
None
:
...
...
@@ -45,7 +47,7 @@ def h5shuffle2(input_file,
"
output_file
"
:
f
"
{
output_file
}
_temp_
{
i
}
"
,
"
delete
"
:
False
,
}
elif
i
==
iterations
-
1
:
elif
i
==
iterations
-
1
:
# last iteration
stgs
=
{
"
input_file
"
:
f
"
{
output_file
}
_temp_
{
i
-
1
}
"
,
...
...
@@ -69,13 +71,14 @@ def h5shuffle2(input_file,
def
shuffle_file
(
input_file
,
datasets
=
(
"
x
"
,
"
y
"
),
output_file
=
None
,
max_ram
=
None
,
max_ram_fraction
=
0.25
,
chunks
=
False
,
delete
=
False
):
input_file
,
datasets
=
(
"
x
"
,
"
y
"
),
output_file
=
None
,
max_ram
=
None
,
max_ram_fraction
=
0.25
,
chunks
=
False
,
delete
=
False
,
):
"""
Shuffle datasets in a h5file that have the same length.
...
...
@@ -116,7 +119,9 @@ def shuffle_file(
if
max_ram
is
None
:
max_ram
=
get_max_ram
(
max_ram_fraction
)
temp_output_file
=
output_file
+
"
_temp_
"
+
time
.
strftime
(
"
%d-%m-%Y-%H-%M-%S
"
,
time
.
gmtime
())
temp_output_file
=
(
output_file
+
"
_temp_
"
+
time
.
strftime
(
"
%d-%m-%Y-%H-%M-%S
"
,
time
.
gmtime
())
)
with
h5py
.
File
(
input_file
,
"
r
"
)
as
f_in
:
dset_infos
,
n_lines
=
get_dset_infos
(
f_in
,
datasets
,
max_ram
)
print
(
f
"
Shuffling datasets
{
datasets
}
with
{
n_lines
}
lines each
"
)
...
...
@@ -144,8 +149,9 @@ def shuffle_file(
os
.
rename
(
temp_output_file
,
output_file
)
if
delete
:
os
.
remove
(
input_file
)
print
(
f
"
Elapsed time:
"
f
"
{
datetime
.
timedelta
(
seconds
=
int
(
time
.
time
()
-
start_time
))
}
"
)
print
(
f
"
Elapsed time:
"
f
"
{
datetime
.
timedelta
(
seconds
=
int
(
time
.
time
()
-
start_time
))
}
"
)
return
output_file
...
...
@@ -160,7 +166,7 @@ def get_indices_largest(dset_infos):
dset_info
=
dset_infos
[
largest_dset
]
print
(
f
"
Total chunks:
{
dset_info
[
'
n_chunks
'
]
}
"
)
ratio
=
dset_info
[
'
chunks_per_batch
'
]
/
dset_info
[
'
n_chunks
'
]
ratio
=
dset_info
[
"
chunks_per_batch
"
]
/
dset_info
[
"
n_chunks
"
]
print
(
f
"
Chunks per batch:
{
dset_info
[
'
chunks_per_batch
'
]
}
(
{
ratio
:
.
2
%
}
)
"
)
return
get_indices_chunked
(
...
...
@@ -170,7 +176,9 @@ def get_indices_largest(dset_infos):
)
def
get_n_iterations
(
input_file
,
datasets
=
(
"
x
"
,
"
y
"
),
max_ram
=
None
,
max_ram_fraction
=
0.25
):
def
get_n_iterations
(
input_file
,
datasets
=
(
"
x
"
,
"
y
"
),
max_ram
=
None
,
max_ram_fraction
=
0.25
):
"""
Get how often you have to shuffle with given ram to get proper randomness.
"""
if
max_ram
is
None
:
max_ram
=
get_max_ram
(
max_ram_fraction
=
max_ram_fraction
)
...
...
@@ -178,8 +186,9 @@ def get_n_iterations(input_file, datasets=("x", "y"), max_ram=None, max_ram_frac
dset_infos
,
n_lines
=
get_dset_infos
(
f_in
,
datasets
,
max_ram
)
largest_dset
=
np
.
argmax
([
v
[
"
n_batches_chunkwise
"
]
for
v
in
dset_infos
])
dset_info
=
dset_infos
[
largest_dset
]
n_iterations
=
int
(
np
.
ceil
(
np
.
log
(
dset_info
[
'
n_chunks
'
])
/
np
.
log
(
dset_info
[
'
chunks_per_batch
'
])))
n_iterations
=
int
(
np
.
ceil
(
np
.
log
(
dset_info
[
"
n_chunks
"
])
/
np
.
log
(
dset_info
[
"
chunks_per_batch
"
]))
)
print
(
f
"
Total chunks:
{
dset_info
[
'
n_chunks
'
]
}
"
)
print
(
f
"
Chunks per batch:
{
dset_info
[
'
chunks_per_batch
'
]
}
"
)
print
(
f
"
--> min iterations for full shuffle:
{
n_iterations
}
"
)
...
...
@@ -194,7 +203,7 @@ def get_indices_chunked(n_batches, n_chunks, chunksize):
index_batches
=
[]
for
bat
in
chunk_batches
:
idx
=
(
bat
[:,
None
]
*
chunksize
+
np
.
arange
(
chunksize
)[
None
,
:]).
flatten
()
idx
=
(
bat
[:,
None
]
*
chunksize
+
np
.
arange
(
chunksize
)[
None
,
:]).
flatten
()
np
.
random
.
shuffle
(
idx
)
index_batches
.
append
(
idx
)
...
...
@@ -211,8 +220,9 @@ def get_dset_infos(f, datasets, max_ram):
n_lines
=
len
(
dset
)
else
:
if
len
(
dset
)
!=
n_lines
:
raise
ValueError
(
f
"
dataset
{
name
}
has different length!
"
f
"
{
len
(
dset
)
}
vs
{
n_lines
}
"
)
raise
ValueError
(
f
"
dataset
{
name
}
has different length!
"
f
"
{
len
(
dset
)
}
vs
{
n_lines
}
"
)
chunksize
=
dset
.
chunks
[
0
]
n_chunks
=
int
(
np
.
ceil
(
n_lines
/
chunksize
))
# TODO in h5py 3.X, use .nbytes to get uncompressed size
...
...
@@ -222,19 +232,21 @@ def get_dset_infos(f, datasets, max_ram):
lines_per_batch
=
int
(
np
.
floor
(
max_ram
/
bytes_per_line
))
chunks_per_batch
=
int
(
np
.
floor
(
max_ram
/
bytes_per_chunk
))
dset_infos
.
append
({
"
name
"
:
name
,
"
dset
"
:
dset
,
"
chunksize
"
:
chunksize
,
"
n_lines
"
:
n_lines
,
"
n_chunks
"
:
n_chunks
,
"
bytes_per_line
"
:
bytes_per_line
,
"
bytes_per_chunk
"
:
bytes_per_chunk
,
"
lines_per_batch
"
:
lines_per_batch
,
"
chunks_per_batch
"
:
chunks_per_batch
,
"
n_batches_linewise
"
:
int
(
np
.
ceil
(
n_lines
/
lines_per_batch
)),
"
n_batches_chunkwise
"
:
int
(
np
.
ceil
(
n_chunks
/
chunks_per_batch
)),
})
dset_infos
.
append
(
{
"
name
"
:
name
,
"
dset
"
:
dset
,
"
chunksize
"
:
chunksize
,
"
n_lines
"
:
n_lines
,
"
n_chunks
"
:
n_chunks
,
"
bytes_per_line
"
:
bytes_per_line
,
"
bytes_per_chunk
"
:
bytes_per_chunk
,
"
lines_per_batch
"
:
lines_per_batch
,
"
chunks_per_batch
"
:
chunks_per_batch
,
"
n_batches_linewise
"
:
int
(
np
.
ceil
(
n_lines
/
lines_per_batch
)),
"
n_batches_chunkwise
"
:
int
(
np
.
ceil
(
n_chunks
/
chunks_per_batch
)),
}
)
return
dset_infos
,
n_lines
...
...
@@ -245,7 +257,7 @@ def make_dset(f_out, dset_info, indices):
slc
=
slice
(
batch_index
*
dset_info
[
"
lines_per_batch
"
],
(
batch_index
+
1
)
*
dset_info
[
"
lines_per_batch
"
],
(
batch_index
+
1
)
*
dset_info
[
"
lines_per_batch
"
],
)
to_read
=
indices
[
slc
]
# reading has to be done with linearly increasing index,
...
...
@@ -323,20 +335,39 @@ def slicify(fancy_indices):
def
run_parser
():
parser
=
argparse
.
ArgumentParser
(
description
=
'
Shuffle datasets in a h5file that have the same length.
'
'
Uses chunkwise readout for speed-up.
'
)
parser
.
add_argument
(
'
input_file
'
,
type
=
str
,
help
=
'
Path of the file that will be shuffled.
'
)
parser
.
add_argument
(
'
--output_file
'
,
type
=
str
,
default
=
None
,
help
=
'
If given, this will be the name of the output file.
'
'
Default: input_file + suffix.
'
)
parser
.
add_argument
(
'
--datasets
'
,
type
=
str
,
nargs
=
"
*
"
,
default
=
(
"
x
"
,
"
y
"
),
help
=
'
Which datasets to include in output. Default: x, y
'
)
parser
.
add_argument
(
'
--max_ram_fraction
'
,
type
=
float
,
default
=
0.25
,
help
=
"
in [0, 1]. Fraction of all available ram to use for reading one batch of data
"
"
Note: this should
"
"
be <=~0.25 or so, since lots of ram is needed for in-memory shuffling.
"
"
Default: 0.25
"
)
parser
.
add_argument
(
'
--iterations
'
,
type
=
int
,
default
=
None
,
help
=
"
Shuffle the file this many times. Default: Auto choose best number.
"
)
description
=
"
Shuffle datasets in a h5file that have the same length.
"
"
Uses chunkwise readout for speed-up.
"
)
parser
.
add_argument
(
"
input_file
"
,
type
=
str
,
help
=
"
Path of the file that will be shuffled.
"
)
parser
.
add_argument
(
"
--output_file
"
,
type
=
str
,
default
=
None
,
help
=
"
If given, this will be the name of the output file.
"
"
Default: input_file + suffix.
"
,
)
parser
.
add_argument
(
"
--datasets
"
,
type
=
str
,
nargs
=
"
*
"
,
default
=
(
"
x
"
,
"
y
"
),
help
=
"
Which datasets to include in output. Default: x, y
"
,
)
parser
.
add_argument
(
"
--max_ram_fraction
"
,
type
=
float
,
default
=
0.25
,
help
=
"
in [0, 1]. Fraction of all available ram to use for reading one batch of data
"
"
Note: this should
"
"
be <=~0.25 or so, since lots of ram is needed for in-memory shuffling.
"
"
Default: 0.25
"
,
)
parser
.
add_argument
(
"
--iterations
"
,
type
=
int
,
default
=
None
,
help
=
"
Shuffle the file this many times. Default: Auto choose best number.
"
,
)
h5shuffle2
(
**
vars
(
parser
.
parse_args
()))
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