NVIDIA
diff --git a/Collapse file
‎cmd/cli/cli/const.go‎
Copy file name to clipboard
+23-12Lines changed: 23 additions & 12 deletions b/Collapse file
‎cmd/cli/cli/const.go‎
Copy file name to clipboard
+23-12Lines changed: 23 additions & 12 deletions
diff --git a/Collapse file
‎cmd/cli/cli/dsort.go‎
Copy file name to clipboard
+5-6Lines changed: 5 additions & 6 deletions b/Collapse file
‎cmd/cli/cli/dsort.go‎
Copy file name to clipboard
+5-6Lines changed: 5 additions & 6 deletions
diff --git a/Collapse file
‎cmd/cli/cli/flag.go‎
Copy file name to clipboard
+22Lines changed: 22 additions & 0 deletions b/Collapse file
‎cmd/cli/cli/flag.go‎
Copy file name to clipboard
+22Lines changed: 22 additions & 0 deletions
@@ -805,19 +805,9 @@ var (
 	}
 
 	// (ETL, dSort, get-batch) specificaton
+	// see also: lhotseManifestFlag
 	specFlag = cli.StringFlag{Name: "spec,f", Value: "", Usage: "Path to JSON or YAML request specification"}
 
-	// Lhotse
-	lhotseCutsFlag = cli.StringFlag{
-		Name:     "cuts",
-		Usage:    "path to Lhotse cuts.jsonl or cuts.jsonl.gz",
-		Required: true,
-	}
-	sampleRateFlag = cli.IntFlag{
-		Name:  "sample-rate",
-		Usage: "audio sample-rate (Hz); used to convert sample offsets (in seconds) to byte offsets",
-	}
-
 	dsortLogFlag = cli.StringFlag{Name: "log", Usage: "Filename to log metrics (statistics)"}
 
 	cleanupFlag = cli.BoolFlag{
@@ -855,7 +845,7 @@ var (
 			indent4 + "\tor, when listing files and/or directories:\n" +
 			indent4 + "\t--list \"/home/docs, /home/abc/1.tar, /home/abc/1.jpeg\"",
 	}
-	templateFlag = cli.StringFlag{
+	templateFlag = cli.StringFlag{ // see also: outputTemplateFlag
 		Name: "template",
 		Usage: "Template to match object or file names; may contain prefix (that could be empty) with zero or more ranges\n" +
 			"\t(with optional steps and gaps), e.g.:\n" +
@@ -1290,4 +1280,25 @@ var (
 		Name:  "streaming",
 		Usage: "stream resulting archive prior to finalizing it in memory",
 	}
+
+	//
+	// Lhotse
+	//
+	lhotseManifestFlag = cli.StringFlag{ // see also: specFlag
+		Name:     "cuts",
+		Usage:    "path to Lhotse cuts.jsonl or cuts.jsonl.gz",
+		Required: true,
+	}
+	sampleRateFlag = cli.IntFlag{
+		Name:  "sample-rate",
+		Usage: "audio sample-rate (Hz); used to convert sample offsets (in seconds) to byte offsets",
+	}
+	batchSizeFlag = cli.IntFlag{
+		Name:  "batch-size",
+		Usage: "number of cuts per output file",
+	}
+	outputTemplateFlag = cli.StringFlag{ // see also: (input) templateFlag
+		Name:  "output-template",
+		Usage: "template for multiple output files (e.g. 'batch-{001..999}.tar')",
+	}
 )
@@ -105,8 +105,9 @@ var phasesOrdered = [...]string{
 
 func startDsortHandler(c *cli.Context) error {
 	var (
-		srcbck, dstbck cmn.Bck
-		spec           dsort.RequestSpec
+		srcbck cmn.Bck
+		dstbck cmn.Bck
+		spec   dsort.RequestSpec
 	)
 
 	// Load spec (required)
@@ -122,15 +123,13 @@ func startDsortHandler(c *cli.Context) error {
 	if c.NArg() > 0 {
 		srcbck, err = parseBckURI(c, c.Args().Get(0), true)
 		if err != nil {
-			return fmt.Errorf("failed to parse source bucket: %v\n(see %s for details)",
-				err, qflprn(cli.HelpFlag))
+			return fmt.Errorf("failed to parse source bucket: %v", err)
 		}
 	}
 	if c.NArg() > 1 {
 		dstbck, err = parseBckURI(c, c.Args().Get(1), true)
 		if err != nil {
-			return fmt.Errorf("failed to parse destination bucket: %v\n(see %s for details)",
-				err, qflprn(cli.HelpFlag))
+			return fmt.Errorf("failed to parse destination bucket: %v", err)
 		}
 	}
 
 
@@ -232,3 +232,25 @@ func sortFlags(fls []cli.Flag) []cli.Flag {
 	sort.Slice(fls, func(i, j int) bool { return fls[i].GetName() < fls[j].GetName() })
 	return fls
 }
+
+func parseLhotseBatchFlags(c *cli.Context) (batchSize int, pt *cos.ParsedTemplate, _ error) {
+	batchSize = parseIntFlag(c, batchSizeFlag)
+	if batchSize <= 0 {
+		return 0, nil, nil // manifest => single TAR
+	}
+
+	template := parseStrFlag(c, outputTemplateFlag)
+	if template == "" {
+		return 0, nil, fmt.Errorf("%s must be set when %s > 0", qflprn(outputTemplateFlag), qflprn(batchSizeFlag))
+	}
+
+	tmpl, err := cos.NewParsedTemplate(template)
+	if err != nil {
+		return 0, nil, err
+	}
+	pt = &tmpl
+	if err := pt.CheckIsRange(); err != nil {
+		return 0, nil, err
+	}
+	return batchSize, pt, nil
+}
Original file line number	Diff line number	Diff line change
`@@ -105,8 +105,9 @@ var phasesOrdered = [...]string{`
`105`	`105`
`106`	`106`	`func startDsortHandler(c *cli.Context) error {`
`107`	`107`	`var (`
`108`		`- srcbck, dstbck cmn.Bck`
`109`		`- spec dsort.RequestSpec`
	`108`	`+ srcbck cmn.Bck`
	`109`	`+ dstbck cmn.Bck`
	`110`	`+ spec dsort.RequestSpec`
`110`	`111`	`)`
`111`	`112`
`112`	`113`	`// Load spec (required)`
`@@ -122,15 +123,13 @@ func startDsortHandler(c *cli.Context) error {`
`122`	`123`	`if c.NArg() > 0 {`
`123`	`124`	`srcbck, err = parseBckURI(c, c.Args().Get(0), true)`
`124`	`125`	`if err != nil {`
`125`		`- return fmt.Errorf("failed to parse source bucket: %v\n(see %s for details)",`
`126`		`- err, qflprn(cli.HelpFlag))`
	`126`	`+ return fmt.Errorf("failed to parse source bucket: %v", err)`
`127`	`127`	`}`
`128`	`128`	`}`
`129`	`129`	`if c.NArg() > 1 {`
`130`	`130`	`dstbck, err = parseBckURI(c, c.Args().Get(1), true)`
`131`	`131`	`if err != nil {`
`132`		`- return fmt.Errorf("failed to parse destination bucket: %v\n(see %s for details)",`
`133`		`- err, qflprn(cli.HelpFlag))`
	`132`	`+ return fmt.Errorf("failed to parse destination bucket: %v", err)`
`134`	`133`	`}`
`135`	`134`	`}`
`136`	`135`