many simscripts updates -- get rid of version dir, auto-fill config f…

…ields to extent possible.

simscripts/00-Jobs.cosh

@@ -4,12 +4,12 @@
 
 // note: br is browser
 
-func OpenJobs(path string) {
+func OpenJobs() {
 	tv := br.NewTabTensorTable("Jobs")
 	dt := tv.Table.Table
 	JobsTableView = tv
 	JobsTable = dt
-	dpath := filepath.Join(br.DataRoot, path)
+	dpath := filepath.Join(br.DataRoot, "jobs")
 	// fmt.Println("opening data at:", dpath)
 
 	if dt.NumColumns() == 0 {
@@ -41,10 +41,8 @@ func OpenJobs(path string) {
 
 // Default update function:
 UpdateFunc = func() {
-	OpenJobs(Config.Version)
+	OpenJobs()
 }
 
-fmt.Println(Config.Version)
-
-OpenJobs(Config.Version)
+OpenJobs()
 

simscripts/10-Status.cosh

@@ -83,10 +83,10 @@ func JobStatus(jid string, force bool) {
 	core.MessageSnackbar(br, "Job: " + jid + " updated with status: " + sstat)
 }
 
-func JobsStatus(path string) {
+func JobsStatus() {
 	@0
 	br.UpdateFiles()
-	dpath := filepath.Join(br.DataRoot, path)
+	dpath := filepath.Join(br.DataRoot, "jobs")
 	ds := fsx.Dirs(dpath)
 	for _, jid := range ds {
 		JobStatus(jid, false) // true = update all -- for format and status edits
@@ -95,5 +95,5 @@ func JobsStatus(path string) {
 	Update()
 }
 
-{go JobsStatus(Config.Version)}
+{go JobsStatus()}
 

simscripts/20-Fetch.cosh

@@ -52,12 +52,12 @@ func FetchJob(jid string, force bool) {
 	}
 }
 
-func FetchJobs(path string) {
+func FetchJobs() {
 	@0
 	tv := JobsTableView
 	jobs := tv.SelectedColumnStrings("JobID")
 	if len(jobs) == 0 {
-		dpath := filepath.Join(br.DataRoot, path)
+		dpath := filepath.Join(br.DataRoot, "jobs")
 		jobs = fsx.Dirs(dpath)
 	}
 	for _, jid := range jobs {
@@ -67,5 +67,5 @@ func FetchJobs(path string) {
 	Update()
 }
 
-{go FetchJobs(Config.Version)}
+{go FetchJobs()}
 

simscripts/30-Submit.cosh

@@ -280,6 +280,9 @@ func NewJob(message, args, label string) {
 		scp {sfn} "@1:go.sum"
 		@1
 		go mod edit -module {projPath}
+		if Config.ExtraGoGet != "" {
+			go get {Config.ExtraGoGet}
+		}
 		go mod tidy
 		@0
 		scp "@1:go.mod" "go.mod"

simscripts/70-Cancel.cosh

@@ -2,10 +2,10 @@
 // with a confirmation prompt.
 
 // CancelJobs cancels the given jobs 
-func CancelJobs(jobs []string, path string) {
+func CancelJobs(jobs []string) {
 	@0
-	dpath := filepath.Join(br.DataRoot, path)
-	spath := filepath.Join(Config.ServerRoot, path)
+	dpath := filepath.Join(br.DataRoot, "jobs")
+	spath := filepath.Join(Config.ServerRoot, "jobs")
 	@1
 	for _, jid := range jobs {
 		sjob := ValueForJob(jid, "ServerJob")
@@ -19,18 +19,18 @@ func CancelJobs(jobs []string, path string) {
 	core.MessageSnackbar(br, "Done canceling jobs")
 }
 
-func CancelJobsPrompt(path string) {
+func CancelJobsPrompt() {
 	tv := JobsTableView
 	jobs := tv.SelectedColumnStrings("JobID")
 	if len(jobs) == 0 {
 		core.MessageSnackbar(br, "No jobs selected for cancel")
 		return
 	}
 	databrowser.PromptOKCancel(br, "Ok to cancel these jobs: " + strings.Join(jobs, " "), func() {
-		CancelJobs(jobs, path)
+		CancelJobs(jobs)
 		Update()
 	})
 }
 
-CancelJobsPrompt(Config.Version)
+CancelJobsPrompt()
 

simscripts/80-Delete.cosh

@@ -1,10 +1,10 @@
 // Delete deletes the selected Jobs, with a confirmation prompt.
 
 // DeleteJobs deletes the given jobs 
-func DeleteJobs(jobs []string, path string) {
+func DeleteJobs(jobs []string) {
 	@0
-	dpath := filepath.Join(br.DataRoot, path)
-	spath := filepath.Join(Config.ServerRoot, path)
+	dpath := filepath.Join(br.DataRoot, "jobs")
+	spath := filepath.Join(Config.ServerRoot, "jobs")
 	for _, jid := range jobs {
 		@1
 		cd
@@ -20,18 +20,18 @@ func DeleteJobs(jobs []string, path string) {
 	core.MessageSnackbar(br, "Done deleting jobs")
 }
 
-func DeleteJobsPrompt(path string) {
+func DeleteJobsPrompt() {
 	tv := JobsTableView
 	jobs := tv.SelectedColumnStrings("JobID")
 	if len(jobs) == 0 {
 		core.MessageSnackbar(br, "No jobs selected for deletion")
 		return
 	}
 	databrowser.PromptOKCancel(br, "Ok to delete these jobs: " + strings.Join(jobs, " "), func() {
-		DeleteJobs(jobs, path)
+		DeleteJobs(jobs)
 		Update()
 	})
 }
 
-DeleteJobsPrompt(Config.Version)
+DeleteJobsPrompt()
 

simscripts/85-Archive.cosh

@@ -3,12 +3,12 @@
 // for results that are useful but not immediately relevant.
 
 // ArchiveJobs archives the given jobs 
-func ArchiveJobs(jobs []string, path string) {
+func ArchiveJobs(jobs []string) {
 	@0
-	dpath := filepath.Join(br.DataRoot, path)
-	apath := filepath.Join(br.DataRoot, "archive", path)
+	dpath := filepath.Join(br.DataRoot, "jobs")
+	apath := filepath.Join(br.DataRoot, "archive", "jobs")
 	mkdir -p {apath}
-	spath := filepath.Join(Config.ServerRoot, path)
+	spath := filepath.Join(Config.ServerRoot, "jobs")
 	for _, jid := range jobs {
 		@1
 		cd
@@ -25,18 +25,18 @@ func ArchiveJobs(jobs []string, path string) {
 	core.MessageSnackbar(br, "Done archiving jobs")
 }
 
-func ArchiveJobsPrompt(path string) {
+func ArchiveJobsPrompt() {
 	tv := JobsTableView
 	jobs := tv.SelectedColumnStrings("JobID")
 	if len(jobs) == 0 {
 		core.MessageSnackbar(br, "No jobs selected for archiving")
 		return
 	}
 	databrowser.PromptOKCancel(br, "Ok to archive these jobs: " + strings.Join(jobs, " "), func() {
-		ArchiveJobs(jobs, path)
+		ArchiveJobs(jobs)
 		Update()
 	})
 }
 
-ArchiveJobsPrompt(Config.Version)
+ArchiveJobsPrompt()
 

simscripts/README.md

@@ -32,7 +32,38 @@ The general workflow is as follows, assuming a standard [install](#install) has
 
 # Install
 
+From this `simscripts` directory, run:
 
+```sh
+> ./install.cosh ~/full/path/to/sim
+```
+
+Which creates a project directory in `~/simdata/projname/username` that has a symbolic link in the sim directory so it is accessible directly from there, but is not actually located there so there are no issues with git ownership of these files.
+
+You then need to create a `defaults.cosh` file that sets various parameters on the `Config` object specific to this project, including extra non-Go file and sub-directories that might need to be copied up to the server to run it.  There are also job configuration parameters (e.g., max runtime).  Here is an example, for a sim in `axon/examples`, that requires the extra `go get`:
+
+```go
+// to run, in numbers:
+// databrowser.NewBrowserWindow("simdata")
+
+// primary remote server: avail as @1
+cossh hpc2.engr.ucdavis.edu
+
+func defaults() {
+	cf := &Config
+	cf.Defaults()
+	cf.ServerName = "hpc2"
+	cf.ExtraGoGet = "github.com/emer/axon/v2@main"
+	cf.Job.Hours = 1
+	cf.Job.Qos = "oreillylab"
+	cf.ExcludeNodes = "agate-[0,17-19,28,41-45]"
+	cf.ExtraFiles = []string{"config_job.toml"}
+
+	cf.Update()
+}
+
+defaults()
+```
 
 # Example `cosh` code
 

simscripts/config.cosh

@@ -1,7 +1,7 @@
 import (
 	"fmt"
-	"os"
 	"path/filepath"
+	"strings"
 
 	"cogentcore.org/core/core"
 	"cogentcore.org/core/plot/plotcore"
@@ -93,7 +93,7 @@ type Configuration struct {
 	// name of simulation project, lowercase (should be name of source dir)
 	Project string
 
-	// current version string, e.g., v008 or v112: names subdirectory of jobs
+	// current git version string, from git describe --tags
 	Version string
 
 	// parameters for job resources etc
@@ -118,6 +118,11 @@ type Configuration struct {
 	// name of current server using to run jobs; gets recorded with each job
 	ServerName string
 
+	// ExtraGoGet is an extra package to do "go get" with, for launching the job.
+	// Typically set this to the parent packge if running within a larger package
+	// upon which this simulation depends, e.g., "github.com/emer/axon/v2@main"
+	ExtraGoGet string
+
 	// root path from user home dir on server.
 	// is auto-set to: filepath.Join("simdata", Project, User)
 	ServerRoot string
@@ -136,7 +141,14 @@ type Configuration struct {
 }
 
 func (cf *Configuration) Defaults() {
-	cf.User = os.Getenv("USER")
+	@0
+	cd
+	cd {br.StartDir}
+	Config.Version = strings.TrimSpace(`git describe --tags`)
+	cd {br.DataRoot}
+	cf.User = strings.TrimSpace(`echo $USER`)
+	_, pj := filepath.Split(br.StartDir)
+	cf.Project = pj
 	cf.Job.Defaults()
 	cf.FetchFiles = "*.tsv"
 	cf.Plot.Defaults()
@@ -187,11 +199,11 @@ var (
 )
 
 func JobPath(jid string) string {
-	return filepath.Join(br.DataRoot, Config.Version, jid)
+	return filepath.Join(br.DataRoot, "jobs", jid)
 }
 
 func ServerJobPath(jid string) string {
-	return filepath.Join(Config.ServerRoot, Config.Version, jid)
+	return filepath.Join(Config.ServerRoot, "jobs", jid)
 }
 
 // Call update after each action that affects jobs.