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
vision
Commits
394de98e
Commit
394de98e
authored
Jun 11, 2019
by
Tomas Alori
Committed by
Francisco Massa
Jun 11, 2019
Browse files
Fix calls to 'download_and_extract_archive()' (#1006)
Changes made in
7716aba5
broke calls to this method.
parent
8a64dbcd
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
9 deletions
+9
-9
torchvision/datasets/caltech.py
torchvision/datasets/caltech.py
+6
-6
torchvision/datasets/cifar.py
torchvision/datasets/cifar.py
+1
-1
torchvision/datasets/omniglot.py
torchvision/datasets/omniglot.py
+1
-1
torchvision/datasets/stl10.py
torchvision/datasets/stl10.py
+1
-1
No files found.
torchvision/datasets/caltech.py
View file @
394de98e
...
@@ -116,13 +116,13 @@ class Caltech101(VisionDataset):
...
@@ -116,13 +116,13 @@ class Caltech101(VisionDataset):
download_and_extract_archive
(
download_and_extract_archive
(
"http://www.vision.caltech.edu/Image_Datasets/Caltech101/101_ObjectCategories.tar.gz"
,
"http://www.vision.caltech.edu/Image_Datasets/Caltech101/101_ObjectCategories.tar.gz"
,
self
.
root
,
self
.
root
,
"101_ObjectCategories.tar.gz"
,
filename
=
"101_ObjectCategories.tar.gz"
,
"b224c7392d521a49829488ab0f1120d9"
)
md5
=
"b224c7392d521a49829488ab0f1120d9"
)
download_and_extract_archive
(
download_and_extract_archive
(
"http://www.vision.caltech.edu/Image_Datasets/Caltech101/Annotations.tar"
,
"http://www.vision.caltech.edu/Image_Datasets/Caltech101/Annotations.tar"
,
self
.
root
,
self
.
root
,
"101_Annotations.tar"
,
filename
=
"101_Annotations.tar"
,
"6f83eeb1f24d99cab4eb377263132c91"
)
md5
=
"6f83eeb1f24d99cab4eb377263132c91"
)
def
extra_repr
(
self
):
def
extra_repr
(
self
):
return
"Target type: {target_type}"
.
format
(
**
self
.
__dict__
)
return
"Target type: {target_type}"
.
format
(
**
self
.
__dict__
)
...
@@ -204,5 +204,5 @@ class Caltech256(VisionDataset):
...
@@ -204,5 +204,5 @@ class Caltech256(VisionDataset):
download_and_extract_archive
(
download_and_extract_archive
(
"http://www.vision.caltech.edu/Image_Datasets/Caltech256/256_ObjectCategories.tar"
,
"http://www.vision.caltech.edu/Image_Datasets/Caltech256/256_ObjectCategories.tar"
,
self
.
root
,
self
.
root
,
"256_ObjectCategories.tar"
,
filename
=
"256_ObjectCategories.tar"
,
"67b4f42ca05d46448c6bb8ecd2220f6d"
)
md5
=
"67b4f42ca05d46448c6bb8ecd2220f6d"
)
torchvision/datasets/cifar.py
View file @
394de98e
...
@@ -147,7 +147,7 @@ class CIFAR10(VisionDataset):
...
@@ -147,7 +147,7 @@ class CIFAR10(VisionDataset):
if
self
.
_check_integrity
():
if
self
.
_check_integrity
():
print
(
'Files already downloaded and verified'
)
print
(
'Files already downloaded and verified'
)
return
return
download_and_extract_archive
(
self
.
url
,
self
.
root
,
self
.
filename
,
self
.
tgz_md5
)
download_and_extract_archive
(
self
.
url
,
self
.
root
,
filename
=
self
.
filename
,
md5
=
self
.
tgz_md5
)
def
extra_repr
(
self
):
def
extra_repr
(
self
):
return
"Split: {}"
.
format
(
"Train"
if
self
.
train
is
True
else
"Test"
)
return
"Split: {}"
.
format
(
"Train"
if
self
.
train
is
True
else
"Test"
)
...
...
torchvision/datasets/omniglot.py
View file @
394de98e
...
@@ -88,7 +88,7 @@ class Omniglot(VisionDataset):
...
@@ -88,7 +88,7 @@ class Omniglot(VisionDataset):
filename
=
self
.
_get_target_folder
()
filename
=
self
.
_get_target_folder
()
zip_filename
=
filename
+
'.zip'
zip_filename
=
filename
+
'.zip'
url
=
self
.
download_url_prefix
+
'/'
+
zip_filename
url
=
self
.
download_url_prefix
+
'/'
+
zip_filename
download_and_extract_archive
(
url
,
self
.
root
,
zip_filename
,
self
.
zips_md5
[
filename
])
download_and_extract_archive
(
url
,
self
.
root
,
filename
=
zip_filename
,
md5
=
self
.
zips_md5
[
filename
])
def
_get_target_folder
(
self
):
def
_get_target_folder
(
self
):
return
'images_background'
if
self
.
background
else
'images_evaluation'
return
'images_background'
if
self
.
background
else
'images_evaluation'
torchvision/datasets/stl10.py
View file @
394de98e
...
@@ -152,7 +152,7 @@ class STL10(VisionDataset):
...
@@ -152,7 +152,7 @@ class STL10(VisionDataset):
if
self
.
_check_integrity
():
if
self
.
_check_integrity
():
print
(
'Files already downloaded and verified'
)
print
(
'Files already downloaded and verified'
)
return
return
download_and_extract_archive
(
self
.
url
,
self
.
root
,
self
.
filename
,
self
.
tgz_md5
)
download_and_extract_archive
(
self
.
url
,
self
.
root
,
filename
=
self
.
filename
,
md5
=
self
.
tgz_md5
)
def
extra_repr
(
self
):
def
extra_repr
(
self
):
return
"Split: {split}"
.
format
(
**
self
.
__dict__
)
return
"Split: {split}"
.
format
(
**
self
.
__dict__
)
...
...
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