Skip to content

Commit

Permalink
v1.0.0 release -- version.go updated
Browse files Browse the repository at this point in the history
  • Loading branch information
rcoreilly committed Nov 22, 2020
1 parent f5f82c0 commit 07f47ed
Show file tree
Hide file tree
Showing 9 changed files with 270 additions and 25 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -65,5 +65,5 @@ gopath-update:
cd examples/ra25; go get -u ./...

release:
$(MAKE) -C leabra release
$(MAKE) -C etorch release

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ As usual, the best way to see everything is to check out the `examples`:

# Installation

See the https://github.com/emer/etorch/tree/master/python directory for instructions on building an `etorch` program that is just like the `python3` executable, but also includes all of the Go-based infrastructure that enables etorch to work.
See the https://github.com/emer/etorch/tree/main/python directory for instructions on building an `etorch` program that is just like the `python3` executable, but also includes all of the Go-based infrastructure that enables etorch to work.

You can also use the `pyleabra` executable from https://github.com/emer/leabra/tree/master/python, which includes `etorch` to facilitate interoperability between leabra and torch models.

Expand Down
2 changes: 1 addition & 1 deletion etorch/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ clean:
$(GOCLEAN)

# NOTE: MUST update version number here prior to running 'make release'
VERS=v1.1.0rc
VERS=v1.0.0
PACKAGE=etorch
GIT_COMMIT=`git rev-parse --short HEAD`
VERS_DATE=`date -u +%Y-%m-%d\ %H:%M`
Expand Down
7 changes: 4 additions & 3 deletions etorch/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
package etorch

const (
Version = "v1.1.0rc"
GitCommit = "92b7a86" // the commit JUST BEFORE the release
VersionDate = "2020-10-26 10:33" // UTC
Version = "v1.0.0"
GitCommit = "f5f82c0" // the commit JUST BEFORE the release
VersionDate = "2020-11-22 12:01" // UTC
)

10 changes: 5 additions & 5 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
module github.com/emer/leabra
module github.com/emer/etorch

go 1.13

require (
github.com/c2h5oh/datasize v0.0.0-20200825124411-48ed595a09d2
github.com/chewxy/math32 v1.0.6
github.com/emer/emergent v1.1.12
github.com/emer/empi v1.0.8
github.com/emer/etable v1.0.17
github.com/goki/gi v1.0.17
github.com/emer/emergent v1.1.13
github.com/emer/empi v1.0.9
github.com/emer/etable v1.0.18
github.com/goki/gi v1.1.0
github.com/goki/ki v1.0.5
github.com/goki/mat32 v1.0.2
)
135 changes: 135 additions & 0 deletions go.sum

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion python/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ install: install-pkg install-exe
# note: it is important that leabra come before deep otherwise deep captures all the common types
# unfortunately this means that all sub-packages need to be explicitly listed.
gen:
gopy exe -name=etorch -vm=python3 -no-warn -exclude=driver,oswin,draw,example,examples,gif,jpeg,png,draw -main="runtime.LockOSThread(); gimain.Main(func() { GoPyMainRun() })" math/rand image github.com/anthonynsimon/bild/transform github.com/goki/ki/ki github.com/goki/ki/kit github.com/goki/mat32 github.com/goki/gi/units github.com/goki/gi/gi github.com/goki/gi/svg github.com/goki/gi/giv github.com/goki/gi/gi3d github.com/goki/gi/gimain github.com/emer/etable github.com/emer/emergent github.com/emer/vision github.com/emer/etorch
gopy exe -name=etorch -vm=python3 -no-warn -exclude=driver,oswin,draw,example,examples,gif,jpeg,png,draw -main="runtime.LockOSThread(); gimain.Main(func() { GoPyMainRun() })" math/rand image github.com/anthonynsimon/bild/transform github.com/goki/ki/ki github.com/goki/ki/kit github.com/goki/mat32 github.com/goki/gi/units github.com/goki/gi/gist github.com/goki/gi/girl github.com/goki/gi/gi github.com/goki/gi/svg github.com/goki/gi/giv github.com/goki/gi/gi3d github.com/goki/gi/gimain github.com/emer/etable github.com/emer/emergent github.com/emer/vision github.com/emer/etorch

build:
$(MAKE) -C etorch build
Expand Down
23 changes: 10 additions & 13 deletions python/go.mod
Original file line number Diff line number Diff line change
@@ -1,20 +1,18 @@
module github.com/emer/leabra/python
module github.com/emer/etorch/python

go 1.15

require (
github.com/alecthomas/chroma v0.8.0
github.com/alecthomas/chroma v0.8.2
github.com/anthonynsimon/bild v0.13.0
github.com/apache/arrow/go/arrow v0.0.0-20200628183233-0b9720463eec
github.com/apache/arrow/go/arrow v0.0.0-20201121231650-0e8be3caa4a6
github.com/aymerick/douceur v0.2.0
github.com/emer/emergent v1.1.11
github.com/emer/etable v1.0.17
github.com/emer/etorch v0.0.0-20201118135503-b51784db80e4
github.com/emer/leabra v1.1.10
github.com/emer/emergent v1.1.13
github.com/emer/etable v1.0.18
github.com/emer/vision v1.1.4
github.com/go-gl/mathgl v0.0.0-20190713194549-592312d8590a
github.com/go-gl/mathgl v1.0.0
github.com/go-python/gopy v0.3.2
github.com/goki/gi v1.0.16
github.com/goki/gi v1.1.0
github.com/goki/ki v1.0.5
github.com/goki/mat32 v1.0.2
github.com/goki/pi v1.0.7
Expand All @@ -24,8 +22,7 @@ require (
github.com/pkg/errors v0.9.1 // indirect
github.com/srwiley/rasterx v0.0.0-20200120212402-85cb7272f5e9
github.com/srwiley/scanx v0.0.0-20190309010443-e94503791388
golang.org/x/image v0.0.0-20200801110659-972c09e46d76
golang.org/x/tools v0.0.0-20200917221617-d56e4e40bc9d // indirect
gonum.org/v1/gonum v0.7.0
gonum.org/v1/plot v0.7.0
golang.org/x/image v0.0.0-20200927104501-e162460cd6b5
gonum.org/v1/gonum v0.8.1
gonum.org/v1/plot v0.8.1
)
Loading

0 comments on commit 07f47ed

Please sign in to comment.