Skip to content
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

Jump to bottom

fix(ir): make sure default value won't be replaced with empty value #970

Merged
merged 1 commit into from
Oct 7, 2022
Merged

fix(ir): make sure default value won't be replaced with empty value #970

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
11 changes: 4 additions & 7 deletions pkg/lang/frontend/starlark/install/install.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,19 +132,16 @@ func ruleFuncSystemPackage(thread *starlark.Thread, _ *starlark.Builtin,

func ruleFuncCUDA(thread *starlark.Thread, _ *starlark.Builtin,
args starlark.Tuple, kwargs []starlark.Tuple) (starlark.Value, error) {
var version, cudnn starlark.String
var version, cudnn string

if err := starlark.UnpackArgs(ruleCUDA, args, kwargs,
"version?", &version, "cudnn?", &cudnn); err != nil {
"version", &version, "cudnn?", &cudnn); err != nil {
return nil, err
}

versionStr := version.GoString()
cudnnStr := cudnn.GoString()

logger.Debugf("rule `%s` is invoked, version=%s, cudnn=%s",
ruleCUDA, versionStr, cudnnStr)
ir.CUDA(versionStr, cudnnStr)
ruleCUDA, version, cudnn)
ir.CUDA(version, cudnn)

return starlark.None, nil
}
Expand Down
3 changes: 1 addition & 2 deletions pkg/lang/frontend/starlark/universe/universe.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,9 @@ func RegisterBuildContext(buildContextDir string) {
func ruleFuncBase(thread *starlark.Thread, _ *starlark.Builtin,
args starlark.Tuple, kwargs []starlark.Tuple) (starlark.Value, error) {
var os, language, image string
var useConda bool

if err := starlark.UnpackArgs(ruleBase, args, kwargs,
"os?", &os, "language?", &language, "image?", &image, "use_conda?", &useConda); err != nil {
"os?", &os, "language?", &language, "image?", &image); err != nil {
return nil, err
}

Expand Down
2 changes: 1 addition & 1 deletion pkg/lang/ir/compile.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ func NewGraph() *Graph {
Version: &langVersion,
},
CUDA: nil,
CUDNN: "8", // default version
CUDNN: CUDNNVersionDefault,
NumGPUs: -1,

PyPIPackages: []string{},
Expand Down
1 change: 1 addition & 0 deletions pkg/lang/ir/consts.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ const (
osDefault = "ubuntu20.04"
languageDefault = "python"
languageVersionDefault = "3"
CUDNNVersionDefault = "8"

aptSourceFilePath = "/etc/apt/sources.list"
pypiIndexFilePath = "/etc/pip.conf"
Expand Down
8 changes: 6 additions & 2 deletions pkg/lang/ir/interface.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,9 @@ func Base(os, language, image string) error {
Name: l,
Version: version,
}
DefaultGraph.OS = os
if len(os) > 0 {
DefaultGraph.OS = os
}
if image != "" {
DefaultGraph.Image = &image
}
Expand Down Expand Up @@ -66,7 +68,9 @@ func GPU(numGPUs int) {

func CUDA(version, cudnn string) {
DefaultGraph.CUDA = &version
DefaultGraph.CUDNN = cudnn
if len(cudnn) > 0 {
DefaultGraph.CUDNN = cudnn
}
}

func VSCodePlugins(plugins []string) error {
Expand Down