update to use emer/etensor and other temporary packages

CompCogNeuro · Jan 28, 2025 · 2eb9a91 · 2eb9a91
1 parent caf53a9
commit 2eb9a91
Show file tree

Hide file tree

Showing 37 changed files with 161 additions and 153 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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"
 )