package/gonum
1
0
Fork 0
mirror of https://github.com/gonum/gonum.git synced 2025-10-20 21:59:25 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

blas,graph,lapack: fix imports and code generation

Browse Source
This commit is contained in:
kortschak
2017-05-26 12:39:54 +09:30
parent b12587ceac
commit ee9686e444
15 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
blas/native/general_single.go
View File

@@ -1,4 +1,4 @@
// Code generated by "go generate github.com/gonum/blas/native"; DO NOT EDIT. // Code generated by "go generate gonum.org/v1/gonum/blas/native"; DO NOT EDIT.
// Copyright ©2014 The gonum Authors. All rights reserved. // Copyright ©2014 The gonum Authors. All rights reserved.
// Use of this source code is governed by a BSD-style // Use of this source code is governed by a BSD-style

2
blas/native/level1single.go
View File

@@ -1,4 +1,4 @@
// Code generated by "go generate github.com/gonum/blas/native"; DO NOT EDIT. // Code generated by "go generate gonum.org/v1/gonum/blas/native"; DO NOT EDIT.
// Copyright ©2015 The gonum Authors. All rights reserved. // Copyright ©2015 The gonum Authors. All rights reserved.
// Use of this source code is governed by a BSD-style // Use of this source code is governed by a BSD-style

2
blas/native/level1single_dsdot.go
View File

@@ -1,4 +1,4 @@
// Code generated by "go generate github.com/gonum/blas/native"; DO NOT EDIT. // Code generated by "go generate gonum.org/v1/gonum/blas/native"; DO NOT EDIT.
// Copyright ©2015 The gonum Authors. All rights reserved. // Copyright ©2015 The gonum Authors. All rights reserved.
// Use of this source code is governed by a BSD-style // Use of this source code is governed by a BSD-style

2
blas/native/level1single_sdot.go
View File

@@ -1,4 +1,4 @@
// Code generated by "go generate github.com/gonum/blas/native"; DO NOT EDIT. // Code generated by "go generate gonum.org/v1/gonum/blas/native"; DO NOT EDIT.
// Copyright ©2015 The gonum Authors. All rights reserved. // Copyright ©2015 The gonum Authors. All rights reserved.
// Use of this source code is governed by a BSD-style // Use of this source code is governed by a BSD-style

2
blas/native/level1single_sdsdot.go
View File

@@ -1,4 +1,4 @@
// Code generated by "go generate github.com/gonum/blas/native"; DO NOT EDIT. // Code generated by "go generate gonum.org/v1/gonum/blas/native"; DO NOT EDIT.
// Copyright ©2015 The gonum Authors. All rights reserved. // Copyright ©2015 The gonum Authors. All rights reserved.
// Use of this source code is governed by a BSD-style // Use of this source code is governed by a BSD-style

2
blas/native/level2single.go
View File

@@ -1,4 +1,4 @@
// Code generated by "go generate github.com/gonum/blas/native"; DO NOT EDIT. // Code generated by "go generate gonum.org/v1/gonum/blas/native"; DO NOT EDIT.
// Copyright ©2014 The gonum Authors. All rights reserved. // Copyright ©2014 The gonum Authors. All rights reserved.
// Use of this source code is governed by a BSD-style // Use of this source code is governed by a BSD-style

2
blas/native/level3single.go
View File

@@ -1,4 +1,4 @@
// Code generated by "go generate github.com/gonum/blas/native"; DO NOT EDIT. // Code generated by "go generate gonum.org/v1/gonum/blas/native"; DO NOT EDIT.
// Copyright ©2014 The gonum Authors. All rights reserved. // Copyright ©2014 The gonum Authors. All rights reserved.
// Use of this source code is governed by a BSD-style // Use of this source code is governed by a BSD-style

2
blas/native/sgemm.go
View File

@@ -1,4 +1,4 @@
// Code generated by "go generate github.com/gonum/blas/native"; DO NOT EDIT. // Code generated by "go generate gonum.org/v1/gonum/blas/native"; DO NOT EDIT.
// Copyright ©2014 The gonum Authors. All rights reserved. // Copyright ©2014 The gonum Authors. All rights reserved.
// Use of this source code is governed by a BSD-style // Use of this source code is governed by a BSD-style

36
blas/native/single_precision.bash
View File

