Skip to content

Commit aa731a3

Browse files
riccardopinosioriccardopinosio
committed
do not error if session already shutdown
1 parent b8d8bde commit aa731a3

6 files changed

Lines changed: 42 additions & 35 deletions

File tree

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#--- dockerfile to test hugot ---
22

3-
ARG GO_VERSION=1.24.2
3+
ARG GO_VERSION=1.24.3
44
ARG ONNXRUNTIME_VERSION=1.21.0
55
ARG BUILD_PLATFORM=linux/amd64
66

‎cuda.Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#--- dockerfile to test hugot ---
22

3-
ARG GO_VERSION=1.24.2
3+
ARG GO_VERSION=1.24.3
44
ARG ONNXRUNTIME_VERSION=1.21.0
55
ARG BUILD_PLATFORM=linux/amd64
66

‎go.mod‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,17 @@ go 1.23.3
55
require (
66
github.com/daulet/tokenizers v1.20.2
77
github.com/gomlx/exceptions v0.0.3
8-
github.com/gomlx/go-huggingface v0.1.2
9-
github.com/gomlx/gomlx v0.18.0
10-
github.com/gomlx/gopjrt v0.6.3
11-
github.com/gomlx/onnx-gomlx v0.2.0
8+
github.com/gomlx/go-huggingface v0.2.0
9+
github.com/gomlx/gomlx v0.19.2
10+
github.com/gomlx/gopjrt v0.7.0
11+
github.com/gomlx/onnx-gomlx v0.2.1
1212
github.com/json-iterator/go v1.1.12
1313
github.com/mattn/go-isatty v0.0.20
1414
github.com/stretchr/testify v1.10.0
1515
github.com/urfave/cli/v2 v2.27.6
16-
github.com/viant/afs v1.25.1
16+
github.com/viant/afs v1.26.2
1717
github.com/yalue/onnxruntime_go v1.19.0
18-
golang.org/x/exp v0.0.0-20250408133849-7e4ce0ab07d0
18+
golang.org/x/exp v0.0.0-20250506013437-ce4c2cf36ca6
1919
)
2020

