projects
/
lightning.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
19524: Fix deprecated scipy.load.
[lightning.git]
/
merge.go
diff --git
a/merge.go
b/merge.go
index 6530d600279655d0a68b9eff2246cd3af9836915..68560edbd0ae62af9fd203ba9aa6d2867a1fe883 100644
(file)
--- a/
merge.go
+++ b/
merge.go
@@
-1,3
+1,7
@@
+// Copyright (C) The Lightning Authors. All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0
+
package lightning
import (
package lightning
import (
@@
-70,7
+74,7
@@
func (cmd *merger) RunCommand(prog string, args []string, stdin io.Reader, stdou
Name: "lightning merge",
Client: arvados.NewClientFromEnv(),
ProjectUUID: *projectUUID,
Name: "lightning merge",
Client: arvados.NewClientFromEnv(),
ProjectUUID: *projectUUID,
- RAM:
25
0000000000,
+ RAM:
70
0000000000,
VCPUs: 16,
Priority: *priority,
APIAccess: true,
VCPUs: 16,
Priority: *priority,
APIAccess: true,
@@
-173,7
+177,7
@@
func (cmd *merger) doMerge() error {
go func(input string) {
defer wg.Done()
log.Printf("%s: reading", input)
go func(input string) {
defer wg.Done()
log.Printf("%s: reading", input)
- err := cmd.tilelib.LoadGob(ctx, rdr, strings.HasSuffix(input, ".gz")
, nil
)
+ err := cmd.tilelib.LoadGob(ctx, rdr, strings.HasSuffix(input, ".gz"))
if err != nil {
cmd.setError(fmt.Errorf("%s: load failed: %w", input, err))
cancel()
if err != nil {
cmd.setError(fmt.Errorf("%s: load failed: %w", input, err))
cancel()