clean up trace

Cheng Li · Cheng Li · commit d45f5eda6c34 · 2019-06-29T19:27:08.000-07:00
diff --git a/vision/cifar10.go b/vision/cifar10.go
@@ -102,12 +102,14 @@ func (d *CIFAR10) Download(ctx context.Context) error {
 	}
 	workingDir := d.workingDir()
 	downloadedFileName := filepath.Join(workingDir, d.fileName)
-	downloadedFileName, err := downloadmanager.DownloadFile(d.url, downloadedFileName, downloadmanager.Context(ctx), downloadmanager.MD5Sum(d.md5sum))
+	downloadedFileName, ifDownload, err := downloadmanager.DownloadFile(d.url, downloadedFileName, downloadmanager.Context(ctx), downloadmanager.MD5Sum(d.md5sum))
 	if err != nil {
 		return err
 	}
-	if err := downloadmanager.Unarchive(workingDir, downloadedFileName); err != nil {
-		return err
+	if ifDownload {
+		if err := downloadmanager.Unarchive(workingDir, downloadedFileName); err != nil {
+			return err
+		}
 	}
 	if err := d.move(ctx); err != nil {
 		return err
diff --git a/vision/cifar100.go b/vision/cifar100.go
@@ -115,12 +115,14 @@ func (d *CIFAR100) Download(ctx context.Context) error {
 	}
 	workingDir := d.workingDir()
 	downloadedFileName := filepath.Join(workingDir, d.fileName)
-	downloadedFileName, err := downloadmanager.DownloadFile(d.url, downloadedFileName, downloadmanager.Context(ctx), downloadmanager.MD5Sum(d.md5sum))
+	downloadedFileName, ifDownload, err := downloadmanager.DownloadFile(d.url, downloadedFileName, downloadmanager.Context(ctx), downloadmanager.MD5Sum(d.md5sum))
 	if err != nil {
 		return err
 	}
-	if err := downloadmanager.Unarchive(workingDir, downloadedFileName); err != nil {
-		return err
+	if ifDownload {
+		if err := downloadmanager.Unarchive(workingDir, downloadedFileName); err != nil {
+			return err
+		}
 	}
 	if err := d.move(ctx); err != nil {
 		return err
diff --git a/vision/coco.go b/vision/coco.go
@@ -107,7 +107,7 @@ func (d *CocoValidationTFRecord) Download(ctx context.Context) error {
 	if com.IsFile(downloadedFileName) {
 		return nil
 	}
-	downloadedFileName, err := downloadmanager.DownloadFile(
+	downloadedFileName, _, err := downloadmanager.DownloadFile(
 		urlJoin(d.baseURL, fileName),
 		downloadedFileName,
 		downloadmanager.Context(ctx),
diff --git a/vision/ilsvrc2012_validation.go b/vision/ilsvrc2012_validation.go
@@ -129,7 +129,7 @@ func (d *ILSVRC2012ValidationRecordIO) Download(ctx context.Context) error {
 				return nil
 			}
 			pp.Println(downloadedFileName)
-			downloadedFileName, err := downloadmanager.DownloadFile(
+			downloadedFileName, _, err := downloadmanager.DownloadFile(
 				urlJoin(d.baseURL, fileName),
 				downloadedFileName,
 				downloadmanager.Context(ctx),
diff --git a/vision/ilsvrc2012_validation_folder.go b/vision/ilsvrc2012_validation_folder.go
@@ -8,6 +8,7 @@ import (
 	"strings"
 
 	context "context"
+
 	"github.com/pkg/errors"
 	"github.com/rai-project/config"
 	"github.com/rai-project/dldataset"
@@ -103,7 +104,7 @@ func (d *ILSVRC2012ValidationFolder) Get(ctx context.Context, name string) (dlda
 
 	workingDir := d.workingDir()
 	downloadedFileName := filepath.Join(workingDir, name)
-	downloadedFileName, err := downloadmanager.DownloadFile(
+	downloadedFileName, _, err := downloadmanager.DownloadFile(
 		fileURL,
 		downloadedFileName,
 		downloadmanager.Context(ctx),
diff --git a/vision/pascal.go b/vision/pascal.go
@@ -150,7 +150,7 @@ func (d *PascalValidationTFRecord) Download(ctx context.Context) error {
 	if com.IsFile(downloadedFileName) {
 		return nil
 	}
-	downloadedFileName, err := downloadmanager.DownloadFile(
+	downloadedFileName, _, err := downloadmanager.DownloadFile(
 		urlJoin(d.baseURL, fileName),
 		downloadedFileName,
 		downloadmanager.Context(ctx),

Original file line number	Diff line number	Diff line change
`@@ -102,12 +102,14 @@ func (d *CIFAR10) Download(ctx context.Context) error {`
`102`	`102`	`}`
`103`	`103`	`workingDir := d.workingDir()`
`104`	`104`	`downloadedFileName := filepath.Join(workingDir, d.fileName)`
`105`		`- downloadedFileName, err := downloadmanager.DownloadFile(d.url, downloadedFileName, downloadmanager.Context(ctx), downloadmanager.MD5Sum(d.md5sum))`
	`105`	`+ downloadedFileName, ifDownload, err := downloadmanager.DownloadFile(d.url, downloadedFileName, downloadmanager.Context(ctx), downloadmanager.MD5Sum(d.md5sum))`
`106`	`106`	`if err != nil {`
`107`	`107`	`return err`
`108`	`108`	`}`
`109`		`- if err := downloadmanager.Unarchive(workingDir, downloadedFileName); err != nil {`
`110`		`- return err`
	`109`	`+ if ifDownload {`
	`110`	`+ if err := downloadmanager.Unarchive(workingDir, downloadedFileName); err != nil {`
	`111`	`+ return err`
	`112`	`+ }`
`111`	`113`	`}`
`112`	`114`	`if err := d.move(ctx); err != nil {`
`113`	`115`	`return err`
Original file line number	Diff line number	Diff line change
`@@ -115,12 +115,14 @@ func (d *CIFAR100) Download(ctx context.Context) error {`
`115`	`115`	`}`
`116`	`116`	`workingDir := d.workingDir()`
`117`	`117`	`downloadedFileName := filepath.Join(workingDir, d.fileName)`
`118`		`- downloadedFileName, err := downloadmanager.DownloadFile(d.url, downloadedFileName, downloadmanager.Context(ctx), downloadmanager.MD5Sum(d.md5sum))`
	`118`	`+ downloadedFileName, ifDownload, err := downloadmanager.DownloadFile(d.url, downloadedFileName, downloadmanager.Context(ctx), downloadmanager.MD5Sum(d.md5sum))`
`119`	`119`	`if err != nil {`
`120`	`120`	`return err`
`121`	`121`	`}`
`122`		`- if err := downloadmanager.Unarchive(workingDir, downloadedFileName); err != nil {`
`123`		`- return err`
	`122`	`+ if ifDownload {`
	`123`	`+ if err := downloadmanager.Unarchive(workingDir, downloadedFileName); err != nil {`
	`124`	`+ return err`
	`125`	`+ }`
`124`	`126`	`}`
`125`	`127`	`if err := d.move(ctx); err != nil {`
`126`	`128`	`return err`
Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ func (d *CocoValidationTFRecord) Download(ctx context.Context) error {`
`107`	`107`	`if com.IsFile(downloadedFileName) {`
`108`	`108`	`return nil`
`109`	`109`	`}`
`110`		`- downloadedFileName, err := downloadmanager.DownloadFile(`
	`110`	`+ downloadedFileName, _, err := downloadmanager.DownloadFile(`
`111`	`111`	`urlJoin(d.baseURL, fileName),`
`112`	`112`	`downloadedFileName,`
`113`	`113`	`downloadmanager.Context(ctx),`
Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,7 @@ func (d *ILSVRC2012ValidationRecordIO) Download(ctx context.Context) error {`
`129`	`129`	`return nil`
`130`	`130`	`}`
`131`	`131`	`pp.Println(downloadedFileName)`
`132`		`- downloadedFileName, err := downloadmanager.DownloadFile(`
	`132`	`+ downloadedFileName, _, err := downloadmanager.DownloadFile(`
`133`	`133`	`urlJoin(d.baseURL, fileName),`
`134`	`134`	`downloadedFileName,`
`135`	`135`	`downloadmanager.Context(ctx),`
Original file line number	Diff line number	Diff line change
`@@ -150,7 +150,7 @@ func (d *PascalValidationTFRecord) Download(ctx context.Context) error {`
`150`	`150`	`if com.IsFile(downloadedFileName) {`
`151`	`151`	`return nil`
`152`	`152`	`}`
`153`		`- downloadedFileName, err := downloadmanager.DownloadFile(`
	`153`	`+ downloadedFileName, _, err := downloadmanager.DownloadFile(`
`154`	`154`	`urlJoin(d.baseURL, fileName),`
`155`	`155`	`downloadedFileName,`
`156`	`156`	`downloadmanager.Context(ctx),`