2121
require (
@@ -24,17 +24,17 @@ require (
2424
github.com/dustin/go-humanize v1.0.1 // indirect
2525
github.com/go-errors/errors v1.5.1 // indirect
2626
github.com/go-logr/logr v1.4.2 // indirect
27+
github.com/gofrs/flock v0.12.1 // indirect
2728
github.com/google/uuid v1.6.0 // indirect
2829
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
2930
github.com/modern-go/reflect2 v1.0.2 // indirect
3031
github.com/pkg/errors v0.9.1 // indirect
3132
github.com/pmezard/go-difflib v1.0.0 // indirect
32-
github.com/rogpeppe/go-internal v1.14.1 // indirect
3333
github.com/russross/blackfriday/v2 v2.1.0 // indirect
3434
github.com/x448/float16 v0.8.4 // indirect
3535
github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 // indirect
36-
golang.org/x/crypto v0.37.0 // indirect
37-
golang.org/x/sys v0.32.0 // indirect
36+
golang.org/x/crypto v0.38.0 // indirect
37+
golang.org/x/sys v0.33.0 // indirect
3838
google.golang.org/protobuf v1.36.6 // indirect
3939
gopkg.in/yaml.v3 v3.0.1 // indirect
4040
k8s.io/klog/v2 v2.130.1 // indirect

‎go.sum‎

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,18 @@ github.com/go-errors/errors v1.5.1 h1:ZwEMSLRCapFLflTpT7NKaAc7ukJ8ZPEjzlxt8rPN8b
1111
github.com/go-errors/errors v1.5.1/go.mod h1:sIVyrIiJhuEF+Pj9Ebtd6P/rEYROXFi3BopGUQ5a5Og=
1212
github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY=
1313
github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
14+
github.com/gofrs/flock v0.12.1 h1:MTLVXXHf8ekldpJk3AKicLij9MdwOWkZ+a/jHHZby9E=
15+
github.com/gofrs/flock v0.12.1/go.mod h1:9zxTsyu5xtJ9DK+1tFZyibEV7y3uwDxPPfbxeeHCoD0=
1416
github.com/gomlx/exceptions v0.0.3 h1:HKnTgEjj4jlmhr8zVFkTP9qmV1ey7ypYYosQ8GzXWuM=
1517
github.com/gomlx/exceptions v0.0.3/go.mod h1:uHL0TQwJ0xaV2/snJOJV6hSE4yRmhhfymuYgNredGxU=
16-
github.com/gomlx/go-huggingface v0.1.2 h1:LvvdV7VvlBUjs+OpEg/t/x1NY0CwzO7Isrk6RG8HfSg=
17-
github.com/gomlx/go-huggingface v0.1.2/go.mod h1:xbiYrFHjJFkJZVSxYasYwYBvyy7EQZikTaQ25ox57Gs=
18-
github.com/gomlx/gomlx v0.18.0 h1:ioWb3qRC2gT/BvLqbvhdybFKz2D7yJx1EYhKj1mqbz4=
19-
github.com/gomlx/gomlx v0.18.0/go.mod h1:HJg4HeG37fHB2LTT4t2GLdsTq0/5Yxh9/PTVTMlaSLg=
20-
github.com/gomlx/gopjrt v0.6.3 h1:xP4FkqzMq5yu0tWo2NKbcdcGxN8PxxMzyQD/20P4Hts=
21-
github.com/gomlx/gopjrt v0.6.3/go.mod h1:HJn0wemLuFPxHr7P7zvuiloLR2OsLv60HV/4obxTXVc=
22-
github.com/gomlx/onnx-gomlx v0.2.0 h1:mGVcUgT1szXmImvISk3RgWA4mrynjk480LGS/l1HxO0=
23-
github.com/gomlx/onnx-gomlx v0.2.0/go.mod h1:o63xCkSZ//5vmKtWQmKPq0WPEA55gZeci2DUGQLH3G4=
18+
github.com/gomlx/go-huggingface v0.2.0 h1:qEWqZ7eYwwSqJk7Y5g9bYKf6qRTu8CRWFQCT79NvM70=
19+
github.com/gomlx/go-huggingface v0.2.0/go.mod h1:pSI9KFkGVksYYnNNO5lqLPBR0hzboFQb2FGrpGjseIY=
20+
github.com/gomlx/gomlx v0.19.2 h1:iK8DtMU91Kgc9ez9fu2xBnfozsjkaCXVfJuMz3UvjEI=
21+
github.com/gomlx/gomlx v0.19.2/go.mod h1:RdhIh7sixw3HWFevfiM7DOPu2SAATjKcOzBI/ZV7Inc=
22+
github.com/gomlx/gopjrt v0.7.0 h1:7TwlK+mRGTkqQYHemxwzIPGGIG9Q8fN7GnmqRspRMHY=
23+
github.com/gomlx/gopjrt v0.7.0/go.mod h1:HJn0wemLuFPxHr7P7zvuiloLR2OsLv60HV/4obxTXVc=
24+
github.com/gomlx/onnx-gomlx v0.2.1 h1:n7LHC+dFRi2pZeyOIK7nAUM+Gmh1oPOdruSm6wUhbtk=
25+
github.com/gomlx/onnx-gomlx v0.2.1/go.mod h1:2vcxuS5NJ2zbNBFGBYxR59aRydIzBZw6a10FCY1kjGY=
2426
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
2527
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
2628
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
@@ -57,23 +59,23 @@ github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOf
5759
github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
5860
github.com/urfave/cli/v2 v2.27.6 h1:VdRdS98FNhKZ8/Az8B7MTyGQmpIr36O1EHybx/LaZ4g=
5961
github.com/urfave/cli/v2 v2.27.6/go.mod h1:3Sevf16NykTbInEnD0yKkjDAeZDS0A6bzhBH5hrMvTQ=
60-
github.com/viant/afs v1.25.1 h1:IPcqwzsPUaWqsSkQXoM1vXwQuRI6u7ZgqQHKQZ8Wxyg=
61-
github.com/viant/afs v1.25.1/go.mod h1:rScbFd9LJPGTM8HOI8Kjwee0AZ+MZMupAvFpPg+Qdj4=
62+
github.com/viant/afs v1.26.2 h1:rOs/iFxFlEndhIRATJVXlNWhVU0cGdRQAGVTVJPdsc0=
63+
github.com/viant/afs v1.26.2/go.mod h1:rScbFd9LJPGTM8HOI8Kjwee0AZ+MZMupAvFpPg+Qdj4=
6264
github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=
6365
github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg=
6466
github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 h1:gEOO8jv9F4OT7lGCjxCBTO/36wtF6j2nSip77qHd4x4=
6567
github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1/go.mod h1:Ohn+xnUBiLI6FVj/9LpzZWtj1/D6lUovWYBkxHVV3aM=
6668
github.com/yalue/onnxruntime_go v1.19.0 h1:+qCu7/Nzrr/TY7B3sMy9sOATegP2qbtXn4b7q90fDOo=
6769
github.com/yalue/onnxruntime_go v1.19.0/go.mod h1:b4X26A8pekNb1ACJ58wAXgNKeUCGEAQ9dmACut9Sm/4=
68-
golang.org/x/crypto v0.37.0 h1:kJNSjF/Xp7kU0iB2Z+9viTPMW4EqqsrywMXLJOOsXSE=
69-
golang.org/x/crypto v0.37.0/go.mod h1:vg+k43peMZ0pUMhYmVAWysMK35e6ioLh3wB8ZCAfbVc=
70-
golang.org/x/exp v0.0.0-20250408133849-7e4ce0ab07d0 h1:R84qjqJb5nVJMxqWYb3np9L5ZsaDtB+a39EqjV0JSUM=
71-
golang.org/x/exp v0.0.0-20250408133849-7e4ce0ab07d0/go.mod h1:S9Xr4PYopiDyqSyp5NjCrhFrqg6A5zA2E/iPHPhqnS8=
70+
golang.org/x/crypto v0.38.0 h1:jt+WWG8IZlBnVbomuhg2Mdq0+BBQaHbtqHEFEigjUV8=
71+
golang.org/x/crypto v0.38.0/go.mod h1:MvrbAqul58NNYPKnOra203SB9vpuZW0e+RRZV+Ggqjw=
72+
golang.org/x/exp v0.0.0-20250506013437-ce4c2cf36ca6 h1:y5zboxd6LQAqYIhHnB48p0ByQ/GnQx2BE33L8BOHQkI=
73+
golang.org/x/exp v0.0.0-20250506013437-ce4c2cf36ca6/go.mod h1:U6Lno4MTRCDY+Ba7aCcauB9T60gsv5s4ralQzP72ZoQ=
7274
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
73-
golang.org/x/sys v0.32.0 h1:s77OFDvIQeibCmezSnk/q6iAfkdiQaJi4VzroCFrN20=
74-
golang.org/x/sys v0.32.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
75-
golang.org/x/term v0.31.0 h1:erwDkOK1Msy6offm1mOgvspSkslFnIGsFnxOKoufg3o=
76-
golang.org/x/term v0.31.0/go.mod h1:R4BeIy7D95HzImkxGkTW1UQTtP54tio2RyHz7PwK0aw=
75+
golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw=
76+
golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
77+
golang.org/x/term v0.32.0 h1:DR4lr0TjUs3epypdhTOkMmuF5CDFJ/8pOnbzMZPQ7bg=
78+
golang.org/x/term v0.32.0/go.mod h1:uZG1FhGx848Sqfsq4/DlJr3xGGsYMu/L5GW4abiaEPQ=
7779
google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY=
7880
google.golang.org/protobuf v1.36.6/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY=
7981
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

‎hugot.go‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -299,10 +299,12 @@ func (s *Session) Destroy() error {
299299
s.tokenClassificationPipelines = nil
300300
s.textClassificationPipelines = nil
301301
s.zeroShotClassificationPipelines = nil
302-
err = errors.Join(
303-
s.options.Destroy(),
304-
s.environmentDestroy(),
305-
)
306-
s.options = nil
302+
303+
if s.options != nil {
304+
err = errors.Join(err, s.options.Destroy())
305+
s.options = nil
306+
}
307+
308+
err = errors.Join(err, s.environmentDestroy())
307309
return err
308310
}

‎hugot_ort.go‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,10 @@ func NewORTSession(opts ...options.WithOption) (*Session, error) {
3333
}
3434

3535
session.environmentDestroy = func() error {
36-
return ort.DestroyEnvironment()
36+
if ort.IsInitialized() {
37+
return ort.DestroyEnvironment()
38+
}
39+
return nil
3740
}
3841

3942
return session, err

0 commit comments

Comments
 (0)