Skip to content

Commit

Permalink
updated to core 0.1.2
Browse files Browse the repository at this point in the history
  • Loading branch information
rcoreilly committed May 1, 2024
1 parent 3517642 commit 70e8bae
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/emer/gosl/v2
go 1.22

require (
cogentcore.org/core v0.1.0
cogentcore.org/core v0.1.2
golang.org/x/tools v0.19.0
)

Expand All @@ -28,7 +28,7 @@ require (
github.com/pelletier/go-toml/v2 v2.1.2-0.20240227203013-2b69615b5d55 // indirect
golang.org/x/image v0.15.0 // indirect
golang.org/x/mod v0.16.0 // indirect
golang.org/x/net v0.22.0 // indirect
golang.org/x/net v0.23.0 // indirect
golang.org/x/sys v0.18.0 // indirect
golang.org/x/text v0.14.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
Expand Down
8 changes: 4 additions & 4 deletions go.sum
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
cogentcore.org/core v0.1.0 h1:fJjpk7jd77IIUCDoauwukOeTVsWU+SuDyIhDXb3PYTM=
cogentcore.org/core v0.1.0/go.mod h1:SAJedgd5nd0iB2cHl//DyCO+rugd/u7KCHXHNjnQOmA=
cogentcore.org/core v0.1.2 h1:iifg+SdqKxq8KR7IU1oCdNzL1DNdgRisIUrs1GB7Al4=
cogentcore.org/core v0.1.2/go.mod h1:civGK+IuQZjq53w8eSxupM6fRyDB7m/irEeVKztMPB8=
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=
Expand Down Expand Up @@ -84,8 +84,8 @@ golang.org/x/image v0.15.0 h1:kOELfmgrmJlw4Cdb7g/QGuB3CvDrXbqEIww/pNtNBm8=
golang.org/x/image v0.15.0/go.mod h1:HUYqC05R2ZcZ3ejNQsIHQDQiwWM4JBqmm6MKANTp4LE=
golang.org/x/mod v0.16.0 h1:QX4fJ0Rr5cPQCF7O9lh9Se4pmwfwskqZfq5moyldzic=
golang.org/x/mod v0.16.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
golang.org/x/net v0.22.0 h1:9sGLhx7iRIHEiX0oAJ3MRZMUCElJgy7Br1nO+AMN3Tc=
golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs=
golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ=
golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
Expand Down
2 changes: 1 addition & 1 deletion slboolview/slboolview.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
package slboolview

import (
"cogentcore.org/core/base/reflectx"
"cogentcore.org/core/core"
"cogentcore.org/core/events"
"cogentcore.org/core/reflectx"
"cogentcore.org/core/views"
"github.com/emer/gosl/v2/slbool"
)
Expand Down
6 changes: 3 additions & 3 deletions testdata/basic.golden
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ float MyTrickyFun(float x) {
// FastExp is a quartic spline approximation to the Exp function, by N.N. Schraudolph
// It does not have any of the sanity checking of a standard method -- returns
// nonsense when arg is out of range. Runs in 2.23ns vs. 6.3ns for 64bit which is faster
// than math32.Exp actually.
// than exp actually.
float FastExp(float x) {
if (x <= -88.76731) { // this doesn't add anything and -exp is main use-case anyway
return 0;
Expand Down Expand Up @@ -83,7 +83,7 @@ struct ParamStruct {
int Option; // note: standard bool doesn't work

float pad; // comment this out to trigger alignment warning
void IntegFmRaw(inout DataStruct ds, inout float modArg) {
void IntegFromRaw(inout DataStruct ds, inout float modArg) {
// note: the following are just to test basic control structures
float newVal = this.Dt*(ds.Raw-ds.Integ) + modArg;
if (newVal < -10 || this.Option==1) {
Expand Down Expand Up @@ -123,5 +123,5 @@ struct ParamStruct {
[[vk::binding(0, 1)]] RWStructuredBuffer<DataStruct> Data;
[numthreads(1, 1, 1)]
void main(uint3 idx : SV_DispatchThreadID) {
Params[0].IntegFmRaw(Data[idx.x], Data[idx.x].Pad2);
Params[0].IntegFromRaw(Data[idx.x], Data[idx.x].Pad2);
}

0 comments on commit 70e8bae

Please sign in to comment.