moved empi / mpi to cogent core

README.md

@@ -118,7 +118,7 @@ The following all work together to provide a convenient layer of abstraction for
 
 * [efuns](efuns) has misc special functions such as Gaussian and Sigmoid.
 
-* [erand](erand) has misc random-number generation support functionality, including `erand.RndParams` for parameterizing the type of random noise to add to a model, and easier support for making permuted random lists, etc.
+* [randx](randx) has misc random-number generation support functionality, including `randx.RandParams` for parameterizing the type of random noise to add to a model, and easier support for making permuted random lists, etc.
 
 * [esg](esg) is the *emergent stochastic / sentence generator* -- parses simple grammars that generate random events (sentences) -- can be a good starting point for generating more complex environments.
 

actrf/mpi.go

@@ -5,8 +5,8 @@
 package actrf
 
 import (
-	"github.com/emer/emergent/v2/empi"
-	"github.com/emer/emergent/v2/empi/mpi"
+	"cogentcore.org/core/base/mpi"
+	"cogentcore.org/core/tensor/tensormpi"
 )
 
 // MPISum aggregates RF Sum data across all processors in given mpi communicator.
@@ -15,9 +15,9 @@ func (af *RF) MPISum(comm *mpi.Comm) {
 	if mpi.WorldSize() == 1 {
 		return
 	}
-	empi.ReduceTensor(&af.MPITmp, &af.SumProd, comm, mpi.OpSum)
+	tensormpi.ReduceTensor(&af.MPITmp, &af.SumProd, comm, mpi.OpSum)
 	af.SumProd.CopyFrom(&af.MPITmp)
-	empi.ReduceTensor(&af.MPITmp, &af.SumSrc, comm, mpi.OpSum)
+	tensormpi.ReduceTensor(&af.MPITmp, &af.SumSrc, comm, mpi.OpSum)
 	af.SumSrc.CopyFrom(&af.MPITmp)
 }
 

decoder/linear.go

@@ -9,9 +9,9 @@ package decoder
 import (
 	"fmt"
 
+	"cogentcore.org/core/base/mpi"
 	"cogentcore.org/core/math32"
 	"cogentcore.org/core/tensor"
-	"github.com/emer/emergent/v2/empi/mpi"
 )
 
 type ActivationFunc func(float32) float32

decoder/softmax.go

@@ -15,10 +15,10 @@ import (
 	"path/filepath"
 	"sort"
 
+	"cogentcore.org/core/base/mpi"
 	"cogentcore.org/core/math32"
 	"cogentcore.org/core/tensor"
 	"github.com/emer/emergent/v2/emer"
-	"github.com/emer/emergent/v2/empi/mpi"
 )
 
 // SoftMax is a softmax decoder, which is the best choice for a 1-hot classification

doc.go

@@ -17,8 +17,8 @@ in algorithm-specific code, including things like MinMax and AvgMax, and also th
 parameter-styling infrastructure (emer.Params, emer.ParamStyle, emer.ParamSet and
 emer.ParamSets).
 
-* erand has misc random-number generation support functionality, including
-erand.RndParams for parameterizing the type of random noise to add to a model,
+* randx has misc random-number generation support functionality, including
+randx.RandParams for parameterizing the type of random noise to add to a model,
 and easier support for making permuted random lists, etc.
 
 * netview provides the NetView interactive 3D network viewer, implemented in the Cogent Core 3D framework.

ecmd/std.go

@@ -9,9 +9,9 @@ package ecmd
 import (
 	"os"
 
+	"cogentcore.org/core/base/mpi"
 	"github.com/emer/emergent/v2/elog"
 	"github.com/emer/emergent/v2/emer"
-	"github.com/emer/emergent/v2/empi/mpi"
 	"github.com/emer/emergent/v2/etime"
 )
 

econfig/README.md

