Skip to content

Commit 7b8c286

Browse files
chewxychewxy
authored
Merge pull request #42 from alejandroEsc/ae/gomod/migrate
migration to go mod, slight changes to cudatest, cgoflag updates
2 parents 89152d7 + 11dffc5 commit 7b8c286

File tree

9 files changed

+148
-197
lines changed

9 files changed

+148
-197
lines changed

‎Gopkg.lock

-117
This file was deleted.

‎Gopkg.toml

-50
This file was deleted.

‎blas/cgoflags.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ package cublas
22

33
// #cgo CFLAGS: -I/usr/local/cuda-9.0/targets/x86_64-linux/include -I/usr/local/cuda/include
44
// #cgo LDFLAGS: -lcublas
5-
// #cgo LDFLAGS: -L/usr/local/cuda-9.0/targets/x86_64-linux/lib -L/usr/local/cuda/lib64
5+
// #cgo LDFLAGS: -L/usr/local/cuda-9.0/targets/x86_64-linux/lib -L/usr/local/cuda/lib64
66
import "C"

‎cgoflags.go

+18-12
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,30 @@ package cu
55
//#cgo LDFLAGS:-lcuda
66
//
77
////default location:
8-
//#cgo LDFLAGS:-L/usr/local/cuda/lib64 -L/usr/local/cuda/lib
9-
//#cgo CFLAGS: -I/usr/local/cuda/include/
8+
//#cgo linux,windows LDFLAGS:-L/usr/local/cuda/lib64 -L/usr/local/cuda/lib
9+
//#cgo linux,windows CFLAGS: -I/usr/local/cuda/include/
1010
//
1111
////default location if not properly symlinked:
12-
//#cgo LDFLAGS:-L/usr/local/cuda-6.0/lib64 -L/usr/local/cuda-6.0/lib
13-
//#cgo LDFLAGS:-L/usr/local/cuda-5.5/lib64 -L/usr/local/cuda-5.5/lib
14-
//#cgo LDFLAGS:-L/usr/local/cuda-5.0/lib64 -L/usr/local/cuda-5.0/lib
15-
//#cgo CFLAGS: -I/usr/local/cuda-6.0/include/
16-
//#cgo CFLAGS: -I/usr/local/cuda-5.5/include/
17-
//#cgo CFLAGS: -I/usr/local/cuda-5.0/include/
12+
//#cgo linux LDFLAGS:-L/usr/local/cuda-10.1/lib64 -L/usr/local/cuda-10.1/lib
13+
//#cgo linux LDFLAGS:-L/usr/local/cuda-6.0/lib64 -L/usr/local/cuda-6.0/lib
14+
//#cgo linux LDFLAGS:-L/usr/local/cuda-5.5/lib64 -L/usr/local/cuda-5.5/lib
15+
//#cgo linux LDFLAGS:-L/usr/local/cuda-5.0/lib64 -L/usr/local/cuda-5.0/lib
16+
//#cgo linux CFLAGS: -I/usr/local/cuda-10.1/include/
17+
//#cgo linux CFLAGS: -I/usr/local/cuda-6.0/include/
18+
//#cgo linux CFLAGS: -I/usr/local/cuda-5.5/include/
19+
//#cgo linux CFLAGS: -I/usr/local/cuda-5.0/include/
1820
//
1921
////Ubuntu 15.04:
20-
//#cgo LDFLAGS:-L/usr/lib/x86_64-linux-gnu/
21-
//#cgo CFLAGS: -I/usr/include
22+
//#cgo linux LDFLAGS:-L/usr/lib/x86_64-linux-gnu/
23+
//#cgo linux CFLAGS: -I/usr/include
2224
//
2325
////arch linux:
24-
//#cgo LDFLAGS:-L/opt/cuda/lib64 -L/opt/cuda/lib
25-
//#cgo CFLAGS: -I/opt/cuda/include
26+
//#cgo linux LDFLAGS:-L/opt/cuda/lib64 -L/opt/cuda/lib
27+
//#cgo linux CFLAGS: -I/opt/cuda/include
28+
//
29+
////Darwin:
30+
//#cgo darwin LDFLAGS:-L/usr/local/cuda/lib
31+
//#cgo darwin CFLAGS: -I/usr/local/cuda/include/
2632
//
2733
////WINDOWS:
2834
//#cgo windows LDFLAGS:-LC:/cuda/v5.0/lib/x64 -LC:/cuda/v5.5/lib/x64 -LC:/cuda/v6.0/lib/x64 -LC:/cuda/v6.5/lib/x64 -LC:/cuda/v7.0/lib/x64 -LC:/cuda/v8.0/lib/x64 -LC:/cuda/v9.0/x64

