From e75080ce47a30f0c331446f674551e098fa09f58 Mon Sep 17 00:00:00 2001 From: bbbboom Date: Thu, 12 Mar 2020 20:45:26 +0800 Subject: [PATCH] change CR-LF to LF --- tensorflow/go/genop/generate.go | 10 +- tensorflow/go/genop/generate.sh | 136 +++++++++++++-------------- tensorflow/go/genop/generate.win.go | 10 +- tensorflow/go/genop/main.go | 140 ++++++++++++++-------------- 4 files changed, 148 insertions(+), 148 deletions(-) diff --git a/tensorflow/go/genop/generate.go b/tensorflow/go/genop/generate.go index 72ec6f552c2..fcf1d65d594 100644 --- a/tensorflow/go/genop/generate.go +++ b/tensorflow/go/genop/generate.go @@ -1,5 +1,5 @@ -// +build !windows - -//go:generate bash generate.sh - -package main +// +build !windows + +//go:generate bash generate.sh + +package main diff --git a/tensorflow/go/genop/generate.sh b/tensorflow/go/genop/generate.sh index 6346f12687d..54541106f13 100644 --- a/tensorflow/go/genop/generate.sh +++ b/tensorflow/go/genop/generate.sh @@ -1,68 +1,68 @@ -#!/usr/bin/env bash -# Copyright 2016 The TensorFlow Authors. All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# ============================================================================== - -set -e - -go get github.com/golang/protobuf/proto -go get github.com/golang/protobuf/protoc-gen-go - -if [ -z "${GOPATH}" ] -then - GOPATH=$(go env GOPATH) -fi - -# change GOPATH style -if [ $1 == "win" ]; then - GOPATH=${GOPATH//\\/\/} - GOPATH=/${GOPATH//:/} -fi - -cd $(dirname $0) -for g in $(echo "${GOPATH//:/ }"); do - TF_DIR="${g}/src/github.com/tensorflow/tensorflow" - PROTOC="${TF_DIR}/bazel-out/host/bin/external/protobuf/protoc" - if [ -x "${PROTOC}" ]; then - break - fi -done - -if [ ! -x "${PROTOC}" ] -then - set +e - PATH_PROTOC=$(which protoc) - if [ ! -x "${PATH_PROTOC}" ] - then - echo "Protocol buffer compiler protoc not found in PATH or in ${PROTOC}" - echo "Perhaps build it using:" - echo "bazel build --config opt @com_google_protobuf//:protoc" - exit 1 - fi - PROTOC=$PATH_PROTOC - set -e -fi - -# Ensure that protoc-gen-go is available in $PATH -# Since ${PROTOC} will require it. -export PATH=$PATH:${GOPATH}/bin -mkdir -p ../vendor -for FILE in ${TF_DIR}/tensorflow/core/framework/*.proto \ - ${TF_DIR}/tensorflow/core/protobuf/*.proto \ - ${TF_DIR}/tensorflow/stream_executor/*.proto; do - ${PROTOC} \ - -I ${TF_DIR} \ - --go_out=../vendor \ - $FILE -done +#!/usr/bin/env bash +# Copyright 2016 The TensorFlow Authors. All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# ============================================================================== + +set -e + +go get github.com/golang/protobuf/proto +go get github.com/golang/protobuf/protoc-gen-go + +if [ -z "${GOPATH}" ] +then + GOPATH=$(go env GOPATH) +fi + +# change GOPATH style +if [ $1 == "win" ]; then + GOPATH=${GOPATH//\\/\/} + GOPATH=/${GOPATH//:/} +fi + +cd $(dirname $0) +for g in $(echo "${GOPATH//:/ }"); do + TF_DIR="${g}/src/github.com/tensorflow/tensorflow" + PROTOC="${TF_DIR}/bazel-out/host/bin/external/protobuf/protoc" + if [ -x "${PROTOC}" ]; then + break + fi +done + +if [ ! -x "${PROTOC}" ] +then + set +e + PATH_PROTOC=$(which protoc) + if [ ! -x "${PATH_PROTOC}" ] + then + echo "Protocol buffer compiler protoc not found in PATH or in ${PROTOC}" + echo "Perhaps build it using:" + echo "bazel build --config opt @com_google_protobuf//:protoc" + exit 1 + fi + PROTOC=$PATH_PROTOC + set -e +fi + +# Ensure that protoc-gen-go is available in $PATH +# Since ${PROTOC} will require it. +export PATH=$PATH:${GOPATH}/bin +mkdir -p ../vendor +for FILE in ${TF_DIR}/tensorflow/core/framework/*.proto \ + ${TF_DIR}/tensorflow/core/protobuf/*.proto \ + ${TF_DIR}/tensorflow/stream_executor/*.proto; do + ${PROTOC} \ + -I ${TF_DIR} \ + --go_out=../vendor \ + $FILE +done diff --git a/tensorflow/go/genop/generate.win.go b/tensorflow/go/genop/generate.win.go index 23b27fffc2a..3eff6ab5e7e 100644 --- a/tensorflow/go/genop/generate.win.go +++ b/tensorflow/go/genop/generate.win.go @@ -1,5 +1,5 @@ -// +build windows - -//go:generate bash generate.sh win - -package main +// +build windows + +//go:generate bash generate.sh win + +package main diff --git a/tensorflow/go/genop/main.go b/tensorflow/go/genop/main.go index 83a361176f0..87c1d27c3b5 100644 --- a/tensorflow/go/genop/main.go +++ b/tensorflow/go/genop/main.go @@ -1,70 +1,70 @@ -/* -Copyright 2016 The TensorFlow Authors. All Rights Reserved. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -// Command genop generates a Go source file with functions for TensorFlow ops. -package main - -import ( - "bytes" - "flag" - "go/format" - "io/ioutil" - "log" - "os" - "path/filepath" - "strings" - - "github.com/tensorflow/tensorflow/tensorflow/go/genop/internal" -) - -func main() { - var ( - filename = flag.String("outfile", "", "File to write generated source code to.") - header = flag.String("header", "", "Path to a file whose contents will be copied into the generated file. Can be empty") - apiDefDirs = flag.String("api_def_dirs", "", "Comma-separated directories containing api_def_*.pbtxt files.") - buf bytes.Buffer - ) - flag.Parse() - if *filename == "" { - log.Fatal("-outfile must be set") - } - if *header != "" { - hdr, err := ioutil.ReadFile(*header) - if err != nil { - log.Fatalf("Unable to read %s: %v", *header, err) - } - buf.Write(hdr) - buf.WriteString("\n\n") - } - os.MkdirAll(filepath.Dir(*filename), 0755) - - apiDefDirsList := []string{} - if len(*apiDefDirs) > 0 { - apiDefDirsList = strings.Split(*apiDefDirs, ",") - } - - if err := internal.GenerateFunctionsForRegisteredOps( - &buf, apiDefDirsList); err != nil { - log.Fatal(err) - } - formatted, err := format.Source(buf.Bytes()) - if err != nil { - log.Fatalf("Failed to generate valid source? 'go fmt' failed: %v", err) - } - if err := ioutil.WriteFile(*filename, formatted, 0644); err != nil { - log.Fatalf("Failed to write to %q: %v", *filename, err) - } -} +/* +Copyright 2016 The TensorFlow Authors. All Rights Reserved. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// Command genop generates a Go source file with functions for TensorFlow ops. +package main + +import ( + "bytes" + "flag" + "go/format" + "io/ioutil" + "log" + "os" + "path/filepath" + "strings" + + "github.com/tensorflow/tensorflow/tensorflow/go/genop/internal" +) + +func main() { + var ( + filename = flag.String("outfile", "", "File to write generated source code to.") + header = flag.String("header", "", "Path to a file whose contents will be copied into the generated file. Can be empty") + apiDefDirs = flag.String("api_def_dirs", "", "Comma-separated directories containing api_def_*.pbtxt files.") + buf bytes.Buffer + ) + flag.Parse() + if *filename == "" { + log.Fatal("-outfile must be set") + } + if *header != "" { + hdr, err := ioutil.ReadFile(*header) + if err != nil { + log.Fatalf("Unable to read %s: %v", *header, err) + } + buf.Write(hdr) + buf.WriteString("\n\n") + } + os.MkdirAll(filepath.Dir(*filename), 0755) + + apiDefDirsList := []string{} + if len(*apiDefDirs) > 0 { + apiDefDirsList = strings.Split(*apiDefDirs, ",") + } + + if err := internal.GenerateFunctionsForRegisteredOps( + &buf, apiDefDirsList); err != nil { + log.Fatal(err) + } + formatted, err := format.Source(buf.Bytes()) + if err != nil { + log.Fatalf("Failed to generate valid source? 'go fmt' failed: %v", err) + } + if err := ioutil.WriteFile(*filename, formatted, 0644); err != nil { + log.Fatalf("Failed to write to %q: %v", *filename, err) + } +}