@@ -11,7 +11,7 @@ WARNING='//\
# Level1 routines. # Level1 routines.
echo Generating level1single.go echo Generating level1single.go
echo -e '// Code generated by "go generate github.com/gonum/blas/native"; DO NOT EDIT.\n' > level1single.go echo -e '// Code generated by "go generate gonum.org/v1/gonum/blas/native"; DO NOT EDIT.\n' > level1single.go
cat level1double.go \ cat level1double.go \
| gofmt -r 'blas.Float64Level1 -> blas.Float32Level1' \ | gofmt -r 'blas.Float64Level1 -> blas.Float32Level1' \
\ \
@@ -28,12 +28,12 @@ cat level1double.go \
-e 's_^// D_// S_' \ -e 's_^// D_// S_' \
-e "s_^\(func (Implementation) \)Id\(.*\)\$_$WARNING\1Is\2_" \ -e "s_^\(func (Implementation) \)Id\(.*\)\$_$WARNING\1Is\2_" \
-e 's_^// Id_// Is_' \ -e 's_^// Id_// Is_' \
-e 's_"github.com/gonum/internal/asm/f64"_"github.com/gonum/internal/asm/f32"_' \ -e 's_"gonum.org/v1/gonum/internal/asm/f64"_"gonum.org/v1/gonum/internal/asm/f32"_' \
-e 's_"math"_math "github.com/gonum/blas/native/internal/math32"_' \ -e 's_"math"_math "gonum.org/v1/gonum/blas/native/internal/math32"_' \
>> level1single.go >> level1single.go
echo Generating level1single_sdot.go echo Generating level1single_sdot.go
echo -e '// Code generated by "go generate github.com/gonum/blas/native"; DO NOT EDIT.\n' > level1single_sdot.go echo -e '// Code generated by "go generate gonum.org/v1/gonum/blas/native"; DO NOT EDIT.\n' > level1single_sdot.go
cat level1double_ddot.go \ cat level1double_ddot.go \
| gofmt -r 'float64 -> float32' \ | gofmt -r 'float64 -> float32' \
\ \
@@ -42,11 +42,11 @@ cat level1double_ddot.go \
\ \
| sed -e "s_^\(func (Implementation) \)D\(.*\)\$_$WARNING\1S\2_" \ | sed -e "s_^\(func (Implementation) \)D\(.*\)\$_$WARNING\1S\2_" \
-e 's_^// D_// S_' \ -e 's_^// D_// S_' \
-e 's_"github.com/gonum/internal/asm/f64"_"github.com/gonum/internal/asm/f32"_' \ -e 's_"gonum.org/v1/gonum/internal/asm/f64"_"gonum.org/v1/gonum/internal/asm/f32"_' \
>> level1single_sdot.go >> level1single_sdot.go
echo Generating level1single_dsdot.go echo Generating level1single_dsdot.go
echo -e '// Code generated by "go generate github.com/gonum/blas/native"; DO NOT EDIT.\n' > level1single_dsdot.go echo -e '// Code generated by "go generate gonum.org/v1/gonum/blas/native"; DO NOT EDIT.\n' > level1single_dsdot.go
cat level1double_ddot.go \ cat level1double_ddot.go \
| gofmt -r '[]float64 -> []float32' \ | gofmt -r '[]float64 -> []float32' \
\ \
@@ -55,11 +55,11 @@ cat level1double_ddot.go \
\ \
| sed -e "s_^\(func (Implementation) \)D\(.*\)\$_$WARNING\1Ds\2_" \ | sed -e "s_^\(func (Implementation) \)D\(.*\)\$_$WARNING\1Ds\2_" \
-e 's_^// D_// Ds_' \ -e 's_^// D_// Ds_' \
-e 's_"github.com/gonum/internal/asm/f64"_"github.com/gonum/internal/asm/f32"_' \ -e 's_"gonum.org/v1/gonum/internal/asm/f64"_"gonum.org/v1/gonum/internal/asm/f32"_' \
>> level1single_dsdot.go >> level1single_dsdot.go
echo Generating level1single_sdsdot.go echo Generating level1single_sdsdot.go
echo -e '// Code generated by "go generate github.com/gonum/blas/native"; DO NOT EDIT.\n' > level1single_sdsdot.go echo -e '// Code generated by "go generate gonum.org/v1/gonum/blas/native"; DO NOT EDIT.\n' > level1single_sdsdot.go
cat level1double_ddot.go \ cat level1double_ddot.go \
| gofmt -r 'float64 -> float32' \ | gofmt -r 'float64 -> float32' \
\ \
@@ -70,14 +70,14 @@ cat level1double_ddot.go \
-e 's_^// D\(.*\)$_// Sds\1 plus a constant_' \ -e 's_^// D\(.*\)$_// Sds\1 plus a constant_' \
-e 's_\\sum_alpha + \\sum_' \ -e 's_\\sum_alpha + \\sum_' \
-e 's/n int/n int, alpha float32/' \ -e 's/n int/n int, alpha float32/' \
-e 's_"github.com/gonum/internal/asm/f64"_"github.com/gonum/internal/asm/f32"_' \ -e 's_"gonum.org/v1/gonum/internal/asm/f64"_"gonum.org/v1/gonum/internal/asm/f32"_' \
>> level1single_sdsdot.go >> level1single_sdsdot.go
# Level2 routines. # Level2 routines.
echo Generating level2single.go echo Generating level2single.go
echo -e '// Code generated by "go generate github.com/gonum/blas/native"; DO NOT EDIT.\n' > level2single.go echo -e '// Code generated by "go generate gonum.org/v1/gonum/blas/native"; DO NOT EDIT.\n' > level2single.go
cat level2double.go \ cat level2double.go \
| gofmt -r 'blas.Float64Level2 -> blas.Float32Level2' \ | gofmt -r 'blas.Float64Level2 -> blas.Float32Level2' \
\ \
@@ -94,14 +94,14 @@ cat level2double.go \
\ \
| sed -e "s_^\(func (Implementation) \)D\(.*\)\$_$WARNING\1S\2_" \ | sed -e "s_^\(func (Implementation) \)D\(.*\)\$_$WARNING\1S\2_" \
-e 's_^// D_// S_' \ -e 's_^// D_// S_' \
-e 's_"github.com/gonum/internal/asm/f64"_"github.com/gonum/internal/asm/f32"_' \ -e 's_"gonum.org/v1/gonum/internal/asm/f64"_"gonum.org/v1/gonum/internal/asm/f32"_' \
>> level2single.go >> level2single.go
# Level3 routines. # Level3 routines.
echo Generating level3single.go echo Generating level3single.go
echo -e '// Code generated by "go generate github.com/gonum/blas/native"; DO NOT EDIT.\n' > level3single.go echo -e '// Code generated by "go generate gonum.org/v1/gonum/blas/native"; DO NOT EDIT.\n' > level3single.go
cat level3double.go \ cat level3double.go \
| gofmt -r 'blas.Float64Level3 -> blas.Float32Level3' \ | gofmt -r 'blas.Float64Level3 -> blas.Float32Level3' \
\ \
@@ -112,11 +112,11 @@ cat level3double.go \
\ \
| sed -e "s_^\(func (Implementation) \)D\(.*\)\$_$WARNING\1S\2_" \ | sed -e "s_^\(func (Implementation) \)D\(.*\)\$_$WARNING\1S\2_" \
-e 's_^// D_// S_' \ -e 's_^// D_// S_' \
-e 's_"github.com/gonum/internal/asm/f64"_"github.com/gonum/internal/asm/f32"_' \ -e 's_"gonum.org/v1/gonum/internal/asm/f64"_"gonum.org/v1/gonum/internal/asm/f32"_' \
>> level3single.go >> level3single.go
echo Generating general_single.go echo Generating general_single.go
echo -e '// Code generated by "go generate github.com/gonum/blas/native"; DO NOT EDIT.\n' > general_single.go echo -e '// Code generated by "go generate gonum.org/v1/gonum/blas/native"; DO NOT EDIT.\n' > general_single.go
cat general_double.go \ cat general_double.go \
| gofmt -r 'float64 -> float32' \ | gofmt -r 'float64 -> float32' \
\ \
@@ -124,12 +124,12 @@ cat general_double.go \
| gofmt -r 'newGeneral64 -> newGeneral32' \ | gofmt -r 'newGeneral64 -> newGeneral32' \
\ \
| sed -e 's/(g general64) print()/(g general32) print()/' \ | sed -e 's/(g general64) print()/(g general32) print()/' \
-e 's_"math"_math "github.com/gonum/blas/native/internal/math32"_' \ -e 's_"math"_math "gonum.org/v1/gonum/blas/native/internal/math32"_' \
-e 's_"github.com/gonum/internal/asm/f64"_"github.com/gonum/internal/asm/f32"_' \ -e 's_"gonum.org/v1/gonum/internal/asm/f64"_"gonum.org/v1/gonum/internal/asm/f32"_' \
>> general_single.go >> general_single.go
echo Generating sgemm.go echo Generating sgemm.go
echo -e '// Code generated by "go generate github.com/gonum/blas/native"; DO NOT EDIT.\n' > sgemm.go echo -e '// Code generated by "go generate gonum.org/v1/gonum/blas/native"; DO NOT EDIT.\n' > sgemm.go
cat dgemm.go \ cat dgemm.go \
| gofmt -r 'float64 -> float32' \ | gofmt -r 'float64 -> float32' \
| gofmt -r 'general64 -> general32' \ | gofmt -r 'general64 -> general32' \
@@ -152,5 +152,5 @@ cat dgemm.go \
| sed -e "s_^\(func (Implementation) \)D\(.*\)\$_$WARNING\1S\2_" \ | sed -e "s_^\(func (Implementation) \)D\(.*\)\$_$WARNING\1S\2_" \
-e 's_^// D_// S_' \ -e 's_^// D_// S_' \
-e 's_^// d_// s_' \ -e 's_^// d_// s_' \
-e 's_"github.com/gonum/internal/asm/f64"_"github.com/gonum/internal/asm/f32"_' \ -e 's_"gonum.org/v1/gonum/internal/asm/f64"_"gonum.org/v1/gonum/internal/asm/f32"_' \
>> sgemm.go >> sgemm.go

