diff --git a/ch10/dyslexia/dyslexia.go b/ch10/dyslexia/dyslexia.go index 58278c28..396ea721 100644 --- a/ch10/dyslexia/dyslexia.go +++ b/ch10/dyslexia/dyslexia.go @@ -18,18 +18,12 @@ import ( "strings" "cogentcore.org/core/base/errors" - "cogentcore.org/core/base/randx" "cogentcore.org/core/core" "cogentcore.org/core/enums" "cogentcore.org/core/icons" "cogentcore.org/core/math32/minmax" - "cogentcore.org/core/tensor" - "cogentcore.org/core/tensor/stats/clust" - "cogentcore.org/core/tensor/stats/metric" - "cogentcore.org/core/tensor/stats/split" - "cogentcore.org/core/tensor/stats/stats" - "cogentcore.org/core/tensor/table" "cogentcore.org/core/tree" + "cogentcore.org/lab/base/randx" "github.com/emer/emergent/v2/econfig" "github.com/emer/emergent/v2/egui" "github.com/emer/emergent/v2/elog" @@ -41,6 +35,12 @@ import ( "github.com/emer/emergent/v2/netview" "github.com/emer/emergent/v2/params" "github.com/emer/emergent/v2/paths" + "github.com/emer/etensor/tensor" + "github.com/emer/etensor/tensor/stats/clust" + "github.com/emer/etensor/tensor/stats/metric" + "github.com/emer/etensor/tensor/stats/split" + "github.com/emer/etensor/tensor/stats/stats" + "github.com/emer/etensor/tensor/table" "github.com/emer/leabra/v2/leabra" ) diff --git a/ch10/sem/sem.go b/ch10/sem/sem.go index ae0c64cc..ba30b1a0 100644 --- a/ch10/sem/sem.go +++ b/ch10/sem/sem.go @@ -17,14 +17,12 @@ import ( "embed" "strings" - "cogentcore.org/core/base/randx" "cogentcore.org/core/core" "cogentcore.org/core/enums" "cogentcore.org/core/icons" "cogentcore.org/core/math32" - "cogentcore.org/core/tensor" - "cogentcore.org/core/tensor/stats/metric" "cogentcore.org/core/tree" + "cogentcore.org/lab/base/randx" "github.com/emer/emergent/v2/econfig" "github.com/emer/emergent/v2/egui" "github.com/emer/emergent/v2/elog" @@ -36,6 +34,8 @@ import ( "github.com/emer/emergent/v2/netview" "github.com/emer/emergent/v2/params" "github.com/emer/emergent/v2/paths" + "github.com/emer/etensor/tensor" + "github.com/emer/etensor/tensor/stats/metric" "github.com/emer/leabra/v2/leabra" ) diff --git a/ch10/sem/sem_env.go b/ch10/sem/sem_env.go index 07372c9b..57ff9ecf 100644 --- a/ch10/sem/sem_env.go +++ b/ch10/sem/sem_env.go @@ -15,10 +15,10 @@ import ( "strings" "cogentcore.org/core/base/errors" - "cogentcore.org/core/base/randx" - "cogentcore.org/core/tensor" + "cogentcore.org/lab/base/randx" "github.com/emer/emergent/v2/env" "github.com/emer/emergent/v2/etime" + "github.com/emer/etensor/tensor" ) // SemEnv presents paragraphs of text, loaded from file(s) diff --git a/ch10/sg/sg.go b/ch10/sg/sg.go index 5fac56b9..a076c61b 100644 --- a/ch10/sg/sg.go +++ b/ch10/sg/sg.go @@ -20,14 +20,12 @@ import ( "strings" "cogentcore.org/core/base/errors" - "cogentcore.org/core/base/randx" "cogentcore.org/core/core" "cogentcore.org/core/enums" "cogentcore.org/core/icons" "cogentcore.org/core/math32" - "cogentcore.org/core/tensor/stats/clust" - "cogentcore.org/core/tensor/table" "cogentcore.org/core/tree" + "cogentcore.org/lab/base/randx" "github.com/emer/emergent/v2/econfig" "github.com/emer/emergent/v2/egui" "github.com/emer/emergent/v2/elog" @@ -39,6 +37,8 @@ import ( "github.com/emer/emergent/v2/netview" "github.com/emer/emergent/v2/params" "github.com/emer/emergent/v2/paths" + "github.com/emer/etensor/tensor/stats/clust" + "github.com/emer/etensor/tensor/table" "github.com/emer/leabra/v2/leabra" ) diff --git a/ch10/sg/sg_env.go b/ch10/sg/sg_env.go index df032ba1..bf861524 100644 --- a/ch10/sg/sg_env.go +++ b/ch10/sg/sg_env.go @@ -11,11 +11,11 @@ import ( "math/rand" "strings" - "cogentcore.org/core/base/randx" - "cogentcore.org/core/tensor" + "cogentcore.org/lab/base/randx" "github.com/emer/emergent/v2/env" "github.com/emer/emergent/v2/esg" "github.com/emer/emergent/v2/etime" + "github.com/emer/etensor/tensor" ) // SentGenEnv generates sentences using a grammar that is parsed from a diff --git a/ch10/sg/sg_probe_env.go b/ch10/sg/sg_probe_env.go index 9266cd84..696e1747 100644 --- a/ch10/sg/sg_probe_env.go +++ b/ch10/sg/sg_probe_env.go @@ -7,9 +7,9 @@ package main import ( "fmt" - "cogentcore.org/core/tensor" "github.com/emer/emergent/v2/env" "github.com/emer/emergent/v2/etime" + "github.com/emer/etensor/tensor" ) // ProbeEnv generates sentences using a grammar that is parsed from a diff --git a/ch10/ss/ss.go b/ch10/ss/ss.go index c6394030..499ce6dc 100644 --- a/ch10/ss/ss.go +++ b/ch10/ss/ss.go @@ -14,18 +14,12 @@ import ( "strings" "cogentcore.org/core/base/errors" - "cogentcore.org/core/base/randx" "cogentcore.org/core/core" "cogentcore.org/core/enums" "cogentcore.org/core/icons" "cogentcore.org/core/math32" - "cogentcore.org/core/tensor" - "cogentcore.org/core/tensor/stats/metric" - "cogentcore.org/core/tensor/stats/split" - "cogentcore.org/core/tensor/stats/stats" - "cogentcore.org/core/tensor/table" - "cogentcore.org/core/tensor/tensorcore" "cogentcore.org/core/tree" + "cogentcore.org/lab/base/randx" "github.com/emer/emergent/v2/econfig" "github.com/emer/emergent/v2/egui" "github.com/emer/emergent/v2/elog" @@ -38,6 +32,12 @@ import ( "github.com/emer/emergent/v2/params" "github.com/emer/emergent/v2/paths" "github.com/emer/emergent/v2/relpos" + "github.com/emer/etensor/tensor" + "github.com/emer/etensor/tensor/stats/metric" + "github.com/emer/etensor/tensor/stats/split" + "github.com/emer/etensor/tensor/stats/stats" + "github.com/emer/etensor/tensor/table" + "github.com/emer/etensor/tensor/tensorcore" "github.com/emer/leabra/v2/leabra" ) diff --git a/ch2/detector/detector.go b/ch2/detector/detector.go index 4ce02880..d099f709 100644 --- a/ch2/detector/detector.go +++ b/ch2/detector/detector.go @@ -15,13 +15,12 @@ import ( "log" "reflect" - "cogentcore.org/core/base/randx" "cogentcore.org/core/core" "cogentcore.org/core/enums" "cogentcore.org/core/icons" "cogentcore.org/core/math32/minmax" - "cogentcore.org/core/tensor/table" "cogentcore.org/core/tree" + "cogentcore.org/lab/base/randx" "github.com/emer/emergent/v2/egui" "github.com/emer/emergent/v2/elog" "github.com/emer/emergent/v2/emer" @@ -32,6 +31,7 @@ import ( "github.com/emer/emergent/v2/netview" "github.com/emer/emergent/v2/params" "github.com/emer/emergent/v2/paths" + "github.com/emer/etensor/tensor/table" "github.com/emer/leabra/v2/leabra" ) diff --git a/ch3/cats_dogs/cats_dogs.go b/ch3/cats_dogs/cats_dogs.go index 8323a92f..f25970a3 100644 --- a/ch3/cats_dogs/cats_dogs.go +++ b/ch3/cats_dogs/cats_dogs.go @@ -15,13 +15,12 @@ import ( "embed" "cogentcore.org/core/base/errors" - "cogentcore.org/core/base/randx" "cogentcore.org/core/core" "cogentcore.org/core/enums" "cogentcore.org/core/icons" "cogentcore.org/core/math32" - "cogentcore.org/core/tensor/table" "cogentcore.org/core/tree" + "cogentcore.org/lab/base/randx" "github.com/emer/emergent/v2/egui" "github.com/emer/emergent/v2/elog" "github.com/emer/emergent/v2/emer" @@ -33,6 +32,7 @@ import ( "github.com/emer/emergent/v2/params" "github.com/emer/emergent/v2/paths" "github.com/emer/emergent/v2/relpos" + "github.com/emer/etensor/tensor/table" "github.com/emer/leabra/v2/leabra" ) diff --git a/ch3/faces/faces.go b/ch3/faces/faces.go index a9ffdf34..364f39eb 100644 --- a/ch3/faces/faces.go +++ b/ch3/faces/faces.go @@ -19,17 +19,12 @@ import ( "embed" "cogentcore.org/core/base/errors" - "cogentcore.org/core/base/randx" "cogentcore.org/core/core" "cogentcore.org/core/enums" "cogentcore.org/core/icons" "cogentcore.org/core/math32" - "cogentcore.org/core/plot/plotcore" - "cogentcore.org/core/tensor" - "cogentcore.org/core/tensor/stats/clust" - "cogentcore.org/core/tensor/stats/metric" - "cogentcore.org/core/tensor/table" "cogentcore.org/core/tree" + "cogentcore.org/lab/base/randx" "github.com/emer/emergent/v2/egui" "github.com/emer/emergent/v2/elog" "github.com/emer/emergent/v2/emer" @@ -41,6 +36,11 @@ import ( "github.com/emer/emergent/v2/params" "github.com/emer/emergent/v2/paths" "github.com/emer/emergent/v2/relpos" + "github.com/emer/etensor/plot/plotcore" + "github.com/emer/etensor/tensor" + "github.com/emer/etensor/tensor/stats/clust" + "github.com/emer/etensor/tensor/stats/metric" + "github.com/emer/etensor/tensor/table" "github.com/emer/leabra/v2/leabra" "golang.org/x/exp/rand" ) diff --git a/ch3/inhib/inhib.go b/ch3/inhib/inhib.go index f5ac6e67..f084c634 100644 --- a/ch3/inhib/inhib.go +++ b/ch3/inhib/inhib.go @@ -11,13 +11,11 @@ package main import ( "cogentcore.org/core/base/errors" - "cogentcore.org/core/base/randx" "cogentcore.org/core/core" "cogentcore.org/core/enums" "cogentcore.org/core/icons" - "cogentcore.org/core/tensor" - "cogentcore.org/core/tensor/table" "cogentcore.org/core/tree" + "cogentcore.org/lab/base/randx" "github.com/emer/emergent/v2/egui" "github.com/emer/emergent/v2/elog" "github.com/emer/emergent/v2/emer" @@ -29,6 +27,8 @@ import ( "github.com/emer/emergent/v2/params" "github.com/emer/emergent/v2/patgen" "github.com/emer/emergent/v2/paths" + "github.com/emer/etensor/tensor" + "github.com/emer/etensor/tensor/table" "github.com/emer/leabra/v2/leabra" ) diff --git a/ch3/necker_cube/necker_cube.go b/ch3/necker_cube/necker_cube.go index 81edb647..af2c5597 100644 --- a/ch3/necker_cube/necker_cube.go +++ b/ch3/necker_cube/necker_cube.go @@ -12,11 +12,11 @@ package main import ( "embed" - "cogentcore.org/core/base/randx" "cogentcore.org/core/core" "cogentcore.org/core/enums" "cogentcore.org/core/icons" "cogentcore.org/core/tree" + "cogentcore.org/lab/base/randx" "github.com/emer/emergent/v2/egui" "github.com/emer/emergent/v2/elog" "github.com/emer/emergent/v2/emer" diff --git a/ch4/err_driven_hidden/err_driven_hidden.go b/ch4/err_driven_hidden/err_driven_hidden.go index a1ab71ce..a7691510 100644 --- a/ch4/err_driven_hidden/err_driven_hidden.go +++ b/ch4/err_driven_hidden/err_driven_hidden.go @@ -14,13 +14,12 @@ import ( "embed" "cogentcore.org/core/base/errors" - "cogentcore.org/core/base/randx" "cogentcore.org/core/core" "cogentcore.org/core/enums" "cogentcore.org/core/icons" "cogentcore.org/core/math32" - "cogentcore.org/core/tensor/table" "cogentcore.org/core/tree" + "cogentcore.org/lab/base/randx" "github.com/emer/emergent/v2/econfig" "github.com/emer/emergent/v2/egui" "github.com/emer/emergent/v2/elog" @@ -32,6 +31,7 @@ import ( "github.com/emer/emergent/v2/netview" "github.com/emer/emergent/v2/params" "github.com/emer/emergent/v2/paths" + "github.com/emer/etensor/tensor/table" "github.com/emer/leabra/v2/leabra" ) diff --git a/ch4/family_trees/family_trees.go b/ch4/family_trees/family_trees.go index 0a991273..8f7c8df0 100644 --- a/ch4/family_trees/family_trees.go +++ b/ch4/family_trees/family_trees.go @@ -14,15 +14,11 @@ import ( "strings" "cogentcore.org/core/base/errors" - "cogentcore.org/core/base/randx" "cogentcore.org/core/core" "cogentcore.org/core/enums" "cogentcore.org/core/icons" - "cogentcore.org/core/tensor" - "cogentcore.org/core/tensor/stats/clust" - "cogentcore.org/core/tensor/stats/metric" - "cogentcore.org/core/tensor/table" "cogentcore.org/core/tree" + "cogentcore.org/lab/base/randx" "github.com/emer/emergent/v2/econfig" "github.com/emer/emergent/v2/egui" "github.com/emer/emergent/v2/elog" @@ -34,6 +30,10 @@ import ( "github.com/emer/emergent/v2/netview" "github.com/emer/emergent/v2/params" "github.com/emer/emergent/v2/paths" + "github.com/emer/etensor/tensor" + "github.com/emer/etensor/tensor/stats/clust" + "github.com/emer/etensor/tensor/stats/metric" + "github.com/emer/etensor/tensor/table" "github.com/emer/leabra/v2/leabra" "gonum.org/v1/gonum/mat" ) diff --git a/ch4/hebberr_combo/hebberr_combo.go b/ch4/hebberr_combo/hebberr_combo.go index eeb46ffa..963bffb2 100644 --- a/ch4/hebberr_combo/hebberr_combo.go +++ b/ch4/hebberr_combo/hebberr_combo.go @@ -13,16 +13,12 @@ import ( "embed" "cogentcore.org/core/base/errors" - "cogentcore.org/core/base/randx" "cogentcore.org/core/core" "cogentcore.org/core/enums" "cogentcore.org/core/icons" "cogentcore.org/core/math32" - "cogentcore.org/core/tensor" - "cogentcore.org/core/tensor/stats/metric" - "cogentcore.org/core/tensor/stats/norm" - "cogentcore.org/core/tensor/table" "cogentcore.org/core/tree" + "cogentcore.org/lab/base/randx" "github.com/emer/emergent/v2/econfig" "github.com/emer/emergent/v2/egui" "github.com/emer/emergent/v2/elog" @@ -34,6 +30,10 @@ import ( "github.com/emer/emergent/v2/netview" "github.com/emer/emergent/v2/params" "github.com/emer/emergent/v2/paths" + "github.com/emer/etensor/tensor" + "github.com/emer/etensor/tensor/stats/metric" + "github.com/emer/etensor/tensor/stats/norm" + "github.com/emer/etensor/tensor/table" "golang.org/x/exp/rand" // "github.com/emer/etable/split" diff --git a/ch4/pat_assoc/pat_assoc.go b/ch4/pat_assoc/pat_assoc.go index 67186fe3..921df3fa 100644 --- a/ch4/pat_assoc/pat_assoc.go +++ b/ch4/pat_assoc/pat_assoc.go @@ -13,13 +13,12 @@ import ( "embed" "cogentcore.org/core/base/errors" - "cogentcore.org/core/base/randx" "cogentcore.org/core/core" "cogentcore.org/core/enums" "cogentcore.org/core/icons" "cogentcore.org/core/math32" - "cogentcore.org/core/tensor/table" "cogentcore.org/core/tree" + "cogentcore.org/lab/base/randx" "github.com/emer/emergent/v2/econfig" "github.com/emer/emergent/v2/egui" "github.com/emer/emergent/v2/elog" @@ -31,6 +30,7 @@ import ( "github.com/emer/emergent/v2/netview" "github.com/emer/emergent/v2/params" "github.com/emer/emergent/v2/paths" + "github.com/emer/etensor/tensor/table" "github.com/emer/leabra/v2/leabra" ) diff --git a/ch4/self_org/self_org.go b/ch4/self_org/self_org.go index 10973136..4d70e84a 100644 --- a/ch4/self_org/self_org.go +++ b/ch4/self_org/self_org.go @@ -13,15 +13,11 @@ import ( "embed" "cogentcore.org/core/base/errors" - "cogentcore.org/core/base/randx" "cogentcore.org/core/core" "cogentcore.org/core/enums" "cogentcore.org/core/icons" - "cogentcore.org/core/tensor" - "cogentcore.org/core/tensor/stats/metric" - "cogentcore.org/core/tensor/stats/norm" - "cogentcore.org/core/tensor/table" "cogentcore.org/core/tree" + "cogentcore.org/lab/base/randx" "github.com/emer/emergent/v2/econfig" "github.com/emer/emergent/v2/egui" "github.com/emer/emergent/v2/elog" @@ -33,6 +29,10 @@ import ( "github.com/emer/emergent/v2/netview" "github.com/emer/emergent/v2/params" "github.com/emer/emergent/v2/paths" + "github.com/emer/etensor/tensor" + "github.com/emer/etensor/tensor/stats/metric" + "github.com/emer/etensor/tensor/stats/norm" + "github.com/emer/etensor/tensor/table" "github.com/emer/leabra/v2/leabra" ) diff --git a/ch6/attn/attn.go b/ch6/attn/attn.go index 9995296a..012fab15 100644 --- a/ch6/attn/attn.go +++ b/ch6/attn/attn.go @@ -17,16 +17,12 @@ import ( "strings" "cogentcore.org/core/base/errors" - "cogentcore.org/core/base/randx" "cogentcore.org/core/core" "cogentcore.org/core/enums" "cogentcore.org/core/icons" "cogentcore.org/core/math32" - "cogentcore.org/core/plot/plotcore" - "cogentcore.org/core/tensor" - "cogentcore.org/core/tensor/stats/split" - "cogentcore.org/core/tensor/table" "cogentcore.org/core/tree" + "cogentcore.org/lab/base/randx" "github.com/emer/emergent/v2/egui" "github.com/emer/emergent/v2/elog" "github.com/emer/emergent/v2/emer" @@ -37,6 +33,10 @@ import ( "github.com/emer/emergent/v2/netview" "github.com/emer/emergent/v2/params" "github.com/emer/emergent/v2/paths" + "github.com/emer/etensor/plot/plotcore" + "github.com/emer/etensor/tensor" + "github.com/emer/etensor/tensor/stats/split" + "github.com/emer/etensor/tensor/table" "github.com/emer/leabra/v2/leabra" ) diff --git a/ch6/objrec/led_env.go b/ch6/objrec/led_env.go index 1f61b4e9..44108eca 100644 --- a/ch6/objrec/led_env.go +++ b/ch6/objrec/led_env.go @@ -8,9 +8,9 @@ import ( "fmt" "math/rand" - "cogentcore.org/core/tensor" "github.com/emer/emergent/v2/env" "github.com/emer/emergent/v2/etime" + "github.com/emer/etensor/tensor" "github.com/emer/vision/v2/vfilter" "github.com/emer/vision/v2/vxform" ) diff --git a/ch6/objrec/objrec.go b/ch6/objrec/objrec.go index 9400b948..f7f46584 100644 --- a/ch6/objrec/objrec.go +++ b/ch6/objrec/objrec.go @@ -18,19 +18,15 @@ import ( "os" "reflect" - "cogentcore.org/core/base/mpi" - "cogentcore.org/core/base/randx" "cogentcore.org/core/core" "cogentcore.org/core/enums" "cogentcore.org/core/icons" "cogentcore.org/core/math32" "cogentcore.org/core/math32/minmax" "cogentcore.org/core/system" - "cogentcore.org/core/tensor/stats/split" - "cogentcore.org/core/tensor/stats/stats" - "cogentcore.org/core/tensor/table" - "cogentcore.org/core/tensor/tensorcore" "cogentcore.org/core/tree" + "cogentcore.org/lab/base/mpi" + "cogentcore.org/lab/base/randx" "github.com/emer/emergent/v2/econfig" "github.com/emer/emergent/v2/egui" "github.com/emer/emergent/v2/elog" @@ -42,6 +38,10 @@ import ( "github.com/emer/emergent/v2/netview" "github.com/emer/emergent/v2/params" "github.com/emer/emergent/v2/paths" + "github.com/emer/etensor/tensor/stats/split" + "github.com/emer/etensor/tensor/stats/stats" + "github.com/emer/etensor/tensor/table" + "github.com/emer/etensor/tensor/tensorcore" "github.com/emer/leabra/v2/leabra" ) diff --git a/ch6/objrec/v1filter.go b/ch6/objrec/v1filter.go index 5d61da95..6b0e5bc3 100644 --- a/ch6/objrec/v1filter.go +++ b/ch6/objrec/v1filter.go @@ -7,8 +7,8 @@ package main import ( "image" - "cogentcore.org/core/tensor" "github.com/anthonynsimon/bild/transform" + "github.com/emer/etensor/tensor" "github.com/emer/vision/v2/fffb" "github.com/emer/vision/v2/gabor" "github.com/emer/vision/v2/kwta" diff --git a/ch6/v1rf/dogfilter.go b/ch6/v1rf/dogfilter.go index d7788058..79737b59 100644 --- a/ch6/v1rf/dogfilter.go +++ b/ch6/v1rf/dogfilter.go @@ -9,7 +9,7 @@ import ( "github.com/anthonynsimon/bild/transform" - "cogentcore.org/core/tensor" + "github.com/emer/etensor/tensor" "github.com/emer/vision/v2/dog" "github.com/emer/vision/v2/vfilter" ) diff --git a/ch6/v1rf/img_env.go b/ch6/v1rf/img_env.go index 23ed55af..40e8862e 100644 --- a/ch6/v1rf/img_env.go +++ b/ch6/v1rf/img_env.go @@ -12,10 +12,10 @@ import ( "math/rand" "cogentcore.org/core/base/iox/imagex" - "cogentcore.org/core/tensor" "github.com/anthonynsimon/bild/clone" "github.com/emer/emergent/v2/env" "github.com/emer/emergent/v2/etime" + "github.com/emer/etensor/tensor" "github.com/emer/vision/v2/vxform" ) diff --git a/ch6/v1rf/v1rf.go b/ch6/v1rf/v1rf.go index 5e53ede5..e4d875e7 100644 --- a/ch6/v1rf/v1rf.go +++ b/ch6/v1rf/v1rf.go @@ -19,16 +19,13 @@ import ( "os" "cogentcore.org/core/base/errors" - "cogentcore.org/core/base/randx" "cogentcore.org/core/core" "cogentcore.org/core/enums" "cogentcore.org/core/icons" "cogentcore.org/core/math32" "cogentcore.org/core/system" - "cogentcore.org/core/tensor" - "cogentcore.org/core/tensor/table" - "cogentcore.org/core/tensor/tensorcore" "cogentcore.org/core/tree" + "cogentcore.org/lab/base/randx" "github.com/emer/emergent/v2/econfig" "github.com/emer/emergent/v2/egui" "github.com/emer/emergent/v2/elog" @@ -40,6 +37,9 @@ import ( "github.com/emer/emergent/v2/netview" "github.com/emer/emergent/v2/params" "github.com/emer/emergent/v2/paths" + "github.com/emer/etensor/tensor" + "github.com/emer/etensor/tensor/table" + "github.com/emer/etensor/tensor/tensorcore" "github.com/emer/leabra/v2/leabra" ) diff --git a/ch7/abac/abac.go b/ch7/abac/abac.go index 396f984c..b73c961b 100644 --- a/ch7/abac/abac.go +++ b/ch7/abac/abac.go @@ -15,18 +15,12 @@ import ( "reflect" "cogentcore.org/core/base/errors" - "cogentcore.org/core/base/randx" "cogentcore.org/core/core" "cogentcore.org/core/enums" "cogentcore.org/core/icons" "cogentcore.org/core/math32" - "cogentcore.org/core/plot/plotcore" - "cogentcore.org/core/tensor/stats/clust" - "cogentcore.org/core/tensor/stats/metric" - "cogentcore.org/core/tensor/stats/split" - "cogentcore.org/core/tensor/stats/stats" - "cogentcore.org/core/tensor/table" "cogentcore.org/core/tree" + "cogentcore.org/lab/base/randx" "github.com/emer/emergent/v2/econfig" "github.com/emer/emergent/v2/egui" "github.com/emer/emergent/v2/elog" @@ -38,6 +32,12 @@ import ( "github.com/emer/emergent/v2/netview" "github.com/emer/emergent/v2/params" "github.com/emer/emergent/v2/paths" + "github.com/emer/etensor/plot/plotcore" + "github.com/emer/etensor/tensor/stats/clust" + "github.com/emer/etensor/tensor/stats/metric" + "github.com/emer/etensor/tensor/stats/split" + "github.com/emer/etensor/tensor/stats/stats" + "github.com/emer/etensor/tensor/table" "github.com/emer/leabra/v2/leabra" "gonum.org/v1/gonum/mat" ) diff --git a/ch7/hip/hip.go b/ch7/hip/hip.go index 5170a963..cae4bb4e 100644 --- a/ch7/hip/hip.go +++ b/ch7/hip/hip.go @@ -16,14 +16,11 @@ import ( "strings" "cogentcore.org/core/base/errors" - "cogentcore.org/core/base/randx" "cogentcore.org/core/core" "cogentcore.org/core/enums" "cogentcore.org/core/icons" - "cogentcore.org/core/plot/plotcore" - "cogentcore.org/core/tensor/stats/split" - "cogentcore.org/core/tensor/table" "cogentcore.org/core/tree" + "cogentcore.org/lab/base/randx" "github.com/emer/emergent/v2/econfig" "github.com/emer/emergent/v2/egui" "github.com/emer/emergent/v2/elog" @@ -36,6 +33,9 @@ import ( "github.com/emer/emergent/v2/params" "github.com/emer/emergent/v2/patgen" "github.com/emer/emergent/v2/paths" + "github.com/emer/etensor/plot/plotcore" + "github.com/emer/etensor/tensor/stats/split" + "github.com/emer/etensor/tensor/table" "github.com/emer/leabra/v2/leabra" ) diff --git a/ch7/priming/priming.go b/ch7/priming/priming.go index 16523b61..c6febc6f 100644 --- a/ch7/priming/priming.go +++ b/ch7/priming/priming.go @@ -16,13 +16,11 @@ import ( "strings" "cogentcore.org/core/base/errors" - "cogentcore.org/core/base/randx" "cogentcore.org/core/core" "cogentcore.org/core/enums" "cogentcore.org/core/icons" - "cogentcore.org/core/plot/plotcore" - "cogentcore.org/core/tensor/table" "cogentcore.org/core/tree" + "cogentcore.org/lab/base/randx" "github.com/emer/emergent/v2/econfig" "github.com/emer/emergent/v2/egui" "github.com/emer/emergent/v2/elog" @@ -34,6 +32,8 @@ import ( "github.com/emer/emergent/v2/netview" "github.com/emer/emergent/v2/params" "github.com/emer/emergent/v2/paths" + "github.com/emer/etensor/plot/plotcore" + "github.com/emer/etensor/tensor/table" "github.com/emer/leabra/v2/leabra" ) diff --git a/ch8/bg/bandit_env.go b/ch8/bg/bandit_env.go index b96d6745..74dd5438 100644 --- a/ch8/bg/bandit_env.go +++ b/ch8/bg/bandit_env.go @@ -8,9 +8,9 @@ import ( "fmt" "math/rand" - "cogentcore.org/core/base/randx" - "cogentcore.org/core/tensor" + "cogentcore.org/lab/base/randx" "github.com/emer/emergent/v2/env" + "github.com/emer/etensor/tensor" ) // BanditEnv simulates an n-armed bandit, where each of n inputs is associated with diff --git a/ch8/bg/bg.go b/ch8/bg/bg.go index 5b3656b7..88450f82 100644 --- a/ch8/bg/bg.go +++ b/ch8/bg/bg.go @@ -15,15 +15,11 @@ package main import ( "cogentcore.org/core/base/errors" - "cogentcore.org/core/base/randx" "cogentcore.org/core/core" "cogentcore.org/core/enums" "cogentcore.org/core/icons" - "cogentcore.org/core/tensor" - "cogentcore.org/core/tensor/stats/metric" - "cogentcore.org/core/tensor/stats/norm" - "cogentcore.org/core/tensor/table" "cogentcore.org/core/tree" + "cogentcore.org/lab/base/randx" "github.com/emer/emergent/v2/econfig" "github.com/emer/emergent/v2/egui" "github.com/emer/emergent/v2/elog" @@ -35,6 +31,10 @@ import ( "github.com/emer/emergent/v2/netview" "github.com/emer/emergent/v2/params" "github.com/emer/emergent/v2/paths" + "github.com/emer/etensor/tensor" + "github.com/emer/etensor/tensor/stats/metric" + "github.com/emer/etensor/tensor/stats/norm" + "github.com/emer/etensor/tensor/table" "github.com/emer/leabra/v2/leabra" ) diff --git a/ch8/rl/cond_env.go b/ch8/rl/cond_env.go index 2380c5cf..9a95f732 100644 --- a/ch8/rl/cond_env.go +++ b/ch8/rl/cond_env.go @@ -8,10 +8,10 @@ import ( "fmt" "math/rand" - "cogentcore.org/core/base/randx" - "cogentcore.org/core/tensor" + "cogentcore.org/lab/base/randx" "github.com/emer/emergent/v2/env" "github.com/emer/emergent/v2/etime" + "github.com/emer/etensor/tensor" ) // OnOff represents stimulus On / Off timing diff --git a/ch8/rl/rl.go b/ch8/rl/rl.go index ca0def5c..37dcd2e1 100644 --- a/ch8/rl/rl.go +++ b/ch8/rl/rl.go @@ -10,16 +10,12 @@ package main import ( "cogentcore.org/core/base/errors" - "cogentcore.org/core/base/randx" "cogentcore.org/core/core" "cogentcore.org/core/enums" "cogentcore.org/core/icons" "cogentcore.org/core/math32" - "cogentcore.org/core/tensor" - "cogentcore.org/core/tensor/stats/metric" - "cogentcore.org/core/tensor/stats/norm" - "cogentcore.org/core/tensor/table" "cogentcore.org/core/tree" + "cogentcore.org/lab/base/randx" "github.com/emer/emergent/v2/econfig" "github.com/emer/emergent/v2/egui" "github.com/emer/emergent/v2/elog" @@ -31,6 +27,10 @@ import ( "github.com/emer/emergent/v2/netview" "github.com/emer/emergent/v2/params" "github.com/emer/emergent/v2/paths" + "github.com/emer/etensor/tensor" + "github.com/emer/etensor/tensor/stats/metric" + "github.com/emer/etensor/tensor/stats/norm" + "github.com/emer/etensor/tensor/table" "github.com/emer/leabra/v2/leabra" ) diff --git a/ch9/a_not_b/a_not_b.go b/ch9/a_not_b/a_not_b.go index 4093400a..b2ee8c1a 100644 --- a/ch9/a_not_b/a_not_b.go +++ b/ch9/a_not_b/a_not_b.go @@ -18,14 +18,13 @@ import ( "strings" "cogentcore.org/core/base/errors" - "cogentcore.org/core/base/randx" "cogentcore.org/core/core" "cogentcore.org/core/enums" "cogentcore.org/core/icons" "cogentcore.org/core/math32" "cogentcore.org/core/styles" - "cogentcore.org/core/tensor/table" "cogentcore.org/core/tree" + "cogentcore.org/lab/base/randx" "github.com/emer/emergent/v2/econfig" "github.com/emer/emergent/v2/egui" "github.com/emer/emergent/v2/elog" @@ -37,6 +36,7 @@ import ( "github.com/emer/emergent/v2/netview" "github.com/emer/emergent/v2/params" "github.com/emer/emergent/v2/paths" + "github.com/emer/etensor/tensor/table" "github.com/emer/leabra/v2/leabra" ) diff --git a/ch9/sir/sir.go b/ch9/sir/sir.go index 829d069d..4bedc853 100644 --- a/ch9/sir/sir.go +++ b/ch9/sir/sir.go @@ -15,13 +15,13 @@ package main import ( "fmt" - "cogentcore.org/core/base/randx" "cogentcore.org/core/core" "cogentcore.org/core/enums" "cogentcore.org/core/icons" "cogentcore.org/core/math32" "cogentcore.org/core/styles" "cogentcore.org/core/tree" + "cogentcore.org/lab/base/randx" "github.com/emer/emergent/v2/econfig" "github.com/emer/emergent/v2/egui" "github.com/emer/emergent/v2/elog" diff --git a/ch9/sir/sir_env.go b/ch9/sir/sir_env.go index 6e99e1a3..5458b618 100644 --- a/ch9/sir/sir_env.go +++ b/ch9/sir/sir_env.go @@ -8,9 +8,9 @@ import ( "fmt" "math/rand" - "cogentcore.org/core/tensor" "github.com/emer/emergent/v2/env" "github.com/emer/emergent/v2/etime" + "github.com/emer/etensor/tensor" ) // Actions are SIR actions diff --git a/ch9/stroop/stroop.go b/ch9/stroop/stroop.go index 028b3a24..0174da6f 100644 --- a/ch9/stroop/stroop.go +++ b/ch9/stroop/stroop.go @@ -16,15 +16,14 @@ import ( "strings" "cogentcore.org/core/base/errors" - "cogentcore.org/core/base/randx" "cogentcore.org/core/core" "cogentcore.org/core/enums" "cogentcore.org/core/icons" "cogentcore.org/core/math32" "cogentcore.org/core/math32/minmax" "cogentcore.org/core/styles" - "cogentcore.org/core/tensor/table" "cogentcore.org/core/tree" + "cogentcore.org/lab/base/randx" "github.com/emer/emergent/v2/econfig" "github.com/emer/emergent/v2/egui" "github.com/emer/emergent/v2/elog" @@ -36,6 +35,7 @@ import ( "github.com/emer/emergent/v2/netview" "github.com/emer/emergent/v2/params" "github.com/emer/emergent/v2/paths" + "github.com/emer/etensor/tensor/table" "github.com/emer/leabra/v2/leabra" ) diff --git a/go.mod b/go.mod index f1712cdf..b27bfc51 100644 --- a/go.mod +++ b/go.mod @@ -1,15 +1,17 @@ module github.com/CompCogNeuro/sims/v2 -go 1.22 +go 1.22.0 require ( - cogentcore.org/core v0.3.5 + cogentcore.org/core v0.3.9-0.20250127075122-ddf64b82d707 + cogentcore.org/lab v0.0.0-20250116065728-014d19175d12 github.com/anthonynsimon/bild v0.13.0 - github.com/emer/emergent/v2 v2.0.0-dev0.1.7 - github.com/emer/leabra/v2 v2.0.0-dev0.5.5 - github.com/emer/vision/v2 v2.0.0-dev0.1.0 - golang.org/x/exp v0.0.0-20240823005443-9b4947da3948 - gonum.org/v1/gonum v0.15.0 + github.com/emer/emergent/v2 v2.0.0-dev0.1.7.0.20250128232110-1e71a5c7249b + github.com/emer/etensor v0.0.0-20250128230539-a9366874f7c3 + github.com/emer/leabra/v2 v2.0.0-dev0.5.5.0.20250128232242-79e931d6fe3b + github.com/emer/vision/v2 v2.0.0-dev0.1.0.0.20250128233535-2716c2c5e5ec + golang.org/x/exp v0.0.0-20250128182459-e0ece0dbea4c + gonum.org/v1/gonum v0.15.1 ) require ( @@ -19,7 +21,7 @@ require ( github.com/alecthomas/chroma/v2 v2.13.0 // indirect github.com/aymerick/douceur v0.2.0 // indirect github.com/chewxy/math32 v1.10.1 // indirect - github.com/cogentcore/webgpu v0.0.0-20240906154609-e35089e9a725 // indirect + github.com/cogentcore/webgpu v0.0.0-20250118183535-3dd1436165cf // indirect github.com/dlclark/regexp2 v1.11.0 // indirect github.com/fsnotify/fsnotify v1.7.0 // indirect github.com/go-gl/glfw/v3.3/glfw v0.0.0-20240506104042-037f3cc74f2a // indirect @@ -33,10 +35,10 @@ require ( github.com/mitchellh/go-homedir v1.1.0 // indirect github.com/pelletier/go-toml/v2 v2.1.2-0.20240227203013-2b69615b5d55 // indirect golang.org/x/image v0.18.0 // indirect - golang.org/x/mod v0.20.0 // indirect - golang.org/x/net v0.28.0 // indirect - golang.org/x/sync v0.8.0 // indirect - golang.org/x/sys v0.23.0 // indirect - golang.org/x/text v0.17.0 // indirect - golang.org/x/tools v0.24.0 // indirect + golang.org/x/mod v0.22.0 // indirect + golang.org/x/net v0.34.0 // indirect + golang.org/x/sync v0.10.0 // indirect + golang.org/x/sys v0.29.0 // indirect + golang.org/x/text v0.21.0 // indirect + golang.org/x/tools v0.29.0 // indirect ) diff --git a/go.sum b/go.sum index 52f42c7b..8108a445 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,7 @@ -cogentcore.org/core v0.3.5 h1:qTW/+GSUbeYYCSi29zdAQ/fnjWg2/E/aTbAMbfAFGfI= -cogentcore.org/core v0.3.5/go.mod h1:q3OrXihYG2aTE2oG785ad5b6aJ3wzSCXeeD2SSLKWIE= +cogentcore.org/core v0.3.9-0.20250127075122-ddf64b82d707 h1:iuSRxC52LhHwAiNKfKx0UslAmZV2Io7QkkQYOgOyM6M= +cogentcore.org/core v0.3.9-0.20250127075122-ddf64b82d707/go.mod h1:o9vCyA2Sdsc6W0qYvxzzQQlozfemP0TiAGEHDDR+xLU= +cogentcore.org/lab v0.0.0-20250116065728-014d19175d12 h1:Y11ebOAN9EMCEmSg2M/O5wToGOOvQN08CWi2iou8jGU= +cogentcore.org/lab v0.0.0-20250116065728-014d19175d12/go.mod h1:QlbVp7wdCDo59f6d0UIoPFLtIsCcG7DueOqd/8OohUs= github.com/Bios-Marcel/wastebasket v0.0.4-0.20240213135800-f26f1ae0a7c4 h1:6lx9xzJAhdjq0LvVfbITeC3IH9Fzvo1aBahyPu2FuG8= github.com/Bios-Marcel/wastebasket v0.0.4-0.20240213135800-f26f1ae0a7c4/go.mod h1:FChzXi1izqzdPb6BiNZmcZLGyTYiT61iGx9Rxx9GNeI= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= @@ -20,8 +22,8 @@ github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuP github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4= github.com/chewxy/math32 v1.10.1 h1:LFpeY0SLJXeaiej/eIp2L40VYfscTvKh/FSEZ68uMkU= github.com/chewxy/math32 v1.10.1/go.mod h1:dOB2rcuFrCn6UHrze36WSLVPKtzPMRAQvBvUwkSsLqs= -github.com/cogentcore/webgpu v0.0.0-20240906154609-e35089e9a725 h1:Zf2ixJY1PsN3huZa0Uof7VKYuoBbdxJCEbKdhKhHqwE= -github.com/cogentcore/webgpu v0.0.0-20240906154609-e35089e9a725/go.mod h1:ciqaxChrmRRMU1SnI5OE12Cn3QWvOKO+e5nSy+N9S1o= +github.com/cogentcore/webgpu v0.0.0-20250118183535-3dd1436165cf h1:efac1kg29kwhSLyMd9EjwHbNX8jJpiRG5Dm2QIb56YQ= +github.com/cogentcore/webgpu v0.0.0-20250118183535-3dd1436165cf/go.mod h1:ciqaxChrmRRMU1SnI5OE12Cn3QWvOKO+e5nSy+N9S1o= github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= @@ -32,12 +34,14 @@ github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/dlclark/regexp2 v1.11.0 h1:G/nrcoOa7ZXlpoa/91N3X7mM3r8eIlMBBJZvsz/mxKI= github.com/dlclark/regexp2 v1.11.0/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8= -github.com/emer/emergent/v2 v2.0.0-dev0.1.7 h1:erlMffQ7V0Wdcc6yGjOZ3o7l3k96w8QZF1dW5nPY8b4= -github.com/emer/emergent/v2 v2.0.0-dev0.1.7/go.mod h1:9QhWnj/IHq/TrVzcXsC96GlC1Gg/pK0pwMI5sZr+/yU= -github.com/emer/leabra/v2 v2.0.0-dev0.5.5 h1:s0fQDr9OSG7tX+fLAyK6YfOJVa51uwEsr+4miteB/+8= -github.com/emer/leabra/v2 v2.0.0-dev0.5.5/go.mod h1:TuB2VEkrxHYzgQyoozP6P1pgYio/F7o4sm11VNT+ztY= -github.com/emer/vision/v2 v2.0.0-dev0.1.0 h1:Xt1zRyjYNGw1XEq4e5mvM9/+GOOBRIu1HYVEYmklp+c= -github.com/emer/vision/v2 v2.0.0-dev0.1.0/go.mod h1:NjWHbBnHzEEG5CzThQeOz8l/aLp2SROmyyBDIBuRYRc= +github.com/emer/emergent/v2 v2.0.0-dev0.1.7.0.20250128232110-1e71a5c7249b h1:9JietOCAVjGy9U14dbTJT2APMywpKT+sGH25eYQtK1g= +github.com/emer/emergent/v2 v2.0.0-dev0.1.7.0.20250128232110-1e71a5c7249b/go.mod h1:5tbTQvSxq8CDPvZffN1Rni/mLYG3jLxYicyWed1t4yo= +github.com/emer/etensor v0.0.0-20250128230539-a9366874f7c3 h1:9yia9XH5z88JjDJwi1trDlVQTIEJ9TTUwdxo6bzr94U= +github.com/emer/etensor v0.0.0-20250128230539-a9366874f7c3/go.mod h1:pH4lH+TChvqJG4Lh2Qi1bS5e3pnGK1QDkCSfUX4J+lQ= +github.com/emer/leabra/v2 v2.0.0-dev0.5.5.0.20250128232242-79e931d6fe3b h1:Z2QRcHh9kvDyKSwPYhc/8q/NwWcd0OUexuhZCq5oHJ4= +github.com/emer/leabra/v2 v2.0.0-dev0.5.5.0.20250128232242-79e931d6fe3b/go.mod h1:Md86O3aaHH2hfZftTsg5orAhX2uRJFT8pXjfN8neYh4= +github.com/emer/vision/v2 v2.0.0-dev0.1.0.0.20250128233535-2716c2c5e5ec h1:OALvNRetXLhCxkBDLrHHHM6wUAbDgr2ZJC1Fq7ZvxR0= +github.com/emer/vision/v2 v2.0.0-dev0.1.0.0.20250128233535-2716c2c5e5ec/go.mod h1:FfG6xjDD5OyFAkgDo3OHRTnbW/rM8mFI3Uq+vmZnaMM= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= @@ -45,6 +49,8 @@ github.com/go-gl/glfw/v3.3/glfw v0.0.0-20240506104042-037f3cc74f2a h1:vxnBhFDDT+ github.com/go-gl/glfw/v3.3/glfw v0.0.0-20240506104042-037f3cc74f2a/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/goki/freetype v1.0.5 h1:yi2lQeUhXnBgSMqYd0vVmPw6RnnfIeTP3N4uvaJXd7A= github.com/goki/freetype v1.0.5/go.mod h1:wKmKxddbzKmeci9K96Wknn5kjTWLyfC8tKOqAFbEX8E= +github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= +github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/gorilla/css v1.0.1 h1:ntNaBIghp6JmvWnxbZKANoLyuXTPZ4cAMlo6RyhlbO8= github.com/gorilla/css v1.0.1/go.mod h1:BvnYkspnSzMmwRK+b8/xgNPLiIuNZr6vbZBTPQ2A3b0= github.com/h2non/filetype v1.1.3 h1:FKkx9QbD7HR/zjK1Ia5XiBsq9zdLi5Kf3zGyFTAFkGg= @@ -85,32 +91,32 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= -github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= +github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= +github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -golang.org/x/exp v0.0.0-20240823005443-9b4947da3948 h1:kx6Ds3MlpiUHKj7syVnbp57++8WpuKPcR5yjLBjvLEA= -golang.org/x/exp v0.0.0-20240823005443-9b4947da3948/go.mod h1:akd2r19cwCdwSwWeIdzYQGa/EZZyqcOdwWiwj5L5eKQ= +golang.org/x/exp v0.0.0-20250128182459-e0ece0dbea4c h1:KL/ZBHXgKGVmuZBZ01Lt57yE5ws8ZPSkkihmEyq7FXc= +golang.org/x/exp v0.0.0-20250128182459-e0ece0dbea4c/go.mod h1:tujkw807nyEEAamNbDrEGzRav+ilXA7PCRAd6xsmwiU= golang.org/x/image v0.0.0-20190703141733-d6a02ce849c9/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/image v0.18.0 h1:jGzIakQa/ZXI1I0Fxvaa9W7yP25TqT6cHIHn+6CqvSQ= golang.org/x/image v0.18.0/go.mod h1:4yyo5vMFQjVjUcVk4jEQcU9MGy/rulF5WvUILseCM2E= -golang.org/x/mod v0.20.0 h1:utOm6MM3R3dnawAiJgn0y+xvuYRsm1RKM/4giyfDgV0= -golang.org/x/mod v0.20.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= -golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE= -golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg= -golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ= -golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/mod v0.22.0 h1:D4nJWe9zXqHOmWqj4VMOJhvzj7bEZg4wEYa759z1pH4= +golang.org/x/mod v0.22.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY= +golang.org/x/net v0.34.0 h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0= +golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k= +golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ= +golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.23.0 h1:YfKFowiIMvtgl1UERQoTPPToxltDeZfbj4H7dVUCwmM= -golang.org/x/sys v0.23.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU= +golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc= -golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= -golang.org/x/tools v0.24.0 h1:J1shsA93PJUEVaUSaay7UXAyE8aimq3GW0pjlolpa24= -golang.org/x/tools v0.24.0/go.mod h1:YhNqVBIfWHdzvTLs0d8LCuMhkKUgSUKldakyV7W/WDQ= -gonum.org/v1/gonum v0.15.0 h1:2lYxjRbTYyxkJxlhC+LvJIx3SsANPdRybu1tGj9/OrQ= -gonum.org/v1/gonum v0.15.0/go.mod h1:xzZVBJBtS+Mz4q0Yl2LJTk+OxOg4jiXZ7qBoM0uISGo= +golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo= +golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ= +golang.org/x/tools v0.29.0 h1:Xx0h3TtM9rzQpQuR4dKLrdglAmCEN5Oi+P74JdhdzXE= +golang.org/x/tools v0.29.0/go.mod h1:KMQVMRsVxU6nHCFXrBPhDB8XncLNLM0lIy/F14RP588= +gonum.org/v1/gonum v0.15.1 h1:FNy7N6OUZVUaWG9pTiD+jlhdQ3lMP+/LcTpJ6+a8sQ0= +gonum.org/v1/gonum v0.15.1/go.mod h1:eZTZuRFrzu5pcyjN5wJhcIhnUdNijYxX1T2IcrOGY0o= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=