From d22f748f3bb375bec002d16c6914dc66c4b76c6b Mon Sep 17 00:00:00 2001 From: "Randall C. O'Reilly" Date: Tue, 18 Jun 2024 02:11:31 -0700 Subject: [PATCH] go mod update --- go.mod | 6 +++--- go.sum | 12 ++++++------ make.cosh | 2 +- simscripts/00-Jobs.cosh | 2 +- simscripts/10-Status.cosh | 2 +- simscripts/20-Fetch.cosh | 2 +- simscripts/30-Submit.cosh | 4 ++-- simscripts/50-Results.cosh | 2 +- simscripts/config.cosh | 4 ++-- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/go.mod b/go.mod index 63c6c130a..2d478af00 100644 --- a/go.mod +++ b/go.mod @@ -3,10 +3,10 @@ module github.com/emer/axon/v2 go 1.22 require ( - cogentcore.org/core v0.1.5-0.20240618055648-247c7f04b7c6 + cogentcore.org/core v0.1.5-0.20240618090428-8a24e602ee2b github.com/anthonynsimon/bild v0.13.0 - github.com/emer/emergent/v2 v2.0.0-dev0.0.14.0.20240618065140-818a70cd1e3c - github.com/emer/vision/v2 v2.0.0-dev0.0.10.0.20240615002009-932108fbb2af + github.com/emer/emergent/v2 v2.0.0-dev0.0.14.0.20240618090608-b56cc32ae098 + github.com/emer/vision/v2 v2.0.0-dev0.0.10.0.20240618090911-239078f1e9a7 github.com/goki/vulkan v1.0.7 github.com/stretchr/testify v1.9.0 gitlab.com/gomidi/midi/v2 v2.0.30 diff --git a/go.sum b/go.sum index 4a6185c6a..44008d30b 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,5 @@ -cogentcore.org/core v0.1.5-0.20240618055648-247c7f04b7c6 h1:NdUK3ct01slXmWuXvrD9BVIx5ACrbL0blOkvK1VnoyA= -cogentcore.org/core v0.1.5-0.20240618055648-247c7f04b7c6/go.mod h1:oZ69LVMXeTb6Tq39AphvDlZkkltfuI/kgk9euC5I6z0= +cogentcore.org/core v0.1.5-0.20240618090428-8a24e602ee2b h1:YQwo7t/5c9CogFJKb3dUHkBjN0orde/vIHFeaHzgpEU= +cogentcore.org/core v0.1.5-0.20240618090428-8a24e602ee2b/go.mod h1:oZ69LVMXeTb6Tq39AphvDlZkkltfuI/kgk9euC5I6z0= 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= @@ -32,10 +32,10 @@ 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.0.14.0.20240618065140-818a70cd1e3c h1:xfCTZGMv7MIgPGGxU6EFGKYR3WoTqDiqfx5vOKNVMXM= -github.com/emer/emergent/v2 v2.0.0-dev0.0.14.0.20240618065140-818a70cd1e3c/go.mod h1:KlbXwPgy9hIIiCVFMz2mXgjfX34ud4/UHf6rP+QeKi0= -github.com/emer/vision/v2 v2.0.0-dev0.0.10.0.20240615002009-932108fbb2af h1:EygCJa/2UHXazkv2HX7yJ79TKXzwjX3nxGNhl+V5mn4= -github.com/emer/vision/v2 v2.0.0-dev0.0.10.0.20240615002009-932108fbb2af/go.mod h1:p1JsCly+knLmWoUv9O2GSvF+WHqV4wK9OdGSJWeQi3E= +github.com/emer/emergent/v2 v2.0.0-dev0.0.14.0.20240618090608-b56cc32ae098 h1:fP+033srf3dhnnIdvT8EWEBG8JZ52yZ6Y+7U8jkob4E= +github.com/emer/emergent/v2 v2.0.0-dev0.0.14.0.20240618090608-b56cc32ae098/go.mod h1:MbGxAkloXcN15xD4j+TbkyqdH2rZHzIYUsm2m0O1hPo= +github.com/emer/vision/v2 v2.0.0-dev0.0.10.0.20240618090911-239078f1e9a7 h1:pd45FWGufAHQ3G5CEzWH9qIAiG9MEvleIz8JdI+K78E= +github.com/emer/vision/v2 v2.0.0-dev0.0.10.0.20240618090911-239078f1e9a7/go.mod h1:+PQE+bMfpzyemHq/8brdyEbDq+qDaAeBO0CjWuBX/nU= 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= diff --git a/make.cosh b/make.cosh index d208ab244..0f093482c 100644 --- a/make.cosh +++ b/make.cosh @@ -2,7 +2,7 @@ // RunInExamples runs given function in examples directory func RunInExamples(fun func(d string)) { - ex := dirs.Dirs("examples") + ex := fsx.Dirs("examples") cwd := `pwd` for _, d := range ex { fd := filepath.Join(cwd, "examples", d) diff --git a/simscripts/00-Jobs.cosh b/simscripts/00-Jobs.cosh index f4bbd0100..018c8b305 100644 --- a/simscripts/00-Jobs.cosh +++ b/simscripts/00-Jobs.cosh @@ -16,7 +16,7 @@ func OpenJobs(path string) { br.FormatTableFromCSV(dt, filepath.Join(br.DataRoot, "dbformat.csv")) } - ds := dirs.Dirs(dpath) + ds := fsx.Dirs(dpath) dt.SetNumRows(len(ds)) for i, d := range ds { dt.SetString("JobID", i, d) diff --git a/simscripts/10-Status.cosh b/simscripts/10-Status.cosh index 8d74017c6..402a28653 100644 --- a/simscripts/10-Status.cosh +++ b/simscripts/10-Status.cosh @@ -87,7 +87,7 @@ func JobsStatus(path string) { @0 br.UpdateFiles() dpath := filepath.Join(br.DataRoot, path) - ds := dirs.Dirs(dpath) + ds := fsx.Dirs(dpath) for _, jid := range ds { JobStatus(jid, false) // true = update all -- for format and status edits } diff --git a/simscripts/20-Fetch.cosh b/simscripts/20-Fetch.cosh index 31da7efce..26f1878a0 100644 --- a/simscripts/20-Fetch.cosh +++ b/simscripts/20-Fetch.cosh @@ -58,7 +58,7 @@ func FetchJobs(path string) { jobs := tv.SelectedColumnStrings("JobID") if len(jobs) == 0 { dpath := filepath.Join(br.DataRoot, path) - jobs = dirs.Dirs(dpath) + jobs = fsx.Dirs(dpath) } for _, jid := range jobs { FetchJob(jid, true) diff --git a/simscripts/30-Submit.cosh b/simscripts/30-Submit.cosh index 705031811..b16acd75f 100644 --- a/simscripts/30-Submit.cosh +++ b/simscripts/30-Submit.cosh @@ -195,7 +195,7 @@ func CopyFilesToJob(localSrc, localJob, hostJob string, exts ...string) { mkdir -p {hostJob} cd {hostJob} @0 - efls := dirs.ExtFilenames(localSrc, exts...) + efls := fsx.Filenames(localSrc, exts...) for _, f := range efls { sfn := filepath.Join(localSrc, f) /bin/cp {sfn} {f} @@ -243,7 +243,7 @@ func NewJob(message, args, label string) { cd {spath} @0 cd {jpath} - fls := dirs.ExtFilenames(br.StartDir, ".go") + fls := fsx.Filenames(br.StartDir, ".go") for _, f := range fls { sfn := filepath.Join(br.StartDir, f) /bin/cp {sfn} {f} diff --git a/simscripts/50-Results.cosh b/simscripts/50-Results.cosh index 7283d4b2d..f93ba41c8 100644 --- a/simscripts/50-Results.cosh +++ b/simscripts/50-Results.cosh @@ -9,7 +9,7 @@ func OpenResultFiles(jobs []string, filter FilterResults) { message := ValueForJob(jid, "Message") label := ValueForJob(jid, "Label") args := ValueForJob(jid, "Args") - fls := dirs.ExtFilenames(jpath, filter.Ext) + fls := fsx.Filenames(jpath, filter.Ext) ifls := []string{} for _, fn := range fls { if filter.FileContains != "" && !strings.Contains(fn, filter.FileContains) { diff --git a/simscripts/config.cosh b/simscripts/config.cosh index 4c01454cf..2322253a4 100644 --- a/simscripts/config.cosh +++ b/simscripts/config.cosh @@ -3,10 +3,10 @@ import ( "os" "path/filepath" + "cogentcore.org/core/core" "cogentcore.org/core/plot/plotcore" "cogentcore.org/core/tensor/table" "cogentcore.org/core/tensor/tensorcore" - "cogentcore.org/core/views" ) // to run, in numbers: @@ -180,7 +180,7 @@ var ( Config Configuration JobsTableView *tensorcore.Table JobsTable *table.Table - ResultsTableView *views.TableView + ResultsTableView *core.Table Results []*Result // function that is run after any action (e.g., Jobs); typically set in Jobs.cosh UpdateFunc func()