Skip to content

Use keepsake's console package for logging #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
andreasjansson merged 1 commit into from
Mar 29, 2021
Merged

Use keepsake's console package for logging #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions cmd/cog/cog.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@ package main
import (
"github.com/replicate/cog/pkg/cli"

log "github.com/sirupsen/logrus"
"github.com/replicate/cog/pkg/console"
)

func main() {
cmd, err := cli.NewRootCommand()
if err != nil {
log.Fatalf("%f", err)
console.Fatal("%f", err)
}

if err = cmd.Execute(); err != nil {
log.Fatalf("%s", err)
console.Fatal("%s", err)
}
}
17 changes: 9 additions & 8 deletions cmd/generate_compatibility_matrices/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ import (
"strings"

"github.com/anaskhan96/soup"
log "github.com/sirupsen/logrus"

"github.com/replicate/cog/pkg/console"

"github.com/replicate/cog/pkg/model"
)
Expand All @@ -22,28 +23,28 @@ func main() {
flag.Parse()

if *tfOutputPath == "" && *torchOutputPath == "" && *cudaImagesOutputPath == "" {
log.Fatal("at least one of -tf-output, -torch-output, -cuda-images-output must be provided")
console.Fatal("at least one of -tf-output, -torch-output, -cuda-images-output must be provided")
}

if *tfOutputPath != "" {
if err := writeTFCompatibilityMatrix(*tfOutputPath); err != nil {
log.Fatalf("Failed to write Tensorflow compatibility matrix: %s", err)
console.Fatal("Failed to write Tensorflow compatibility matrix: %s", err)
}
}
if *torchOutputPath != "" {
if err := writeTorchCompatibilityMatrix(*torchOutputPath); err != nil {
log.Fatalf("Failed to write PyTorch compatibility matrix: %s", err)
console.Fatal("Failed to write PyTorch compatibility matrix: %s", err)
}
}
if *cudaImagesOutputPath != "" {
if err := writeCUDABaseImageTags(*cudaImagesOutputPath); err != nil {
log.Fatalf("Failed to write CUDA base images: %s", err)
console.Fatal("Failed to write CUDA base images: %s", err)
}
}
}

func writeTFCompatibilityMatrix(outputPath string) error {
log.Infof("Writing Tensorflow compatibility matrix to %s...", outputPath)
console.Info("Writing Tensorflow compatibility matrix to %s...", outputPath)

url := "https://www.tensorflow.org/install/source"
resp, err := soup.Get(url)
Expand Down Expand Up @@ -93,7 +94,7 @@ func writeTFCompatibilityMatrix(outputPath string) error {
}

func writeTorchCompatibilityMatrix(outputPath string) error {
log.Infof("Writing PyTorch compatibility matrix to %s...", outputPath)
console.Info("Writing PyTorch compatibility matrix to %s...", outputPath)

compats := []model.TorchCompatibility{}
var err error
Expand Down Expand Up @@ -122,7 +123,7 @@ func writeTorchCompatibilityMatrix(outputPath string) error {
}

func writeCUDABaseImageTags(outputPath string) error {
log.Infof("Writing CUDA base images to %s...", outputPath)
console.Info("Writing CUDA base images to %s...", outputPath)
url := "https://hub.docker.com/v2/repositories/nvidia/cuda/tags/?page_size=1000&name=devel-ubuntu&ordering=last_updated"
resp, err := soup.Get(url)
if err != nil {
Expand Down
18 changes: 7 additions & 11 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ go 1.16

require (
github.com/Microsoft/go-winio v0.4.16 // indirect
github.com/TylerBrock/colorjson v0.0.0-20200706003622-8a50f05110d2 // indirect
github.com/TylerBrock/colorjson v0.0.0-20200706003622-8a50f05110d2
github.com/anaskhan96/soup v1.2.4
github.com/containerd/containerd v1.4.4 // indirect
github.com/docker/distribution v2.7.1+incompatible // indirect
Expand All @@ -14,22 +14,21 @@ require (
github.com/fatih/color v1.10.0 // indirect
github.com/golang/protobuf v1.4.3 // indirect
github.com/google/go-cmp v0.5.4 // indirect
github.com/gopherdata/gophernotes v0.7.2 // indirect
github.com/gorilla/mux v1.8.0
github.com/hokaccha/go-prettyjson v0.0.0-20210113012101-fb4e108d2519 // indirect
github.com/kr/text v0.2.0 // indirect
github.com/logrusorgru/aurora v2.0.3+incompatible
github.com/mattn/go-isatty v0.0.12
github.com/mholt/archiver/v3 v3.5.0
github.com/mitchellh/go-homedir v1.1.0
github.com/moby/term v0.0.0-20201110203204-bea5bbe245bf // indirect
github.com/mitchellh/go-wordwrap v1.0.1
github.com/moby/term v0.0.0-20201110203204-bea5bbe245bf
github.com/morikuni/aec v1.0.0 // indirect
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect
github.com/onsi/ginkgo v1.8.0 // indirect
github.com/onsi/gomega v1.4.3 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/image-spec v1.0.1 // indirect
github.com/pebbe/zmq4 v0.0.0-20170917105202-90d69e412a09 // indirect
github.com/satori/go.uuid v1.2.1-0.20180103174451-36e9d2ebbde5 // indirect
github.com/schollz/progressbar/v3 v3.7.6
github.com/sirupsen/logrus v1.7.0
github.com/sirupsen/logrus v1.7.0 // indirect
github.com/spf13/cobra v1.1.3
github.com/stretchr/testify v1.7.0
github.com/xeonx/timeago v1.0.0-rc4
Expand All @@ -40,11 +39,8 @@ require (
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
google.golang.org/genproto v0.0.0-20210222152913-aa3ee6e6a81c // indirect
google.golang.org/grpc v1.35.0 // indirect
gopkg.in/airbrake/gobrake.v2 v2.0.9 // indirect
gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect
gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2 // indirect
gopkg.in/yaml.v2 v2.4.0
gotest.tools/gotestsum v1.6.2 // indirect
gotest.tools/v3 v3.0.3 // indirect
)

Expand Down
Loading