Skip to content

Commit 11a6d0a

Browse files
ashraffoudaashraffouda
authored
Merge pull request #214 from threefoldtech/fix-gpu-type
2 parents a8270d9 + b3137d8 commit 11a6d0a

File tree

14 files changed

+22
-28
lines changed

14 files changed

+22
-28
lines changed

‎go.work.sum‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -744,6 +744,7 @@ github.com/threefoldtech/rmb-sdk-go v1.0.0/go.mod h1:OFb7TpYhHa6YpWBJjsh6r7CX7uV
744744
github.com/threefoldtech/rmb-sdk-go v1.0.1 h1:dyjPfLqOa9xhQjg1a3+pmTpJrflqCd/rreblUPGb2wU=
745745
github.com/threefoldtech/rmb-sdk-go v1.0.1/go.mod h1:DKMNAkL2+lc4iI+wemPx3z5q5Z9ww2uY7D25yIKpZH4=
746746
github.com/threefoldtech/substrate-client v0.1.5/go.mod h1:ys/GJLeLmNX8E36UFMeR0yZC5Lo4PufYtfwsVX8H/AM=
747+
github.com/threefoldtech/tfchain/clients/tfchain-client-go v0.0.0-20230616110830-e0aae0ad6d60/go.mod h1:dtDKAPiUDxAwIkfHV7xcAFZcOm+xwNIuOI1MLFS+MeQ=
747748
github.com/threefoldtech/tfgrid-sdk-go/rmb-sdk-go v0.4.0/go.mod h1:tttnc/l4F2lx1SyETTiLrMaiQEgMeGCvlVEIW6nUeJA=
748749
github.com/threefoldtech/zbus v1.0.1/go.mod h1:E/v/xEvG/l6z/Oj0aDkuSUXFm/1RVJkhKBwDTAIdsHo=
749750
github.com/tinylib/msgp v1.0.2/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDWklFE=

