Skip to content

Commit 85b6ef7

Browse files
rcoreillyrcoreilly
committed
don't use log.Println -- doesn't work! replace with errors.Log or slog
1 parent 0ecace2 commit 85b6ef7

File tree

14 files changed

+58
-114
lines changed

14 files changed

+58
-114
lines changed

‎emer/layer.go‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ package emer
77
import (
88
"fmt"
99
"io"
10-
"log"
1110
"math"
1211

12+
"cogentcore.org/core/base/errors"
1313
"cogentcore.org/core/base/slicesx"
1414
"cogentcore.org/core/math32"
1515
"cogentcore.org/lab/tensor"
@@ -350,8 +350,7 @@ func (ly *LayerBase) UnitValues(vals *[]float32, varNm string, di int) error {
350350
func (ly *LayerBase) UnitValuesTensor(tsr tensor.Values, varNm string, di int) error {
351351
if tsr == nil {
352352
err := fmt.Errorf("emer.UnitValuesTensor: Tensor is nil")
353-
log.Println(err)
354-
return err
353+
return errors.Log(err)
355354
}
356355
nn := ly.NumUnits()
357356
tsr.SetShapeSizes(ly.Shape.Sizes...)
@@ -394,8 +393,7 @@ func (ly *LayerBase) UnitValuesSampleTensor(tsr tensor.Values, varNm string, di
394393
}
395394
if tsr == nil {
396395
err := fmt.Errorf("emer.UnitValuesSampleTensor: Tensor is nil")
397-
log.Println(err)
398-
return err
396+
return errors.Log(err)
399397
}
400398
if tsr.Len() != nu {
401399
rs := ly.GetSampleShape()

‎emer/network.go‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ package emer
99
import (
1010
"fmt"
1111
"io"
12-
"log"
1312
"os"
1413
"strings"
1514

@@ -374,10 +373,7 @@ func (nt *NetworkBase) ParamsString(nonDefault bool) string {
374373
func (nt *NetworkBase) SaveParams(nonDefault bool, filename core.Filename) error {
375374
str := nt.ParamsString(nonDefault)
376375
err := os.WriteFile(string(filename), []byte(str), 0666)
377-
if err != nil {
378-
log.Println(err)
379-
}
380-
return err
376+
return errors.Log(err)
381377
}
382378

383379
// SetRandSeed sets random seed and calls ResetRandSeed

‎emer/weights.go‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import (
1010
"fmt"
1111
"io"
1212
"io/fs"
13-
"log"
1413
"os"
1514
"path/filepath"
1615
"sort"
@@ -28,8 +27,7 @@ func (nt *NetworkBase) SaveWeightsJSON(filename core.Filename) error { //types:a
2827
fp, err := os.Create(string(filename))
2928
defer fp.Close()
3029
if err != nil {
31-
log.Println(err)
32-
return err
30+
return errors.Log(err)
3331
}
3432
ext := filepath.Ext(string(filename))
3533
if ext == ".gz" {
@@ -50,16 +48,14 @@ func (nt *NetworkBase) OpenWeightsJSON(filename core.Filename) error { //types:a
5048
fp, err := os.Open(string(filename))
5149
defer fp.Close()
5250
if err != nil {
53-
log.Println(err)
54-
return err
51+
return errors.Log(err)
5552
}
5653
ext := filepath.Ext(string(filename))
5754
if ext == ".gz" {
5855
gzr, err := gzip.NewReader(fp)
5956
defer gzr.Close()
6057
if err != nil {
61-
log.Println(err)
62-
return err
58+
return errors.Log(err)
6359
}
6460
return nt.EmerNetwork.ReadWeightsJSON(gzr)
6561
} else {
@@ -74,16 +70,14 @@ func (nt *NetworkBase) OpenWeightsFS(fsys fs.FS, filename string) error {
7470
fp, err := fsys.Open(filename)
7571
defer fp.Close()
7672
if err != nil {
77-
log.Println(err)
78-
return err
73+
return errors.Log(err)
7974
}
8075
ext := filepath.Ext(filename)
8176
if ext == ".gz" {
8277
gzr, err := gzip.NewReader(fp)
8378
defer gzr.Close()
8479
if err != nil {
85-
log.Println(err)
86-
return err
80+
return errors.Log(err)
8781
}
8882
return nt.EmerNetwork.ReadWeightsJSON(gzr)
8983
} else {
@@ -147,7 +141,7 @@ func (nt *NetworkBase) ReadWeightsJSON(r io.Reader) error {
147141
}
148142
err = nt.SetWeights(nw)
149143
if err != nil {
150-
log.Println(err)
144+
errors.Log(err)
151145
}
152146
return err
153147
}

‎env/fixed.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ package env
66

77
import (
88
"fmt"
9-
"log"
9+
"log/slog"
1010
"math/rand"
1111

1212
"cogentcore.org/lab/base/randx"
@@ -148,7 +148,7 @@ func (ft *FixedTable) Step() bool {
148148
func (ft *FixedTable) State(element string) tensor.Values {
149149
et := ft.Table.Column(element).RowTensor(ft.Row())
150150
if et == nil {
151-
log.Println("FixedTable.State -- could not find element:", element)
151+
slog.Error("FixedTable.State: could not find", "element", element)
152152
}
153153
return et
154154
}

‎env/freq.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ package env
66

77
import (
88
"fmt"
9-
"log"
9+
"log/slog"
1010
"math"
1111

1212
"cogentcore.org/lab/base/randx"
@@ -176,7 +176,7 @@ func (ft *FreqTable) Step() bool {
176176
func (ft *FreqTable) State(element string) tensor.Values {
177177
et := ft.Table.Column(element).RowTensor(ft.Row())
178178
if et == nil {
179-
log.Println("FreqTable.State -- could not find element:", element)
179+
slog.Error("FreqTable.State: could not find:", "element", element)
180180
}
181181
return et
182182
}

‎env/mpifixed.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ package env
66

77
import (
88
"fmt"
9-
"log"
9+
"log/slog"
1010
"math/rand"
1111

1212
"cogentcore.org/lab/base/randx"
@@ -150,7 +150,7 @@ func (ft *MPIFixedTable) Step() bool {
150150
func (ft *MPIFixedTable) State(element string) tensor.Values {
151151
et := ft.Table.Column(element).RowTensor(ft.Row())
152152
if et == nil {
153-
log.Println("MPIFixedTable.State -- could not find element:", element)
153+
slog.Error("MPIFixedTable.State: could not find:", "element", element)
154154
}
155155
return et
156156
}

‎esg/parse.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,19 @@ import (
88
"bufio"
99
"fmt"
1010
"io"
11-
"log"
1211
"os"
1312
"strconv"
1413
"strings"
14+
15+
"cogentcore.org/core/base/errors"
1516
)
1617

1718
// OpenRules reads in a text file with rules, line-by-line simple parser
1819
func (rls *Rules) OpenRules(fname string) []error {
1920
fp, err := os.Open(fname)
2021
defer fp.Close()
21-
if err != nil {
22-
log.Println(err)
23-
return nil
22+
if errors.Log(err) != nil {
23+
return []error{err}
2424
}
2525
return rls.ReadRules(fp)
2626
}

‎netview/netdata.go‎

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import (
1010
"encoding/json"
1111
"fmt"
1212
"io"
13-
"log"
1413
"math"
1514
"os"
1615
"path/filepath"
@@ -544,16 +543,14 @@ func (nd *NetData) OpenJSON(filename core.Filename) error { //types:add
544543
fp, err := os.Open(string(filename))
545544
defer fp.Close()
546545
if err != nil {
547-
log.Println(err)
548-
return err
546+
return errors.Log(err)
549547
}
550548
ext := filepath.Ext(string(filename))
551549
if ext == ".gz" {
552550
gzr, err := gzip.NewReader(fp)
553551
defer gzr.Close()
554552
if err != nil {
555-
log.Println(err)
556-
return err
553+
return errors.Log(err)
557554
}
558555
return nd.ReadJSON(gzr)
559556
} else {
@@ -566,8 +563,7 @@ func (nd *NetData) SaveJSON(filename core.Filename) error { //types:add
566563
fp, err := os.Create(string(filename))
567564
defer fp.Close()
568565
if err != nil {
569-
log.Println(err)
570-
return err
566+
return errors.Log(err)
571567
}
572568
ext := filepath.Ext(string(filename))
573569
if ext == ".gz" {
@@ -597,8 +593,7 @@ func (nd *NetData) ReadJSON(r io.Reader) error {
597593
if err == nil || err == io.EOF {
598594
return nil
599595
}
600-
log.Println(err)
601-
return err
596+
return errors.Log(err)
602597
}
603598

604599
// NaNSub is used to replace NaN values for saving -- JSON doesn't handle nan's
@@ -615,11 +610,7 @@ func (nd *NetData) WriteJSON(w io.Writer) error {
615610
}
616611
enc := json.NewEncoder(w)
617612
enc.SetIndent("", " ")
618-
err := enc.Encode(nd)
619-
if err != nil {
620-
log.Println(err)
621-
}
622-
return err
613+
return errors.Log(enc.Encode(nd))
623614
}
624615

625616
// func (ld *LayData) MarshalJSON() ([]byte, error) {

‎params/apply.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ package params
77
import (
88
"errors"
99
"fmt"
10-
"log"
10+
"log/slog"
1111
"slices"
1212
"strings"
1313
)
@@ -83,7 +83,7 @@ func (ps *Sheet[T]) SelNoMatchWarn(sheetName, objName string) error {
8383
}
8484
if msg != "" {
8585
msg = fmt.Sprintf("param.Sheet from Sheet: %s for object: %s had the following non-matching Selectors:\n%s", sheetName, objName, msg)
86-
log.Println(msg) // todo: slog?
86+
slog.Warn(msg)
8787
return errors.New(msg)
8888
}
8989
return nil

‎paths/pooltile.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ package paths
66

77
import (
88
"fmt"
9-
"log"
109

10+
"cogentcore.org/core/base/errors"
1111
"cogentcore.org/core/math32"
1212
"cogentcore.org/core/math32/minmax"
1313
"cogentcore.org/core/math32/vecint"
@@ -246,8 +246,7 @@ func (pt *PoolTile) TopoWeights(send, recv *tensor.Shape, wts *tensor.Float32) e
246246
}
247247
}
248248
err := fmt.Errorf("PoolTile:TopoWeights no Gauss or Sig params turned on")
249-
log.Println(err)
250-
return err
249+
return errors.Log(err)
251250
}
252251

253252
/////////////////////////////////////////////////////

0 commit comments

Comments
 (0)