@@ -59,7 +59,7 @@ Docs: [GoDoc](https://pkg.go.dev/github.com/emer/emergent/econfig)
 The [Cogent Core](https://cogentcore.org/core) GUI processes `default:"value"` struct tags to highlight values that are not at their defaults.  econfig uses these same tags to auto-initialize fields as well, ensuring that the tag and the actual initial value are the same.  The value for strings or numbers is just the string representation.  For more complex types, here ar some examples:
 
 * `struct`: specify using standard Go literal expression as a string, with single-quotes `'` used instead of double-quotes around strings, such as the name of the fields:
-    + `evec.Vector2i`: `default:"{'X':10,'Y':10}"`
+    + `vecint.Vector2i`: `default:"{'X':10,'Y':10}"`
 
 * `slice`: comma-separated list of values in square braces -- use `'` for internal string boundaries:
     + `[]float32`: `default:"[1, 2.14, 3.14]"`
@@ -80,10 +80,10 @@ type ParamConfig struct {
 	Network map[string]any
 
 	// size of hidden layer -- can use emer.LaySize for 4D layers
-	Hidden1Size evec.Vector2i `default:"{'X':10,'Y':10}" nest:"+"`
+	Hidden1Size vecint.Vector2i `default:"{'X':10,'Y':10}" nest:"+"`
 
 	// size of hidden layer -- can use emer.LaySize for 4D layers
-	Hidden2Size evec.Vector2i `default:"{'X':10,'Y':10}" nest:"+"`
+	Hidden2Size vecint.Vector2i `default:"{'X':10,'Y':10}" nest:"+"`
 
 	// Extra Param Sheet name(s) to use (space separated if multiple) -- must be valid name as listed in compiled-in params or loaded params
 	Sheet string

econfig/args.go

@@ -14,8 +14,8 @@ import (
 	"strings"
 
 	"cogentcore.org/core/base/iox/tomlx"
+	"cogentcore.org/core/base/mpi"
 	"cogentcore.org/core/base/reflectx"
-	"github.com/emer/emergent/v2/empi/mpi"
 	"github.com/iancoleman/strcase"
 )
 

econfig/config.go

@@ -12,7 +12,7 @@ import (
 	"reflect"
 
 	"cogentcore.org/core/base/dirs"
-	"github.com/emer/emergent/v2/empi/mpi"
+	"cogentcore.org/core/base/mpi"
 )
 
 var (

econfig/io.go

@@ -9,7 +9,7 @@ import (
 	"strings"
 
 	"cogentcore.org/core/base/iox/tomlx"
-	"github.com/emer/emergent/v2/empi/mpi"
+	"cogentcore.org/core/base/mpi"
 )
 
 // OpenWithIncludes reads config from given config file,

elog/logs.go

@@ -13,10 +13,10 @@ import (
 	"path/filepath"
 	"strconv"
 
+	"cogentcore.org/core/base/mpi"
 	"cogentcore.org/core/tensor/table"
+	"cogentcore.org/core/tensor/tensormpi"
 	"github.com/emer/emergent/v2/emer"
-	"github.com/emer/emergent/v2/empi"
-	"github.com/emer/emergent/v2/empi/mpi"
 	"github.com/emer/emergent/v2/estats"
 	"github.com/emer/emergent/v2/etime"
 )
@@ -308,7 +308,7 @@ func (lg *Logs) ResetLog(mode etime.Modes, time etime.Times) {
 	lt.ResetIndexViews()
 }
 
-// MPIGatherTableRows calls empi.GatherTableRows on the given log table
+// MPIGatherTableRows calls tensormpi.GatherTableRows on the given log table
 // using an "MPI" suffixed MiscTable that is then switched out with the main table,
 // so that any subsequent aggregation etc operates as usual on the full set of data.
 // IMPORTANT: this switch means that the number of rows in the table MUST be reset
@@ -323,7 +323,7 @@ func (lg *Logs) MPIGatherTableRows(mode etime.Modes, time etime.Times, comm *mpi
 	if !has {
 		mt = &table.Table{}
 	}
-	empi.GatherTableRows(mt, dt, comm)
+	tensormpi.GatherTableRows(mt, dt, comm)
 	lt.Table = mt
 	lg.MiscTables[skm] = dt // note: actual underlying tables are always being swapped
 	lt.ResetIndexViews()

emer/netparams.go

@@ -9,7 +9,7 @@ import (
 	"log"
 	"strings"
 
-	"github.com/emer/emergent/v2/empi/mpi"
+	"cogentcore.org/core/base/mpi"
 	"github.com/emer/emergent/v2/netparams"
 	"github.com/emer/emergent/v2/params"
 )