axon finally into building just axon dir

emer · Oct 8, 2024 · 7b19d38 · 7b19d38
1 parent 1753f82
commit 7b19d38
Show file tree

Hide file tree

Showing 12 changed files with 629 additions and 625 deletions.
diff --git a/axon/act.go b/axon/act.go
diff --git a/axon/act_path.go b/axon/act_path.go
diff --git a/axon/helpers.go b/axon/helpers.go
@@ -9,7 +9,6 @@ import (
 
 	"cogentcore.org/core/base/mpi"
 	"cogentcore.org/core/core"
-	"github.com/emer/emergent/v2/ecmd"
 )
 
 ////////////////////////////////////////////////////
@@ -51,6 +50,7 @@ func SaveWeights(net *Network, ctrString, runName string) string {
 	return fnm
 }
 
+/*
 // SaveWeightsIfArgSet saves network weights if the "wts" arg has been set to true.
 // uses WeightsFilename information to identify the weights.
 // only for 0 rank MPI if running mpi
@@ -61,6 +61,7 @@ func SaveWeightsIfArgSet(net *Network, args *ecmd.Args, ctrString, runName strin
 	}
 	return ""
 }
+*/
 
 // SaveWeightsIfConfigSet saves network weights if the given config
 // bool value has been set to true.

diff --git a/axon/hip_net.go b/axon/hip_net.go
@@ -7,7 +7,7 @@ package axon
 import (
 	"cogentcore.org/core/base/errors"
 	"cogentcore.org/core/math32/vecint"
-	"cogentcore.org/core/tensor/stats/norm"
+	"cogentcore.org/core/tensor/stats/stats"
 	"github.com/emer/emergent/v2/emer"
 	"github.com/emer/emergent/v2/etime"
 	"github.com/emer/emergent/v2/looper"
@@ -258,7 +258,7 @@ func (net *Network) ConfigLoopsHip(ctx *Context, man *looper.Manager, hip *HipCo
 				for di := uint32(0); di < ctx.NetIndexes.NData; di++ {
 					clampSrc.UnitValues(&tmpValues, "Act", int(di))
 					if hip.EC5ClampThr > 0 {
-						norm.Binarize32(tmpValues, hip.EC5ClampThr, 1, 0)
+						stats.Binarize32(tmpValues, tensor.NewFloat64Scalar(hip.EC5ClampThr))
 					}
 					ec5.ApplyExt1D32(ctx, di, tmpValues)
 				}