Skip to content

Commit

Permalink
update to latest gogi with mat32 separate. have to remove buildtst b/…
Browse files Browse the repository at this point in the history
…c go.mod has circular dependency.
  • Loading branch information
Randall C. O'Reilly committed Mar 16, 2020
1 parent 7fd455f commit feac6c5
Show file tree
Hide file tree
Showing 19 changed files with 57 additions and 221 deletions.
7 changes: 4 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,8 @@ old:
@echo "GO111MODULE = $(value GO111MODULE)"
go list -u -m all | grep '\['

update:
mod-update: export GO111MODULE = on
mod-update:
@echo "GO111MODULE = $(value GO111MODULE)"
go get -u ./...
go mod tidy
Expand All @@ -56,8 +57,8 @@ update:
gopath-update: export GO111MODULE = off
gopath-update:
@echo "GO111MODULE = $(value GO111MODULE)"
cd cmd/gide; go get -u ./...
cd buildtst; go get -u ./...

release:
$(MAKE) -C emergent release

127 changes: 0 additions & 127 deletions buildtst/buildtst.go

This file was deleted.

2 changes: 1 addition & 1 deletion emer/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.0.0
VERS=v1.0.1
PACKAGE=emer
GIT_COMMIT=`git rev-parse --short HEAD`
VERS_DATE=`date -u +%Y-%m-%d\ %H:%M`
Expand Down
2 changes: 1 addition & 1 deletion emer/layer.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (
"github.com/emer/emergent/relpos"
"github.com/emer/emergent/weights"
"github.com/emer/etable/etensor"
"github.com/goki/gi/mat32"
"github.com/goki/ki/kit"
"github.com/goki/mat32"
)

// Layer defines the basic interface for neural network layers, used for managing the structural
Expand Down
2 changes: 1 addition & 1 deletion emer/network.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"github.com/emer/emergent/prjn"
"github.com/emer/emergent/weights"
"github.com/goki/gi/gi"
"github.com/goki/gi/mat32"
"github.com/goki/mat32"
)

// Network defines the basic interface for a neural network, used for managing the structural
Expand Down
2 changes: 1 addition & 1 deletion evec/gauss.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ package evec

import (
"github.com/chewxy/math32"
"github.com/goki/gi/mat32"
"github.com/goki/mat32"
)

// GaussVecDistNoNorm returns the gaussian of the distance between two 2D vectors
Expand Down
3 changes: 3 additions & 0 deletions evec/vec2i.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@

package evec

// Note: This is distinct from mat32.Vec2i because it uses int instead of int32
// the int is significantly easier to deal with for layer sizing params etc.

// Vec2i is a 2D vector/point with X and Y int components.
type Vec2i struct {
X int
Expand Down
8 changes: 4 additions & 4 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ go 1.13
require (
github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883
github.com/chewxy/math32 v1.0.4
github.com/emer/etable v1.0.1-0.20200215112956-af9e3a7ce4e6
github.com/emer/leabra v1.0.1-0.20200215023251-8082c85145ec
github.com/goki/gi v0.9.11
github.com/goki/ki v0.9.11
github.com/emer/etable v1.0.1
github.com/goki/gi v0.9.14
github.com/goki/ki v0.9.12-0.20200309063305-3102412f93be
github.com/goki/mat32 v1.0.0
)
Loading

0 comments on commit feac6c5

Please sign in to comment.