‎cmd/cudatest/main.go

+10-4
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,18 @@ import (
55
"fmt"
66

77
"gorgonia.org/cu"
8+
"os"
9+
"github.com/cloudflare/cfssl/log"
810
)
911

1012
func main() {
11-
fmt.Printf("CUDA version: %v\n", cu.Version())
12-
devices, _ := cu.NumDevices()
13-
fmt.Printf("CUDA devices: %v\n", devices)
13+
fmt.Printf("\nCUDA version: %v\n", cu.Version())
14+
devices, err := cu.NumDevices()
15+
if err != nil {
16+
log.Info("issue found: %+v", err)
17+
os.Exit(1)
18+
}
19+
fmt.Printf("CUDA devices: %v\n\n", devices)
1420

1521
for d := 0; d < devices; d++ {
1622
name, _ := cu.Device(d).Name()
@@ -21,6 +27,6 @@ func main() {
2127
fmt.Printf("Device %d\n========\nName :\t%q\n", d, name)
2228
fmt.Printf("Clock Rate:\t%v kHz\n", cr)
2329
fmt.Printf("Memory :\t%v bytes\n", mem)
24-
fmt.Printf("Compute : \t%d.%d\n", maj, min)
30+
fmt.Printf("Compute : \t%d.%d\n\n", maj, min)
2531
}
2632
}

‎cu.go

+8-1
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,19 @@ package cu // import "gorgonia.org/cu"
55

66
//#include <cuda.h>
77
import "C"
8+
import (
9+
"fmt"
10+
"os"
11+
)
12+
13+
const initHtml = "https://docs.nvidia.com/cuda/cuda-driver-api/group__CUDA__INITIALIZE.html"
814

915
func init() {
1016
// Given that the flags must be 0, the CUDA driver is initialized at the package level
1117
// http://docs.nvidia.com/cuda/cuda-driver-api/group__CUDA__INITIALIZE.html
1218
if err := result(C.cuInit(C.uint(0))); err != nil {
13-
panic(err)
19+
fmt.Printf("Error in initialization, please refer to %q for details on: %+v\n", initHtml, err)
20+
os.Exit(1)
1421
}
1522

1623
}

‎go.mod

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
module gorgonia.org/cu
2+
3+
require (
4+
github.com/awalterschulze/gographviz v0.0.0-20190221210632-1e9ccb565bca // indirect
5+
github.com/chewxy/hm v1.0.0 // indirect
6+
github.com/chewxy/math32 v1.0.0 // indirect
7+
github.com/cloudflare/cfssl v0.0.0-20190409034051-768cd563887f
8+
github.com/cznic/cc v0.0.0-20171021204506-4b6ffb9b7827
9+
github.com/cznic/golex v0.0.0-20170803123110-4ab7c5e190e4 // indirect
10+
github.com/cznic/mathutil v0.0.0-20171015093839-09cde8d5df5f // indirect
11+
github.com/cznic/strutil v0.0.0-20171016134553-529a34b1c186 // indirect
12+
github.com/cznic/xc v0.0.0-20170110181416-056465bb2be5
13+
github.com/davecgh/go-spew v1.1.0 // indirect
14+
github.com/gonum/blas v0.0.0-20170728112917-37e82626499e
15+
github.com/gorgonia/bindgen v0.0.0-20180812032444-09626750019e
16+
github.com/kr/pretty v0.1.0
17+
github.com/leesper/go_rng v0.0.0-20171009123644-5344a9259b21 // indirect
18+
github.com/pkg/errors v0.8.0
19+
github.com/pmezard/go-difflib v1.0.0 // indirect
20+
github.com/stretchr/testify v1.1.4
21+
github.com/xtgo/set v0.0.0-20151204082305-4431f6b51265 // indirect
22+
golang.org/x/exp v0.0.0-20190413192849-7f338f571082 // indirect
23+
gonum.org/v1/gonum v0.0.0-20190413104459-5d695651a1d5
24+
gorgonia.org/dawson v1.1.0 // indirect
25+
gorgonia.org/gorgonia v0.9.1
26+
gorgonia.org/tensor v0.8.0
27+
gorgonia.org/vecf32 v0.0.0-20171210012140-9c61466a81d9 // indirect
28+
gorgonia.org/vecf64 v0.0.0-20171210012113-92cacded62a7 // indirect
29+
)

‎go.sum

+66
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
2+
github.com/awalterschulze/gographviz v0.0.0-20190221210632-1e9ccb565bca h1:xwIXr1FpA2XBoohlpvgb11No/zbsh5Clm/98PWPcHVA=
3+
github.com/awalterschulze/gographviz v0.0.0-20190221210632-1e9ccb565bca/go.mod h1:GEV5wmg4YquNw7v1kkyoX9etIk8yVmXj+AkDHuuETHs=
4+
github.com/chewxy/hm v1.0.0 h1:zy/TSv3LV2nD3dwUEQL2VhXeoXbb9QkpmdRAVUFiA6k=
5+
github.com/chewxy/hm v1.0.0/go.mod h1:qg9YI4q6Fkj/whwHR1D+bOGeF7SniIP40VweVepLjg0=
6+
github.com/chewxy/math32 v1.0.0 h1:RTt2SACA7BTzvbsAKVQJLZpV6zY2MZw4bW9L2HEKkHg=
7+
github.com/chewxy/math32 v1.0.0/go.mod h1:Miac6hA1ohdDUTagnvJy/q+aNnEk16qWUdb8ZVhvCN0=
8+
github.com/cloudflare/cfssl v0.0.0-20190409034051-768cd563887f h1:+2gpkLTePKn3qDlYFOF5HnOLn+Hti/n4Iqk5jBFA7KU=
9+
github.com/cloudflare/cfssl v0.0.0-20190409034051-768cd563887f/go.mod h1:yMWuSON2oQp+43nFtAV/uvKQIFpSPerB57DCt9t8sSA=
10+
github.com/cznic/cc v0.0.0-20171021204506-4b6ffb9b7827 h1:2qozRgyDnCl8L8WG80/4AzIimBXV4X+o1U7Q+PBGlRA=
11+
github.com/cznic/cc v0.0.0-20171021204506-4b6ffb9b7827/go.mod h1:m3fD/V+XTB35Kh9zw6dzjMY+We0Q7PMf6LLIC4vuG9k=
12+
github.com/cznic/golex v0.0.0-20170803123110-4ab7c5e190e4 h1:CVAqftqbj+exlab+8KJQrE+kNIVlQfJt58j4GxCMF1s=
13+
github.com/cznic/golex v0.0.0-20170803123110-4ab7c5e190e4/go.mod h1:+bmmJDNmKlhWNG+gwWCkaBoTy39Fs+bzRxVBzoTQbIc=
14+
github.com/cznic/mathutil v0.0.0-20171015093839-09cde8d5df5f h1:PvrGZWKywilcw6odUgj/JbsuPo3HxKdxsyfnDJpz7pQ=
15+
github.com/cznic/mathutil v0.0.0-20171015093839-09cde8d5df5f/go.mod h1:e6NPNENfs9mPDVNRekM7lKScauxd5kXTr1Mfyig6TDM=
16+
github.com/cznic/strutil v0.0.0-20171016134553-529a34b1c186 h1:0rkFMAbn5KBKNpJyHQ6Prb95vIKanmAe62KxsrN+sqA=
17+
github.com/cznic/strutil v0.0.0-20171016134553-529a34b1c186/go.mod h1:AHHPPPXTw0h6pVabbcbyGRK1DckRn7r/STdZEeIDzZc=
18+
github.com/cznic/xc v0.0.0-20170110181416-056465bb2be5 h1:ZES9X38zJkHU4+zo8Z66kCrDd4f22mm+lXMwyNxGOpo=
19+
github.com/cznic/xc v0.0.0-20170110181416-056465bb2be5/go.mod h1:3oFoiOvCDBYH+swwf5+k/woVmWy7h1Fcyu8Qig/jjX0=
20+
github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
21+
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
22+
github.com/gonum/blas v0.0.0-20170728112917-37e82626499e h1:VScL7slL7Uf+8QD9dB4p4/JyE028bsbeEbW1pCXHiK8=
23+
github.com/gonum/blas v0.0.0-20170728112917-37e82626499e/go.mod h1:P32wAyui1PQ58Oce/KYkOqQv8cVw1zAapXOl+dRFGbc=
24+
github.com/gorgonia/bindgen v0.0.0-20180812032444-09626750019e h1:s7hYZXDub8rGKuh712Cdd+zAuti5trhwWmEZvjWnxEw=
25+
github.com/gorgonia/bindgen v0.0.0-20180812032444-09626750019e/go.mod h1:YzKk63P9jQHkwAo2rXHBv02yPxDzoQT2cBV0x5bGV/8=
26+
github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
27+
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
28+
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
29+
github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
30+
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
31+
github.com/leesper/go_rng v0.0.0-20171009123644-5344a9259b21 h1:O75p5GUdUfhJqNCMM1ntthjtJCOHVa1lzMSfh5Qsa0Y=
32+
github.com/leesper/go_rng v0.0.0-20171009123644-5344a9259b21/go.mod h1:N0SVk0uhy+E1PZ3C9ctsPRlvOPAFPkCNlcPBDkt0N3U=
33+
github.com/pkg/errors v0.8.0 h1:WdK/asTD0HN+q6hsWO3/vpuAkAr+tw6aNJNDFFf0+qw=
34+
github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
35+
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
36+
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
37+
github.com/stretchr/testify v1.1.4 h1:ToftOQTytwshuOSj6bDSolVUa3GINfJP/fg3OkkOzQQ=
38+
github.com/stretchr/testify v1.1.4/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
39+
github.com/xtgo/set v0.0.0-20151204082305-4431f6b51265 h1:86yslOGLdMhh3xJR1+1UleoyTbyzmBWAGDdw0qPg1HI=
40+
github.com/xtgo/set v0.0.0-20151204082305-4431f6b51265/go.mod h1:d3NHzGzSa0NmB2NhFyECA+QdRp29oEn2xbT+TpeFoM8=
41+
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
42+
golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
43+
golang.org/x/exp v0.0.0-20190413192849-7f338f571082 h1:8U/MRXCZDoZSA3StuCYbxw6iFH9EuuqaCpjl8WaVLU0=
44+
golang.org/x/exp v0.0.0-20190413192849-7f338f571082/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
45+
golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
46+
golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE=
47+
golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
48+
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
49+
golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
50+
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
51+
golang.org/x/tools v0.0.0-20190206041539-40960b6deb8e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
52+
golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
53+
gonum.org/v1/gonum v0.0.0-20190413104459-5d695651a1d5 h1:UADH4ZCmNGSypq6ADKeex9d7DOobzOBfVXa1O4Oj8lU=
54+
gonum.org/v1/gonum v0.0.0-20190413104459-5d695651a1d5/go.mod h1:2ltnJ7xHfj0zHS40VVPYEAAMTa3ZGguvHGBSJeRWqE0=
55+
gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0 h1:OE9mWmgKkjJyEmDAAtGMPjXu+YNeGvK9VTSHY6+Qihc=
56+
gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0/go.mod h1:wa6Ws7BG/ESfp6dHfk7C6KdzKA7wR7u/rKwOGE66zvw=
57+
gorgonia.org/dawson v1.1.0 h1:o7+eJ3SKi9sheH19lpOat//tDbg0Y+M9iY/lH79VHqY=
58+
gorgonia.org/dawson v1.1.0/go.mod h1:Px1mcziba8YUBIDsbzGwbKJ11uIblv/zkln4jNrZ9Ws=
59+
gorgonia.org/gorgonia v0.9.1 h1:6blWHSDHCplQHem+pvo9dZvtsQp7l3ZiVqXk26frn9M=
60+
gorgonia.org/gorgonia v0.9.1/go.mod h1:qucT7YHm/2OuSHWEw/6Je/LQ5htRJNQJ1+qpB58fY8c=
61+
gorgonia.org/tensor v0.8.0 h1:+JDsIEnx+wQVf9brvrYyU+/uZit2PnzP9Dt4CWNeirQ=
62+
gorgonia.org/tensor v0.8.0/go.mod h1:05Y4laKuVlj4qFoZIZW1q/9n1jZkgDBOLmKXZdBLG1w=
63+
gorgonia.org/vecf32 v0.0.0-20171210012140-9c61466a81d9 h1:z+YbKTUsw7lWVx58pCo+YGkwHiuAx5bzngvCet4A7Lw=
64+
gorgonia.org/vecf32 v0.0.0-20171210012140-9c61466a81d9/go.mod h1:iHG+kvTMqGYA0SgahfO2k62WRnxmHsqAREGbayRDzy8=
65+
gorgonia.org/vecf64 v0.0.0-20171210012113-92cacded62a7 h1:2kkbVvFCxrivKvAuOM+3SGJHxik5BZfmCxzJLyoHpzA=
66+
gorgonia.org/vecf64 v0.0.0-20171210012113-92cacded62a7/go.mod h1:1y4pmcSd+wh3phG+InwWQjYrqwyrtN9h27WLFVQfV1Q=

0 commit comments

Comments
 (0)