‎grid-cli/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ require (
4747
github.com/rs/cors v1.9.0 // indirect
4848
github.com/shirou/gopsutil v3.21.11+incompatible // indirect
4949
github.com/spf13/pflag v1.0.5 // indirect
50-
github.com/threefoldtech/tfchain/clients/tfchain-client-go v0.0.0-20230616110830-e0aae0ad6d60 // indirect
50+
github.com/threefoldtech/tfchain/clients/tfchain-client-go v0.0.0-20230619085748-dd2f8ad00fe5 // indirect
5151
github.com/threefoldtech/tfgrid-sdk-go/rmb-sdk-go v0.4.0 // indirect
5252
github.com/tklauser/go-sysconf v0.3.9 // indirect
5353
github.com/tklauser/numcpus v0.6.0 // indirect

‎grid-cli/go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,8 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
115115
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
116116
github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8=
117117
github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
118-
github.com/threefoldtech/tfchain/clients/tfchain-client-go v0.0.0-20230616110830-e0aae0ad6d60 h1:HIKhyBKgXbDU9QmkcpZp2lk8A2U2zjFUtfh7Tc93ka0=
119-
github.com/threefoldtech/tfchain/clients/tfchain-client-go v0.0.0-20230616110830-e0aae0ad6d60/go.mod h1:dtDKAPiUDxAwIkfHV7xcAFZcOm+xwNIuOI1MLFS+MeQ=
118+
github.com/threefoldtech/tfchain/clients/tfchain-client-go v0.0.0-20230619085748-dd2f8ad00fe5 h1:wF7V9chGm2W3+PXEO400PV5s6eaz8uiINtWvtjqajJE=
119+
github.com/threefoldtech/tfchain/clients/tfchain-client-go v0.0.0-20230619085748-dd2f8ad00fe5/go.mod h1:dtDKAPiUDxAwIkfHV7xcAFZcOm+xwNIuOI1MLFS+MeQ=
120120
github.com/threefoldtech/zos v0.5.6-0.20230621094643-c1c26774b2a8 h1:1x+o9l/uFS8vCGcdkxB3WrM3xYtogOsM3cvHGn7c3fo=
121121
github.com/threefoldtech/zos v0.5.6-0.20230621094643-c1c26774b2a8/go.mod h1:KDLYu7igkUy1d2E+9rKFBeLY1iUs0zb2aj17ggue26c=
122122
github.com/tklauser/go-sysconf v0.3.9 h1:JeUVdAOWhhxVcU6Eqr/ATFHgXk/mmiItdKeJPev3vTo=

‎grid-client/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ require (
1010
github.com/pkg/errors v0.9.1
1111
github.com/rs/zerolog v1.29.1
1212
github.com/stretchr/testify v1.8.2
13-
github.com/threefoldtech/tfchain/clients/tfchain-client-go v0.0.0-20230616110830-e0aae0ad6d60
13+
github.com/threefoldtech/tfchain/clients/tfchain-client-go v0.0.0-20230619085748-dd2f8ad00fe5
1414
github.com/threefoldtech/tfgrid-sdk-go/grid-proxy v0.1.0
1515
github.com/threefoldtech/tfgrid-sdk-go/rmb-sdk-go v0.4.0
1616
github.com/threefoldtech/zos v0.5.6-0.20230621094643-c1c26774b2a8

‎grid-client/go.sum‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -108,14 +108,8 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
108108
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
109109
github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8=
110110
github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
111-
github.com/threefoldtech/tfchain/clients/tfchain-client-go v0.0.0-20230530114457-e57ee9560f79 h1:raL62fseJwRAQoaUn5h1M5RLPCjLWLvyDOhpW9E1TNI=
112-
github.com/threefoldtech/tfchain/clients/tfchain-client-go v0.0.0-20230530114457-e57ee9560f79/go.mod h1:dtDKAPiUDxAwIkfHV7xcAFZcOm+xwNIuOI1MLFS+MeQ=
113-
github.com/threefoldtech/tfchain/clients/tfchain-client-go v0.0.0-20230616110830-e0aae0ad6d60 h1:HIKhyBKgXbDU9QmkcpZp2lk8A2U2zjFUtfh7Tc93ka0=
114-
github.com/threefoldtech/tfchain/clients/tfchain-client-go v0.0.0-20230616110830-e0aae0ad6d60/go.mod h1:dtDKAPiUDxAwIkfHV7xcAFZcOm+xwNIuOI1MLFS+MeQ=
115-
github.com/threefoldtech/zos v0.5.6-0.20230602153943-9168c20d48c1 h1:mpLaJvl5XjZVtinllBO6XR6iN23yumHZjWyvpqeXhIA=
116-
github.com/threefoldtech/zos v0.5.6-0.20230602153943-9168c20d48c1/go.mod h1:l6bANbmYn3y2Oi6WuoA/MeKrsHweRBflwk0DY8/jmao=
117-
github.com/threefoldtech/zos v0.5.6-0.20230619090727-df9b1fd2fbed h1:qSP41hNr2mCwArV64J84jFAwoddSpB/EHT7I9jBYulc=
118-
github.com/threefoldtech/zos v0.5.6-0.20230619090727-df9b1fd2fbed/go.mod h1:KDLYu7igkUy1d2E+9rKFBeLY1iUs0zb2aj17ggue26c=
111+
github.com/threefoldtech/tfchain/clients/tfchain-client-go v0.0.0-20230619085748-dd2f8ad00fe5 h1:wF7V9chGm2W3+PXEO400PV5s6eaz8uiINtWvtjqajJE=
112+
github.com/threefoldtech/tfchain/clients/tfchain-client-go v0.0.0-20230619085748-dd2f8ad00fe5/go.mod h1:dtDKAPiUDxAwIkfHV7xcAFZcOm+xwNIuOI1MLFS+MeQ=
119113
github.com/threefoldtech/zos v0.5.6-0.20230621094643-c1c26774b2a8 h1:1x+o9l/uFS8vCGcdkxB3WrM3xYtogOsM3cvHGn7c3fo=
120114
github.com/threefoldtech/zos v0.5.6-0.20230621094643-c1c26774b2a8/go.mod h1:KDLYu7igkUy1d2E+9rKFBeLY1iUs0zb2aj17ggue26c=
121115
github.com/tklauser/go-sysconf v0.3.9 h1:JeUVdAOWhhxVcU6Eqr/ATFHgXk/mmiItdKeJPev3vTo=

‎grid-client/workloads/vm.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ func NewVMFromMap(vm map[string]interface{}) *VM {
7474

7575
var gpus []zos.GPU
7676
for _, v := range vm["gpus"].([]interface{}) {
77-
gpus = append(gpus, v.(zos.GPU))
77+
gpus = append(gpus, zos.GPU(v.(string)))
7878
}
7979

8080
return &VM{

‎grid-proxy/go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ require (
1414
github.com/stretchr/testify v1.8.2
1515
github.com/swaggo/http-swagger v1.3.4
1616
github.com/swaggo/swag v1.8.12
17-
github.com/threefoldtech/tfchain/clients/tfchain-client-go v0.0.0-20230530114457-e57ee9560f79
17+
github.com/threefoldtech/tfchain/clients/tfchain-client-go v0.0.0-20230619085748-dd2f8ad00fe5
1818
github.com/threefoldtech/tfgrid-sdk-go/rmb-sdk-go v0.4.0
19-
github.com/threefoldtech/zos v0.5.6-0.20230526112430-f620733482d7
19+
github.com/threefoldtech/zos v0.5.6-0.20230621094643-c1c26774b2a8
2020
gorm.io/driver/postgres v1.5.0
2121
gorm.io/gorm v1.25.0
2222
)

‎grid-proxy/go.sum‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -154,10 +154,9 @@ github.com/swaggo/http-swagger v1.3.4 h1:q7t/XLx0n15H1Q9/tk3Y9L4n210XzJF5WtnDX64
154154
github.com/swaggo/http-swagger v1.3.4/go.mod h1:9dAh0unqMBAlbp1uE2Uc2mQTxNMU/ha4UbucIg1MFkQ=
155155
github.com/swaggo/swag v1.8.12 h1:pctzkNPu0AlQP2royqX3apjKCQonAnf7KGoxeO4y64w=
156156
github.com/swaggo/swag v1.8.12/go.mod h1:lNfm6Gg+oAq3zRJQNEMBE66LIJKM44mxFqhEEgy2its=
157-
github.com/threefoldtech/tfchain/clients/tfchain-client-go v0.0.0-20230530114457-e57ee9560f79 h1:raL62fseJwRAQoaUn5h1M5RLPCjLWLvyDOhpW9E1TNI=
158-
github.com/threefoldtech/tfchain/clients/tfchain-client-go v0.0.0-20230530114457-e57ee9560f79/go.mod h1:dtDKAPiUDxAwIkfHV7xcAFZcOm+xwNIuOI1MLFS+MeQ=
159-
github.com/threefoldtech/zos v0.5.6-0.20230526112430-f620733482d7 h1:4gkPADdVpLK4jciXvQHgYYWCzNRnY04Vg34iVofRk+0=
160-
github.com/threefoldtech/zos v0.5.6-0.20230526112430-f620733482d7/go.mod h1:l6bANbmYn3y2Oi6WuoA/MeKrsHweRBflwk0DY8/jmao=
157+
github.com/threefoldtech/tfchain/clients/tfchain-client-go v0.0.0-20230619085748-dd2f8ad00fe5 h1:wF7V9chGm2W3+PXEO400PV5s6eaz8uiINtWvtjqajJE=
158+
github.com/threefoldtech/tfchain/clients/tfchain-client-go v0.0.0-20230619085748-dd2f8ad00fe5/go.mod h1:dtDKAPiUDxAwIkfHV7xcAFZcOm+xwNIuOI1MLFS+MeQ=
159+
github.com/threefoldtech/zos v0.5.6-0.20230621094643-c1c26774b2a8 h1:1x+o9l/uFS8vCGcdkxB3WrM3xYtogOsM3cvHGn7c3fo=
161160
github.com/tklauser/go-sysconf v0.3.9 h1:JeUVdAOWhhxVcU6Eqr/ATFHgXk/mmiItdKeJPev3vTo=
162161
github.com/tklauser/numcpus v0.6.0 h1:kebhY2Qt+3U6RNK7UqpYNA+tJ23IBEGKkB7JQBfDYms=
163162
github.com/tyler-smith/go-bip39 v1.1.0 h1:5eUemwrMargf3BSLRRCalXT93Ns6pQJIjYQN2nyfOP8=

‎gridify/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ require (
6161
github.com/shirou/gopsutil v3.21.11+incompatible // indirect
6262
github.com/skeema/knownhosts v1.1.0 // indirect
6363
github.com/spf13/pflag v1.0.5 // indirect
64-
github.com/threefoldtech/tfchain/clients/tfchain-client-go v0.0.0-20230616110830-e0aae0ad6d60 // indirect
64+
github.com/threefoldtech/tfchain/clients/tfchain-client-go v0.0.0-20230619085748-dd2f8ad00fe5 // indirect
6565
github.com/threefoldtech/tfgrid-sdk-go/rmb-sdk-go v0.4.0 // indirect
6666
github.com/threefoldtech/zos v0.5.6-0.20230621094643-c1c26774b2a8 // indirect
6767
github.com/tklauser/go-sysconf v0.3.9 // indirect

‎gridify/go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -169,8 +169,8 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
169169
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
170170
github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8=
171171
github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
172-
github.com/threefoldtech/tfchain/clients/tfchain-client-go v0.0.0-20230616110830-e0aae0ad6d60 h1:HIKhyBKgXbDU9QmkcpZp2lk8A2U2zjFUtfh7Tc93ka0=
173-
github.com/threefoldtech/tfchain/clients/tfchain-client-go v0.0.0-20230616110830-e0aae0ad6d60/go.mod h1:dtDKAPiUDxAwIkfHV7xcAFZcOm+xwNIuOI1MLFS+MeQ=
172+
github.com/threefoldtech/tfchain/clients/tfchain-client-go v0.0.0-20230619085748-dd2f8ad00fe5 h1:wF7V9chGm2W3+PXEO400PV5s6eaz8uiINtWvtjqajJE=
173+
github.com/threefoldtech/tfchain/clients/tfchain-client-go v0.0.0-20230619085748-dd2f8ad00fe5/go.mod h1:dtDKAPiUDxAwIkfHV7xcAFZcOm+xwNIuOI1MLFS+MeQ=
174174
github.com/threefoldtech/zos v0.5.6-0.20230621094643-c1c26774b2a8 h1:1x+o9l/uFS8vCGcdkxB3WrM3xYtogOsM3cvHGn7c3fo=
175175
github.com/threefoldtech/zos v0.5.6-0.20230621094643-c1c26774b2a8/go.mod h1:KDLYu7igkUy1d2E+9rKFBeLY1iUs0zb2aj17ggue26c=
176176
github.com/tklauser/go-sysconf v0.3.9 h1:JeUVdAOWhhxVcU6Eqr/ATFHgXk/mmiItdKeJPev3vTo=

0 commit comments

Comments
 (0)