8
blas/testblas/benchautogen/autogen_bench_level1double.go
View File

@@ -20,13 +20,13 @@ var copyrightnotice = []byte(`// Copyright 2014 The Gonum Authors. All rights re
// Use of this code is governed by a BSD-style // Use of this code is governed by a BSD-style
// license that can be found in the LICENSE file`) // license that can be found in the LICENSE file`)
var autogen = []byte("// Code generated by \"go run github.com/gonum/blas/testblas/benchautogen/autogen_bench_level1double.go\"; DO NOT EDIT.\n") var autogen = []byte("// Code generated by \"go run gonum.org/v1/gonum/blas/testblas/benchautogen/autogen_bench_level1double.go\"; DO NOT EDIT.\n")
var imports = []byte(`import( var imports = []byte(`import(
"math/rand" "math/rand"
"testing" "testing"
"github.com/gonum/blas" "gonum.org/v1/gonum/blas"
)`) )`)
var randomSliceFunction = []byte(`func randomSlice(l, idx int) ([]float64) { var randomSliceFunction = []byte(`func randomSlice(l, idx int) ([]float64) {
@@ -180,7 +180,7 @@ func init() {
} }
func main() { func main() {
blasPath := filepath.Join(gopath, "src", "github.com", "gonum", "blas") blasPath := filepath.Join(gopath, "src", "gonum.org", "v1", "gonum", "blas")
pkgs := []struct{ name string }{{name: "native"}, {name: "cgo"}} pkgs := []struct{ name string }{{name: "native"}, {name: "cgo"}}
@@ -191,7 +191,7 @@ func main() {
os.Exit(1) os.Exit(1)
} }
err = exec.Command("go", "fmt", path.Join("github.com", "gonum", "blas", pkg.name)).Run() err = exec.Command("go", "fmt", path.Join("gonum.org", "v1", "gonum", "blas", pkg.name)).Run()
if err != nil { if err != nil {
fmt.Println(err) fmt.Println(err)
os.Exit(1) os.Exit(1)

4
graph/formats/dot/README.md
View File

@@ -4,6 +4,6 @@
The source code and any original content of the formats/dot directory is released under [Public Domain Dedication](https://creativecommons.org/publicdomain/zero/1.0/). The source code and any original content of the formats/dot directory is released under [Public Domain Dedication](https://creativecommons.org/publicdomain/zero/1.0/).
The source code is also licensed under the gonum license, and users are free to choice the license which suits their needs. The source code is also licensed under the gonum license, and users are free to choose the license which suits their needs.
Please see github.com/gonum/license for general license information, contributors, authors, etc on the Gonum suite of packages. Please see gonum.org/v1/gonum for general license information, contributors, authors, etc on the Gonum suite of packages.

4
graph/formats/dot/internal/dot.bnf
View File

@@ -154,8 +154,8 @@ _block_comment : '/' '*' { . | '*' } '*' '/' ;
// ### [ Syntax ] ############################################################## // ### [ Syntax ] ##############################################################
<< import ( << import (
"github.com/gonum/graph/formats/dot/ast" "gonum.org/v1/gonum/graph/formats/dot/ast"
"github.com/gonum/graph/formats/dot/internal/astx" "gonum.org/v1/gonum/graph/formats/dot/internal/astx"
) >> ) >>
// === [ Files ] =============================================================== // === [ Files ] ===============================================================

2
graph/formats/dot/internal/lexer/lexer.go
View File

@@ -17,7 +17,7 @@ import (
"io/ioutil" "io/ioutil"
"unicode/utf8" "unicode/utf8"
// "github.com/gonum/graph/formats/dot/internal/util" // "gonum.org/v1/gonum/graph/formats/dot/internal/util"
"gonum.org/v1/gonum/graph/formats/dot/internal/token" "gonum.org/v1/gonum/graph/formats/dot/internal/token"
) )

2
lapack/internal/testdata/dlahr2test/main.go vendored
View File

@@ -19,7 +19,7 @@ import (
"os" "os"
"path/filepath" "path/filepath"
"github.com/gonum/lapack/internal/testdata/netlib" "gonum.org/v1/gonum/lapack/internal/testdata/netlib"
) )
type Dlahr2Test struct { type Dlahr2Test struct {

2
lapack/internal/testdata/dlaqr5test/main.go vendored
View File

@@ -19,7 +19,7 @@ import (
"os" "os"
"path/filepath" "path/filepath"
"github.com/gonum/lapack/internal/testdata/netlib" "gonum.org/v1/gonum/lapack/internal/testdata/netlib"
) )
type Dlaqr5Test struct { type Dlaqr5Test struct {